diff options
Diffstat (limited to 'engines/zvision/scripting')
37 files changed, 0 insertions, 61 deletions
diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index 8ff6bd0496..c8c82063f7 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/engines/zvision/scripting/actions.cpp @@ -49,7 +49,6 @@ #include "audio/decoders/wave.h" - namespace ZVision { ////////////////////////////////////////////////////////////////////////////// @@ -66,7 +65,6 @@ bool ActionAdd::execute() { return true; } - ////////////////////////////////////////////////////////////////////////////// // ActionAssign ////////////////////////////////////////////////////////////////////////////// @@ -89,7 +87,6 @@ bool ActionAssign::execute() { return true; } - ////////////////////////////////////////////////////////////////////////////// // ActionAttenuate ////////////////////////////////////////////////////////////////////////////// @@ -108,7 +105,6 @@ bool ActionAttenuate::execute() { return true; } - ////////////////////////////////////////////////////////////////////////////// // ActionChangeLocation ////////////////////////////////////////////////////////////////////////////// @@ -125,7 +121,6 @@ bool ActionChangeLocation::execute() { return false; } - ////////////////////////////////////////////////////////////////////////////// // ActionCrossfade ////////////////////////////////////////////////////////////////////////////// @@ -368,7 +363,6 @@ bool ActionInventory::execute() { return true; } - ////////////////////////////////////////////////////////////////////////////// // ActionKill ////////////////////////////////////////////////////////////////////////////// @@ -457,8 +451,6 @@ ActionMusic::ActionMusic(ZVision *engine, int32 slotkey, const Common::String &l _volume = volume * 255 / 100; } } - - } ActionMusic::~ActionMusic() { @@ -583,7 +575,6 @@ bool ActionUnloadAnimation::execute() { return true; } - ////////////////////////////////////////////////////////////////////////////// // ActionPlayAnimation ////////////////////////////////////////////////////////////////////////////// @@ -625,7 +616,6 @@ bool ActionPlayAnimation::execute() { return true; } - ////////////////////////////////////////////////////////////////////////////// // ActionPlayPreloadAnimation ////////////////////////////////////////////////////////////////////////////// @@ -646,7 +636,6 @@ bool ActionPlayPreloadAnimation::execute() { return true; } - ////////////////////////////////////////////////////////////////////////////// // ActionQuit ////////////////////////////////////////////////////////////////////////////// @@ -786,7 +775,6 @@ bool ActionRotateTo::execute() { return true; } - ////////////////////////////////////////////////////////////////////////////// // ActionSetPartialScreen ////////////////////////////////////////////////////////////////////////////// @@ -833,7 +821,6 @@ bool ActionSetPartialScreen::execute() { return true; } - ////////////////////////////////////////////////////////////////////////////// // ActionSetScreen ////////////////////////////////////////////////////////////////////////////// @@ -852,7 +839,6 @@ bool ActionSetScreen::execute() { return true; } - ////////////////////////////////////////////////////////////////////////////// // ActionSetVenus ////////////////////////////////////////////////////////////////////////////// @@ -884,7 +870,6 @@ bool ActionStop::execute() { return true; } - ////////////////////////////////////////////////////////////////////////////// // ActionStreamVideo ////////////////////////////////////////////////////////////////////////////// diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h index 03a249e580..f9e4ee8167 100644 --- a/engines/zvision/scripting/actions.h +++ b/engines/zvision/scripting/actions.h @@ -28,7 +28,6 @@ #include "audio/mixer.h" - namespace ZVision { // Forward declaration of ZVision. This file is included before ZVision is declared diff --git a/engines/zvision/scripting/control.cpp b/engines/zvision/scripting/control.cpp index e69d57f75c..5469106928 100644 --- a/engines/zvision/scripting/control.cpp +++ b/engines/zvision/scripting/control.cpp @@ -31,7 +31,6 @@ #include "common/stream.h" - namespace ZVision { void Control::parseFlatControl(ZVision *engine) { diff --git a/engines/zvision/scripting/control.h b/engines/zvision/scripting/control.h index 5814c9e419..803d0cf1ce 100644 --- a/engines/zvision/scripting/control.h +++ b/engines/zvision/scripting/control.h @@ -26,7 +26,6 @@ #include "common/keyboard.h" #include "common/str.h" - namespace Common { class SeekableReadStream; struct Point; diff --git a/engines/zvision/scripting/controls/fist_control.cpp b/engines/zvision/scripting/controls/fist_control.cpp index 9bb03cba51..dd6a7f11a9 100644 --- a/engines/zvision/scripting/controls/fist_control.cpp +++ b/engines/zvision/scripting/controls/fist_control.cpp @@ -37,7 +37,6 @@ #include "graphics/surface.h" - namespace ZVision { FistControl::FistControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) diff --git a/engines/zvision/scripting/controls/fist_control.h b/engines/zvision/scripting/controls/fist_control.h index 33c3c7b579..cb765c429a 100644 --- a/engines/zvision/scripting/controls/fist_control.h +++ b/engines/zvision/scripting/controls/fist_control.h @@ -28,7 +28,6 @@ #include "common/array.h" #include "common/rect.h" - namespace ZVision { class MetaAnimation; diff --git a/engines/zvision/scripting/controls/hotmov_control.cpp b/engines/zvision/scripting/controls/hotmov_control.cpp index fd7afb92d1..68861dc221 100644 --- a/engines/zvision/scripting/controls/hotmov_control.cpp +++ b/engines/zvision/scripting/controls/hotmov_control.cpp @@ -37,7 +37,6 @@ #include "graphics/surface.h" - namespace ZVision { HotMovControl::HotMovControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) diff --git a/engines/zvision/scripting/controls/hotmov_control.h b/engines/zvision/scripting/controls/hotmov_control.h index 9e01b40bab..86600d65dc 100644 --- a/engines/zvision/scripting/controls/hotmov_control.h +++ b/engines/zvision/scripting/controls/hotmov_control.h @@ -28,7 +28,6 @@ #include "common/array.h" #include "common/rect.h" - namespace ZVision { class MetaAnimation; diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp index 8af436bb40..c541693ec3 100644 --- a/engines/zvision/scripting/controls/input_control.cpp +++ b/engines/zvision/scripting/controls/input_control.cpp @@ -35,7 +35,6 @@ #include "common/stream.h" #include "common/rect.h" - namespace ZVision { InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) diff --git a/engines/zvision/scripting/controls/input_control.h b/engines/zvision/scripting/controls/input_control.h index 9a829d30f6..410caf6d49 100644 --- a/engines/zvision/scripting/controls/input_control.h +++ b/engines/zvision/scripting/controls/input_control.h @@ -30,7 +30,6 @@ #include "common/rect.h" - namespace ZVision { class InputControl : public Control { diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp index 1f176ef9d0..12b07d7584 100644 --- a/engines/zvision/scripting/controls/lever_control.cpp +++ b/engines/zvision/scripting/controls/lever_control.cpp @@ -38,7 +38,6 @@ #include "graphics/surface.h" - namespace ZVision { LeverControl::LeverControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) diff --git a/engines/zvision/scripting/controls/lever_control.h b/engines/zvision/scripting/controls/lever_control.h index 8de6d1e5c9..37d4d3bd8d 100644 --- a/engines/zvision/scripting/controls/lever_control.h +++ b/engines/zvision/scripting/controls/lever_control.h @@ -28,7 +28,6 @@ #include "common/list.h" #include "common/rect.h" - namespace ZVision { class ZorkAVIDecoder; diff --git a/engines/zvision/scripting/controls/paint_control.cpp b/engines/zvision/scripting/controls/paint_control.cpp index cb3c17e0fd..9bad6f2c58 100644 --- a/engines/zvision/scripting/controls/paint_control.cpp +++ b/engines/zvision/scripting/controls/paint_control.cpp @@ -110,8 +110,6 @@ PaintControl::PaintControl(ZVision *engine, uint32 key, Common::SeekableReadStre delete _paint; _paint = tmp; } - - } PaintControl::~PaintControl() { diff --git a/engines/zvision/scripting/controls/paint_control.h b/engines/zvision/scripting/controls/paint_control.h index aac4755fcd..8097290ac2 100644 --- a/engines/zvision/scripting/controls/paint_control.h +++ b/engines/zvision/scripting/controls/paint_control.h @@ -30,7 +30,6 @@ #include "common/rect.h" #include "common/list.h" - namespace ZVision { class PaintControl : public Control { diff --git a/engines/zvision/scripting/controls/push_toggle_control.cpp b/engines/zvision/scripting/controls/push_toggle_control.cpp index ea4e947abe..c5ec070899 100644 --- a/engines/zvision/scripting/controls/push_toggle_control.cpp +++ b/engines/zvision/scripting/controls/push_toggle_control.cpp @@ -31,7 +31,6 @@ #include "common/stream.h" - namespace ZVision { PushToggleControl::PushToggleControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) diff --git a/engines/zvision/scripting/controls/push_toggle_control.h b/engines/zvision/scripting/controls/push_toggle_control.h index 6d68b8f162..9444c77cb6 100644 --- a/engines/zvision/scripting/controls/push_toggle_control.h +++ b/engines/zvision/scripting/controls/push_toggle_control.h @@ -29,7 +29,6 @@ #include "common/events.h" #include "common/array.h" - namespace ZVision { class PushToggleControl : public Control { diff --git a/engines/zvision/scripting/controls/safe_control.cpp b/engines/zvision/scripting/controls/safe_control.cpp index 66ab53085f..3ad5d3a8ae 100644 --- a/engines/zvision/scripting/controls/safe_control.cpp +++ b/engines/zvision/scripting/controls/safe_control.cpp @@ -38,7 +38,6 @@ #include "graphics/surface.h" - namespace ZVision { SafeControl::SafeControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) diff --git a/engines/zvision/scripting/controls/safe_control.h b/engines/zvision/scripting/controls/safe_control.h index e682e35050..e32ca97b70 100644 --- a/engines/zvision/scripting/controls/safe_control.h +++ b/engines/zvision/scripting/controls/safe_control.h @@ -28,7 +28,6 @@ #include "common/list.h" #include "common/rect.h" - namespace ZVision { class ZorkAVIDecoder; diff --git a/engines/zvision/scripting/controls/save_control.cpp b/engines/zvision/scripting/controls/save_control.cpp index 7e1a65a9cc..ad01257e6b 100644 --- a/engines/zvision/scripting/controls/save_control.cpp +++ b/engines/zvision/scripting/controls/save_control.cpp @@ -35,7 +35,6 @@ #include "common/str.h" #include "common/stream.h" - namespace ZVision { SaveControl::SaveControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) diff --git a/engines/zvision/scripting/controls/save_control.h b/engines/zvision/scripting/controls/save_control.h index fefb0e0ce2..cdc50eb54d 100644 --- a/engines/zvision/scripting/controls/save_control.h +++ b/engines/zvision/scripting/controls/save_control.h @@ -27,7 +27,6 @@ #include "common/list.h" - namespace ZVision { class SaveControl : public Control { diff --git a/engines/zvision/scripting/controls/slot_control.cpp b/engines/zvision/scripting/controls/slot_control.cpp index 074d1905b4..1d83b44392 100644 --- a/engines/zvision/scripting/controls/slot_control.cpp +++ b/engines/zvision/scripting/controls/slot_control.cpp @@ -32,7 +32,6 @@ #include "common/stream.h" - namespace ZVision { SlotControl::SlotControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) diff --git a/engines/zvision/scripting/controls/slot_control.h b/engines/zvision/scripting/controls/slot_control.h index 86fd261f25..e776d99311 100644 --- a/engines/zvision/scripting/controls/slot_control.h +++ b/engines/zvision/scripting/controls/slot_control.h @@ -30,7 +30,6 @@ #include "common/rect.h" #include "common/list.h" - namespace ZVision { class SlotControl : public Control { diff --git a/engines/zvision/scripting/controls/titler_control.cpp b/engines/zvision/scripting/controls/titler_control.cpp index b803501033..f0126bebc2 100644 --- a/engines/zvision/scripting/controls/titler_control.cpp +++ b/engines/zvision/scripting/controls/titler_control.cpp @@ -32,7 +32,6 @@ #include "common/stream.h" - namespace ZVision { TitlerControl::TitlerControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) diff --git a/engines/zvision/scripting/controls/titler_control.h b/engines/zvision/scripting/controls/titler_control.h index ee230afa97..075e47c9e9 100644 --- a/engines/zvision/scripting/controls/titler_control.h +++ b/engines/zvision/scripting/controls/titler_control.h @@ -30,7 +30,6 @@ #include "common/rect.h" #include "common/array.h" - namespace ZVision { class TitlerControl : public Control { diff --git a/engines/zvision/scripting/inventory.cpp b/engines/zvision/scripting/inventory.cpp index 98d063395b..76d43b200b 100644 --- a/engines/zvision/scripting/inventory.cpp +++ b/engines/zvision/scripting/inventory.cpp @@ -24,7 +24,6 @@ #include "zvision/scripting/script_manager.h" - namespace ZVision { int8 ScriptManager::inventoryGetCount() { diff --git a/engines/zvision/scripting/puzzle.h b/engines/zvision/scripting/puzzle.h index ab38c5fc5d..4123880835 100644 --- a/engines/zvision/scripting/puzzle.h +++ b/engines/zvision/scripting/puzzle.h @@ -28,7 +28,6 @@ #include "common/list.h" #include "common/ptr.h" - namespace ZVision { struct Puzzle { diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp index 697de58ed8..f97eed6b75 100644 --- a/engines/zvision/scripting/scr_file_handling.cpp +++ b/engines/zvision/scripting/scr_file_handling.cpp @@ -43,7 +43,6 @@ #include "common/file.h" #include "common/tokenizer.h" - namespace ZVision { void ScriptManager::parseScrFile(const Common::String &fileName, ScriptScope &scope) { @@ -210,8 +209,6 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis args = Common::String(chrs + startpos, chrs + pos); } - - // Parse for the action type if (act.matchString("add", true)) { actionList.push_back(new ActionAdd(_engine, slot, args)); diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp index 2a54cc4314..7904817156 100644 --- a/engines/zvision/scripting/script_manager.cpp +++ b/engines/zvision/scripting/script_manager.cpp @@ -37,7 +37,6 @@ #include "common/debug.h" #include "common/stream.h" - namespace ZVision { ScriptManager::ScriptManager(ZVision *engine) diff --git a/engines/zvision/scripting/script_manager.h b/engines/zvision/scripting/script_manager.h index 5701cde6d0..89b961634b 100644 --- a/engines/zvision/scripting/script_manager.h +++ b/engines/zvision/scripting/script_manager.h @@ -31,7 +31,6 @@ #include "common/queue.h" #include "common/events.h" - namespace Common { class String; class SeekableReadStream; @@ -340,7 +339,6 @@ private: ScriptManager *_scriptManager; }; - } // End of namespace ZVision #endif diff --git a/engines/zvision/scripting/sidefx.cpp b/engines/zvision/scripting/sidefx.cpp index c0b8a4d12f..9a658817c9 100644 --- a/engines/zvision/scripting/sidefx.cpp +++ b/engines/zvision/scripting/sidefx.cpp @@ -32,5 +32,4 @@ namespace ZVision { - } // End of namespace ZVision diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp index 98ac4e3b37..549aacba7f 100644 --- a/engines/zvision/scripting/sidefx/animation_node.cpp +++ b/engines/zvision/scripting/sidefx/animation_node.cpp @@ -31,7 +31,6 @@ #include "graphics/surface.h" - namespace ZVision { AnimationNode::AnimationNode(ZVision *engine, uint32 controlKey, const Common::String &fileName, int32 mask, int32 frate, bool DisposeAfterUse) @@ -154,8 +153,6 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) { return false; } - - void AnimationNode::addPlayNode(int32 slot, int x, int y, int x2, int y2, int startFrame, int endFrame, int loops) { playnode nod; nod.loop = loops; diff --git a/engines/zvision/scripting/sidefx/animation_node.h b/engines/zvision/scripting/sidefx/animation_node.h index dab3d88d80..94428d2542 100644 --- a/engines/zvision/scripting/sidefx/animation_node.h +++ b/engines/zvision/scripting/sidefx/animation_node.h @@ -27,7 +27,6 @@ #include "common/rect.h" #include "common/list.h" - namespace Common { class String; } diff --git a/engines/zvision/scripting/sidefx/distort_node.cpp b/engines/zvision/scripting/sidefx/distort_node.cpp index 9be6b29413..0d5c8b1ed5 100644 --- a/engines/zvision/scripting/sidefx/distort_node.cpp +++ b/engines/zvision/scripting/sidefx/distort_node.cpp @@ -31,7 +31,6 @@ #include "common/stream.h" - namespace ZVision { DistortNode::DistortNode(ZVision *engine, uint32 key, int16 speed, float startAngle, float endAngle, float startLineScale, float endLineScale) @@ -83,8 +82,6 @@ bool DistortNode::process(uint32 deltaTimeInMillis) { } float diff = (1.0 / (5.0 - (_curFrame * _frmSpeed))) / (5.0 - _frmSpeed); - - setParams(_startAngle + diff * _diffAngle, _startLineScale + diff * _diffLinScale); return false; @@ -105,5 +102,4 @@ void DistortNode::setParams(float angl, float linScale) { } } - } // End of namespace ZVision diff --git a/engines/zvision/scripting/sidefx/music_node.cpp b/engines/zvision/scripting/sidefx/music_node.cpp index b1e16e71ef..a76d3b4e8d 100644 --- a/engines/zvision/scripting/sidefx/music_node.cpp +++ b/engines/zvision/scripting/sidefx/music_node.cpp @@ -34,7 +34,6 @@ #include "common/file.h" #include "audio/decoders/wave.h" - namespace ZVision { MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool loop, int8 volume) @@ -188,7 +187,6 @@ PanTrackNode::~PanTrackNode() { } } - MusicMidiNode::MusicMidiNode(ZVision *engine, uint32 key, int8 program, int8 note, int8 volume) : MusicNodeBASE(engine, key, SIDEFX_AUDIO) { _volume = volume; diff --git a/engines/zvision/scripting/sidefx/syncsound_node.cpp b/engines/zvision/scripting/sidefx/syncsound_node.cpp index 39542675eb..c1f139694b 100644 --- a/engines/zvision/scripting/sidefx/syncsound_node.cpp +++ b/engines/zvision/scripting/sidefx/syncsound_node.cpp @@ -33,7 +33,6 @@ #include "common/file.h" #include "audio/decoders/wave.h" - namespace ZVision { SyncSoundNode::SyncSoundNode(ZVision *engine, uint32 key, Common::String &filename, int32 syncto) diff --git a/engines/zvision/scripting/sidefx/timer_node.cpp b/engines/zvision/scripting/sidefx/timer_node.cpp index 6e71101acd..abf2c90b04 100644 --- a/engines/zvision/scripting/sidefx/timer_node.cpp +++ b/engines/zvision/scripting/sidefx/timer_node.cpp @@ -29,7 +29,6 @@ #include "common/stream.h" - namespace ZVision { TimerNode::TimerNode(ZVision *engine, uint32 key, uint timeInSeconds) diff --git a/engines/zvision/scripting/sidefx/ttytext_node.cpp b/engines/zvision/scripting/sidefx/ttytext_node.cpp index 68636eb422..1fb7c10792 100644 --- a/engines/zvision/scripting/sidefx/ttytext_node.cpp +++ b/engines/zvision/scripting/sidefx/ttytext_node.cpp @@ -32,7 +32,6 @@ #include "common/stream.h" #include "common/file.h" - namespace ZVision { ttyTextNode::ttyTextNode(ZVision *engine, uint32 key, const Common::String &file, const Common::Rect &r, int32 delay) : |