From 6238c034fd20017ec6734a43ba4ad1c36c9741c2 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Thu, 11 Oct 2012 00:45:46 +0200 Subject: [PATCH] MORTEVIELLE: Some more renaming --- engines/mortevielle/actions.cpp | 64 ++++---- engines/mortevielle/dialogs.cpp | 4 +- engines/mortevielle/mortevielle.cpp | 235 +++++++++++++++------------- engines/mortevielle/mortevielle.h | 18 +-- 4 files changed, 169 insertions(+), 152 deletions(-) diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp index f53dd914973..2e4a237d534 100644 --- a/engines/mortevielle/actions.cpp +++ b/engines/mortevielle/actions.cpp @@ -43,8 +43,8 @@ void MortevielleEngine::fctMove() { if ((_coreVar._currPlace == ROOM26) && (_msg[4] == _menu._moveMenu[6])) { _coreVar._currPlace = LANDING; _caff = _coreVar._currPlace; - afdes(); - repon(2, _coreVar._currPlace); + drawPictureWithText(); + handleDescriptionText(2, _coreVar._currPlace); } if ((_coreVar._currPlace == LANDING) && (_msg[4] == _menu._moveMenu[6])) { if (!_syn) @@ -314,7 +314,7 @@ void MortevielleEngine::fctInventoryTake() { _menu.setInventoryText(); avpoing(cz); _crep = 998; - clearScreenType2(); + clearDescriptionBar(); } /** @@ -686,7 +686,7 @@ void MortevielleEngine::fctPlace() { // Open hidden passage aniof(1, 2); aniof(1, 1); - repon(2, 165); + handleDescriptionText(2, 165); displayEmptyHand(); _speechManager.startSpeech(6, -9, 1); @@ -700,8 +700,8 @@ void MortevielleEngine::fctPlace() { _mouse.hideMouse(); hirs(); drawRightFrame(); - clearScreenType2(); - clearScreenType3(); + clearDescriptionBar(); + clearVerbBar(); _mouse.showMouse(); prepareRoom(); drawClock(); @@ -717,7 +717,7 @@ void MortevielleEngine::fctPlace() { } else { _menu.setDestinationText(_coreVar._currPlace); setPal(14); - dessin(); + drawPicture(); aniof(1, 2); aniof(1, 1); alertTxt = getString(577); @@ -788,7 +788,7 @@ void MortevielleEngine::fctTurn() { if (_num != 0) { _crep = 997; if ((_coreVar._currPlace == ATTIC) && (_coreVar._atticRodHoleObjectId == 159) && (_coreVar._atticBallHoleObjectId == 141)) { - repon(2, 167); + handleDescriptionText(2, 167); _speechManager.startSpeech(7, 9, 1); int answer = Alert::show(getEngineString(S_YES_NO), 1); if (answer == 1) @@ -797,8 +797,8 @@ void MortevielleEngine::fctTurn() { _crep = 168; } if ((_coreVar._currPlace == SECRET_PASSAGE) && (_coreVar._secretPassageObjectId == 143)) { - repon(2, 175); - clearScreenType3(); + handleDescriptionText(2, 175); + clearVerbBar(); _speechManager.startSpeech(6, -9, 1); int answer = Alert::show(getEngineString(S_YES_NO), 1); if (answer == 1) { @@ -1152,8 +1152,8 @@ void MortevielleEngine::fctEnter() { if (_roomDoorId == ROOM9) { _col = true; _caff = 70; - afdes(); - repon(2, _caff); + drawPictureWithText(); + handleDescriptionText(2, _caff); } else _col = false; resetRoomVariables(_roomDoorId); @@ -1190,12 +1190,12 @@ void MortevielleEngine::fctSleep() { exitRoom(); _coreVar._currPlace = OWN_ROOM; affrep(); - afdes(); + drawPictureWithText(); resetRoomVariables(_coreVar._currPlace); _menu.setDestinationText(_coreVar._currPlace); } - clearScreenType3(); - clearScreenType2(); + clearVerbBar(); + clearDescriptionBar(); prepareScreenType2(); ecr2(getEngineString(S_WANT_TO_WAKE_UP)); updateHour(j, h, m); @@ -1285,7 +1285,7 @@ void MortevielleEngine::fctLeave() { */ void MortevielleEngine::fctWait() { _savedBitIndex = 0; - clearScreenType3(); + clearVerbBar(); int answer; do { @@ -1304,7 +1304,7 @@ void MortevielleEngine::fctWait() { prepareRoom(); return; } - repon(2, 102); + handleDescriptionText(2, 102); answer = Alert::show(getEngineString(S_YES_NO), 1); } while (answer != 2); _crep = 998; @@ -1347,8 +1347,8 @@ void MortevielleEngine::fctDiscuss() { ++cx; } while (_menu._discussMenu[cx] != _msg[4]); _caff = 69 + cx; - afdes(); - repon(2, _caff); + drawPictureWithText(); + handleDescriptionText(2, _caff); suj = _caff + 60; } testKey(false); @@ -1522,7 +1522,7 @@ void MortevielleEngine::fctDiscuss() { affrep(); /* chech;*/ _menu.setDestinationText(_coreVar._currPlace); - clearScreenType3(); + clearVerbBar(); } /** @@ -1565,10 +1565,10 @@ void MortevielleEngine::endGame() { _quitGame = true; tlu(13, 152); displayEmptyHand(); - clearScreenType1(); - clearScreenType2(); - clearScreenType3(); - repon(9, 1509); + clearUpperLeftPart(); + clearDescriptionBar(); + clearVerbBar(); + handleDescriptionText(9, 1509); testKey(false); _mouse.hideMouse(); _caff = 70; @@ -1577,14 +1577,14 @@ void MortevielleEngine::endGame() { premtet(); startDialog(141); _mouse.showMouse(); - clearScreenType1(); - repon(9, 1509); - repon(2, 142); + clearUpperLeftPart(); + handleDescriptionText(9, 1509); + handleDescriptionText(2, 142); testKey(false); _caff = 32; - afdes(); - repon(6, 34); - repon(2, 35); + drawPictureWithText(); + handleDescriptionText(6, 34); + handleDescriptionText(2, 35); startMusicOrSpeech(0); testKey(false); // A wait message was displayed. @@ -1600,7 +1600,7 @@ void MortevielleEngine::endGame() { * @remarks Originally called 'tencore' */ void MortevielleEngine::askRestart() { - clearScreenType2(); + clearDescriptionBar(); startMusicOrSpeech(0); testKey(false); displayEmptyHand(); @@ -1612,7 +1612,7 @@ void MortevielleEngine::askRestart() { _minute = 0; _hour = 10; _day = 0; - repon(2, 180); + handleDescriptionText(2, 180); int answer = Alert::show(getEngineString(S_YES_NO), 1); _quitGame = (answer != 1); diff --git a/engines/mortevielle/dialogs.cpp b/engines/mortevielle/dialogs.cpp index b2be026ff56..f0f44528995 100644 --- a/engines/mortevielle/dialogs.cpp +++ b/engines/mortevielle/dialogs.cpp @@ -462,7 +462,7 @@ void f3f8::aff50(bool drawAni50Fl) { if (drawAni50Fl) ani50(); else - g_vm->repon(2, kDialogStringIndex + 142); + g_vm->handleDescriptionText(2, kDialogStringIndex + 142); // Draw the f3/f8 dialog draw(); @@ -474,7 +474,7 @@ void f3f8::ani50() { g_vm->_crep = g_vm->animof(2, 1); g_vm->pictout(kAdrAni, g_vm->_crep, 63, 12); g_vm->_largestClearScreen = (g_vm->_res == 1); - g_vm->repon(2, kDialogStringIndex + 143); + g_vm->handleDescriptionText(2, kDialogStringIndex + 143); } } // End of namespace Mortevielle diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp index 9f41292f49f..a6fda733f27 100644 --- a/engines/mortevielle/mortevielle.cpp +++ b/engines/mortevielle/mortevielle.cpp @@ -635,7 +635,7 @@ void MortevielleEngine::handleAction() { char inkey = '\0'; bool oo, funct = 0; - clearScreenType3(); + clearVerbBar(); oo = false; _controlMenu = 0; if (!_keyPressedEsc) { @@ -690,7 +690,7 @@ void MortevielleEngine::handleAction() { if ((funct) && (inkey != '\77')) return; if (temps > lim) { - repon(2, 141); + handleDescriptionText(2, 141); if (_num == 9999) _num = 0; } else { @@ -722,10 +722,10 @@ void MortevielleEngine::handleAction() { g_vm->_text.taffich(); if (_okdes) { _okdes = false; - dessin(); + drawPicture(); } if ((!_syn) || (_col)) - repon(2, _crep); + handleDescriptionText(2, _crep); } } while (_syn); if (_controlMenu != 0) @@ -883,7 +883,7 @@ void MortevielleEngine::showPeoplePresent(int bitIndex) { for (int i = 1; i <= 8; ++i) _menu.disableMenuItem(_menu._discussMenu[i]); - clearScreenType10(); + clearUpperRightPart(); if ((bitIndex & 128) == 128) { _screenSurface.putxy(xp, 24); _screenSurface.drawString("LEO", 4); @@ -1082,7 +1082,7 @@ void MortevielleEngine::displayAloneText() { Common::String sAre = getEngineString(S_ARE); Common::String sAlone = getEngineString(S_ALONE); - clearScreenType10(); + clearUpperRightPart(); _screenSurface.putxy(580 - (_screenSurface.getStringWidth(sYou) / 2), 30); _screenSurface.drawString(sYou, 4); _screenSurface.putxy(580 - (_screenSurface.getStringWidth(sAre) / 2), 50); @@ -1687,11 +1687,11 @@ void MortevielleEngine::loseGame() { getPresence(MANOR_FRONT); _loseGame = true; - clearScreenType1(); + clearUpperLeftPart(); _screenSurface.drawBox(60, 35, 400, 50, 15); - repon(9, _crep); - clearScreenType2(); - clearScreenType3(); + handleDescriptionText(9, _crep); + clearDescriptionBar(); + clearVerbBar(); _col = false; _syn = false; _okdes = false; @@ -1776,9 +1776,9 @@ void MortevielleEngine::gotoDiningRoom() { _currBitIndex = 255; // Everybody is present showPeoplePresent(_currBitIndex); _caff = 77; - afdes(); + drawPictureWithText(); _screenSurface.drawBox(223, 47, 155, 91, 15); - repon(2, 33); + handleDescriptionText(2, 33); testKey(false); mennor(); _mouse.hideMouse(); @@ -1861,11 +1861,11 @@ void MortevielleEngine::changeGraphicalDevice(int newDevice) { showPeoplePresent(_currBitIndex); else displayAloneText(); - clearScreenType2(); - clearScreenType3(); + clearDescriptionBar(); + clearVerbBar(); _maff = 68; - afdes(); - repon(2, _crep); + drawPictureWithText(); + handleDescriptionText(2, _crep); _menu.displayMenu(); } @@ -1911,9 +1911,9 @@ void MortevielleEngine::gameLoaded() { displayAloneText(); prepareRoom(); drawClock(); - afdes(); - repon(2, _crep); - clearScreenType3(); + drawPictureWithText(); + handleDescriptionText(2, _crep); + clearVerbBar(); _endGame = false; _menu.setDestinationText(_coreVar._currPlace); _menu.setInventoryText(); @@ -1928,7 +1928,7 @@ void MortevielleEngine::gameLoaded() { */ void MortevielleEngine::handleOpcode() { if (!_col) - clearScreenType2(); + clearDescriptionBar(); _syn = false; _keyPressedEsc = false; if (!_anyone) { @@ -2063,20 +2063,20 @@ void MortevielleEngine::charToHour() { } /** - * Engine function - Clear Screen - Type 1 + * Engine function - Clear upper left part of Screen - Type 1 * @remarks Originally called 'clsf1' */ -void MortevielleEngine::clearScreenType1() { +void MortevielleEngine::clearUpperLeftPart() { _mouse.hideMouse(); _screenSurface.fillRect(0, Common::Rect(0, 11, 514, 175)); _mouse.showMouse(); } /** - * Engine function - Clear Screen - Type 2 + * Engine function - Clear low bar used by description * @remarks Originally called 'clsf2' */ -void MortevielleEngine::clearScreenType2() { +void MortevielleEngine::clearDescriptionBar() { _mouse.hideMouse(); if (_largestClearScreen) { _screenSurface.fillRect(0, Common::Rect(1, 176, 633, 199)); @@ -2090,10 +2090,10 @@ void MortevielleEngine::clearScreenType2() { } /** - * Engine function - Clear Screen - Type 3 + * Engine function - Clear lowest bar used by verbs * @remarks Originally called 'clsf3' */ -void MortevielleEngine::clearScreenType3() { +void MortevielleEngine::clearVerbBar() { _mouse.hideMouse(); _screenSurface.fillRect(0, Common::Rect(1, 192, 633, 199)); _screenSurface.drawBox(0, 191, 634, 8, 15); @@ -2101,22 +2101,23 @@ void MortevielleEngine::clearScreenType3() { } /** - * Engine function - Clear Screen - Type 10 + * Engine function - Clear upper right part of the screen * @remarks Originally called 'clsf10' */ -void MortevielleEngine::clearScreenType10() { - int co, cod; +void MortevielleEngine::clearUpperRightPart() { + int x1, x2; Common::String st; _mouse.hideMouse(); if (_res == 1) { - co = 634; - cod = 534; + x2 = 634; + x1 = 534; } else { - co = 600; - cod = 544; + x2 = 600; + x1 = 544; } - _screenSurface.fillRect(15, Common::Rect(cod, 93, co, 98)); + // Clear ambiance description + _screenSurface.fillRect(15, Common::Rect(x1, 93, x2, 98)); if (_coreVar._faithScore < 33) st = getEngineString(S_COOL); else if (_coreVar._faithScore < 66) @@ -2124,12 +2125,12 @@ void MortevielleEngine::clearScreenType10() { else if (_coreVar._faithScore > 65) st = getEngineString(S_MALSAINE); - co = 580 - (_screenSurface.getStringWidth(st) / 2); - _screenSurface.putxy(co, 92); + x1 = 580 - (_screenSurface.getStringWidth(st) / 2); + _screenSurface.putxy(x1, 92); _screenSurface.drawString(st, 4); + // Clear person list _screenSurface.fillRect(15, Common::Rect(560, 24, 610, 86)); - /* rempli(69,12,32,5,255);*/ _mouse.showMouse(); } @@ -2555,7 +2556,7 @@ void MortevielleEngine::music() { */ void MortevielleEngine::showTitleScreen() { hirs(); - repon(7, 2035); + handleDescriptionText(7, 2035); _caff = 51; _text.taffich(); testKeyboard(); @@ -2736,12 +2737,12 @@ void MortevielleEngine::prepareRoom() { _brt = true; _startHour = readclock(); if (getRandomNumber(1, 5) < 5) { - clearScreenType3(); + clearVerbBar(); prepareScreenType2(); ecr3(getEngineString(S_HEAR_NOISE)); int rand = (getRandomNumber(0, 4)) - 2; _speechManager.startSpeech(1, rand, 1); - clearScreenType3(); + clearVerbBar(); } } } @@ -2860,7 +2861,7 @@ void MortevielleEngine::initCaveOrCellar() { _coreVar._faithScore += 2; if (_coreVar._faithScore > 69) _coreVar._faithScore += (_coreVar._faithScore / 10); - clearScreenType3(); + clearVerbBar(); prepareScreenType2(); ecr3(getEngineString(S_SOMEONE_ENTERS)); int rand = (getRandomNumber(0, 4)) - 2; @@ -2869,7 +2870,7 @@ void MortevielleEngine::initCaveOrCellar() { // The original was doing here a useless loop. // It has been removed - clearScreenType3(); + clearVerbBar(); displayAloneText(); } @@ -2878,7 +2879,7 @@ void MortevielleEngine::initCaveOrCellar() { * @remarks Originally called 'tctrm' */ void MortevielleEngine::displayControlMenu() { - repon(2, (3000 + _controlMenu)); + handleDescriptionText(2, (3000 + _controlMenu)); _controlMenu = 0; } @@ -2933,41 +2934,49 @@ int MortevielleEngine::animof(int ouf, int num) { return animof_result; } -void MortevielleEngine::text1(int x, int y, int nb, int m) { +/** + * Display text in description bar + * @remarks Originally called 'text1' + */ +void MortevielleEngine::displayTextInDescriptionBar(int x, int y, int nb, int mesgId) { int co; if (_res == 1) co = 10; else co = 6; - Common::String tmpStr = getString(m); + Common::String tmpStr = getString(mesgId); if ((y == 182) && ((int) tmpStr.size() * co > nb * 6)) y = 176; _text.displayStr(tmpStr, x, y, nb, 20, _textColor); } -void MortevielleEngine::repon(int f, int m) { - if ((m > 499) && (m < 563)) { - Common::String tmpStr = getString(m - 501 + kInventoryStringIndex); +/** + * Display description text + * @remarks Originally called 'repon' + */ +void MortevielleEngine::handleDescriptionText(int f, int mesgId) { + if ((mesgId > 499) && (mesgId < 563)) { + Common::String tmpStr = getString(mesgId - 501 + kInventoryStringIndex); if ((int) tmpStr.size() > ((58 + (_res - 1) * 37) << 1)) _largestClearScreen = true; else _largestClearScreen = false; - clearScreenType2(); + clearDescriptionBar(); _text.displayStr(tmpStr, 8, 176, 85, 3, 5); } else { - modif(m); + mapMessageId(mesgId); switch (f) { case 2: case 8: - clearScreenType2(); + clearDescriptionBar(); prepareScreenType2(); - text1(8, 182, 103, m); - if ((m == 68) || (m == 69)) + displayTextInDescriptionBar(8, 182, 103, mesgId); + if ((mesgId == 68) || (mesgId == 69)) _coreVar._teauto[40] = '*'; - if ((m == 104) && (_caff == 14)) { + if ((mesgId == 104) && (_caff == 14)) { _coreVar._teauto[36] = '*'; if (_coreVar._teauto[39] == '*') { _coreVar._pourc[3] = '*'; @@ -2984,12 +2993,12 @@ void MortevielleEngine::repon(int f, int m) { else i = 5; - Common::String tmpStr = getString(m); + Common::String tmpStr = getString(mesgId); _text.displayStr(tmpStr, 80, 40, 60, 25, i); - if (m == 180) + if (mesgId == 180) _coreVar._pourc[6] = '*'; - else if (m == 179) + else if (mesgId == 179) _coreVar._pourc[10] = '*'; } break; @@ -2999,43 +3008,47 @@ void MortevielleEngine::repon(int f, int m) { } } -void MortevielleEngine::modif(int &nu) { - if (nu == 26) - nu = 25; - else if ((nu > 29) && (nu < 36)) - nu -= 4; - else if ((nu > 69) && (nu < 78)) - nu -= 37; - else if ((nu > 99) && (nu < 194)) - nu -= 59; - else if ((nu > 996) && (nu < 1000)) - nu -= 862; - else if ((nu > 1500) && (nu < 1507)) - nu -= 1363; - else if ((nu > 1507) && (nu < 1513)) - nu -= 1364; - else if ((nu > 1999) && (nu < 2002)) - nu -= 1851; - else if (nu == 2010) - nu = 151; - else if ((nu > 2011) && (nu < 2025)) - nu -= 1860; - else if (nu == 2026) - nu = 165; - else if ((nu > 2029) && (nu < 2037)) - nu -= 1864; - else if ((nu > 3000) && (nu < 3005)) - nu -= 2828; - else if (nu == 4100) - nu = 177; - else if (nu == 4150) - nu = 178; - else if ((nu > 4151) && (nu < 4156)) - nu -= 3973; - else if (nu == 4157) - nu = 183; - else if ((nu == 4160) || (nu == 4161)) - nu -= 3976; +/** + * Recompute message Id + * @remarks Originally called 'modif' + */ +void MortevielleEngine::mapMessageId(int &mesgId) { + if (mesgId == 26) + mesgId = 25; + else if ((mesgId > 29) && (mesgId < 36)) + mesgId -= 4; + else if ((mesgId > 69) && (mesgId < 78)) + mesgId -= 37; + else if ((mesgId > 99) && (mesgId < 194)) + mesgId -= 59; + else if ((mesgId > 996) && (mesgId < 1000)) + mesgId -= 862; + else if ((mesgId > 1500) && (mesgId < 1507)) + mesgId -= 1363; + else if ((mesgId > 1507) && (mesgId < 1513)) + mesgId -= 1364; + else if ((mesgId > 1999) && (mesgId < 2002)) + mesgId -= 1851; + else if (mesgId == 2010) + mesgId = 151; + else if ((mesgId > 2011) && (mesgId < 2025)) + mesgId -= 1860; + else if (mesgId == 2026) + mesgId = 165; + else if ((mesgId > 2029) && (mesgId < 2037)) + mesgId -= 1864; + else if ((mesgId > 3000) && (mesgId < 3005)) + mesgId -= 2828; + else if (mesgId == 4100) + mesgId = 177; + else if (mesgId == 4150) + mesgId = 178; + else if ((mesgId > 4151) && (mesgId < 4156)) + mesgId -= 3973; + else if (mesgId == 4157) + mesgId = 183; + else if ((mesgId == 4160) || (mesgId == 4161)) + mesgId -= 3976; } void MortevielleEngine::initouv() { @@ -3057,7 +3070,7 @@ void MortevielleEngine::ecr2(Common::String text) { _screenSurface.drawString(copy(text, tlig, tlig << 1), 5); } else { _largestClearScreen = true; - clearScreenType2(); + clearDescriptionBar(); _screenSurface.putxy(8, 176); _screenSurface.drawString(copy(text, 1, (tlig - 1)), 5); _screenSurface.putxy(8, 182); @@ -3068,7 +3081,7 @@ void MortevielleEngine::ecr2(Common::String text) { } void MortevielleEngine::ecr3(Common::String text) { - clearScreenType3(); + clearVerbBar(); _screenSurface.putxy(8, 192); _screenSurface.drawString(text, 5); } @@ -3296,8 +3309,12 @@ void MortevielleEngine::aniof(int ouf, int num) { prepareScreenType1(); } -void MortevielleEngine::dessin() { - clearScreenType1(); +/** + * Draw Picture + * @remarks Originally called 'dessin' + */ +void MortevielleEngine::drawPicture() { + clearUpperLeftPart(); if (_caff > 99) { draw(kAdrDes, 60, 33); _screenSurface.drawBox(118, 32, 291, 121, 15); // Medium box @@ -3332,9 +3349,9 @@ void MortevielleEngine::dessin() { } } -void MortevielleEngine::afdes() { +void MortevielleEngine::drawPictureWithText() { _text.taffich(); - dessin(); + drawPicture(); _okdes = false; } @@ -3374,9 +3391,9 @@ void MortevielleEngine::testKey(bool d) { void MortevielleEngine::tlu(int af, int ob) { _caff = 32; - afdes(); - repon(6, ob + 4000); - repon(2, 999); + drawPictureWithText(); + handleDescriptionText(6, ob + 4000); + handleDescriptionText(2, 999); testKey(true); _caff = af; _msg[3] = OPCODE_NONE; @@ -3517,7 +3534,7 @@ L1: if (!_hiddenHero) { if (_crep == 997) _crep = 138; - repon(2, _crep); + handleDescriptionText(2, _crep); if (_crep == 138) _speechManager.startSpeech(5, 2, 1); else @@ -3544,10 +3561,10 @@ L1: _crep = 137; goto L1; } else { - repon(2, 136); + handleDescriptionText(2, 136); int rand = (getRandomNumber(0, 4)) - 2; _speechManager.startSpeech(3, rand, 1); - clearScreenType2(); + clearDescriptionBar(); displayAloneText(); resetRoomVariables(MANOR_FRONT); affrep(); @@ -3677,11 +3694,11 @@ void MortevielleEngine::treg(int objId) { _caff = objId; if (((_caff > 29) && (_caff < 33)) || (_caff == 144) || (_caff == 147) || (_caff == 149) || (_msg[4] == OPCODE_SLOOK)) { - afdes(); + drawPictureWithText(); if ((_caff > 29) && (_caff < 33)) - repon(2, _caff); + handleDescriptionText(2, _caff); else - repon(2, _caff + 400); + handleDescriptionText(2, _caff + 400); testKey(true); _caff = mdes; _msg[3] = 0; diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h index ec7e86f1fa0..20390af293c 100644 --- a/engines/mortevielle/mortevielle.h +++ b/engines/mortevielle/mortevielle.h @@ -323,10 +323,10 @@ private: void endSearch(); int convertCharacterIndexToBitIndex(int characterIndex); int convertBitIndexToCharacterIndex(int bitIndex); - void clearScreenType1(); - void clearScreenType2(); - void clearScreenType3(); - void clearScreenType10(); + void clearUpperLeftPart(); + void clearDescriptionBar(); + void clearVerbBar(); + void clearUpperRightPart(); int getRandomNumber(int minval, int maxval); void showMoveMenuAlert(); void showConfigScreen(); @@ -424,8 +424,8 @@ private: void cinq_huit(char &c, int &idx, byte &pt, bool &the_end); void copcha(); void adzon(); - void text1(int x, int y, int nb, int m); - void modif(int &nu); + void displayTextInDescriptionBar(int x, int y, int nb, int mesgId); + void mapMessageId(int &mesgId); void initouv(); void phaz(int &rand, int &p, int cf); void writetp(Common::String s, int t); @@ -437,8 +437,8 @@ private: void ecr3(Common::String text); void init_nbrepm(); void aniof(int ouf, int num); - void dessin(); - void afdes(); + void drawPicture(); + void drawPictureWithText(); void tlu(int af, int ob); void affrep(); void mennor(); @@ -522,7 +522,7 @@ public: void hirs(); int testou(); - void repon(int f, int m); + void handleDescriptionText(int f, int mesgId); int animof(int ouf, int num); void pictout(int seg, int dep, int x, int y); void sauvecr(int y, int dy);