[Freeciv-commits] r28801 - /trunk/client/packhand.c
Author: jtn
Date: Fri Apr 17 18:30:57 2015
New Revision: 28801
URL: http://svn.gna.org/viewcvs/freeciv?rev=28801view=rev
Log:
Fix/improve comments about how cargo and transporters are knitted
together in the client.
Modified:
trunk/client/packhand.c
Modified: trunk/client/packhand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/packhand.c?rev=28801r1=28800r2=28801view=diff
==
--- trunk/client/packhand.c (original)
+++ trunk/client/packhand.c Fri Apr 17 18:30:57 2015
@@ -1657,7 +1657,9 @@
repaint_unit = !unit_transported(punit);
agents_unit_new(punit);
-/* Check if we should link cargo units. */
+/* Check if we should link cargo units.
+ * (This might be necessary if the cargo info was sent to us before
+ * this transporter.) */
if (punit-client.occupied) {
unit_list_iterate(unit_tile(punit)-units, aunit) {
if (aunit-client.transported_by == punit-id) {
@@ -1682,9 +1684,9 @@
struct unit *ptrans
= game_unit_by_number(packet_unit-client.transported_by);
-/* Load unit only if transporter is known by the client. For full
- * unit info the transporter should be known. See recursive sending
- * of transporter information in send_unit_info_to_onlookers(). */
+/* Load unit only if transporter is known by the client.
+ * (If not, cargo will be loaded later when the transporter info is
+ * sent to the client.) */
if (ptrans ptrans != unit_transport_get(punit)) {
/* First, we have to unload the unit from its old transporter. */
unit_transport_unload(punit);
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28800 - /branches/S2_6/client/packhand.c
Author: jtn
Date: Fri Apr 17 18:19:22 2015
New Revision: 28800
URL: http://svn.gna.org/viewcvs/freeciv?rev=28800view=rev
Log:
Fix/improve comments about how cargo and transporters are knitted
together in the client.
Modified:
branches/S2_6/client/packhand.c
Modified: branches/S2_6/client/packhand.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/packhand.c?rev=28800r1=28799r2=28800view=diff
==
--- branches/S2_6/client/packhand.c (original)
+++ branches/S2_6/client/packhand.c Fri Apr 17 18:19:22 2015
@@ -1657,7 +1657,9 @@
repaint_unit = !unit_transported(punit);
agents_unit_new(punit);
-/* Check if we should link cargo units. */
+/* Check if we should link cargo units.
+ * (This might be necessary if the cargo info was sent to us before
+ * this transporter.) */
if (punit-client.occupied) {
unit_list_iterate(unit_tile(punit)-units, aunit) {
if (aunit-client.transported_by == punit-id) {
@@ -1682,9 +1684,9 @@
struct unit *ptrans
= game_unit_by_number(packet_unit-client.transported_by);
-/* Load unit only if transporter is known by the client. For full
- * unit info the transporter should be known. See recursive sending
- * of transporter information in send_unit_info_to_onlookers(). */
+/* Load unit only if transporter is known by the client.
+ * (If not, cargo will be loaded later when the transporter info is
+ * sent to the client.) */
if (ptrans ptrans != unit_transport_get(punit)) {
/* First, we have to unload the unit from its old transporter. */
unit_transport_unload(punit);
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28803 - /branches/S2_6/translations/freeciv/fi.po
Author: cazfi Date: Sat Apr 18 00:28:17 2015 New Revision: 28803 URL: http://svn.gna.org/viewcvs/freeciv?rev=28803view=rev Log: Updated Finnish translation. This is just S2_5 translation msgmerged against latest S2_6 strings. Modified: branches/S2_6/translations/freeciv/fi.po [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/S2_6/translations/freeciv/fi.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/freeciv/fi.po?rev=28803r1=28802r2=28803view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28804 - /trunk/translations/freeciv/fi.po
Author: cazfi Date: Sat Apr 18 00:28:31 2015 New Revision: 28804 URL: http://svn.gna.org/viewcvs/freeciv?rev=28804view=rev Log: Updated Finnish translation. This is just S2_5 translation msgmerged against latest TRUNK strings. Modified: trunk/translations/freeciv/fi.po [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/translations/freeciv/fi.po URL: http://svn.gna.org/viewcvs/freeciv/trunk/translations/freeciv/fi.po?rev=28804r1=28803r2=28804view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28802 - /branches/S2_5/translations/freeciv/fi.po
Author: cazfi Date: Sat Apr 18 00:27:58 2015 New Revision: 28802 URL: http://svn.gna.org/viewcvs/freeciv?rev=28802view=rev Log: Updated Finnish translation. Modified: branches/S2_5/translations/freeciv/fi.po [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/S2_5/translations/freeciv/fi.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/fi.po?rev=28802r1=28801r2=28802view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
