Author: cazfi
Date: Fri Mar 14 18:36:47 2014
New Revision: 24671
URL: http://svn.gna.org/viewcvs/freeciv?rev=24671&view=rev
Log:
Removed assert working against unit classes other than land moving ones from
having "ZOC" flag.
See bug #21777
Modified:
branches/S2_4/server/advisors/advgoto.c
Modified: branches/S2_4/server/advisors/advgoto.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/server/advisors/advgoto.c?rev=24671&r1=24670&r2=24671&view=diff
==============================================================================
--- branches/S2_4/server/advisors/advgoto.c (original)
+++ branches/S2_4/server/advisors/advgoto.c Fri Mar 14 18:36:47 2014
@@ -164,13 +164,13 @@
**************************************************************************/
static bool adv_could_be_my_zoc(struct unit *myunit, struct tile *ptile)
{
- fc_assert_ret_val(is_ground_unit(myunit), TRUE);
-
- if (same_pos(ptile, unit_tile(myunit)))
+ if (same_pos(ptile, unit_tile(myunit))) {
return FALSE; /* can't be my zoc */
+ }
if (is_tiles_adjacent(ptile, unit_tile(myunit))
- && !is_non_allied_unit_tile(ptile, unit_owner(myunit)))
+ && !is_non_allied_unit_tile(ptile, unit_owner(myunit))) {
return FALSE;
+ }
adjc_iterate(ptile, atile) {
if (!is_ocean_tile(atile)
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
