From b55602180decd888084797a7e7a8fb8778d6c7ee Mon Sep 17 00:00:00 2001
From: Florian Kagerer
Date: Sat, 21 Mar 2009 14:30:25 +0000
Subject: LOL: The guards will now attack you when you throw certain items at
 them. They can't do any damage though, since this isn't implemented yet.

svn-id: r39582
---
 engines/kyra/items_lol.cpp | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

(limited to 'engines/kyra/items_lol.cpp')

diff --git a/engines/kyra/items_lol.cpp b/engines/kyra/items_lol.cpp
index 06667023ad..1977ba9a60 100644
--- a/engines/kyra/items_lol.cpp
+++ b/engines/kyra/items_lol.cpp
@@ -413,7 +413,7 @@ void LoLEngine::updateObjectFlightPosition(FlyingObject *t) {
 }
 
 void LoLEngine::objectFlightProcessHits(FlyingObject *t, int x, int y, int objectOnNextBlock) {
-	int r = 0;
+	uint16 r = 0;
 
 	if (objectOnNextBlock == 1) {
 		runLevelScriptCustom(calcNewBlockPosition(_itemsInPlay[t->item].blockPropertyIndex, t->direction >> 1), 0x8000, -1, t->item, 0, 0);
@@ -432,7 +432,7 @@ void LoLEngine::objectFlightProcessHits(FlyingObject *t, int x, int y, int objec
 			return;
 
 		} else {
-			r = flyingObjectHitMonsters(x, y);
+			r = getClosestMonster(x, y);
 		}
 
 	} else if (objectOnNextBlock == 4) {
@@ -445,25 +445,13 @@ void LoLEngine::objectFlightProcessHits(FlyingObject *t, int x, int y, int objec
 			return;
 
 		} else {
-			r = flyingObjectHitParty(x, y);
+			r = getClosestPartyMember(x, y);
 		}
 	}
 
 	runItemScript(t->charNum, t->item, 0x8000, r, 0);
 }
 
-uint16 LoLEngine::flyingObjectHitMonsters(int x, int y) {
-	////////////
-	// TODO
-	return 0;
-}
-
-uint16 LoLEngine::flyingObjectHitParty(int x, int y) {
-	////////////
-	// TODO
-	return 0;
-}
-
 void LoLEngine::updateFlyingObjects(FlyingObject *t) {
 	int x = 0;
 	int y = 0;
-- 
cgit v1.2.3