summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-04-10 10:23:35 +0200
committerSergeanur <s.anureev@yandex.ua>2020-04-10 10:23:35 +0200
commit8917567508f1c98ba96579fdc0516cd07902c74d (patch)
treeec7078b2f0bbf736570f5a78e8db66a2a114f244 /src/control
parentFix sprite vertical scale (diff)
downloadre3-8917567508f1c98ba96579fdc0516cd07902c74d.tar
re3-8917567508f1c98ba96579fdc0516cd07902c74d.tar.gz
re3-8917567508f1c98ba96579fdc0516cd07902c74d.tar.bz2
re3-8917567508f1c98ba96579fdc0516cd07902c74d.tar.lz
re3-8917567508f1c98ba96579fdc0516cd07902c74d.tar.xz
re3-8917567508f1c98ba96579fdc0516cd07902c74d.tar.zst
re3-8917567508f1c98ba96579fdc0516cd07902c74d.zip
Diffstat (limited to '')
-rw-r--r--src/control/CarCtrl.cpp2
-rw-r--r--src/control/CarGen.cpp2
-rw-r--r--src/control/Script.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp
index 3174a253..cdcfbba6 100644
--- a/src/control/CarCtrl.cpp
+++ b/src/control/CarCtrl.cpp
@@ -90,7 +90,7 @@ uint32 (&aCarsToKeepTime)[MAX_CARS_TO_KEEP] = *(uint32(*)[MAX_CARS_TO_KEEP])*(ui
void
CCarCtrl::GenerateRandomCars()
{
- if (CCutsceneMgr::IsCutsceneProcessing())
+ if (CCutsceneMgr::IsRunning())
return;
if (NumRandomCars < 30){
if (CountDownToCarsAtStart == 0){
diff --git a/src/control/CarGen.cpp b/src/control/CarGen.cpp
index 49a96f50..721ac35a 100644
--- a/src/control/CarGen.cpp
+++ b/src/control/CarGen.cpp
@@ -242,7 +242,7 @@ void CCarGenerator::Load(uint8 *&buffer)
void CTheCarGenerators::Process()
{
- if (FindPlayerTrain() || CCutsceneMgr::IsRunning())
+ if (FindPlayerTrain() || CCutsceneMgr::IsCutsceneProcessing())
return;
if (++CTheCarGenerators::ProcessCounter == 4)
CTheCarGenerators::ProcessCounter = 0;
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index ddea0e3c..b7876172 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -8442,7 +8442,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
CPlayerInfo* pPlayerInfo = &CWorld::Players[ScriptParams[0]];
CPad::GetPad(ScriptParams[0])->DisablePlayerControls |= PLAYERCONTROL_DISABLED_80;
pPlayerInfo->MakePlayerSafe(true);
- CCutsceneMgr::SetRunning(true);
+ CCutsceneMgr::StartCutsceneProcessing();
return 0;
}
case COMMAND_USE_TEXT_COMMANDS: