From 1ba696f5fca9dfc7c6f6d4f5f2537392b96cfc63 Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Sun, 23 Feb 2020 13:12:44 +0300 Subject: some changes --- src/core/Frontend.cpp | 4 ++-- src/core/PlayerInfo.cpp | 4 ++-- src/core/Radar.cpp | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/core') 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) -- cgit v1.2.3 From 56c83dfaaebffc1eabec01671c2da892661059af Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Mon, 24 Feb 2020 21:17:15 +0300 Subject: more stuff + intro fix --- src/core/main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/core') diff --git a/src/core/main.cpp b/src/core/main.cpp index 2f266a9e..90afff72 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -48,6 +48,7 @@ #include "RpAnimBlend.h" #include "Frontend.h" #include "AnimViewer.h" +#include "Script.h" #define DEFAULT_VIEWWINDOW (Tan(DEGTORAD(CDraw::GetFOV() * 0.5f))) @@ -356,7 +357,7 @@ RenderScene(void) void RenderDebugShit(void) { - // CTheScripts::RenderTheScriptDebugLines() + CTheScripts::RenderTheScriptDebugLines(); if(gbShowCollisionLines) CRenderer::RenderCollisionLines(); } -- cgit v1.2.3