aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Brown2002-04-21 09:20:38 +0000
committerJames Brown2002-04-21 09:20:38 +0000
commit43a4a9c8e5ffabe252a6a629550527424387f08f (patch)
treed1b25a733137af86d75ea439ad9f25f7b9ff35f5
parenta42fc116cf1ea073aff6426a4c9bf3bb0da502b3 (diff)
downloadscummvm-rg350-43a4a9c8e5ffabe252a6a629550527424387f08f.tar.gz
scummvm-rg350-43a4a9c8e5ffabe252a6a629550527424387f08f.tar.bz2
scummvm-rg350-43a4a9c8e5ffabe252a6a629550527424387f08f.zip
Add fixme hack to room 17 FOA cost animation.
Remove \M from costume.cpp - how do these get here?!?! :) svn-id: r4032
-rw-r--r--actor.cpp12
-rw-r--r--costume.cpp3
2 files changed, 11 insertions, 4 deletions
diff --git a/actor.cpp b/actor.cpp
index 30ce903614..42b8d4f071 100644
--- a/actor.cpp
+++ b/actor.cpp
@@ -227,13 +227,12 @@ int Scumm::updateActorDirection(Actor * a)
int diff;
int dirType;
int num;
-
+
dirType = akos_hasManyDirections(a);
from = toSimpleDir(dirType, a->facing);
to = toSimpleDir(dirType, remapDirection(a, a->newDirection));
- diff = to - from;
-
+ diff = to - from;
num = numSimpleDirDirections(dirType);
if (abs(diff) > (num >> 1))
@@ -356,7 +355,7 @@ void Scumm::setupActorScale(Actor * a)
void Scumm::startAnimActor(Actor * a, int frame)
{
- if (_features & GF_NEW_COSTUMES) {
+ if (_features & GF_NEW_COSTUMES) {
switch (frame) {
case 1001:
frame = a->initFrame;
@@ -405,6 +404,11 @@ void Scumm::startAnimActor(Actor * a, int frame)
a->cost.animCounter1 = 0;
a->needRedraw = true;
+ // FIXME: FOA hack, room 17, climbing off machine
+ if (_gameId == GID_INDY4 && a->costume == 27) {
+ a->facing = 0;
+ }
+
if (a->initFrame == frame)
initActorCostumeData(a);
diff --git a/costume.cpp b/costume.cpp
index 3c0aabd3b7..7a7cdcfe92 100644
--- a/costume.cpp
+++ b/costume.cpp
@@ -702,9 +702,12 @@ void CostumeRenderer::proc_special(Actor *a, byte mask2)
byte shadow4;
byte shadow5;
+
if(a->costume==153) //Samnmax elevator FIXME
+
return;
+
shadow1=a->shadow_mode & 0x80;
shadow2=a->shadow_mode & 0x40;
shadow3=a->shadow_mode & 0x20;