diff options
| -rw-r--r-- | disaster_cmd.c | 6 | ||||
| -rw-r--r-- | misc.c | 6 | ||||
| -rw-r--r-- | ttd.c | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/disaster_cmd.c b/disaster_cmd.c index 197b4d4d4..141d1840f 100644 --- a/disaster_cmd.c +++ b/disaster_cmd.c @@ -178,7 +178,7 @@ static void DisasterTick_Zeppeliner(Vehicle *v) 0); } } - if (v->y_pos >= (MapSizeY() + 9) * 16 - 1) + if (v->y_pos >= ((int)MapSizeY() + 9) * 16 - 1) DeleteDisasterVeh(v); return; } @@ -416,7 +416,7 @@ static void DisasterTick_3(Vehicle *v) GetNewVehiclePos(v, &gp); SetDisasterVehiclePos(v, gp.x, gp.y, v->z_pos); - if (gp.x > MapSizeX() * 16 + 9*16 - 1) { + if (gp.x > (int)MapSizeX() * 16 + 9*16 - 1) { DeleteDisasterVeh(v); return; } @@ -594,7 +594,7 @@ static void DisasterTick_4b(Vehicle *v) GetNewVehiclePos(v, &gp); SetDisasterVehiclePos(v, gp.x, gp.y, v->z_pos); - if (gp.x > MapSizeX() * 16 + 9*16 - 1) { + if (gp.x > (int)MapSizeX() * 16 + 9*16 - 1) { DeleteDisasterVeh(v); return; } @@ -737,10 +737,10 @@ int FindFirstBit(uint32 value) extern uint SafeTileAdd(uint tile, int add, const char *exp, const char *file, int line) { - int x = GET_TILE_X(tile) + (signed char)(add & 0xFF); - int y = GET_TILE_Y(tile) + ((((0x8080 + add)>>8) & 0xFF) - 0x80); + uint x = GET_TILE_X(tile) + (signed char)(add & 0xFF); + uint y = GET_TILE_Y(tile) + ((((0x8080 + add)>>8) & 0xFF) - 0x80); - if (x < 0 || y < 0 || x >= MapSizeX() || y >= MapSizeY()) { + if (x >= MapSizeX() || y >= MapSizeY()) { char buf[512]; sprintf(buf, "TILE_ADD(%s) when adding 0x%.4X and %d failed", exp, tile, add); @@ -1240,8 +1240,6 @@ bool AfterLoadGame(uint version) BEGIN_TILE_LOOP(tile_cur, w, h, tile) if (IS_TILETYPE(tile_cur, MP_WATER) && _map_owner[tile_cur] >= MAX_PLAYERS) _map_owner[tile_cur] = OWNER_WATER; - if (!IS_TILETYPE(tile_cur, MP_WATER) && _map_owner[tile_cur] == OWNER_WATER) - _map_owner[tile_cur] = OWNER_NONE; END_TILE_LOOP(tile_cur, w, h, tile) } |