Merge branch 'master' of https://github.com/gtamodding/re3

premake5.lua

@@ -3,30 +3,39 @@ workspace "re3"
 	location "build"
 
 	files { "src/*.*" }
-	files { "src/skel/*.*" }
-	files { "src/skel/win/*.*" }
+	files { "src/animation/*.*" }
+	files { "src/audio/*.*" }
+	files { "src/control/*.*" }
+	files { "src/core/*.*" }
+	files { "src/entities/*.*" }
 	files { "src/math/*.*" }
 	files { "src/modelinfo/*.*" }
-	files { "src/entities/*.*" }
-	files { "src/weapons/*.*" }
+	files { "src/objects/*.*" }
+	files { "src/peds/*.*" }
 	files { "src/render/*.*" }
-	files { "src/control/*.*" }
-	files { "src/animation/*.*" }
-	files { "src/audio/*.*" }
+	files { "src/skel/*.*" }
+	files { "src/skel/win/*.*" }
+	files { "src/vehicles/*.*" }
+	files { "src/weapons/*.*" }
 
 	includedirs { "src" }
+	includedirs { "src/animation" }
+	includedirs { "src/audio" }
+	includedirs { "src/control" }
+	includedirs { "src/core" }
+	includedirs { "src/entities" }
+	includedirs { "src/modelinfo" }
+	includedirs { "src/objects" }
+	includedirs { "src/peds" }
+	includedirs { "src/render" }
 	includedirs { "src/skel/" }
 	includedirs { "src/skel/win" }
-	includedirs { "src/modelinfo" }
-	includedirs { "src/entities" }
+	includedirs { "src/vehicles" }
 	includedirs { "src/weapons" }
-	includedirs { "src/render" }
-	includedirs { "src/control" }
-	includedirs { "src/audio" }
-	includedirs { "src/animation" }
+
 	includedirs { "dxsdk/include" }
 	includedirs { "rwsdk/include/d3d8" }
-	
+
 	libdirs { "dxsdk/lib" }
 
 project "re3"

src/animation/AnimBlendAssociation.h

@@ -77,7 +77,7 @@ class CAnimBlendAssociation
 	void UpdateTime(float timeDelta, float relSpeed);
 	bool UpdateBlend(float timeDelta);
 
-	float GetTimeLeft() { return hierarchy->totalLength - currentTime; }
+	inline float GetTimeLeft() { return hierarchy->totalLength - currentTime; }
 
 	static CAnimBlendAssociation *FromLink(CAnimBlendLink *l) {
 		return (CAnimBlendAssociation*)((uint8*)l - offsetof(CAnimBlendAssociation, link));

src/animation/AnimManager.cpp

@@ -752,7 +752,7 @@ CAnimManager::LoadAnimFiles(void)
 		AnimAssocDefinition *def = &CAnimManager::ms_aAnimAssocDefinitions[i];
 		group->CreateAssociations(def->blockName, clump, def->animNames, def->numAnims);
 		for(j = 0; j < group->numAssociations; j++)
-			group->GetAnimation(def->animDescs[j].animId)->flags |= def->animDescs[j].flags;
+			group->GetAnimation(j)->flags |= def->animDescs[j].flags;
 		RpClumpDestroy(clump);
 	}
 }

src/control/PhoneInfo.cpp → src/control/Phones.cpp

@@ -1,6 +1,6 @@
 #include "common.h"
 #include "patcher.h"
-#include "PhoneInfo.h"
+#include "Phones.h"
 
 WRAPPER void PhonePutDownCB(CAnimBlendAssociation *assoc, void *arg) { EAXJMP(0x42F570); }
-WRAPPER void PhonePickUpCB(CAnimBlendAssociation *assoc, void *arg) { EAXJMP(0x42F470); }
+WRAPPER void PhonePickUpCB(CAnimBlendAssociation *assoc, void *arg) { EAXJMP(0x42F470); }

src/control/Replay.cpp

@@ -16,7 +16,7 @@
 #include "ModelInfo.h"
 #include "Object.h"
 #include "Pad.h"
-#include "PhoneInfo.h"
+#include "Phones.h"
 #include "Pickups.h"
 #include "Plane.h"
 #include "Pools.h"
