mirror of
https://github.com/scummvm/scummvm.git
synced 2026-06-20 05:45:29 +00:00
CRAB: Fix misc. warnings in the TMX component
This commit is contained in:
1 parent
afd30a0e8e
commit
ea86cf4e62
3 files changed
+7
-7
No files matched your search
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user