<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40427 >
Value of the Airlift effect tells how many airlifts city can make in one turn.
- ML
diff -Nurd -X.diff_ignore freeciv/common/city.c freeciv/common/city.c
--- freeciv/common/city.c 2008-08-10 00:17:47.000000000 +0300
+++ freeciv/common/city.c 2008-08-11 18:17:00.000000000 +0300
@@ -2493,7 +2493,7 @@
pcity->shield_stock = 0;
pcity->pollution = 0;
- pcity->airlift = FALSE;
+ pcity->airlift = 0;
pcity->debug = FALSE;
#endif
pcity->did_buy = TRUE; /* You cannot buy production same turn city is
diff -Nurd -X.diff_ignore freeciv/common/city.h freeciv/common/city.h
--- freeciv/common/city.h 2008-07-31 23:27:48.000000000 +0300
+++ freeciv/common/city.h 2008-08-11 18:05:00.000000000 +0300
@@ -318,7 +318,7 @@
int pollution; /* not saved */
/* turn states */
- bool airlift;
+ int airlift;
bool debug; /* not saved */
bool did_buy;
bool did_sell;
diff -Nurd -X.diff_ignore freeciv/common/packets.def freeciv/common/packets.def
--- freeciv/common/packets.def 2008-08-01 23:07:37.000000000 +0300
+++ freeciv/common/packets.def 2008-08-11 18:12:03.000000000 +0300
@@ -538,7 +538,8 @@
UINT16 caravan_shields;
UINT16 last_turns_shield_surplus;
- BOOL airlift, did_buy, did_sell, was_happy;
+ UINT8 airlift;
+ BOOL did_buy, did_sell, was_happy;
BOOL diplomat_investigate;
BOOL walls;
diff -Nurd -X.diff_ignore freeciv/common/unit.c freeciv/common/unit.c
--- freeciv/common/unit.c 2008-08-01 23:07:37.000000000 +0300
+++ freeciv/common/unit.c 2008-08-11 18:17:23.000000000 +0300
@@ -154,7 +154,7 @@
if (city_owner(acity) != city_owner(pcity)) {
return FALSE;
}
- if (!acity->airlift || !pcity->airlift) {
+ if (acity->airlift <= 0 || pcity->airlift <= 0) {
return FALSE;
}
if (!is_ground_unit(punit))
diff -Nurd -X.diff_ignore freeciv/server/cityturn.c freeciv/server/cityturn.c
--- freeciv/server/cityturn.c 2008-07-18 22:08:35.000000000 +0300
+++ freeciv/server/cityturn.c 2008-08-11 18:09:07.000000000 +0300
@@ -1767,7 +1767,7 @@
pcity->did_sell=FALSE;
pcity->did_buy = FALSE;
- pcity->airlift = (get_city_bonus(pcity, EFT_AIRLIFT) > 0);
+ pcity->airlift = get_city_bonus(pcity, EFT_AIRLIFT);
update_tech(pplayer, pcity->prod[O_SCIENCE]);
pplayer->economic.gold+=pcity->prod[O_GOLD];
pay_for_units(pplayer, pcity);
diff -Nurd -X.diff_ignore freeciv/server/savegame.c freeciv/server/savegame.c
--- freeciv/server/savegame.c 2008-08-01 23:07:37.000000000 +0300
+++ freeciv/server/savegame.c 2008-08-11 18:18:51.000000000 +0300
@@ -2244,7 +2244,7 @@
secfile_lookup_int(file, "player%d.c%d.shield_stock", plrno, i);
pcity->airlift =
- secfile_lookup_bool_default(file, FALSE, "player%d.c%d.airlift",
+ secfile_lookup_int_default(file, 0, "player%d.c%d.airlift",
plrno,i);
pcity->was_happy =
secfile_lookup_bool_default(file, FALSE, "player%d.c%d.was_happy",
@@ -3352,7 +3352,7 @@
secfile_insert_int(file, pcity->shield_stock, "player%d.c%d.shield_stock",
plrno, i);
- secfile_insert_bool(file, pcity->airlift, "player%d.c%d.airlift",
+ secfile_insert_int(file, pcity->airlift, "player%d.c%d.airlift",
plrno, i);
secfile_insert_bool(file, pcity->was_happy, "player%d.c%d.was_happy",
plrno, i);
diff -Nurd -X.diff_ignore freeciv/server/unittools.c freeciv/server/unittools.c
--- freeciv/server/unittools.c 2008-07-18 22:08:35.000000000 +0300
+++ freeciv/server/unittools.c 2008-08-11 18:09:52.000000000 +0300
@@ -2092,8 +2092,8 @@
if (get_transporter_occupancy(punit) > 0) {
return FALSE;
}
- city1->airlift = FALSE;
- city2->airlift = FALSE;
+ city1->airlift--;
+ city2->airlift--;
notify_player(unit_owner(punit), city2->tile, E_UNIT_RELOCATED,
_("%s transported successfully."),
diff -Nurd -X.diff_ignore freeciv/version.in freeciv/version.in
--- freeciv/version.in 2008-08-01 23:07:38.000000000 +0300
+++ freeciv/version.in 2008-08-11 18:04:44.000000000 +0300
@@ -23,5 +23,5 @@
# - Avoid adding a new mandatory capability to the development branch for
# as long as possible. We want to maintain network compatibility with
# the stable branch for as long as possible.
-NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel.2008.Aug.01"
+NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel.2008.Aug.11"
NETWORK_CAPSTRING_OPTIONAL=""
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
