aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorStrangerke2014-03-16 17:26:51 +0100
committerStrangerke2014-03-16 17:26:51 +0100
commit136b64db83a36f0c6ac00d52b11afba497d7c212 (patch)
treea85050fc89412cd66cf7a37eff3c2c4d3963be17 /engines
parent17870490873bd9ba040b58cb5fbfc1c8480d5461 (diff)
downloadscummvm-rg350-136b64db83a36f0c6ac00d52b11afba497d7c212.tar.gz
scummvm-rg350-136b64db83a36f0c6ac00d52b11afba497d7c212.tar.bz2
scummvm-rg350-136b64db83a36f0c6ac00d52b11afba497d7c212.zip
MADS: Move setAAName() to Scene1xx
Diffstat (limited to 'engines')
-rw-r--r--engines/mads/nebular/nebular_scenes.cpp5
-rw-r--r--engines/mads/nebular/nebular_scenes.h5
-rw-r--r--engines/mads/nebular/nebular_scenes1.cpp6
-rw-r--r--engines/mads/nebular/nebular_scenes1.h16
4 files changed, 12 insertions, 20 deletions
diff --git a/engines/mads/nebular/nebular_scenes.cpp b/engines/mads/nebular/nebular_scenes.cpp
index 21592b07bf..085eee1bbb 100644
--- a/engines/mads/nebular/nebular_scenes.cpp
+++ b/engines/mads/nebular/nebular_scenes.cpp
@@ -99,11 +99,6 @@ void NebularScene::setPlayerSpritesPrefix() {
_vm->_palette->setEntry(17, 10, 45, 45);
}
-void NebularScene::setAAName() {
- int idx = (_scene->_nextSceneId > 103 && _scene->_nextSceneId < 112) ? 1 : 0;
- _game._aaName = Resources::formatAAName(idx);
-}
-
/*------------------------------------------------------------------------*/
void SceneInfoNebular::loadCodes(MSurface &depthSurface) {
diff --git a/engines/mads/nebular/nebular_scenes.h b/engines/mads/nebular/nebular_scenes.h
index 4da8b49996..c1dbcb8b26 100644
--- a/engines/mads/nebular/nebular_scenes.h
+++ b/engines/mads/nebular/nebular_scenes.h
@@ -105,11 +105,6 @@ protected:
Common::String formAnimName(char sepChar, int suffixNum);
/**
- *Sets the AA file to use for the scene
- */
- void setAAName();
-
- /**
* Updates the prefix used for getting player sprites for the scene
*/
void setPlayerSpritesPrefix();
diff --git a/engines/mads/nebular/nebular_scenes1.cpp b/engines/mads/nebular/nebular_scenes1.cpp
index cdc754702c..3d36b19c13 100644
--- a/engines/mads/nebular/nebular_scenes1.cpp
+++ b/engines/mads/nebular/nebular_scenes1.cpp
@@ -30,6 +30,12 @@ namespace MADS {
namespace Nebular {
+void Scene1xx::setAAName() {
+ int idx = (_scene->_nextSceneId > 103 && _scene->_nextSceneId < 112) ? 1 : 0;
+ _game._aaName = Resources::formatAAName(idx);
+}
+
+
void Scene1xx::sceneEntrySound() {
if (_vm->_musicFlag) {
switch (_scene->_nextSceneId) {
diff --git a/engines/mads/nebular/nebular_scenes1.h b/engines/mads/nebular/nebular_scenes1.h
index 0af34dfff5..93de7c86e7 100644
--- a/engines/mads/nebular/nebular_scenes1.h
+++ b/engines/mads/nebular/nebular_scenes1.h
@@ -38,6 +38,12 @@ protected:
* Plays an appropriate sound when entering a scene
*/
void sceneEntrySound();
+
+ /**
+ *Sets the AA file to use for the scene
+ */
+ void setAAName();
+
public:
Scene1xx(MADSEngine *vm) : NebularScene(vm) {}
};
@@ -47,15 +53,10 @@ public:
Scene101(MADSEngine *vm) : Scene1xx(vm) {}
virtual void setup();
-
virtual void enter();
-
virtual void step();
-
virtual void preActions();
-
virtual void actions();
-
virtual void postActions();
};
@@ -64,15 +65,10 @@ public:
Scene103(MADSEngine *vm) : Scene1xx(vm) {}
virtual void setup();
-
virtual void enter();
-
virtual void step();
-
virtual void preActions();
-
virtual void actions();
-
virtual void postActions();
};