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

[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:
d928871f7a MORTEVIELLE: added starting screen
58565c43da MORTEVIELLE: added starting screen string index constant
f2fffeb17c Merge pull request #576 from chrilith/master


Commit: d928871f7a03b410f4fcac43c44315e2f999efc9
    https://github.com/scummvm/scummvm/commit/d928871f7a03b410f4fcac43c44315e2f999efc9
Author: Chris Apers (chrilith at hotmail.com)
Date: 2015-01-27T20:48:31+01:00

Commit Message:
MORTEVIELLE: added starting screen

To give credits to the original authors and developers.

Changed paths:
    engines/mortevielle/utils.cpp



diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index 74f2bc5..49e1777 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -1726,6 +1726,22 @@ void MortevielleEngine::showMoveMenuAlert() {
  * @remarks	Originally called 'dialpre'
  */
 void MortevielleEngine::showConfigScreen() {
+	// FIXME: need a DOS palette, index 9 (light blue). Also we should show DOS font here
+	Common::String tmpStr;
+	int width, cy = 0;
+	clearScreen();
+ 	do {
+ 		++cy;
+ 		tmpStr = getString(cy + 456);
+ 		width = _screenSurface->getStringWidth(tmpStr);
+ 		_text->displayStr(tmpStr, 320 - width / 2, cy * 8, 80, 1, 2);
+ 	} while (cy != 20);
+
+ 	int ix = 0;
+ 	do {
+ 		++ix;
+ 	} while (!(keyPressed() || ix == 0x5e5));
+
 	_crep = 998;
 }
 
@@ -2132,6 +2148,7 @@ void MortevielleEngine::showTitleScreen() {
 	clearScreen();
 	draw(0, 0);
 
+	// FIXME: should be a DOS font here
 	Common::String cpr = "COPYRIGHT 1989 : LANKHOR";
 	_screenSurface->putxy(104 + 72 * kResolutionScaler, 185);
 	_screenSurface->drawString(cpr, 0);


Commit: 58565c43da24553bfd9bea4e58de2d9191993ed3
    https://github.com/scummvm/scummvm/commit/58565c43da24553bfd9bea4e58de2d9191993ed3
Author: Chris Apers (chrilith at hotmail.com)
Date: 2015-01-27T20:55:47+01:00

Commit Message:
MORTEVIELLE: added starting screen string index constant

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



diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
index f260edb..42d70fc 100644
--- a/engines/mortevielle/mortevielle.h
+++ b/engines/mortevielle/mortevielle.h
@@ -116,6 +116,7 @@ const int kInventoryStringIndex = 186;
 const int kQuestionStringIndex = 247;
 const int kDialogStringIndex = 292;
 const int kMenuPlaceStringIndex = 435;
+const int kStartingScreenStringIndex = 456;
 const int kMenuActionStringIndex = 476;
 const int kMenuSelfStringIndex = 497;
 const int kMenuSayStringIndex = 502;
diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index 49e1777..5fe4767 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -1732,7 +1732,7 @@ void MortevielleEngine::showConfigScreen() {
 	clearScreen();
  	do {
  		++cy;
- 		tmpStr = getString(cy + 456);
+ 		tmpStr = getString(cy + kStartingScreenStringIndex);
  		width = _screenSurface->getStringWidth(tmpStr);
  		_text->displayStr(tmpStr, 320 - width / 2, cy * 8, 80, 1, 2);
  	} while (cy != 20);


Commit: f2fffeb17cd8a46728f02fd0195e3f72bb0b29c5
    https://github.com/scummvm/scummvm/commit/f2fffeb17cd8a46728f02fd0195e3f72bb0b29c5
Author: Arnaud Boutonné (Strangerke at scummvm.org)
Date: 2015-01-28T07:50:02+01:00

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

MORTEVIELLE: added starting screen

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