From a8e5e1e2dbd8a3fcf438966383172866a90b835e Mon Sep 17 00:00:00 2001 From: richiesams Date: Sat, 6 Jul 2013 12:30:54 -0500 Subject: ZVISION: Rename result_action.h/.cpp files to actions.h/.cpp --- engines/zvision/actions.cpp | 162 ++++++++++++++++++++++++++++++++ engines/zvision/actions.h | 192 ++++++++++++++++++++++++++++++++++++++ engines/zvision/puzzle.h | 2 +- engines/zvision/result_action.cpp | 162 -------------------------------- engines/zvision/result_action.h | 192 -------------------------------------- engines/zvision/script_manager.h | 2 +- 6 files changed, 356 insertions(+), 356 deletions(-) create mode 100644 engines/zvision/actions.cpp create mode 100644 engines/zvision/actions.h delete mode 100644 engines/zvision/result_action.cpp delete mode 100644 engines/zvision/result_action.h diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp new file mode 100644 index 0000000000..23f7f166c8 --- /dev/null +++ b/engines/zvision/actions.cpp @@ -0,0 +1,162 @@ +/* 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 "common/scummsys.h" + +#include "zvision/actions.h" +#include "zvision/zvision.h" + +namespace ZVision { + +////////////////////////////////////////////////////////////////////////////// +// ActionAdd +////////////////////////////////////////////////////////////////////////////// + +ActionAdd::ActionAdd(Common::String line) { + sscanf(line.c_str(), ":add(%u,%hhu)", &_key, &_value); +} + +bool ActionAdd::execute(ZVision *zVision) { + zVision->getScriptManager()->addToStateValue(_key, _value); + return true; +} + + +////////////////////////////////////////////////////////////////////////////// +// ActionAssign +////////////////////////////////////////////////////////////////////////////// + +ActionAssign::ActionAssign(Common::String line) { + sscanf(line.c_str(), ":assign(%u, %hhu)", &_key, &_value); +} + +bool ActionAssign::execute(ZVision *zVision) { + zVision->getScriptManager()->setStateValue(_key, _value); + return true; +} + + +////////////////////////////////////////////////////////////////////////////// +// ActionAttenuate +////////////////////////////////////////////////////////////////////////////// + +ActionAttenuate::ActionAttenuate(Common::String line) { + sscanf(line.c_str(), ":assign(%u, %hd)", &_key, &_attenuation); +} + +bool ActionAttenuate::execute(ZVision *zVision) { + // TODO: Implement + return true; +} + + +////////////////////////////////////////////////////////////////////////////// +// ActionChangeLocation +////////////////////////////////////////////////////////////////////////////// + +ActionChangeLocation::ActionChangeLocation(Common::String line) { + sscanf(line.c_str(), ":change_location(%c,%c,%2c,%hu)", &_world, &_room, &_nodeview, &_x); +} + +bool ActionChangeLocation::execute(ZVision *zVision) { + // TODO: Implement + return true; +} + + +////////////////////////////////////////////////////////////////////////////// +// ActionCrossfade +////////////////////////////////////////////////////////////////////////////// + +ActionCrossfade::ActionCrossfade(Common::String line) { + sscanf(line.c_str(), + ":crossfade(%u %u %hhu %hhu %hhu %hhu %hu)", + &_keyOne, &_keyTwo, &_oneStartVolume, &_twoStartVolume, &_oneEndVolume, &_twoEndVolume, &_timeInMillis); +} + +bool ActionCrossfade::execute(ZVision *zVision) { + // TODO: Implement + return true; +} + + +////////////////////////////////////////////////////////////////////////////// +// ActionPreloadAnimation +////////////////////////////////////////////////////////////////////////////// + +ActionPreloadAnimation::ActionPreloadAnimation(Common::String line) { + // The two %*hhu are always 0 and dont seem to have a use + sscanf(line.c_str(), ":animpreload:%u(%s %*hhu %*hhu %u %hhu)", &_key, &_fileName, &_mask, &_framerate); +} + +bool ActionPreloadAnimation::execute(ZVision *zVision) { + // TODO: Implement + return true; +} + + +////////////////////////////////////////////////////////////////////////////// +// ActionPlayAnimation +////////////////////////////////////////////////////////////////////////////// + +ActionPlayAnimation::ActionPlayAnimation(Common::String line) { + // The two %*hhu are always 0 and dont seem to have a use + sscanf(line.c_str(), + ":animplay:%u(%s %u %u %u %u %u %u %hhu %*hhu %*hhu %u %hhu)", + &_key, &_x, &_y, &_width, &_height, &_start, &_end, &_loop, &_mask, &_framerate); +} + +bool ActionPlayAnimation::execute(ZVision *zVision) { + // TODO: Implement + return true; +} + + +////////////////////////////////////////////////////////////////////////////// +// ActionRandom +////////////////////////////////////////////////////////////////////////////// + +ActionRandom::ActionRandom(Common::String line) { + sscanf(line.c_str(), ":random:%u, %u)", &_key, &_max); +} + +bool ActionRandom::execute(ZVision *zVision) { + uint32 randNumber = zVision->getRandomSource()->getRandomNumber(_max); + zVision->getScriptManager()->setStateValue(_key, randNumber); + return true; +} + + +////////////////////////////////////////////////////////////////////////////// +// ActionTimer +////////////////////////////////////////////////////////////////////////////// + +ActionTimer::ActionTimer(Common::String line) { + sscanf(line.c_str(), ":timer:%u(%hu)", &_key, &_time); +} + +bool ActionTimer::execute(ZVision *zVision) { + // TODO: Implement + return true; +} + +} // End of namespace ZVision diff --git a/engines/zvision/actions.h b/engines/zvision/actions.h new file mode 100644 index 0000000000..a58ef68e34 --- /dev/null +++ b/engines/zvision/actions.h @@ -0,0 +1,192 @@ +/* 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 ZVISION_RESULT_ACTION_H +#define ZVISION_RESULT_ACTION_H + +#include "common/scummsys.h" + +#include "common/str.h" + +namespace ZVision { + +// Forward declaration of ZVision. This file is included before ZVision is declared +class ZVision; + +class ResultAction { +public: + virtual ~ResultAction() {} + virtual bool execute(ZVision *zVision) = 0; +}; + + +// The different types of actions +// CROSSFADE, +// DEBUG, +// DELAY_RENDER, +// DISABLE_CONTROL, +// DISABLE_VENUS, +// DISPLAY_MESSAGE, +// DISSOLVE, +// DISTORT, +// ENABLE_CONTROL, +// FLUSH_MOUSE_EVENTS, +// INVENTORY, +// KILL, +// MENU_BAR_ENABLE, +// MUSIC, +// PAN_TRACK, +// PLAY_PRELOAD, +// PREFERENCES, +// QUIT, +// RANDOM, +// REGION, +// RESTORE_GAME, +// ROTATE_TO, +// SAVE_GAME, +// SET_PARTIAL_SCREEN, +// SET_SCREEN, +// SET_VENUS, +// STOP, +// STREAM_VIDEO, +// SYNC_SOUND, +// TTY_TEXT, +// UNIVERSE_MUSIC, + +class ActionAdd : public ResultAction { +public: + ActionAdd(Common::String line); + bool execute(ZVision *zVision); + +private: + uint32 _key; + byte _value; +}; + +class ActionAssign : public ResultAction { +public: + ActionAssign(Common::String line); + bool execute(ZVision *zVision); + +private: + uint32 _key; + byte _value; +}; + +class ActionAttenuate : public ResultAction { +public: + ActionAttenuate(Common::String line); + bool execute(ZVision *zVision); + +private: + uint32 _key; + int16 _attenuation; +}; + +class ActionChangeLocation : public ResultAction { +public: + ActionChangeLocation(Common::String line); + bool execute(ZVision *zVision); + +private: + char _world; + char _room; + char _nodeview[2]; + int16 _x; +}; + +class ActionCrossfade : public ResultAction { +public: + ActionCrossfade(Common::String line); + bool execute(ZVision *zVision); + +private: + uint32 _keyOne; + uint32 _keyTwo; + byte _oneStartVolume; + byte _twoStartVolume; + byte _oneEndVolume; + byte _twoEndVolume; + uint16 _timeInMillis; +}; + +class ActionPlayAnimation : public ResultAction { +public: + ActionPlayAnimation(Common::String line); + bool execute(ZVision *zVision); + +private: + uint32 _key; + Common::String _fileName; + uint32 _x; + uint32 _y; + uint32 _width; + uint32 _height; + uint32 _start; + uint32 _end; + uint32 _mask; + byte _framerate; + bool _loop; +}; + +class ActionPreloadAnimation : public ResultAction { +public: + ActionPreloadAnimation(Common::String line); + bool execute(ZVision *zVision); + +private: + uint32 _key; + Common::String _fileName; + uint32 _mask; + byte _framerate; +}; + +// TODO: See if this exists in ZGI. It doesn't in ZNem +//class ActionUnloadAnimation : public ResultAction { +//public: +// ActionUnloadAnimation(Common::String line); +// bool execute(ZVision *zVision); +//}; + +class ActionRandom : public ResultAction { +public: + ActionRandom(Common::String line); + bool execute(ZVision *zVision); + +private: + uint32 _key; + uint32 _max; +}; + +class ActionTimer : public ResultAction { +public: + ActionTimer(Common::String line); + bool execute(ZVision *zVision); + +private: + uint32 _key; + uint32 _time; +}; + +} // End of namespace ZVision + +#endif diff --git a/engines/zvision/puzzle.h b/engines/zvision/puzzle.h index d3b7536e8d..9dab606f54 100644 --- a/engines/zvision/puzzle.h +++ b/engines/zvision/puzzle.h @@ -25,7 +25,7 @@ #include "common/list.h" -#include "zvision/result_action.h" +#include "zvision/actions.h" namespace ZVision { diff --git a/engines/zvision/result_action.cpp b/engines/zvision/result_action.cpp deleted file mode 100644 index c61fcca398..0000000000 --- a/engines/zvision/result_action.cpp +++ /dev/null @@ -1,162 +0,0 @@ -/* 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 "common/scummsys.h" - -#include "zvision/result_action.h" -#include "zvision/zvision.h" - -namespace ZVision { - -////////////////////////////////////////////////////////////////////////////// -// ActionAdd -////////////////////////////////////////////////////////////////////////////// - -ActionAdd::ActionAdd(Common::String line) { - sscanf(line.c_str(), ":add(%u,%hhu)", &_key, &_value); -} - -bool ActionAdd::execute(ZVision *zVision) { - zVision->getScriptManager()->addToStateValue(_key, _value); - return true; -} - - -////////////////////////////////////////////////////////////////////////////// -// ActionAssign -////////////////////////////////////////////////////////////////////////////// - -ActionAssign::ActionAssign(Common::String line) { - sscanf(line.c_str(), ":assign(%u, %hhu)", &_key, &_value); -} - -bool ActionAssign::execute(ZVision *zVision) { - zVision->getScriptManager()->setStateValue(_key, _value); - return true; -} - - -////////////////////////////////////////////////////////////////////////////// -// ActionAttenuate -////////////////////////////////////////////////////////////////////////////// - -ActionAttenuate::ActionAttenuate(Common::String line) { - sscanf(line.c_str(), ":assign(%u, %hd)", &_key, &_attenuation); -} - -bool ActionAttenuate::execute(ZVision *zVision) { - // TODO: Implement - return true; -} - - -////////////////////////////////////////////////////////////////////////////// -// ActionChangeLocation -////////////////////////////////////////////////////////////////////////////// - -ActionChangeLocation::ActionChangeLocation(Common::String line) { - sscanf(line.c_str(), ":change_location(%c,%c,%2c,%hu)", &_world, &_room, &_nodeview, &_x); -} - -bool ActionChangeLocation::execute(ZVision *zVision) { - // TODO: Implement - return true; -} - - -////////////////////////////////////////////////////////////////////////////// -// ActionCrossfade -////////////////////////////////////////////////////////////////////////////// - -ActionCrossfade::ActionCrossfade(Common::String line) { - sscanf(line.c_str(), - ":crossfade(%u %u %hhu %hhu %hhu %hhu %hu)", - &_keyOne, &_keyTwo, &_oneStartVolume, &_twoStartVolume, &_oneEndVolume, &_twoEndVolume, &_timeInMillis); -} - -bool ActionCrossfade::execute(ZVision *zVision) { - // TODO: Implement - return true; -} - - -////////////////////////////////////////////////////////////////////////////// -// ActionPreloadAnimation -////////////////////////////////////////////////////////////////////////////// - -ActionPreloadAnimation::ActionPreloadAnimation(Common::String line) { - // The two %*hhu are always 0 and dont seem to have a use - sscanf(line.c_str(), ":animpreload:%u(%s %*hhu %*hhu %u %hhu)", &_key, &_fileName, &_mask, &_framerate); -} - -bool ActionPreloadAnimation::execute(ZVision *zVision) { - // TODO: Implement - return true; -} - - -////////////////////////////////////////////////////////////////////////////// -// ActionPlayAnimation -////////////////////////////////////////////////////////////////////////////// - -ActionPlayAnimation::ActionPlayAnimation(Common::String line) { - // The two %*hhu are always 0 and dont seem to have a use - sscanf(line.c_str(), - ":animplay:%u(%s %u %u %u %u %u %u %hhu %*hhu %*hhu %u %hhu)", - &_key, &_x, &_y, &_width, &_height, &_start, &_end, &_loop, &_mask, &_framerate); -} - -bool ActionPlayAnimation::execute(ZVision *zVision) { - // TODO: Implement - return true; -} - - -////////////////////////////////////////////////////////////////////////////// -// ActionRandom -////////////////////////////////////////////////////////////////////////////// - -ActionRandom::ActionRandom(Common::String line) { - sscanf(line.c_str(), ":random:%u, %u)", &_key, &_max); -} - -bool ActionRandom::execute(ZVision *zVision) { - uint32 randNumber = zVision->getRandomSource()->getRandomNumber(_max); - zVision->getScriptManager()->setStateValue(_key, randNumber); - return true; -} - - -////////////////////////////////////////////////////////////////////////////// -// ActionTimer -////////////////////////////////////////////////////////////////////////////// - -ActionTimer::ActionTimer(Common::String line) { - sscanf(line.c_str(), ":timer:%u(%hu)", &_key, &_time); -} - -bool ActionTimer::execute(ZVision *zVision) { - // TODO: Implement - return true; -} - -} // End of namespace ZVision diff --git a/engines/zvision/result_action.h b/engines/zvision/result_action.h deleted file mode 100644 index a58ef68e34..0000000000 --- a/engines/zvision/result_action.h +++ /dev/null @@ -1,192 +0,0 @@ -/* 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 ZVISION_RESULT_ACTION_H -#define ZVISION_RESULT_ACTION_H - -#include "common/scummsys.h" - -#include "common/str.h" - -namespace ZVision { - -// Forward declaration of ZVision. This file is included before ZVision is declared -class ZVision; - -class ResultAction { -public: - virtual ~ResultAction() {} - virtual bool execute(ZVision *zVision) = 0; -}; - - -// The different types of actions -// CROSSFADE, -// DEBUG, -// DELAY_RENDER, -// DISABLE_CONTROL, -// DISABLE_VENUS, -// DISPLAY_MESSAGE, -// DISSOLVE, -// DISTORT, -// ENABLE_CONTROL, -// FLUSH_MOUSE_EVENTS, -// INVENTORY, -// KILL, -// MENU_BAR_ENABLE, -// MUSIC, -// PAN_TRACK, -// PLAY_PRELOAD, -// PREFERENCES, -// QUIT, -// RANDOM, -// REGION, -// RESTORE_GAME, -// ROTATE_TO, -// SAVE_GAME, -// SET_PARTIAL_SCREEN, -// SET_SCREEN, -// SET_VENUS, -// STOP, -// STREAM_VIDEO, -// SYNC_SOUND, -// TTY_TEXT, -// UNIVERSE_MUSIC, - -class ActionAdd : public ResultAction { -public: - ActionAdd(Common::String line); - bool execute(ZVision *zVision); - -private: - uint32 _key; - byte _value; -}; - -class ActionAssign : public ResultAction { -public: - ActionAssign(Common::String line); - bool execute(ZVision *zVision); - -private: - uint32 _key; - byte _value; -}; - -class ActionAttenuate : public ResultAction { -public: - ActionAttenuate(Common::String line); - bool execute(ZVision *zVision); - -private: - uint32 _key; - int16 _attenuation; -}; - -class ActionChangeLocation : public ResultAction { -public: - ActionChangeLocation(Common::String line); - bool execute(ZVision *zVision); - -private: - char _world; - char _room; - char _nodeview[2]; - int16 _x; -}; - -class ActionCrossfade : public ResultAction { -public: - ActionCrossfade(Common::String line); - bool execute(ZVision *zVision); - -private: - uint32 _keyOne; - uint32 _keyTwo; - byte _oneStartVolume; - byte _twoStartVolume; - byte _oneEndVolume; - byte _twoEndVolume; - uint16 _timeInMillis; -}; - -class ActionPlayAnimation : public ResultAction { -public: - ActionPlayAnimation(Common::String line); - bool execute(ZVision *zVision); - -private: - uint32 _key; - Common::String _fileName; - uint32 _x; - uint32 _y; - uint32 _width; - uint32 _height; - uint32 _start; - uint32 _end; - uint32 _mask; - byte _framerate; - bool _loop; -}; - -class ActionPreloadAnimation : public ResultAction { -public: - ActionPreloadAnimation(Common::String line); - bool execute(ZVision *zVision); - -private: - uint32 _key; - Common::String _fileName; - uint32 _mask; - byte _framerate; -}; - -// TODO: See if this exists in ZGI. It doesn't in ZNem -//class ActionUnloadAnimation : public ResultAction { -//public: -// ActionUnloadAnimation(Common::String line); -// bool execute(ZVision *zVision); -//}; - -class ActionRandom : public ResultAction { -public: - ActionRandom(Common::String line); - bool execute(ZVision *zVision); - -private: - uint32 _key; - uint32 _max; -}; - -class ActionTimer : public ResultAction { -public: - ActionTimer(Common::String line); - bool execute(ZVision *zVision); - -private: - uint32 _key; - uint32 _time; -}; - -} // End of namespace ZVision - -#endif diff --git a/engines/zvision/script_manager.h b/engines/zvision/script_manager.h index 173705edf5..f02073b4c6 100644 --- a/engines/zvision/script_manager.h +++ b/engines/zvision/script_manager.h @@ -29,7 +29,7 @@ #include "zvision/puzzle.h" #include "zvision/control.h" -#include "zvision/result_action.h" +#include "zvision/actions.h" namespace ZVision { -- cgit v1.2.3