From ea86cf4e628d2a5ee4b627ea650ef9b69ed8fdc1 Mon Sep 17 00:00:00 2001 From: hax0kartik Date: Tue, 23 May 2023 18:52:23 +0530 Subject: [PATCH] CRAB: Fix misc. warnings in the TMX component --- engines/crab/TMX/TMXMap.cpp | 2 +- engines/crab/TMX/TMXTileSet.cpp | 10 +++++----- engines/crab/TMX/TMXTileSet.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/engines/crab/TMX/TMXMap.cpp b/engines/crab/TMX/TMXMap.cpp index 1ccc8a76b2b..1814b2c6ccd 100644 --- a/engines/crab/TMX/TMXMap.cpp +++ b/engines/crab/TMX/TMXMap.cpp @@ -349,7 +349,7 @@ bool TMXMap::InsideWalk(const Vector2i &pos) { } bool TMXMap::CollideWithTrigger(const Rect rect, int index) { - if (area_trig.size() > index) + if (area_trig.size() > (unsigned int)index) return area_trig.at(index).Collide(rect).intersect; return false; diff --git a/engines/crab/TMX/TMXTileSet.cpp b/engines/crab/TMX/TMXTileSet.cpp index b58139656f0..1ca11c6f8a3 100644 --- a/engines/crab/TMX/TMXTileSet.cpp +++ b/engines/crab/TMX/TMXTileSet.cpp @@ -153,9 +153,9 @@ void TileSetGroup::ForceDraw(MapLayer &layer, const Rect &camera, const Vector2i finish.x = (player_pos.y + player_pos.h) / tile_size.y + 1; finish.y = (player_pos.x + player_pos.w) / tile_size.x + 1; - if (finish.x > layer.tile.size()) + if (finish.x > (int)layer.tile.size()) finish.x = layer.tile.size(); - if (finish.y > layer.tile[0].size()) + if (finish.y > (int)layer.tile[0].size()) finish.y = layer.tile.at(0).size(); v.x = start.y * tile_size.x - camera.x; @@ -187,7 +187,7 @@ void TileSetGroup::Draw(MapLayer &layer, const Rect &camera, const Vector2i &til // The row and column we end drawing at finish.x = layer.tile.size() - 1; - finish.y = finish.y = layer.tile.at(0).size() - 1; + finish.y = layer.tile.at(0).size() - 1; v.x = (start.y * tile_size.x - camera.x) * layer.rate.x; v.y = (start.x * tile_size.y - camera.y) * layer.rate.y; @@ -227,9 +227,9 @@ void TileSetGroup::Draw(MapLayer &layer, const Rect &camera, const Vector2i &til finish.x = (camera.y + camera.h) / tile_size.y + 1; finish.y = (camera.x + camera.w) / tile_size.x + 1; - if (finish.x > layer.tile.size()) + if (finish.x > (int)layer.tile.size()) finish.x = layer.tile.size(); - if (finish.y > layer.tile[0].size()) + if (finish.y > (int)layer.tile[0].size()) finish.y = layer.tile.at(0).size(); v.x = camera.x; diff --git a/engines/crab/TMX/TMXTileSet.h b/engines/crab/TMX/TMXTileSet.h index 693dcca2624..f9f4fd34e90 100644 --- a/engines/crab/TMX/TMXTileSet.h +++ b/engines/crab/TMX/TMXTileSet.h @@ -46,7 +46,7 @@ struct TileSet { std::string loc; // The first gid of the tileset - int first_gid; + GidFormat first_gid; // Dimensions of tiles int tile_w, tile_h;