@@ -638,7 +638,7 @@ void CReplay::StoreCarUpdate(CVehicle *vehicle, int id)
 	if (vehicle->IsCar()){
 		CAutomobile* car = (CAutomobile*)vehicle;
 		for (int i = 0; i < 4; i++){
-			vp->wheel_susp_dist[i] = 50.0f * car->m_aWheelDist[i];
+			vp->wheel_susp_dist[i] = 50.0f * car->m_aSuspensionSpringRatio[i];
 			vp->wheel_rotation[i] = 128.0f / M_PI * car->m_aWheelRotation[i];
 		}
 		vp->door_angles[0] = 127.0f / M_PI * car->Doors[2].m_fAngle;
@@ -683,7 +683,7 @@ void CReplay::ProcessCarUpdate(CVehicle *vehicle, float interpolation, CAddressI
 	if (vehicle->IsCar()) {
 		CAutomobile* car = (CAutomobile*)vehicle;
 		for (int i = 0; i < 4; i++) {
-			car->m_aWheelDist[i] = vp->wheel_susp_dist[i] / 50.0f;
+			car->m_aSuspensionSpringRatio[i] = vp->wheel_susp_dist[i] / 50.0f;
 			car->m_aWheelRotation[i] = vp->wheel_rotation[i] * M_PI / 128.0f;
 		}
 		car->Doors[2].m_fAngle = car->Doors[2].m_fPreviousAngle = vp->door_angles[0] * M_PI / 127.0f;

src/control/Replay.h

@@ -262,8 +262,8 @@ class CReplay
 	static void StreamAllNecessaryCarsAndPeds(void);
 	static bool ShouldStandardCameraBeProcessed(void);
 
-	inline static bool IsPlayingBack() { return Mode == MODE_PLAYBACK; }
-	inline static bool IsPlayingBackFromFile() { return bPlayingBackFromFile; }
+	static bool IsPlayingBack() { return Mode == MODE_PLAYBACK; }
+	static bool IsPlayingBackFromFile() { return bPlayingBackFromFile; }
 
 private:
 	static void RecordThisFrame(void);

src/control/Script.cpp

@@ -129,6 +129,10 @@ void CMissionCleanup::Process()
 	}
 }
 
+/* NB: CUpsideDownCarCheck is not used by actual script at all
+ * It has a weird usage: AreAnyCarsUpsideDown would fail any mission
+ * just like death or arrest. */
+
 void CUpsideDownCarCheck::Init()
 {
 	for (int i = 0; i < MAX_UPSIDEDOWN_CAR_CHECKS; i++){
@@ -137,16 +141,140 @@ void CUpsideDownCarCheck::Init()
 	}
 }
 
+bool CUpsideDownCarCheck::IsCarUpsideDown(int32 id)
+{
+	CVehicle* v = CPools::GetVehiclePool()->GetAt(id);
+	return v->GetUp().z <= -0.97f &&
+		v->GetMoveSpeed().Magnitude() < 0.01f &&
+		v->GetTurnSpeed().Magnitude() < 0.02f;
+}
+
+void CUpsideDownCarCheck::UpdateTimers()
+{
+	uint32 timeStep = CTimer::GetTimeStepInMilliseconds();
+	for (int i = 0; i < MAX_UPSIDEDOWN_CAR_CHECKS; i++){
+		CVehicle* v = CPools::GetVehiclePool()->GetAt(m_sCars[i].m_nVehicleIndex);
+		if (v){
+			if (IsCarUpsideDown(m_sCars[i].m_nVehicleIndex))
+				m_sCars[i].m_nUpsideDownTimer += timeStep;
+			else
+				m_sCars[i].m_nUpsideDownTimer = 0;
+		}else{
+			m_sCars[i].m_nVehicleIndex = -1;
+			m_sCars[i].m_nUpsideDownTimer = 0;
+		}
+	}
+}
+
+bool CUpsideDownCarCheck::AreAnyCarsUpsideDown()
+{
+	for (int i = 0; i < MAX_UPSIDEDOWN_CAR_CHECKS; i++){
+		if (m_sCars[i].m_nVehicleIndex >= 0 && m_sCars[i].m_nUpsideDownTimer > 1000)
+			return true;
+	}
+	return false;
+}
+
+void CUpsideDownCarCheck::AddCarToCheck(int32 id)
+{
+	uint16 index = 0;
+	while (index < MAX_UPSIDEDOWN_CAR_CHECKS && m_sCars[index].m_nVehicleIndex >= 0)
+		index++;
+	if (index >= MAX_UPSIDEDOWN_CAR_CHECKS)
+		return;
+	m_sCars[index].m_nVehicleIndex = id;
+	m_sCars[index].m_nUpsideDownTimer = 0;
+}
+
+void CUpsideDownCarCheck::RemoveCarFromCheck(int32 id)
+{
+	for (int i = 0; i < MAX_UPSIDEDOWN_CAR_CHECKS; i++){
+		if (m_sCars[i].m_nVehicleIndex == id){
+			m_sCars[i].m_nVehicleIndex = -1;
+			m_sCars[i].m_nUpsideDownTimer = 0;
+		}
+	}
+}
+
+bool CUpsideDownCarCheck::HasCarBeenUpsideDownForAWhile(int32 id)
+{
+	for (int i = 0; i < MAX_UPSIDEDOWN_CAR_CHECKS; i++){
+		if (m_sCars[i].m_nVehicleIndex == id)
+			return m_sCars[i].m_nUpsideDownTimer > 1000;
+	}
+	return false;
+}
+
+void CStuckCarCheckEntry::Reset()
+{
+	m_nVehicleIndex = -1;
+	m_vecPos = CVector(-5000.0f, -5000.0f, -5000.0f);
+	m_nLastCheck = -1;
+	m_fRadius = 0.0f;
+	m_nStuckTime = 0;
+	m_bStuck = false;
+}
+
 void CStuckCarCheck::Init()
 {
 	for (int i = 0; i < MAX_STUCK_CAR_CHECKS; i++) {
-		m_sCars[i].m_nVehicleIndex = -1;
-		m_sCars[i].m_vecPos = CVector(-5000.0f, -5000.0f, -5000.0f);
-		m_sCars[i].m_nStartTime = -1;
-		m_sCars[i].m_fDistance = 0.0f;
-		m_sCars[i].m_nStuckTime = 0;
-		m_sCars[i].m_bStuck = false;
+		m_sCars[i].Reset();
+	}
+}
+
+void CStuckCarCheck::Process()
+{
+	uint32 timer = CTimer::GetTimeInMilliseconds();
+	for (int i = 0; i < MAX_STUCK_CAR_CHECKS; i++){
+		if (m_sCars[i].m_nVehicleIndex < 0)
+			continue;
+		if (timer <= m_sCars[i].m_nStuckTime + m_sCars[i].m_nLastCheck)
+			continue;
+		CVehicle* pv = CPools::GetVehiclePool()->GetAt(m_sCars[i].m_nVehicleIndex);
+		if (!pv){
+			m_sCars[i].Reset();
+			continue;
+		}
+		float distance = (pv->GetPosition() - m_sCars[i].m_vecPos).Magnitude();
+		m_sCars[i].m_bStuck = distance < m_sCars[i].m_fRadius;
+		m_sCars[i].m_vecPos = pv->GetPosition();
+		m_sCars[i].m_nLastCheck = timer;
+	}
+}
+
+void CStuckCarCheck::AddCarToCheck(int32 id, float radius, uint32 time)
+{
+	CVehicle* pv = CPools::GetVehiclePool()->GetAt(id);
+	if (!pv)
+		return;
+	int index = 0;
+	while (index < MAX_STUCK_CAR_CHECKS && m_sCars[index].m_nVehicleIndex >= 0)
+		index++;
+	/* Would be nice to return if index >= MAX_STUCK_CAR_CHECKS... */
+	m_sCars[index].m_nVehicleIndex = id;
+	m_sCars[index].m_vecPos = pv->GetPosition();
+	m_sCars[index].m_nLastCheck = CTimer::GetTimeInMilliseconds();
+	m_sCars[index].m_fRadius = radius;
+	m_sCars[index].m_nStuckTime = time;
+	m_sCars[index].m_bStuck = false;
+}
+
+void CStuckCarCheck::RemoveCarFromCheck(int32 id)
+{
+	for (int i = 0; i < MAX_STUCK_CAR_CHECKS; i++){
+		if (m_sCars[i].m_nVehicleIndex == id){
+			m_sCars[i].Reset();
+		}
+	}
+}
+
+bool CStuckCarCheck::HasCarBeenStuckForAWhile(int32 id)
+{
+	for (int i = 0; i < MAX_STUCK_CAR_CHECKS; i++){
+		if (m_sCars[i].m_nVehicleIndex == id)
+			return m_sCars[i].m_bStuck;
 	}
+	return false;
 }
 
 WRAPPER void CTheScripts::CleanUpThisVehicle(CVehicle*) { EAXJMP(0x4548D0); }
@@ -160,4 +288,15 @@ InjectHook(0x437AE0, &CMissionCleanup::Init, PATCH_JUMP);
 InjectHook(0x437BA0, &CMissionCleanup::AddEntityToList, PATCH_JUMP);
 InjectHook(0x437BD0, &CMissionCleanup::RemoveEntityFromList, PATCH_JUMP);
 InjectHook(0x437C10, &CMissionCleanup::Process, PATCH_JUMP);
+InjectHook(0x437DC0, &CUpsideDownCarCheck::Init, PATCH_JUMP);
+InjectHook(0x437EE0, &CUpsideDownCarCheck::UpdateTimers, PATCH_JUMP);
+InjectHook(0x437F80, &CUpsideDownCarCheck::AreAnyCarsUpsideDown, PATCH_JUMP);
+InjectHook(0x437FB0, &CUpsideDownCarCheck::AddCarToCheck, PATCH_JUMP);
+InjectHook(0x437FE0, &CUpsideDownCarCheck::RemoveCarFromCheck, PATCH_JUMP);
+InjectHook(0x438010, &CUpsideDownCarCheck::HasCarBeenUpsideDownForAWhile, PATCH_JUMP);
+InjectHook(0x438050, &CStuckCarCheck::Init, PATCH_JUMP);
+InjectHook(0x4380A0, &CStuckCarCheck::Process, PATCH_JUMP);
+InjectHook(0x4381C0, &CStuckCarCheck::AddCarToCheck, PATCH_JUMP);
+InjectHook(0x438240, &CStuckCarCheck::RemoveCarFromCheck, PATCH_JUMP);
+InjectHook(0x4382A0, &CStuckCarCheck::HasCarBeenStuckForAWhile, PATCH_JUMP);
 ENDPATCHES

src/control/Script.h

@@ -101,16 +101,24 @@ class CUpsideDownCarCheck
 
 public:
 	void Init();
+	bool IsCarUpsideDown(int32);
+	void UpdateTimers();
+	bool AreAnyCarsUpsideDown();
+	void AddCarToCheck(int32);
+	void RemoveCarFromCheck(int32);
+	bool HasCarBeenUpsideDownForAWhile(int32);
 };
 
 struct CStuckCarCheckEntry
 {
 	int32 m_nVehicleIndex;
 	CVector m_vecPos;
-	int32 m_nStartTime;
-	float m_fDistance;
+	int32 m_nLastCheck;
+	float m_fRadius;
 	uint32 m_nStuckTime;
 	bool m_bStuck;
+
+	inline void Reset();
 };
 
 class CStuckCarCheck
@@ -119,6 +127,10 @@ class CStuckCarCheck
 
 public:
 	void Init();
+	void Process();
+	void AddCarToCheck(int32, float, uint32);
+	void RemoveCarFromCheck(int32);
+	bool HasCarBeenStuckForAWhile(int32);
 };
 
 class CTheScripts

src/Camera.cpp → src/core/Camera.cpp

@@ -8,7 +8,7 @@
 #include "PlayerPed.h"
 #include "Pad.h"
 #include "General.h"
-#include "CullZones.h"
+#include "ZoneCull.h"
 #include "SurfaceTable.h"
 #include "MBlur.h"
 #include "Camera.h"

src/Collision.cpp → src/core/Collision.cpp

@@ -5,7 +5,7 @@
 #include "Game.h"
 #include "Zones.h"
 #include "General.h"
-#include "CullZones.h"
+#include "ZoneCull.h"
 #include "World.h"
 #include "Entity.h"
 #include "Train.h"

src/FileLoader.cpp → src/core/FileLoader.cpp

@@ -21,7 +21,7 @@
 #include "DummyObject.h"
 #include "World.h"
 #include "Zones.h"
-#include "CullZones.h"
+#include "ZoneCull.h"
 #include "CdStream.h"
 #include "FileLoader.h"