aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2014-12-31 16:54:14 -1000
committerPaul Gilbert2014-12-31 16:54:14 -1000
commit9eb229273668b96f63162cabfd769035f95e8a8b (patch)
tree91ea634d37d4c4c9d04c852f0b54ce26cf24f9e4 /engines
parent6e587578c64a7439c330dff09ee1205a97c5b24a (diff)
downloadscummvm-rg350-9eb229273668b96f63162cabfd769035f95e8a8b.tar.gz
scummvm-rg350-9eb229273668b96f63162cabfd769035f95e8a8b.tar.bz2
scummvm-rg350-9eb229273668b96f63162cabfd769035f95e8a8b.zip
XEEN: Compilation fixes
Diffstat (limited to 'engines')
-rw-r--r--engines/xeen/menus.h6
-rw-r--r--engines/xeen/worldofxeen/worldofxeen_game.cpp10
-rw-r--r--engines/xeen/xeen.cpp4
3 files changed, 5 insertions, 15 deletions
diff --git a/engines/xeen/menus.h b/engines/xeen/menus.h
index 07a7bb7e8d..8cc004ac6f 100644
--- a/engines/xeen/menus.h
+++ b/engines/xeen/menus.h
@@ -51,7 +51,7 @@ protected:
Common::Array<DialogButton> _buttons;
char _key;
- virtual void doScroll(bool drawFlag, bool doFade) = 0;
+ virtual void doScroll(bool drawFlag, bool doFade);
void checkEvents();
public:
@@ -78,7 +78,7 @@ private:
protected:
OptionsMenu(XeenEngine *vm) : SettingsBaseDialog(vm) {}
protected:
- virtual void startup(Common::String &title1, Common::String &title2);
+ virtual void startup(Common::String &title1, Common::String &title2) = 0;
virtual void setBackground() {}
@@ -96,8 +96,6 @@ public:
class CloudsOptionsMenu : public OptionsMenu {
protected:
virtual void startup(Common::String &title1, Common::String &title2);
-
- virtual void doScroll(bool drawFlag, bool doFade);
public:
CloudsOptionsMenu(XeenEngine *vm) : OptionsMenu(vm) {}
};
diff --git a/engines/xeen/worldofxeen/worldofxeen_game.cpp b/engines/xeen/worldofxeen/worldofxeen_game.cpp
index 8057331250..bcfbaa1675 100644
--- a/engines/xeen/worldofxeen/worldofxeen_game.cpp
+++ b/engines/xeen/worldofxeen/worldofxeen_game.cpp
@@ -30,15 +30,7 @@ WorldOfXeenEngine::WorldOfXeenEngine(OSystem *syst, const XeenGameDescription *g
}
void WorldOfXeenEngine::playGame () {
- _screen->loadPalette("mm4.pal");
- _screen->fadeIn(4);
-
- //darkSideIntro();
- _events->setCursor(0);
- _events->showCursor();
- while (!shouldQuit()) {
- _events->pollEventsAndWait();
- }
+ XeenEngine::playGame();
}
} // End of namespace Xeen
diff --git a/engines/xeen/xeen.cpp b/engines/xeen/xeen.cpp
index 505d9bd2db..372bbb1b46 100644
--- a/engines/xeen/xeen.cpp
+++ b/engines/xeen/xeen.cpp
@@ -28,6 +28,7 @@
#include "graphics/scaler.h"
#include "graphics/thumbnail.h"
#include "xeen/xeen.h"
+#include "xeen/menus.h"
#include "xeen/resources.h"
namespace Xeen {
@@ -219,8 +220,7 @@ void XeenEngine::writeSavegameHeader(Common::OutSaveFile *out, XeenSavegameHeade
}
void XeenEngine::playGame() {
- //showIntro();
-
+ OptionsMenu::show(this);
}
} // End of namespace Xeen