diff options
author | aap <aap@papnet.eu> | 2019-07-26 14:27:13 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2019-07-26 14:27:13 +0200 |
commit | 9a50a59a3ced80d782ac1b89aed1e5e86a91dd64 (patch) | |
tree | d3252eb8d966a82ea1e41853c08642a88b593a3a /src/core | |
parent | Merge pull request #165 from Nick007J/master (diff) | |
download | re3-9a50a59a3ced80d782ac1b89aed1e5e86a91dd64.tar re3-9a50a59a3ced80d782ac1b89aed1e5e86a91dd64.tar.gz re3-9a50a59a3ced80d782ac1b89aed1e5e86a91dd64.tar.bz2 re3-9a50a59a3ced80d782ac1b89aed1e5e86a91dd64.tar.lz re3-9a50a59a3ced80d782ac1b89aed1e5e86a91dd64.tar.xz re3-9a50a59a3ced80d782ac1b89aed1e5e86a91dd64.tar.zst re3-9a50a59a3ced80d782ac1b89aed1e5e86a91dd64.zip |
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/Collision.cpp | 6 | ||||
-rw-r--r-- | src/core/Fire.cpp | 1 | ||||
-rw-r--r-- | src/core/Fire.h | 3 | ||||
-rw-r--r-- | src/core/PlayerInfo.h | 2 | ||||
-rw-r--r-- | src/core/re3.cpp | 1 |
5 files changed, 8 insertions, 5 deletions
diff --git a/src/core/Collision.cpp b/src/core/Collision.cpp index 7982e77d..cc360f79 100644 --- a/src/core/Collision.cpp +++ b/src/core/Collision.cpp @@ -2023,11 +2023,11 @@ CColModel::operator=(const CColModel &other) numVerts = 0; for(i = 0; i < other.numTriangles; i++){ if(other.triangles[i].a > numVerts) - other.triangles[i].a = numVerts; + numVerts = other.triangles[i].a; if(other.triangles[i].b > numVerts) - other.triangles[i].b = numVerts; + numVerts = other.triangles[i].b; if(other.triangles[i].c > numVerts) - other.triangles[i].c = numVerts; + numVerts = other.triangles[i].c; } numVerts++; if(vertices) diff --git a/src/core/Fire.cpp b/src/core/Fire.cpp index bc59de2f..a2894d43 100644 --- a/src/core/Fire.cpp +++ b/src/core/Fire.cpp @@ -7,3 +7,4 @@ CFireManager &gFireManager = *(CFireManager*)0x8F31D0; WRAPPER void CFire::Extinguish(void) { EAXJMP(0x479D40); } WRAPPER void CFireManager::StartFire(CEntity *entityOnFire, CEntity *culprit, float, uint32) { EAXJMP(0x479590); } +WRAPPER CFire *CFireManager::FindFurthestFire_NeverMindFireMen(CVector coors, float, float) { EAXJMP(0x479430); } diff --git a/src/core/Fire.h b/src/core/Fire.h index 9c9e1dec..040e9a25 100644 --- a/src/core/Fire.h +++ b/src/core/Fire.h @@ -4,6 +4,7 @@ class CEntity; class CFire { +public: bool m_bIsOngoing; bool m_bExists; bool m_bPropogationFlag; @@ -18,7 +19,6 @@ class CFire int field_28; float field_2C; -public: void Extinguish(void); }; @@ -26,5 +26,6 @@ class CFireManager { public: void StartFire(CEntity *entityOnFire, CEntity *culprit, float, uint32); + CFire *FindFurthestFire_NeverMindFireMen(CVector coors, float, float); }; extern CFireManager &gFireManager; diff --git a/src/core/PlayerInfo.h b/src/core/PlayerInfo.h index a5f69122..decfb24c 100644 --- a/src/core/PlayerInfo.h +++ b/src/core/PlayerInfo.h @@ -20,7 +20,7 @@ public: CPlayerPed *m_pPed; CVehicle *m_pRemoteVehicle; CColModel m_ColModel; - CVehicle *m_pVehicleEx; + CVehicle *m_pVehicleEx; // vehicle using the col model above char m_aPlayerName[70]; int32 m_nMoney; int32 m_nVisibleMoney; diff --git a/src/core/re3.cpp b/src/core/re3.cpp index 6566a282..c2787bc3 100644 --- a/src/core/re3.cpp +++ b/src/core/re3.cpp @@ -295,6 +295,7 @@ DebugMenuPopulate(void) DebugMenuAddCmd("Spawn", "Spawn Enforcer", [](){ SpawnCar(MI_ENFORCER); }); DebugMenuAddCmd("Spawn", "Spawn Banshee", [](){ SpawnCar(MI_BANSHEE); }); DebugMenuAddCmd("Spawn", "Spawn Yakuza", [](){ SpawnCar(MI_YAKUZA); }); + DebugMenuAddCmd("Spawn", "Spawn Yardie", [](){ SpawnCar(MI_YARDIE); }); DebugMenuAddCmd("Spawn", "Spawn Dodo", [](){ SpawnCar(MI_DODO); }); DebugMenuAddCmd("Spawn", "Spawn Rhino", [](){ SpawnCar(MI_RHINO); }); DebugMenuAddCmd("Spawn", "Spawn Firetruck", [](){ SpawnCar(MI_FIRETRUCK); }); |