Author: cazfi Date: Thu Sep 10 21:25:11 2015 New Revision: 29852 URL: http://svn.gna.org/viewcvs/freeciv?rev=29852&view=rev Log: Do not call is_valid_dir() with invalid direction when unit sprite facing random direction is requested.
See bug #23863 Modified: trunk/client/tilespec.c trunk/common/map.c Modified: trunk/client/tilespec.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/tilespec.c?rev=29852&r1=29851&r2=29852&view=diff ============================================================================== --- trunk/client/tilespec.c (original) +++ trunk/client/tilespec.c Thu Sep 10 21:25:11 2015 @@ -5738,7 +5738,7 @@ fc_assert_ret_val(NULL != punittype, NULL); - if (!is_valid_dir(facing)) { + if (!direction8_is_valid(facing) || !is_valid_dir(facing)) { /* Fallback to using random orientation sprite. */ facing = rand_direction(); } Modified: trunk/common/map.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/map.c?rev=29852&r1=29851&r2=29852&view=diff ============================================================================== --- trunk/common/map.c (original) +++ trunk/common/map.c Thu Sep 10 21:25:11 2015 @@ -1207,7 +1207,7 @@ **************************************************************************/ bool is_valid_dir(enum direction8 dir) { - fc_assert_ret_val(dir >= 0 && dir < 8, FALSE); + fc_assert_ret_val(direction8_is_valid(dir), FALSE); return dir_validity[dir]; } @@ -1247,7 +1247,7 @@ **************************************************************************/ bool is_cardinal_dir(enum direction8 dir) { - fc_assert_ret_val(dir >= 0 && dir < 8, FALSE); + fc_assert_ret_val(direction8_is_valid(dir), FALSE); return dir_cardinality[dir]; } _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits