diff options
| author | Max Horn | 2005-03-27 01:07:22 +0000 |
|---|---|---|
| committer | Max Horn | 2005-03-27 01:07:22 +0000 |
| commit | abcf7bf2de88c3926843fa3fd613e50f5ea63cd5 (patch) | |
| tree | ac27f9a9639270ceff80adb478f19fba339ea9bc /scumm/scumm.h | |
| parent | 5bd26a52df502391714b539df30eb76e50c72cf7 (diff) | |
| download | scummvm-rg350-abcf7bf2de88c3926843fa3fd613e50f5ea63cd5.tar.gz scummvm-rg350-abcf7bf2de88c3926843fa3fd613e50f5ea63cd5.tar.bz2 scummvm-rg350-abcf7bf2de88c3926843fa3fd613e50f5ea63cd5.zip | |
Tie the AKOS code into the new costume infrastructure, too
svn-id: r17259
Diffstat (limited to 'scumm/scumm.h')
| -rw-r--r-- | scumm/scumm.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h index 31006b61a8..eed39e4b91 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -43,6 +43,7 @@ class GameDetector; namespace Scumm { class Actor; +class BaseCostumeLoader; class BaseCostumeRenderer; class CharsetRenderer; class IMuse; @@ -470,7 +471,8 @@ public: int _numCostumes; // FIXME - should be protected, used by Actor::remapActorPalette int _numCharsets; // FIXME - should be protected, used by CharsetRenderer - BaseCostumeRenderer* _costumeRenderer; + BaseCostumeLoader *_costumeLoader; + BaseCostumeRenderer *_costumeRenderer; int _NESCostumeSet; void NES_loadCostumeSet(int n); @@ -845,7 +847,6 @@ public: void setTalkingActor(int variable); // Generic costume code - void costumeDecodeData(Actor *a, int frame, uint usemask); bool isCostumeInUse(int i) const; // Akos Class @@ -863,8 +864,6 @@ public: bool akos_increaseAnim(Actor *a, int i, const byte *aksq, const uint16 *akfo, int numakfo); void akos_queCommand(byte cmd, Actor *a, int param_1, int param_2); void akos_processQueue(); - void akos_decodeData(Actor *a, int frame, uint usemask); - bool akos_hasManyDirections(int costume); protected: /* Should be in Graphics class? */ |