aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authoruruk2014-07-15 14:41:46 +0200
committeruruk2014-07-15 14:41:46 +0200
commit8861b0b583f1cd56ff5e8f7a8b408f696c85f545 (patch)
treec6544f5b7533ac8e20c8e2c34a91abcc19af5cb5 /engines
parent470736b9c456cc9217f7377dbd543774eebcb88b (diff)
downloadscummvm-rg350-8861b0b583f1cd56ff5e8f7a8b408f696c85f545.tar.gz
scummvm-rg350-8861b0b583f1cd56ff5e8f7a8b408f696c85f545.tar.bz2
scummvm-rg350-8861b0b583f1cd56ff5e8f7a8b408f696c85f545.zip
CGE2: Get rid of _mode.
Diffstat (limited to 'engines')
-rw-r--r--engines/cge2/cge2.cpp1
-rw-r--r--engines/cge2/cge2.h1
-rw-r--r--engines/cge2/cge2_main.cpp6
3 files changed, 1 insertions, 7 deletions
diff --git a/engines/cge2/cge2.cpp b/engines/cge2/cge2.cpp
index 1fb880c4df..b820ba53a7 100644
--- a/engines/cge2/cge2.cpp
+++ b/engines/cge2/cge2.cpp
@@ -74,7 +74,6 @@ CGE2Engine::CGE2Engine(OSystem *syst, const ADGameDescription *gameDescription)
_quitFlag = false;
_bitmapPalette = nullptr;
- _mode = 0;
_music = true;
_startupMode = 1;
_now = 1;
diff --git a/engines/cge2/cge2.h b/engines/cge2/cge2.h
index 252fad07bd..d97ba3d675 100644
--- a/engines/cge2/cge2.h
+++ b/engines/cge2/cge2.h
@@ -263,7 +263,6 @@ public:
bool _quitFlag;
Dac *_bitmapPalette;
- int _mode;
bool _music;
int _startupMode;
int _now;
diff --git a/engines/cge2/cge2_main.cpp b/engines/cge2/cge2_main.cpp
index 0e2e702288..29592d73f1 100644
--- a/engines/cge2/cge2_main.cpp
+++ b/engines/cge2/cge2_main.cpp
@@ -836,14 +836,12 @@ void CGE2Engine::cge2_main() {
if (_startGameSlot != -1) {
// Starting up a savegame from the launcher
- _mode++;
runGame();
}
if (showTitle("WELCOME")) {
#if 0
- if (_mode == 1)
- movie(kIntroExt);
+ movie(kIntroExt);
#endif
if (_text->getText(255) != nullptr) {
runGame();
@@ -891,8 +889,6 @@ int CGE2Engine::newRandom(int range) {
bool CGE2Engine::showTitle(const char *name) {
if (_quitFlag)
return false;
-
- _mode++;
_bitmapPalette = _vga->_sysPal;
BitmapPtr LB = new Bitmap[1];