[Scummvm-cvs-logs] scummvm master -> 378d031b94be2de914e6bf21f610052b15f857ed

[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:
3839d9ce0b MORTEVIELLE: Fixed drawBox() to match original code
a7d5ac9963 MORTEVIELLE: Fixed read index parsing alert strings
378d031b94 Merge pull request #569 from chrilith/mortevielle


Commit: 3839d9ce0b0b746da62cd3380f91a48c9748b033
    https://github.com/scummvm/scummvm/commit/3839d9ce0b0b746da62cd3380f91a48c9748b033
Author: chrilith (chrilith at hotmail.com)
Date: 2015-01-23T14:29:16+01:00

Commit Message:
MORTEVIELLE: Fixed drawBox() to match original code

Changed paths:
    engines/mortevielle/dialogs.cpp
    engines/mortevielle/graphics.cpp
    engines/mortevielle/utils.cpp



diff --git a/engines/mortevielle/dialogs.cpp b/engines/mortevielle/dialogs.cpp
index 89098fa..95388c7 100644
--- a/engines/mortevielle/dialogs.cpp
+++ b/engines/mortevielle/dialogs.cpp
@@ -405,7 +405,7 @@ void DialogManager::drawF3F8() {
 	int f8Width = _vm->_screenSurface->getStringWidth(f8);
 
 	// Write out the bounding box
-	_vm->_screenSurface->drawBox(0, 42, MAX(f3Width, f8Width) + 6, 18, 7);
+	_vm->_screenSurface->drawBox(0, 42, MAX(f3Width, f8Width) + 4, 16, 7);
 }
 
 /**
diff --git a/engines/mortevielle/graphics.cpp b/engines/mortevielle/graphics.cpp
index 553c1a7..aa479fd 100644
--- a/engines/mortevielle/graphics.cpp
+++ b/engines/mortevielle/graphics.cpp
@@ -1019,6 +1019,8 @@ void ScreenSurface::writeCharacter(const Common::Point &pt, unsigned char ch, in
  *		simulate the original 640x400 surface, all Y values have to be doubled
  */
 void ScreenSurface::drawBox(int x, int y, int dx, int dy, int col) {
+	dx++; dy++;	// Original function draws 1px bigger
+
 	Graphics::Surface destSurface = lockArea(Common::Rect(x, y * 2, x + dx, (y + dy) * 2));
 
 	destSurface.hLine(0, 0, dx, col);
diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index 40136ad..8ae4951 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -1653,11 +1653,11 @@ void MortevielleEngine::clearDescriptionBar() {
 	_mouse->hideMouse();
 	if (_largestClearScreen) {
 		_screenSurface->fillRect(0, Common::Rect(1, 176, 633, 199));
-		_screenSurface->drawBox(0, 176, 634, 23, 15);
+		_screenSurface->drawBox(0, 175, 634, 24, 15);
 		_largestClearScreen = false;
 	} else {
 		_screenSurface->fillRect(0, Common::Rect(1, 176, 633, 190));
-		_screenSurface->drawBox(0, 176, 634, 14, 15);
+		_screenSurface->drawBox(0, 175, 634, 15, 15);
 	}
 	_mouse->showMouse();
 }


Commit: a7d5ac9963ceb209d99f3c00fe1b16694e6ab8e0
    https://github.com/scummvm/scummvm/commit/a7d5ac9963ceb209d99f3c00fe1b16694e6ab8e0
Author: chrilith (chrilith at hotmail.com)
Date: 2015-01-23T14:29:29+01:00

Commit Message:
MORTEVIELLE: Fixed read index parsing alert strings

because Pascal code is base 1

Changed paths:
    engines/mortevielle/dialogs.cpp



diff --git a/engines/mortevielle/dialogs.cpp b/engines/mortevielle/dialogs.cpp
index 95388c7..9df6684 100644
--- a/engines/mortevielle/dialogs.cpp
+++ b/engines/mortevielle/dialogs.cpp
@@ -66,12 +66,12 @@ int DialogManager::show(const Common::String &msg) {
 		drawAlertBox(10, 5, colNumb);
 	} else {
 		drawAlertBox(8, 7, colNumb);
-		int i = 0;
+		int i = -1;
 		_vm->_screenSurface->_textPos.y = 70;
 		do {
 			curPos.x = 320;
 			Common::String displayStr = "";
-			while ((alertStr[i + 1] != '\174') && (alertStr[i + 1] != '\135')) {
+			while ((alertStr[i + 1] != '|') && (alertStr[i + 1] != ']')) {
 				++i;
 				displayStr += alertStr[i];
 				curPos.x -= 3;


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

Commit Message:
Merge pull request #569 from chrilith/mortevielle

MORTEVIELLE: some display bugs fixed

Changed paths:
    engines/mortevielle/dialogs.cpp
    engines/mortevielle/graphics.cpp
    engines/mortevielle/utils.cpp