Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-09-15 15:02:34 +02:00
Code Issues Projects Releases Activity

Fix segfault when script timer runs out

Browse Source
This commit is contained in:
husho 2018-08-13 03:30:16 +03:00 committed by Daniel Evans
parent 1945d67818
commit 7dece398f4
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rwgame/RWGame.cpp
View File

@ -510,10 +510,7 @@ void RWGame::tick(float dt) {
while (scriptTimerAccumulator >= timerClockRate) { while (scriptTimerAccumulator >= timerClockRate) {
// Original game uses milliseconds // Original game uses milliseconds
(*state.scriptTimerVariable) -= timerClockRate * 1000; (*state.scriptTimerVariable) -= timerClockRate * 1000;
if (*state.scriptTimerVariable <= 0) {
(*state.scriptTimerVariable) = 0;
state.scriptTimerVariable = nullptr;
}
// 11 seconds // 11 seconds
if (*state.scriptTimerVariable <= 11000 && if (*state.scriptTimerVariable <= 11000 &&
beepTime - *state.scriptTimerVariable >= 1000) { beepTime - *state.scriptTimerVariable >= 1000) {
@ -521,6 +518,12 @@ void RWGame::tick(float dt) {
// @todo beep // @todo beep
} }
if (*state.scriptTimerVariable <= 0) {
(*state.scriptTimerVariable) = 0;
state.scriptTimerVariable = nullptr;
}
scriptTimerAccumulator -= timerClockRate; scriptTimerAccumulator -= timerClockRate;
} }
} }