diff options
author | Ľubomír Remák | 2019-02-03 23:35:43 +0100 |
---|---|---|
committer | Ľubomír Remák | 2019-02-03 23:35:43 +0100 |
commit | d18c83e8b8b96c3849b7bdd34b17a6bb91da4e78 (patch) | |
tree | 93a1e7889e67a81fd61808edbdf62e6630ade949 /engines/mutationofjb | |
parent | 66400e7422ffe154b30e640fd26ababa4269a6f7 (diff) | |
download | scummvm-rg350-d18c83e8b8b96c3849b7bdd34b17a6bb91da4e78.tar.gz scummvm-rg350-d18c83e8b8b96c3849b7bdd34b17a6bb91da4e78.tar.bz2 scummvm-rg350-d18c83e8b8b96c3849b7bdd34b17a6bb91da4e78.zip |
MUTATIONOFJB: Fix play animation command.
Diffstat (limited to 'engines/mutationofjb')
-rw-r--r-- | engines/mutationofjb/commands/playanimationcommand.cpp | 4 | ||||
-rw-r--r-- | engines/mutationofjb/commands/playanimationcommand.h | 6 | ||||
-rw-r--r-- | engines/mutationofjb/commands/setobjectframecommand.cpp | 2 | ||||
-rw-r--r-- | engines/mutationofjb/gamedata.h | 4 | ||||
-rw-r--r-- | engines/mutationofjb/room.cpp | 2 | ||||
-rw-r--r-- | engines/mutationofjb/room.h | 2 |
6 files changed, 11 insertions, 9 deletions
diff --git a/engines/mutationofjb/commands/playanimationcommand.cpp b/engines/mutationofjb/commands/playanimationcommand.cpp index 60c6f1c3cf..6f70a81aa1 100644 --- a/engines/mutationofjb/commands/playanimationcommand.cpp +++ b/engines/mutationofjb/commands/playanimationcommand.cpp @@ -40,8 +40,8 @@ bool PlayAnimationCommandParser::parse(const Common::String &line, ScriptParseCo if (line.size() < 11 || (!line.hasPrefix("FLB ") && !line.hasPrefix("FLX "))) return false; - const uint8 fromFrame = (uint8) atoi(line.c_str() + 4); - const uint8 toFrame = (uint8) atoi(line.c_str() + 8); + const int fromFrame = atoi(line.c_str() + 4); + const int toFrame = atoi(line.c_str() + 8); command = new PlayAnimationCommand(fromFrame, toFrame); return true; diff --git a/engines/mutationofjb/commands/playanimationcommand.h b/engines/mutationofjb/commands/playanimationcommand.h index da7ff25324..4f0d4d7e69 100644 --- a/engines/mutationofjb/commands/playanimationcommand.h +++ b/engines/mutationofjb/commands/playanimationcommand.h @@ -37,14 +37,14 @@ public: class PlayAnimationCommand : public SeqCommand { public: - PlayAnimationCommand(uint8 fromFrame, uint8 toFrame) : _fromFrame(fromFrame), _toFrame(toFrame) {} + PlayAnimationCommand(int fromFrame, int toFrame) : _fromFrame(fromFrame), _toFrame(toFrame) {} const Common::String &getName() const; virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; virtual Common::String debugString() const override; private: - uint8 _fromFrame; - uint8 _toFrame; + int _fromFrame; + int _toFrame; }; } diff --git a/engines/mutationofjb/commands/setobjectframecommand.cpp b/engines/mutationofjb/commands/setobjectframecommand.cpp index 8fcff2be26..9524729733 100644 --- a/engines/mutationofjb/commands/setobjectframecommand.cpp +++ b/engines/mutationofjb/commands/setobjectframecommand.cpp @@ -40,7 +40,7 @@ bool SetObjectFrameCommandParser::parse(const Common::String &line, ScriptParseC return false; const uint8 objectId = (uint8) atoi(line.c_str() + 8); - const uint8 frame = (uint8) atoi(line.c_str() + 11); + const unsigned int frame = atoi(line.c_str() + 11); command = new SetObjectFrameCommand(objectId, frame); return true; diff --git a/engines/mutationofjb/gamedata.h b/engines/mutationofjb/gamedata.h index c2ddfd644a..e4bc611608 100644 --- a/engines/mutationofjb/gamedata.h +++ b/engines/mutationofjb/gamedata.h @@ -155,6 +155,7 @@ struct Object : public Common::Serializable { uint8 _numFrames; /** * Low 8 bits of the 16-bit starting room frame (FS register). + * This is in the room frame space. * * @see _roomFrameMSB */ @@ -168,7 +169,7 @@ struct Object : public Common::Serializable { /** * Current animation frame (CA register). * - * @note Absolute index to the frame space. Numbered from 1. + * @note Index in the shared object frame space. Numbered from 1. */ uint8 _currentFrame; /** X coordinate of the object rectangle (XX register). */ @@ -183,6 +184,7 @@ struct Object : public Common::Serializable { uint16 _WX; /** * High 8 bits of the 16-bit starting room frame (WY register). + * This is in the room frame space. * * @see _roomFrameLSB */ diff --git a/engines/mutationofjb/room.cpp b/engines/mutationofjb/room.cpp index 1d49fb3c80..09c0f29f27 100644 --- a/engines/mutationofjb/room.cpp +++ b/engines/mutationofjb/room.cpp @@ -181,7 +181,7 @@ void Room::drawStatic(Static *const stat) { drawFrames(frame, frame, staticArea, 0xC0); // Hardcoded threshold. } -void Room::drawFrames(uint8 fromFrame, uint8 toFrame, const Common::Rect &area, uint8 threshold) { +void Room::drawFrames(int fromFrame, int toFrame, const Common::Rect &area, uint8 threshold) { GameData &gameData = _game->getGameData(); Scene *const scene = gameData.getCurrentScene(); diff --git a/engines/mutationofjb/room.h b/engines/mutationofjb/room.h index 1c76344303..ff0fbffa1e 100644 --- a/engines/mutationofjb/room.h +++ b/engines/mutationofjb/room.h @@ -64,7 +64,7 @@ public: * @param stat Static. */ void drawStatic(Static *stat); - void drawFrames(uint8 fromFrame, uint8 toFrame, const Common::Rect &area = Common::Rect(), uint8 threshold = 0xFF); + void drawFrames(int fromFrame, int toFrame, const Common::Rect &area = Common::Rect(), uint8 threshold = 0xFF); void initialDraw(); void redraw(bool useBackgroundBuffer = true); private: |