From 53023eb65bdcde43e341c1ecb7cf0c7f8ee524fb Mon Sep 17 00:00:00 2001 From: aap Date: Sun, 7 Jul 2019 13:09:11 +0200 Subject: [PATCH] the great reorganization --- premake5.lua | 39 ++++++++++++-------- src/control/{PhoneInfo.cpp => Phones.cpp} | 4 +- src/control/{PhoneInfo.h => Phones.h} | 0 src/control/Replay.cpp | 6 +-- src/{ => core}/Camera.cpp | 2 +- src/{ => core}/Camera.h | 0 src/{ => core}/CdStream.cpp | 0 src/{ => core}/CdStream.h | 0 src/{ => core}/Clock.cpp | 0 src/{ => core}/Clock.h | 0 src/{ => core}/Collision.cpp | 2 +- src/{ => core}/Collision.h | 0 src/{ => core}/ControllerConfig.cpp | 0 src/{ => core}/ControllerConfig.h | 0 src/{ => core}/CutsceneMgr.cpp | 0 src/{ => core}/CutsceneMgr.h | 0 src/{ => core}/Directory.cpp | 0 src/{ => core}/Directory.h | 0 src/{ => core}/FileLoader.cpp | 2 +- src/{ => core}/FileLoader.h | 0 src/{ => core}/FileMgr.cpp | 0 src/{ => core}/FileMgr.h | 0 src/{ => core}/Fire.cpp | 0 src/{ => core}/Fire.h | 0 src/{ => core}/Frontend.cpp | 0 src/{ => core}/Frontend.h | 0 src/{ => core}/Game.cpp | 0 src/{ => core}/Game.h | 0 src/{ => core}/General.h | 0 src/{ => core}/Lists.cpp | 0 src/{ => core}/Lists.h | 0 src/{ => core}/MenuScreens.h | 0 src/{ => core}/Messages.cpp | 0 src/{ => core}/Messages.h | 0 src/{ => core}/NodeName.cpp | 0 src/{ => core}/NodeName.h | 0 src/{ => core}/PCSave.cpp | 0 src/{ => core}/PCSave.h | 0 src/{ => core}/Pad.cpp | 0 src/{ => core}/Pad.h | 0 src/{ => core}/Placeable.cpp | 0 src/{ => core}/Placeable.h | 0 src/{entities => core}/PlayerInfo.cpp | 0 src/{entities => core}/PlayerInfo.h | 0 src/{entities => core}/PlayerSkin.cpp | 0 src/{entities => core}/PlayerSkin.h | 0 src/{ => core}/Pools.cpp | 0 src/{ => core}/Pools.h | 0 src/{ => core}/Radar.cpp | 0 src/{ => core}/Radar.h | 0 src/{ => core}/References.cpp | 0 src/{ => core}/References.h | 0 src/{ => core}/RwClumpRead.cpp | 0 src/{ => core}/RwHelper.cpp | 0 src/{ => core}/RwHelper.h | 0 src/{ => core}/RwMatFX.cpp | 0 src/{ => core}/RwTexRead.cpp | 0 src/{ => core}/Stats.cpp | 0 src/{ => core}/Stats.h | 0 src/{ => core}/Streaming.cpp | 2 +- src/{ => core}/Streaming.h | 0 src/{ => core}/SurfaceTable.cpp | 0 src/{ => core}/SurfaceTable.h | 0 src/{ => core}/TempColModels.cpp | 0 src/{ => core}/TempColModels.h | 0 src/{ => core}/Text.cpp | 0 src/{ => core}/Text.h | 0 src/{ => core}/Timer.cpp | 0 src/{ => core}/Timer.h | 0 src/{ => core}/TxdStore.cpp | 0 src/{ => core}/TxdStore.h | 0 src/{ => core}/User.cpp | 0 src/{ => core}/User.h | 0 src/{ => core}/Wanted.cpp | 0 src/{ => core}/Wanted.h | 0 src/{ => core}/World.cpp | 0 src/{ => core}/World.h | 0 src/{CullZones.cpp => core/ZoneCull.cpp} | 2 +- src/{CullZones.h => core/ZoneCull.h} | 0 src/{ => core}/Zones.cpp | 0 src/{ => core}/Zones.h | 0 src/{ => core}/common.h | 0 src/{ => core}/config.h | 0 src/{ => core}/debugmenu_public.h | 0 src/{ => core}/main.cpp | 2 +- src/{ => core}/main.h | 0 src/{ => core}/patcher.cpp | 0 src/{ => core}/patcher.h | 0 src/{ => core}/re3.cpp | 0 src/{ => core}/rw.cpp | 0 src/{ => core}/templates.h | 0 src/entities/Physical.cpp | 8 ++-- src/{ => modelinfo}/MloInstance.cpp | 0 src/{ => modelinfo}/MloInstance.h | 0 src/{entities => objects}/CutsceneHead.cpp | 0 src/{entities => objects}/CutsceneHead.h | 0 src/{entities => objects}/CutsceneObject.cpp | 0 src/{entities => objects}/CutsceneObject.h | 0 src/{entities => objects}/DummyObject.cpp | 0 src/{entities => objects}/DummyObject.h | 0 src/{entities => objects}/Object.cpp | 0 src/{entities => objects}/Object.h | 0 src/{control => objects}/ObjectData.cpp | 0 src/{control => objects}/ObjectData.h | 0 src/{ => objects}/ParticleObject.cpp | 0 src/{ => objects}/ParticleObject.h | 0 src/{entities => objects}/Projectile.cpp | 0 src/{entities => objects}/Projectile.h | 0 src/{entities => peds}/CivilianPed.cpp | 0 src/{entities => peds}/CivilianPed.h | 0 src/{entities => peds}/CopPed.cpp | 0 src/{entities => peds}/CopPed.h | 0 src/{entities => peds}/DummyPed.h | 0 src/{entities => peds}/EmergencyPed.cpp | 0 src/{entities => peds}/EmergencyPed.h | 0 src/{entities => peds}/Ped.cpp | 2 +- src/{entities => peds}/Ped.h | 0 src/{entities => peds}/PedIK.cpp | 0 src/{entities => peds}/PedIK.h | 0 src/{control => peds}/PedPlacement.cpp | 0 src/{control => peds}/PedPlacement.h | 0 src/{control => peds}/PedStats.cpp | 0 src/{control => peds}/PedStats.h | 0 src/{control => peds}/PedType.cpp | 0 src/{control => peds}/PedType.h | 0 src/{entities => peds}/PlayerPed.cpp | 0 src/{entities => peds}/PlayerPed.h | 0 src/render/Lights.cpp | 2 +- src/{ => render}/Timecycle.cpp | 2 +- src/{ => render}/Timecycle.h | 0 src/{ => render}/Weather.cpp | 0 src/{ => render}/Weather.h | 0 src/{entities => vehicles}/Automobile.cpp | 0 src/{entities => vehicles}/Automobile.h | 7 ++-- src/{entities => vehicles}/Boat.cpp | 0 src/{entities => vehicles}/Boat.h | 0 src/{ => vehicles}/DamageManager.cpp | 0 src/{ => vehicles}/DamageManager.h | 0 src/{control => vehicles}/HandlingMgr.cpp | 0 src/{control => vehicles}/HandlingMgr.h | 0 src/{entities => vehicles}/Heli.cpp | 0 src/{entities => vehicles}/Heli.h | 0 src/{entities => vehicles}/Plane.cpp | 0 src/{entities => vehicles}/Plane.h | 0 src/{entities => vehicles}/Train.cpp | 0 src/{entities => vehicles}/Train.h | 0 src/{control => vehicles}/Transmission.cpp | 0 src/{control => vehicles}/Transmission.h | 0 src/{entities => vehicles}/Vehicle.cpp | 0 src/{entities => vehicles}/Vehicle.h | 0 150 files changed, 45 insertions(+), 37 deletions(-) rename src/control/{PhoneInfo.cpp => Phones.cpp} (80%) rename src/control/{PhoneInfo.h => Phones.h} (100%) rename src/{ => core}/Camera.cpp (99%) rename src/{ => core}/Camera.h (100%) rename src/{ => core}/CdStream.cpp (100%) rename src/{ => core}/CdStream.h (100%) rename src/{ => core}/Clock.cpp (100%) rename src/{ => core}/Clock.h (100%) rename src/{ => core}/Collision.cpp (99%) rename src/{ => core}/Collision.h (100%) rename src/{ => core}/ControllerConfig.cpp (100%) rename src/{ => core}/ControllerConfig.h (100%) rename src/{ => core}/CutsceneMgr.cpp (100%) rename src/{ => core}/CutsceneMgr.h (100%) rename src/{ => core}/Directory.cpp (100%) rename src/{ => core}/Directory.h (100%) rename src/{ => core}/FileLoader.cpp (99%) rename src/{ => core}/FileLoader.h (100%) rename src/{ => core}/FileMgr.cpp (100%) rename src/{ => core}/FileMgr.h (100%) rename src/{ => core}/Fire.cpp (100%) rename src/{ => core}/Fire.h (100%) rename src/{ => core}/Frontend.cpp (100%) rename src/{ => core}/Frontend.h (100%) rename src/{ => core}/Game.cpp (100%) rename src/{ => core}/Game.h (100%) rename src/{ => core}/General.h (100%) rename src/{ => core}/Lists.cpp (100%) rename src/{ => core}/Lists.h (100%) rename src/{ => core}/MenuScreens.h (100%) rename src/{ => core}/Messages.cpp (100%) rename src/{ => core}/Messages.h (100%) rename src/{ => core}/NodeName.cpp (100%) rename src/{ => core}/NodeName.h (100%) rename src/{ => core}/PCSave.cpp (100%) rename src/{ => core}/PCSave.h (100%) rename src/{ => core}/Pad.cpp (100%) rename src/{ => core}/Pad.h (100%) rename src/{ => core}/Placeable.cpp (100%) rename src/{ => core}/Placeable.h (100%) rename src/{entities => core}/PlayerInfo.cpp (100%) rename src/{entities => core}/PlayerInfo.h (100%) rename src/{entities => core}/PlayerSkin.cpp (100%) rename src/{entities => core}/PlayerSkin.h (100%) rename src/{ => core}/Pools.cpp (100%) rename src/{ => core}/Pools.h (100%) rename src/{ => core}/Radar.cpp (100%) rename src/{ => core}/Radar.h (100%) rename src/{ => core}/References.cpp (100%) rename src/{ => core}/References.h (100%) rename src/{ => core}/RwClumpRead.cpp (100%) rename src/{ => core}/RwHelper.cpp (100%) rename src/{ => core}/RwHelper.h (100%) rename src/{ => core}/RwMatFX.cpp (100%) rename src/{ => core}/RwTexRead.cpp (100%) rename src/{ => core}/Stats.cpp (100%) rename src/{ => core}/Stats.h (100%) rename src/{ => core}/Streaming.cpp (99%) rename src/{ => core}/Streaming.h (100%) rename src/{ => core}/SurfaceTable.cpp (100%) rename src/{ => core}/SurfaceTable.h (100%) rename src/{ => core}/TempColModels.cpp (100%) rename src/{ => core}/TempColModels.h (100%) rename src/{ => core}/Text.cpp (100%) rename src/{ => core}/Text.h (100%) rename src/{ => core}/Timer.cpp (100%) rename src/{ => core}/Timer.h (100%) rename src/{ => core}/TxdStore.cpp (100%) rename src/{ => core}/TxdStore.h (100%) rename src/{ => core}/User.cpp (100%) rename src/{ => core}/User.h (100%) rename src/{ => core}/Wanted.cpp (100%) rename src/{ => core}/Wanted.h (100%) rename src/{ => core}/World.cpp (100%) rename src/{ => core}/World.h (100%) rename src/{CullZones.cpp => core/ZoneCull.cpp} (99%) rename src/{CullZones.h => core/ZoneCull.h} (100%) rename src/{ => core}/Zones.cpp (100%) rename src/{ => core}/Zones.h (100%) rename src/{ => core}/common.h (100%) rename src/{ => core}/config.h (100%) rename src/{ => core}/debugmenu_public.h (100%) rename src/{ => core}/main.cpp (99%) rename src/{ => core}/main.h (100%) rename src/{ => core}/patcher.cpp (100%) rename src/{ => core}/patcher.h (100%) rename src/{ => core}/re3.cpp (100%) rename src/{ => core}/rw.cpp (100%) rename src/{ => core}/templates.h (100%) rename src/{ => modelinfo}/MloInstance.cpp (100%) rename src/{ => modelinfo}/MloInstance.h (100%) rename src/{entities => objects}/CutsceneHead.cpp (100%) rename src/{entities => objects}/CutsceneHead.h (100%) rename src/{entities => objects}/CutsceneObject.cpp (100%) rename src/{entities => objects}/CutsceneObject.h (100%) rename src/{entities => objects}/DummyObject.cpp (100%) rename src/{entities => objects}/DummyObject.h (100%) rename src/{entities => objects}/Object.cpp (100%) rename src/{entities => objects}/Object.h (100%) rename src/{control => objects}/ObjectData.cpp (100%) rename src/{control => objects}/ObjectData.h (100%) rename src/{ => objects}/ParticleObject.cpp (100%) rename src/{ => objects}/ParticleObject.h (100%) rename src/{entities => objects}/Projectile.cpp (100%) rename src/{entities => objects}/Projectile.h (100%) rename src/{entities => peds}/CivilianPed.cpp (100%) rename src/{entities => peds}/CivilianPed.h (100%) rename src/{entities => peds}/CopPed.cpp (100%) rename src/{entities => peds}/CopPed.h (100%) rename src/{entities => peds}/DummyPed.h (100%) rename src/{entities => peds}/EmergencyPed.cpp (100%) rename src/{entities => peds}/EmergencyPed.h (100%) rename src/{entities => peds}/Ped.cpp (99%) rename src/{entities => peds}/Ped.h (100%) rename src/{entities => peds}/PedIK.cpp (100%) rename src/{entities => peds}/PedIK.h (100%) rename src/{control => peds}/PedPlacement.cpp (100%) rename src/{control => peds}/PedPlacement.h (100%) rename src/{control => peds}/PedStats.cpp (100%) rename src/{control => peds}/PedStats.h (100%) rename src/{control => peds}/PedType.cpp (100%) rename src/{control => peds}/PedType.h (100%) rename src/{entities => peds}/PlayerPed.cpp (100%) rename src/{entities => peds}/PlayerPed.h (100%) rename src/{ => render}/Timecycle.cpp (99%) rename src/{ => render}/Timecycle.h (100%) rename src/{ => render}/Weather.cpp (100%) rename src/{ => render}/Weather.h (100%) rename src/{entities => vehicles}/Automobile.cpp (100%) rename src/{entities => vehicles}/Automobile.h (90%) rename src/{entities => vehicles}/Boat.cpp (100%) rename src/{entities => vehicles}/Boat.h (100%) rename src/{ => vehicles}/DamageManager.cpp (100%) rename src/{ => vehicles}/DamageManager.h (100%) rename src/{control => vehicles}/HandlingMgr.cpp (100%) rename src/{control => vehicles}/HandlingMgr.h (100%) rename src/{entities => vehicles}/Heli.cpp (100%) rename src/{entities => vehicles}/Heli.h (100%) rename src/{entities => vehicles}/Plane.cpp (100%) rename src/{entities => vehicles}/Plane.h (100%) rename src/{entities => vehicles}/Train.cpp (100%) rename src/{entities => vehicles}/Train.h (100%) rename src/{control => vehicles}/Transmission.cpp (100%) rename src/{control => vehicles}/Transmission.h (100%) rename src/{entities => vehicles}/Vehicle.cpp (100%) rename src/{entities => vehicles}/Vehicle.h (100%) diff --git a/premake5.lua b/premake5.lua index cbd4c7f9..6966ec16 100644 --- a/premake5.lua +++ b/premake5.lua @@ -3,30 +3,39 @@ workspace "re3" location "build" files { "src/*.*" } - files { "src/skel/*.*" } - files { "src/skel/win/*.*" } - files { "src/math/*.*" } - files { "src/modelinfo/*.*" } - files { "src/entities/*.*" } - files { "src/weapons/*.*" } - files { "src/render/*.*" } - files { "src/control/*.*" } files { "src/animation/*.*" } files { "src/audio/*.*" } + files { "src/control/*.*" } + files { "src/core/*.*" } + files { "src/entities/*.*" } + files { "src/math/*.*" } + files { "src/modelinfo/*.*" } + files { "src/objects/*.*" } + files { "src/peds/*.*" } + files { "src/render/*.*" } + 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" diff --git a/src/control/PhoneInfo.cpp b/src/control/Phones.cpp similarity index 80% rename from src/control/PhoneInfo.cpp rename to src/control/Phones.cpp index dbb7acc5..fa4f83e5 100644 --- a/src/control/PhoneInfo.cpp +++ b/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); } \ No newline at end of file +WRAPPER void PhonePickUpCB(CAnimBlendAssociation *assoc, void *arg) { EAXJMP(0x42F470); } diff --git a/src/control/PhoneInfo.h b/src/control/Phones.h similarity index 100% rename from src/control/PhoneInfo.h rename to src/control/Phones.h diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp index e166e6b5..06995663 100644 --- a/src/control/Replay.cpp +++ b/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; diff --git a/src/Camera.cpp b/src/core/Camera.cpp similarity index 99% rename from src/Camera.cpp rename to src/core/Camera.cpp index d7ee398b..660be333 100644 --- a/src/Camera.cpp +++ b/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" diff --git a/src/Camera.h b/src/core/Camera.h similarity index 100% rename from src/Camera.h rename to src/core/Camera.h diff --git a/src/CdStream.cpp b/src/core/CdStream.cpp similarity index 100% rename from src/CdStream.cpp rename to src/core/CdStream.cpp diff --git a/src/CdStream.h b/src/core/CdStream.h similarity index 100% rename from src/CdStream.h rename to src/core/CdStream.h diff --git a/src/Clock.cpp b/src/core/Clock.cpp similarity index 100% rename from src/Clock.cpp rename to src/core/Clock.cpp diff --git a/src/Clock.h b/src/core/Clock.h similarity index 100% rename from src/Clock.h rename to src/core/Clock.h diff --git a/src/Collision.cpp b/src/core/Collision.cpp similarity index 99% rename from src/Collision.cpp rename to src/core/Collision.cpp index 62b27eff..d15ccca5 100644 --- a/src/Collision.cpp +++ b/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" diff --git a/src/Collision.h b/src/core/Collision.h similarity index 100% rename from src/Collision.h rename to src/core/Collision.h diff --git a/src/ControllerConfig.cpp b/src/core/ControllerConfig.cpp similarity index 100% rename from src/ControllerConfig.cpp rename to src/core/ControllerConfig.cpp diff --git a/src/ControllerConfig.h b/src/core/ControllerConfig.h similarity index 100% rename from src/ControllerConfig.h rename to src/core/ControllerConfig.h diff --git a/src/CutsceneMgr.cpp b/src/core/CutsceneMgr.cpp similarity index 100% rename from src/CutsceneMgr.cpp rename to src/core/CutsceneMgr.cpp diff --git a/src/CutsceneMgr.h b/src/core/CutsceneMgr.h similarity index 100% rename from src/CutsceneMgr.h rename to src/core/CutsceneMgr.h diff --git a/src/Directory.cpp b/src/core/Directory.cpp similarity index 100% rename from src/Directory.cpp rename to src/core/Directory.cpp diff --git a/src/Directory.h b/src/core/Directory.h similarity index 100% rename from src/Directory.h rename to src/core/Directory.h diff --git a/src/FileLoader.cpp b/src/core/FileLoader.cpp similarity index 99% rename from src/FileLoader.cpp rename to src/core/FileLoader.cpp index d87964ac..fdc3b9d7 100644 --- a/src/FileLoader.cpp +++ b/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" diff --git a/src/FileLoader.h b/src/core/FileLoader.h similarity index 100% rename from src/FileLoader.h rename to src/core/FileLoader.h diff --git a/src/FileMgr.cpp b/src/core/FileMgr.cpp similarity index 100% rename from src/FileMgr.cpp rename to src/core/FileMgr.cpp diff --git a/src/FileMgr.h b/src/core/FileMgr.h similarity index 100% rename from src/FileMgr.h rename to src/core/FileMgr.h diff --git a/src/Fire.cpp b/src/core/Fire.cpp similarity index 100% rename from src/Fire.cpp rename to src/core/Fire.cpp diff --git a/src/Fire.h b/src/core/Fire.h similarity index 100% rename from src/Fire.h rename to src/core/Fire.h diff --git a/src/Frontend.cpp b/src/core/Frontend.cpp similarity index 100% rename from src/Frontend.cpp rename to src/core/Frontend.cpp diff --git a/src/Frontend.h b/src/core/Frontend.h similarity index 100% rename from src/Frontend.h rename to src/core/Frontend.h diff --git a/src/Game.cpp b/src/core/Game.cpp similarity index 100% rename from src/Game.cpp rename to src/core/Game.cpp diff --git a/src/Game.h b/src/core/Game.h similarity index 100% rename from src/Game.h rename to src/core/Game.h diff --git a/src/General.h b/src/core/General.h similarity index 100% rename from src/General.h rename to src/core/General.h diff --git a/src/Lists.cpp b/src/core/Lists.cpp similarity index 100% rename from src/Lists.cpp rename to src/core/Lists.cpp diff --git a/src/Lists.h b/src/core/Lists.h similarity index 100% rename from src/Lists.h rename to src/core/Lists.h diff --git a/src/MenuScreens.h b/src/core/MenuScreens.h similarity index 100% rename from src/MenuScreens.h rename to src/core/MenuScreens.h diff --git a/src/Messages.cpp b/src/core/Messages.cpp similarity index 100% rename from src/Messages.cpp rename to src/core/Messages.cpp diff --git a/src/Messages.h b/src/core/Messages.h similarity index 100% rename from src/Messages.h rename to src/core/Messages.h diff --git a/src/NodeName.cpp b/src/core/NodeName.cpp similarity index 100% rename from src/NodeName.cpp rename to src/core/NodeName.cpp diff --git a/src/NodeName.h b/src/core/NodeName.h similarity index 100% rename from src/NodeName.h rename to src/core/NodeName.h diff --git a/src/PCSave.cpp b/src/core/PCSave.cpp similarity index 100% rename from src/PCSave.cpp rename to src/core/PCSave.cpp diff --git a/src/PCSave.h b/src/core/PCSave.h similarity index 100% rename from src/PCSave.h rename to src/core/PCSave.h diff --git a/src/Pad.cpp b/src/core/Pad.cpp similarity index 100% rename from src/Pad.cpp rename to src/core/Pad.cpp diff --git a/src/Pad.h b/src/core/Pad.h similarity index 100% rename from src/Pad.h rename to src/core/Pad.h diff --git a/src/Placeable.cpp b/src/core/Placeable.cpp similarity index 100% rename from src/Placeable.cpp rename to src/core/Placeable.cpp diff --git a/src/Placeable.h b/src/core/Placeable.h similarity index 100% rename from src/Placeable.h rename to src/core/Placeable.h diff --git a/src/entities/PlayerInfo.cpp b/src/core/PlayerInfo.cpp similarity index 100% rename from src/entities/PlayerInfo.cpp rename to src/core/PlayerInfo.cpp diff --git a/src/entities/PlayerInfo.h b/src/core/PlayerInfo.h similarity index 100% rename from src/entities/PlayerInfo.h rename to src/core/PlayerInfo.h diff --git a/src/entities/PlayerSkin.cpp b/src/core/PlayerSkin.cpp similarity index 100% rename from src/entities/PlayerSkin.cpp rename to src/core/PlayerSkin.cpp diff --git a/src/entities/PlayerSkin.h b/src/core/PlayerSkin.h similarity index 100% rename from src/entities/PlayerSkin.h rename to src/core/PlayerSkin.h diff --git a/src/Pools.cpp b/src/core/Pools.cpp similarity index 100% rename from src/Pools.cpp rename to src/core/Pools.cpp diff --git a/src/Pools.h b/src/core/Pools.h similarity index 100% rename from src/Pools.h rename to src/core/Pools.h diff --git a/src/Radar.cpp b/src/core/Radar.cpp similarity index 100% rename from src/Radar.cpp rename to src/core/Radar.cpp diff --git a/src/Radar.h b/src/core/Radar.h similarity index 100% rename from src/Radar.h rename to src/core/Radar.h diff --git a/src/References.cpp b/src/core/References.cpp similarity index 100% rename from src/References.cpp rename to src/core/References.cpp diff --git a/src/References.h b/src/core/References.h similarity index 100% rename from src/References.h rename to src/core/References.h diff --git a/src/RwClumpRead.cpp b/src/core/RwClumpRead.cpp similarity index 100% rename from src/RwClumpRead.cpp rename to src/core/RwClumpRead.cpp diff --git a/src/RwHelper.cpp b/src/core/RwHelper.cpp similarity index 100% rename from src/RwHelper.cpp rename to src/core/RwHelper.cpp diff --git a/src/RwHelper.h b/src/core/RwHelper.h similarity index 100% rename from src/RwHelper.h rename to src/core/RwHelper.h diff --git a/src/RwMatFX.cpp b/src/core/RwMatFX.cpp similarity index 100% rename from src/RwMatFX.cpp rename to src/core/RwMatFX.cpp diff --git a/src/RwTexRead.cpp b/src/core/RwTexRead.cpp similarity index 100% rename from src/RwTexRead.cpp rename to src/core/RwTexRead.cpp diff --git a/src/Stats.cpp b/src/core/Stats.cpp similarity index 100% rename from src/Stats.cpp rename to src/core/Stats.cpp diff --git a/src/Stats.h b/src/core/Stats.h similarity index 100% rename from src/Stats.h rename to src/core/Stats.h diff --git a/src/Streaming.cpp b/src/core/Streaming.cpp similarity index 99% rename from src/Streaming.cpp rename to src/core/Streaming.cpp index 08fd80f0..f8ab19d4 100644 --- a/src/Streaming.cpp +++ b/src/core/Streaming.cpp @@ -16,7 +16,7 @@ #include "FileMgr.h" #include "FileLoader.h" #include "Zones.h" -#include "CullZones.h" +#include "ZoneCull.h" #include "Radar.h" #include "Camera.h" #include "Record.h" diff --git a/src/Streaming.h b/src/core/Streaming.h similarity index 100% rename from src/Streaming.h rename to src/core/Streaming.h diff --git a/src/SurfaceTable.cpp b/src/core/SurfaceTable.cpp similarity index 100% rename from src/SurfaceTable.cpp rename to src/core/SurfaceTable.cpp diff --git a/src/SurfaceTable.h b/src/core/SurfaceTable.h similarity index 100% rename from src/SurfaceTable.h rename to src/core/SurfaceTable.h diff --git a/src/TempColModels.cpp b/src/core/TempColModels.cpp similarity index 100% rename from src/TempColModels.cpp rename to src/core/TempColModels.cpp diff --git a/src/TempColModels.h b/src/core/TempColModels.h similarity index 100% rename from src/TempColModels.h rename to src/core/TempColModels.h diff --git a/src/Text.cpp b/src/core/Text.cpp similarity index 100% rename from src/Text.cpp rename to src/core/Text.cpp diff --git a/src/Text.h b/src/core/Text.h similarity index 100% rename from src/Text.h rename to src/core/Text.h diff --git a/src/Timer.cpp b/src/core/Timer.cpp similarity index 100% rename from src/Timer.cpp rename to src/core/Timer.cpp diff --git a/src/Timer.h b/src/core/Timer.h similarity index 100% rename from src/Timer.h rename to src/core/Timer.h diff --git a/src/TxdStore.cpp b/src/core/TxdStore.cpp similarity index 100% rename from src/TxdStore.cpp rename to src/core/TxdStore.cpp diff --git a/src/TxdStore.h b/src/core/TxdStore.h similarity index 100% rename from src/TxdStore.h rename to src/core/TxdStore.h diff --git a/src/User.cpp b/src/core/User.cpp similarity index 100% rename from src/User.cpp rename to src/core/User.cpp diff --git a/src/User.h b/src/core/User.h similarity index 100% rename from src/User.h rename to src/core/User.h diff --git a/src/Wanted.cpp b/src/core/Wanted.cpp similarity index 100% rename from src/Wanted.cpp rename to src/core/Wanted.cpp diff --git a/src/Wanted.h b/src/core/Wanted.h similarity index 100% rename from src/Wanted.h rename to src/core/Wanted.h diff --git a/src/World.cpp b/src/core/World.cpp similarity index 100% rename from src/World.cpp rename to src/core/World.cpp diff --git a/src/World.h b/src/core/World.h similarity index 100% rename from src/World.h rename to src/core/World.h diff --git a/src/CullZones.cpp b/src/core/ZoneCull.cpp similarity index 99% rename from src/CullZones.cpp rename to src/core/ZoneCull.cpp index 6155ae57..90155bcf 100644 --- a/src/CullZones.cpp +++ b/src/core/ZoneCull.cpp @@ -8,7 +8,7 @@ #include "Camera.h" #include "World.h" #include "FileMgr.h" -#include "CullZones.h" +#include "ZoneCull.h" int32 &CCullZones::NumCullZones = *(int*)0x8F2564; CCullZone *CCullZones::aZones = (CCullZone*)0x864750; // [NUMCULLZONES]; diff --git a/src/CullZones.h b/src/core/ZoneCull.h similarity index 100% rename from src/CullZones.h rename to src/core/ZoneCull.h diff --git a/src/Zones.cpp b/src/core/Zones.cpp similarity index 100% rename from src/Zones.cpp rename to src/core/Zones.cpp diff --git a/src/Zones.h b/src/core/Zones.h similarity index 100% rename from src/Zones.h rename to src/core/Zones.h diff --git a/src/common.h b/src/core/common.h similarity index 100% rename from src/common.h rename to src/core/common.h diff --git a/src/config.h b/src/core/config.h similarity index 100% rename from src/config.h rename to src/core/config.h diff --git a/src/debugmenu_public.h b/src/core/debugmenu_public.h similarity index 100% rename from src/debugmenu_public.h rename to src/core/debugmenu_public.h diff --git a/src/main.cpp b/src/core/main.cpp similarity index 99% rename from src/main.cpp rename to src/core/main.cpp index 2835f396..e7f42780 100644 --- a/src/main.cpp +++ b/src/core/main.cpp @@ -40,7 +40,7 @@ #include "CutsceneMgr.h" #include "Lights.h" #include "Credits.h" -#include "CullZones.h" +#include "ZoneCull.h" #include "Timecycle.h" #include "TxdStore.h" #include "FileMgr.h" diff --git a/src/main.h b/src/core/main.h similarity index 100% rename from src/main.h rename to src/core/main.h diff --git a/src/patcher.cpp b/src/core/patcher.cpp similarity index 100% rename from src/patcher.cpp rename to src/core/patcher.cpp diff --git a/src/patcher.h b/src/core/patcher.h similarity index 100% rename from src/patcher.h rename to src/core/patcher.h diff --git a/src/re3.cpp b/src/core/re3.cpp similarity index 100% rename from src/re3.cpp rename to src/core/re3.cpp diff --git a/src/rw.cpp b/src/core/rw.cpp similarity index 100% rename from src/rw.cpp rename to src/core/rw.cpp diff --git a/src/templates.h b/src/core/templates.h similarity index 100% rename from src/templates.h rename to src/core/templates.h diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp index 600e5dca..d6a82658 100644 --- a/src/entities/Physical.cpp +++ b/src/entities/Physical.cpp @@ -1897,10 +1897,10 @@ CPhysical::ProcessCollision(void) CVehicle *veh = (CVehicle*)this; if(veh->m_vehType == VEHICLE_TYPE_CAR){ CAutomobile *car = (CAutomobile*)this; - car->m_aWheelDist[0] = 1.0f; - car->m_aWheelDist[1] = 1.0f; - car->m_aWheelDist[2] = 1.0f; - car->m_aWheelDist[3] = 1.0f; + car->m_aSuspensionSpringRatio[0] = 1.0f; + car->m_aSuspensionSpringRatio[1] = 1.0f; + car->m_aSuspensionSpringRatio[2] = 1.0f; + car->m_aSuspensionSpringRatio[3] = 1.0f; }else if(veh->m_vehType == VEHICLE_TYPE_BIKE){ assert(0 && "TODO - but unused"); } diff --git a/src/MloInstance.cpp b/src/modelinfo/MloInstance.cpp similarity index 100% rename from src/MloInstance.cpp rename to src/modelinfo/MloInstance.cpp diff --git a/src/MloInstance.h b/src/modelinfo/MloInstance.h similarity index 100% rename from src/MloInstance.h rename to src/modelinfo/MloInstance.h diff --git a/src/entities/CutsceneHead.cpp b/src/objects/CutsceneHead.cpp similarity index 100% rename from src/entities/CutsceneHead.cpp rename to src/objects/CutsceneHead.cpp diff --git a/src/entities/CutsceneHead.h b/src/objects/CutsceneHead.h similarity index 100% rename from src/entities/CutsceneHead.h rename to src/objects/CutsceneHead.h diff --git a/src/entities/CutsceneObject.cpp b/src/objects/CutsceneObject.cpp similarity index 100% rename from src/entities/CutsceneObject.cpp rename to src/objects/CutsceneObject.cpp diff --git a/src/entities/CutsceneObject.h b/src/objects/CutsceneObject.h similarity index 100% rename from src/entities/CutsceneObject.h rename to src/objects/CutsceneObject.h diff --git a/src/entities/DummyObject.cpp b/src/objects/DummyObject.cpp similarity index 100% rename from src/entities/DummyObject.cpp rename to src/objects/DummyObject.cpp diff --git a/src/entities/DummyObject.h b/src/objects/DummyObject.h similarity index 100% rename from src/entities/DummyObject.h rename to src/objects/DummyObject.h diff --git a/src/entities/Object.cpp b/src/objects/Object.cpp similarity index 100% rename from src/entities/Object.cpp rename to src/objects/Object.cpp diff --git a/src/entities/Object.h b/src/objects/Object.h similarity index 100% rename from src/entities/Object.h rename to src/objects/Object.h diff --git a/src/control/ObjectData.cpp b/src/objects/ObjectData.cpp similarity index 100% rename from src/control/ObjectData.cpp rename to src/objects/ObjectData.cpp diff --git a/src/control/ObjectData.h b/src/objects/ObjectData.h similarity index 100% rename from src/control/ObjectData.h rename to src/objects/ObjectData.h diff --git a/src/ParticleObject.cpp b/src/objects/ParticleObject.cpp similarity index 100% rename from src/ParticleObject.cpp rename to src/objects/ParticleObject.cpp diff --git a/src/ParticleObject.h b/src/objects/ParticleObject.h similarity index 100% rename from src/ParticleObject.h rename to src/objects/ParticleObject.h diff --git a/src/entities/Projectile.cpp b/src/objects/Projectile.cpp similarity index 100% rename from src/entities/Projectile.cpp rename to src/objects/Projectile.cpp diff --git a/src/entities/Projectile.h b/src/objects/Projectile.h similarity index 100% rename from src/entities/Projectile.h rename to src/objects/Projectile.h diff --git a/src/entities/CivilianPed.cpp b/src/peds/CivilianPed.cpp similarity index 100% rename from src/entities/CivilianPed.cpp rename to src/peds/CivilianPed.cpp diff --git a/src/entities/CivilianPed.h b/src/peds/CivilianPed.h similarity index 100% rename from src/entities/CivilianPed.h rename to src/peds/CivilianPed.h diff --git a/src/entities/CopPed.cpp b/src/peds/CopPed.cpp similarity index 100% rename from src/entities/CopPed.cpp rename to src/peds/CopPed.cpp diff --git a/src/entities/CopPed.h b/src/peds/CopPed.h similarity index 100% rename from src/entities/CopPed.h rename to src/peds/CopPed.h diff --git a/src/entities/DummyPed.h b/src/peds/DummyPed.h similarity index 100% rename from src/entities/DummyPed.h rename to src/peds/DummyPed.h diff --git a/src/entities/EmergencyPed.cpp b/src/peds/EmergencyPed.cpp similarity index 100% rename from src/entities/EmergencyPed.cpp rename to src/peds/EmergencyPed.cpp diff --git a/src/entities/EmergencyPed.h b/src/peds/EmergencyPed.h similarity index 100% rename from src/entities/EmergencyPed.h rename to src/peds/EmergencyPed.h diff --git a/src/entities/Ped.cpp b/src/peds/Ped.cpp similarity index 99% rename from src/entities/Ped.cpp rename to src/peds/Ped.cpp index 055ea3fb..80ef53ee 100644 --- a/src/entities/Ped.cpp +++ b/src/peds/Ped.cpp @@ -17,7 +17,7 @@ #include "PedPlacement.h" #include "Shadows.h" #include "Weather.h" -#include "CullZones.h" +#include "ZoneCull.h" #include "Population.h" #include "Renderer.h" #include "Lights.h" diff --git a/src/entities/Ped.h b/src/peds/Ped.h similarity index 100% rename from src/entities/Ped.h rename to src/peds/Ped.h diff --git a/src/entities/PedIK.cpp b/src/peds/PedIK.cpp similarity index 100% rename from src/entities/PedIK.cpp rename to src/peds/PedIK.cpp diff --git a/src/entities/PedIK.h b/src/peds/PedIK.h similarity index 100% rename from src/entities/PedIK.h rename to src/peds/PedIK.h diff --git a/src/control/PedPlacement.cpp b/src/peds/PedPlacement.cpp similarity index 100% rename from src/control/PedPlacement.cpp rename to src/peds/PedPlacement.cpp diff --git a/src/control/PedPlacement.h b/src/peds/PedPlacement.h similarity index 100% rename from src/control/PedPlacement.h rename to src/peds/PedPlacement.h diff --git a/src/control/PedStats.cpp b/src/peds/PedStats.cpp similarity index 100% rename from src/control/PedStats.cpp rename to src/peds/PedStats.cpp diff --git a/src/control/PedStats.h b/src/peds/PedStats.h similarity index 100% rename from src/control/PedStats.h rename to src/peds/PedStats.h diff --git a/src/control/PedType.cpp b/src/peds/PedType.cpp similarity index 100% rename from src/control/PedType.cpp rename to src/peds/PedType.cpp diff --git a/src/control/PedType.h b/src/peds/PedType.h similarity index 100% rename from src/control/PedType.h rename to src/peds/PedType.h diff --git a/src/entities/PlayerPed.cpp b/src/peds/PlayerPed.cpp similarity index 100% rename from src/entities/PlayerPed.cpp rename to src/peds/PlayerPed.cpp diff --git a/src/entities/PlayerPed.h b/src/peds/PlayerPed.h similarity index 100% rename from src/entities/PlayerPed.h rename to src/peds/PlayerPed.h diff --git a/src/render/Lights.cpp b/src/render/Lights.cpp index 1e27ec48..cd83a898 100644 --- a/src/render/Lights.cpp +++ b/src/render/Lights.cpp @@ -6,7 +6,7 @@ #include "Timecycle.h" #include "Coronas.h" #include "Weather.h" -#include "CullZones.h" +#include "ZoneCull.h" #include "Frontend.h" RpLight *&pAmbient = *(RpLight**)0x885B6C; diff --git a/src/Timecycle.cpp b/src/render/Timecycle.cpp similarity index 99% rename from src/Timecycle.cpp rename to src/render/Timecycle.cpp index c04295dd..af154716 100644 --- a/src/Timecycle.cpp +++ b/src/render/Timecycle.cpp @@ -5,7 +5,7 @@ #include "Weather.h" #include "Camera.h" #include "Shadows.h" -#include "CullZones.h" +#include "ZoneCull.h" #include "CutsceneMgr.h" #include "FileMgr.h" #include "Timecycle.h" diff --git a/src/Timecycle.h b/src/render/Timecycle.h similarity index 100% rename from src/Timecycle.h rename to src/render/Timecycle.h diff --git a/src/Weather.cpp b/src/render/Weather.cpp similarity index 100% rename from src/Weather.cpp rename to src/render/Weather.cpp diff --git a/src/Weather.h b/src/render/Weather.h similarity index 100% rename from src/Weather.h rename to src/render/Weather.h diff --git a/src/entities/Automobile.cpp b/src/vehicles/Automobile.cpp similarity index 100% rename from src/entities/Automobile.cpp rename to src/vehicles/Automobile.cpp diff --git a/src/entities/Automobile.h b/src/vehicles/Automobile.h similarity index 90% rename from src/entities/Automobile.h rename to src/vehicles/Automobile.h index b1463936..630635c7 100644 --- a/src/entities/Automobile.h +++ b/src/vehicles/Automobile.h @@ -25,8 +25,8 @@ public: CDoor Doors[6]; RwFrame *m_aCarNodes[NUM_CAR_NODES]; CColPoint m_aWheelColPoints[4]; - float m_aWheelDist[4]; - float m_aWheelDistPrev[4]; + float m_aSuspensionSpringRatio[4]; + float m_aSuspensionSpringRatioPrev[4]; float m_aWheelSkidThing[4]; int field_49C; bool m_aWheelSkidmarkMuddy[4]; @@ -37,7 +37,7 @@ public: uint8 stuff3[12]; uint32 m_nBusDoorTimerEnd; uint32 m_nBusDoorTimerStart; - float m_aSuspensionRange[4]; + float m_aSuspensionSpringLength[4]; float m_aSuspensionLineLength[4]; float m_fHeightAboveRoad; float m_fImprovedHandling; @@ -65,4 +65,3 @@ public: void dtor() { this->CAutomobile::~CAutomobile(); } }; static_assert(sizeof(CAutomobile) == 0x5A8, "CAutomobile: error"); -static_assert(offsetof(CAutomobile, m_aWheelDist) == 0x46C, "CAutomobile: error"); diff --git a/src/entities/Boat.cpp b/src/vehicles/Boat.cpp similarity index 100% rename from src/entities/Boat.cpp rename to src/vehicles/Boat.cpp diff --git a/src/entities/Boat.h b/src/vehicles/Boat.h similarity index 100% rename from src/entities/Boat.h rename to src/vehicles/Boat.h diff --git a/src/DamageManager.cpp b/src/vehicles/DamageManager.cpp similarity index 100% rename from src/DamageManager.cpp rename to src/vehicles/DamageManager.cpp diff --git a/src/DamageManager.h b/src/vehicles/DamageManager.h similarity index 100% rename from src/DamageManager.h rename to src/vehicles/DamageManager.h diff --git a/src/control/HandlingMgr.cpp b/src/vehicles/HandlingMgr.cpp similarity index 100% rename from src/control/HandlingMgr.cpp rename to src/vehicles/HandlingMgr.cpp diff --git a/src/control/HandlingMgr.h b/src/vehicles/HandlingMgr.h similarity index 100% rename from src/control/HandlingMgr.h rename to src/vehicles/HandlingMgr.h diff --git a/src/entities/Heli.cpp b/src/vehicles/Heli.cpp similarity index 100% rename from src/entities/Heli.cpp rename to src/vehicles/Heli.cpp diff --git a/src/entities/Heli.h b/src/vehicles/Heli.h similarity index 100% rename from src/entities/Heli.h rename to src/vehicles/Heli.h diff --git a/src/entities/Plane.cpp b/src/vehicles/Plane.cpp similarity index 100% rename from src/entities/Plane.cpp rename to src/vehicles/Plane.cpp diff --git a/src/entities/Plane.h b/src/vehicles/Plane.h similarity index 100% rename from src/entities/Plane.h rename to src/vehicles/Plane.h diff --git a/src/entities/Train.cpp b/src/vehicles/Train.cpp similarity index 100% rename from src/entities/Train.cpp rename to src/vehicles/Train.cpp diff --git a/src/entities/Train.h b/src/vehicles/Train.h similarity index 100% rename from src/entities/Train.h rename to src/vehicles/Train.h diff --git a/src/control/Transmission.cpp b/src/vehicles/Transmission.cpp similarity index 100% rename from src/control/Transmission.cpp rename to src/vehicles/Transmission.cpp diff --git a/src/control/Transmission.h b/src/vehicles/Transmission.h similarity index 100% rename from src/control/Transmission.h rename to src/vehicles/Transmission.h diff --git a/src/entities/Vehicle.cpp b/src/vehicles/Vehicle.cpp similarity index 100% rename from src/entities/Vehicle.cpp rename to src/vehicles/Vehicle.cpp diff --git a/src/entities/Vehicle.h b/src/vehicles/Vehicle.h similarity index 100% rename from src/entities/Vehicle.h rename to src/vehicles/Vehicle.h