Author: sveinung Date: Fri Feb 3 14:56:07 2017 New Revision: 34946 URL: http://svn.gna.org/viewcvs/freeciv?rev=34946&view=rev Log: Demote walk-through-enemy assertion to a warning.
A player can now give a "Go to and..." order while assuming that the enemy at the tile the last regular move targets will be gone or converted by the time the unit reaches it. Reported by Christian Knoke <chrisk> See patch #8101 Modified: trunk/client/goto.c Modified: trunk/client/goto.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/goto.c?rev=34946&r1=34945&r2=34946&view=diff ============================================================================== --- trunk/client/goto.c (original) +++ trunk/client/goto.c Fri Feb 3 14:56:07 2017 @@ -1419,13 +1419,12 @@ * caller hope that the situation would change before the unit got * there? */ - /* No current final order user should try to walk through non allied - * units or cities. */ - fc_assert_msg(!is_non_allied_city_tile(old_tile, client_player()) - && !is_non_allied_unit_tile(old_tile, - client_player()), - "Warning: unit or city blocks the path of your %s", - unit_rule_name(punit)); + /* It's currently illegal to walk into tiles with non allied units or + * cities. Some actions causes the actor to enter the target tile but + * that is a part of the action it self, not a regular pre action + * move. */ + log_verbose("unit or city blocks the path of your %s", + unit_rule_name(punit)); } } _______________________________________________ Freeciv-commits mailing list Freecivemail@example.com https://mail.gna.org/listinfo/freeciv-commits