diff options
author | Max Horn | 2003-06-26 22:50:01 +0000 |
---|---|---|
committer | Max Horn | 2003-06-26 22:50:01 +0000 |
commit | 1ec54d032e65af70890c6d53209608deb409fae9 (patch) | |
tree | 390d6dd2e855058a3a9741b8cb59526c9431c829 /scumm | |
parent | eec095a72d290af44bc86a8fc8de35b9823e5ebb (diff) | |
download | scummvm-rg350-1ec54d032e65af70890c6d53209608deb409fae9.tar.gz scummvm-rg350-1ec54d032e65af70890c6d53209608deb409fae9.tar.bz2 scummvm-rg350-1ec54d032e65af70890c6d53209608deb409fae9.zip |
Moved out akos_compare (no reason for it to be member of class Scumm)
svn-id: r8660
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/akos.cpp | 34 | ||||
-rw-r--r-- | scumm/scumm.h | 1 |
2 files changed, 17 insertions, 18 deletions
diff --git a/scumm/akos.cpp b/scumm/akos.cpp index 7767c10063..19eaa64653 100644 --- a/scumm/akos.cpp +++ b/scumm/akos.cpp @@ -95,6 +95,23 @@ enum AkosOpcodes { AKC_EndSeq = 0xC0FF }; +static bool akos_compare(int a, int b, byte cmd) { + switch (cmd) { + case 0: + return a == b; + case 1: + return a != b; + case 2: + return a < b; + case 3: + return a <= b; + case 4: + return a > b; + default: + return a >= b; + } +} + bool Scumm::akos_hasManyDirections(Actor *a) { byte *akos; const AkosHeader *akhd; @@ -1348,23 +1365,6 @@ void Scumm::akos_queCommand(byte cmd, Actor *a, int param_1, int param_2) { } } -bool Scumm::akos_compare(int a, int b, byte cmd) { - switch (cmd) { - case 0: - return a == b; - case 1: - return a != b; - case 2: - return a < b; - case 3: - return a <= b; - case 4: - return a > b; - default: - return a >= b; - } -} - #ifdef __PALM_OS__ #include "scumm_globals.h" // init globals void Akos_initGlobals() { diff --git a/scumm/scumm.h b/scumm/scumm.h index 697b99c645..a86899d091 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -797,7 +797,6 @@ public: bool akos_increaseAnims(const byte *akos, Actor *a); 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); - bool akos_compare(int a, int b, byte cmd); void akos_decodeData(Actor *a, int frame, uint usemask); int akos_frameToAnim(Actor *a, int frame); bool akos_hasManyDirections(Actor *a); |