diff options
| author | Strangerke | 2012-06-28 07:25:56 +0200 |
|---|---|---|
| committer | Strangerke | 2012-06-28 07:25:56 +0200 |
| commit | d73ed91051f9155f77162c50b99ca9efbb7d3b46 (patch) | |
| tree | e10fabe3ae55e13a8ef55f1e85f88508226d20cb | |
| parent | 647bc59f992e77fa65dfa7e1e000b85a9ea55c2a (diff) | |
| download | scummvm-rg350-d73ed91051f9155f77162c50b99ca9efbb7d3b46.tar.gz scummvm-rg350-d73ed91051f9155f77162c50b99ca9efbb7d3b46.tar.bz2 scummvm-rg350-d73ed91051f9155f77162c50b99ca9efbb7d3b46.zip | |
CGE: Remove unused Demo text id
| -rw-r--r-- | engines/cge/cge.cpp | 1 | ||||
| -rw-r--r-- | engines/cge/cge.h | 1 | ||||
| -rw-r--r-- | engines/cge/cge_main.cpp | 4 | ||||
| -rw-r--r-- | engines/cge/cge_main.h | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/engines/cge/cge.cpp b/engines/cge/cge.cpp index 2f5acfa4a4..6cc0c45963 100644 --- a/engines/cge/cge.cpp +++ b/engines/cge/cge.cpp @@ -52,7 +52,6 @@ CGEEngine::CGEEngine(OSystem *syst, const ADGameDescription *gameDescription) DebugMan.addDebugChannel(kCGEDebugEngine, "engine", "CGE Engine debug channel"); _startupMode = 1; - _demoText = kDemo; _oldLev = 0; _pocPtr = 0; _bitmapPalette = NULL; diff --git a/engines/cge/cge.h b/engines/cge/cge.h index c5be78236a..0e8c5a05bb 100644 --- a/engines/cge/cge.h +++ b/engines/cge/cge.h @@ -149,7 +149,6 @@ public: const ADGameDescription *_gameDescription; int _startupMode; - int _demoText; int _oldLev; int _pocPtr; bool _music; diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp index dd1c78d92e..fbe37e58a0 100644 --- a/engines/cge/cge_main.cpp +++ b/engines/cge/cge_main.cpp @@ -150,11 +150,11 @@ void CGEEngine::sndSetVolume() { void CGEEngine::syncHeader(Common::Serializer &s) { debugC(1, kCGEDebugEngine, "CGEEngine::syncHeader(s)"); - int i; + int i = kDemo; s.syncAsUint16LE(_now); s.syncAsUint16LE(_oldLev); - s.syncAsUint16LE(_demoText); + s.syncAsUint16LE(i); // unused Demo string id for (i = 0; i < 5; i++) s.syncAsUint16LE(_game); s.syncAsSint16LE(i); // unused VGA::Mono variable diff --git a/engines/cge/cge_main.h b/engines/cge/cge_main.h index 87199ee524..b98fec531d 100644 --- a/engines/cge/cge_main.h +++ b/engines/cge/cge_main.h @@ -78,7 +78,7 @@ namespace CGE { #define kScrHeight 200 #define kWorldHeight (kScrHeight - kPanHeight) #define kStackSize 2048 -#define kSavegameCheckSum (1956 + _now + _oldLev + _game + _music + _demoText) +#define kSavegameCheckSum (1956 + _now + _oldLev + _game + _music + kDemo) #define kSavegame0Name ("{{INIT}}" kSvgExt) #define kSavegameStrSize 11 #define kGameFrameDelay (1000 / 50) |