summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorwithmorten <morten.with@gmail.com>2021-01-22 11:43:29 +0100
committerwithmorten <morten.with@gmail.com>2021-01-22 11:43:29 +0100
commitfeb993e751ad8baccedc0547383913069846f8f5 (patch)
treefbd4f659dc001beb12adef014e28d18cd71b6408 /src/core
parentMerge pull request #974 from withmorten/miami-wantedlevel (diff)
downloadre3-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/core')
-rw-r--r--src/core/Accident.cpp2
-rw-r--r--src/core/Cam.cpp2
-rw-r--r--src/core/Clock.cpp2
-rw-r--r--src/core/ControllerConfig.cpp2
-rw-r--r--src/core/EventList.cpp2
-rw-r--r--src/core/FileLoader.cpp4
-rw-r--r--src/core/Fire.cpp2
-rw-r--r--src/core/Frontend.cpp2
-rw-r--r--src/core/Game.cpp2
-rw-r--r--src/core/General.h2
-rw-r--r--src/core/IniFile.cpp2
-rw-r--r--src/core/Pad.cpp2
-rw-r--r--src/core/PlayerInfo.cpp2
-rw-r--r--src/core/Pools.cpp2
-rw-r--r--src/core/Radar.cpp2
-rw-r--r--src/core/Stats.cpp2
-rw-r--r--src/core/Streaming.cpp2
-rw-r--r--src/core/SurfaceTable.cpp2
-rw-r--r--src/core/Timer.cpp2
-rw-r--r--src/core/User.cpp2
-rw-r--r--src/core/Wanted.cpp2
-rw-r--r--src/core/World.cpp2
-rw-r--r--src/core/ZoneCull.cpp2
-rw-r--r--src/core/Zones.cpp6
-rw-r--r--src/core/main.cpp4
25 files changed, 3 insertions, 55 deletions
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)
{