From: <ave...@us...> - 2009-10-10 17:04:43
|
Revision: 7399 http://gemrb.svn.sourceforge.net/gemrb/?rev=7399&view=rev Author: avenger_teambg Date: 2009-10-10 17:04:36 +0000 (Sat, 10 Oct 2009) Log Message: ----------- fixed dead actors not messing up the queue (area animation height is still not handled correctly) Modified Paths: -------------- gemrb/trunk/gemrb/plugins/Core/Map.cpp Modified: gemrb/trunk/gemrb/plugins/Core/Map.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/Map.cpp 2009-10-10 16:03:41 UTC (rev 7398) +++ gemrb/trunk/gemrb/plugins/Core/Map.cpp 2009-10-10 17:04:36 UTC (rev 7399) @@ -92,11 +92,12 @@ PathFinderInited = false; } -inline static AnimationObjectType SelectObject(Actor *actor, AreaAnimation *a, ScriptedAnimation *sca, Particles *spark, Projectile *pro) +inline static AnimationObjectType SelectObject(Actor *actor, int q, AreaAnimation *a, ScriptedAnimation *sca, Particles *spark, Projectile *pro) { int actorh; if (actor) { actorh = actor->Pos.y; + if (q) actorh = 0; } else { actorh = 0x7fffffff; } @@ -1036,7 +1037,7 @@ Particles *spark = GetNextSpark(spaidx); while (actor || a || sca || spark || pro) { - switch(SelectObject(actor,a,sca,spark,pro)) { + switch(SelectObject(actor,q,a,sca,spark,pro)) { case AOT_ACTOR: actor->Draw( screen ); actor = GetNextActor(q, index); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |