Merge branch 'master' of https://github.com/scummvm/scummvm

6 files changed, 13 insertions, 16 deletions

diff --git a/backends/platform/android/org/scummvm/scummvm/ScummVM.java b/backends/platform/android/org/scummvm/scummvm/ScummVM.java
index 3a25b54eeb..5047502e61 100644
--- a/backends/platform/android/org/scummvm/scummvm/ScummVM.java
+++ b/backends/platform/android/org/scummvm/scummvm/ScummVM.java
@@ -86,13 +86,15 @@ public abstract class ScummVM implements SurfaceHolder.Callback, Runnable {
 		Log.d(LOG_TAG, String.format("surfaceChanged: %dx%d (%d)",
 										width, height, format));
 
+		// store values for the native code
+		// make sure to do it before notifying the lock
+		// as it leads to a race condition otherwise
+		setSurface(width, height);
+
 		synchronized(_sem_surface) {
 			_surface_holder = holder;
 			_sem_surface.notifyAll();
 		}
-
-		// store values for the native code
-		setSurface(width, height);
 	}
 
 	// SurfaceHolder callback
diff --git a/engines/queen/cutaway.cpp b/engines/queen/cutaway.cpp
index 1e53c00564..ade1220a5e 100644
--- a/engines/queen/cutaway.cpp
+++ b/engines/queen/cutaway.cpp
@@ -552,7 +552,6 @@ void Cutaway::dumpCutawayAnim(CutawayAnim &anim) {
 const byte *Cutaway::handleAnimation(const byte *ptr, CutawayObject &object) {
 	// lines 1517-1770 in cutaway.c
 	int frameCount = 0;
-	int header = 0;
 	int i;
 
 	CutawayAnim objAnim[56];
@@ -560,7 +559,7 @@ const byte *Cutaway::handleAnimation(const byte *ptr, CutawayObject &object) {
 	// Read animation frames
 	for (;;) {
 
-		header = (int16)READ_BE_INT16(ptr);
+		int header = (int16)READ_BE_INT16(ptr);
 		ptr += 2;
 
 		if (-2 == header)
diff --git a/engines/queen/detection.cpp b/engines/queen/detection.cpp
index 57b314c088..9c37fec754 100644
--- a/engines/queen/detection.cpp
+++ b/engines/queen/detection.cpp
@@ -172,35 +172,31 @@ static const QueenGameDescription gameDescriptions[] = {
 		},
 	},
 
-#if 0
 	// DOS Floppy - French
 	{
 		{
 			"queen",
 			"Floppy",
-			AD_ENTRY1s("queen.1", NULL, 22157304), // TODO: Fill in correct MD5
+			AD_ENTRY1s("queen.1", "f5e827645d3c887be3bdf4729d847756", 22157304),
 			Common::FR_FRA,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
 			GUIO1(GUIO_NOSPEECH)
 		},
 	},
-#endif
 
-#if 0
 	// DOS CD - French
 	{
 		{
 			"queen",
 			"Talkie",
-			AD_ENTRY1s("queen.1", NULL, 186689095), // TODO: Fill in correct MD5
+			AD_ENTRY1s("queen.1", "6fd5486a0db75bae2e023b575c3d6a5d", 186689095),
 			Common::FR_FRA,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
 			GUIO1(GAMEOPTION_ALT_INTRO)
 		},
 	},
-#endif
 
 #if 0
 	// DOS Floppy - German
diff --git a/engines/queen/graphics.cpp b/engines/queen/graphics.cpp
index 70f7d7c94b..d98ddd635f 100644
--- a/engines/queen/graphics.cpp
+++ b/engines/queen/graphics.cpp
@@ -522,7 +522,7 @@ void Graphics::setBobText(const BobSlot *pbs, const char *text, int textX, int t
 
 	// Calc text position
 
-	short x, y, width, height;
+	short x, y, width;
 
 	if (flags) {
 		if (flags == 2)
@@ -540,7 +540,7 @@ void Graphics::setBobText(const BobSlot *pbs, const char *text, int textX, int t
 		BobFrame *pbf = _vm->bankMan()->fetchFrame(pbs->frameNum);
 
 		width  = (pbf->width  * pbs->scale) / 100;
-		height = (pbf->height * pbs->scale) / 100;
+		short height = (pbf->height * pbs->scale) / 100;
 
 		y = y - height - 16 - lineCount * 9;
 	}
diff --git a/engines/queen/talk.cpp b/engines/queen/talk.cpp
index 1531510ba4..dd3ce0022e 100644
--- a/engines/queen/talk.cpp
+++ b/engines/queen/talk.cpp
@@ -1252,7 +1252,6 @@ int16 Talk::selectSentence() {
 		_vm->input()->clearKeyVerb();
 
 		if (sentenceCount > 0) {
-			int zone = 0;
 			int oldZone = 0;
 
 			while (0 == selectedSentence) {
@@ -1263,7 +1262,7 @@ int16 Talk::selectSentence() {
 				_vm->update();
 
 				Common::Point mouse = _vm->input()->getMousePos();
-				zone = _vm->grid()->findZoneForPos(GS_PANEL, mouse.x, mouse.y);
+				int zone = _vm->grid()->findZoneForPos(GS_PANEL, mouse.x, mouse.y);
 
 				int mouseButton = _vm->input()->mouseButton();
 				_vm->input()->clearMouseButton();
diff --git a/ports.mk b/ports.mk
index e432c8c65f..306e0f046b 100644
--- a/ports.mk
+++ b/ports.mk
@@ -97,10 +97,11 @@ endif
 ifneq ($(BACKEND), iphone)
 # Static libaries, used for the scummvm-static and iphone targets
 OSX_STATIC_LIBS := `$(STATICLIBPATH)/bin/sdl-config --static-libs`
+endif
+
 ifdef USE_FREETYPE2
 OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libfreetype.a $(STATICLIBPATH)/lib/libbz2.a
 endif
-endif
 
 ifdef USE_VORBIS
 OSX_STATIC_LIBS += \