Author: pepeto
Date: Fri Oct 24 18:42:30 2014
New Revision: 26855
URL: http://svn.gna.org/viewcvs/freeciv?rev=26855&view=rev
Log:
Really Send the move of the cargo units when a transporter moves adjacently,
even if the units are no more visible at destination. It was causing assertion
failures on client side, complaining about different positions between the
transporter and its cargo.
See gna bug #22852
Modified:
branches/S2_5/server/unittools.c
Modified: branches/S2_5/server/unittools.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/unittools.c?rev=26855&r1=26854&r2=26855&view=diff
==============================================================================
--- branches/S2_5/server/unittools.c (original)
+++ branches/S2_5/server/unittools.c Fri Oct 24 18:42:30 2014
@@ -3538,8 +3538,10 @@
|| (aplayer == NULL && pconn->observer)) {
send_packet_unit_info(pconn, &dest_info);
} else if (aplayer != NULL
- && BV_ISSET(pmove_data->can_see_unit_at_dest,
- player_index(aplayer))) {
+ && (BV_ISSET(pmove_data->can_see_unit_at_dest,
+ player_index(aplayer))
+ || (adj && BV_ISSET(pmove_data->can_see_unit_at_src,
+ player_index(aplayer))))) {
send_packet_unit_short_info(pconn, &dest_sinfo);
}
} conn_list_iterate_end;
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
