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

[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:
c6c9620ff2 CGE: Remove some useless constants


Commit: c6c9620ff2a0ef8c7c7b074445a3886660f02bba
    https://github.com/scummvm/scummvm/commit/c6c9620ff2a0ef8c7c7b074445a3886660f02bba
Author: Strangerke (strangerke at scummvm.org)
Date: 2011-11-13T03:48:09-08:00

Commit Message:
CGE: Remove some useless constants

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



diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp
index cb03517..53078fe 100644
--- a/engines/cge/cge_main.cpp
+++ b/engines/cge/cge_main.cpp
@@ -200,7 +200,7 @@ bool CGEEngine::loadGame(int slotNumber, SavegameHeader *header, bool tiny) {
 
 	if (slotNumber == -1) {
 		// Loading the data for the initial game state
-		kSavegame0File file = kSavegame0File(this, kSavegame0Name);
+		EncryptedStream file = EncryptedStream(this, kSavegame0Name);
 		int size = file.size();
 		byte *dataBuffer = (byte *)malloc(size);
 		file.read(dataBuffer, size);
diff --git a/engines/cge/cge_main.h b/engines/cge/cge_main.h
index d5f2e4f..87199ee 100644
--- a/engines/cge/cge_main.h
+++ b/engines/cge/cge_main.h
@@ -57,10 +57,7 @@ namespace CGE {
 #define kHeroFun0      (40 * 12)
 #define kHeroFun1      ( 2 * 12)
 #define kShowScummVMVersion 15
-#define kGetNamePrompt 50
-#define kGetNameTitle  51
 #define kTSeq          96
-#define kNoMusic       98
 #define kBadSVG        99
 #define kSeqHTalk      (kTSeq + 4)
 #define kSeqTooFar     (kTSeq + 5)
@@ -83,7 +80,6 @@ namespace CGE {
 #define kStackSize     2048
 #define kSavegameCheckSum   (1956 + _now + _oldLev + _game + _music + _demoText)
 #define kSavegame0Name ("{{INIT}}" kSvgExt)
-#define kSavegame0File EncryptedStream
 #define kSavegameStrSize 11
 #define kGameFrameDelay (1000 / 50)
 #define kGameTickDelay  (1000 / 62)