aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/items_lol.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/kyra/items_lol.cpp')
-rw-r--r--engines/kyra/items_lol.cpp18
1 files changed, 3 insertions, 15 deletions
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;