[Scummvm-git-logs] scummvm master -> ff950bca8dc203239676b3e2b10ea27ee3856016

[lephilousophe]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
55312a2fc9 GLK: Finx int vs int32 discrepancies
ff950bca8d WINTERMUTE: Fix build when not compiling WME3D


Commit: 55312a2fc93cab9066db2d81a8398960e9a39506
    https://github.com/scummvm/scummvm/commit/55312a2fc93cab9066db2d81a8398960e9a39506
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-06-26T15:55:32+02:00

Commit Message:
GLK: Finx int vs int32 discrepancies

Changed paths:
    engines/glk/scott/globals.h
    engines/glk/scott/seas_of_blood.cpp


diff --git a/engines/glk/scott/globals.h b/engines/glk/scott/globals.h
index 521380ac991..ac03a15e11d 100644
--- a/engines/glk/scott/globals.h
+++ b/engines/glk/scott/globals.h
@@ -196,7 +196,7 @@ public:
 	winid_t _leftDiceWin = nullptr;
 	winid_t _rightDiceWin = nullptr;
 	winid_t _battleRight = nullptr;
-	glui32 _backgroundColour = 0;
+	uint _backgroundColour = 0;
 	uint8_t *_bloodImageData = nullptr;
 	glui32 _dicePixelSize = 0;
 	glui32 _diceXOffset = 0;
diff --git a/engines/glk/scott/seas_of_blood.cpp b/engines/glk/scott/seas_of_blood.cpp
index 18d747705d1..07b52fa545f 100644
--- a/engines/glk/scott/seas_of_blood.cpp
+++ b/engines/glk/scott/seas_of_blood.cpp
@@ -256,7 +256,7 @@ glui32 optimalDicePixelSize(glui32 *width, glui32 *height) {
 	*width = idealWidth;
 	*height = idealHeight;
 	int multiplier = 1;
-	glui32 graphwidth, graphheight;
+	uint graphwidth, graphheight;
 	g_scott->glk_window_get_size(_G(_leftDiceWin), &graphwidth, &graphheight);
 	multiplier = graphheight / idealHeight;
 	if ((glui32)(idealWidth * multiplier) > graphwidth)
@@ -274,7 +274,7 @@ glui32 optimalDicePixelSize(glui32 *width, glui32 *height) {
 }
 
 static void drawBorder(winid_t win) {
-	glui32 width, height;
+	uint width, height;
 	g_scott->glk_stream_set_current(g_scott->glk_window_get_stream(win));
 	g_scott->glk_window_get_size(win, &width, &height);
 	height--;
@@ -312,7 +312,7 @@ static void redrawStaticText(winid_t win, int boatFlag) {
 	}
 
 	if (win == _G(_battleRight)) {
-		glui32 width;
+		uint width;
 		g_scott->glk_window_get_size(_G(_battleRight), &width, 0);
 		g_scott->glk_window_move_cursor(_G(_battleRight), width - 6, 1);
 		g_scott->glk_put_string("YOU");
@@ -320,7 +320,8 @@ static void redrawStaticText(winid_t win, int boatFlag) {
 }
 
 static void redrawBattleScreen(int boatFlag) {
-	glui32 graphwidth, graphheight, optimal_width, optimal_height;
+	uint graphwidth, graphheight;
+	glui32 optimal_width, optimal_height;
 
 	g_scott->glk_window_get_size(_G(_leftDiceWin), &graphwidth, &graphheight);
 
@@ -517,7 +518,7 @@ void updateResult(int ourTurn, int strike, int stamina, int boatFlag) {
 void clearResult(void) {
 	winid_t win = _G(_topWindow);
 
-	glui32 width;
+	uint width;
 	for (int j = 0; j < 2; j++) {
 		g_scott->glk_window_get_size(win, &width, 0);
 		g_scott->glk_stream_set_current(g_scott->glk_window_get_stream(win));
@@ -533,7 +534,7 @@ void clearResult(void) {
 void clearStamina(void) {
 	winid_t win = _G(_topWindow);
 
-	glui32 width;
+	uint width;
 	for (int j = 0; j < 2; j++) {
 		g_scott->glk_window_get_size(win, &width, 0);
 		g_scott->glk_stream_set_current(g_scott->glk_window_get_stream(win));


Commit: ff950bca8dc203239676b3e2b10ea27ee3856016
    https://github.com/scummvm/scummvm/commit/ff950bca8dc203239676b3e2b10ea27ee3856016
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-06-26T15:55:32+02:00

Commit Message:
WINTERMUTE: Fix build when not compiling WME3D

Changed paths:
    engines/wintermute/ad/ad_scene.cpp


diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index 7c60723e8a3..0c1f3d889c6 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -146,22 +146,22 @@ void AdScene::setDefaults() {
 	_gameRef->registerObject(_fader);
 
 #ifdef ENABLE_WME3D
-	_fov = -1.0f;
-#endif
-	_viewport = nullptr;
-
-	_nearPlane = -1.0f;
-	_farPlane = -1.0f;
+	_ambientLightColor = 0x00000000;
+	_maxShadowType = SHADOW_FLAT;
 
 	_2DPathfinding = false;
-	_maxShadowType = SHADOW_FLAT;
 
-	_ambientLightColor = 0x00000000;
+	_fov = -1.0f;
+	_nearPlane = -1.0f;
+	_farPlane = -1.0f;
 
 	_fogParameters._enabled = false;
 	_fogParameters._color = 0x00FFFFFF;
 	_fogParameters._start = 0.0f;
 	_fogParameters._end = 0.0f;
+#endif
+
+	_viewport = nullptr;
 }