diff options
| author | Arnaud Boutonné | 2015-01-25 21:07:11 +0100 |
|---|---|---|
| committer | Arnaud Boutonné | 2015-01-25 21:07:11 +0100 |
| commit | 4aa6f5caeeb6283cde5f53f77fb559cfcd7ee88a (patch) | |
| tree | 6788f04d31737367727067996dc0df7d4c9ef077 | |
| parent | 4e1ffc9434f771d3f43e66104adeea9e0166123c (diff) | |
| parent | e695c018629a1a648892fe5474d2049a429e8dc8 (diff) | |
| download | scummvm-rg350-4aa6f5caeeb6283cde5f53f77fb559cfcd7ee88a.tar.gz scummvm-rg350-4aa6f5caeeb6283cde5f53f77fb559cfcd7ee88a.tar.bz2 scummvm-rg350-4aa6f5caeeb6283cde5f53f77fb559cfcd7ee88a.zip | |
Merge pull request #571 from chrilith/master
Small adjustments to match original code
| -rw-r--r-- | engines/mortevielle/mortevielle.h | 2 | ||||
| -rw-r--r-- | engines/mortevielle/utils.cpp | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h index b6fee3f19f..b0faff3510 100644 --- a/engines/mortevielle/mortevielle.h +++ b/engines/mortevielle/mortevielle.h @@ -92,7 +92,7 @@ enum DataType { #define MORT_DAT_REQUIRED_VERSION 1 #define MORT_DAT "mort.dat" #define GAME_FRAME_DELAY (1000 / 50) -#define DISK_ACCESS_DELAY 3000 +#define DISK_ACCESS_DELAY 1000 const int kTime1 = 410; const int kTime2 = 250; diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp index 61f58c0972..aa58dc6f7c 100644 --- a/engines/mortevielle/utils.cpp +++ b/engines/mortevielle/utils.cpp @@ -391,7 +391,7 @@ void MortevielleEngine::setTextColor(int col) { */ void MortevielleEngine::prepareScreenType1() { // Large drawing - _screenSurface->drawBox(0, 11, 512, 164, 15); + _screenSurface->drawBox(0, 11, 512, 163, 15); } /** @@ -1381,7 +1381,7 @@ void MortevielleEngine::gotoDiningRoom() { showPeoplePresent(_currBitIndex); _caff = 77; drawPictureWithText(); - _screenSurface->drawBox(223, 47, 155, 92, 15); + _screenSurface->drawBox(223, 47, 155, 91, 15); handleDescriptionText(2, 33); testKey(false); menuUp(); @@ -2885,10 +2885,10 @@ void MortevielleEngine::drawPicture() { clearUpperLeftPart(); if (_caff > 99) { draw(60, 33); - _screenSurface->drawBox(118, 32, 291, 122, 15); // Medium box + _screenSurface->drawBox(118, 32, 291, 121, 15); // Medium box } else if (_caff > 69) { draw(112, 48); // Heads - _screenSurface->drawBox(222, 47, 155, 92, 15); + _screenSurface->drawBox(222, 47, 155, 91, 15); } else { draw(0, 12); prepareScreenType1(); @@ -2926,6 +2926,9 @@ void MortevielleEngine::drawPicture() { } } +/** + * @remarks Originally called 'afdes' + */ void MortevielleEngine::drawPictureWithText() { _text->taffich(); drawPicture(); @@ -3087,7 +3090,7 @@ void MortevielleEngine::menuUp() { */ void MortevielleEngine::drawDiscussionBox() { draw(10, 80); - _screenSurface->drawBox(18, 79, 155, 92, 15); + _screenSurface->drawBox(18, 79, 155, 91, 15); } /** |