aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2014-04-08 22:21:45 -0400
committerPaul Gilbert2014-04-08 22:21:45 -0400
commit21a0e38f34324423e0f571ccb37a800737cd78d2 (patch)
tree2f0d36d74812637ec4b489a609725a1758e771ca /engines
parent531ebab4da814aac23a9b084772a6156bfb3b9b8 (diff)
downloadscummvm-rg350-21a0e38f34324423e0f571ccb37a800737cd78d2.tar.gz
scummvm-rg350-21a0e38f34324423e0f571ccb37a800737cd78d2.tar.bz2
scummvm-rg350-21a0e38f34324423e0f571ccb37a800737cd78d2.zip
MADS: Resolve some old TODOs
Diffstat (limited to 'engines')
-rw-r--r--engines/mads/game.cpp4
-rw-r--r--engines/mads/game.h2
-rw-r--r--engines/mads/nebular/game_nebular.cpp4
-rw-r--r--engines/mads/player.h4
-rw-r--r--engines/mads/scene.cpp2
5 files changed, 7 insertions, 9 deletions
diff --git a/engines/mads/game.cpp b/engines/mads/game.cpp
index f790341e8a..eb7ba62fbd 100644
--- a/engines/mads/game.cpp
+++ b/engines/mads/game.cpp
@@ -309,10 +309,6 @@ void Game::initSection(int sectionNumber) {
CURSOR_ARROW : CURSOR_WAIT);
}
-void Game::loadResourceSequence(const Common::String prefix, int v) {
- warning("TODO: loadResourceSequence");
-}
-
void Game::loadQuotes() {
File f("*QUOTES.DAT");
diff --git a/engines/mads/game.h b/engines/mads/game.h
index 296bbcd7ea..56593660b5 100644
--- a/engines/mads/game.h
+++ b/engines/mads/game.h
@@ -90,8 +90,6 @@ protected:
*/
void initSection(int sectionNumber);
- void loadResourceSequence(const Common::String prefix, int v);
-
//@{
/** @name Virtual Method list */
diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp
index 69c896a1f8..d8b00bcf54 100644
--- a/engines/mads/nebular/game_nebular.cpp
+++ b/engines/mads/nebular/game_nebular.cpp
@@ -232,8 +232,8 @@ void GameNebular::initialiseGlobals() {
_player._facing = FACING_NORTH;
_player._turnToFacing = FACING_NORTH;
- loadResourceSequence("RXM", 1);
- loadResourceSequence("ROX", 1);
+ Player::preloadSequences("RXM", 1);
+ Player::preloadSequences("ROX", 1);
}
void GameNebular::setSectionHandler() {
diff --git a/engines/mads/player.h b/engines/mads/player.h
index 8315206fc3..6df1159ad4 100644
--- a/engines/mads/player.h
+++ b/engines/mads/player.h
@@ -210,6 +210,10 @@ public:
* Delete any sprites used by the player
*/
void releasePlayerSprites();
+
+ static void preloadSequences(const Common::String &prefix, int level) {
+ // No implementation in ScummVM
+ }
};
} // End of namespace MADS
diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp
index 8cb5fbcf87..76263bd0f6 100644
--- a/engines/mads/scene.cpp
+++ b/engines/mads/scene.cpp
@@ -168,7 +168,7 @@ void Scene::loadScene(int sceneId, const Common::String &prefix, bool palFlag) {
_userInterface.setup(_vm->_game->_screenObjects._inputMode);
- warning("TODO: showMouse");
+ _vm->_events->showCursor();
warning("TODO: inventory_anim_allocate");
}