diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-23 21:04:24 +0100 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-23 21:04:24 +0100 |
commit | 37d1aa41296f3ea1e912041d4fc201df54ad2639 (patch) | |
tree | 5b01aa010def0f2dcc739559237d627ceb44e3eb /src/control/Script10.cpp | |
parent | added some missing functions (diff) | |
download | re3-37d1aa41296f3ea1e912041d4fc201df54ad2639.tar re3-37d1aa41296f3ea1e912041d4fc201df54ad2639.tar.gz re3-37d1aa41296f3ea1e912041d4fc201df54ad2639.tar.bz2 re3-37d1aa41296f3ea1e912041d4fc201df54ad2639.tar.lz re3-37d1aa41296f3ea1e912041d4fc201df54ad2639.tar.xz re3-37d1aa41296f3ea1e912041d4fc201df54ad2639.tar.zst re3-37d1aa41296f3ea1e912041d4fc201df54ad2639.zip |
Diffstat (limited to '')
-rw-r--r-- | src/control/Script10.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/control/Script10.cpp b/src/control/Script10.cpp index 536701b3..fef33848 100644 --- a/src/control/Script10.cpp +++ b/src/control/Script10.cpp @@ -74,7 +74,7 @@ int8 CRunningScript::ProcessCommands1600To1699(int32 command) case COMMAND_ADD_ARROW_3D_MARKER: { uint32 ip = m_nIp; - uint32 id = (uint32)(uintptr)GetPointerToScriptVariable(&m_nIp, 0); + uint32 id = (uint32)(uintptr)GetPointerToScriptVariable(&ip, 0); CollectParameters(&m_nIp, 10); CVector pos = GET_VECTOR_PARAM(0); CVector dir = GET_VECTOR_PARAM(3); @@ -213,7 +213,7 @@ int8 CRunningScript::ProcessCommands1600To1699(int32 command) case COMMAND_PRINT_WITH_2_NUMBERS_NOW_NO_BRIEF: { wchar* key = CTheScripts::GetTextByKeyFromScript(&m_nIp); - CollectParameters(&m_nIp, 3); + CollectParameters(&m_nIp, 4); CMessages::AddMessageJumpQWithNumber(key, GET_INTEGER_PARAM(2), GET_INTEGER_PARAM(3), GET_INTEGER_PARAM(0), GET_INTEGER_PARAM(1), -1, -1, -1, -1); // 0 return 0; } @@ -321,6 +321,7 @@ int8 CRunningScript::ProcessCommands1600To1699(int32 command) strncpy(onscreen_str2, (char*)&CTheScripts::ScriptSpace[m_nIp], KEY_LENGTH_IN_SCRIPT); m_nIp += KEY_LENGTH_IN_SCRIPT; CUserDisplay::OnscnTimer.AddCounter(var, GET_INTEGER_PARAM(1), onscreen_str1, 0); // TODO - second set of data + return 0; } case COMMAND_GET_PLAYER_STORED_WEAPON: { |