[Scummvm-git-logs] scummvm master -> aa05f9c8025b4db260dc25d6ceb871dc37cd0146
dreammaster
dreammaster at scummvm.org
Sun Sep 25 02:55:07 CEST 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
aa05f9c802 XEEN: Move old main menu classes into WorldOfXeen namespace
Commit: aa05f9c8025b4db260dc25d6ceb871dc37cd0146
https://github.com/scummvm/scummvm/commit/aa05f9c8025b4db260dc25d6ceb871dc37cd0146
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-09-24T20:54:58-04:00
Commit Message:
XEEN: Move old main menu classes into WorldOfXeen namespace
Changed paths:
A engines/xeen/worldofxeen/worldofxeen_menu.cpp
A engines/xeen/worldofxeen/worldofxeen_menu.h
R engines/xeen/dialogs_options.cpp
R engines/xeen/dialogs_options.h
engines/xeen/module.mk
engines/xeen/xeen.cpp
diff --git a/engines/xeen/dialogs_options.cpp b/engines/xeen/dialogs_options.cpp
deleted file mode 100644
index a49b6d6..0000000
--- a/engines/xeen/dialogs_options.cpp
+++ /dev/null
@@ -1,231 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-#include "xeen/dialogs_options.h"
-#include "xeen/resources.h"
-
-namespace Xeen {
-
-void OptionsMenu::show(XeenEngine *vm) {
- OptionsMenu *menu;
-
- switch (vm->getGameID()) {
- case GType_Clouds:
- menu = new CloudsOptionsMenu(vm);
- break;
- case GType_DarkSide:
- menu = new DarkSideOptionsMenu(vm);
- break;
- case GType_WorldOfXeen:
- menu = new WorldOptionsMenu(vm);
- break;
- default:
- error("Unsupported game");
- break;
- }
-
- menu->execute();
- delete menu;
-}
-
-void OptionsMenu::execute() {
- SpriteResource special("special.icn");
- Screen &screen = *_vm->_screen;
- EventsManager &events = *_vm->_events;
-
- File newBright("newbrigh.m");
- _vm->_sound->playSong(newBright);
-
- screen._windows[GAME_WINDOW].setBounds(Common::Rect(72, 25, 248, 175));
-
- Common::String title1, title2;
- startup(title1, title2);
- SpriteResource title1Sprites(title1), title2Sprites(title2);
-
- bool firstTime = true, doFade = true;
- while (!_vm->shouldQuit()) {
- setBackground(doFade);
- events.setCursor(0);
-
- if (firstTime) {
- firstTime = false;
- warning("TODO: Read existing save file");
- }
-
- showTitles1(title1Sprites);
- showTitles2();
-
- clearButtons();
- setupButtons(&title2Sprites);
- openWindow();
-
- while (!_vm->shouldQuit()) {
- // Show the dialog with a continually animating background
- while (!_vm->shouldQuit() && !_buttonValue)
- showContents(title1Sprites, true);
- if (_vm->shouldQuit())
- return;
-
- // Handle keypress
- int key = toupper(_buttonValue);
- _buttonValue = 0;
-
- if (key == 'C' || key == 'V') {
- // Show credits
- CreditsScreen::show(_vm);
- break;
- } else if (key == 27) {
- // Hide the options menu
- break;
- }
- }
- }
-}
-
-void OptionsMenu::showTitles1(SpriteResource &sprites) {
- Screen &screen = *_vm->_screen;
- EventsManager &events = *_vm->_events;
-
- int frameNum = 0;
- while (!_vm->shouldQuit() && !events.isKeyMousePressed()) {
- events.updateGameCounter();
-
- frameNum = (frameNum + 1) % (_vm->getGameID() == GType_WorldOfXeen ? 5 : 10);
- screen.restoreBackground();
- sprites.draw(screen, frameNum);
-
- events.wait(4);
- }
-}
-
-void OptionsMenu::showTitles2() {
- Screen &screen = *_vm->_screen;
- EventsManager &events = *_vm->_events;
- Sound &sound = *_vm->_sound;
-
- SpriteResource titleSprites("title2b.raw");
- SpriteResource kludgeSprites("kludge.int");
- SpriteResource title2Sprites[8] = {
- SpriteResource("title2b.int"), SpriteResource("title2c.int"),
- SpriteResource("title2d.int"), SpriteResource("title2e.int"),
- SpriteResource("title2f.int"), SpriteResource("title2g.int"),
- SpriteResource("title2h.int"), SpriteResource("title2i.int"),
- };
-
- kludgeSprites.draw(screen, 0);
- screen.saveBackground();
- sound.playSound("elect.voc");
-
- for (int i = 0; i < 30 && !_vm->shouldQuit(); ++i) {
- events.updateGameCounter();
- screen.restoreBackground();
- title2Sprites[i / 4].draw(screen, i % 4);
- screen._windows[0].update();
-
- if (i == 19)
- sound.stopSound();
-
- while (!_vm->shouldQuit() && events.timeElapsed() < 2)
- events.pollEventsAndWait();
- }
-
- screen.restoreBackground();
- screen._windows[0].update();
-}
-
-void OptionsMenu::setupButtons(SpriteResource *buttons) {
- addButton(Common::Rect(124, 87, 124 + 53, 87 + 10), 'S');
- addButton(Common::Rect(126, 98, 126 + 47, 98 + 10), 'L');
- addButton(Common::Rect(91, 110, 91 + 118, 110 + 10), 'C');
- addButton(Common::Rect(85, 121, 85 + 131, 121 + 10), 'O');
-}
-
-void WorldOptionsMenu::setupButtons(SpriteResource *buttons) {
- addButton(Common::Rect(93, 53, 93 + 134, 53 + 20), 'S', buttons);
- addButton(Common::Rect(93, 78, 93 + 134, 78 + 20), 'L', buttons);
- addButton(Common::Rect(93, 103, 93 + 134, 103 + 20), 'C', buttons);
- addButton(Common::Rect(93, 128, 93 + 134, 128 + 20), 'O', buttons);
-}
-
-/*------------------------------------------------------------------------*/
-
-void CloudsOptionsMenu::startup(Common::String &title1, Common::String &title2) {
- title1 = "title1.int";
- title2 = "title1a.int";
-}
-
-/*------------------------------------------------------------------------*/
-
-void DarkSideOptionsMenu::startup(Common::String &title1, Common::String &title2) {
- title1 = "title2.int";
- title2 = "title2a.int";
-}
-
-void WorldOptionsMenu::startup(Common::String &title1, Common::String &title2) {
- title1 = "world.int";
- title2 = "start.icn";
-
- Screen &screen = *_vm->_screen;
- screen.fadeOut();
- screen.loadPalette("dark.pal");
- _vm->_events->clearEvents();
-}
-
-void WorldOptionsMenu::setBackground(bool doFade) {
- Screen &screen = *_vm->_screen;
- screen.loadBackground("world.raw");
- screen.saveBackground();
-
- if (doFade)
- screen.fadeIn();
-}
-
-void WorldOptionsMenu::openWindow() {
- _vm->_screen->_windows[GAME_WINDOW].open();
-}
-
-void WorldOptionsMenu::showContents(SpriteResource &title1, bool waitFlag) {
- Screen &screen = *_vm->_screen;
- EventsManager &events = *_vm->_events;
- events.updateGameCounter();
-
- // Draw the background frame in a continous cycle
- _bgFrame = (_bgFrame + 1) % 5;
- title1.draw(screen._windows[0], _bgFrame);
-
- // Draw the basic frame for the optitons menu and title text
- screen._windows[GAME_WINDOW].frame();
- screen._windows[GAME_WINDOW].writeString(Res.OPTIONS_TITLE);
-
- drawButtons(&screen._windows[0]);
-
- if (waitFlag) {
- screen._windows[0].update();
-
- while (!_vm->shouldQuit() && !_buttonValue && events.timeElapsed() < 3) {
- checkEvents(_vm);
- }
- }
-}
-
-} // End of namespace Xeen
diff --git a/engines/xeen/dialogs_options.h b/engines/xeen/dialogs_options.h
deleted file mode 100644
index bb4aea9..0000000
--- a/engines/xeen/dialogs_options.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef XEEN_DIALOGS_OPTIONS_H
-#define XEEN_DIALOGS_OPTIONS_H
-
-#include "xeen/xeen.h"
-#include "xeen/dialogs.h"
-
-namespace Xeen {
-
-class OptionsMenu : public SettingsBaseDialog {
-private:
- void execute();
-protected:
- OptionsMenu(XeenEngine *vm) : SettingsBaseDialog(vm) {}
-protected:
- virtual void startup(Common::String &title1, Common::String &title2) = 0;
-
- virtual void setBackground(bool doFade) {}
-
- virtual void showTitles1(SpriteResource &sprites);
-
- virtual void showTitles2();
-
- virtual void setupButtons(SpriteResource *buttons);
-
- virtual void openWindow() {}
-public:
- virtual ~OptionsMenu() {}
-
- static void show(XeenEngine *vm);
-};
-
-class CloudsOptionsMenu : public OptionsMenu {
-protected:
- virtual void startup(Common::String &title1, Common::String &title2);
-public:
- CloudsOptionsMenu(XeenEngine *vm) : OptionsMenu(vm) {}
-
- virtual ~CloudsOptionsMenu() {}
-};
-
-class DarkSideOptionsMenu : public OptionsMenu {
-protected:
- virtual void startup(Common::String &title1, Common::String &title2);
-public:
- DarkSideOptionsMenu(XeenEngine *vm) : OptionsMenu(vm) {}
-
- virtual ~DarkSideOptionsMenu() {}
-};
-
-class WorldOptionsMenu : public DarkSideOptionsMenu {
-private:
- int _bgFrame;
-protected:
- virtual void startup(Common::String &title1, Common::String &title2);
-
- virtual void setBackground(bool doFade);
-
- virtual void showTitles2() {}
-
- virtual void setupButtons(SpriteResource *buttons);
-
- virtual void openWindow();
-
- virtual void showContents(SpriteResource &title1, bool mode);
-public:
- WorldOptionsMenu(XeenEngine *vm) : DarkSideOptionsMenu(vm), _bgFrame(0) {}
-
- virtual ~WorldOptionsMenu() {}
-};
-
-} // End of namespace Xeen
-
-#endif /* XEEN_DIALOGS_H */
diff --git a/engines/xeen/module.mk b/engines/xeen/module.mk
index 400e273..553169a 100644
--- a/engines/xeen/module.mk
+++ b/engines/xeen/module.mk
@@ -3,6 +3,7 @@ MODULE := engines/xeen
MODULE_OBJS := \
worldofxeen/clouds_cutscenes.o \
worldofxeen/darkside_cutscenes.o \
+ worldofxeen/worldofxeen_menu.o \
worldofxeen/worldofxeen.o \
worldofxeen/worldofxeen_resources.o \
character.o \
@@ -18,7 +19,6 @@ MODULE_OBJS := \
dialogs_error.o \
dialogs_exchange.o \
dialogs_fight_options.o \
- dialogs_options.o \
dialogs_info.o \
dialogs_input.o \
dialogs_items.o \
diff --git a/engines/xeen/worldofxeen/worldofxeen_menu.cpp b/engines/xeen/worldofxeen/worldofxeen_menu.cpp
new file mode 100644
index 0000000..3b8f965
--- /dev/null
+++ b/engines/xeen/worldofxeen/worldofxeen_menu.cpp
@@ -0,0 +1,233 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+#include "xeen/worldofxeen/worldofxeen_menu.h"
+#include "xeen/resources.h"
+
+namespace Xeen {
+namespace WorldOfXeen {
+
+void WorldOfXeenMenu::show(XeenEngine *vm) {
+ WorldOfXeenMenu *menu;
+
+ switch (vm->getGameID()) {
+ case GType_Clouds:
+ menu = new CloudsOptionsMenu(vm);
+ break;
+ case GType_DarkSide:
+ menu = new DarkSideOptionsMenu(vm);
+ break;
+ case GType_WorldOfXeen:
+ menu = new WorldOptionsMenu(vm);
+ break;
+ default:
+ error("Unsupported game");
+ break;
+ }
+
+ menu->execute();
+ delete menu;
+}
+
+void WorldOfXeenMenu::execute() {
+ SpriteResource special("special.icn");
+ Screen &screen = *_vm->_screen;
+ EventsManager &events = *_vm->_events;
+
+ File newBright("newbrigh.m");
+ _vm->_sound->playSong(newBright);
+
+ screen._windows[GAME_WINDOW].setBounds(Common::Rect(72, 25, 248, 175));
+
+ Common::String title1, title2;
+ startup(title1, title2);
+ SpriteResource title1Sprites(title1), title2Sprites(title2);
+
+ bool firstTime = true, doFade = true;
+ while (!_vm->shouldQuit()) {
+ setBackground(doFade);
+ events.setCursor(0);
+
+ if (firstTime) {
+ firstTime = false;
+ warning("TODO: Read existing save file");
+ }
+
+ showTitles1(title1Sprites);
+ showTitles2();
+
+ clearButtons();
+ setupButtons(&title2Sprites);
+ openWindow();
+
+ while (!_vm->shouldQuit()) {
+ // Show the dialog with a continually animating background
+ while (!_vm->shouldQuit() && !_buttonValue)
+ showContents(title1Sprites, true);
+ if (_vm->shouldQuit())
+ return;
+
+ // Handle keypress
+ int key = toupper(_buttonValue);
+ _buttonValue = 0;
+
+ if (key == 'C' || key == 'V') {
+ // Show credits
+ CreditsScreen::show(_vm);
+ break;
+ } else if (key == 27) {
+ // Hide the options menu
+ break;
+ }
+ }
+ }
+}
+
+void WorldOfXeenMenu::showTitles1(SpriteResource &sprites) {
+ Screen &screen = *_vm->_screen;
+ EventsManager &events = *_vm->_events;
+
+ int frameNum = 0;
+ while (!_vm->shouldQuit() && !events.isKeyMousePressed()) {
+ events.updateGameCounter();
+
+ frameNum = (frameNum + 1) % (_vm->getGameID() == GType_WorldOfXeen ? 5 : 10);
+ screen.restoreBackground();
+ sprites.draw(screen, frameNum);
+
+ events.wait(4);
+ }
+}
+
+void WorldOfXeenMenu::showTitles2() {
+ Screen &screen = *_vm->_screen;
+ EventsManager &events = *_vm->_events;
+ Sound &sound = *_vm->_sound;
+
+ SpriteResource titleSprites("title2b.raw");
+ SpriteResource kludgeSprites("kludge.int");
+ SpriteResource title2Sprites[8] = {
+ SpriteResource("title2b.int"), SpriteResource("title2c.int"),
+ SpriteResource("title2d.int"), SpriteResource("title2e.int"),
+ SpriteResource("title2f.int"), SpriteResource("title2g.int"),
+ SpriteResource("title2h.int"), SpriteResource("title2i.int"),
+ };
+
+ kludgeSprites.draw(screen, 0);
+ screen.saveBackground();
+ sound.playSound("elect.voc");
+
+ for (int i = 0; i < 30 && !_vm->shouldQuit(); ++i) {
+ events.updateGameCounter();
+ screen.restoreBackground();
+ title2Sprites[i / 4].draw(screen, i % 4);
+ screen._windows[0].update();
+
+ if (i == 19)
+ sound.stopSound();
+
+ while (!_vm->shouldQuit() && events.timeElapsed() < 2)
+ events.pollEventsAndWait();
+ }
+
+ screen.restoreBackground();
+ screen._windows[0].update();
+}
+
+void WorldOfXeenMenu::setupButtons(SpriteResource *buttons) {
+ addButton(Common::Rect(124, 87, 124 + 53, 87 + 10), 'S');
+ addButton(Common::Rect(126, 98, 126 + 47, 98 + 10), 'L');
+ addButton(Common::Rect(91, 110, 91 + 118, 110 + 10), 'C');
+ addButton(Common::Rect(85, 121, 85 + 131, 121 + 10), 'O');
+}
+
+void WorldOptionsMenu::setupButtons(SpriteResource *buttons) {
+ addButton(Common::Rect(93, 53, 93 + 134, 53 + 20), 'S', buttons);
+ addButton(Common::Rect(93, 78, 93 + 134, 78 + 20), 'L', buttons);
+ addButton(Common::Rect(93, 103, 93 + 134, 103 + 20), 'C', buttons);
+ addButton(Common::Rect(93, 128, 93 + 134, 128 + 20), 'O', buttons);
+}
+
+/*------------------------------------------------------------------------*/
+
+void CloudsOptionsMenu::startup(Common::String &title1, Common::String &title2) {
+ title1 = "title1.int";
+ title2 = "title1a.int";
+}
+
+/*------------------------------------------------------------------------*/
+
+void DarkSideOptionsMenu::startup(Common::String &title1, Common::String &title2) {
+ title1 = "title2.int";
+ title2 = "title2a.int";
+}
+
+void WorldOptionsMenu::startup(Common::String &title1, Common::String &title2) {
+ title1 = "world.int";
+ title2 = "start.icn";
+
+ Screen &screen = *_vm->_screen;
+ screen.fadeOut();
+ screen.loadPalette("dark.pal");
+ _vm->_events->clearEvents();
+}
+
+void WorldOptionsMenu::setBackground(bool doFade) {
+ Screen &screen = *_vm->_screen;
+ screen.loadBackground("world.raw");
+ screen.saveBackground();
+
+ if (doFade)
+ screen.fadeIn();
+}
+
+void WorldOptionsMenu::openWindow() {
+ _vm->_screen->_windows[GAME_WINDOW].open();
+}
+
+void WorldOptionsMenu::showContents(SpriteResource &title1, bool waitFlag) {
+ Screen &screen = *_vm->_screen;
+ EventsManager &events = *_vm->_events;
+ events.updateGameCounter();
+
+ // Draw the background frame in a continous cycle
+ _bgFrame = (_bgFrame + 1) % 5;
+ title1.draw(screen._windows[0], _bgFrame);
+
+ // Draw the basic frame for the optitons menu and title text
+ screen._windows[GAME_WINDOW].frame();
+ screen._windows[GAME_WINDOW].writeString(Res.OPTIONS_TITLE);
+
+ drawButtons(&screen._windows[0]);
+
+ if (waitFlag) {
+ screen._windows[0].update();
+
+ while (!_vm->shouldQuit() && !_buttonValue && events.timeElapsed() < 3) {
+ checkEvents(_vm);
+ }
+ }
+}
+
+} // End of namespace WorldOfXeen
+} // End of namespace Xeen
diff --git a/engines/xeen/worldofxeen/worldofxeen_menu.h b/engines/xeen/worldofxeen/worldofxeen_menu.h
new file mode 100644
index 0000000..9b507b7
--- /dev/null
+++ b/engines/xeen/worldofxeen/worldofxeen_menu.h
@@ -0,0 +1,97 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef XEEN_WORLDOFXEEN_WORLDOFXEEN_MENU_H
+#define XEEN_WORLDOFXEEN_WORLDOFXEEN_MENU_H
+
+#include "xeen/xeen.h"
+#include "xeen/dialogs.h"
+
+namespace Xeen {
+namespace WorldOfXeen {
+
+class WorldOfXeenMenu : public SettingsBaseDialog {
+private:
+ void execute();
+protected:
+ WorldOfXeenMenu(XeenEngine *vm) : SettingsBaseDialog(vm) {}
+protected:
+ virtual void startup(Common::String &title1, Common::String &title2) = 0;
+
+ virtual void setBackground(bool doFade) {}
+
+ virtual void showTitles1(SpriteResource &sprites);
+
+ virtual void showTitles2();
+
+ virtual void setupButtons(SpriteResource *buttons);
+
+ virtual void openWindow() {}
+public:
+ virtual ~WorldOfXeenMenu() {}
+
+ static void show(XeenEngine *vm);
+};
+
+class CloudsOptionsMenu : public WorldOfXeenMenu {
+protected:
+ virtual void startup(Common::String &title1, Common::String &title2);
+public:
+ CloudsOptionsMenu(XeenEngine *vm) : WorldOfXeenMenu(vm) {}
+
+ virtual ~CloudsOptionsMenu() {}
+};
+
+class DarkSideOptionsMenu : public WorldOfXeenMenu {
+protected:
+ virtual void startup(Common::String &title1, Common::String &title2);
+public:
+ DarkSideOptionsMenu(XeenEngine *vm) : WorldOfXeenMenu(vm) {}
+
+ virtual ~DarkSideOptionsMenu() {}
+};
+
+class WorldOptionsMenu : public DarkSideOptionsMenu {
+private:
+ int _bgFrame;
+protected:
+ virtual void startup(Common::String &title1, Common::String &title2);
+
+ virtual void setBackground(bool doFade);
+
+ virtual void showTitles2() {}
+
+ virtual void setupButtons(SpriteResource *buttons);
+
+ virtual void openWindow();
+
+ virtual void showContents(SpriteResource &title1, bool mode);
+public:
+ WorldOptionsMenu(XeenEngine *vm) : DarkSideOptionsMenu(vm), _bgFrame(0) {}
+
+ virtual ~WorldOptionsMenu() {}
+};
+
+} // End of namespace WorldOfXeen
+} // End of namespace Xeen
+
+#endif /* XEEN_WORLDOFXEEN_WORLDOFXEEN_MENU_H */
diff --git a/engines/xeen/xeen.cpp b/engines/xeen/xeen.cpp
index 341af61..451afcc 100644
--- a/engines/xeen/xeen.cpp
+++ b/engines/xeen/xeen.cpp
@@ -28,7 +28,6 @@
#include "graphics/scaler.h"
#include "graphics/thumbnail.h"
#include "xeen/xeen.h"
-#include "xeen/dialogs_options.h"
#include "xeen/files.h"
#include "xeen/resources.h"
More information about the Scummvm-git-logs
mailing list