diff options
Diffstat (limited to 'engines/agos')
-rw-r--r-- | engines/agos/agos.cpp | 2 | ||||
-rw-r--r-- | engines/agos/detection.cpp | 10 | ||||
-rw-r--r-- | engines/agos/detection_tables.h | 112 | ||||
-rw-r--r-- | engines/agos/feeble.cpp | 1 | ||||
-rw-r--r-- | engines/agos/gfx.cpp | 4 | ||||
-rw-r--r-- | engines/agos/icons.cpp | 2 | ||||
-rw-r--r-- | engines/agos/res.cpp | 2 | ||||
-rw-r--r-- | engines/agos/saveload.cpp | 12 | ||||
-rw-r--r-- | engines/agos/sound.cpp | 2 | ||||
-rw-r--r-- | engines/agos/verb.cpp | 2 | ||||
-rw-r--r-- | engines/agos/vga_pn.cpp | 2 |
11 files changed, 76 insertions, 75 deletions
diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp index 73a37e42ef..359a6f7289 100644 --- a/engines/agos/agos.cpp +++ b/engines/agos/agos.cpp @@ -580,7 +580,7 @@ Common::Error AGOSEngine::init() { if ((getGameType() == GType_SIMON2 && getPlatform() == Common::kPlatformWindows) || (getGameType() == GType_SIMON1 && getPlatform() == Common::kPlatformWindows) || ((getFeatures() & GF_TALKIE) && getPlatform() == Common::kPlatformAcorn) || - (getPlatform() == Common::kPlatformPC)) { + (getPlatform() == Common::kPlatformDOS)) { int ret = _midi->open(getGameType()); if (ret) diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp index 13559c2f4f..a5a42a86ad 100644 --- a/engines/agos/detection.cpp +++ b/engines/agos/detection.cpp @@ -53,12 +53,12 @@ static const Engines::ObsoleteGameID obsoleteGameIDsTable[] = { {"simon1acorn", "simon1", Common::kPlatformAcorn}, {"simon1amiga", "simon1", Common::kPlatformAmiga}, {"simon1cd32", "simon1", Common::kPlatformAmiga}, - {"simon1demo", "simon1", Common::kPlatformPC}, - {"simon1dos", "simon1", Common::kPlatformPC}, - {"simon1talkie", "simon1", Common::kPlatformPC}, + {"simon1demo", "simon1", Common::kPlatformDOS}, + {"simon1dos", "simon1", Common::kPlatformDOS}, + {"simon1talkie", "simon1", Common::kPlatformDOS}, {"simon1win", "simon1", Common::kPlatformWindows}, - {"simon2dos", "simon2", Common::kPlatformPC}, - {"simon2talkie", "simon2", Common::kPlatformPC}, + {"simon2dos", "simon2", Common::kPlatformDOS}, + {"simon2talkie", "simon2", Common::kPlatformDOS}, {"simon2mac", "simon2", Common::kPlatformMacintosh}, {"simon2win", "simon2", Common::kPlatformWindows}, {0, 0, Common::kPlatformUnknown} diff --git a/engines/agos/detection_tables.h b/engines/agos/detection_tables.h index 7fe6df5f17..70757865f5 100644 --- a/engines/agos/detection_tables.h +++ b/engines/agos/detection_tables.h @@ -105,7 +105,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::EN_ANY, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -283,7 +283,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::EN_ANY, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, @@ -306,7 +306,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::EN_ANY, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -329,7 +329,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::ES_ESP, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -352,7 +352,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::FR_FRA, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -375,7 +375,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::DE_DEU, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -584,7 +584,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::EN_ANY, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -610,7 +610,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::EN_ANY, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -636,7 +636,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::EN_ANY, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -662,7 +662,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::FR_FRA, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -688,7 +688,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::DE_DEU, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -714,7 +714,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::IT_ITA, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -740,7 +740,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::ES_ESP, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -766,7 +766,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::ES_ESP, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -843,7 +843,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::EN_ANY, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, @@ -872,7 +872,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::EN_ANY, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -901,7 +901,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::FR_FRA, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -930,7 +930,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::DE_DEU, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -959,7 +959,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::ES_ESP, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -1249,7 +1249,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::EN_ANY, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, @@ -1273,7 +1273,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::EN_ANY, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -1297,7 +1297,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::CZ_CZE, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -1321,7 +1321,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::RU_RUS, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -1345,7 +1345,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::EN_ANY, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -1369,7 +1369,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::CZ_CZE, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -1393,7 +1393,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::RU_RUS, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -1417,7 +1417,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::FR_FRA, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -1441,7 +1441,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::DE_DEU, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -1465,7 +1465,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::IT_ITA, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -1489,7 +1489,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::ES_ESP, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -1514,7 +1514,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::EN_ANY, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_DEMO, GUIO1(GUIO_NOSUBTITLES) }, @@ -1539,7 +1539,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::EN_ANY, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_CD, GUIO1(GUIO_NOSUBTITLES) }, @@ -1564,7 +1564,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::EN_ANY, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_CD, GUIO1(GUIO_NOSUBTITLES) }, @@ -1589,7 +1589,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::RU_RUS, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_CD, GUIO0() }, @@ -1614,7 +1614,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::FR_FRA, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_CD, GUIO0() }, @@ -1639,7 +1639,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::DE_DEU, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSUBTITLES) }, @@ -1664,7 +1664,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::HE_ISR, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_CD, GUIO0() }, @@ -1689,7 +1689,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::IT_ITA, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_CD, GUIO0() }, @@ -1740,7 +1740,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::ES_ESP, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_CD, GUIO0() }, @@ -1815,7 +1815,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::EN_ANY, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -1840,7 +1840,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::RU_RUS, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -1865,7 +1865,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::DE_DEU, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -1890,7 +1890,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::DE_DEU, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -1915,7 +1915,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::IT_ITA, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -1940,7 +1940,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::EN_ANY, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_DEMO, GUIO0() }, @@ -1965,7 +1965,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::DE_DEU, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_DEMO, GUIO0() }, @@ -1990,7 +1990,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::DE_DEU, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_DEMO, GUIO0() }, @@ -2015,7 +2015,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::EN_ANY, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_CD, GUIO0() }, @@ -2040,7 +2040,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::EN_ANY, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_CD, GUIO0() }, @@ -2065,7 +2065,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::FR_FRA, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_CD, GUIO0() }, @@ -2090,7 +2090,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::DE_DEU, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_CD, GUIO0() }, @@ -2115,7 +2115,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::DE_DEU, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_CD, GUIO0() }, @@ -2140,7 +2140,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::HE_ISR, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_CD, GUIO0() }, @@ -2191,7 +2191,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::ES_ESP, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_CD, GUIO0() }, @@ -2338,7 +2338,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::EN_ANY, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_DEMO, GUIO3(GUIO_NOSUBTITLES, GUIO_NOMUSIC, GUIO_NOASPECT) }, @@ -2359,7 +2359,7 @@ static const AGOSGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::DE_DEU, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_DEMO, GUIO3(GUIO_NOSUBTITLES, GUIO_NOMUSIC, GUIO_NOASPECT) }, diff --git a/engines/agos/feeble.cpp b/engines/agos/feeble.cpp index 4608969667..a96caa9f8b 100644 --- a/engines/agos/feeble.cpp +++ b/engines/agos/feeble.cpp @@ -38,6 +38,7 @@ AGOSEngine_Feeble::AGOSEngine_Feeble(OSystem *system, const AGOSGameDescription _interactiveVideo = 0; _moviePlayer = 0; _vgaCurSpritePriority = 0; + _mouseToggle = false; } AGOSEngine_Feeble::~AGOSEngine_Feeble() { diff --git a/engines/agos/gfx.cpp b/engines/agos/gfx.cpp index fbf7f416ed..db0817250b 100644 --- a/engines/agos/gfx.cpp +++ b/engines/agos/gfx.cpp @@ -1450,7 +1450,7 @@ void AGOSEngine::setWindowImage(uint16 mode, uint16 vgaSpriteId, bool specialCas } if (getGameType() == GType_PN && !_wiped && !specialCase) { - uint8 color = (getPlatform() == Common::kPlatformPC) ? 7 : 15; + uint8 color = (getPlatform() == Common::kPlatformDOS) ? 7 : 15; dst = (byte *)screen->pixels + 48; memset(dst, color, 224); @@ -1475,7 +1475,7 @@ void AGOSEngine::setWindowImage(uint16 mode, uint16 vgaSpriteId, bool specialCas // Personal Nightmare specific void AGOSEngine::drawEdging() { byte *dst; - uint8 color = (getPlatform() == Common::kPlatformPC) ? 7 : 15; + uint8 color = (getPlatform() == Common::kPlatformDOS) ? 7 : 15; Graphics::Surface *screen = _system->lockScreen(); diff --git a/engines/agos/icons.cpp b/engines/agos/icons.cpp index 7db2d85f21..0ee1d62fde 100644 --- a/engines/agos/icons.cpp +++ b/engines/agos/icons.cpp @@ -1044,7 +1044,7 @@ void AGOSEngine_PN::drawIconHitBar() { Graphics::Surface *screen = _system->lockScreen(); byte *dst = (byte *)screen->pixels + 3 * screen->pitch + 6 * 8; const byte *src = hitBarData; - uint8 color = (getPlatform() == Common::kPlatformPC) ? 7 : 15; + uint8 color = (getPlatform() == Common::kPlatformDOS) ? 7 : 15; for (int h = 0; h < 7; h++) { for (int w = 0; w < 12; w++) { diff --git a/engines/agos/res.cpp b/engines/agos/res.cpp index 2e44a6575c..cf1d062d96 100644 --- a/engines/agos/res.cpp +++ b/engines/agos/res.cpp @@ -932,7 +932,7 @@ void AGOSEngine::loadVGAVideoFile(uint16 id, uint8 type, bool useError) { } dstSize = srcSize = in->size(); - if (getGameType() == GType_PN && getPlatform() == Common::kPlatformPC && id == 17 && type == 2) { + if (getGameType() == GType_PN && getPlatform() == Common::kPlatformDOS && id == 17 && type == 2) { // The A2.out file isn't compressed in PC version of Personal Nightmare dst = allocBlock(dstSize + extraBuffer); if (in->read(dst, dstSize) != dstSize) diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp index e13fa214d1..48671390f0 100644 --- a/engines/agos/saveload.cpp +++ b/engines/agos/saveload.cpp @@ -105,7 +105,7 @@ char *AGOSEngine_Simon1::genSaveName(int slot) { char *AGOSEngine_Waxworks::genSaveName(int slot) { static char buf[20]; - if (getPlatform() == Common::kPlatformPC) + if (getPlatform() == Common::kPlatformDOS) sprintf(buf, "waxworks-pc.%.3d", slot); else sprintf(buf, "waxworks.%.3d", slot); @@ -116,7 +116,7 @@ char *AGOSEngine_Waxworks::genSaveName(int slot) { char *AGOSEngine_Elvira2::genSaveName(int slot) { static char buf[20]; - if (getPlatform() == Common::kPlatformPC) + if (getPlatform() == Common::kPlatformDOS) sprintf(buf, "elvira2-pc.%.3d", slot); else sprintf(buf, "elvira2.%.3d", slot); @@ -1264,7 +1264,7 @@ bool AGOSEngine_Elvira2::loadGame(const char *filename, bool restartMode) { addTimeEvent(timeout, subroutine_id); } - if (getGameType() == GType_WW && getPlatform() == Common::kPlatformPC) { + if (getGameType() == GType_WW && getPlatform() == Common::kPlatformDOS) { for (uint s = 0; s < _numRoomStates; s++) { _roomStates[s].state = f->readUint16BE(); _roomStates[s].classFlags = f->readUint16BE(); @@ -1385,7 +1385,7 @@ bool AGOSEngine_Elvira2::loadGame(const char *filename, bool restartMode) { if (getGameType() == GType_WW && getPlatform() == Common::kPlatformAmiga) { _itemStore[i] = derefItem(f->readUint16BE() / 16); } else if (getGameType() == GType_ELVIRA2) { - if (getPlatform() == Common::kPlatformPC) { + if (getPlatform() == Common::kPlatformDOS) { _itemStore[i] = derefItem(readItemID(f)); } else { _itemStore[i] = derefItem(f->readUint16BE() / 18); @@ -1475,7 +1475,7 @@ bool AGOSEngine_Elvira2::saveGame(uint slot, const char *caption) { f->writeUint16BE(te->subroutine_id); } - if (getGameType() == GType_WW && getPlatform() == Common::kPlatformPC) { + if (getGameType() == GType_WW && getPlatform() == Common::kPlatformDOS) { if (_roomsListPtr) { byte *p = _roomsListPtr; for (;;) { @@ -1564,7 +1564,7 @@ bool AGOSEngine_Elvira2::saveGame(uint slot, const char *caption) { if (getGameType() == GType_WW && getPlatform() == Common::kPlatformAmiga) { f->writeUint16BE(itemPtrToID(_itemStore[i]) * 16); } else if (getGameType() == GType_ELVIRA2) { - if (getPlatform() == Common::kPlatformPC) { + if (getPlatform() == Common::kPlatformDOS) { writeItemID(f, itemPtrToID(_itemStore[i])); } else { f->writeUint16BE(itemPtrToID(_itemStore[i]) * 18); diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp index bec41bbbd3..a6a731ab24 100644 --- a/engines/agos/sound.cpp +++ b/engines/agos/sound.cpp @@ -674,7 +674,7 @@ void Sound::playRawData(byte *soundData, uint sound, uint size, uint freq) { memcpy(buffer, soundData, size); byte flags = 0; - if (_vm->getPlatform() == Common::kPlatformPC) + if (_vm->getPlatform() == Common::kPlatformDOS) flags = Audio::FLAG_UNSIGNED; Audio::AudioStream *stream = Audio::makeRawStream(buffer, size, freq, flags); diff --git a/engines/agos/verb.cpp b/engines/agos/verb.cpp index dec05f6703..93077ed83e 100644 --- a/engines/agos/verb.cpp +++ b/engines/agos/verb.cpp @@ -1004,7 +1004,7 @@ void AGOSEngine::invertBox(HitArea *ha, byte a, byte b, byte c, byte d) { src[i] = color; } } else if (getGameType() == GType_PN) { - if (getPlatform() == Common::kPlatformPC) { + if (getPlatform() == Common::kPlatformDOS) { if (color != 15) { color ^= 7; src[i] = color; diff --git a/engines/agos/vga_pn.cpp b/engines/agos/vga_pn.cpp index 3bd5400504..1e7b2ba060 100644 --- a/engines/agos/vga_pn.cpp +++ b/engines/agos/vga_pn.cpp @@ -152,7 +152,7 @@ void AGOSEngine::vc48_specialEffect() { uint16 num = vcReadNextWord(); vcReadNextWord(); - if (getPlatform() == Common::kPlatformPC) { + if (getPlatform() == Common::kPlatformDOS) { if (num == 1) { Graphics::Surface *screen = _system->lockScreen(); byte *dst = (byte *)screen->pixels; |