diff options
| author | withmorten <morten.with@gmail.com> | 2021-01-22 11:43:29 +0100 |
|---|---|---|
| committer | withmorten <morten.with@gmail.com> | 2021-01-22 11:43:29 +0100 |
| commit | feb993e751ad8baccedc0547383913069846f8f5 (patch) | |
| tree | fbd4f659dc001beb12adef014e28d18cd71b6408 /src | |
| parent | Merge pull request #974 from withmorten/miami-wantedlevel (diff) | |
| download | re3-feb993e751ad8baccedc0547383913069846f8f5.tar re3-feb993e751ad8baccedc0547383913069846f8f5.tar.gz re3-feb993e751ad8baccedc0547383913069846f8f5.tar.bz2 re3-feb993e751ad8baccedc0547383913069846f8f5.tar.lz re3-feb993e751ad8baccedc0547383913069846f8f5.tar.xz re3-feb993e751ad8baccedc0547383913069846f8f5.tar.zst re3-feb993e751ad8baccedc0547383913069846f8f5.zip | |
Diffstat (limited to 'src')
125 files changed, 16 insertions, 604 deletions
diff --git a/src/animation/AnimBlendAssocGroup.cpp b/src/animation/AnimBlendAssocGroup.cpp index df47e9b5..ad6f54a9 100644 --- a/src/animation/AnimBlendAssocGroup.cpp +++ b/src/animation/AnimBlendAssocGroup.cpp @@ -15,8 +15,6 @@ #include "AnimBlendAssociation.h" #include "AnimBlendAssocGroup.h" -//--MIAMI: file done - CAnimBlendAssocGroup::CAnimBlendAssocGroup(void) { animBlock = nil; diff --git a/src/animation/AnimBlendAssociation.cpp b/src/animation/AnimBlendAssociation.cpp index b91b35ee..bb4e7bf4 100644 --- a/src/animation/AnimBlendAssociation.cpp +++ b/src/animation/AnimBlendAssociation.cpp @@ -7,8 +7,6 @@ #include "AnimBlendAssociation.h" #include "MemoryMgr.h" -//--MIAMI: file done - CAnimBlendAssociation::CAnimBlendAssociation(void) { groupId = -1; diff --git a/src/animation/AnimBlendClumpData.cpp b/src/animation/AnimBlendClumpData.cpp index 620c2229..b333a449 100644 --- a/src/animation/AnimBlendClumpData.cpp +++ b/src/animation/AnimBlendClumpData.cpp @@ -3,8 +3,6 @@ #include "AnimBlendClumpData.h" #include "MemoryMgr.h" -//--MIAMI: file done - CAnimBlendClumpData::CAnimBlendClumpData(void) { numFrames = 0; diff --git a/src/animation/AnimBlendHierarchy.cpp b/src/animation/AnimBlendHierarchy.cpp index cc7c7de8..bfa39ef9 100644 --- a/src/animation/AnimBlendHierarchy.cpp +++ b/src/animation/AnimBlendHierarchy.cpp @@ -4,8 +4,6 @@ #include "AnimBlendHierarchy.h" #include "AnimManager.h" -//--MIAMI: file done - CAnimBlendHierarchy::CAnimBlendHierarchy(void) { sequences = nil; diff --git a/src/animation/AnimBlendNode.cpp b/src/animation/AnimBlendNode.cpp index d2a8dd41..6352c11b 100644 --- a/src/animation/AnimBlendNode.cpp +++ b/src/animation/AnimBlendNode.cpp @@ -3,8 +3,6 @@ #include "AnimBlendAssociation.h" #include "AnimBlendNode.h" -//--MIAMI: file done - void CAnimBlendNode::Init(void) { diff --git a/src/animation/AnimBlendSequence.cpp b/src/animation/AnimBlendSequence.cpp index 93cce91d..36ac9495 100644 --- a/src/animation/AnimBlendSequence.cpp +++ b/src/animation/AnimBlendSequence.cpp @@ -3,8 +3,6 @@ #include "AnimBlendSequence.h" #include "MemoryHeap.h" -//--MIAMI: file done - CAnimBlendSequence::CAnimBlendSequence(void) { type = 0; diff --git a/src/animation/AnimManager.cpp b/src/animation/AnimManager.cpp index 607dfe26..284a567d 100644 --- a/src/animation/AnimManager.cpp +++ b/src/animation/AnimManager.cpp @@ -12,8 +12,6 @@ #include "AnimManager.h" #include "Streaming.h" -//--MIAMI: file done - CAnimBlock CAnimManager::ms_aAnimBlocks[NUMANIMBLOCKS]; CAnimBlendHierarchy CAnimManager::ms_aAnimations[NUMANIMATIONS]; int32 CAnimManager::ms_numAnimBlocks; @@ -1277,7 +1275,6 @@ CAnimManager::LoadAnimFile(const char *filename) RwStreamClose(stream, nil); } -//--MIAMI: done void CAnimManager::LoadAnimFile(RwStream *stream, bool compress, char (*uncompressedAnims)[32]) { diff --git a/src/animation/CutsceneMgr.cpp b/src/animation/CutsceneMgr.cpp index eeec2728..633618b1 100644 --- a/src/animation/CutsceneMgr.cpp +++ b/src/animation/CutsceneMgr.cpp @@ -23,8 +23,6 @@ #include "Radar.h" #include "Pools.h" -//--MIAMI: file done - const struct { const char *szTrackName; int iTrackId; diff --git a/src/animation/FrameUpdate.cpp b/src/animation/FrameUpdate.cpp index e35bd4c8..d3094bb0 100644 --- a/src/animation/FrameUpdate.cpp +++ b/src/animation/FrameUpdate.cpp @@ -6,8 +6,6 @@ #include "AnimBlendAssociation.h" #include "RpAnimBlend.h" -//--MIAMI: file done - CAnimBlendClumpData *gpAnimBlendClump; // PS2 names without "NonSkinned" diff --git a/src/animation/RpAnimBlend.cpp b/src/animation/RpAnimBlend.cpp index 9223d198..9a11d8bb 100644 --- a/src/animation/RpAnimBlend.cpp +++ b/src/animation/RpAnimBlend.cpp @@ -12,8 +12,6 @@ #include "RpAnimBlend.h" #include "PedModelInfo.h" -//--MIAMI: file done - RwInt32 ClumpOffset; enum diff --git a/src/audio/sampman_miles.cpp b/src/audio/sampman_miles.cpp index 2a4286eb..c360d64f 100644 --- a/src/audio/sampman_miles.cpp +++ b/src/audio/sampman_miles.cpp @@ -20,8 +20,6 @@ #pragma comment( lib, "mss32.lib" ) -// --MIAMI: file done - cSampleManager SampleManager; uint32 BankStartOffset[MAX_SFX_BANKS]; /////////////////////////////////////////////////////////////// diff --git a/src/collision/Collision.cpp b/src/collision/Collision.cpp index 703804d9..45a15628 100644 --- a/src/collision/Collision.cpp +++ b/src/collision/Collision.cpp @@ -24,8 +24,6 @@ #include "Camera.h" #include "ColStore.h" -//--MIAMI: file done - #ifdef VU_COLLISION #include "VuCollision.h" @@ -93,7 +91,7 @@ CCollision::Update(void) { } -//--MIAMI: unused +// unused eLevelName GetCollisionInSectorList(CPtrList &list) { @@ -110,7 +108,7 @@ GetCollisionInSectorList(CPtrList &list) return LEVEL_GENERIC; } -//--MIAMI: unused +// unused // Get a level this sector is in based on collision models eLevelName GetCollisionInSector(CSector §) @@ -880,7 +878,7 @@ CCollision::ProcessLineSphere(const CColLine &line, const CColSphere &sphere, CC return true; } -//--MIAMI: unused +// unused bool CCollision::ProcessVerticalLineTriangle(const CColLine &line, const CompressedVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane, diff --git a/src/control/AutoPilot.cpp b/src/control/AutoPilot.cpp index a899518b..c956a6f1 100644 --- a/src/control/AutoPilot.cpp +++ b/src/control/AutoPilot.cpp @@ -6,8 +6,6 @@ #include "Curves.h" #include "PathFind.h" -//--MIAMI: file done - void CAutoPilot::ModifySpeed(float speed) { m_fMaxTrafficSpeed = Max(0.01f, speed); diff --git a/src/control/Bridge.cpp b/src/control/Bridge.cpp index 1a1c03bd..1e63cf30 100644 --- a/src/control/Bridge.cpp +++ b/src/control/Bridge.cpp @@ -6,8 +6,6 @@ #include "PathFind.h" #include "Stats.h" -//--MIAMI: file done - CEntity *CBridge::pLiftRoad; CEntity *CBridge::pLiftPart; CEntity *CBridge::pWeight; diff --git a/src/control/CarAI.cpp b/src/control/CarAI.cpp index 54f81519..8e79fee1 100644 --- a/src/control/CarAI.cpp +++ b/src/control/CarAI.cpp @@ -22,8 +22,6 @@ #define DISTANCE_TO_SWITCH_DISTANCE_GOTO 20.0f -//--MIAMI: file done - float CCarAI::FindSwitchDistanceClose(CVehicle* pVehicle) { return pVehicle->AutoPilot.m_nSwitchDistance; diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp index 5aefcf76..c6d78882 100644 --- a/src/control/CarCtrl.cpp +++ b/src/control/CarCtrl.cpp @@ -83,8 +83,6 @@ #define OFFSCREEN_DESPAWN_RANGE (40.0f) #define EXTENDED_RANGE_DESPAWN_MULTIPLIER (1.5f) -//--MIAMI: file done - bool CCarCtrl::bMadDriversCheat; int CCarCtrl::NumLawEnforcerCars; int CCarCtrl::NumAmbulancesOnDuty; @@ -111,8 +109,6 @@ int32 CCarCtrl::LoadedCarsArray[TOTAL_CUSTOM_CLASSES][MAX_CAR_MODELS_IN_ARRAY]; CVehicle* apCarsToKeep[MAX_CARS_TO_KEEP]; uint32 aCarsToKeepTime[MAX_CARS_TO_KEEP]; -//--MIAMI: done except heli/plane functions - void CCarCtrl::GenerateRandomCars() { diff --git a/src/control/Curves.cpp b/src/control/Curves.cpp index 29471608..31a2767a 100644 --- a/src/control/Curves.cpp +++ b/src/control/Curves.cpp @@ -2,8 +2,6 @@ #include "Curves.h" -//--MIAMI: file done - float CCurves::CalcSpeedScaleFactor(CVector* pPoint1, CVector* pPoint2, float dir1X, float dir1Y, float dir2X, float dir2Y) { CVector2D dir1(dir1X, dir1Y); diff --git a/src/control/Darkel.cpp b/src/control/Darkel.cpp index f1400de8..a6aca57e 100644 --- a/src/control/Darkel.cpp +++ b/src/control/Darkel.cpp @@ -16,8 +16,6 @@ #include "Vehicle.h" #include "GameLogic.h" -//--MIAMI: file done - #define FRENZY_ANY_PED -1 #define FRENZY_ANY_CAR -2 diff --git a/src/control/GameLogic.cpp b/src/control/GameLogic.cpp index d971b67f..33c40c91 100644 --- a/src/control/GameLogic.cpp +++ b/src/control/GameLogic.cpp @@ -46,8 +46,6 @@ CVector CGameLogic::ShortCutDropOffForMission; float CGameLogic::ShortCutDropOffOrientationForMission; bool CGameLogic::MissionDropOffReadyToBeUsed; -//--MIAMI: file done - #define SHORTCUT_TAXI_COST (9) #define TOTAL_BUSTED_AUDIO (28) diff --git a/src/control/Garages.cpp b/src/control/Garages.cpp index 0794a31c..39fa5c94 100644 --- a/src/control/Garages.cpp +++ b/src/control/Garages.cpp @@ -25,8 +25,6 @@ #include "World.h" #include "VarConsole.h" -//--MIAMI: file done - #define CRUSHER_GARAGE_X1 (1135.5f) #define CRUSHER_GARAGE_Y1 (57.0f) #define CRUSHER_GARAGE_Z1 (-1.0f) diff --git a/src/control/OnscreenTimer.cpp b/src/control/OnscreenTimer.cpp index 52d00f43..08e6fa3f 100644 --- a/src/control/OnscreenTimer.cpp +++ b/src/control/OnscreenTimer.cpp @@ -9,8 +9,6 @@ #include "OnscreenTimer.h" #include "Camera.h" -// --MIAMI: file done - void COnscreenTimer::Init() { m_bDisabled = false; for(uint32 i = 0; i < NUMONSCREENCOUNTERS; i++) { diff --git a/src/control/PathFind.cpp b/src/control/PathFind.cpp index 0f135029..cbc29db4 100644 --- a/src/control/PathFind.cpp +++ b/src/control/PathFind.cpp @@ -8,8 +8,6 @@ #include "Lines.h" // for debug #include "PathFind.h" -//--MIAMI: file done except mobile unused function - bool gbShowPedPaths; bool gbShowCarPaths; bool gbShowCarPathsLinks; diff --git a/src/control/Phones.cpp b/src/control/Phones.cpp index d25f146f..411dc8c3 100644 --- a/src/control/Phones.cpp +++ b/src/control/Phones.cpp @@ -17,8 +17,6 @@ #include "Replay.h" #endif -// --MIAMI: file done - CPhoneInfo gPhoneInfo; bool CPhoneInfo::bDisplayingPhoneMessage; // is phone picked up diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp index 8c9d1031..67e658c6 100644 --- a/src/control/Pickups.cpp +++ b/src/control/Pickups.cpp @@ -34,8 +34,6 @@ #include "Messages.h" #include "Streaming.h" -// --MIAMI: file done - CPickup CPickups::aPickUps[NUMPICKUPS]; int16 CPickups::NumMessages; int32 CPickups::aPickUpsCollected[NUMCOLLECTEDPICKUPS]; @@ -1578,7 +1576,6 @@ CPacManPickups::ResetPowerPillsCarriedByPlayer() { } -// --MIAMI: Done void CPed::CreateDeadPedMoney(void) { @@ -1599,7 +1596,6 @@ CPed::CreateDeadPedMoney(void) m_nPedMoney = 0; } -// --MIAMI: Done void CPed::CreateDeadPedWeaponPickups(void) { @@ -1625,7 +1621,6 @@ CPed::CreateDeadPedWeaponPickups(void) ClearWeapons(); } -// --MIAMI: Done void CPed::CreateDeadPedPickupCoors(float *x, float *y, float *z) { diff --git a/src/control/Record.cpp b/src/control/Record.cpp index 9b4a21fc..5e6c7cdb 100644 --- a/src/control/Record.cpp +++ b/src/control/Record.cpp @@ -10,8 +10,6 @@ #include "VehicleModelInfo.h" #include "World.h" -//--MIAMI: file done - uint16 CRecordDataForGame::RecordingState; void CRecordDataForGame::Init(void) diff --git a/src/control/Remote.cpp b/src/control/Remote.cpp index 164a2f4c..047b19f3 100644 --- a/src/control/Remote.cpp +++ b/src/control/Remote.cpp @@ -9,8 +9,6 @@ #include "PlayerInfo.h" #include "Vehicle.h" -//--MIAMI: file done - void CRemote::GivePlayerRemoteControlledCar(float x, float y, float z, float rot, uint16 model) { diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp index a99979e9..dbb2612d 100644 --- a/src/control/Replay.cpp +++ b/src/control/Replay.cpp @@ -53,8 +53,6 @@ #include "Fluff.h" #include "WaterCreatures.h" -//--MIAMI: file done - uint8 CReplay::Mode; CAddressInReplayBuffer CReplay::Record; CAddressInReplayBuffer CReplay::Playback; diff --git a/src/control/Restart.cpp b/src/control/Restart.cpp index f63d2c07..e1950a29 100644 --- a/src/control/Restart.cpp +++ b/src/control/Restart.cpp @@ -4,8 +4,6 @@ #include "Zones.h" #include "PathFind.h" -//--MIAMI: file done - uint8 CRestart::OverrideHospitalLevel; uint8 CRestart::OverridePoliceStationLevel; bool CRestart::bFadeInAfterNextArrest; diff --git a/src/control/RoadBlocks.cpp b/src/control/RoadBlocks.cpp index bcb7e059..f75b4f50 100644 --- a/src/control/RoadBlocks.cpp +++ b/src/control/RoadBlocks.cpp @@ -16,8 +16,6 @@ #include "General.h" #include "Object.h" -//--MIAMI: file done - #define ROADBLOCKDIST (90.0f) #define ROADBLOCK_OBJECT_WIDTH (4.0f) diff --git a/src/control/SceneEdit.cpp b/src/control/SceneEdit.cpp index c793e027..74d81327 100644 --- a/src/control/SceneEdit.cpp +++ b/src/control/SceneEdit.cpp @@ -20,8 +20,6 @@ #include "WeaponInfo.h" #include "World.h" -//--MIAMI: file done - bool CSceneEdit::m_bEditOn; int32 CSceneEdit::m_bCameraFollowActor; bool CSceneEdit::m_bRecording; diff --git a/src/control/Script.cpp b/src/control/Script.cpp index bd056805..642ad65b 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -53,8 +53,6 @@ #include <stdarg.h> #endif -//--MIAMI: file done - uint8 CTheScripts::ScriptSpace[SIZE_SCRIPT_SPACE]; CRunningScript CTheScripts::ScriptsArray[MAX_NUM_SCRIPTS]; intro_text_line CTheScripts::IntroTextLines[MAX_NUM_INTRO_TEXT_LINES]; diff --git a/src/control/SetPieces.cpp b/src/control/SetPieces.cpp index e2fa2ef6..143115b8 100644 --- a/src/control/SetPieces.cpp +++ b/src/control/SetPieces.cpp @@ -14,8 +14,6 @@ #define TIME_BETWEEN_SETPIECE_SPAWNS 20000 -//--MIAMI: file done - bool CSetPieces::bDebug; uint32 CSetPieces::NumSetPieces; CSetPiece CSetPieces::aSetPieces[NUM_SETPIECES]; diff --git a/src/control/TrafficLights.cpp b/src/control/TrafficLights.cpp index ecfc7207..df0761ab 100644 --- a/src/control/TrafficLights.cpp +++ b/src/control/TrafficLights.cpp @@ -15,8 +15,6 @@ #include "Weather.h" #include "World.h" -//--MIAMI: file done - bool CTrafficLights::bGreenLightsCheat; void diff --git a/src/core/Accident.cpp b/src/core/Accident.cpp index cb46e181..c8611323 100644 --- a/src/core/Accident.cpp +++ b/src/core/Accident.cpp @@ -6,8 +6,6 @@ #include "Pools.h" #include "World.h" -// --MIAMI: File done - CAccidentManager gAccidentManager; CAccident* diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp index eedc16bb..26232100 100644 --- a/src/core/Cam.cpp +++ b/src/core/Cam.cpp @@ -30,8 +30,6 @@ #include "Bike.h" #include "Pickups.h" -//--MIAMI: file done - bool PrintDebugCode = false; int16 DebugCamMode; diff --git a/src/core/Clock.cpp b/src/core/Clock.cpp index b391e508..a3298343 100644 --- a/src/core/Clock.cpp +++ b/src/core/Clock.cpp @@ -6,8 +6,6 @@ #include "Stats.h" #include "VarConsole.h" -// --MIAMI: File done - _TODO("gbFastTime"); bool gbFastTime; diff --git a/src/core/ControllerConfig.cpp b/src/core/ControllerConfig.cpp index b2dad358..eea1f6f0 100644 --- a/src/core/ControllerConfig.cpp +++ b/src/core/ControllerConfig.cpp @@ -21,8 +21,6 @@ #include "Camera.h" #include "GenericGameStorage.h" -// --MIAMI: file done - CControllerConfigManager ControlsManager; CControllerConfigManager::CControllerConfigManager() diff --git a/src/core/EventList.cpp b/src/core/EventList.cpp index 160adab2..b7f139b4 100644 --- a/src/core/EventList.cpp +++ b/src/core/EventList.cpp @@ -10,8 +10,6 @@ #include "main.h" #include "Accident.h" -// --MIAMI: file done - int32 CEventList::ms_nFirstFreeSlotIndex; CEvent gaEvent[NUMEVENTS]; diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp index b8201400..4d1cd921 100644 --- a/src/core/FileLoader.cpp +++ b/src/core/FileLoader.cpp @@ -30,8 +30,6 @@ #include "ColStore.h" #include "Occlusion.h" -//--MIAMI: file done - char CFileLoader::ms_line[256]; const char* @@ -1309,7 +1307,7 @@ CFileLoader::LoadOcclusionVolume(const char *line) } -//--MIAMI: unused +// unused void CFileLoader::ReloadPaths(const char *filename) { diff --git a/src/core/Fire.cpp b/src/core/Fire.cpp index c4c39b1f..8a6db0da 100644 --- a/src/core/Fire.cpp +++ b/src/core/Fire.cpp @@ -18,8 +18,6 @@ #include "GameLogic.h" #include "CarAI.h" -// --MIAMI: file done - CFireManager gFireManager; CFire::CFire() diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp index 98344b6d..f8945d98 100644 --- a/src/core/Frontend.cpp +++ b/src/core/Frontend.cpp @@ -40,8 +40,6 @@ #include "User.h" #include "sampman.h" -// --MIAMI: file done - // Similar story to Hud.cpp: // Game has colors inlined in code. // For easier modification we collect them here: diff --git a/src/core/Game.cpp b/src/core/Game.cpp index ece19446..c407bbe8 100644 --- a/src/core/Game.cpp +++ b/src/core/Game.cpp @@ -125,8 +125,6 @@ int gameTxdSlot; uint8 gameProcessPirateCheck = 0; #endif -// --MIAMI: File done - bool DoRWStuffStartOfFrame(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomRed, int16 BottomGreen, int16 BottomBlue, int16 Alpha); void DoRWStuffEndOfFrame(void); #ifdef PS2_MENU diff --git a/src/core/General.h b/src/core/General.h index 69492fb8..1ea7f2bd 100644 --- a/src/core/General.h +++ b/src/core/General.h @@ -2,8 +2,6 @@ #include <ctype.h> -// --MIAMI: file done - class CGeneral { public: diff --git a/src/core/IniFile.cpp b/src/core/IniFile.cpp index f7e2bfdd..b9033530 100644 --- a/src/core/IniFile.cpp +++ b/src/core/IniFile.cpp @@ -7,8 +7,6 @@ #include "main.h" #include "Population.h" -// --MIAMI: file done - float CIniFile::PedNumberMultiplier = 0.6f; float CIniFile::CarNumberMultiplier = 0.6f; diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp index 402c6c74..60ff3555 100644 --- a/src/core/Pad.cpp +++ b/src/core/Pad.cpp @@ -54,8 +54,6 @@ #include "libpad.h" #endif -// --MIAMI: file done except Mobile(see TODOs) and PS2 stuff - CPad Pads[MAX_PADS]; #ifdef GTA_PS2 u_long128 pad_dma_buf[scePadDmaBufferMax] __attribute__((aligned(64))); diff --git a/src/core/PlayerInfo.cpp b/src/core/PlayerInfo.cpp index 32b2f853..a64d4cca 100644 --- a/src/core/PlayerInfo.cpp +++ b/src/core/PlayerInfo.cpp @@ -35,8 +35,6 @@ #include "Automobile.h" #include "GameLogic.h" -// --MIAMI: File done - CVector lastPlayerPos; void diff --git a/src/core/Pools.cpp b/src/core/Pools.cpp index bd246b71..bf35f8ef 100644 --- a/src/core/Pools.cpp +++ b/src/core/Pools.cpp @@ -15,8 +15,6 @@ #include "World.h" #include "MemoryHeap.h" -//--MIAMI: file done - CCPtrNodePool *CPools::ms_pPtrNodePool; CEntryInfoNodePool *CPools::ms_pEntryInfoNodePool; CPedPool *CPools::ms_pPedPool; diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp index 5ead82f2..36fb156d 100644 --- a/src/core/Radar.cpp +++ b/src/core/Radar.cpp @@ -17,8 +17,6 @@ #include "SpecialFX.h" #include "Font.h" -// --MIAMI: file done - float CRadar::m_radarRange; sRadarTrace CRadar::ms_RadarTrace[NUMRADARBLIPS]; CVector2D vec2DRadarOrigin; diff --git a/src/core/Stats.cpp b/src/core/Stats.cpp index 8d61c484..7ada0da9 100644 --- a/src/core/Stats.cpp +++ b/src/core/Stats.cpp @@ -115,8 +115,6 @@ float CStats::LongestWheelieDist; float CStats::LongestStoppieDist; float CStats::Longest2WheelDist; -// --MIAMI: functions below are done, but there are some to be moved from Frontend - void CStats::Init() { PeopleKilledByOthers = 0; diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp index ec0e8e93..6f0e3153 100644 --- a/src/core/Streaming.cpp +++ b/src/core/Streaming.cpp @@ -38,8 +38,6 @@ #include "Frontend.h" #include "VarConsole.h" -//--MIAMI: file done (possibly bugs) - bool CStreaming::ms_disableStreaming; bool CStreaming::ms_bLoadingBigModel; int32 CStreaming::ms_numModelsRequested; diff --git a/src/core/SurfaceTable.cpp b/src/core/SurfaceTable.cpp index 8018076d..c4b184bf 100644 --- a/src/core/SurfaceTable.cpp +++ b/src/core/SurfaceTable.cpp @@ -6,8 +6,6 @@ #include "Collision.h" #include "SurfaceTable.h" -//--MIAMI: file done - float CSurfaceTable::ms_aAdhesiveLimitTable[NUMADHESIVEGROUPS][NUMADHESIVEGROUPS]; void diff --git a/src/core/Timer.cpp b/src/core/Timer.cpp index bdef6187..5ebe3f53 100644 --- a/src/core/Timer.cpp +++ b/src/core/Timer.cpp @@ -7,8 +7,6 @@ #include "Timer.h" #include "SpecialFX.h" -// --MIAMI: file done - uint32 CTimer::m_snTimeInMilliseconds; PauseModeTime CTimer::m_snTimeInMillisecondsPauseMode = 1; diff --git a/src/core/User.cpp b/src/core/User.cpp index 8d584b74..53196d03 100644 --- a/src/core/User.cpp +++ b/src/core/User.cpp @@ -10,8 +10,6 @@ #include "World.h" #include "Zones.h" -// --MIAMI: file done - CPlaceName CUserDisplay::PlaceName; COnscreenTimer CUserDisplay::OnscnTimer; CPager CUserDisplay::Pager; diff --git a/src/core/Wanted.cpp b/src/core/Wanted.cpp index f5ea6e53..65bc84d8 100644 --- a/src/core/Wanted.cpp +++ b/src/core/Wanted.cpp @@ -15,8 +15,6 @@ int32 CWanted::MaximumWantedLevel = 6; int32 CWanted::nMaximumWantedLevel = 9600; -// --MIAMI: File done except stats - void CWanted::Initialise() { diff --git a/src/core/World.cpp b/src/core/World.cpp index 1af0c4a4..f7d2a28b 100644 --- a/src/core/World.cpp +++ b/src/core/World.cpp @@ -29,8 +29,6 @@ #include "WaterLevel.h" #include "World.h" -// --MIAMI: file done - #define OBJECT_REPOSITION_OFFSET_Z 2.0f CColPoint gaTempSphereColPoints[MAX_COLLISION_POINTS]; diff --git a/src/core/ZoneCull.cpp b/src/core/ZoneCull.cpp index 69c7a796..db3577ad 100644 --- a/src/core/ZoneCull.cpp +++ b/src/core/ZoneCull.cpp @@ -11,8 +11,6 @@ #include "ZoneCull.h" #include "Zones.h" -//--MIAMI: done - int32 CCullZones::NumAttributeZones; CAttributeZone CCullZones::aAttributeZones[NUMATTRIBZONES]; diff --git a/src/core/Zones.cpp b/src/core/Zones.cpp index 55b43c10..85564f03 100644 --- a/src/core/Zones.cpp +++ b/src/core/Zones.cpp @@ -9,8 +9,6 @@ #include "World.h" #include "Timer.h" -//--MIAMI: file done - eLevelName CTheZones::m_CurrLevel; int16 CTheZones::FindIndex; @@ -544,7 +542,7 @@ CTheZones::SetZonePedInfo(uint16 zoneid, uint8 day, int16 pedDensity, info->gangPedThreshold[8] += info->gangPedThreshold[7]; } -//--MIAMI: unused +// unused void CTheZones::SetCarDensity(uint16 zoneid, uint8 day, uint16 cardensity) { @@ -553,7 +551,7 @@ CTheZones::SetCarDensity(uint16 zoneid, uint8 day, uint16 cardensity) ZoneInfoArray[day ? zone->zoneinfoDay : zone->zoneinfoNight].carDensity = cardensity; } -//--MIAMI: unused +// unused void CTheZones::SetPedDensity(uint16 zoneid, uint8 day, uint16 peddensity) { diff --git a/src/core/main.cpp b/src/core/main.cpp index a22ba4eb..1798a60f 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -513,7 +513,6 @@ Terminate3D(void) CSprite2d splash; int splashTxdId = -1; -//--MIAMI: done CSprite2d* LoadSplash(const char *name) { @@ -559,7 +558,6 @@ DestroySplashScreen(void) splashTxdId = -1; } -//--MIAMI: done Const char* GetRandomSplashScreen(void) { @@ -602,7 +600,6 @@ ResetLoadingScreenBar() NumberOfChunksLoaded = 0.0f; } -//--MIAMI: done void LoadingScreen(const char *str1, const char *str2, const char *splashscreen) { @@ -689,7 +686,6 @@ LoadingScreen(const char *str1, const char *str2, const char *splashscreen) } } -//--MIAMI: done void LoadingIslandScreen(const char *levelName) { diff --git a/src/entities/Dummy.cpp b/src/entities/Dummy.cpp index 580245a8..9878b595 100644 --- a/src/entities/Dummy.cpp +++ b/src/entities/Dummy.cpp @@ -4,8 +4,6 @@ #include "World.h" #include "Dummy.h" -// --MIAMI: file done - void *CDummy::operator new(size_t sz) { return CPools::GetDummyPool()->New(); } void CDummy::operator delete(void *p, size_t sz) { CPools::GetDummyPool()->Delete((CDummy*)p); } diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp index 9a849218..6204b748 100644 --- a/src/entities/Entity.cpp +++ b/src/entities/Entity.cpp @@ -26,8 +26,6 @@ #include "Dummy.h" #include "WindModifiers.h" -//--MIAMI: file done - int gBuildings; CEntity::CEntity(void) @@ -687,7 +685,7 @@ float BannerWindTabel[] = { 0.28f, 0.28f, 0.22f, 0.1f, 0.0f, -0.1f, -0.17f, -0.12f }; -//--MIAMI: unused +// unused void CEntity::ModifyMatrixForBannerInWind(void) { diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp index f2045b1e..73a6570a 100644 --- a/src/entities/Physical.cpp +++ b/src/entities/Physical.cpp @@ -21,8 +21,6 @@ #include "Pickups.h" #include "Physical.h" -//--MIAMI: file done - #ifdef WALLCLIMB_CHEAT bool gGravityCheat; #endif diff --git a/src/modelinfo/BaseModelInfo.cpp b/src/modelinfo/BaseModelInfo.cpp index f05be242..966ffb38 100644 --- a/src/modelinfo/BaseModelInfo.cpp +++ b/src/modelinfo/BaseModelInfo.cpp @@ -6,8 +6,6 @@ #include "BaseModelInfo.h" #include "ModelInfo.h" -//--MIAMI: file done - CBaseModelInfo::CBaseModelInfo(ModelInfoType type) { m_colModel = nil; diff --git a/src/modelinfo/ClumpModelInfo.cpp b/src/modelinfo/ClumpModelInfo.cpp index 3fa9a36f..ba18bfa7 100644 --- a/src/modelinfo/ClumpModelInfo.cpp +++ b/src/modelinfo/ClumpModelInfo.cpp @@ -7,8 +7,6 @@ #include "ModelInfo.h" #include "AnimManager.h" -//--MIAMI: file done - void CClumpModelInfo::DeleteRwObject(void) { @@ -150,7 +148,7 @@ CClumpModelInfo::FindFrameFromIdCB(RwFrame *frame, void *data) return assoc->frame ? nil : frame; } -//--MIAMI: unused +// unused RwFrame* CClumpModelInfo::FindFrameFromNameCB(RwFrame *frame, void *data) { diff --git a/src/modelinfo/ModelInfo.cpp b/src/modelinfo/ModelInfo.cpp index 0a542cf6..41515e20 100644 --- a/src/modelinfo/ModelInfo.cpp +++ b/src/modelinfo/ModelInfo.cpp @@ -5,8 +5,6 @@ #include "ModelIndices.h" #include "ModelInfo.h" -// --MIAMI: file done - CBaseModelInfo *CModelInfo::ms_modelInfoPtrs[MODELINFOSIZE]; CStore<CSimpleModelInfo, SIMPLEMODELSIZE> CModelInfo::ms_simpleModelStore; diff --git a/src/modelinfo/PedModelInfo.cpp b/src/modelinfo/PedModelInfo.cpp index e84b9272..28de2507 100644 --- a/src/modelinfo/PedModelInfo.cpp +++ b/src/modelinfo/PedModelInfo.cpp @@ -10,8 +10,6 @@ #include "ModelInfo.h" #include "custompipes.h" -//--MIAMI: file done - void CPedModelInfo::DeleteRwObject(void) { diff --git a/src/modelinfo/SimpleModelInfo.cpp b/src/modelinfo/SimpleModelInfo.cpp index 757a3721..8da3a86a 100644 --- a/src/modelinfo/SimpleModelInfo.cpp +++ b/src/modelinfo/SimpleModelInfo.cpp @@ -6,8 +6,6 @@ #include "AnimManager.h" #include "custompipes.h" -//--MIAMI: file done - #define LOD_DISTANCE (300.0f) void diff --git a/src/modelinfo/VehicleModelInfo.cpp b/src/modelinfo/VehicleModelInfo.cpp index 6dc9e5b0..dfd6519b 100644 --- a/src/modelinfo/VehicleModelInfo.cpp +++ b/src/modelinfo/VehicleModelInfo.cpp @@ -21,8 +21,6 @@ #include "ModelInfo.h" #include "custompipes.h" -//--MIAMI: done - int8 CVehicleModelInfo::ms_compsToUse[2] = { -2, -2 }; int8 CVehicleModelInfo::ms_compsUsed[2]; RwRGBA CVehicleModelInfo::ms_vehicleColourTable[256]; @@ -924,7 +922,7 @@ CVehicleModelInfo::AvoidSameVehicleColour(uint8 *col1, uint8 *col2) } } -//--MIAMI: unused +// unused RwTexture* CreateCarColourTexture(uint8 r, uint8 g, uint8 b) { diff --git a/src/modelinfo/WeaponModelInfo.cpp b/src/modelinfo/WeaponModelInfo.cpp index bd8f5cb8..d9294c3f 100644 --- a/src/modelinfo/WeaponModelInfo.cpp +++ b/src/modelinfo/WeaponModelInfo.cpp @@ -4,8 +4,6 @@ #include "AnimManager.h" #include "VisibilityPlugins.h" -//--MIAMI: file done - void CWeaponModelInfo::SetAnimFile(const char *file) { diff --git a/src/objects/DummyObject.cpp b/src/objects/DummyObject.cpp index 8656abbb..8dd1643d 100644 --- a/src/objects/DummyObject.cpp +++ b/src/objects/DummyObject.cpp @@ -3,8 +3,6 @@ #include "DummyObject.h" #include "Pools.h" -// --MIAMI: file done - CDummyObject::CDummyObject(CObject *obj) { SetModelIndexNoCreate(obj->GetModelIndex()); diff --git a/src/objects/ObjectData.cpp b/src/objects/ObjectData.cpp index 04ac0b9c..8b23f0ae 100644 --- a/src/objects/ObjectData.cpp +++ b/src/objects/ObjectData.cpp @@ -6,8 +6,6 @@ #include "FileMgr.h" #include "ObjectData.h" -//--MIAMI: file done - CObjectInfo CObjectData::ms_aObjectInfo[NUMOBJECTINFO]; // Another ugly file reader diff --git a/src/objects/Projectile.cpp b/src/objects/Projectile.cpp index fc4b25cf..fe8b0c68 100644 --- a/src/objects/Projectile.cpp +++ b/src/objects/Projectile.cpp @@ -2,8 +2,6 @@ #include "Projectile.h" -// --MIAMI: file done - CProjectile::CProjectile(int32 model) : CObject() { m_fMass = 1.0f; diff --git a/src/peds/CivilianPed.cpp b/src/peds/CivilianPed.cpp index 079024f6..f3511366 100644 --- a/src/peds/CivilianPed.cpp +++ b/src/peds/CivilianPed.cpp @@ -18,8 +18,6 @@ #include <float.h> #endif -// --MIAMI: file done - CCivilianPed::CCivilianPed(ePedType pedtype, uint32 mi) : CPed(pedtype) { SetModelIndex(mi); @@ -420,7 +418,6 @@ CCivilianPed::ProcessControl(void) Avoid(); } -// --MIAMI: Done bool CPed::RunToReportCrime(eCrimeType crimeToReport) { diff --git a/src/peds/CopPed.cpp b/src/peds/CopPed.cpp index 3b777394..9d22c98c 100644 --- a/src/peds/CopPed.cpp +++ b/src/peds/CopPed.cpp @@ -20,8 +20,6 @@ #include "Ropes.h" #include "Stinger.h" -// --MIAMI: file done except TODOs - CCopPed::CCopPed(eCopType copType, int32 modifier) : CPed(PEDTYPE_COP) { m_nCopType = copType; diff --git a/src/peds/EmergencyPed.cpp b/src/peds/EmergencyPed.cpp index 2eabfe04..62b70d7d 100644 --- a/src/peds/EmergencyPed.cpp +++ b/src/peds/EmergencyPed.cpp @@ -9,8 +9,6 @@ #include "CarCtrl.h" #include "Accident.h" -// --MIAMI: file done - CEmergencyPed::CEmergencyPed(uint32 type) : CPed(type) { switch (type){ diff --git a/src/peds/Gangs.cpp b/src/peds/Gangs.cpp index 38e37430..2d6d1137 100644 --- a/src/peds/Gangs.cpp +++ b/src/peds/Gangs.cpp @@ -6,8 +6,6 @@ #include "Streaming.h" #include "Weapon.h" -// --MIAMI: file done - CGangInfo CGangs::Gang[NUM_GANGS]; bool CGangs::GangAttackWithCops[NUM_GANGS]; diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index 53fca844..22b03cce 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -39,8 +39,6 @@ #include "CutsceneShadow.h" #include "Clock.h" -// --MIAMI: file done - CPed *gapTempPedList[50]; uint16 gnNumTempPedList; @@ -61,7 +59,6 @@ void CPed::operator delete(void *p, int handle) { CPools::GetPedPool()->Delete(( float gfTommyFatness = 1.0f; -// --MIAMI: Done CPed::CPed(uint32 pedType) : m_pedIK(this) { #ifdef USE_CUTSCENE_SHADOW_FOR_PED @@ -370,7 +367,6 @@ CPed::CPed(uint32 pedType) : m_pedIK(this) m_lastComment = UINT32_MAX; } -// --MIAMI: Done CPed::~CPed(void) { #ifdef USE_CUTSCENE_SHADOW_FOR_PED @@ -407,7 +403,6 @@ CPed::~CPed(void) DMAudio.DestroyEntity(m_audioEntityId); } -// --MIAMI: Done void CPed::Initialise(void) { @@ -418,7 +413,6 @@ CPed::Initialise(void) debug("CPed ready\n"); } -// --MIAMI: Done void CPed::SetModelIndex(uint32 mi) { @@ -450,21 +444,18 @@ CPed::SetModelIndex(uint32 mi) #endif } -// --MIAMI: Done void CPed::SetPedStats(ePedStats pedStat) { m_pedStats = CPedStats::ms_apPedStats[pedStat]; } -// --MIAMI: Done void CPed::DeleteRwObject() { CEntity::DeleteRwObject(); } -// --MIAMI: Done void CPed::BuildPedLists(void) { @@ -540,7 +531,6 @@ CPed::BuildPedLists(void) } } -// --MIAMI: Done bool CPed::OurPedCanSeeThisOne(CEntity *target, bool shootablesDoBlock) { @@ -562,7 +552,6 @@ CPed::OurPedCanSeeThisOne(CEntity *target, bool shootablesDoBlock) colpoint, ent, true, false, false, shootablesDoBlock, false, false, false, shootablesDoBlock); } -// --MIAMI: Done // Some kind of binary sort void CPed::SortPeds(CPed **list, int min, int max) @@ -600,14 +589,12 @@ CPed::SortPeds(CPed **list, int min, int max) SortPeds(list, right, max); } -// --MIAMI: Done void CPed::SetMoveState(eMoveState state) { m_nMoveState = state; } -// --MIAMI: Done void CPed::SetMoveAnim(void) { @@ -721,7 +708,6 @@ CPed::SetMoveAnim(void) } } -// --MIAMI: Done void CPed::StopNonPartialAnims(void) { @@ -733,7 +719,6 @@ CPed::StopNonPartialAnims(void) } } -// --MIAMI: Done void CPed::RestartNonPartialAnims(void) { @@ -745,7 +730,6 @@ CPed::RestartNonPartialAnims(void) } } -// --MIAMI: Done void CPed::SetStoredState(void) { @@ -764,7 +748,6 @@ CPed::SetStoredState(void) } } -// --MIAMI: Done void CPed::RestorePreviousState(void) { @@ -815,7 +798,6 @@ CPed::RestorePreviousState(void) } } -// --MIAMI: Done uint32 CPed::ScanForThreats(void) { @@ -976,7 +958,6 @@ CPed::ScanForThreats(void) } } -// --MIAMI: Done void CPed::ScanForDelayedResponseThreats(void) { @@ -996,7 +977,6 @@ CPed::ScanForDelayedResponseThreats(void) m_threatCheckTimer = 0; } -// --MIAMI: Done void CPed::CheckThreatValidity(void) { @@ -1012,7 +992,6 @@ CPed::CheckThreatValidity(void) m_threatFlags = 0; } -// --MIAMI: Done bool CPed::CanUseTorsoWhenLooking(void) { @@ -1023,7 +1002,6 @@ CPed::CanUseTorsoWhenLooking(void) return false; } -// --MIAMI: Done void CPed::SetLookFlag(float direction, bool keepTryingToLook, bool cancelPrevious) { @@ -1040,7 +1018,6 @@ CPed::SetLookFlag(float direction, bool keepTryingToLook, bool cancelPrevious) } } -// --MIAMI: Done void CPed::SetLookFlag(CEntity *target, bool keepTryingToLook, bool cancelPrevious) { @@ -1058,7 +1035,6 @@ CPed::SetLookFlag(CEntity *target, bool keepTryingToLook, bool cancelPrevious) } } -// --MIAMI: Done void CPed::ClearLookFlag(void) { if (bIsLooking) { @@ -1080,7 +1056,6 @@ CPed::ClearLookFlag(void) { } } -// --MIAMI: Done void CPed::MoveHeadToLook(void) { @@ -1159,7 +1134,6 @@ CPed::MoveHeadToLook(void) } } -// --MIAMI: Done void CPed::RestoreHeadPosition(void) { @@ -1173,7 +1147,6 @@ CPed::RestoreHeadPosition(void) } } -// --MIAMI: Done void CPed::SetAimFlag(float angle) { @@ -1193,7 +1166,6 @@ CPed::SetAimFlag(float angle) m_pedIK.m_flags &= ~CPedIK::AIMS_WITH_ARM; } -// --MIAMI: Done void CPed::SetAimFlag(CEntity *to) { @@ -1210,7 +1182,6 @@ CPed::SetAimFlag(CEntity *to) m_lookTimer = 0; } -// --MIAMI: Done void CPed::ClearAimFlag(void) { @@ -1225,7 +1196,6 @@ CPed::ClearAimFlag(void) ((CPlayerPed*)this)->m_fFPSMoveHeading = 0.0f; } -// --MIAMI: Done void CPed::AimGun(void) { @@ -1258,7 +1228,6 @@ CPed::AimGun(void) } } -// --MIAMI: Done void CPed::RestoreGunPosition(void) { @@ -1273,14 +1242,12 @@ CPed::RestoreGunPosition(void) } } -// --MIAMI: Done bool CPed::CanWeRunAndFireWithWeapon(void) { return CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType)->IsFlagSet(WEAPONFLAG_CANAIM_WITHARM); } -// --MIAMI: Done void CPed::ScanForInterestingStuff(void) { @@ -1374,7 +1341,6 @@ CPed::ScanForInterestingStuff(void) } } -// --MIAMI: Done bool CPed::WillChat(CPed *stranger) { @@ -1400,7 +1366,6 @@ CPed::WillChat(CPed *stranger) return true; } -// --MIAMI: Done void CPed::CalculateNewVelocity(void) { @@ -1492,7 +1457,6 @@ CPed::CalculateNewVelocity(void) } } -// --MIAMI: Done float CPed::WorkOutHeadingForMovingFirstPerson(float offset) { @@ -1516,7 +1480,6 @@ CPed::WorkOutHeadingForMovingFirstPerson(float offset) return CGeneral::LimitRadianAngle(offset + angle); } -// --MIAMI: Done void CPed::UpdatePosition(void) { @@ -1584,7 +1547,6 @@ CPed::UpdatePosition(void) m_vecMoveSpeed.y += velocityChange.y; } -// --MIAMI: Done void CPed::CalculateNewOrientation(void) { @@ -1594,7 +1556,6 @@ CPed::CalculateNewOrientation(void) SetHeading(m_fRotationCur); } -// --MIAMI: Done void CPed::ClearAll(void) { @@ -1618,7 +1579,6 @@ CPed::ClearAll(void) m_pCollidingEntity = nil; } -// --MIAMI: Done void CPed::ProcessBuoyancy(void) { @@ -1737,7 +1697,6 @@ CPed::ProcessBuoyancy(void) bTouchingWater = false; } -// --MIAMI: Done? void CPed::ProcessControl(void) { @@ -2878,7 +2837,6 @@ CPed::ProcessControl(void) ServiceTalking(); } -// --MIAMI: Done int32 CPed::ProcessEntityCollision(CEntity *collidingEnt, CColPoint *collidingPoints) { @@ -3084,7 +3042,6 @@ CPed::ProcessEntityCollision(CEntity *collidingEnt, CColPoint *collidingPoints) return ourCollidedSpheres; } -// --MIAMI: Done static void particleProduceFootSplash(CPed *ped, CVector const &pos, float size, int times) { @@ -3098,7 +3055,6 @@ particleProduceFootSplash(CPed *ped, CVector const &pos, float size, int times) } } -// --MIAMI: Done static void particleProduceFootDust(CPed *ped, CVector const &pos, float size, int times) { @@ -3125,7 +3081,6 @@ particleProduceFootDust(CPed *ped, CVector const &pos, float size, int times) } } -// --MIAMI: Done void CPed::PlayFootSteps(void) { @@ -3384,7 +3339,6 @@ CPed::PlayFootSteps(void) } } -// --MIAMI: Done // Actually GetLocalDirectionTo(Turn/Look) int CPed::GetLocalDirection(const CVector2D &posOffset) @@ -3400,14 +3354,12 @@ CPed::GetLocalDirection(const CVector2D &posOffset) return direction; } -// --MIAMI: Done bool CPed::SetDirectionToWalkAroundVehicle(CVehicle* veh) { return SetFollowPath(m_vecSeekPos, 0.0f, m_nMoveState, veh, m_pedInObjective, m_nMoveState == PEDMOVE_WALK ? 2000 : 250); } -// --MIAMI: Done void CPed::SetDirectionToWalkAroundObject(CEntity *obj) { @@ -3860,7 +3812,6 @@ CPed::SetDirectionToWalkAroundObject(CEntity *obj) m_nPedStateTimer = CTimer::GetTimeInMilliseconds() + 280.0f * dist * checkIntervalInTime; } -// --MIAMI: Done bool CPed::IsPedInControl(void) { @@ -3869,14 +3820,12 @@ CPed::IsPedInControl(void) && m_fHealth > 0.0f; } -// --MIAMI: Done bool CPed::IsPedShootable(void) { return m_nPedState <= PED_STATES_NO_ST; } -// --MIAMI: Done bool CPed::UseGroundColModel(void) { @@ -3886,7 +3835,6 @@ CPed::UseGroundColModel(void) m_nPedState == PED_DEAD; } -// --MIAMI: Done bool CPed::CanPedReturnToState(void) { @@ -3894,14 +3842,12 @@ CPed::CanPedReturnToState(void) m_nPedState != PED_FIGHT && m_nPedState != PED_STEP_AWAY && m_nPedState != PED_SNIPER_MODE && m_nPedState != PED_LOOK_ENTITY; } -// --MIAMI: Done bool CPed::CanSetPedState(void) { return !DyingOrDead() && m_nPedState != PED_ARRESTED && !EnteringCar() && m_nPedState != PED_STEAL_CAR; } -// --MIAMI: Done bool CPed::CanStrafeOrMouseControl(void) { @@ -3913,7 +3859,6 @@ CPed::CanStrafeOrMouseControl(void) m_nPedState == PED_ATTACK || m_nPedState == PED_FIGHT || m_nPedState == PED_AIM_GUN || m_nPedState == PED_JUMP || m_nPedState == PED_ANSWER_MOBILE; } -// --MIAMI: Done void CPed::PedSetPreviousStateCB(CAnimBlendAssociation* assoc, void* arg) { @@ -3922,7 +3867,6 @@ CPed::PedSetPreviousStateCB(CAnimBlendAssociation* assoc, void* arg) ped->m_pVehicleAnim = nil; } -// --MIAMI: Done void CPed::PedGetupCB(CAnimBlendAssociation* animAssoc, void* arg) { @@ -3958,7 +3902,6 @@ CPed::PedGetupCB(CAnimBlendAssociation* animAssoc, void* arg) ped->bGetUpAnimStarted = false; } -// --MIAMI: Done void CPed::PedLandCB(CAnimBlendAssociation* animAssoc, void* arg) { @@ -3971,7 +3914,6 @@ CPed::PedLandCB(CAnimBlendAssociation* animAssoc, void* arg) ped->RestorePreviousState(); } -// --MIAMI: Done void CPed::PedStaggerCB(CAnimBlendAssociation* animAssoc, void* arg) { @@ -3982,7 +3924,6 @@ CPed::PedStaggerCB(CAnimBlendAssociation* animAssoc, void* arg) // nothing */ } -// --MIAMI: Done void CPed::PedSetOutCarCB(CAnimBlendAssociation *animAssoc, void *arg) { @@ -4163,7 +4104,6 @@ CPed::PedSetOutCarCB(CAnimBlendAssociation *animAssoc, void *arg) ped->bHeldHostageInCar = false; } -// --MIAMI: Done void CPed::PedSetDraggedOutCarCB(CAnimBlendAssociation *dragAssoc, void *arg) { @@ -4240,7 +4180,6 @@ CPed::PedSetDraggedOutCarCB(CAnimBlendAssociation *dragAssoc, void *arg) ped->bVehExitWillBeInstant = false; } -// --MIAMI: Done void CPed::PedSetInCarCB(CAnimBlendAssociation *animAssoc, void *arg) { @@ -4499,7 +4438,6 @@ CPed::PedSetInCarCB(CAnimBlendAssociation *animAssoc, void *arg) ped->bChangedSeat = true; } -// --MIAMI: Done bool CPed::CanBeDeleted(void) { @@ -4518,7 +4456,6 @@ CPed::CanBeDeleted(void) } } -//--MIAMI: done bool CPed::CanBeDeletedEvenInVehicle(void) { @@ -4534,7 +4471,6 @@ CPed::CanBeDeletedEvenInVehicle(void) } } -// --MIAMI: Done void CPed::AddWeaponModel(int id) { @@ -4562,7 +4498,6 @@ RemoveAllModelCB(RwObject *object, void *data) return object; } -// --MIAMI: Done void CPed::RemoveWeaponModel(int modelId) { @@ -4590,7 +4525,6 @@ CPed::RemoveWeaponModel(int modelId) m_wepModelID = -1; } -// --MIAMI: Done void CPed::RequestDelayedWeapon() { @@ -4610,7 +4544,6 @@ CPed::RequestDelayedWeapon() } } -// --MIAMI: Done void CPed::GiveDelayedWeapon(eWeaponType weapon, uint32 ammo) { @@ -4632,7 +4565,6 @@ CPed::GiveDelayedWeapon(eWeaponType weapon, uint32 ammo) } } -// --MIAMI: Done int32 CPed::GiveWeapon(eWeaponType weaponType, uint32 ammo, bool unused) { @@ -4669,14 +4601,12 @@ CPed::GiveWeapon(eWeaponType weaponType, uint32 ammo, bool unused) return slot; } -// --MIAMI: Done int CPed::GetWeaponSlot(eWeaponType weaponType) { return CWeaponInfo::GetWeaponInfo(weaponType)->m_nWeaponSlot; } -// --MIAMI: Done void CPed::SetCurrentWeapon(int slot) { @@ -4699,14 +4629,12 @@ CPed::SetCurrentWeapon(int slot) } } -// --MIAMI: Done void CPed::SetCurrentWeapon(eWeaponType weaponType) { SetCurrentWeapon(CWeaponInfo::GetWeaponInfo(weaponType)->m_nWeaponSlot); } -// --MIAMI: Done void CPed::GrantAmmo(eWeaponType weaponType, uint32 ammo) { @@ -4727,7 +4655,6 @@ CPed::GrantAmmo(eWeaponType weaponType, uint32 ammo) GetWeapon(slot).m_eWeaponState = WEAPONSTATE_READY; } -// --MIAMI: Done void CPed::SetAmmo(eWeaponType weaponType, uint32 ammo) { @@ -4752,7 +4679,6 @@ CPed::SetAmmo(eWeaponType weaponType, uint32 ammo) GetWeapon(slot).m_eWeaponState = WEAPONSTATE_READY; } -// --MIAMI: Done void CPed::ClearWeapons(void) { @@ -4763,7 +4689,6 @@ CPed::ClearWeapons(void) SetCurrentWeapon(WEAPONTYPE_UNARMED); } -// --MIAMI: Done void CPed::RemoveWeaponWhenEnteringVehicle(void) { @@ -4776,14 +4701,13 @@ CPed::RemoveWeaponWhenEnteringVehicle(void) RemoveWeaponModel(ourWeapon->m_nModelId); } } -// --MIAMI: Done, but enumarate weapon slots void CPed::ReplaceWeaponWhenExitingVehicle(void) { eWeaponType weaponType = GetWeapon()->m_eWeaponType; // If it's Uzi, we may have stored weapon. Uzi is the only gun we can use in car. - if (IsPlayer() && GetWeaponSlot(weaponType) == 5) { + if (IsPlayer() && GetWeaponSlot(weaponType) == WEAPONSLOT_SUBMACHINEGUN) { if (m_storedWeapon != WEAPONTYPE_UNIDENTIFIED) { SetCurrentWeapon(m_storedWeapon); m_storedWeapon = WEAPONTYPE_UNIDENTIFIED; @@ -4793,7 +4717,6 @@ CPed::ReplaceWeaponWhenExitingVehicle(void) } } -// --MIAMI: Done void CPed::PreRender(void) { @@ -5028,7 +4951,6 @@ CPed::PreRender(void) CVector vecTestTemp(-1.0f, -1.0f, -1.0f); -// --MIAMI: Done void CPed::Render(void) { @@ -5078,7 +5000,6 @@ CPed::Render(void) } } -// --MIAMI: Done void CPed::CheckAroundForPossibleCollisions(void) { @@ -5111,7 +5032,6 @@ CPed::CheckAroundForPossibleCollisions(void) } } -// --MIAMI: Done void CPed::SetIdle(void) { @@ -5128,7 +5048,6 @@ CPed::SetIdle(void) } } -// --MIAMI: Done void CPed::Idle(void) { @@ -5156,14 +5075,12 @@ CPed::Idle(void) m_moved = CVector2D(0.0f, 0.0f); } -// --MIAMI: Done void CPed::ClearPause(void) { RestorePreviousState(); } -// --MIAMI: Done void CPed::Pause(void) { @@ -5172,7 +5089,6 @@ CPed::Pause(void) ClearPause(); } -// --MIAMI: Done void CPed::SetFall(int extraTime, AnimationId animId, uint8 evenIfNotInControl) { @@ -5238,14 +5154,12 @@ CPed::SetFall(int extraTime, AnimationId animId, uint8 evenIfNotInControl) bFallenDown = true; } -// --MIAMI: Done void CPed::ClearFall(void) { SetGetUp(); } -// --MIAMI: Done void CPed::Fall(void) { @@ -5304,7 +5218,6 @@ CPed::Fall(void) } } -// --MIAMI: Done bool CPed::CheckIfInTheAir(void) { @@ -5326,7 +5239,6 @@ CPed::CheckIfInTheAir(void) return !foundGround; } -// --MIAMI: Done void CPed::SetInTheAir(void) { @@ -5345,7 +5257,6 @@ CPed::SetInTheAir(void) } -// --MIAMI: Done void CPed::InTheAir(void) { @@ -5369,7 +5280,6 @@ CPed::InTheAir(void) } } -// --MIAMI: Done void CPed::SetLanding(void) { @@ -5405,7 +5315,6 @@ CPed::SetLanding(void) bIsLanding = true; } -// --MIAMI: Done void CPed::SetGetUp(void) { @@ -5476,7 +5385,6 @@ CPed::SetGetUp(void) } } -// --MIAMI: Done void CPed::Mug(void) { @@ -5498,7 +5406,6 @@ CPed::Mug(void) } } -// --MIAMI: Done // Unused void CPed::SetLook(float direction) @@ -5510,7 +5417,6 @@ CPed::SetLook(float direction) } } -// --MIAMI: Done void CPed::SetLook(CEntity* to) { @@ -5521,7 +5427,6 @@ CPed::SetLook(CEntity* to) } } -// --MIAMI: Done void CPed::SetLookTimer(int time) { @@ -5530,7 +5435,6 @@ CPed::SetLookTimer(int time) } } -// --MIAMI: Done void CPed::SetAttackTimer(uint32 time) { @@ -5538,7 +5442,6 @@ CPed::SetAttackTimer(uint32 time) m_attackTimer = Max(m_shootTimer, CTimer::GetTimeInMilliseconds()) + time; } -// --MIAMI: Done void CPed::SetShootTimer(uint32 time) { @@ -5547,7 +5450,6 @@ CPed::SetShootTimer(uint32 time) } } -// --MIAMI: Done void CPed::ClearLook(void) { @@ -5555,14 +5457,12 @@ CPed::ClearLook(void) ClearLookFlag(); } -// --MIAMI: Done void CPed::Look(void) { TurnBody(); } -// --MIAMI: Done bool CPed::TurnBody(void) { @@ -5596,7 +5496,6 @@ CPed::TurnBody(void) return turnDone; } -// --MIAMI: Done void CPed::SetSeek(CVector pos, float distanceToCountDone) { @@ -5615,7 +5514,6 @@ CPed::SetSeek(CVector pos, float distanceToCountDone) m_distanceToCountSeekDone = distanceToCountDone; m_vecSeekPos = pos; } -// --MIAMI: Done void CPed::SetSeek(CEntity *seeking, float distanceToCountDone) { @@ -5638,7 +5536,6 @@ CPed::SetSeek(CEntity *seeking, float distanceToCountDone) SetMoveState(PEDMOVE_STILL); } -// --MIAMI: Done void CPed::ClearSeek(void) { @@ -5646,7 +5543,6 @@ CPed::ClearSeek(void) bRunningToPhone = false; } -// --MIAMI: Done bool CPed::Seek(void) { @@ -5819,7 +5715,6 @@ CPed::Seek(void) return true; } -// --MIAMI: Done void CPed::SetFlee(CVector2D const &from, int time) { @@ -5849,7 +5744,6 @@ CPed::SetFlee(CVector2D const &from, int time) } } -// --MIAMI: Done void CPed::SetFlee(CEntity *fleeFrom, int time) { @@ -5880,7 +5774,6 @@ CPed::SetFlee(CEntity *fleeFrom, int time) } } -// --MIAMI: Done void CPed::ClearFlee(void) { @@ -5890,7 +5783,6 @@ CPed::ClearFlee(void) m_fleeTimer = 0; } -// --MIAMI: Done void CPed::Flee(void) { @@ -6078,7 +5970,6 @@ CPed::WanderRange(void) } } -// --MIAMI: Done bool CPed::SetWanderPath(int8 pathStateDest) { @@ -6127,7 +6018,6 @@ CPed::SetWanderPath(int8 pathStateDest) } } -// --MIAMI: Done void CPed::WanderPath(void) { @@ -6235,7 +6125,6 @@ CPed::WanderPath(void) Say(SOUND_PED_WAIT_DOUBLEBACK); } } -// --MIAMI: Done void CPed::Avoid(void) { @@ -6284,7 +6173,6 @@ CPed::Avoid(void) } } -// --MIAMI: Done CVector* CPed::SeekFollowingPath(void) { @@ -6306,7 +6194,6 @@ CPed::SeekFollowingPath(void) return &vecNextPathNode; } -// --MIAMI: Done bool CPed::SetFollowPath(CVector dest, float radius, eMoveState state, CEntity* walkAroundEnt, CEntity* targetEnt, int time) { @@ -6359,7 +6246,6 @@ CPed::SetFollowPath(CVector dest, float radius, eMoveState state, CEntity* walkA return SetFollowPathStatic(); } -// --MIAMI: Done bool CPed::SetFollowPathStatic(void) { @@ -6428,7 +6314,6 @@ CPed::SetFollowPathStatic(void) return true; } -// --MIAMI: Done bool CPed::SetFollowPathDynamic(void) { @@ -6812,7 +6697,6 @@ CPed::SetFollowPathDynamic(void) } } -// --MIAMI: Done void CPed::ClearFollowPath() { @@ -6823,7 +6707,6 @@ CPed::ClearFollowPath() m_nCurPathNodeId = 0; } -// --MIAMI: Done void CPed::FollowPath(void) { @@ -6854,7 +6737,6 @@ CPed::FollowPath(void) } } -// --MIAMI: Done void CPed::SetEvasiveStep(CEntity *reason, uint8 animType) { @@ -6930,7 +6812,6 @@ CPed::SetEvasiveStep(CEntity *reason, uint8 animType) } } -// --MIAMI: Done void CPed::SetEvasiveDive(CPhysical *reason, uint8 onlyRandomJump) { @@ -7050,7 +6931,6 @@ CPed::SetEvasiveDive(CPhysical *reason, uint8 onlyRandomJump) } } -// --MIAMI: Done void CPed::PedEvadeCB(CAnimBlendAssociation* animAssoc, void* arg) { @@ -7088,7 +6968,6 @@ CPed::PedEvadeCB(CAnimBlendAssociation* animAssoc, void* arg) } } -// --MIAMI: Done void CPed::SetDie(AnimationId animId, float delta, float speed) { @@ -7152,7 +7031,6 @@ CPed::SetDie(AnimationId animId, float delta, float speed) } } -// --MIAMI: Done void CPed::FinishDieAnimCB(CAnimBlendAssociation *animAssoc, void *arg) { @@ -7162,7 +7040,6 @@ CPed::FinishDieAnimCB(CAnimBlendAssociation *animAssoc, void *arg) ped->bIsPedDieAnimPlaying = false; } -// --MIAMI: Done void CPed::SetDead(void) { @@ -7195,14 +7072,12 @@ CPed::SetDead(void) CEventList::RegisterEvent(EVENT_DEAD_PED, EVENT_ENTITY_PED, this, nil, 1000); } -// --MIAMI: Done void CPed::Die(void) { // UNUSED: This is a perfectly empty function. } -// --MIAMI: Done void CPed::SetChat(CEntity *chatWith, uint32 time) { @@ -7219,7 +7094,6 @@ CPed::SetChat(CEntity *chatWith, uint32 time) m_lookTimer = CTimer::GetTimeInMilliseconds() + 3000; } -// --MIAMI: Done void CPed::Chat(void) { @@ -7275,7 +7149,6 @@ CPed::Chat(void) } } -// --MIAMI: Done void CPed::ClearChat(void) { @@ -7294,7 +7167,6 @@ CPed::ClearChat(void) } } -// --MIAMI: Done bool CPed::FacePhone(void) { @@ -7343,7 +7215,6 @@ CPed::FacePhone(void) #endif } -// --MIAMI: Done bool CPed::MakePhonecall(void) { @@ -7356,7 +7227,6 @@ CPed::MakePhonecall(void) return true; } -// --MIAMI: Done void StartTalkingOnMobileCB(CAnimBlendAssociation* assoc, void* arg) { @@ -7365,7 +7235,6 @@ StartTalkingOnMobileCB(CAnimBlendAssociation* assoc, void* arg) CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_PHONE_TALK, 4.0f); } -// --MIAMI: Done void FinishTalkingOnMobileCB(CAnimBlendAssociation *assoc, void *arg) { @@ -7378,7 +7247,6 @@ FinishTalkingOnMobileCB(CAnimBlendAssociation *assoc, void *arg) ped->m_lookTimer = 0; } -// --MIAMI: Done void CPed::SetAnswerMobile(void) { @@ -7395,7 +7263,6 @@ CPed::SetAnswerMobile(void) } } -// --MIAMI: Done void CPed::ClearAnswerMobile(void) { @@ -7415,7 +7282,6 @@ CPed::ClearAnswerMobile(void) } } -// --MIAMI: Done void CPed::AnswerMobile(void) { @@ -7448,7 +7314,6 @@ CPed::AnswerMobile(void) } } -// --MIAMI: Done void CPed::Teleport(CVector pos) { @@ -7462,7 +7327,6 @@ CPed::Teleport(CVector pos) CWorld::Add(this); } -// --MIAMI: Done void CPed::SetSeekCar(CVehicle *car, uint32 doorNode) { @@ -7486,7 +7350,6 @@ CPed::SetSeekCar(CVehicle *car, uint32 doorNode) } -// --MIAMI: Done void CPed::SeekCar(void) { @@ -7669,7 +7532,6 @@ CPed::SeekCar(void) } } -// --MIAMI: Done bool CPed::CheckForExplosions(CVector2D &area) { @@ -7714,7 +7576,6 @@ CPed::CheckForExplosions(CVector2D &area) return false; } -// --MIAMI: Done CPed * CPed::CheckForGunShots(void) { @@ -7730,7 +7591,6 @@ CPed::CheckForGunShots(void) return nil; } -// --MIAMI: Done CPed * CPed::CheckForDeadPeds(void) { @@ -7746,7 +7606,6 @@ CPed::CheckForDeadPeds(void) return nil; } -// --MIAMI: Done bool CPed::IsPlayer(void) const { @@ -7759,14 +7618,12 @@ CPed::IsPlayer(void) const #endif } -// --MIAMI: Done bool CPed::IsGangMember(void) const { return m_nPedType >= PEDTYPE_GANG1 && m_nPedType <= PEDTYPE_GANG9; } -// --MIAMI: Done bool IsPedPointerValid(CPed* pPed) { @@ -7777,7 +7634,6 @@ IsPedPointerValid(CPed* pPed) return pPed->m_entryInfoList.first || pPed == FindPlayerPed(); } -// --MIAMI: Done bool IsPedPointerValid_NotInWorld(CPed* pPed) { @@ -7793,7 +7649,6 @@ IsPedPointerValid_NotInWorld(CPed* pPed) return true; } -// --MIAMI: Done bool CPed::IsPointerValid(void) { @@ -7807,7 +7662,6 @@ CPed::IsPointerValid(void) return false; } -// --MIAMI: Done void CPed::SetPedPositionInCar(void) { @@ -7900,7 +7754,6 @@ CPed::SetPedPositionInCar(void) GetMatrix() = newMat; } -// --MIAMI: Done void CPed::LookForSexyPeds(void) { @@ -7926,7 +7779,6 @@ CPed::LookForSexyPeds(void) m_lookTimer = CTimer::GetTimeInMilliseconds() + 10000; } -// --MIAMI: Done void CPed::LookForSexyCars(void) { @@ -7956,7 +7808,6 @@ CPed::LookForSexyCars(void) } } -// --MIAMI: Done bool CPed::LookForInterestingNodes(void) { @@ -8098,7 +7949,6 @@ CPed::LookForInterestingNodes(void) return true; } -// --MIAMI: Done void PlayRandomAnimationsFromAnimBlock(CPed* ped, AssocGroupId animGroup, uint32 first, uint32 amount) { @@ -8135,7 +7985,6 @@ PlayRandomAnimationsFromAnimBlock(CPed* ped, AssocGroupId animGroup, uint32 firs } } -// --MIAMI: Done void CPed::ClearWaitState(void) { @@ -8239,7 +8088,6 @@ CPed::ClearWaitState(void) m_nWaitState = WAITSTATE_FALSE; } -// --MIAMI: Done void CPed::SetWaitState(eWaitState state, void *time) { @@ -8459,7 +8307,6 @@ CPed::SetWaitState(eWaitState state, void *time) m_nWaitState = state; } -// --MIAMI: Done void CPed::Wait(void) { @@ -8903,7 +8750,6 @@ CPed::Wait(void) RestoreHeadingRate(); } -// --MIAMI: Done void CPed::DeleteSunbatheIdleAnimCB(CAnimBlendAssociation *assoc, void *arg) { @@ -8922,7 +8768,6 @@ CPed::DeleteSunbatheIdleAnimCB(CAnimBlendAssociation *assoc, void *arg) ped->Wait(); } -// --MIAMI: Done void CPed::FinishedWaitCB(CAnimBlendAssociation *animAssoc, void *arg) { @@ -8933,21 +8778,18 @@ CPed::FinishedWaitCB(CAnimBlendAssociation *animAssoc, void *arg) ped->Wait(); } -// --MIAMI: Done void CPed::RestoreHeadingRate(void) { m_headingRate = m_pedStats->m_headingChangeRate; } -// --MIAMI: Done void CPed::RestoreHeadingRateCB(CAnimBlendAssociation *assoc, void *arg) { ((CPed*)arg)->RestoreHeadingRate(); } -// --MIAMI: Done void CPed::FlagToDestroyWhenNextProcessed(void) { @@ -8971,7 +8813,6 @@ CPed::FlagToDestroyWhenNextProcessed(void) m_pVehicleAnim = nil; } -// --MIAMI: Done void CPed::SetSolicit(uint32 time) { @@ -8997,7 +8838,6 @@ CPed::SetSolicit(uint32 time) } } -// --MIAMI: Done void CPed::Solicit(void) { @@ -9043,7 +8883,6 @@ CPed::Solicit(void) } } -// --MIAMI: Done void CPed::SetBuyIceCream(void) { @@ -9056,7 +8895,6 @@ CPed::SetBuyIceCream(void) SetPedState(PED_BUY_ICECREAM); } -// --MIAMI: Done void CPed::BuyIceCream(void) { @@ -9075,7 +8913,6 @@ CPed::BuyIceCream(void) } } -// --MIAMI: Done bool CPed::PossiblyFindBetterPosToSeekCar(CVector *pos, CVehicle *veh) { @@ -9209,7 +9046,6 @@ CPed::PossiblyFindBetterPosToSeekCar(CVector *pos, CVehicle *veh) return true; } -// --MIAMI: Done void CPed::SetLeader(CEntity *leader) { @@ -9221,7 +9057,6 @@ CPed::SetLeader(CEntity *leader) } } -// --MIAMI: Done bool CPed::CanPedJumpThis(CEntity *unused, CVector *damageNormal) { @@ -9254,7 +9089,6 @@ CPed::CanPedJumpThis(CEntity *unused, CVector *damageNormal) return CWorld::GetIsLineOfSightClear(pos, forwardPos, true, false, false, true, false, false, false); } -// --MIAMI: Done void CPed::SetJump(void) { @@ -9269,7 +9103,6 @@ CPed::SetJump(void) } } -// --MIAMI: Done void CPed::FinishLaunchCB(CAnimBlendAssociation *animAssoc, void *arg) { @@ -9379,7 +9212,6 @@ CPed::FinishLaunchCB(CAnimBlendAssociation *animAssoc, void *arg) } } -// --MIAMI: Done void CPed::FinishJumpCB(CAnimBlendAssociation *animAssoc, void *arg) { @@ -9391,7 +9223,6 @@ CPed::FinishJumpCB(CAnimBlendAssociation *animAssoc, void *arg) animAssoc->blendDelta = -1000.0f; } -// --MIAMI: Done void CPed::FinishHitHeadCB(CAnimBlendAssociation *animAssoc, void *arg) { @@ -9408,7 +9239,6 @@ CPed::FinishHitHeadCB(CAnimBlendAssociation *animAssoc, void *arg) ped->bIsLanding = false; } -// --MIAMI: Done bool CPed::CanPedDriveOff(void) { @@ -9424,7 +9254,6 @@ CPed::CanPedDriveOff(void) } return true; } -// --MIAMI: Done void CPed::SetRadioStation(void) { @@ -9445,7 +9274,6 @@ CPed::SetRadioStation(void) } } -// --MIAMI: Done void CPed::WarpPedIntoCar(CVehicle *car) { @@ -9513,14 +9341,12 @@ CPed::WarpPedIntoCar(CVehicle *car) bChangedSeat = true; } -// --MIAMI: Done bool CPed::HasAttractor(void) { return m_attractor != nil; } -// --MIAMI: Done void CPed::SetNewAttraction(CPedAttractor* pAttractor, const CVector& pos, float heading, float time, int32 qid) { @@ -9541,7 +9367,6 @@ CPed::SetNewAttraction(CPedAttractor* pAttractor, const CVector& pos, float head m_positionInQueue = qid; } -// --MIAMI: Done void CPed::AttachPedToEntity(CEntity *ent, CVector offset, uint16 type, float rot, eWeaponType weapon) { @@ -9589,7 +9414,6 @@ CPed::AttachPedToEntity(CEntity *ent, CVector offset, uint16 type, float rot, eW PositionAttachedPed(); } -// --MIAMI: Done void CPed::DettachPedFromEntity(void) { @@ -9613,7 +9437,6 @@ CPed::DettachPedFromEntity(void) } } -// --MIAMI: Done void CPed::PositionAttachedPed() { @@ -9665,7 +9488,6 @@ CPed::PositionAttachedPed() } } -// --MIAMI: Done void CPed::Undress(const char* name) { @@ -9681,7 +9503,6 @@ CPed::Undress(const char* name) CWorld::Remove(this); } -// --MIAMI: Done void CPed::Dress(void) { diff --git a/src/peds/PedAI.cpp b/src/peds/PedAI.cpp index 04e6f596..a0769b9c 100644 --- a/src/peds/PedAI.cpp +++ b/src/peds/PedAI.cpp @@ -30,8 +30,6 @@ #include "GameLogic.h" #include "Streaming.h" -//--MIAMI: file done - CVector vecPedCarDoorAnimOffset; CVector vecPedCarDoorLoAnimOffset; CVector vecPedVanRearDoorAnimOffset; @@ -44,7 +42,6 @@ CVector vecPedHarleyBikeJumpRhsAnimOffset; CVector vecPedDirtBikeJumpRhsAnimOffset; CVector vecPedBikeKickAnimOffset; -// --MIAMI: Done void CPed::SetObjectiveTimer(int time) { @@ -55,7 +52,6 @@ CPed::SetObjectiveTimer(int time) } } -// --MIAMI: Done void CPed::SetStoredObjective(void) { @@ -90,7 +86,6 @@ CPed::SetStoredObjective(void) } } -// --MIAMI: Done void CPed::ForceStoredObjective(eObjective objective) { @@ -124,7 +119,6 @@ CPed::ForceStoredObjective(eObjective objective) } } -// --MIAMI: Done bool CPed::IsTemporaryObjective(eObjective objective) { @@ -133,7 +127,6 @@ CPed::IsTemporaryObjective(eObjective objective) objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER; } -// --MIAMI: Done void CPed::SetObjective(eObjective newObj) { @@ -180,7 +173,6 @@ CPed::SetObjective(eObjective newObj) } } -// --MIAMI: Done void CPed::SetObjective(eObjective newObj, void *entity) { @@ -370,7 +362,6 @@ CPed::SetObjective(eObjective newObj, void *entity) } } -// --MIAMI: Done // Only used in 01E1: SET_CHAR_OBJ_FOLLOW_ROUTE opcode // IDA fails very badly in here, puts a fake loop and ignores SetFollowRoute call... void @@ -403,7 +394,6 @@ CPed::SetObjective(eObjective newObj, int16 routePoint, int16 routeType) } } -// --MIAMI: Done void CPed::SetObjective(eObjective newObj, CVector dest) { @@ -543,7 +533,6 @@ CPed::SetObjective(eObjective newObj, CVector dest) } } -// --MIAMI: Done void CPed::SetObjective(eObjective newObj, float heading, const CVector& pos) { @@ -560,7 +549,6 @@ CPed::SetObjective(eObjective newObj, float heading, const CVector& pos) } } -// --MIAMI: Done void CPed::ClearObjective(void) { @@ -586,7 +574,6 @@ CPed::ClearObjective(void) } } -// --MIAMI: Done void CPed::ClearLeader(void) { @@ -606,7 +593,6 @@ CPed::ClearLeader(void) } } -// --MIAMI: Done void CPed::UpdateFromLeader(void) { @@ -765,7 +751,6 @@ CPed::UpdateFromLeader(void) } } -// --MIAMI: Done void CPed::RestorePreviousObjective(void) { @@ -788,7 +773,6 @@ CPed::RestorePreviousObjective(void) bObjectiveCompleted = false; } -// --MIAMI: Done void CPed::ProcessObjective(void) { @@ -2060,7 +2044,6 @@ CPed::ProcessObjective(void) } } -// --MIAMI: Done void CPed::SetFollowRoute(int16 currentPoint, int16 routeType) { @@ -2073,7 +2056,6 @@ CPed::SetFollowRoute(int16 currentPoint, int16 routeType) m_nextRoutePointPos = CRouteNode::GetPointPosition(GetNextPointOnRoute()); } -// --MIAMI: Done int CPed::GetNextPointOnRoute(void) { @@ -2101,7 +2083,6 @@ CPed::GetNextPointOnRoute(void) return nextPoint; } -// --MIAMI: Done bool CPed::HaveReachedNextPointOnRoute(float distToCountReached) { @@ -2112,7 +2093,6 @@ CPed::HaveReachedNextPointOnRoute(float distToCountReached) return false; } -// --MIAMI: Done bool CPed::CanSeeEntity(CEntity *entity, float threshold) { @@ -2138,7 +2118,6 @@ CPed::CanSeeEntity(CEntity *entity, float threshold) return neededTurn < threshold || TWOPI - threshold < neededTurn; } -// --MIAMI: Done // Only used while deciding which gun ped should switch to, if no ammo left. bool CPed::SelectGunIfArmed(void) @@ -2159,7 +2138,6 @@ CPed::SelectGunIfArmed(void) SetCurrentWeapon(WEAPONTYPE_UNARMED); return false; } -// --MIAMI: Done void CPed::ReactToPointGun(CEntity *entWithGun) { @@ -2244,7 +2222,6 @@ CPed::ReactToPointGun(CEntity *entWithGun) } } -// --MIAMI: Done void CPed::ReactToAttack(CEntity *attacker) { @@ -2317,7 +2294,6 @@ CPed::ReactToAttack(CEntity *attacker) } } -// --MIAMI: Done void CPed::PedAnimAlignCB(CAnimBlendAssociation *animAssoc, void *arg) { @@ -2562,7 +2538,6 @@ CPed::PedAnimAlignCB(CAnimBlendAssociation *animAssoc, void *arg) } } -// --MIAMI: Done void CPed::PedAnimDoorOpenCB(CAnimBlendAssociation* animAssoc, void* arg) { @@ -2782,7 +2757,6 @@ CPed::PedAnimDoorOpenCB(CAnimBlendAssociation* animAssoc, void* arg) return; } -// --MIAMI: Done void CPed::PedAnimPullPedOutCB(CAnimBlendAssociation* animAssoc, void* arg) { @@ -2868,7 +2842,6 @@ CPed::PedAnimPullPedOutCB(CAnimBlendAssociation* animAssoc, void* arg) } } -// --MIAMI: Done void CPed::PedAnimGetInCB(CAnimBlendAssociation *animAssoc, void *arg) { @@ -3018,7 +2991,6 @@ CPed::PedAnimGetInCB(CAnimBlendAssociation *animAssoc, void *arg) } } -// --MIAMI: Done void CPed::PedShuffle(void) { @@ -3034,7 +3006,6 @@ CPed::PedShuffle(void) } } -// --MIAMI: Done void CPed::PedAnimDoorCloseCB(CAnimBlendAssociation *animAssoc, void *arg) { @@ -3101,7 +3072,6 @@ CPed::PedAnimDoorCloseCB(CAnimBlendAssociation *animAssoc, void *arg) } } -// --MIAMI: Done void CPed::PedAnimShuffleCB(CAnimBlendAssociation* assoc, void* arg) { @@ -3113,7 +3083,6 @@ CPed::PedAnimShuffleCB(CAnimBlendAssociation* assoc, void* arg) } } -// --MIAMI: Done void CPed::SetFormation(eFormation type) { @@ -3137,7 +3106,6 @@ CPed::SetFormation(eFormation type) m_pedFormation = type; } -// --MIAMI: Done CVector CPed::GetFormationPosition(void) { @@ -3186,7 +3154,6 @@ CPed::GetFormationPosition(void) return m_pedInObjective->GetMatrix() * formationOffset; } -// --MIAMI: Done void CPed::PedAnimStepOutCarCB(CAnimBlendAssociation* animAssoc, void* arg) { @@ -3326,7 +3293,6 @@ CPed::PedAnimStepOutCarCB(CAnimBlendAssociation* animAssoc, void* arg) return; } -// --MIAMI: Done void CPed::LineUpPedWithCar(PedLineUpPhase phase) { @@ -3663,7 +3629,6 @@ CPed::LineUpPedWithCar(PedLineUpPhase phase) } -// --MIAMI: Done void CPed::SetCarJack(CVehicle* car) { @@ -3746,7 +3711,6 @@ CPed::SetCarJack(CVehicle* car) SetCarJack_AllClear(car, m_vehDoor, doorFlag); } -// --MIAMI: Done void CPed::SetCarJack_AllClear(CVehicle* car, uint32 doorNode, uint32 doorFlag) { @@ -3789,7 +3753,6 @@ CPed::SetCarJack_AllClear(CVehicle* car, uint32 doorNode, uint32 doorFlag) } } -// --MIAMI: Done void CPed::SetBeingDraggedFromCar(CVehicle *veh, uint32 vehEnterType, bool quickJack) { @@ -3838,7 +3801,6 @@ CPed::SetBeingDraggedFromCar(CVehicle *veh, uint32 vehEnterType, bool quickJack) veh->m_nGettingOutFlags |= GetCarDoorFlag(m_vehDoor); } -// --MIAMI: Done void CPed::BeingDraggedFromCar(void) { @@ -3904,7 +3866,6 @@ CPed::BeingDraggedFromCar(void) } } -// --MIAMI: Done void CPed::SetEnterCar(CVehicle *car, uint32 unused) { @@ -3981,7 +3942,6 @@ CPed::SetEnterCar(CVehicle *car, uint32 unused) } } -// --MIAMI: Done void CPed::SetEnterCar_AllClear(CVehicle *car, uint32 doorNode, uint32 doorFlag) { @@ -4034,7 +3994,6 @@ CPed::SetEnterCar_AllClear(CVehicle *car, uint32 doorNode, uint32 doorFlag) } } -// --MIAMI: Done void CPed::EnterCar(void) { @@ -4078,7 +4037,6 @@ CPed::EnterCar(void) } } -// --MIAMI: Done void CPed::QuitEnteringCar(void) { @@ -4127,7 +4085,6 @@ CPed::QuitEnteringCar(void) } } -// --MIAMI: Done void CPed::SetExitBoat(CVehicle *boat) { @@ -4185,7 +4142,6 @@ CPed::SetExitBoat(CVehicle *boat) m_vecMoveSpeed = boat->m_vecMoveSpeed; } -// --MIAMI: Done // wantedDoorNode = 0 means that func. will determine it void CPed::SetExitCar(CVehicle *veh, uint32 wantedDoorNode) @@ -4570,7 +4526,6 @@ CPed::SetExitCar(CVehicle *veh, uint32 wantedDoorNode) } } -// --MIAMI: Done void CPed::ExitCar(void) { @@ -4642,7 +4597,6 @@ CPed::ExitCar(void) } } -// --MIAMI: Done CVector CPed::GetPositionToOpenCarDoor(CVehicle *veh, uint32 component) { @@ -4655,7 +4609,6 @@ CPed::GetPositionToOpenCarDoor(CVehicle *veh, uint32 component) return vehDoorPos; } -// --MIAMI: Done void CPed::GetNearestDoor(CVehicle *veh, CVector &posToOpen) { @@ -4724,7 +4677,6 @@ CPed::GetNearestDoor(CVehicle *veh, CVector &posToOpen) } } -// --MIAMI: Done bool CPed::GetNearestPassengerDoor(CVehicle *veh, CVector &posToOpen) { @@ -4808,7 +4760,6 @@ CPed::GetNearestPassengerDoor(CVehicle *veh, CVector &posToOpen) return canEnter; } -// --MIAMI: Done void CPed::GoToNearestDoor(CVehicle *veh) { @@ -4818,7 +4769,6 @@ CPed::GoToNearestDoor(CVehicle *veh) SetMoveState(PEDMOVE_RUN); } -// --MIAMI: Done // Unused void CPed::PedSetGetInCarPositionCB(CAnimBlendAssociation* assoc, void* arg) { @@ -4832,7 +4782,6 @@ void CPed::PedSetGetInCarPositionCB(CAnimBlendAssociation* assoc, void* arg) pPed->SetPosition(position); } -// --MIAMI: Done void CPed::SetAnimOffsetForEnterOrExitVehicle(void) { @@ -4994,7 +4943,6 @@ CPed::SetAnimOffsetForEnterOrExitVehicle(void) CAnimManager::RemoveAnimBlockRef(bikedBlock); } -// --MIAMI: Done void CPed::PedSetQuickDraggedOutCarPositionCB(CAnimBlendAssociation *animAssoc, void *arg) { @@ -5083,7 +5031,6 @@ CPed::PedSetQuickDraggedOutCarPositionCB(CAnimBlendAssociation *animAssoc, void ped->m_nLastPedState = PED_WANDER_PATH; } -// --MIAMI: Done void CPed::PedSetDraggedOutCarPositionCB(CAnimBlendAssociation* animAssoc, void* arg) { @@ -5180,7 +5127,6 @@ CPed::PedSetDraggedOutCarPositionCB(CAnimBlendAssociation* animAssoc, void* arg) ped->SetGetUp(); } -// --MIAMI: Done uint8 CPed::GetNearestTrainDoor(CVehicle *train, CVector &doorPos) { @@ -5198,7 +5144,6 @@ CPed::GetNearestTrainDoor(CVehicle *train, CVector &doorPos) return 1; } -// --MIAMI: Done uint8 CPed::GetNearestTrainPedPosition(CVehicle *train, CVector &enterPos) { @@ -5257,7 +5202,6 @@ CPed::GetNearestTrainPedPosition(CVehicle *train, CVector &enterPos) return 1; } -// --MIAMI: Done :D void CPed::PedSetInTrainCB(CAnimBlendAssociation* animAssoc, void* arg) { @@ -5407,7 +5351,6 @@ CPed::PedSetOutTrainCB(CAnimBlendAssociation *animAssoc, void *arg) } #endif -// --MIAMI: Done void CPed::RegisterThreatWithGangPeds(CEntity *attacker) { @@ -5471,7 +5414,6 @@ CPed::RegisterThreatWithGangPeds(CEntity *attacker) } } -// --MIAMI: Done // Some helper function which doesn't exist in og game. inline void SelectClosestNodeForSeek(CPed *ped, CPathNode *node, CVector2D closeDist, CVector2D farDist, CPathNode *closeNode, CPathNode *closeNode2, int runCount = 3) @@ -5501,7 +5443,6 @@ SelectClosestNodeForSeek(CPed *ped, CPathNode *node, CVector2D closeDist, CVecto } } -// --MIAMI: Done bool CPed::FindBestCoordsFromNodes(CVector unused, CVector *bestCoords) { @@ -5542,7 +5483,6 @@ CPed::FindBestCoordsFromNodes(CVector unused, CVector *bestCoords) return false; } -// --MIAMI: Done bool CPed::DuckAndCover(void) { @@ -5731,7 +5671,6 @@ CPed::DuckAndCover(void) return false; } -// --MIAMI: Done CVector CPed::GetPositionToOpenCarDoor(CVehicle *veh, uint32 component, float offset) { @@ -5779,7 +5718,6 @@ CPed::GetPositionToOpenCarDoor(CVehicle *veh, uint32 component, float offset) return veh->GetPosition() + doorPos; } -// --MIAMI: Done CVector CPed::GetLocalPositionToOpenCarDoor(CVehicle *veh, uint32 component, float seatPosMult) { @@ -5865,7 +5803,7 @@ CPed::GetLocalPositionToOpenCarDoor(CVehicle *veh, uint32 component, float seatP } } -// --MIAMI: Done, but what is this parameter for? +// TODO: what is this parameter for? void CPed::SetDuck(uint32 time, bool sth) { @@ -5891,7 +5829,6 @@ CPed::SetDuck(uint32 time, bool sth) } } -// --MIAMI: Done void CPed::Duck(void) { @@ -5918,7 +5855,6 @@ CPed::Duck(void) } } -// --MIAMI: Done void CPed::ClearDuck(bool clearTimer) { @@ -5941,7 +5877,6 @@ CPed::ClearDuck(bool clearTimer) } } -// --MIAMI: Done void CPed::InformMyGangOfAttack(CEntity *attacker) { @@ -5976,7 +5911,6 @@ CPed::InformMyGangOfAttack(CEntity *attacker) } } -// --MIAMI: Done void CPed::PedAnimDoorCloseRollingCB(CAnimBlendAssociation* animAssoc, void* arg) { @@ -5999,7 +5933,6 @@ CPed::PedAnimDoorCloseRollingCB(CAnimBlendAssociation* animAssoc, void* arg) veh->Damage.SetDoorStatus(DOOR_FRONT_LEFT, DOOR_STATUS_OK); } -// --MIAMI: Done void CPed::SetSeekBoatPosition(CVehicle *boat) { @@ -6015,7 +5948,6 @@ CPed::SetSeekBoatPosition(CVehicle *boat) SetPedState(PED_SEEK_IN_BOAT); } -// --MIAMI: Done void CPed::SeekBoatPosition(void) { @@ -6037,7 +5969,6 @@ CPed::SeekBoatPosition(void) RestorePreviousState(); } -// --MIAMI: Done bool CPed::IsRoomToBeCarJacked(void) { @@ -6061,7 +5992,6 @@ CPed::IsRoomToBeCarJacked(void) return false; } -// --MIAMI: Done void CPed::AddInCarAnims(CVehicle* car, bool isDriver) { @@ -6096,7 +6026,6 @@ CPed::AddInCarAnims(CVehicle* car, bool isDriver) StopNonPartialAnims(); } -// --MIAMI: Done void CPed::RemoveDrivebyAnims() { @@ -6124,7 +6053,6 @@ CPed::RemoveDrivebyAnims() animAssoc->blendDelta = -1000.0f; } -// --MIAMI: Done void CPed::RemoveInCarAnims(void) { @@ -6137,7 +6065,6 @@ CPed::RemoveInCarAnims(void) } } -// --MIAMI: Done bool CPed::PositionPedOutOfCollision(void) { @@ -6276,7 +6203,6 @@ CPed::PositionPedOutOfCollision(void) return true; } -// --MIAMI: Done // "Any" means he shouldn't have to be in vehicle. bool CPed::PositionAnyPedOutOfCollision(void) @@ -6332,7 +6258,6 @@ CPed::PositionAnyPedOutOfCollision(void) return true; } -// --MIAMI: Done bool CPed::WarpPedToNearLeaderOffScreen(void) { @@ -6366,7 +6291,6 @@ CPed::WarpPedToNearLeaderOffScreen(void) return teleported; } -// --MIAMI: Done bool CPed::WarpPedToNearEntityOffScreen(CEntity *warpTo) { @@ -6400,7 +6324,6 @@ CPed::WarpPedToNearEntityOffScreen(CEntity *warpTo) return teleported; } -// --MIAMI: Done int32 CPed::KillCharOnFootArmed(CVector &ourPos, CVector &targetPos, CVector &distWithTarget) { @@ -6675,7 +6598,6 @@ CPed::KillCharOnFootArmed(CVector &ourPos, CVector &targetPos, CVector &distWith return ATTACK_IN_PROGRESS; } -// --MIAMI: Done int32 CPed::KillCharOnFootMelee(CVector &ourPos, CVector &targetPos, CVector &distWithTarget) { @@ -6930,7 +6852,6 @@ CPed::KillCharOnFootMelee(CVector &ourPos, CVector &targetPos, CVector &distWith } } -// --MIAMI: Done bool CPed::CanBeDamagedByThisGangMember(CPed* who) { diff --git a/src/peds/PedAttractor.cpp b/src/peds/PedAttractor.cpp index eeb65398..22e0e779 100644 --- a/src/peds/PedAttractor.cpp +++ b/src/peds/PedAttractor.cpp @@ -13,8 +13,6 @@ const int gcMaxSizeOfPizzaQueue = 5; const int gcMaxSizeOfShelterQueue = 5; const int gcMaxSizeOfIceCreamQueue = 1; -//--MIAMI: file done - std::vector<CVector> CPedShelterAttractor::ms_displacements; CPedAttractorManager* GetPedAttractorManager() diff --git a/src/peds/PedChat.cpp b/src/peds/PedChat.cpp index 470b7eeb..ec6719c6 100644 --- a/src/peds/PedChat.cpp +++ b/src/peds/PedChat.cpp @@ -4,8 +4,6 @@ #include "General.h" #include "Ped.h" -// --MIAMI: file done - // Corresponds to ped sounds (from SOUND_PED_DEATH to SOUND_PED_TAXI_CALL) PedAudioData CommentWaitTime[56] = { { 500, 800, 500, 2 }, diff --git a/src/peds/PedFight.cpp b/src/peds/PedFight.cpp index e0ffa82e..e8fee649 100644 --- a/src/peds/PedFight.cpp +++ b/src/peds/PedFight.cpp @@ -26,8 +26,6 @@ #include "Glass.h" #include "SpecialFX.h" -//--MIAMI: file done - uint16 nPlayerInComboMove; RpClump* flyingClumpTemp; @@ -159,7 +157,6 @@ CheckForPedsOnGroundToAttack(CPed *attacker, CPed **pedOnGround) return stateToReturn; } -// --MIAMI: Done void CPed::SetPointGunAt(CEntity *to) { @@ -202,7 +199,6 @@ CPed::SetPointGunAt(CEntity *to) Say(SOUND_PED_ATTACK); } -// --MIAMI: Done void CPed::PointGunAt(void) { @@ -230,7 +226,6 @@ CPed::PointGunAt(void) } } -// --MIAMI: Done void CPed::ClearPointGunAt(void) { @@ -257,7 +252,6 @@ CPed::ClearPointGunAt(void) } } -// --MIAMI: Done void CPed::SetAttack(CEntity *victim) { @@ -440,7 +434,6 @@ CPed::SetAttack(CEntity *victim) SetLookTimer(100); } -// --MIAMI: Done void CPed::ClearAttack(void) { @@ -461,7 +454,6 @@ CPed::ClearAttack(void) } } -// --MIAMI: Done void CPed::ClearAttackByRemovingAnim(void) { @@ -497,7 +489,6 @@ CPed::ClearAttackByRemovingAnim(void) } } -// --MIAMI: Done void CPed::FinishedAttackCB(CAnimBlendAssociation *attackAssoc, void *arg) { @@ -577,7 +568,6 @@ CPed::FinishedAttackCB(CAnimBlendAssociation *attackAssoc, void *arg) } } -// --MIAMI: Done void CPed::FinishedReloadCB(CAnimBlendAssociation *reloadAssoc, void *arg) { @@ -611,7 +601,6 @@ CPed::FinishedReloadCB(CAnimBlendAssociation *reloadAssoc, void *arg) } } -// --MIAMI: Done uint8 CPed::CheckForPointBlankPeds(CPed *pedToVerify) { @@ -655,7 +644,6 @@ CPed::CheckForPointBlankPeds(CPed *pedToVerify) return NO_POINT_BLANK_PED; } -// --MIAMI: Done except commented things void CPed::Attack(void) { @@ -1043,7 +1031,6 @@ CPed::Attack(void) bIsAttacking = attackShouldContinue; } -// --MIAMI: Done void CPed::StartFightAttack(uint8 buttonPressure) { @@ -1136,7 +1123,6 @@ CPed::StartFightAttack(uint8 buttonPressure) nPlayerInComboMove = 0; } -// --MIAMI: Done void CPed::StartFightDefend(uint8 direction, uint8 hitLevel, uint8 unk) { @@ -1380,7 +1366,6 @@ CPed::StartFightDefend(uint8 direction, uint8 hitLevel, uint8 unk) } } -// --MIAMI: Done void CPed::Fight(void) { @@ -1608,7 +1593,6 @@ CPed::Fight(void) } } -// --MIAMI: Done int32 CPed::ChooseAttackAI(uint8 buttonPressure, bool fightWithWeapon) { @@ -1695,7 +1679,6 @@ CPed::ChooseAttackAI(uint8 buttonPressure, bool fightWithWeapon) return FIGHTMOVE_SHUFFLE_F; } -// --MIAMI: Done int32 CPed::ChooseAttackPlayer(uint8 buttonPressure, bool fightWithWeapon) { @@ -1936,7 +1919,6 @@ CPed::ChooseAttackPlayer(uint8 buttonPressure, bool fightWithWeapon) return choosenMove; } -// --MIAMI: Done void CPed::EndFight(uint8 endType) { @@ -1971,7 +1953,6 @@ CPed::EndFight(uint8 endType) m_nWaitTimer = 0; } -// --MIAMI: Done void CPed::PlayHitSound(CPed *hitTo) { @@ -2047,7 +2028,6 @@ CPed::PlayHitSound(CPed *hitTo) DMAudio.PlayOneShot(m_audioEntityId, soundId, (weapon << 8) | ENTITY_TYPE_PED); } -// --MIAMI: Done bool CPed::FightStrike(CVector &touchedNodePos, bool fightWithWeapon) { @@ -2144,7 +2124,6 @@ CPed::FightStrike(CVector &touchedNodePos, bool fightWithWeapon) return false; } -// --MIAMI: Done void CPed::FightHitPed(CPed *victim, CVector &touchPoint, CVector &dir, int16 piece) { @@ -2294,7 +2273,6 @@ CPed::FightHitPed(CPed *victim, CVector &touchPoint, CVector &dir, int16 piece) } } -// --MIAMI: Done void CPed::FinishFightMoveCB(CAnimBlendAssociation *animAssoc, void *arg) { @@ -2306,7 +2284,6 @@ CPed::FinishFightMoveCB(CAnimBlendAssociation *animAssoc, void *arg) } } -// --MIAMI: Done void CPed::LoadFightData(void) { @@ -2394,7 +2371,6 @@ CPed::LoadFightData(void) } } -// --MIAMI: Done void CPed::SetInvestigateEvent(eEventType event, CVector2D pos, float distanceToCountDone, uint16 time, float angle) { @@ -2417,7 +2393,6 @@ CPed::SetInvestigateEvent(eEventType event, CVector2D pos, float distanceToCount } -// --MIAMI: Done void CPed::InvestigateEvent(void) { @@ -2623,7 +2598,6 @@ CPed::InvestigateEvent(void) } } -// --MIAMI: Done void CPed::ClearInvestigateEvent(void) { @@ -2649,7 +2623,6 @@ CPed::ClearInvestigateEvent(void) SetMoveState(PEDMOVE_WALK); } -// --MIAMI: Done bool CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPieceTypes pedPiece, uint8 direction) { @@ -3221,7 +3194,6 @@ RecurseFrameChildrenToCloneCB(RwFrame *frame, void *data) return newFrame; } -// --MIAMI: Done void CPed::RemoveBodyPart(PedNode nodeId, int8 direction) { @@ -3252,7 +3224,6 @@ CPed::RemoveBodyPart(PedNode nodeId, int8 direction) } } -// --MIAMI: Done CObject* CPed::SpawnFlyingComponent(int pedNode, int8 direction) { @@ -3260,7 +3231,6 @@ CPed::SpawnFlyingComponent(int pedNode, int8 direction) return nil; } -// --MIAMI: Done // III leftover and unused void CPed::ApplyHeadShot(eWeaponType weaponType, CVector pos, bool evenOnPlayer) @@ -3303,14 +3273,12 @@ CPed::ApplyHeadShot(eWeaponType weaponType, CVector pos, bool evenOnPlayer) } } -// --MIAMI: Done bool CPed::IsPedHeadAbovePos(float zOffset) { return zOffset + GetPosition().z < GetNodePosition(PED_HEAD).z; } -// --MIAMI: Done bool CPed::PlacePedOnDryLand(void) { @@ -3362,7 +3330,6 @@ CPed::PlacePedOnDryLand(void) return true; } -// --MIAMI: Done void CPed::CollideWithPed(CPed *collideWith) { @@ -3629,7 +3596,6 @@ CPed::CollideWithPed(CPed *collideWith) } } -// --MIAMI: Done void CPed::KillPedWithCar(CVehicle *car, float impulse) { @@ -3867,7 +3833,6 @@ CPed::KillPedWithCar(CVehicle *car, float impulse) } } -// --MIAMI: Done void CPed::DriveVehicle(void) { @@ -4175,7 +4140,6 @@ CPed::DriveVehicle(void) } } -// --MIAMI: Done void CPed::RemoveWeaponAnims(int unused, float animDelta) { diff --git a/src/peds/PedIK.cpp b/src/peds/PedIK.cpp index 2925667a..475e04f1 100644 --- a/src/peds/PedIK.cpp +++ b/src/peds/PedIK.cpp @@ -7,8 +7,6 @@ #include "General.h" #include "RwHelper.h" -//--MIAMI: file done - LimbMovementInfo CPedIK::ms_torsoInfo = { DEGTORAD(50.0f), DEGTORAD(-50.0f), DEGTORAD(8.0f), DEGTORAD(45.0f), DEGTORAD(-45.0f), DEGTORAD(5.0f) }; LimbMovementInfo CPedIK::ms_headInfo = { DEGTORAD(90.0f), DEGTORAD(-90.0f), DEGTORAD(15.0f), DEGTORAD(45.0f), DEGTORAD(-45.0f), DEGTORAD(8.0f) }; LimbMovementInfo CPedIK::ms_headRestoreInfo = { DEGTORAD(90.0f), DEGTORAD(-90.0f), DEGTORAD(10.0f), DEGTORAD(45.0f), DEGTORAD(-45.0f), DEGTORAD(5.0f) }; diff --git a/src/peds/PedPlacement.cpp b/src/peds/PedPlacement.cpp index 8012650a..840d33fc 100644 --- a/src/peds/PedPlacement.cpp +++ b/src/peds/PedPlacement.cpp @@ -4,7 +4,6 @@ #include "PedPlacement.h" #include "World.h" -// --MIAMI: Done bool CPedPlacement::FindZCoorForPed(CVector* pos) { diff --git a/src/peds/PedRoutes.cpp b/src/peds/PedRoutes.cpp index 2de90eae..3ff080e6 100644 --- a/src/peds/PedRoutes.cpp +++ b/src/peds/PedRoutes.cpp @@ -3,8 +3,6 @@ #include "main.h" #include "PedRoutes.h" -// --MIAMI: file done - CRouteNode gaRoutes[NUMPEDROUTES]; void diff --git a/src/peds/PedType.cpp b/src/peds/PedType.cpp index bc6395b0..bacb1a78 100644 --- a/src/peds/PedType.cpp +++ b/src/peds/PedType.cpp @@ -4,8 +4,6 @@ #include "FileMgr.h" #include "PedType.h" -// --MIAMI: file done - CPedType *CPedType::ms_apPedType[NUM_PEDTYPES]; CPedStats *CPedStats::ms_apPedStats[NUM_PEDSTATS]; diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp index b66c1854..fd0bf643 100644 --- a/src/peds/PlayerPed.cpp +++ b/src/peds/PlayerPed.cpp @@ -51,7 +51,6 @@ CPlayerPed::~CPlayerPed() delete m_pWanted; } -// --MIAMI: Done CPlayerPed::CPlayerPed(void) : CPed(PEDTYPE_PLAYER1) { m_fMoveSpeed = 0.0f; @@ -100,7 +99,6 @@ CPlayerPed::CPlayerPed(void) : CPed(PEDTYPE_PLAYER1) idleAnimBlockIndex = CAnimManager::GetAnimationBlockIndex("playidles"); } -// --MIAMI: Done void CPlayerPed::ClearWeaponTarget() { @@ -112,21 +110,18 @@ CPlayerPed::ClearWeaponTarget() ClearPointGunAt(); } -// --MIAMI: Done void CPlayerPed::SetWantedLevel(int32 level) { m_pWanted->SetWantedLevel(level); } -// --MIAMI: Done void CPlayerPed::SetWantedLevelNoDrop(int32 level) { m_pWanted->SetWantedLevelNoDrop(level); } -// --MIAMI: Done void CPlayerPed::MakeObjectTargettable(int32 handle) { @@ -138,7 +133,6 @@ CPlayerPed::MakeObjectTargettable(int32 handle) } } -// --MIAMI: Done // I don't know the actual purpose of parameter void CPlayerPed::AnnoyPlayerPed(bool annoyedByPassingEntity) @@ -152,7 +146,6 @@ CPlayerPed::AnnoyPlayerPed(bool annoyedByPassingEntity) } } -// --MIAMI: Done void CPlayerPed::ClearAdrenaline(void) { @@ -162,7 +155,6 @@ CPlayerPed::ClearAdrenaline(void) } } -// --MIAMI: Done CPlayerInfo * CPlayerPed::GetPlayerInfoForThisPlayerPed() { @@ -172,7 +164,6 @@ CPlayerPed::GetPlayerInfoForThisPlayerPed() return nil; } -// --MIAMI: Done void CPlayerPed::SetupPlayerPed(int32 index) { @@ -193,21 +184,18 @@ CPlayerPed::SetupPlayerPed(int32 index) #endif } -// --MIAMI: Done void CPlayerPed::DeactivatePlayerPed(int32 index) { CWorld::Remove(CWorld::Players[index].m_pPed); } -// --MIAMI: Done void CPlayerPed::ReactivatePlayerPed(int32 index) { CWorld::Add(CWorld::Players[index].m_pPed); } -// --MIAMI: Done void CPlayerPed::UseSprintEnergy(void) { @@ -224,7 +212,6 @@ CPlayerPed::UseSprintEnergy(void) } } -// --MIAMI: Done void CPlayerPed::MakeChangesForNewWeapon(eWeaponType weapon) { @@ -249,7 +236,6 @@ CPlayerPed::MakeChangesForNewWeapon(eWeaponType weapon) TheCamera.ClearPlayerWeaponMode(); } -// --MIAMI: Done void CPlayerPed::MakeChangesForNewWeapon(int32 slot) { @@ -257,7 +243,6 @@ CPlayerPed::MakeChangesForNewWeapon(int32 slot) MakeChangesForNewWeapon(m_weapons[slot].m_eWeaponType); } -// --MIAMI: Done void CPlayerPed::ReApplyMoveAnims(void) { @@ -277,7 +262,6 @@ CPlayerPed::ReApplyMoveAnims(void) } } -// --MIAMI: Done void CPlayerPed::SetInitialState(void) { @@ -324,7 +308,6 @@ CPlayerPed::SetInitialState(void) m_attachWepAmmo = 0; } -// --MIAMI: Done void CPlayerPed::SetRealMoveAnim(void) { @@ -568,7 +551,6 @@ CPlayerPed::SetRealMoveAnim(void) } } -// --MIAMI: Done void CPlayerPed::RestoreSprintEnergy(float restoreSpeed) { @@ -576,7 +558,6 @@ CPlayerPed::RestoreSprintEnergy(float restoreSpeed) m_fCurrentStamina += restoreSpeed * CTimer::GetTimeStep() * 0.5f; } -// --MIAMI: Done float CPlayerPed::DoWeaponSmoothSpray(void) { @@ -626,7 +607,6 @@ CPlayerPed::DoWeaponSmoothSpray(void) return -1.0f; } -// --MIAMI: Done void CPlayerPed::DoStuffToGoOnFire(void) { @@ -634,7 +614,6 @@ CPlayerPed::DoStuffToGoOnFire(void) TheCamera.ClearPlayerWeaponMode(); } -// --MIAMI: Done bool CPlayerPed::DoesTargetHaveToBeBroken(CVector target, CWeapon *weaponUsed) { @@ -646,7 +625,6 @@ CPlayerPed::DoesTargetHaveToBeBroken(CVector target, CWeapon *weaponUsed) return false; } -// --MIAMI: Done // Cancels landing anim while running & jumping? I think void CPlayerPed::RunningLand(CPad *padUsed) @@ -665,7 +643,6 @@ CPlayerPed::RunningLand(CPad *padUsed) } } -// --MIAMI: Done bool CPlayerPed::IsThisPedAnAimingPriority(CPed *suspect) { @@ -688,7 +665,6 @@ CPlayerPed::IsThisPedAnAimingPriority(CPed *suspect) return suspect->m_nPedState == PED_ABSEIL; } -// --MIAMI: Done void CPlayerPed::PlayerControlSniper(CPad *padUsed) { @@ -725,7 +701,6 @@ CPlayerPed::PlayerControlSniper(CPad *padUsed) GetWeapon()->Update(m_audioEntityId, nil); } -// --MIAMI: Done // I think R* also used goto in here. void CPlayerPed::ProcessWeaponSwitch(CPad *padUsed) @@ -816,7 +791,6 @@ switchDetectDone: } } -// --MIAMI: Done void CPlayerPed::PlayerControlM16(CPad *padUsed) { @@ -853,7 +827,6 @@ CPlayerPed::PlayerControlM16(CPad *padUsed) GetWeapon()->Update(m_audioEntityId, nil); } -// --MIAMI: Done void CPlayerPed::PlayerControlFighter(CPad *padUsed) { @@ -879,7 +852,6 @@ CPlayerPed::PlayerControlFighter(CPad *padUsed) } } -// --MIAMI: Done void CPlayerPed::PlayerControl1stPersonRunAround(CPad *padUsed) { @@ -940,7 +912,6 @@ CPlayerPed::PlayerControl1stPersonRunAround(CPad *padUsed) #endif } -// --MIAMI: Done void CPlayerPed::KeepAreaAroundPlayerClear(void) { @@ -990,7 +961,6 @@ CPlayerPed::KeepAreaAroundPlayerClear(void) } } -// --MIAMI: Done void CPlayerPed::EvaluateNeighbouringTarget(CEntity *candidate, CEntity **targetPtr, float *lastCloseness, float distLimit, float angleOffset, bool lookToLeft, bool priority) { @@ -1017,7 +987,6 @@ CPlayerPed::EvaluateNeighbouringTarget(CEntity *candidate, CEntity **targetPtr, } } -// --MIAMI: Done void CPlayerPed::EvaluateTarget(CEntity *candidate, CEntity **targetPtr, float *lastCloseness, float distLimit, float angleOffset, bool priority) { @@ -1072,7 +1041,6 @@ CPlayerPed::RotatePlayerToTrackTarget(void) } } -// --MIAMI: Done bool CPlayerPed::FindNextWeaponLockOnTarget(CEntity *previousTarget, bool lookToLeft) { @@ -1115,7 +1083,6 @@ CPlayerPed::FindNextWeaponLockOnTarget(CEntity *previousTarget, bool lookToLeft) return true; } -// --MIAMI: Done bool CPlayerPed::FindWeaponLockOnTarget(void) { @@ -1167,7 +1134,6 @@ CPlayerPed::FindWeaponLockOnTarget(void) return true; } -// --MIAMI: Done void CPlayerPed::ProcessAnimGroups(void) { @@ -1476,7 +1442,6 @@ CPlayerPed::MovementDisabledBecauseOfTargeting(void) return m_pPointGunAt && !CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType)->IsFlagSet(WEAPONFLAG_CANAIM_WITHARM); } -// --MIAMI: Done void CPlayerPed::PlayerControlZelda(CPad *padUsed) { @@ -1952,7 +1917,6 @@ CPlayerPed::ProcessControl(void) UpdateRpHAnim(); } -// --MIAMI: Done bool CPlayerPed::DoesPlayerWantNewWeapon(eWeaponType weapon, bool onlyIfSlotIsEmpty) { @@ -2036,7 +2000,6 @@ CPlayerPed::PlayIdleAnimations(CPad *padUsed) } } -// --MIAMI: Done void CPlayerPed::SetNearbyPedsToInteractWithPlayer(void) { @@ -2071,7 +2034,6 @@ CPlayerPed::SetNearbyPedsToInteractWithPlayer(void) } } -// --MIAMI: Done void CPlayerPed::UpdateMeleeAttackers(void) { @@ -2114,7 +2076,6 @@ CPlayerPed::UpdateMeleeAttackers(void) && m_pMeleeList[4] == this && m_pMeleeList[5] == this; } -// --MIAMI: Done void CPlayerPed::RemovePedFromMeleeList(CPed *ped) { @@ -2127,7 +2088,6 @@ CPlayerPed::RemovePedFromMeleeList(CPed *ped) ped->m_attackTimer = 0; } -// --MIAMI: Done void CPlayerPed::GetMeleeAttackCoords(CVector& coords, int8 dir, float dist) { @@ -2160,7 +2120,6 @@ CPlayerPed::GetMeleeAttackCoords(CVector& coords, int8 dir, float dist) } } -// --MIAMI: Done int32 CPlayerPed::FindMeleeAttackPoint(CPed *victim, CVector &dist, uint32 &endOfAttackOut) { diff --git a/src/peds/Population.cpp b/src/peds/Population.cpp index b1943358..5603e2c6 100644 --- a/src/peds/Population.cpp +++ b/src/peds/Population.cpp @@ -29,8 +29,6 @@ #include "Clock.h" #include "WaterLevel.h" -// --MIAMI: File done - #define MIN_CREATION_DIST 40.0f // not for start of the game (look at the GeneratePedsAtStartOfGame) #define CREATION_RANGE 10.0f // added over the MIN_CREATION_DIST. #define OFFSCREEN_CREATION_MULT 0.5f diff --git a/src/render/Antennas.cpp b/src/render/Antennas.cpp index b9da95cb..452069a0 100644 --- a/src/render/Antennas.cpp +++ b/src/render/Antennas.cpp @@ -2,8 +2,6 @@ #include "Antennas.h" -//--MIAMI: file done - CAntenna CAntennas::aAntennas[NUMANTENNAS]; void diff --git a/src/render/Coronas.cpp b/src/render/Coronas.cpp index 515e1000..e3d3416c 100644 --- a/src/render/Coronas.cpp +++ b/src/render/Coronas.cpp @@ -18,8 +18,6 @@ #include "Clock.h" #include "Bridge.h" -//--MIAMI: file done - struct FlareDef { float position; diff --git a/src/render/Credits.cpp b/src/render/Credits.cpp index 6c811b7f..883ad2f2 100644 --- a/src/render/Credits.cpp +++ b/src/render/Credits.cpp @@ -9,8 +9,6 @@ #include "Credits.h" #include "Pad.h" -// --MIAMI: file done - bool CCredits::bCreditsGoing; uint32 CCredits::CreditsStartTime; diff --git a/src/render/Hud.cpp b/src/render/Hud.cpp index b7decdb3..17291a61 100644 --- a/src/render/Hud.cpp +++ b/src/render/Hud.cpp @@ -26,8 +26,6 @@ #include "General.h" #include "VarConsole.h" -// --MIAMI: file done - #if defined(FIX_BUGS) #define SCREEN_SCALE_X_FIX(a) SCREEN_SCALE_X(a) #define SCREEN_SCALE_Y_FIX(a) SCREEN_SCALE_Y(a) diff --git a/src/render/PlayerSkin.cpp b/src/render/PlayerSkin.cpp index 1626716f..ee944ca7 100644 --- a/src/render/PlayerSkin.cpp +++ b/src/render/PlayerSkin.cpp @@ -16,8 +16,6 @@ #include "Lights.h" #include "MemoryMgr.h" -//--MIAMI: file done - RpClump *gpPlayerClump; float gOldFov; diff --git a/src/render/PointLights.cpp b/src/render/PointLights.cpp index c8f21d21..3e73c57f 100644 --- a/src/render/PointLights.cpp +++ b/src/render/PointLights.cpp @@ -11,8 +11,6 @@ #include "Timer.h" #include "PointLights.h" -//--MIAMI: file done - int16 CPointLights::NumLights; CRegisteredPointLight CPointLights::aLights[NUMPOINTLIGHTS]; CVector CPointLights::aCachedMapReads[32]; diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp index 91a34592..7522f832 100644 --- a/src/render/Renderer.cpp +++ b/src/render/Renderer.cpp @@ -26,8 +26,6 @@ #include "custompipes.h" #include "Frontend.h" -//--MIAMI: file done - bool gbShowPedRoadGroups; bool gbShowCarRoadGroups; bool gbShowCollisionPolys; @@ -1198,7 +1196,6 @@ CEntity::RemoveLighting(bool) { } -// --MIAMI: Done bool CPed::SetupLighting(void) { @@ -1224,7 +1221,6 @@ CPed::SetupLighting(void) return false; } -// --MIAMI: Done void CPed::RemoveLighting(bool reset) { diff --git a/src/render/Rubbish.cpp b/src/render/Rubbish.cpp index dada2439..bd69f875 100644 --- a/src/render/Rubbish.cpp +++ b/src/render/Rubbish.cpp @@ -13,8 +13,6 @@ #include "RenderBuffer.h" #include "Rubbish.h" -//--MIAMI: file done - #define RUBBISH_MAX_DIST (23.0f) #define RUBBISH_FADE_DIST (20.0f) diff --git a/src/render/Skidmarks.cpp b/src/render/Skidmarks.cpp index 0251878a..07039c17 100644 --- a/src/render/Skidmarks.cpp +++ b/src/render/Skidmarks.cpp @@ -6,8 +6,6 @@ #include "Replay.h" #include "Skidmarks.h" -//--MIAMI: file done - CSkidmark CSkidmarks::aSkidmarks[NUMSKIDMARKS]; RwImVertexIndex SkidmarkIndexList[SKIDMARK_LENGTH * 6]; diff --git a/src/render/SpecialFX.cpp b/src/render/SpecialFX.cpp index 18e7fd34..35b0b2fc 100644 --- a/src/render/SpecialFX.cpp +++ b/src/render/SpecialFX.cpp @@ -645,8 +645,6 @@ MarkerAtomicCB(RpAtomic *atomic, void *data) return atomic; } -// --MIAMI: C3dMarker and C3dMarkers done - bool C3dMarker::AddMarker(uint32 identifier, uint16 type, float fSize, uint8 r, uint8 g, uint8 b, uint8 a, uint16 pulsePeriod, float pulseFraction, int16 rotateRate) { diff --git a/src/render/Timecycle.cpp b/src/render/Timecycle.cpp index 70926c1a..95d9fe3c 100644 --- a/src/render/Timecycle.cpp +++ b/src/render/Timecycle.cpp @@ -10,8 +10,6 @@ #include "FileMgr.h" #include "Timecycle.h" -//--MIAMI: done - uint8 CTimeCycle::m_nAmbientRed[NUMHOURS][NUMWEATHERS]; uint8 CTimeCycle::m_nAmbientGreen[NUMHOURS][NUMWEATHERS]; uint8 CTimeCycle::m_nAmbientBlue[NUMHOURS][NUMWEATHERS]; diff --git a/src/render/WaterCannon.cpp b/src/render/WaterCannon.cpp index 91304be3..53b4d30e 100644 --- a/src/render/WaterCannon.cpp +++ b/src/render/WaterCannon.cpp @@ -13,8 +13,6 @@ #include "Camera.h" #include "Particle.h" -// --MIAMI: file done - #define WATERCANNONVERTS 4 #define WATERCANNONINDEXES 12 diff --git a/src/render/Weather.cpp b/src/render/Weather.cpp index f5d7402a..ffbd7e8f 100644 --- a/src/render/Weather.cpp +++ b/src/render/Weather.cpp @@ -21,8 +21,6 @@ #include "SpecialFX.h" #include "Replay.h" -//--MIAMI: file done - int32 CWeather::SoundHandle = -1; int32 CWeather::WeatherTypeInList; diff --git a/src/rw/ClumpRead.cpp b/src/rw/ClumpRead.cpp index b8d72d23..9c027dc5 100644 --- a/src/rw/ClumpRead.cpp +++ b/src/rw/ClumpRead.cpp @@ -1,7 +1,5 @@ #include "common.h" -//--MIAMI: done - struct rpGeometryList { RpGeometry **geometries; diff --git a/src/rw/Lights.cpp b/src/rw/Lights.cpp index e0dff850..772e1961 100644 --- a/src/rw/Lights.cpp +++ b/src/rw/Lights.cpp @@ -11,8 +11,6 @@ #include "Frontend.h" #include "MBlur.h" -//--MIAMI: done - RpLight *pAmbient; RpLight *pDirect; RpLight *pExtraDirectionals[4] = { nil }; diff --git a/src/rw/VisibilityPlugins.cpp b/src/rw/VisibilityPlugins.cpp index 83c3c5bc..871ef287 100644 --- a/src/rw/VisibilityPlugins.cpp +++ b/src/rw/VisibilityPlugins.cpp @@ -14,8 +14,6 @@ #include "custompipes.h" #include "MemoryHeap.h" -//--MIAMI: file done - CLinkList<CVisibilityPlugins::AlphaObjectInfo> CVisibilityPlugins::m_alphaList; CLinkList<CVisibilityPlugins::AlphaObjectInfo> CVisibilityPlugins::m_alphaBoatAtomicList; CLinkList<CVisibilityPlugins::AlphaObjectInfo> CVisibilityPlugins::m_alphaEntityList; diff --git a/src/save/GenericGameStorage.cpp b/src/save/GenericGameStorage.cpp index bbf136bf..ee946480 100644 --- a/src/save/GenericGameStorage.cpp +++ b/src/save/GenericGameStorage.cpp @@ -41,8 +41,6 @@ #include "Timecycle.h" #include "Fluff.h" -// --MIAMI: file done - #define BLOCK_COUNT 22 #define SIZE_OF_SIMPLEVARS 0xE4 diff --git a/src/save/PCSave.cpp b/src/save/PCSave.cpp index dd0926cf..70ca31d2 100644 --- a/src/save/PCSave.cpp +++ b/src/save/PCSave.cpp @@ -12,8 +12,6 @@ #include "PCSave.h" #include "Text.h" -// --MIAMI: file done - const char* _psGetUserFilesFolder(); C_PcSave PcSaveHelper; diff --git a/src/skel/events.cpp b/src/skel/events.cpp index 6589ab71..3e1e95b3 100644 --- a/src/skel/events.cpp +++ b/src/skel/events.cpp @@ -9,8 +9,6 @@ #include "events.h" -// --MIAMI: file done - /* ***************************************************************************** */ diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp index 9b2a768e..3154ad99 100644 --- a/src/skel/glfw/glfw.cpp +++ b/src/skel/glfw/glfw.cpp @@ -44,8 +44,6 @@ #define MAX_SUBSYSTEMS (16) -// --MIAMI: file done - rw::EngineOpenParams openParams; static RwBool ForegroundApp = TRUE; diff --git a/src/skel/skeleton.cpp b/src/skel/skeleton.cpp index 6f6b3744..2bb23460 100644 --- a/src/skel/skeleton.cpp +++ b/src/skel/skeleton.cpp @@ -13,8 +13,6 @@ #include "main.h" #include "MemoryHeap.h" -// --MIAMI: file done - static RwBool DefaultVideoMode = TRUE; RsGlobalType RsGlobal; diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp index a5f721c8..84a010de 100644 --- a/src/skel/win/win.cpp +++ b/src/skel/win/win.cpp @@ -53,8 +53,6 @@ #define MAX_SUBSYSTEMS (16) -// --MIAMI: file done - static RwBool ForegroundApp = TRUE; static RwBool RwInitialised = FALSE; diff --git a/src/text/Messages.cpp b/src/text/Messages.cpp index db0865ae..81339ae0 100644 --- a/src/text/Messages.cpp +++ b/src/text/Messages.cpp @@ -11,8 +11,6 @@ #include "Font.h" -// --MIAMI: file done - tMessage CMessages::BriefMessages[NUMBRIEFMESSAGES]; tPreviousBrief CMessages::PreviousBriefs[NUMPREVIOUSBRIEFS]; tBigMessage CMessages::BIGMessages[NUMBIGMESSAGES]; diff --git a/src/text/Text.cpp b/src/text/Text.cpp index 7afd64d2..5f55d4f7 100644 --- a/src/text/Text.cpp +++ b/src/text/Text.cpp @@ -9,8 +9,6 @@ #include "Text.h" #include "Timer.h" -//--MIAMI: file done - static wchar WideErrorString[25]; CText TheText; diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp index 89ba43d9..8a5426ed 100644 --- a/src/vehicles/Automobile.cpp +++ b/src/vehicles/Automobile.cpp @@ -50,8 +50,6 @@ #include "Automobile.h" #include "Bike.h" -//--MIAMI: file done - bool bAllCarCheat; RwObject *GetCurrentAtomicObjectCB(RwObject *object, void *data); @@ -5130,7 +5128,6 @@ CAutomobile::HasCarStoppedBecauseOfLight(void) return false; } -// --MIAMI: Done void CPed::DeadPedMakesTyresBloody(void) { @@ -5154,7 +5151,6 @@ CPed::DeadPedMakesTyresBloody(void) } } -// --MIAMI: Done void CPed::MakeTyresMuddySectorList(CPtrList &list) { diff --git a/src/vehicles/Bike.cpp b/src/vehicles/Bike.cpp index d588e777..a84a43e5 100644 --- a/src/vehicles/Bike.cpp +++ b/src/vehicles/Bike.cpp @@ -37,8 +37,6 @@ #include "Bike.h" #include "Debug.h" -//--MIAMI: file done - const uint32 CBike::nSaveStructSize = #ifdef COMPATIBLE_SAVES 1260; diff --git a/src/vehicles/Boat.cpp b/src/vehicles/Boat.cpp index 807b43b1..adaab72c 100644 --- a/src/vehicles/Boat.cpp +++ b/src/vehicles/Boat.cpp @@ -28,8 +28,6 @@ #include "Record.h" #include "Shadows.h" -//--MIAMI: file done - #define INVALID_ORIENTATION (-9999.99f) float CBoat::MAX_WAKE_LENGTH = 50.0f; @@ -1253,7 +1251,7 @@ CBoat::Teleport(CVector v) CWorld::Add(this); } -//--MIAMI: unused +// unused bool CBoat::IsSectorAffectedByWake(CVector2D sector, float fSize, CBoat **apBoats) { @@ -1285,7 +1283,7 @@ CBoat::IsSectorAffectedByWake(CVector2D sector, float fSize, CBoat **apBoats) return numVerts != 0; } -//--MIAMI: unused +// unused float CBoat::IsVertexAffectedByWake(CVector vecVertex, CBoat *pBoat) { diff --git a/src/vehicles/CarGen.cpp b/src/vehicles/CarGen.cpp index 77d66cbf..78e67d49 100644 --- a/src/vehicles/CarGen.cpp +++ b/src/vehicles/CarGen.cpp @@ -18,8 +18,6 @@ #include "Zones.h" #include "Occlusion.h" -// --MIAMI: file done - uint8 CTheCarGenerators::ProcessCounter; uint32 CTheCarGenerators::NumOfCarGenerators; CCarGenerator CTheCarGenerators::CarGeneratorArray[NUM_CARGENS]; diff --git a/src/vehicles/Cranes.cpp b/src/vehicles/Cranes.cpp index 8433a0ba..b5926867 100644 --- a/src/vehicles/Cranes.cpp +++ b/src/vehicles/Cranes.cpp @@ -12,8 +12,6 @@ #include "Object.h" #include "World.h" -// --MIAMI: file done - #define MAX_DISTANCE_TO_FIND_CRANE (10.0f) #define CRANE_UPDATE_RADIUS (300.0f) #define CRANE_MOVEMENT_PROCESSING_RADIUS (150.0f) diff --git a/src/vehicles/Floater.cpp b/src/vehicles/Floater.cpp index 92e3d80e..08688a3c 100644 --- a/src/vehicles/Floater.cpp +++ b/src/vehicles/Floater.cpp @@ -7,8 +7,6 @@ #include "Vehicle.h" #include "Floater.h" -//--MIAMI: done - cBuoyancy mod_Buoyancy; float fVolMultiplier = 1.0f; diff --git a/src/vehicles/HandlingMgr.cpp b/src/vehicles/HandlingMgr.cpp index 9aa834ac..8438c5c9 100644 --- a/src/vehicles/HandlingMgr.cpp +++ b/src/vehicles/HandlingMgr.cpp @@ -5,8 +5,6 @@ #include "Physical.h" #include "HandlingMgr.h" -//--MIAMI: done - cHandlingDataMgr mod_HandlingManager; const char *HandlingFilename = "HANDLING.CFG"; diff --git a/src/vehicles/Heli.cpp b/src/vehicles/Heli.cpp index fc4f7bac..38550c38 100644 --- a/src/vehicles/Heli.cpp +++ b/src/vehicles/Heli.cpp @@ -32,8 +32,6 @@ #include "Replay.h" #endif -//--MIAMI: done - enum { HELI_STATUS_HOVER, diff --git a/src/vehicles/Plane.cpp b/src/vehicles/Plane.cpp index 5b5536fd..48f7b8c0 100644 --- a/src/vehicles/Plane.cpp +++ b/src/vehicles/Plane.cpp @@ -20,8 +20,6 @@ #include "Plane.h" #include "MemoryHeap.h" -//--MIAMI: file done - CPlaneNode *pPathNodes; CPlaneNode *pPath2Nodes; CPlaneNode *pPath3Nodes; @@ -1004,7 +1002,7 @@ CPlane::TestRocketCollision(CVector *rocketPos) return false; } -//--MIAMI: unused +// unused // BUG: not in CPlane in the game void CPlane::CreateIncomingCesna(void) @@ -1028,7 +1026,7 @@ CPlane::CreateIncomingCesna(void) printf("CPlane::CreateIncomingCesna(void)\n"); } -//--MIAMI: unused +// unused void CPlane::CreateDropOffCesna(void) { @@ -1051,7 +1049,7 @@ CPlane::CreateDropOffCesna(void) printf("CPlane::CreateDropOffCesna(void)\n"); } -//--MIAMI: all unused +// all unused const CVector CPlane::FindDrugPlaneCoordinates(void) { return pDrugRunCesna->GetPosition(); } const CVector CPlane::FindDropOffCesnaCoordinates(void) { return pDropOffCesna->GetPosition(); } bool CPlane::HasCesnaLanded(void) { return CesnaMissionStatus == CESNA_STATUS_LANDED; } diff --git a/src/vehicles/Transmission.cpp b/src/vehicles/Transmission.cpp index b3e1af7d..1aeabfe0 100644 --- a/src/vehicles/Transmission.cpp +++ b/src/vehicles/Transmission.cpp @@ -4,8 +4,6 @@ #include "HandlingMgr.h" #include "Transmission.h" -//--MIAMI: done - void cTransmission::InitGearRatios(void) { diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp index cda21563..07b290d6 100644 --- a/src/vehicles/Vehicle.cpp +++ b/src/vehicles/Vehicle.cpp @@ -33,8 +33,6 @@ #include "Weather.h" #include "Coronas.h" -//--MIAMI: done - bool CVehicle::bWheelsOnlyCheat; bool CVehicle::bAllDodosCheat; bool CVehicle::bCheat3; diff --git a/src/weapons/BulletInfo.cpp b/src/weapons/BulletInfo.cpp index 13032300..445f31a0 100644 --- a/src/weapons/BulletInfo.cpp +++ b/src/weapons/BulletInfo.cpp @@ -25,8 +25,6 @@ #include "SurfaceTable.h" #include "Heli.h" -// --MIAMI: file done - #ifdef SQUEEZE_PERFORMANCE uint32 bulletInfoInUse; #endif diff --git a/src/weapons/ProjectileInfo.cpp b/src/weapons/ProjectileInfo.cpp index 0930756c..10aa3ef5 100644 --- a/src/weapons/ProjectileInfo.cpp +++ b/src/weapons/ProjectileInfo.cpp @@ -17,8 +17,6 @@ uint32 projectileInUse; #endif -// --MIAMI: file done except TODOs - CProjectileInfo gaProjectileInfo[NUM_PROJECTILES]; CProjectile *CProjectileInfo::ms_apProjectile[NUM_PROJECTILES]; diff --git a/src/weapons/ShotInfo.cpp b/src/weapons/ShotInfo.cpp index a03ed16f..788bcbe1 100644 --- a/src/weapons/ShotInfo.cpp +++ b/src/weapons/ShotInfo.cpp @@ -10,8 +10,6 @@ #include "Ped.h" #include "Fire.h" -// --MIAMI: file done - CShotInfo gaShotInfo[NUMSHOTINFOS]; float CShotInfo::ms_afRandTable[20]; diff --git a/src/weapons/Weapon.cpp b/src/weapons/Weapon.cpp index 17e0b313..3ef7d2a1 100644 --- a/src/weapons/Weapon.cpp +++ b/src/weapons/Weapon.cpp @@ -3173,7 +3173,6 @@ CWeapon::HasWeaponAmmoToBeUsed(void) return m_nAmmoTotal != 0; } -// --MIAMI: Done bool CPed::IsPedDoingDriveByShooting(void) { |