[Scummvm-cvs-logs] scummvm master -> bf3e2bca07636afa307efc9e880548023f249e9b

[Strangerke]

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

Summary:
6691f9d812 MORTEVIELLE: Added missing mesgId handling for 3rd intro screen
a4d822f98a MORTEVIELLE: alternatively we can make it local to delay()
bf3e2bca07 Merge pull request #570 from chrilith/mortevielle_3rdintro


Commit: 6691f9d8122aa36a0640fa33f6c2a3c6a72a6dd8
    https://github.com/scummvm/scummvm/commit/6691f9d8122aa36a0640fa33f6c2a3c6a72a6dd8
Author: Chris Apers (chrilith at hotmail.com)
Date: 2015-01-24T11:13:32+01:00

Commit Message:
MORTEVIELLE: Added missing mesgId handling for 3rd intro screen

This message is displayed during disk access, so it is not visible as
is in ScummVM version, a delay is required. Also delay should hide the
mouse to prevent frozen screen.

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



diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
index 5f7f175..b6fee3f 100644
--- a/engines/mortevielle/mortevielle.h
+++ b/engines/mortevielle/mortevielle.h
@@ -92,6 +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
 
 const int kTime1 = 410;
 const int kTime2 = 250;
diff --git a/engines/mortevielle/mouse.cpp b/engines/mortevielle/mouse.cpp
index 8f96ba3..7551da3 100644
--- a/engines/mortevielle/mouse.cpp
+++ b/engines/mortevielle/mouse.cpp
@@ -51,7 +51,7 @@ void MouseHandler::initMouse() {
  * @remarks	Originally called 'hide_mouse'
  */
 void MouseHandler::hideMouse() {
-	// No implementation needed in ScummVM
+	g_system->showMouse(false);
 }
 
 /**
@@ -59,7 +59,7 @@ void MouseHandler::hideMouse() {
  * @remarks	Originally called 'show_mouse'
  */
 void MouseHandler::showMouse() {
-	// ScummVM implementation uses CursorMan for drawing the cursor
+	g_system->showMouse(true);
 }
 
 /**
diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index 40136ad..a89af1a 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -234,6 +234,7 @@ void MortevielleEngine::setMousePos(const Common::Point &pt) {
 void MortevielleEngine::delay(int amount) {
 	uint32 endTime = g_system->getMillis() + amount;
 
+	_mouse->hideMouse();
 	while (g_system->getMillis() < endTime) {
 		if (g_system->getMillis() > (_lastGameFrame + GAME_FRAME_DELAY)) {
 			_lastGameFrame = g_system->getMillis();
@@ -244,6 +245,7 @@ void MortevielleEngine::delay(int amount) {
 
 		g_system->delayMillis(10);
 	}
+	_mouse->showMouse();
 }
 
 /**
@@ -2124,6 +2126,7 @@ void MortevielleEngine::showTitleScreen() {
 	_caff = 51;
 	_text->taffich();
 	testKeyboard();
+	delay(DISK_ACCESS_DELAY);
 	clearScreen();
 	draw(0, 0);
 
@@ -2521,6 +2524,18 @@ void MortevielleEngine::handleDescriptionText(int f, int mesgId) {
 				_coreVar._pctHintFound[10] = '*';
 			}
 			break;
+		case 7: {
+			prepareScreenType3();
+			Common::String tmpStr = getString(mesgId);
+			// CHECKME: original code seems to consider one extra character
+			// See text position in the 3rd intro screen
+			int size = tmpStr.size() + 1;
+			if (size < 40)
+				_text->displayStr(tmpStr, 252 - size * 3, 86, 50, 3, 5);
+			else
+				_text->displayStr(tmpStr, 144, 86, 50, 3, 5);
+			}
+			break;
 		default:
 			break;
 		}


Commit: a4d822f98a3df3c64daafbc1cb5166ad6295d47a
    https://github.com/scummvm/scummvm/commit/a4d822f98a3df3c64daafbc1cb5166ad6295d47a
Author: Chris Apers (chrilith at hotmail.com)
Date: 2015-01-24T14:03:22+01:00

Commit Message:
MORTEVIELLE: alternatively we can make it local to delay()

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



diff --git a/engines/mortevielle/mouse.cpp b/engines/mortevielle/mouse.cpp
index 7551da3..8f96ba3 100644
--- a/engines/mortevielle/mouse.cpp
+++ b/engines/mortevielle/mouse.cpp
@@ -51,7 +51,7 @@ void MouseHandler::initMouse() {
  * @remarks	Originally called 'hide_mouse'
  */
 void MouseHandler::hideMouse() {
-	g_system->showMouse(false);
+	// No implementation needed in ScummVM
 }
 
 /**
@@ -59,7 +59,7 @@ void MouseHandler::hideMouse() {
  * @remarks	Originally called 'show_mouse'
  */
 void MouseHandler::showMouse() {
-	g_system->showMouse(true);
+	// ScummVM implementation uses CursorMan for drawing the cursor
 }
 
 /**
diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index a89af1a..50dcb4e 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -234,7 +234,7 @@ void MortevielleEngine::setMousePos(const Common::Point &pt) {
 void MortevielleEngine::delay(int amount) {
 	uint32 endTime = g_system->getMillis() + amount;
 
-	_mouse->hideMouse();
+	g_system->showMouse(false);
 	while (g_system->getMillis() < endTime) {
 		if (g_system->getMillis() > (_lastGameFrame + GAME_FRAME_DELAY)) {
 			_lastGameFrame = g_system->getMillis();
@@ -245,7 +245,7 @@ void MortevielleEngine::delay(int amount) {
 
 		g_system->delayMillis(10);
 	}
-	_mouse->showMouse();
+	g_system->showMouse(true);
 }
 
 /**


Commit: bf3e2bca07636afa307efc9e880548023f249e9b
    https://github.com/scummvm/scummvm/commit/bf3e2bca07636afa307efc9e880548023f249e9b
Author: Arnaud Boutonné (Strangerke at scummvm.org)
Date: 2015-01-24T14:37:00+01:00

Commit Message:
Merge pull request #570 from chrilith/mortevielle_3rdintro

MORTEVIELLE: Added missing mesgId handling for 3rd intro screen

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