Merge pull request #2672 from Brickcaster/patch-1

Fix for world_to_map() with negative coords.  Fixes issue #2665
This commit is contained in:
Juan Linietsky 2015-11-18 19:07:53 -03:00
commit d38fd747ab

View file

@ -1031,13 +1031,12 @@ Vector2 TileMap::world_to_map(const Vector2& p_pos) const{
switch(half_offset) { switch(half_offset) {
case HALF_OFFSET_X: { case HALF_OFFSET_X: {
if (int(ret.y)&1) { if ( ret.y > 0 ? int(ret.y)&1 : (int(ret.y)-1)&1 ) {
ret.x-=0.5; ret.x-=0.5;
} }
} break; } break;
case HALF_OFFSET_Y: { case HALF_OFFSET_Y: {
if (int(ret.x)&1) { if ( ret.x > 0 ? int(ret.x)&1 : (int(ret.x)-1)&1) {
ret.y-=0.5; ret.y-=0.5;
} }
} break; } break;