From f60f39c8533270982f256964088640784fcac305 Mon Sep 17 00:00:00 2001 From: Roman C Date: Thu, 3 Apr 2008 22:00:14 +0000 Subject: [PATCH] Fix one one the possible reasons for "SendDroidMove: Invalid move order" assert. git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4473 4a71c877-e1ca-e34f-864e-861f7616d084 --- src/map.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/map.h b/src/map.h index f08037d04..8d4e1c187 100644 --- a/src/map.h +++ b/src/map.h @@ -190,10 +190,11 @@ static inline int32_t map_coord(int32_t worldCoord) */ static inline void clip_world_offmap(int* worldX, int* worldY) { - *worldX = MAX(0, *worldX); - *worldY = MAX(0, *worldY); - *worldX = MIN(world_coord(mapWidth), *worldX); - *worldY = MIN(world_coord(mapHeight), *worldY); + // x,y must be > 0 + *worldX = MAX(1, *worldX); + *worldY = MAX(1, *worldY); + *worldX = MIN(world_coord(mapWidth) - 1, *worldX); + *worldY = MIN(world_coord(mapHeight) - 1, *worldY); } /* maps a position down to the corner of a tile */