From 9d7f7fc4b625918340ad3a081e44526a583e0ee0 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 17 Apr 2011 16:30:59 +0200
Subject: SCUMM: Prefer Surface::create taking a PixelFormat over the one
 taking a byte depth.

---
 engines/scumm/scumm.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/scumm/scumm.cpp')

diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 5aea36ef66..33343aef81 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1222,7 +1222,7 @@ void ScummEngine::setupScumm() {
 	setupCharsetRenderer();
 
 	// Create and clear the text surface
-	_textSurface.create(_screenWidth * _textSurfaceMultiplier, _screenHeight * _textSurfaceMultiplier, 1);
+	_textSurface.create(_screenWidth * _textSurfaceMultiplier, _screenHeight * _textSurfaceMultiplier, Graphics::PixelFormat::createFormatCLUT8());
 	clearTextSurface();
 
 	// Create the costume renderer
-- 
cgit v1.2.3


From b929699ad20dc06a379fedb3704a28aec0f82347 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 18 Apr 2011 18:20:40 +0200
Subject: SCUMM: Make use of new Common::Error type

---
 engines/scumm/scumm.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/scumm/scumm.cpp')

diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 5aea36ef66..67c535690b 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1162,7 +1162,7 @@ Common::Error ScummEngine::init() {
 				warning("Starting game without the required 16bit color support.\nYou may experience color glitches");
 				initGraphics(screenWidth, screenHeight, (screenWidth > 320));
 			} else {
-				error("16bit color support is required for this game");
+				return Common::Error(Common::kUnsupportedColorMode, "16bit color support is required for this game");
 			}
 #endif
 		} else {
-- 
cgit v1.2.3


From 44c1d3822239376deca8a41bf33b184553bce9d8 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Fri, 22 Apr 2011 19:57:33 +0100
Subject: DOTT: MM message can now be translated.

---
 engines/scumm/scumm.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/scumm/scumm.cpp')

diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 67c535690b..7108aabd21 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -2494,7 +2494,7 @@ void ScummEngine_v90he::runBootscript() {
 
 void ScummEngine::startManiac() {
 	debug(0, "stub startManiac()");
-	displayMessage(0, "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' directory inside the Tentacle game directory.");
+	displayMessage(0, _("Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' directory inside the Tentacle game directory."));
 }
 
 #pragma mark -
-- 
cgit v1.2.3


From 4a7360d29be53dc8ab4ccd2cd8f508cd21ed1c7c Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Fri, 22 Apr 2011 21:46:38 +0200
Subject: SCUMM: Do not pass non-string literal but "%s" + string to
 displayMessage.

Since displayMessages usualy vsnprintf internally it is not quite safe to pass
any string to it, since it might include a format argument like %n, which is
unsafe.
---
 engines/scumm/scumm.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/scumm/scumm.cpp')

diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 7108aabd21..920887e387 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -2494,7 +2494,7 @@ void ScummEngine_v90he::runBootscript() {
 
 void ScummEngine::startManiac() {
 	debug(0, "stub startManiac()");
-	displayMessage(0, _("Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' directory inside the Tentacle game directory."));
+	displayMessage(0, "%s", _("Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' directory inside the Tentacle game directory."));
 }
 
 #pragma mark -
-- 
cgit v1.2.3


From 1331c998e35a91b94c6c54cfc5d0eb2adf0eb028 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Wed, 27 Apr 2011 20:06:13 -0400
Subject: SCUMM: Add separate game id's for soccermls and soccer2004

There are subtle differences in their u32 code that we need to handle
---
 engines/scumm/scumm.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'engines/scumm/scumm.cpp')

diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 920887e387..0e7ceff195 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1648,6 +1648,8 @@ void ScummEngine_v90he::resetScumm() {
 			break;
 
 		case GID_SOCCER:
+		case GID_SOCCERMLS:
+		case GID_SOCCER2004:
 			_logicHE = new LogicHEsoccer(this);
 			break;
 
-- 
cgit v1.2.3