[Scummvm-cvs-logs] scummvm master -> d73ed91051f9155f77162c50b99ca9efbb7d3b46

[Strangerke]

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:
d73ed91051 CGE: Remove unused Demo text id


Commit: d73ed91051f9155f77162c50b99ca9efbb7d3b46
    https://github.com/scummvm/scummvm/commit/d73ed91051f9155f77162c50b99ca9efbb7d3b46
Author: Strangerke (strangerke at scummvm.org)
Date: 2012-06-27T22:25:56-07:00

Commit Message:
CGE: Remove unused Demo text id

Changed paths:
    engines/cge/cge.cpp
    engines/cge/cge.h
    engines/cge/cge_main.cpp
    engines/cge/cge_main.h



diff --git a/engines/cge/cge.cpp b/engines/cge/cge.cpp
index 2f5acfa..6cc0c45 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 c5be782..0e8c5a0 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 dd1c78d..fbe37e5 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 87199ee..b98fec5 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)