diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-08 22:20:09 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-08 22:20:09 +0100 |
| commit | a9559f03b020b16aa64dee1554b22e960c9dcc14 (patch) | |
| tree | a04816d8ee48d651e80afec26f7682a04c69ac09 /src/control/Script2.cpp | |
| parent | Merge branch 'lcs-dev' into lcs (diff) | |
| download | re3-a9559f03b020b16aa64dee1554b22e960c9dcc14.tar re3-a9559f03b020b16aa64dee1554b22e960c9dcc14.tar.gz re3-a9559f03b020b16aa64dee1554b22e960c9dcc14.tar.bz2 re3-a9559f03b020b16aa64dee1554b22e960c9dcc14.tar.lz re3-a9559f03b020b16aa64dee1554b22e960c9dcc14.tar.xz re3-a9559f03b020b16aa64dee1554b22e960c9dcc14.tar.zst re3-a9559f03b020b16aa64dee1554b22e960c9dcc14.zip | |
Diffstat (limited to 'src/control/Script2.cpp')
| -rw-r--r-- | src/control/Script2.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/control/Script2.cpp b/src/control/Script2.cpp index a94bf907..10f122ca 100644 --- a/src/control/Script2.cpp +++ b/src/control/Script2.cpp @@ -168,7 +168,7 @@ int8 CRunningScript::ProcessCommands300To399(int32 command) */ case COMMAND_DISPLAY_ONSCREEN_TIMER: { - script_assert(CTheScripts::ScriptSpace[m_nIp] == ARGUMENT_GLOBALVAR); + //script_assert(CTheScripts::ScriptSpace[m_nIp] == ARGUMENT_GLOBALVAR); m_nIp++; uint16 offset = CTheScripts::Read2BytesFromScript(&m_nIp); CollectParameters(&m_nIp, 1); @@ -177,14 +177,14 @@ int8 CRunningScript::ProcessCommands300To399(int32 command) } case COMMAND_CLEAR_ONSCREEN_TIMER: { - script_assert(CTheScripts::ScriptSpace[m_nIp] == ARGUMENT_GLOBALVAR); + //script_assert(CTheScripts::ScriptSpace[m_nIp] == ARGUMENT_GLOBALVAR); m_nIp++; CUserDisplay::OnscnTimer.ClearClock((uint16)CTheScripts::Read2BytesFromScript(&m_nIp)); return 0; } case COMMAND_DISPLAY_ONSCREEN_COUNTER: { - script_assert(CTheScripts::ScriptSpace[m_nIp] == ARGUMENT_GLOBALVAR); + //script_assert(CTheScripts::ScriptSpace[m_nIp] == ARGUMENT_GLOBALVAR); m_nIp++; int16 counter = CTheScripts::Read2BytesFromScript(&m_nIp); CollectParameters(&m_nIp, 1); @@ -193,7 +193,7 @@ int8 CRunningScript::ProcessCommands300To399(int32 command) } case COMMAND_CLEAR_ONSCREEN_COUNTER: { - script_assert(CTheScripts::ScriptSpace[m_nIp] == ARGUMENT_GLOBALVAR); + //script_assert(CTheScripts::ScriptSpace[m_nIp] == ARGUMENT_GLOBALVAR); m_nIp++; CUserDisplay::OnscnTimer.ClearCounter((uint16)CTheScripts::Read2BytesFromScript(&m_nIp)); return 0; @@ -590,7 +590,7 @@ int8 CRunningScript::ProcessCommands300To399(int32 command) //case COMMAND_MOVE_CAMERA_ALONG_SPLINE: //case COMMAND_GET_CAMERA_POSITION_ALONG_SPLINE: case COMMAND_DECLARE_MISSION_FLAG: - CTheScripts::OnAMissionFlag = (uint16)CTheScripts::Read2BytesFromScript(&++m_nIp); + CTheScripts::OnAMissionFlag = GetPointerToScriptVariable(&m_nIp, VAR_GLOBAL) - (int32*)CTheScripts::ScriptSpace; return 0; case COMMAND_DECLARE_MISSION_FLAG_FOR_CONTACT: return 0; |