diff options
author | Nipun Garg | 2019-08-01 11:22:11 +0530 |
---|---|---|
committer | Eugene Sandulenko | 2019-09-03 17:17:31 +0200 |
commit | 345c017ff7c2bafc800c3054ade8adda3eccffa1 (patch) | |
tree | 17cde81b0f5889ce36433862b54fda4c92333bb1 /engines/hdb | |
parent | e3ec3480ae6078194feef75b43f98deb2dfbda24 (diff) | |
download | scummvm-rg350-345c017ff7c2bafc800c3054ade8adda3eccffa1.tar.gz scummvm-rg350-345c017ff7c2bafc800c3054ade8adda3eccffa1.tar.bz2 scummvm-rg350-345c017ff7c2bafc800c3054ade8adda3eccffa1.zip |
HDB: Section off WIN32 specific-code
Diffstat (limited to 'engines/hdb')
-rw-r--r-- | engines/hdb/ai-funcs.cpp | 13 | ||||
-rw-r--r-- | engines/hdb/input.cpp | 12 | ||||
-rw-r--r-- | engines/hdb/menu.cpp | 48 |
3 files changed, 47 insertions, 26 deletions
diff --git a/engines/hdb/ai-funcs.cpp b/engines/hdb/ai-funcs.cpp index abdcd6ebe5..7faa8880c3 100644 --- a/engines/hdb/ai-funcs.cpp +++ b/engines/hdb/ai-funcs.cpp @@ -2224,11 +2224,14 @@ void AI::getItemSound(AIType type) { case ITEM_ENV_RED: case ITEM_ENV_BLUE: case ITEM_ENV_GREEN: - if (g_hdb->_sound->getVoiceStatus()) - g_hdb->_sound->playVoice(GUY_GOT_SOMETHING, 1); - else - g_hdb->_sound->playSound(SND_GET_THING); - break; + if (!g_hdb->isPPC()) { + if (g_hdb->_sound->getVoiceStatus()) + g_hdb->_sound->playVoice(GUY_GOT_SOMETHING, 1); + else + g_hdb->_sound->playSound(SND_GET_THING); + break; + } + // fall through if it is PPC default: g_hdb->_sound->playSound(SND_GET_THING); } } diff --git a/engines/hdb/input.cpp b/engines/hdb/input.cpp index e6a0e9c91b..72e111174b 100644 --- a/engines/hdb/input.cpp +++ b/engines/hdb/input.cpp @@ -164,6 +164,10 @@ void Input::stylusDown(int x, int y) { return; } + if (g_hdb->isPPC()) { + warning("STUB: Add PPC code for Deliveries\Inventory"); + } + // Is Dialog Active? if (g_hdb->_window->dialogActive()) { g_hdb->_window->closeDialog(); @@ -207,9 +211,11 @@ void Input::stylusDown(int x, int y) { worldX = ((worldX + x) / kTileWidth) * kTileWidth; worldY = ((worldY + y) / kTileHeight) * kTileHeight; - // Don't allow a click into INV/DELIVERIES area to go into the world - if (x >= (g_hdb->_screenWidth - 32 * 5)) - return; + if (!g_hdb->isPPC()) { + // Don't allow a click into INV/DELIVERIES area to go into the world + if (x >= (g_hdb->_screenWidth - 32 * 5)) + return; + } // Toggle Walk Speed if we clicked Player int nx, ny; diff --git a/engines/hdb/menu.cpp b/engines/hdb/menu.cpp index dd88c4aba8..63024279ef 100644 --- a/engines/hdb/menu.cpp +++ b/engines/hdb/menu.cpp @@ -706,18 +706,19 @@ void Menu::drawMenu() { drawSlider(_optionsX, _optionsY + kOptionLineSPC * 2 + 20, g_hdb->_sound->getSFXVolume()); - // Voices ON or OFF - drawToggle(_optionsX, _optionsY + kOptionLineSPC * 4 + 20, g_hdb->_sound->getVoiceStatus()); - - if (!g_hdb->isVoiceless()) { - g_hdb->_gfx->setCursor(_optionsX + kOptionSPC + 24, _optionsY + kOptionLineSPC * 4 + 24); - if (!g_hdb->_sound->getVoiceStatus()) - g_hdb->_gfx->drawText("Voice Dialogue OFF"); - else - g_hdb->_gfx->drawText("Voice Dialogue ON"); + if (!g_hdb->isPPC()) { + // Voices ON or OFF + drawToggle(_optionsX, _optionsY + kOptionLineSPC * 4 + 20, g_hdb->_sound->getVoiceStatus()); + + if (!g_hdb->isVoiceless()) { + g_hdb->_gfx->setCursor(_optionsX + kOptionSPC + 24, _optionsY + kOptionLineSPC * 4 + 24); + if (!g_hdb->_sound->getVoiceStatus()) + g_hdb->_gfx->drawText("Voice Dialogue OFF"); + else + g_hdb->_gfx->drawText("Voice Dialogue ON"); + } } - // title logo _titleLogo->drawMasked(centerPic(_titleLogo), _rocketY + _mTitleY); _menuBackoutGfx->drawMasked(_backoutX, g_hdb->_menu->_backoutY); @@ -767,8 +768,10 @@ void Menu::drawMenu() { _modeLoadGfx->drawMasked(centerPic(_modeLoadGfx), _oBannerY); _menuBackoutGfx->drawMasked(_backoutX, g_hdb->_menu->_backoutY); - if (_saveGames[kAutoSaveSlot].seconds) - _vortexian[anim]->drawMasked(_vortSaveX, _vortSaveY); + if (!g_hdb->isPPC()) { + if (_saveGames[kAutoSaveSlot].seconds) + _vortexian[anim]->drawMasked(_vortSaveX, _vortSaveY); + } if (g_hdb->isPPC()) { g_hdb->_gfx->setCursor(_vortSaveTextX, _vortSaveY); @@ -1086,14 +1089,17 @@ void Menu::drawTitle() { // exhaust if (_rocketEx < 5) { _rocketEx1->drawMasked(_mRocketX + _mRocketEXHX, _rocketY + _mRocketYBottom); - _rocketEx2->drawMasked(_mRocketX + _mRocketEXHX2, _rocketY + _mRocketYBottom); + if (!g_hdb->isPPC()) + _rocketEx2->drawMasked(_mRocketX + _mRocketEXHX2, _rocketY + _mRocketYBottom); } else if (_rocketEx >= 5 && _rocketEx < 10) { _rocketEx2->drawMasked(_mRocketX + _mRocketEXHX, _rocketY + _mRocketYBottom); - _rocketEx1->drawMasked(_mRocketX + _mRocketEXHX2, _rocketY + _mRocketYBottom); + if (!g_hdb->isPPC()) + _rocketEx1->drawMasked(_mRocketX + _mRocketEXHX2, _rocketY + _mRocketYBottom); } else { _rocketEx = 0; _rocketEx1->drawMasked(_mRocketX + _mRocketEXHX, _rocketY + _mRocketYBottom); - _rocketEx2->drawMasked(_mRocketX + _mRocketEXHX2, _rocketY + _mRocketYBottom); + if (!g_hdb->isPPC()) + _rocketEx2->drawMasked(_mRocketX + _mRocketEXHX2, _rocketY + _mRocketYBottom); } _rocketEx++; @@ -1630,14 +1636,20 @@ void Menu::drawRocketAndSelections() { // exhaust if (_rocketEx < 5) { _rocketEx1->drawMasked(_mRocketX + _mRocketEXHX, _rocketY + _mRocketYBottom); - _rocketEx2->drawMasked(_mRocketX + _mRocketEXHX2, _rocketY + _mRocketYBottom); + if (!g_hdb->isPPC()) { + _rocketEx2->drawMasked(_mRocketX + _mRocketEXHX2, _rocketY + _mRocketYBottom); + } } else if (_rocketEx >= 5 && _rocketEx < 10) { _rocketEx2->drawMasked(_mRocketX + _mRocketEXHX, _rocketY + _mRocketYBottom); - _rocketEx1->drawMasked(_mRocketX + _mRocketEXHX2, _rocketY + _mRocketYBottom); + if (!g_hdb->isPPC()) { + _rocketEx1->drawMasked(_mRocketX + _mRocketEXHX2, _rocketY + _mRocketYBottom); + } } else { _rocketEx = 0; _rocketEx1->drawMasked(_mRocketX + _mRocketEXHX, _rocketY + _mRocketYBottom); - _rocketEx2->drawMasked(_mRocketX + _mRocketEXHX2, _rocketY + _mRocketYBottom); + if (!g_hdb->isPPC()) { + _rocketEx2->drawMasked(_mRocketX + _mRocketEXHX2, _rocketY + _mRocketYBottom); + } } _rocketEx++; |