aboutsummaryrefslogtreecommitdiff
path: root/engines/sky/logic.h
diff options
context:
space:
mode:
authorRobert Göffringmann2016-12-11 05:12:51 +0100
committerRobert Göffringmann2016-12-11 05:12:51 +0100
commit5781568fe6412f3376ef19c74c2049fb49b0fd63 (patch)
treeb79019cede4a8487d1c10ce3f4bf9421ec94c7b2 /engines/sky/logic.h
parent22398e571bf8b4cfb04fcd00ffcef81eeb998d66 (diff)
downloadscummvm-rg350-5781568fe6412f3376ef19c74c2049fb49b0fd63.tar.gz
scummvm-rg350-5781568fe6412f3376ef19c74c2049fb49b0fd63.tar.bz2
scummvm-rg350-5781568fe6412f3376ef19c74c2049fb49b0fd63.zip
Fixed collision detection, now it actually corresponds with the original
asm code. Certain width attributes of the two objects being checked were flipped. I guess this may render a couple of hacky workarounds not necessary anymore.
Diffstat (limited to 'engines/sky/logic.h')
-rw-r--r--engines/sky/logic.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sky/logic.h b/engines/sky/logic.h
index 8507fe7398..cd83e1a5f8 100644
--- a/engines/sky/logic.h
+++ b/engines/sky/logic.h
@@ -164,7 +164,7 @@ protected:
void push(uint32);
uint32 pop();
void checkModuleLoaded(uint16 moduleNo);
- bool collide(Compact *cpt);
+ bool isCollision(Compact *cpt);
void initScriptVariables();
void mainAnim();
void runGetOff();