aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2011-11-13 12:48:09 +0100
committerStrangerke2011-11-13 12:48:09 +0100
commitc6c9620ff2a0ef8c7c7b074445a3886660f02bba (patch)
treef5243c8dcdd67ce90f53be9e9e730d28243b8f06
parent8097aeb43a916dac160bda11201a6fc79a933c40 (diff)
downloadscummvm-rg350-c6c9620ff2a0ef8c7c7b074445a3886660f02bba.tar.gz
scummvm-rg350-c6c9620ff2a0ef8c7c7b074445a3886660f02bba.tar.bz2
scummvm-rg350-c6c9620ff2a0ef8c7c7b074445a3886660f02bba.zip
CGE: Remove some useless constants
-rw-r--r--engines/cge/cge_main.cpp2
-rw-r--r--engines/cge/cge_main.h4
2 files changed, 1 insertions, 5 deletions
diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp
index cb03517963..53078fe8f8 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 d5f2e4f5fb..87199ee524 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)