[Scummvm-cvs-logs] scummvm master -> 4aa6f5caeeb6283cde5f53f77fb559cfcd7ee88a

[Strangerke]

This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
241f459582 Merge pull request #1 from scummvm/master
975b1cf7fb MORTEVIELLE: more drawBox() adjustments
e695c01862 MORTEVIELLE: 1sec seems to be far enough here
4aa6f5caee Merge pull request #571 from chrilith/master


Commit: 241f4595824706b91d0153c23204c64f85f956dd
    https://github.com/scummvm/scummvm/commit/241f4595824706b91d0153c23204c64f85f956dd
Author: chrilith (chrilith at hotmail.com)
Date: 2015-01-24T16:46:03+01:00

Commit Message:
Merge pull request #1 from scummvm/master

Latest changes including mines

Changed paths:
    engines/mortevielle/dialogs.cpp
    engines/mortevielle/graphics.cpp
    engines/mortevielle/mortevielle.h
    engines/mortevielle/utils.cpp
    engines/zvision/video/zork_avi_decoder.cpp





Commit: 975b1cf7fb7f936971c553e5ed30492ad9e7e94d
    https://github.com/scummvm/scummvm/commit/975b1cf7fb7f936971c553e5ed30492ad9e7e94d
Author: Chris Apers (chrilith at hotmail.com)
Date: 2015-01-25T20:53:42+01:00

Commit Message:
MORTEVIELLE: more drawBox() adjustments

Changed paths:
    engines/mortevielle/utils.cpp



diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index 61f58c0..aa58dc6 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);
 }
 
 /**


Commit: e695c018629a1a648892fe5474d2049a429e8dc8
    https://github.com/scummvm/scummvm/commit/e695c018629a1a648892fe5474d2049a429e8dc8
Author: Chris Apers (chrilith at hotmail.com)
Date: 2015-01-25T20:54:09+01:00

Commit Message:
MORTEVIELLE: 1sec seems to be far enough here

Changed paths:
    engines/mortevielle/mortevielle.h



diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
index b6fee3f..b0faff3 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;


Commit: 4aa6f5caeeb6283cde5f53f77fb559cfcd7ee88a
    https://github.com/scummvm/scummvm/commit/4aa6f5caeeb6283cde5f53f77fb559cfcd7ee88a
Author: Arnaud Boutonné (Strangerke at scummvm.org)
Date: 2015-01-25T21:07:11+01:00

Commit Message:
Merge pull request #571 from chrilith/master

Small adjustments to match original code

Changed paths:
    engines/mortevielle/mortevielle.h
    engines/mortevielle/utils.cpp