diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-06 01:01:03 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-06 01:01:03 +0200 |
| commit | 7f8a78e5decdf23bf0d06674c336f4e3169eaa6a (patch) | |
| tree | ee0c2b666cacfd6f6a0ee9f36eca6237a78a6df2 /src/control/Script.cpp | |
| parent | Merge branch 'master' into garages_dev (diff) | |
| download | re3-7f8a78e5decdf23bf0d06674c336f4e3169eaa6a.tar re3-7f8a78e5decdf23bf0d06674c336f4e3169eaa6a.tar.gz re3-7f8a78e5decdf23bf0d06674c336f4e3169eaa6a.tar.bz2 re3-7f8a78e5decdf23bf0d06674c336f4e3169eaa6a.tar.lz re3-7f8a78e5decdf23bf0d06674c336f4e3169eaa6a.tar.xz re3-7f8a78e5decdf23bf0d06674c336f4e3169eaa6a.tar.zst re3-7f8a78e5decdf23bf0d06674c336f4e3169eaa6a.zip | |
Diffstat (limited to 'src/control/Script.cpp')
| -rw-r--r-- | src/control/Script.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 8a79ba1d..6409f339 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -2229,6 +2229,7 @@ int8 CRunningScript::ProcessCommands100To199(int32 command) if (pos.z <= -100) pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y); UpdateCompareFlag(TheCamera.IsSphereVisible(pos, *(float*)&ScriptParams[3])); + return 0; } case COMMAND_DEBUG_ON: CTheScripts::DbgFlag = true; @@ -7657,13 +7658,13 @@ int8 CRunningScript::ProcessCommands900To999(int32 command) assert(pObject); if (ScriptParams[1]) { if (pObject->bIsStatic) { - pObject->bIsStatic = true; + pObject->bIsStatic = false; pObject->AddToMovingList(); } } else { if (!pObject->bIsStatic) { - pObject->bIsStatic = false; + pObject->bIsStatic = true; pObject->RemoveFromMovingList(); } } @@ -11037,6 +11038,7 @@ void CRunningScript::DoDeatharrestCheck() int contactFlagOffset = CTheScripts::OnAMissionForContactFlag[contact]; if (contactFlagOffset && CTheScripts::ScriptSpace[contactFlagOffset] == 1) { messageId += CTheScripts::BaseBriefIdForContact[contact]; + found = true; } } if (!found) @@ -11331,6 +11333,7 @@ INITSAVEBUF break; case 4: InvisibilitySettingArray[i] = CPools::GetDummyPool()->GetSlot(handle - 1); + break; default: assert(false); } |