libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 05:38:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #571 from chrilith/master

Browse Source 
Small adjustments to match original code
This commit is contained in:
Arnaud Boutonné 2015-01-25 21:07:11 +01:00
commit 4aa6f5caee
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/mortevielle/mortevielle.h
View File

@ -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;

13
engines/mortevielle/utils.cpp
View File

@ -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);
}
/**