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/control | |
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/control')
-rw-r--r-- | src/control/AutoPilot.cpp | 2 | ||||
-rw-r--r-- | src/control/Bridge.cpp | 2 | ||||
-rw-r--r-- | src/control/CarAI.cpp | 2 | ||||
-rw-r--r-- | src/control/CarCtrl.cpp | 4 | ||||
-rw-r--r-- | src/control/Curves.cpp | 2 | ||||
-rw-r--r-- | src/control/Darkel.cpp | 2 | ||||
-rw-r--r-- | src/control/GameLogic.cpp | 2 | ||||
-rw-r--r-- | src/control/Garages.cpp | 2 | ||||
-rw-r--r-- | src/control/OnscreenTimer.cpp | 2 | ||||
-rw-r--r-- | src/control/PathFind.cpp | 2 | ||||
-rw-r--r-- | src/control/Phones.cpp | 2 | ||||
-rw-r--r-- | src/control/Pickups.cpp | 5 | ||||
-rw-r--r-- | src/control/Record.cpp | 2 | ||||
-rw-r--r-- | src/control/Remote.cpp | 2 | ||||
-rw-r--r-- | src/control/Replay.cpp | 2 | ||||
-rw-r--r-- | src/control/Restart.cpp | 2 | ||||
-rw-r--r-- | src/control/RoadBlocks.cpp | 2 | ||||
-rw-r--r-- | src/control/SceneEdit.cpp | 2 | ||||
-rw-r--r-- | src/control/Script.cpp | 2 | ||||
-rw-r--r-- | src/control/SetPieces.cpp | 2 | ||||
-rw-r--r-- | src/control/TrafficLights.cpp | 2 |
21 files changed, 0 insertions, 47 deletions
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 |