diff options
Diffstat (limited to 'engines/mohawk')
-rw-r--r-- | engines/mohawk/myst.cpp | 2 | ||||
-rw-r--r-- | engines/mohawk/myst.h | 3 | ||||
-rw-r--r-- | engines/mohawk/myst_areas.cpp | 6 | ||||
-rw-r--r-- | engines/mohawk/myst_scripts.cpp | 9 | ||||
-rw-r--r-- | engines/mohawk/myst_scripts.h | 1 |
5 files changed, 0 insertions, 21 deletions
diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp index b6a6c27329..2f6444a223 100644 --- a/engines/mohawk/myst.cpp +++ b/engines/mohawk/myst.cpp @@ -78,7 +78,6 @@ MohawkEngine_Myst::MohawkEngine_Myst(OSystem *syst, const MohawkGameDescription _needsUpdate = false; _curResource = -1; _hoverResource = 0; - _dragResource = 0; _gfx = NULL; _console = NULL; @@ -644,7 +643,6 @@ void MohawkEngine_Myst::changeToCard(uint16 card, TransitionType transition) { } // Make sure we have the right cursor showing - _dragResource = 0; _hoverResource = 0; _curResource = -1; checkCurrentResource(); diff --git a/engines/mohawk/myst.h b/engines/mohawk/myst.h index 4d86642652..b2f93aee8b 100644 --- a/engines/mohawk/myst.h +++ b/engines/mohawk/myst.h @@ -168,8 +168,6 @@ public: Common::String wrapMovieFilename(const Common::String &movieName, uint16 stack); - void reloadSaveList(); - void changeToStack(uint16 stack, uint16 card, uint16 linkSrcSound, uint16 linkDstSound); void changeToCard(uint16 card, TransitionType transition); uint16 getCurCard() { return _curCard; } @@ -191,7 +189,6 @@ public: MystGameState *_gameState; MystScriptParser *_scriptParser; Common::Array<MystResource *> _resources; - MystResource *_dragResource; Common::RandomSource *_rnd; bool _showResourceRects; diff --git a/engines/mohawk/myst_areas.cpp b/engines/mohawk/myst_areas.cpp index 7a9596d8e0..802e5e96cd 100644 --- a/engines/mohawk/myst_areas.cpp +++ b/engines/mohawk/myst_areas.cpp @@ -554,9 +554,6 @@ void MystResourceType10::restoreBackground() { } void MystResourceType10::handleMouseDown() { - // Tell the engine we are dragging a resource - _vm->_dragResource = this; - const Common::Point &mouse = _vm->_system->getEventManager()->getMousePos(); updatePosition(mouse); @@ -596,9 +593,6 @@ void MystResourceType10::handleMouseUp() { _vm->_scriptParser->setVarValue(_var8, value); MystResourceType11::handleMouseUp(); - - // No longer in drag mode - _vm->_dragResource = 0; } void MystResourceType10::handleMouseDrag() { diff --git a/engines/mohawk/myst_scripts.cpp b/engines/mohawk/myst_scripts.cpp index 487d0f45fe..99970e68b3 100644 --- a/engines/mohawk/myst_scripts.cpp +++ b/engines/mohawk/myst_scripts.cpp @@ -260,15 +260,6 @@ bool MystScriptParser::setVarValue(uint16 var, uint16 value) { return false; } -// NOTE: Check to be used on Opcodes where var is thought -// not to be used. This emits a warning if var is nonzero. -// It is possible that the opcode does use var 0 in this case, -// but this will catch the majority of missed cases. -void MystScriptParser::varUnusedCheck(uint16 op, uint16 var) { - if (var != 0) - warning("Opcode %d: Unused Var %d", op, var); -} - void MystScriptParser::animatedUpdate(uint16 argc, uint16 *argv, uint16 delay) { uint16 argsRead = 0; diff --git a/engines/mohawk/myst_scripts.h b/engines/mohawk/myst_scripts.h index 7d8165c762..cce4d7f436 100644 --- a/engines/mohawk/myst_scripts.h +++ b/engines/mohawk/myst_scripts.h @@ -163,7 +163,6 @@ protected: static const uint16 _startCard[]; void setupCommonOpcodes(); - void varUnusedCheck(uint16 op, uint16 var); }; } // End of namespace Mohawk |