From c1e13177a1bbc6ce17d1ddc14cecc74cb278b853 Mon Sep 17 00:00:00 2001 From: aap Date: Wed, 27 May 2020 22:32:33 +0200 Subject: some CAutomobile --- src/core/Stats.cpp | 1 + src/core/Stats.h | 1 + src/core/config.h | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/core') diff --git a/src/core/Stats.cpp b/src/core/Stats.cpp index 34fc41d1..91f583bd 100644 --- a/src/core/Stats.cpp +++ b/src/core/Stats.cpp @@ -67,6 +67,7 @@ float CStats::AutoPaintingBudget; int32 CStats::NoMoreHurricanes; float CStats::FashionBudget; int32 CStats::SafeHouseVisits; +int32 CStats::TyresPopped; void CStats::Init() { diff --git a/src/core/Stats.h b/src/core/Stats.h index 485bdccf..33d4ef72 100644 --- a/src/core/Stats.h +++ b/src/core/Stats.h @@ -71,6 +71,7 @@ public: static int32 NoMoreHurricanes; static float FashionBudget; static int32 SafeHouseVisits; + static int32 TyresPopped; public: static void Init(void); diff --git a/src/core/config.h b/src/core/config.h index c90d3cbf..d7e83ddc 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -41,7 +41,7 @@ enum Config { NUMANIMBLOCKS = 35, NUMANIMATIONS = 450, - NUMTEMPOBJECTS = 30, + NUMTEMPOBJECTS = 40, // Path data NUM_PATHNODES = 9650, -- cgit v1.2.3 From 218772c296418abf3de4b0116977b2da1e78a66b Mon Sep 17 00:00:00 2001 From: aap Date: Thu, 28 May 2020 10:37:13 +0200 Subject: gahhh --- src/core/config.h | 2 +- src/core/re3.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src/core') diff --git a/src/core/config.h b/src/core/config.h index d7e83ddc..faf2815c 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -205,7 +205,7 @@ enum Config { #define RELOADABLES // some debug menu options to reload TXD files #endif -#define PC_WATER +//#define PC_WATER #define WATER_CHEATS // Particle diff --git a/src/core/re3.cpp b/src/core/re3.cpp index 54077e6f..61de2e08 100644 --- a/src/core/re3.cpp +++ b/src/core/re3.cpp @@ -337,6 +337,7 @@ DebugMenuPopulate(void) DebugMenuAddCmd("Spawn", "Spawn Cheetah", [](){ SpawnCar(MI_CHEETAH); }); DebugMenuAddCmd("Spawn", "Spawn Esperanto", [](){ SpawnCar(MI_ESPERANT); }); DebugMenuAddCmd("Spawn", "Spawn Stallion", [](){ SpawnCar(MI_STALLION); }); + DebugMenuAddCmd("Spawn", "Spawn Admiral", [](){ SpawnCar(MI_ADMIRAL); }); DebugMenuAddCmd("Spawn", "Spawn Washington", [](){ SpawnCar(MI_WASHING); }); DebugMenuAddCmd("Spawn", "Spawn Taxi", [](){ SpawnCar(MI_TAXI); }); DebugMenuAddCmd("Spawn", "Spawn Police", [](){ SpawnCar(MI_POLICE); }); -- cgit v1.2.3 From 00dc86917eca1b6628446f8a3f80f15855050d2c Mon Sep 17 00:00:00 2001 From: aap Date: Thu, 28 May 2020 18:53:54 +0200 Subject: some more CAutomobile --- src/core/Pad.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/core') diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp index 89b3f053..d309d469 100644 --- a/src/core/Pad.cpp +++ b/src/core/Pad.cpp @@ -321,6 +321,12 @@ void RenderWaterLayersCheat(void) CWaterLevel::m_nRenderWaterLayers = 0; } +void BackToTheFuture(void) +{ + CHud::SetHelpMessage(TheText.Get("CHEAT1"), true); + CVehicle::bHoverCheat = !CVehicle::bHoverCheat; +} + ////////////////////////////////////////////////////////////////////////// @@ -1080,7 +1086,11 @@ void CPad::AddToPCCheatString(char c) if (!_CHEATCMP("TAEHCSREYALRETAW")) RenderWaterLayersCheat(); #endif - + + // SEAWAYS + if (!_CHEATCMP("SYAWAES")) + BackToTheFuture(); + #undef _CHEATCMP } -- cgit v1.2.3 From 21ce0a4b28a1842dad91433362d250089ec491b8 Mon Sep 17 00:00:00 2001 From: aap Date: Sun, 31 May 2020 17:05:49 +0200 Subject: CAutomobile done --- src/core/Cam.cpp | 5 ++--- src/core/Camera.h | 1 + src/core/PlayerInfo.h | 1 + src/core/re3.cpp | 4 +++- 4 files changed, 7 insertions(+), 4 deletions(-) (limited to 'src/core') diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp index 1c74598c..fe2c250f 100644 --- a/src/core/Cam.cpp +++ b/src/core/Cam.cpp @@ -3778,7 +3778,7 @@ CCam::Process_Debug(const CVector&, float, float, float) if(FindPlayerVehicle()) FindPlayerVehicle()->Teleport(Source); else - CWorld::Players[CWorld::PlayerInFocus].m_pPed->SetPosition(Source); + CWorld::Players[CWorld::PlayerInFocus].m_pPed->SetPosition(Source); } // stay inside sectors @@ -3845,8 +3845,7 @@ CCam::Process_Debug(const CVector&, float, float, float) if(FindPlayerVehicle()) FindPlayerVehicle()->Teleport(Source); else - CWorld::Players[CWorld::PlayerInFocus].m_pPed->GetPosition() = Source; - + CWorld::Players[CWorld::PlayerInFocus].m_pPed->SetPosition(Source); } // stay inside sectors diff --git a/src/core/Camera.h b/src/core/Camera.h index 18144ef5..669ac740 100644 --- a/src/core/Camera.h +++ b/src/core/Camera.h @@ -382,6 +382,7 @@ public: bool m_WideScreenOn; bool m_1rstPersonRunCloseToAWall; bool m_bHeadBob; + bool m_bVehicleSuspenHigh; bool m_bFailedCullZoneTestPreviously; bool m_FadeTargetIsSplashScreen; diff --git a/src/core/PlayerInfo.h b/src/core/PlayerInfo.h index e2e874e6..ba8dc8fe 100644 --- a/src/core/PlayerInfo.h +++ b/src/core/PlayerInfo.h @@ -42,6 +42,7 @@ public: uint32 m_nTimeLastHealthLoss; uint32 m_nTimeLastArmourLoss; uint32 m_nTimeTankShotGun; + int32 m_nTimeNotFullyOnGround; int32 m_nUpsideDownCounter; int32 field_248; int16 m_nTrafficMultiplier; diff --git a/src/core/re3.cpp b/src/core/re3.cpp index 61de2e08..d02bd9b0 100644 --- a/src/core/re3.cpp +++ b/src/core/re3.cpp @@ -335,6 +335,8 @@ DebugMenuPopulate(void) DebugMenuAddCmd("Spawn", "Spawn Stinger", [](){ SpawnCar(MI_STINGER); }); DebugMenuAddCmd("Spawn", "Spawn Infernus", [](){ SpawnCar(MI_INFERNUS); }); DebugMenuAddCmd("Spawn", "Spawn Cheetah", [](){ SpawnCar(MI_CHEETAH); }); + DebugMenuAddCmd("Spawn", "Spawn Phoenix", [](){ SpawnCar(MI_PHEONIX); }); + DebugMenuAddCmd("Spawn", "Spawn Banshee", [](){ SpawnCar(MI_BANSHEE); }); DebugMenuAddCmd("Spawn", "Spawn Esperanto", [](){ SpawnCar(MI_ESPERANT); }); DebugMenuAddCmd("Spawn", "Spawn Stallion", [](){ SpawnCar(MI_STALLION); }); DebugMenuAddCmd("Spawn", "Spawn Admiral", [](){ SpawnCar(MI_ADMIRAL); }); @@ -342,9 +344,9 @@ DebugMenuPopulate(void) DebugMenuAddCmd("Spawn", "Spawn Taxi", [](){ SpawnCar(MI_TAXI); }); DebugMenuAddCmd("Spawn", "Spawn Police", [](){ SpawnCar(MI_POLICE); }); DebugMenuAddCmd("Spawn", "Spawn Enforcer", [](){ SpawnCar(MI_ENFORCER); }); - DebugMenuAddCmd("Spawn", "Spawn Banshee", [](){ SpawnCar(MI_BANSHEE); }); DebugMenuAddCmd("Spawn", "Spawn Cuban", [](){ SpawnCar(MI_CUBAN); }); DebugMenuAddCmd("Spawn", "Spawn Voodoo", [](){ SpawnCar(MI_VOODOO); }); + DebugMenuAddCmd("Spawn", "Spawn BF injection", [](){ SpawnCar(MI_BFINJECT); }); DebugMenuAddCmd("Spawn", "Spawn Maverick", [](){ SpawnCar(MI_MAVERICK); }); DebugMenuAddCmd("Spawn", "Spawn VCN Maverick", [](){ SpawnCar(MI_VCNMAV); }); DebugMenuAddCmd("Spawn", "Spawn Sparrow", [](){ SpawnCar(MI_SPARROW); }); -- cgit v1.2.3 From 197c49d74013de3b2a073e36b8b64b2cb189ea48 Mon Sep 17 00:00:00 2001 From: aap Date: Mon, 1 Jun 2020 10:29:46 +0200 Subject: fixed bumper colmodel --- src/core/TempColModels.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core') diff --git a/src/core/TempColModels.cpp b/src/core/TempColModels.cpp index a4814759..c6a9d368 100644 --- a/src/core/TempColModels.cpp +++ b/src/core/TempColModels.cpp @@ -156,7 +156,7 @@ CTempColModels::Initialise(void) } ms_colModelBumper1.boundingSphere.Set(2.2f, CVector(0.0f, -0.6f, 0.0f)); - ms_colModelBumper1.boundingBox.Set(CVector(-1.2f, -0.3f, -0.2f), CVector(1.2f, 0.3f, -0.2f)); + ms_colModelBumper1.boundingBox.Set(CVector(-1.2f, -0.3f, -0.2f), CVector(1.2f, 0.3f, 0.2f)); SET_COLMODEL_SPHERES(ms_colModelBumper1, s_aBumperSpheres); -- cgit v1.2.3 From d8272b8812fb7e5b6a6045a796c535d10ebb95c2 Mon Sep 17 00:00:00 2001 From: aap Date: Mon, 1 Jun 2020 20:28:04 +0200 Subject: hanim fix --- src/core/common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core') diff --git a/src/core/common.h b/src/core/common.h index ed331bbb..cc570bef 100644 --- a/src/core/common.h +++ b/src/core/common.h @@ -29,14 +29,14 @@ #define STREAMFILE(str) (((rw::StreamFile*)(str))->file) #define HIERNODEINFO(hier) ((hier)->nodeInfo) #define HIERNODEID(hier, i) ((hier)->nodeInfo[i].id) -#define HANIMFRAMES(anim) ((anim)->keyframes) +#define HANIMFRAME(anim, i) ((RwUInt8*)(anim)->keyframes + (i)*(anim)->interpInfo->animKeyFrameSize) #else #define RWHALFPIXEL // always d3d #define STREAMPOS(str) ((str)->Type.memory.position) #define STREAMFILE(str) ((str)->Type.file.fpFile) #define HIERNODEINFO(hier) ((hier)->pNodeInfo) #define HIERNODEID(hier, i) ((hier)->pNodeInfo[i].nodeID) -#define HANIMFRAMES(anim) ((anim)->pFrames) +#define HANIMFRAME(anim, i) ((RwUInt8*)(anim)->pFrames + (i)*(anim)->interpInfo->keyFrameSize) #endif #ifdef RWHALFPIXEL -- cgit v1.2.3