diff options
| author | Max Horn | 2003-05-18 19:44:22 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-18 19:44:22 +0000 |
| commit | 8f7f22aeae822a123627c6f7e27e6f397129bd70 (patch) | |
| tree | 5e94881c4093d7527884efc1395e43aa6d0a28bf /scumm/actor.h | |
| parent | c9048e046b4427112e9c7996fa2c6a3a1618d3b3 (diff) | |
| download | scummvm-rg350-8f7f22aeae822a123627c6f7e27e6f397129bd70.tar.gz scummvm-rg350-8f7f22aeae822a123627c6f7e27e6f397129bd70.tar.bz2 scummvm-rg350-8f7f22aeae822a123627c6f7e27e6f397129bd70.zip | |
implemented proper 'invalid walkbox' handling in older games (in newer games, box 0 is used as invalid box, while in older games this is a legal box and box 255 is the 'invalid' box); removed lots of FIXME's which were needed to cope with ScummVM not implementing the invalid walkbox stuff properly in the past; removed other actor FIXMEs.
svn-id: r7642
Diffstat (limited to 'scumm/actor.h')
| -rw-r--r-- | scumm/actor.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scumm/actor.h b/scumm/actor.h index d78cde17c8..c397799732 100644 --- a/scumm/actor.h +++ b/scumm/actor.h @@ -83,7 +83,7 @@ public: byte charset; int16 newDirection; byte moving; - byte ignoreBoxes; + bool ignoreBoxes; byte forceClip; byte initFrame, walkFrame, standFrame, talkFrame1, talkFrame2; bool needRedraw, needBgReset, costumeNeedsInit, visible; @@ -102,6 +102,8 @@ public: uint16 sound[8]; CostumeData cost; byte palette[256]; + + static byte INVALID_BOX; protected: Scumm *_vm; |