From d6412130c0b3f5d9e77586f7d25e9390a21c4d57 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 29 Dec 2011 15:24:04 +0100
Subject: KYRA: Prefix version string in LoL, EoB, EoB 2 main menu with
 "ScummVM".

---
 engines/kyra/sequences_darkmoon.cpp | 7 ++++---
 engines/kyra/sequences_eob.cpp      | 7 ++++---
 engines/kyra/sequences_lol.cpp      | 6 ++++--
 3 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'engines/kyra')

diff --git a/engines/kyra/sequences_darkmoon.cpp b/engines/kyra/sequences_darkmoon.cpp
index fbe892120c..6013492b5d 100644
--- a/engines/kyra/sequences_darkmoon.cpp
+++ b/engines/kyra/sequences_darkmoon.cpp
@@ -96,7 +96,7 @@ int DarkMoonEngine::mainMenu() {
 
 	while (menuChoice >= 0 && !shouldQuit()) {
 		switch (menuChoice) {
-			case 0:
+			case 0: {
 				s = _res->createReadStream("XENU.CPS");
 				if (s) {
 					s->read(_screen->getPalette(0).getData(), 768);
@@ -110,13 +110,14 @@ int DarkMoonEngine::mainMenu() {
 
 				of = _screen->setFont(Screen::FID_6_FNT);
 				op = _screen->setCurPage(2);
-				_screen->printText(gScummVMVersion, 267 - strlen(gScummVMVersion) * 6, 160, 13, 0);
+				Common::String versionString(Common::String::format("ScummVM %s", gScummVMVersion));
+				_screen->printText(versionString.c_str(), 267 - versionString.size() * 6, 160, 13, 0);
 				_screen->setFont(of);
 				_screen->_curPage = op;
 				_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
 				_screen->updateScreen();
 				menuChoice = mainMenuLoop();
-				break;
+				} break;
 
 			case 1:
 				// load game in progress
diff --git a/engines/kyra/sequences_eob.cpp b/engines/kyra/sequences_eob.cpp
index 65c149ea8f..4b094f4e9c 100644
--- a/engines/kyra/sequences_eob.cpp
+++ b/engines/kyra/sequences_eob.cpp
@@ -41,13 +41,14 @@ int EoBEngine::mainMenu() {
 
 	while (menuChoice >= 0 && !shouldQuit()) {
 		switch (menuChoice) {
-		case 0:
+		case 0: {
 			_screen->loadPalette("EOBPAL.COL", _screen->getPalette(0));
 			_screen->loadEoBBitmap("INTRO", 0, 5, 3, 2);
 			_screen->setScreenPalette(_screen->getPalette(0));
 			_screen->_curPage = 2;
 			of = _screen->setFont(Screen::FID_6_FNT);
-			_screen->printText(gScummVMVersion, 280 - strlen(gScummVMVersion) * 6, 153, _screen->getPagePixel(2, 0, 0), 0);
+			Common::String versionString(Common::String::format("ScummVM %s", gScummVMVersion));
+			_screen->printText(versionString.c_str(), 280 - versionString.size() * 6, 153, _screen->getPagePixel(2, 0, 0), 0);
 			_screen->setFont(of);
 			_screen->fillRect(0, 159, 319, 199, _screen->getPagePixel(2, 0, 0));
 			gui_drawBox(77, 165, 173, 29, 13, 14, 12);
@@ -56,7 +57,7 @@ int EoBEngine::mainMenu() {
 			_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
 			_screen->updateScreen();
 			menuChoice = mainMenuLoop();
-			break;
+			} break;
 
 		case 1:
 			// load game in progress
diff --git a/engines/kyra/sequences_lol.cpp b/engines/kyra/sequences_lol.cpp
index d5b3dd97c4..ba27ccff8e 100644
--- a/engines/kyra/sequences_lol.cpp
+++ b/engines/kyra/sequences_lol.cpp
@@ -55,6 +55,8 @@ int LoLEngine::processPrologue() {
 
 	preInit();
 
+	Common::String versionString(Common::String::format("ScummVM %s", gScummVMVersion));
+
 	int processSelection = -1;
 	while (!shouldQuit() && processSelection == -1) {
 		_screen->loadBitmap("TITLE.CPS", 2, 2, &_screen->getPalette(0));
@@ -62,8 +64,8 @@ int LoLEngine::processPrologue() {
 
 		_screen->setFont(Screen::FID_6_FNT);
 		// Original version: (260|193) "V CD1.02 D"
-		const int width = _screen->getTextWidth(gScummVMVersion);
-		_screen->fprintString("SVM %s", 300 - width, 193, 0x67, 0x00, 0x04, gScummVMVersion);
+		const int width = _screen->getTextWidth(versionString.c_str());
+		_screen->fprintString(versionString.c_str(), 320 - width, 193, 0x67, 0x00, 0x04, gScummVMVersion);
 		_screen->setFont(_flags.lang == Common::JA_JPN ? Screen::FID_SJIS_FNT : Screen::FID_9_FNT);
 
 		_screen->fadePalette(_screen->getPalette(0), 0x1E);
-- 
cgit v1.2.3