From 4202d45fce31db586991e9afb3aaca82baa4404b Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 22 Feb 2012 16:30:39 +0100
Subject: CGE: Avoid including advancedDetector.h from cge.h

---
 engines/cge/cge.cpp    | 1 +
 engines/cge/cge.h      | 3 ++-
 engines/cge/events.cpp | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/cge/cge.cpp b/engines/cge/cge.cpp
index 34e7d3f2f9..875ac34cd0 100644
--- a/engines/cge/cge.cpp
+++ b/engines/cge/cge.cpp
@@ -28,6 +28,7 @@
 #include "common/EventRecorder.h"
 #include "common/file.h"
 #include "common/fs.h"
+#include "engines/advancedDetector.h"
 #include "engines/util.h"
 #include "cge/cge.h"
 #include "cge/vga13h.h"
diff --git a/engines/cge/cge.h b/engines/cge/cge.h
index d324b293fa..4ebc836ee0 100644
--- a/engines/cge/cge.h
+++ b/engines/cge/cge.h
@@ -31,11 +31,12 @@
 #include "engines/engine.h"
 #include "gui/debugger.h"
 #include "graphics/surface.h"
-#include "engines/advancedDetector.h"
 #include "cge/console.h"
 #include "cge/bitmap.h"
 #include "cge/sound.h"
 
+struct ADGameDescription;
+
 namespace CGE {
 
 class Console;
diff --git a/engines/cge/events.cpp b/engines/cge/events.cpp
index 7c98f00b7b..3c561c5659 100644
--- a/engines/cge/events.cpp
+++ b/engines/cge/events.cpp
@@ -30,6 +30,7 @@
 #include "gui/message.h"
 #include "common/config-manager.h"
 #include "common/events.h"
+#include "engines/advancedDetector.h"
 #include "cge/events.h"
 #include "cge/events.h"
 #include "cge/text.h"
-- 
cgit v1.2.3


From 37216ab3814f68d45df1f02fd8765e58b4a1b9df Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 22 Feb 2012 18:21:57 +0100
Subject: DREAMWEB: Avoid including advancedDetector.h from dreamweb.h

---
 engines/dreamweb/detection.cpp      | 10 ++++++++++
 engines/dreamweb/detection_tables.h |  4 ++++
 engines/dreamweb/dreamweb.cpp       | 14 +++++---------
 engines/dreamweb/dreamweb.h         |  8 ++------
 4 files changed, 21 insertions(+), 15 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/detection.cpp b/engines/dreamweb/detection.cpp
index b891c2a3ea..9d3797db03 100644
--- a/engines/dreamweb/detection.cpp
+++ b/engines/dreamweb/detection.cpp
@@ -25,6 +25,8 @@
 #include "common/algorithm.h"
 #include "common/system.h"
 
+#include "engines/advancedDetector.h"
+
 #include "graphics/thumbnail.h"
 
 #include "dreamweb/dreamweb.h"
@@ -215,4 +217,12 @@ bool DreamWebEngine::canSaveGameStateCurrently() {
 	return false;
 }
 
+Common::Language DreamWebEngine::getLanguage() const {
+	return _gameDescription->desc.language;
+}
+
+bool DreamWebEngine::isCD() {
+	return _gameDescription->desc.flags & ADGF_CD;
+}
+
 } // End of namespace DreamWeb
diff --git a/engines/dreamweb/detection_tables.h b/engines/dreamweb/detection_tables.h
index 75f5786268..216e6715dc 100644
--- a/engines/dreamweb/detection_tables.h
+++ b/engines/dreamweb/detection_tables.h
@@ -25,6 +25,10 @@
 
 namespace DreamWeb {
 
+struct DreamWebGameDescription {
+	ADGameDescription desc;
+};
+
 static const DreamWebGameDescription gameDescriptions[] = {
 	// International floppy release
 	{
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 0a5deb4657..2ee20210ba 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -30,6 +30,8 @@
 #include "common/timer.h"
 #include "common/util.h"
 
+#include "engines/advancedDetector.h"
+
 #include "graphics/palette.h"
 #include "graphics/surface.h"
 
@@ -60,8 +62,6 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam
 	_channel0 = 0;
 	_channel1 = 0;
 
-	_language = gameDesc->desc.language;
-
 	_openChangeSize = kInventx+(4*kItempicsize);
 	_quitRequested = false;
 
@@ -477,10 +477,9 @@ uint8 DreamWebEngine::modifyChar(uint8 c) const {
 	if (c < 128)
 		return c;
 
-	switch(_language) {
+	switch(getLanguage()) {
 	case Common::DE_DEU:
-		switch(c)
-		{
+		switch(c) {
 		case 129:
 			return 'Z' + 3;
 		case 132:
@@ -528,11 +527,8 @@ uint8 DreamWebEngine::modifyChar(uint8 c) const {
 	}
 }
 
-bool DreamWebEngine::isCD() {
-	return _gameDescription->desc.flags & ADGF_CD;
-}
-
 bool DreamWebEngine::hasSpeech() {
 	return isCD() && _hasSpeech;
 }
+
 } // End of namespace DreamWeb
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 38016e5897..981ee86d4e 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -34,7 +34,6 @@
 #include "audio/audiostream.h"
 #include "audio/mixer.h"
 
-#include "engines/advancedDetector.h"
 #include "engines/engine.h"
 
 #include "dreamweb/console.h"
@@ -98,9 +97,7 @@ enum {
 	kDebugSaveLoad = (1 << 1)
 };
 
-struct DreamWebGameDescription {
-	ADGameDescription desc;
-};
+struct DreamWebGameDescription;
 
 class DreamWebEngine : public Engine {
 private:
@@ -149,7 +146,7 @@ public:
 
 	void enableSavingOrLoading(bool enable = true) { _enableSavingOrLoading = enable; }
 
-	Common::Language getLanguage() const { return _language; }
+	Common::Language getLanguage() const;
 	uint8 modifyChar(uint8 c) const;
 
 	void stopSound(uint8 channel);
@@ -167,7 +164,6 @@ private:
 	bool _turbo;
 	uint _oldMouseState;
 	bool _enableSavingOrLoading;
-	Common::Language _language;
 
 	struct Sample {
 		uint offset;
-- 
cgit v1.2.3


From 9628913cdc1cf832ba438a2015db4e25e7217524 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 22 Feb 2012 18:26:38 +0100
Subject: GOB: Fix type conversion warning

---
 engines/gob/minigames/geisha/meter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/gob/minigames/geisha/meter.cpp b/engines/gob/minigames/geisha/meter.cpp
index 335622c5df..e3b9bd1ccf 100644
--- a/engines/gob/minigames/geisha/meter.cpp
+++ b/engines/gob/minigames/geisha/meter.cpp
@@ -101,7 +101,7 @@ void Meter::update() {
 
 	_surface->fill(_backColor);
 
-	int32 n = floor((((float) _width) / _maxValue * _value) + 0.5);
+	int32 n = (int32)floor((((float) _width) / _maxValue * _value) + 0.5);
 	if (n <= 0)
 		return;
 
-- 
cgit v1.2.3