[Scummvm-cvs-logs] SF.net SVN: scummvm:[41292] scummvm/trunk/engines/kyra/items_lol.cpp

[athrxx at users.sourceforge.net]

Revision: 41292
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41292&view=rev
Author:   athrxx
Date:     2009-06-06 18:46:07 +0000 (Sat, 06 Jun 2009)

Log Message:
-----------
LOL: fix flying item hit processing

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/items_lol.cpp

Modified: scummvm/trunk/engines/kyra/items_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/items_lol.cpp	2009-06-06 18:41:25 UTC (rev 41291)
+++ scummvm/trunk/engines/kyra/items_lol.cpp	2009-06-06 18:46:07 UTC (rev 41292)
@@ -451,22 +451,19 @@
 
 	if (objectOnNextBlock == 1) {
 		runLevelScriptCustom(calcNewBlockPosition(_itemsInPlay[t->item].block, t->direction >> 1), 0x8000, -1, t->item, 0, 0);
-		return;
 
 	} else if (objectOnNextBlock == 2) {
 		if (_itemProperties[_itemsInPlay[t->item].itemPropertyIndex].flags & 0x4000) {
 			int o = _levelBlockProperties[_itemsInPlay[t->item].block].assignedObjects;
-
 			while (o & 0x8000) {
 				ItemInPlay *i = findObject(o);
 				o = i->nextAssignedObject;
 				runItemScript(t->attackerId, t->item, 0x8000, o, 0);
 			}
 
-			return;
-
 		} else {
 			r = getNearestMonsterFromPos(x, y);
+			runItemScript(t->attackerId, t->item, 0x8000, r, 0);
 		}
 
 	} else if (objectOnNextBlock == 4) {
@@ -476,14 +473,11 @@
 				if (_characters[i].flags & 1)
 					runItemScript(t->attackerId, t->item, 0x8000, i, 0);
 			}
-			return;
-
 		} else {
 			r = getNearestPartyMemberFromPos(x, y);
+			runItemScript(t->attackerId, t->item, 0x8000, r, 0);
 		}
-	}
-
-	runItemScript(t->attackerId, t->item, 0x8000, r, 0);
+	}	
 }
 
 void LoLEngine::updateFlyingObject(FlyingObject *t) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.