marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix possible hang on effect execution with timer=1 

If a timer=1-effect registered another timer=1-effect into the same object, it could cause an endless loop. This happened if the timer in the sequence object was set to 1.
console-destruction
Sven Eberhardt 2016-08-18 00:14:19 -04:00
parent 5518d0ca15
commit 5d6ecc8dc8
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/script/C4Effect.cpp
View File

@ -302,6 +302,13 @@ C4Effect* C4Effect::Check(const char *szCheckEffect, int32_t iPrio, int32_t iTim
void C4Effect::Execute(C4Effect **ppEffectList)
{
// advance all effect timers first; then do execution
// this prevents a possible endless loop if timers register into the same effect list with interval 1 while it is being executed
for (C4Effect *pEffect = *ppEffectList; pEffect; pEffect = pEffect->pNext)
{
// ignore dead status; adjusting their time doesn't hurt
++pEffect->iTime;
}
// get effect list
// execute all effects not marked as dead
C4Effect *pEffect = *ppEffectList, **ppPrevEffect=ppEffectList;
@ -319,10 +326,8 @@ void C4Effect::Execute(C4Effect **ppEffectList)
}
else
{
// execute effect: time elapsed
++pEffect->iTime;
// check timer execution
if (pEffect->iInterval && !(pEffect->iTime % pEffect->iInterval))
if (pEffect->iInterval && !(pEffect->iTime % pEffect->iInterval) && pEffect->iTime)
{
if (pEffect->CallTimer(pEffect->iTime) == C4Fx_Execute_Kill)
{