From 0c340485e01e0c18634a496d145841afb2ac2536 Mon Sep 17 00:00:00 2001 From: Ľubomír Remák Date: Fri, 2 Nov 2018 23:26:58 +0100 Subject: MUTATIONOFJB: Draw bitmaps. Implement RB (bitmap visibility) command. Implement stub for FLX and FLB (play animation) commands. --- .../commands/bitmapvisibilitycommand.cpp | 58 ++++++++++++++++++++ .../commands/bitmapvisibilitycommand.h | 53 +++++++++++++++++++ engines/mutationofjb/commands/camefromcommand.cpp | 1 + .../mutationofjb/commands/playanimationcommand.cpp | 61 ++++++++++++++++++++++ .../mutationofjb/commands/playanimationcommand.h | 52 ++++++++++++++++++ 5 files changed, 225 insertions(+) create mode 100644 engines/mutationofjb/commands/bitmapvisibilitycommand.cpp create mode 100644 engines/mutationofjb/commands/bitmapvisibilitycommand.h create mode 100644 engines/mutationofjb/commands/playanimationcommand.cpp create mode 100644 engines/mutationofjb/commands/playanimationcommand.h (limited to 'engines/mutationofjb/commands') diff --git a/engines/mutationofjb/commands/bitmapvisibilitycommand.cpp b/engines/mutationofjb/commands/bitmapvisibilitycommand.cpp new file mode 100644 index 0000000000..f1238907a7 --- /dev/null +++ b/engines/mutationofjb/commands/bitmapvisibilitycommand.cpp @@ -0,0 +1,58 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "mutationofjb/commands/bitmapvisibilitycommand.h" +#include "mutationofjb/gamedata.h" +#include "mutationofjb/script.h" + +/** @file + * "RB " " " " " + * + * Changes visibility of a bitmap in the specified scene. + */ + +namespace MutationOfJB { + +bool BitmapVisibilityCommandParser::parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) { + if (line.size() < 10 || !line.hasPrefix("RB ")) + return false; + + const uint8 sceneId = (uint8) atoi(line.c_str() + 3); + const uint8 bitmapId = (uint8) atoi(line.c_str() + 6); + const bool visible = (line[9] == '1'); + + command = new BitmapVisibilityCommand(sceneId, bitmapId, visible); + return true; +} + + +Command::ExecuteResult BitmapVisibilityCommand::execute(ScriptExecutionContext &scriptExecCtx) { + scriptExecCtx.getGameData().getScene(_sceneId)->getBitmap(_bitmapId)->_isVisible = _visible; + + return Finished; +} + +Common::String BitmapVisibilityCommand::debugString() const { + return Common::String::format("SETBITMAPVIS %u %u %s", (unsigned int) _sceneId, (unsigned int) _bitmapId, _visible ? "true" : "false"); +} + +} diff --git a/engines/mutationofjb/commands/bitmapvisibilitycommand.h b/engines/mutationofjb/commands/bitmapvisibilitycommand.h new file mode 100644 index 0000000000..366abd3148 --- /dev/null +++ b/engines/mutationofjb/commands/bitmapvisibilitycommand.h @@ -0,0 +1,53 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef MUTATIONOFJB_BITMAPVISIBILITYCOMMAND_H +#define MUTATIONOFJB_BITMAPVISIBILITYCOMMAND_H + +#include "mutationofjb/commands/seqcommand.h" +#include "common/str.h" + +namespace MutationOfJB { + +class BitmapVisibilityCommandParser : public SeqCommandParser { +public: + BitmapVisibilityCommandParser() {} + + virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command); +}; + +class BitmapVisibilityCommand : public SeqCommand { +public: + BitmapVisibilityCommand(uint8 sceneId, uint8 bitmapId, bool visible) : _sceneId(sceneId), _bitmapId(bitmapId), _visible(visible) {} + const Common::String &getName() const; + + virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + virtual Common::String debugString() const override; +private: + uint8 _sceneId; + uint8 _bitmapId; + bool _visible; +}; + +} + +#endif diff --git a/engines/mutationofjb/commands/camefromcommand.cpp b/engines/mutationofjb/commands/camefromcommand.cpp index 67033b8a53..b4bbcc75cb 100644 --- a/engines/mutationofjb/commands/camefromcommand.cpp +++ b/engines/mutationofjb/commands/camefromcommand.cpp @@ -41,6 +41,7 @@ bool CameFromCommandParser::parse(const Common::String &line, ScriptParseContext } const uint8 sceneId = atoi(line.c_str() + 9); + _tags.push(0); command = new CameFromCommand(sceneId); return true; } diff --git a/engines/mutationofjb/commands/playanimationcommand.cpp b/engines/mutationofjb/commands/playanimationcommand.cpp new file mode 100644 index 0000000000..60c6f1c3cf --- /dev/null +++ b/engines/mutationofjb/commands/playanimationcommand.cpp @@ -0,0 +1,61 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "mutationofjb/commands/playanimationcommand.h" +#include "mutationofjb/game.h" +#include "mutationofjb/room.h" +#include "mutationofjb/script.h" + +/** @file + * ( "FLB " | "FLX" ) " " + * + * Plays the specified frames from room animation. + * + * TODO: Parse all arguments of this command. + * TODO: Actually play the animation instead of just showing last frame. + */ + +namespace MutationOfJB { + +bool PlayAnimationCommandParser::parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) { + 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); + + command = new PlayAnimationCommand(fromFrame, toFrame); + return true; +} + + +Command::ExecuteResult PlayAnimationCommand::execute(ScriptExecutionContext &scriptExecCtx) { + scriptExecCtx.getGame().getRoom().drawFrames(_fromFrame - 1, _toFrame - 1); + + return Finished; +} + +Common::String PlayAnimationCommand::debugString() const { + return Common::String::format("PLAYROOMANIM %u %u", (unsigned int) _fromFrame, (unsigned int) _toFrame); +} + +} diff --git a/engines/mutationofjb/commands/playanimationcommand.h b/engines/mutationofjb/commands/playanimationcommand.h new file mode 100644 index 0000000000..da7ff25324 --- /dev/null +++ b/engines/mutationofjb/commands/playanimationcommand.h @@ -0,0 +1,52 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef MUTATIONOFJB_PLAYANIMATIONCOMMAND_H +#define MUTATIONOFJB_PLAYANIMATIONCOMMAND_H + +#include "mutationofjb/commands/seqcommand.h" +#include "common/str.h" + +namespace MutationOfJB { + +class PlayAnimationCommandParser : public SeqCommandParser { +public: + PlayAnimationCommandParser() {} + + virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command); +}; + +class PlayAnimationCommand : public SeqCommand { +public: + PlayAnimationCommand(uint8 fromFrame, uint8 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; +}; + +} + +#endif -- cgit v1.2.3