From d1317f8fa649120f841f8c1f8bcf17b3ee74c235 Mon Sep 17 00:00:00 2001 From: withmorten Date: Fri, 22 Jan 2021 00:20:51 +0100 Subject: m_nWantedLevel -> GetWantedLevel() --- src/render/Hud.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/render') diff --git a/src/render/Hud.cpp b/src/render/Hud.cpp index 238dfbb5..b7decdb3 100644 --- a/src/render/Hud.cpp +++ b/src/render/Hud.cpp @@ -619,11 +619,11 @@ void CHud::Draw() /* DrawWantedLevel */ - if (m_LastWanted == playerPed->m_pWanted->m_nWantedLevel) { + if (m_LastWanted == playerPed->m_pWanted->GetWantedLevel()) { alpha = DrawFadeState(HUD_WANTED_FADING, 0); } else { alpha = DrawFadeState(HUD_WANTED_FADING, 1); - m_LastWanted = playerPed->m_pWanted->m_nWantedLevel; + m_LastWanted = playerPed->m_pWanted->GetWantedLevel(); } if (m_WantedState != FADED_OUT) { @@ -639,7 +639,7 @@ void CHud::Draw() for (int i = 0; i < 6; i++) { if (FrontEndMenuManager.m_PrefsShowHud) { - if (playerPed->m_pWanted->m_nWantedLevel > i + if (playerPed->m_pWanted->GetWantedLevel() > i && (CTimer::GetTimeInMilliseconds() > playerPed->m_pWanted->m_nLastWantedLevelChange + 2000 || CTimer::GetFrameCounter() & 4)) { @@ -652,7 +652,7 @@ void CHud::Draw() CFont::SetColor(WANTED_COLOR_FLASH); CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(110.0f + 23.0f * i), SCREEN_SCALE_Y(87.0f), sPrintIcon); - } else if (playerPed->m_pWanted->m_nWantedLevel <= i) { + } else if (playerPed->m_pWanted->GetWantedLevel() <= i) { NOTWANTED_COLOR.a = alpha; CFont::SetColor(NOTWANTED_COLOR); CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(110.0f + 23.0f * i), SCREEN_SCALE_Y(87.0f), sPrintIcon); -- cgit v1.2.3 From feb993e751ad8baccedc0547383913069846f8f5 Mon Sep 17 00:00:00 2001 From: withmorten Date: Fri, 22 Jan 2021 11:43:29 +0100 Subject: get rid of most --MIAMI comments --- src/render/Antennas.cpp | 2 -- src/render/Coronas.cpp | 2 -- src/render/Credits.cpp | 2 -- src/render/Hud.cpp | 2 -- src/render/PlayerSkin.cpp | 2 -- src/render/PointLights.cpp | 2 -- src/render/Renderer.cpp | 4 ---- src/render/Rubbish.cpp | 2 -- src/render/Skidmarks.cpp | 2 -- src/render/SpecialFX.cpp | 2 -- src/render/Timecycle.cpp | 2 -- src/render/WaterCannon.cpp | 2 -- src/render/Weather.cpp | 2 -- 13 files changed, 28 deletions(-) (limited to 'src/render') 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; -- cgit v1.2.3