Merge pull request #282 from erorcun/erorcun

CEmergencyPed done
GTAmodding · Dec 23, 2019 · 458ae30b6f4d3beb1cc2db1538b1659578b588bd · 458ae30
2 parents 790f486 + 04499bf
commit 458ae30b6f4d3beb1cc2db1538b1659578b588bd
Unified Split

Showing with 456 additions and 31 deletions.

+14 −2 src/control/AccidentManager.cpp

+1 −0 src/control/AccidentManager.h

+414 −22 src/peds/EmergencyPed.cpp

+27 −7 src/peds/EmergencyPed.h
diff --git a/src/control/AccidentManager.cpp b/src/control/AccidentManager.cpp
@@ -8,7 +8,8 @@ CAccidentManager& gAccidentManager = *(CAccidentManager*)0x87FD10;
 
 WRAPPER void CAccidentManager::Update(void) { EAXJMP(0x456710); }
 
-uint16 CAccidentManager::CountActiveAccidents()
+uint16
+CAccidentManager::CountActiveAccidents()
 {
 	uint16 accidents = 0;
 	for (int i = 0; i < NUM_ACCIDENTS; i++){
@@ -18,7 +19,8 @@ uint16 CAccidentManager::CountActiveAccidents()
 	return accidents;
 }
 
-CAccident* CAccidentManager::FindNearestAccident(CVector vecPos, float* pDistance)
+CAccident*
+CAccidentManager::FindNearestAccident(CVector vecPos, float* pDistance)
 {
 	for (int i = 0; i < MAX_MEDICS_TO_ATTEND_ACCIDENT; i++){
 		int accidentId = -1;
@@ -44,4 +46,14 @@ CAccident* CAccidentManager::FindNearestAccident(CVector vecPos, float* pDistanc
 			return &m_aAccidents[accidentId];
 	}
 	return nil;
+}
+
+bool
+CAccidentManager::UnattendedAccidents(void)
+{
+	for (int i = 0; i < NUM_ACCIDENTS; i++) {
+		if (m_aAccidents[i].m_pVictim && m_aAccidents[i].m_nMedicsAttending == 0)
+			return true;
+	}
+	return false;
 }
diff --git a/src/control/AccidentManager.h b/src/control/AccidentManager.h
@@ -21,6 +21,7 @@ class CAccidentManager
 	};
 public:
 	uint16 CountActiveAccidents();
+	bool UnattendedAccidents();
 	CAccident* FindNearestAccident(CVector, float*);
 	void Update(void);
 };