thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ZVISION: Rename ZVisionGameIds to use standard format

Browse source
This commit is contained in:
RichieSams 2013-09-29 21:41:43 -05:00
parent 49d67caa31
commit 11576c5aa9
5 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engines/zvision/cursor_manager.cpp
View file

@ -47,10 +47,10 @@ CursorManager::CursorManager(ZVision *engine, const Graphics::PixelFormat *pixel
_pixelFormat(pixelFormat), _pixelFormat(pixelFormat),
_cursorIsPushed(false) { _cursorIsPushed(false) {
// WARNING: The index IDLE_CURSOR_INDEX is hardcoded. If you change the order of _cursorNames/_zgiCursorFileNames/_zNemCursorFileNames, you HAVE to change the index accordingly // WARNING: The index IDLE_CURSOR_INDEX is hardcoded. If you change the order of _cursorNames/_zgiCursorFileNames/_zNemCursorFileNames, you HAVE to change the index accordingly
if (_engine->getGameId() == ZorkNemesis) { if (_engine->getGameId() == GID_NEMESIS) {
Common::String name(Common::String::format("%sa.zcr", _zNemCursorFileNames[IDLE_CURSOR_INDEX])); Common::String name(Common::String::format("%sa.zcr", _zNemCursorFileNames[IDLE_CURSOR_INDEX]));
_idleCursor = ZorkCursor(name); _idleCursor = ZorkCursor(name);
} else if (_engine->getGameId() == ZorkGrandInquisitor) { } else if (_engine->getGameId() == GID_GRANDINQUISITOR) {
_idleCursor = ZorkCursor(_zgiCursorFileNames[IDLE_CURSOR_INDEX]); _idleCursor = ZorkCursor(_zgiCursorFileNames[IDLE_CURSOR_INDEX]);
} }
} }
@ -77,7 +77,7 @@ void CursorManager::changeCursor(const Common::String &cursorName, bool pushed)
} }
for (int i = 0; i < NUM_CURSORS; i++) { for (int i = 0; i < NUM_CURSORS; i++) {
if (_engine->getGameId() == ZorkNemesis) { if (_engine->getGameId() == GID_NEMESIS) {
if (cursorName.equals(_cursorNames[i])) { if (cursorName.equals(_cursorNames[i])) {
_currentCursor = cursorName; _currentCursor = cursorName;
@ -88,7 +88,7 @@ void CursorManager::changeCursor(const Common::String &cursorName, bool pushed)
changeCursor(ZorkCursor(name)); changeCursor(ZorkCursor(name));
return; return;
} }
} else if (_engine->getGameId() == ZorkGrandInquisitor) { } else if (_engine->getGameId() == GID_GRANDINQUISITOR) {
if (cursorName.equals(_cursorNames[i])) { if (cursorName.equals(_cursorNames[i])) {
_currentCursor = cursorName; _currentCursor = cursorName;

6
engines/zvision/detection.cpp
View file

@ -68,7 +68,7 @@ static const ZVisionGameDescription gameDescriptions[] = {
ADGF_NO_FLAGS, ADGF_NO_FLAGS,
GUIO1(GUIO_NONE) GUIO1(GUIO_NONE)
}, },
ZorkNemesis GID_NEMESIS
}, },
{ {
@ -82,12 +82,12 @@ static const ZVisionGameDescription gameDescriptions[] = {
ADGF_NO_FLAGS, ADGF_NO_FLAGS,
GUIO1(GUIO_NONE) GUIO1(GUIO_NONE)
}, },
ZorkGrandInquisitor GID_GRANDINQUISITOR
}, },
{ {
AD_TABLE_END_MARKER, AD_TABLE_END_MARKER,
None GID_NONE
} }
}; };

6
engines/zvision/detection.h
View file

@ -28,9 +28,9 @@
namespace ZVision { namespace ZVision {
enum ZVisionGameId { enum ZVisionGameId {
None = 0, GID_NONE = 0,
ZorkNemesis = 1, GID_NEMESIS = 1,
ZorkGrandInquisitor = 2 GID_GRANDINQUISITOR = 2
}; };
struct ZVisionGameDescription { struct ZVisionGameDescription {

4
engines/zvision/string_manager.cpp
View file

@ -47,10 +47,10 @@ StringManager::~StringManager() {
} }
void StringManager::initialize(ZVisionGameId gameId) { void StringManager::initialize(ZVisionGameId gameId) {
if (gameId == ZorkNemesis) { if (gameId == GID_NEMESIS) {
// TODO: Check this hardcoded filename against all versions of Nemesis // TODO: Check this hardcoded filename against all versions of Nemesis
parseStrFile("nemesis.str"); parseStrFile("nemesis.str");
} else if (gameId == ZorkGrandInquisitor) { } else if (gameId == GID_GRANDINQUISITOR) {
// TODO: Check this hardcoded filename against all versions of Grand Inquisitor // TODO: Check this hardcoded filename against all versions of Grand Inquisitor
parseStrFile("inquis.str"); parseStrFile("inquis.str");
} }

4
engines/zvision/zork_raw.cpp
View file

@ -164,13 +164,13 @@ Audio::RewindableAudioStream *makeRawZorkStream(const Common::String &filePath,
SoundParams soundParams; SoundParams soundParams;
if (engine->getGameId() == ZorkNemesis) { if (engine->getGameId() == GID_NEMESIS) {
for (int i = 0; i < 6; i++) { for (int i = 0; i < 6; i++) {
if (zNemSoundParamLookupTable[i].identifier == (fileName[6])) if (zNemSoundParamLookupTable[i].identifier == (fileName[6]))
soundParams = zNemSoundParamLookupTable[i]; soundParams = zNemSoundParamLookupTable[i];
} }
} }
else if (engine->getGameId() == ZorkGrandInquisitor) { else if (engine->getGameId() == GID_GRANDINQUISITOR) {
for (int i = 0; i < 6; i++) { for (int i = 0; i < 6; i++) {
if (zgiSoundParamLookupTable[i].identifier == (fileName[7])) if (zgiSoundParamLookupTable[i].identifier == (fileName[7]))
soundParams = zgiSoundParamLookupTable[i]; soundParams = zgiSoundParamLookupTable[i];