diff options
| author | Max Horn | 2010-06-25 16:16:29 +0000 | 
|---|---|---|
| committer | Max Horn | 2010-06-25 16:16:29 +0000 | 
| commit | 6ee82a20276d213a06d43ff731d197f5a92a09d7 (patch) | |
| tree | d9bc631c10aa56d2ba6d47b2cdcb644696fee0a4 /engines/sci/engine/segment.cpp | |
| parent | 23d384e6b88f4023b9150401a70a4efdf9bae018 (diff) | |
| download | scummvm-rg350-6ee82a20276d213a06d43ff731d197f5a92a09d7.tar.gz scummvm-rg350-6ee82a20276d213a06d43ff731d197f5a92a09d7.tar.bz2 scummvm-rg350-6ee82a20276d213a06d43ff731d197f5a92a09d7.zip | |
SCI: Introduce SciGameId enum
svn-id: r50273
Diffstat (limited to 'engines/sci/engine/segment.cpp')
| -rw-r--r-- | engines/sci/engine/segment.cpp | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/engines/sci/engine/segment.cpp b/engines/sci/engine/segment.cpp index 6a564fcc57..0a39d950b0 100644 --- a/engines/sci/engine/segment.cpp +++ b/engines/sci/engine/segment.cpp @@ -465,7 +465,7 @@ SegmentRef LocalVariables::dereference(reg_t pointer) {  		ret.reg = &_locals[pointer.offset / 2];  	} else {  		if ((g_sci->getEngineState()->currentRoomNumber() == 660 || g_sci->getEngineState()->currentRoomNumber() == 660) -			&& g_sci->getGameId() == "laurabow2") { +			&& g_sci->getGameId() == GID_LAURABOW2) {  			// Happens in two places during the intro of LB2CD, both from kMemory(peek):  			// - room 160: Heap 160 has 83 local variables (0-82), and the game  			//   asks for variables at indices 83 - 90 too. @@ -520,7 +520,7 @@ SegmentRef SystemStrings::dereference(reg_t pointer) {  	if (isValidOffset(pointer.offset))  		ret.raw = (byte *)(_strings[pointer.offset]._value);  	else { -		if (g_sci->getGameId() == "kq5") { +		if (g_sci->getGameId() == GID_KQ5) {  			// This occurs in KQ5CD when interacting with certain objects  		} else {  			error("SystemStrings::dereference(): Attempt to dereference invalid pointer %04x:%04x", PRINT_REG(pointer)); | 
