diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2019-10-26 17:20:31 +0300 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2019-10-26 17:20:31 +0300 |
| commit | 3dee880c2941417c9e5ec42297da65f27ab9c5ca (patch) | |
| tree | 93f0daf6f0fdc04fb2898a202157d3d9ec078ffb /src/control/Script.cpp | |
| parent | 542e746f66593ac63eb1a269ba9708593a627b24 (diff) | |
| parent | 35bd3f514d2a673cf17db78103b17c169d2027e1 (diff) | |
merge
Diffstat (limited to 'src/control/Script.cpp')
| -rw-r--r-- | src/control/Script.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 804a50c4..45fef232 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -670,12 +670,12 @@ void CRunningScript::Process() if (!CPad::GetPad(0)->GetCrossJustDown()) return; m_nWakeTime = 0; - for (int i = 0; i < 6; i++){ /* TODO: add constant for number of messages */ - if (CMessages::BIGMessages[i].m_Current.m_pText) - CMessages::BIGMessages[i].m_Current.m_nStartTime = 0; - if (CMessages::BriefMessages[0].m_pText) - CMessages::BriefMessages[0].m_nStartTime = 0; + for (int i = 0; i < NUMBIGMESSAGES; i++){ + if (CMessages::BIGMessages[i].m_Stack[0].m_pText != nil) + CMessages::BIGMessages[i].m_Stack[0].m_nStartTime = 0; } + if (CMessages::BriefMessages[0].m_pText != nil) + CMessages::BriefMessages[0].m_nStartTime = 0; } int8 CRunningScript::ProcessOneCommand() @@ -2191,7 +2191,7 @@ int8 CRunningScript::ProcessCommandsFrom100To199(int32 command) wchar* key = TheText.Get((char*)&CTheScripts::ScriptSpace[m_nIp]); m_nIp += 8; CollectParameters(&m_nIp, 2); - CMessages::AddMessage(key, ScriptParams[0], ScriptParams[1]); + CMessages::AddMessageSoon(key, ScriptParams[0], ScriptParams[1]); return 0; } case COMMAND_CLEAR_PRINTS: |