diff options
author | Strangerke | 2013-08-21 08:18:44 +0200 |
---|---|---|
committer | Strangerke | 2013-08-21 08:37:56 +0200 |
commit | a710bb5ca435b246d7ac042fbb5575e0ab82c1fd (patch) | |
tree | 614b21c87e7ac5bd183cd9f22830206503d074fb /engines/mortevielle | |
parent | 972cdf0e129759e109aa53876b72ed4df03c229b (diff) | |
download | scummvm-rg350-a710bb5ca435b246d7ac042fbb5575e0ab82c1fd.tar.gz scummvm-rg350-a710bb5ca435b246d7ac042fbb5575e0ab82c1fd.tar.bz2 scummvm-rg350-a710bb5ca435b246d7ac042fbb5575e0ab82c1fd.zip |
MORTEVIELLE: Remove second parameter of show()
Diffstat (limited to 'engines/mortevielle')
-rw-r--r-- | engines/mortevielle/actions.cpp | 18 | ||||
-rw-r--r-- | engines/mortevielle/dialogs.cpp | 8 | ||||
-rw-r--r-- | engines/mortevielle/dialogs.h | 2 | ||||
-rw-r--r-- | engines/mortevielle/utils.cpp | 6 |
4 files changed, 17 insertions, 17 deletions
diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp index d0ecd6cdc0..e63518951e 100644 --- a/engines/mortevielle/actions.cpp +++ b/engines/mortevielle/actions.cpp @@ -702,10 +702,10 @@ void MortevielleEngine::fctPlace() { _soundManager.startSpeech(6, -9, 1); // Do you want to enter the hidden passage? - int answer = _dialogManager.show(getEngineString(S_YES_NO), 1); + int answer = _dialogManager.show(getEngineString(S_YES_NO)); if (answer == 1) { Common::String alertTxt = getString(582); - _dialogManager.show(alertTxt, 1); + _dialogManager.show(alertTxt); bool enterPassageFl = _dialogManager.showKnowledgeCheck(); _mouse.hideMouse(); @@ -732,7 +732,7 @@ void MortevielleEngine::fctPlace() { displayAnimFrame(1, 2); displayAnimFrame(1, 1); alertTxt = getString(577); - _dialogManager.show(alertTxt, 1); + _dialogManager.show(alertTxt); displayAnimFrame(2, 1); _crep = 166; } @@ -801,7 +801,7 @@ void MortevielleEngine::fctTurn() { if ((_coreVar._currPlace == ATTIC) && (_coreVar._atticRodHoleObjectId == 159) && (_coreVar._atticBallHoleObjectId == 141)) { handleDescriptionText(2, 167); _soundManager.startSpeech(7, 9, 1); - int answer = _dialogManager.show(getEngineString(S_YES_NO), 1); + int answer = _dialogManager.show(getEngineString(S_YES_NO)); if (answer == 1) _endGame = true; else @@ -811,7 +811,7 @@ void MortevielleEngine::fctTurn() { handleDescriptionText(2, 175); clearVerbBar(); _soundManager.startSpeech(6, -9, 1); - int answer = _dialogManager.show(getEngineString(S_YES_NO), 1); + int answer = _dialogManager.show(getEngineString(S_YES_NO)); if (answer == 1) { _coreVar._currPlace = CRYPT; prepareDisplayText(); @@ -914,7 +914,7 @@ void MortevielleEngine::fctKnock() { displayTextInVerbBar(getEngineString(S_HIT)); if (_coreVar._currPlace == LANDING) { - _dialogManager.show(getEngineString(S_BEFORE_USE_DEP_MENU), 1); + _dialogManager.show(getEngineString(S_BEFORE_USE_DEP_MENU)); return; } @@ -1223,7 +1223,7 @@ void MortevielleEngine::fctSleep() { if (hour > 23) hour = 0; prepareRoom(); - answer = _dialogManager.show(getEngineString(S_YES_NO), 1); + answer = _dialogManager.show(getEngineString(S_YES_NO)); _anyone = false; } while (answer != 1); _crep = 998; @@ -1313,7 +1313,7 @@ void MortevielleEngine::fctWait() { return; } handleDescriptionText(2, 102); - answer = _dialogManager.show(getEngineString(S_YES_NO), 1); + answer = _dialogManager.show(getEngineString(S_YES_NO)); } while (answer != 2); _crep = 998; if (!_anyone) @@ -1629,7 +1629,7 @@ void MortevielleEngine::askRestart() { _day = 0; handleDescriptionText(2, 180); - int answer = _dialogManager.show(getEngineString(S_YES_NO), 1); + int answer = _dialogManager.show(getEngineString(S_YES_NO)); _quitGame = (answer != 1); } diff --git a/engines/mortevielle/dialogs.cpp b/engines/mortevielle/dialogs.cpp index a7bd381603..9a2ade60ab 100644 --- a/engines/mortevielle/dialogs.cpp +++ b/engines/mortevielle/dialogs.cpp @@ -39,7 +39,7 @@ namespace Mortevielle { * Alert function - Show * @remarks Originally called 'do_alert' */ -int DialogManager::show(const Common::String &msg, int n) { +int DialogManager::show(const Common::String &msg) { // Make a copy of the current screen surface for later restore _vm->_backgroundSurface.copyFrom(_vm->_screenSurface); @@ -164,10 +164,10 @@ int DialogManager::show(const Common::String &msg, int n) { _vm->setMouseClick(false); _vm->_mouse.hideMouse(); if (!test3) { - id = n; - setPosition(n, coldep, esp); + id = 1; + setPosition(1, coldep, esp); Common::String tmp4(" "); - tmp4 += buttonStr[n]; + tmp4 += buttonStr[1]; tmp4 += " "; _vm->_screenSurface.drawString(tmp4, 1); } diff --git a/engines/mortevielle/dialogs.h b/engines/mortevielle/dialogs.h index ee210a62b2..3f30851960 100644 --- a/engines/mortevielle/dialogs.h +++ b/engines/mortevielle/dialogs.h @@ -52,7 +52,7 @@ private: void setButtonText(Common::String c, int coldep, int nbcase, Common::String *str, int esp); public: void setParent(MortevielleEngine *vm); - int show(const Common::String &msg, int n); + int show(const Common::String &msg); void drawF3F8(); void checkForF8(int SpeechNum, bool drawFrame2Fl); int waitForF3F8(); diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp index f8012b57bd..cb2c3c59b3 100644 --- a/engines/mortevielle/utils.cpp +++ b/engines/mortevielle/utils.cpp @@ -290,7 +290,7 @@ void MortevielleEngine::handleAction() { if (_menu._menuSelected && (_currMenu == MENU_LOAD)) _savegameManager.loadGame((_currAction & 15) - 1); if (inkey == '\103') { /* F9 */ - temps = _dialogManager.show(_hintPctMessage, 1); + temps = _dialogManager.show(_hintPctMessage); return; } else if (inkey == '\77') { if ((_menuOpcode != OPCODE_NONE) && ((_currMenu == MENU_ACTION) || (_currMenu == MENU_SELF))) { @@ -1712,7 +1712,7 @@ int MortevielleEngine::getRandomNumber(int minval, int maxval) { * @remarks Originally called 'aldepl' */ void MortevielleEngine::showMoveMenuAlert() { - _dialogManager.show(getEngineString(S_USE_DEP_MENU), 1); + _dialogManager.show(getEngineString(S_USE_DEP_MENU)); } /** @@ -3190,7 +3190,7 @@ void MortevielleEngine::displayStatusArrow() { } while (!(qust || inRect || _anyone)); if (qust && (touch == '\103')) - _dialogManager.show(_hintPctMessage, 1); + _dialogManager.show(_hintPctMessage); } while (!((touch == '\73') || ((touch == '\104') && (_x != 0) && (_y != 0)) || (_anyone) || (inRect))); if (touch == '\73') |