GOT: Further x64 warning fixes

tag2015 · Jan 12, 2025 · 860070f · 860070f
1 parent b3564a1
commit 860070f
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/engines/got/game/special_tile.cpp b/engines/got/game/special_tile.cpp
@@ -151,8 +151,10 @@ int special_tile_thor(int x, int y, int icon) {
         return 0;
     case 218:
     case 219:
+		// Hole tiles
         f = 1;
-    case 220:     // Hole tiles
+		// fall through
+    case 220:
     case 221:
     case 222:
     case 223:
@@ -162,6 +164,7 @@ int special_tile_thor(int x, int y, int icon) {
     case 227:
     case 228:
     case 229:
+		// Hole tiles
         cx = (_G(thor_x1) + 7) / 16;
         cy = (_G(thor_real_y1) + 8) / 16;
         if (_G(scrn).icon[cy][cx] == icon) {

diff --git a/engines/got/gfx/font.cpp b/engines/got/gfx/font.cpp
@@ -61,7 +61,7 @@ void Font::drawString(Graphics::ManagedSurface *src, const Common::Point &pos,
             } else {
                 ch = toupper(ch) - 55;
             }
-            color = DIALOG_COLOR[ch];
+            color = DIALOG_COLOR[(byte)ch];
             continue;
         }
         if (ch > 31 && ch < 127)

diff --git a/engines/got/utils/file.cpp b/engines/got/utils/file.cpp
@@ -25,8 +25,6 @@
 
 namespace Got {
 
-static const char *gotres = "GOTRES.00";
-
 bool File::open(const Common::Path &filename) {
     if (!Common::File::open(filename))
         error("Could not open - %s", filename.baseName().c_str());

diff --git a/engines/got/views/credits.cpp b/engines/got/views/credits.cpp
@@ -45,7 +45,7 @@ void Credits::draw() {
     GfxSurface s = getSurface();
 
     // Draw scroll background
-    Graphics::ManagedSurface bg = _G(gfx)[42];
+    const Graphics::ManagedSurface &bg = _G(gfx)[42];
     s.clear(*(byte *)bg.getPixels());
     s.simpleBlitFrom(bg, Common::Point(0, 24));
 

diff --git a/engines/got/views/dialogs/say.cpp b/engines/got/views/dialogs/say.cpp
@@ -26,8 +26,6 @@ namespace Got {
 namespace Views {
 namespace Dialogs {
 
-#define _HRZSP 24
-
 Say::Say() : Dialog("Say") {
     setBounds(Common::Rect(32, 48, 288, 160));
 }

diff --git a/engines/got/views/game_status.cpp b/engines/got/views/game_status.cpp
@@ -74,7 +74,7 @@ void GameStatus::displayJewels(GfxSurface &s) {
 }
 
 void GameStatus::displayScore(GfxSurface &s) {
-    Common::String str = Common::String::format("%d", _G(thor_info).score);
+    Common::String str = Common::String::format("%ld", _G(thor_info).score);
     int x = 276 - (str.size() * 8);
 
     s.fillRect(Common::Rect(223, 32, 279, 42), STAT_COLOR);