diff options
author | Matthew Hoops | 2013-05-02 18:26:58 -0400 |
---|---|---|
committer | Matthew Hoops | 2013-05-02 18:43:10 -0400 |
commit | 0031c41db855ac4bebd05ca1b2c1fa6694242979 (patch) | |
tree | 98f4e4bf20148171c3638476ed7f24a61a7a03c1 /engines/parallaction | |
parent | 8942a96bafaa8541383347318c19392ce949248a (diff) | |
download | scummvm-rg350-0031c41db855ac4bebd05ca1b2c1fa6694242979.tar.gz scummvm-rg350-0031c41db855ac4bebd05ca1b2c1fa6694242979.tar.bz2 scummvm-rg350-0031c41db855ac4bebd05ca1b2c1fa6694242979.zip |
COMMON: Change kPlatformPC to kPlatformDOS
"PC" was very ambiguous and now it matches what we show in the GUI.
This also corrects sword2's platform to Windows.
Diffstat (limited to 'engines/parallaction')
-rw-r--r-- | engines/parallaction/balloons.cpp | 2 | ||||
-rw-r--r-- | engines/parallaction/callables_ns.cpp | 2 | ||||
-rw-r--r-- | engines/parallaction/detection.cpp | 6 | ||||
-rw-r--r-- | engines/parallaction/font.cpp | 4 | ||||
-rw-r--r-- | engines/parallaction/graphics.cpp | 4 | ||||
-rw-r--r-- | engines/parallaction/gui_br.cpp | 4 | ||||
-rw-r--r-- | engines/parallaction/input.cpp | 2 | ||||
-rw-r--r-- | engines/parallaction/parallaction_br.cpp | 4 | ||||
-rw-r--r-- | engines/parallaction/parallaction_ns.cpp | 4 | ||||
-rw-r--r-- | engines/parallaction/staticres.cpp | 4 |
10 files changed, 18 insertions, 18 deletions
diff --git a/engines/parallaction/balloons.cpp b/engines/parallaction/balloons.cpp index 1ddd401b20..2a7e0ce375 100644 --- a/engines/parallaction/balloons.cpp +++ b/engines/parallaction/balloons.cpp @@ -727,7 +727,7 @@ void BalloonManager_br::cacheAnims() { BalloonManager_br::BalloonManager_br(Parallaction_br *vm, Font *font) : _vm(vm), _numBalloons(0), _leftBalloon(0), _rightBalloon(0), _sw(font), _se(font) { - if (_vm->getPlatform() == Common::kPlatformPC) { + if (_vm->getPlatform() == Common::kPlatformDOS) { _textColors[kSelectedColor] = 12; _textColors[kUnselectedColor] = 0; _textColors[kNormalColor] = 0; diff --git a/engines/parallaction/callables_ns.cpp b/engines/parallaction/callables_ns.cpp index c1720a1a8e..04642aa632 100644 --- a/engines/parallaction/callables_ns.cpp +++ b/engines/parallaction/callables_ns.cpp @@ -439,7 +439,7 @@ void Parallaction_ns::_c_closeMusic(void *) { void Parallaction_ns::_c_startIntro(void *parm) { _rightHandAnim = _location.findAnimation("righthand"); - if (getPlatform() == Common::kPlatformPC) { + if (getPlatform() == Common::kPlatformDOS) { _soundManI->setMusicFile("intro"); _soundManI->playMusic(); } diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp index 43176a0759..fb892c44b2 100644 --- a/engines/parallaction/detection.cpp +++ b/engines/parallaction/detection.cpp @@ -70,7 +70,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::UNK_LANG, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -153,7 +153,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::UNK_LANG, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GUIO_NOSPEECH) }, @@ -170,7 +170,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { { NULL, 0, NULL, 0} }, Common::UNK_LANG, - Common::kPlatformPC, + Common::kPlatformDOS, ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, diff --git a/engines/parallaction/font.cpp b/engines/parallaction/font.cpp index 3b40960381..03b1ced8e1 100644 --- a/engines/parallaction/font.cpp +++ b/engines/parallaction/font.cpp @@ -668,7 +668,7 @@ GfxObj* DosDisk_br::createInventoryObjects(Common::SeekableReadStream &stream) { void Parallaction_ns::initFonts() { - if (getPlatform() == Common::kPlatformPC) { + if (getPlatform() == Common::kPlatformDOS) { _dialogueFont = _disk->loadFont("comic"); _labelFont = _disk->loadFont("topaz"); _menuFont = _disk->loadFont("slide"); @@ -683,7 +683,7 @@ void Parallaction_ns::initFonts() { } void Parallaction_br::initFonts() { - if (getPlatform() == Common::kPlatformPC) { + if (getPlatform() == Common::kPlatformDOS) { _menuFont = _disk->loadFont("russia"); _dialogueFont = _disk->loadFont("comic"); _labelFont = _menuFont; diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp index 59cd02e6ef..b8a8ceb61f 100644 --- a/engines/parallaction/graphics.cpp +++ b/engines/parallaction/graphics.cpp @@ -746,7 +746,7 @@ Gfx::Gfx(Parallaction* vm) : _unpackedBitmap = new byte[MAXIMUM_UNPACKED_BITMAP_SIZE]; assert(_unpackedBitmap); - if ((_gameType == GType_BRA) && (_vm->getPlatform() == Common::kPlatformPC)) { + if ((_gameType == GType_BRA) && (_vm->getPlatform() == Common::kPlatformDOS)) { // this loads the backup palette needed by the PC version of BRA (see setBackground()). BackgroundInfo paletteInfo; _disk->loadSlide(paletteInfo, "pointer"); @@ -834,7 +834,7 @@ void Gfx::setBackground(uint type, BackgroundInfo *info) { // The PC version of BRA needs the entries 20-31 of the palette to be constant, but // the background resource files are screwed up. The right colors come from an unused // bitmap (pointer.bmp). Nothing is known about the Amiga version so far. - if ((_gameType == GType_BRA) && (_vm->getPlatform() == Common::kPlatformPC)) { + if ((_gameType == GType_BRA) && (_vm->getPlatform() == Common::kPlatformDOS)) { int r, g, b; for (uint i = 16; i < 32; i++) { _backupPal.getEntry(i, r, g, b); diff --git a/engines/parallaction/gui_br.cpp b/engines/parallaction/gui_br.cpp index 5bc5acf630..ddbc31d730 100644 --- a/engines/parallaction/gui_br.cpp +++ b/engines/parallaction/gui_br.cpp @@ -120,7 +120,7 @@ class MainMenuInputState_BR : public MenuInputState { memset(data, 0, MENUITEM_WIDTH * MENUITEM_HEIGHT * 2); // build first frame to be displayed when item is not selected - if (_vm->getPlatform() == Common::kPlatformPC) { + if (_vm->getPlatform() == Common::kPlatformDOS) { _vm->_menuFont->setColor(0); } else { _vm->_menuFont->setColor(23); @@ -238,7 +238,7 @@ public: virtual void enter() { _vm->_gfx->clearScreen(); int x = 0, y = 0, i = 0; - if (_vm->getPlatform() == Common::kPlatformPC) { + if (_vm->getPlatform() == Common::kPlatformDOS) { x = 20; y = 50; } diff --git a/engines/parallaction/input.cpp b/engines/parallaction/input.cpp index 484e210893..bf7cdc439d 100644 --- a/engines/parallaction/input.cpp +++ b/engines/parallaction/input.cpp @@ -478,7 +478,7 @@ void Input::initCursors() { break; case GType_BRA: - if (_vm->getPlatform() == Common::kPlatformPC) { + if (_vm->getPlatform() == Common::kPlatformDOS) { _dinoCursor = _vm->_disk->loadPointer("pointer1"); _dougCursor = _vm->_disk->loadPointer("pointer2"); _donnaCursor = _vm->_disk->loadPointer("pointer3"); diff --git a/engines/parallaction/parallaction_br.cpp b/engines/parallaction/parallaction_br.cpp index 07755fac5f..f9df9d85db 100644 --- a/engines/parallaction/parallaction_br.cpp +++ b/engines/parallaction/parallaction_br.cpp @@ -52,7 +52,7 @@ Common::Error Parallaction_br::init() { _screenWidth = 640; _screenHeight = 400; - if (getPlatform() == Common::kPlatformPC) { + if (getPlatform() == Common::kPlatformDOS) { if (getFeatures() & GF_DEMO) { _disk = new DosDemoDisk_br(this); } else { @@ -297,7 +297,7 @@ void Parallaction_br::changeLocation() { // TODO: maybe handle this into Disk delete _objects; - if (getPlatform() == Common::kPlatformPC) { + if (getPlatform() == Common::kPlatformDOS) { _objects = _disk->loadObjects("icone.ico"); } else { _objects = _disk->loadObjects("icons.ico", _part); diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp index d33be0aa47..49b63dcac3 100644 --- a/engines/parallaction/parallaction_ns.cpp +++ b/engines/parallaction/parallaction_ns.cpp @@ -152,7 +152,7 @@ Common::Error Parallaction_ns::init() { _screenWidth = 320; _screenHeight = 200; - if (getPlatform() == Common::kPlatformPC) { + if (getPlatform() == Common::kPlatformDOS) { _disk = new DosDisk_ns(this); } else { if (getFeatures() & GF_DEMO) { @@ -163,7 +163,7 @@ Common::Error Parallaction_ns::init() { _disk->init(); - if (getPlatform() == Common::kPlatformPC) { + if (getPlatform() == Common::kPlatformDOS) { _soundManI = new DosSoundMan_ns(this); _soundManI->setMusicVolume(ConfMan.getInt("music_volume")); } else { diff --git a/engines/parallaction/staticres.cpp b/engines/parallaction/staticres.cpp index f09b1241bc..32404037f0 100644 --- a/engines/parallaction/staticres.cpp +++ b/engines/parallaction/staticres.cpp @@ -396,7 +396,7 @@ void Parallaction_ns::initResources() { _localFlagNames = new FixedTable(NUM_LOCATIONS, 1); _localFlagNames->addData("visited"); - if (getPlatform() == Common::kPlatformPC) { + if (getPlatform() == Common::kPlatformDOS) { _callables = _dosCallables; } else { _callables = _amigaCallables; @@ -412,7 +412,7 @@ void Parallaction_br::initResources() { _localFlagNames->addData("visited"); _localFlagNames->addData("testtrue"); - if (getPlatform() == Common::kPlatformPC) { + if (getPlatform() == Common::kPlatformDOS) { _callables = _dosCallables; } else { _callables = _amigaCallables; |