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

[digitall]

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

Summary:
a168244466 FREESCAPE: Fix GCC Compiler Warnings


Commit: a168244466daae388bdb0a3af57d316af5422949
    https://github.com/scummvm/scummvm/commit/a168244466daae388bdb0a3af57d316af5422949
Author: D G Turner (digitall at scummvm.org)
Date: 2023-01-07T14:36:18Z

Commit Message:
FREESCAPE: Fix GCC Compiler Warnings

Changed paths:
    engines/freescape/games/driller.cpp
    engines/freescape/gfx.cpp


diff --git a/engines/freescape/games/driller.cpp b/engines/freescape/games/driller.cpp
index dacfb2806bf..1a0390e4eb2 100644
--- a/engines/freescape/games/driller.cpp
+++ b/engines/freescape/games/driller.cpp
@@ -402,9 +402,9 @@ Common::SeekableReadStream *parseEDSK(const Common::String filename) {
 	if (0) { // Useful to debug where exactly each object is located in memory once it is parsed
 		i = 0;
 		while(i < j) {
-			debugN("%0.5x: ", i);
+			debugN("%05x: ", i);
 			for (int k = 0; k <= 16; k++) {
-				debugN("%0.2x ", memBuffer[i]);
+				debugN("%02x ", memBuffer[i]);
 				i++;
 			}
 			debugN("\n");
diff --git a/engines/freescape/gfx.cpp b/engines/freescape/gfx.cpp
index 17f6c16013d..87514d6f3cc 100644
--- a/engines/freescape/gfx.cpp
+++ b/engines/freescape/gfx.cpp
@@ -113,6 +113,8 @@ void Renderer::extractC64Indexes(uint8 cm1, uint8 cm2, uint8 &i1, uint8 &i2) {
 	} else if (cm1 == 0x41 && cm2 == 0x52) {
 		i1 = 0;
 		i2 = 3;
+// Covered by the default of i1 = 0, i2 = 0
+#if 0
 	} else if (cm1 == 0x5a && cm2 == 0xa5) {
 		i1 = 0;
 		i2 = 0;
@@ -125,6 +127,7 @@ void Renderer::extractC64Indexes(uint8 cm1, uint8 cm2, uint8 &i1, uint8 &i2) {
 	} else if (cm1 == 0xfb && cm2 == 0xfe) {
 		i1 = 0;
 		i2 = 0;
+#endif
 	} else {
 		i1 = 0;
 		i2 = 0;