From 9187873396500555041325ac0baf40c14488c765 Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Thu, 26 Aug 2021 00:34:31 +0300 Subject: Onscreen timer --- src/control/Script10.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/control/Script10.cpp') diff --git a/src/control/Script10.cpp b/src/control/Script10.cpp index 2fd1c322..b6489843 100644 --- a/src/control/Script10.cpp +++ b/src/control/Script10.cpp @@ -242,7 +242,7 @@ int8 CRunningScript::ProcessCommands1600To1699(int32 command) { uint16 offset = (uint8*)GetPointerToScriptVariable(&m_nIp, VAR_GLOBAL) - CTheScripts::ScriptSpace; CollectParameters(&m_nIp, 1); - //CUserDisplay::OnscnTimer.ChangeCounterPrefix(offset, GET_INTEGER_PARAMS(0)); + CUserDisplay::OnscnTimer.ChangeCounterPrefix(offset, GET_INTEGER_PARAM(0) != 0); return 0; } case COMMAND_STORE_PLAYER_OUTFIT: @@ -263,7 +263,7 @@ int8 CRunningScript::ProcessCommands1600To1699(int32 command) wchar* text = TheText.Get((char*)&CTheScripts::ScriptSpace[m_nIp]); strncpy(onscreen_str1, (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 + CUserDisplay::OnscnTimer.AddCounter(var, GET_INTEGER_PARAM(1), onscreen_str1, 0, GET_INTEGER_PARAM(0), nil, 0); return 0; } case COMMAND_SET_PLAYER_CURRENT_WEAPON_AMMO_IN_CLIP: @@ -322,7 +322,7 @@ int8 CRunningScript::ProcessCommands1600To1699(int32 command) wchar* text2 = TheText.Get((char*)&CTheScripts::ScriptSpace[m_nIp]); 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 + CUserDisplay::OnscnTimer.AddCounter(var, GET_INTEGER_PARAM(1), onscreen_str2, 0, GET_INTEGER_PARAM(0), onscreen_str1, GET_INTEGER_PARAM(2)); return 0; } case COMMAND_GET_PLAYER_STORED_WEAPON: -- cgit v1.2.3