diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-02-23 11:12:44 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-02-23 11:12:44 +0100 |
| commit | 1ba696f5fca9dfc7c6f6d4f5f2537392b96cfc63 (patch) | |
| tree | 03f1c90f1578c84d2c41beaf077108bd915a8217 /src/core | |
| parent | some cosmetic stuff (diff) | |
| download | re3-1ba696f5fca9dfc7c6f6d4f5f2537392b96cfc63.tar re3-1ba696f5fca9dfc7c6f6d4f5f2537392b96cfc63.tar.gz re3-1ba696f5fca9dfc7c6f6d4f5f2537392b96cfc63.tar.bz2 re3-1ba696f5fca9dfc7c6f6d4f5f2537392b96cfc63.tar.lz re3-1ba696f5fca9dfc7c6f6d4f5f2537392b96cfc63.tar.xz re3-1ba696f5fca9dfc7c6f6d4f5f2537392b96cfc63.tar.zst re3-1ba696f5fca9dfc7c6f6d4f5f2537392b96cfc63.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Frontend.cpp | 4 | ||||
| -rw-r--r-- | src/core/PlayerInfo.cpp | 4 | ||||
| -rw-r--r-- | src/core/Radar.cpp | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp index 751ca23f..181ceb60 100644 --- a/src/core/Frontend.cpp +++ b/src/core/Frontend.cpp @@ -732,7 +732,7 @@ void CMenuManager::Draw() textToPrint[MENUCOLUMN_RIGHT] = TheText.Get(gString); break; case MENUACTION_SETDBGFLAG: - textToPrint[MENUCOLUMN_RIGHT] = TheText.Get(CTheScripts::DbgFlag ? "FEM_ON" : "FEM_OFF"); + textToPrint[MENUCOLUMN_RIGHT] = TheText.Get(CTheScripts::IsDebugOn() ? "FEM_ON" : "FEM_OFF"); break; case MENUACTION_SWITCHBIGWHITEDEBUGLIGHT: textToPrint[MENUCOLUMN_RIGHT] = TheText.Get(gbBigWhiteDebugLightSwitchedOn ? "FEM_ON" : "FEM_OFF"); @@ -2150,7 +2150,7 @@ void CMenuManager::ProcessOnOffMenuOptions() SaveSettings(); break; case MENUACTION_SETDBGFLAG: - CTheScripts::DbgFlag = !CTheScripts::DbgFlag; + CTheScripts::InvertDebugFlag(); DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SUCCESS, 0); break; case MENUACTION_SWITCHBIGWHITEDEBUGLIGHT: diff --git a/src/core/PlayerInfo.cpp b/src/core/PlayerInfo.cpp index a01c1398..633be810 100644 --- a/src/core/PlayerInfo.cpp +++ b/src/core/PlayerInfo.cpp @@ -164,7 +164,7 @@ void CPlayerInfo::MakePlayerSafe(bool toggle)
{
if (toggle) {
- CTheScripts::CountdownToMakePlayerUnsafe = 0;
+ CTheScripts::ResetCountdownToMakePlayerUnsafe();
m_pPed->m_pWanted->m_bIgnoredByEveryone = true;
CWorld::StopAllLawEnforcersInTheirTracks();
CPad::GetPad(0)->DisablePlayerControls |= PLAYERCONTROL_DISABLED_20;
@@ -185,7 +185,7 @@ CPlayerInfo::MakePlayerSafe(bool toggle) CWorld::ExtinguishAllCarFiresInArea(GetPos(), 4000.0f);
CReplay::DisableReplays();
- } else if (!CGame::playingIntro && !CTheScripts::CountdownToMakePlayerUnsafe) {
+ } else if (!CGame::playingIntro && !CTheScripts::IsCountdownToMakePlayerUnsafeOn()) {
m_pPed->m_pWanted->m_bIgnoredByEveryone = false;
CPad::GetPad(0)->DisablePlayerControls &= ~PLAYERCONTROL_DISABLED_20;
m_pPed->bBulletProof = false;
diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp index ab7de13e..6a1446da 100644 --- a/src/core/Radar.cpp +++ b/src/core/Radar.cpp @@ -325,7 +325,7 @@ void CRadar::DrawBlips() if (blipEntity) { uint32 color = GetRadarTraceColour(ms_RadarTrace[blipId].m_nColor, ms_RadarTrace[blipId].m_bDim); if (ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_MARKER_ONLY) { - if (CTheScripts::DbgFlag) { + if (CTheScripts::IsDebugOn()) { ShowRadarMarker(blipEntity->GetPosition(), color, ms_RadarTrace[blipId].m_Radius); ms_RadarTrace[blipId].m_Radius = ms_RadarTrace[blipId].m_Radius - 0.1f; if (ms_RadarTrace[blipId].m_Radius < 1.0f) @@ -364,7 +364,7 @@ void CRadar::DrawBlips() uint32 color = GetRadarTraceColour(ms_RadarTrace[blipId].m_nColor, ms_RadarTrace[blipId].m_bDim); if (ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_MARKER_ONLY) { - if (CTheScripts::DbgFlag) { + if (CTheScripts::IsDebugOn()) { ShowRadarMarker(ms_RadarTrace[blipId].m_vecPos, color, ms_RadarTrace[blipId].m_Radius); ms_RadarTrace[blipId].m_Radius = ms_RadarTrace[blipId].m_Radius - 0.1f; if (ms_RadarTrace[blipId].m_Radius < 1.0f) @@ -429,7 +429,7 @@ void CRadar::DrawBlips() if (blipEntity) { uint32 color = GetRadarTraceColour(ms_RadarTrace[blipId].m_nColor, ms_RadarTrace[blipId].m_bDim); if (ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_MARKER_ONLY) { - if (CTheScripts::DbgFlag) { + if (CTheScripts::IsDebugOn()) { ShowRadarMarker(blipEntity->GetPosition(), color, ms_RadarTrace[blipId].m_Radius); ms_RadarTrace[blipId].m_Radius = ms_RadarTrace[blipId].m_Radius - 0.1f; if (ms_RadarTrace[blipId].m_Radius < 1.0f) @@ -478,7 +478,7 @@ void CRadar::DrawBlips() uint32 color = GetRadarTraceColour(ms_RadarTrace[blipId].m_nColor, ms_RadarTrace[blipId].m_bDim); if (ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_MARKER_ONLY) { - if (CTheScripts::DbgFlag) { + if (CTheScripts::IsDebugOn()) { ShowRadarMarker(ms_RadarTrace[blipId].m_vecPos, color, ms_RadarTrace[blipId].m_Radius); ms_RadarTrace[blipId].m_Radius = ms_RadarTrace[blipId].m_Radius - 0.1f; if (ms_RadarTrace[blipId].m_Radius < 1.0f) |