[Freeciv-commits] r33964 - /trunk/INSTALL
Author: cazfi
Date: Mon Oct 3 05:49:59 2016
New Revision: 33964
URL: http://svn.gna.org/viewcvs/freeciv?rev=33964=rev
Log:
Corrected minimum gtk3x-client requirements in INSTALL
See patch #7746
Modified:
trunk/INSTALL
Modified: trunk/INSTALL
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/INSTALL?rev=33964=33963=33964=diff
==
--- trunk/INSTALL (original)
+++ trunk/INSTALL Mon Oct 3 05:49:59 2016
@@ -111,7 +111,7 @@
The Freeciv client comes in the following forms:
* Gtk+ 2.0 widget library ("Gtk+ 2.0").
* Gtk+ 3.0 widget library ("Gtk+ 3.0").
-* Gtk+ 3.0 widget library, latest versions ("Gtk+ 3.x")
+* Gtk+ 3.0 widget library, current versions ("Gtk+ 3.x")
* SDL2
* Qt
@@ -275,12 +275,12 @@
The "Glib" utility library provides non-graphical functions used by the
"Gdk" and "Gtk+" libraries, like hash tables, single linked lists, etc.
- Freeciv requires a version of "Glib" greater or equal to 2.36
+ Freeciv requires a version of "Glib" greater or equal to 2.46
If the Freeciv configure process tells you that you don't have the
Glib library installed, then it may be obtained from here:
- http://ftp.gnome.org/pub/gnome/sources/glib/2.46/glib-2.46.2.tar.xz
+ http://ftp.gnome.org/pub/gnome/sources/glib/2.48/glib-2.48.2.tar.xz
- The "Atk" accessibility library.
@@ -315,12 +315,12 @@
Provides an abstraction layer over X-Windows/LinuxFB/Win32 to implement
basic drawing functions, windows, clipping, etc.
- Freeciv requires a version of "Gtk+" greater or equal to 3.14.0.
+ Freeciv requires a version of "Gtk+" greater or equal to 3.18.0.
If the Freeciv configure process tells you that you don't have the
Gtk+ library installed, then it may be obtained from here:
- http://ftp.gnome.org/pub/gnome/sources/gtk+/3.18/gtk+-3.18.6.tar.xz
+ http://ftp.gnome.org/pub/gnome/sources/gtk+/3.20/gtk+-3.20.9.tar.xz
"Gtk+" depends on the "Glib", "Atk", "Gdk-Pixbuf", and "Pango" libraries.
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33963 - in /trunk: ./ client/ common/ common/networking/ data/alien/ data/civ1/ data/civ2/ data/civ2civ3/ data/classic/ dat...
Author: cazfi
Date: Sun Oct 2 19:12:17 2016
New Revision: 33963
URL: http://svn.gna.org/viewcvs/freeciv?rev=33963=rev
Log:
Added support for helptexts for goods.
See patch #7741
Modified:
trunk/client/helpdata.c
trunk/client/packhand.c
trunk/common/networking/packets.def
trunk/common/traderoutes.c
trunk/common/traderoutes.h
trunk/data/alien/game.ruleset
trunk/data/civ1/game.ruleset
trunk/data/civ2/game.ruleset
trunk/data/civ2civ3/game.ruleset
trunk/data/classic/game.ruleset
trunk/data/experimental/game.ruleset
trunk/data/multiplayer/game.ruleset
trunk/data/ruledit/comments.txt
trunk/data/sandbox/game.ruleset
trunk/data/stub/game.ruleset
trunk/data/webperimental/game.ruleset
trunk/fc_version
trunk/server/ruleset.c
trunk/tools/ruleutil/rulesave.c
Modified: trunk/client/helpdata.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/helpdata.c?rev=33963=33962=33963=diff
==
--- trunk/client/helpdata.c (original)
+++ trunk/client/helpdata.c Sun Oct 2 19:12:17 2016
@@ -2819,13 +2819,11 @@
fc_assert_ret(NULL != buf && 0 < bufsz);
buf[0] = '\0';
- /*
if (NULL != pgood->helptext) {
strvec_iterate(pgood->helptext, text) {
cat_snprintf(buf, bufsz, "%s\n\n", _(text));
} strvec_iterate_end;
}
- */
cat_snprintf(buf, bufsz, _("Sending city enjoys %d%% income from the
route.\n"),
pgood->from_pct);
Modified: trunk/client/packhand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/packhand.c?rev=33963=33962=33963=diff
==
--- trunk/client/packhand.c (original)
+++ trunk/client/packhand.c Sun Oct 2 19:12:17 2016
@@ -3944,6 +3944,8 @@
pgood->from_pct = p->from_pct;
pgood->to_pct = p->to_pct;
pgood->flags = p->flags;
+
+ PACKET_STRVEC_EXTRACT(pgood->helptext, p->helptext);
}
/**
Modified: trunk/common/networking/packets.def
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/networking/packets.def?rev=33963=33962=33963=diff
==
--- trunk/common/networking/packets.def (original)
+++ trunk/common/networking/packets.def Sun Oct 2 19:12:17 2016
@@ -1701,6 +1701,7 @@
UINT16 from_pct;
UINT16 to_pct;
BV_GOODS_FLAGS flags;
+ STRVEC helptext[MAX_LEN_PACKET];
end
PACKET_RULESET_DISASTER = 224; sc, lsend
Modified: trunk/common/traderoutes.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/traderoutes.c?rev=33963=33962=33963=diff
==
--- trunk/common/traderoutes.c (original)
+++ trunk/common/traderoutes.c Sun Oct 2 19:12:17 2016
@@ -429,6 +429,7 @@
requirement_vector_init(&(goods[i].reqs));
goods[i].disabled = FALSE;
+goods[i].helptext = NULL;
}
}
@@ -441,6 +442,11 @@
for (i = 0; i < MAX_GOODS_TYPES; i++) {
requirement_vector_free(&(goods[i].reqs));
+
+if (NULL != goods[i].helptext) {
+ strvec_destroy(goods[i].helptext);
+ goods[i].helptext = NULL;
+}
}
}
Modified: trunk/common/traderoutes.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/traderoutes.h?rev=33963=33962=33963=diff
==
--- trunk/common/traderoutes.h (original)
+++ trunk/common/traderoutes.h Sun Oct 2 19:12:17 2016
@@ -176,6 +176,8 @@
int to_pct;
bv_goods_flags flags;
+
+ struct strvec *helptext;
};
void goods_init(void);
Modified: trunk/data/alien/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/game.ruleset?rev=33963=33962=33963=diff
==
--- trunk/data/alien/game.ruleset (original)
+++ trunk/data/alien/game.ruleset Sun Oct 2 19:12:17 2016
@@ -776,6 +776,8 @@
; - "Depletes" = Trade route gets cancelled when the source city
cannot provide
; goods any more. Bidirectional routes gets
cancelled if either
; one of the involved cities cannot provide goods.
+; helptext= Optional help text string; should escape all raw
+; newlines so that xgettext parsing works
;
; */ <-- avoid gettext warnings
Modified: trunk/data/civ1/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/game.ruleset?rev=33963=33962=33963=diff
==
--- trunk/data/civ1/game.ruleset(original)
+++ trunk/data/civ1/game.rulesetSun Oct 2 19:12:17 2016
@@ -770,6 +770,8 @@
; - "Depletes" = Trade route gets cancelled when the source city
cannot provide
;
[Freeciv-commits] r33962 - /branches/S2_6/win32/installer_msys2/Makefile
Author: cazfi Date: Sun Oct 2 09:24:35 2016 New Revision: 33962 URL: http://svn.gna.org/viewcvs/freeciv?rev=33962=rev Log: Build Ruledit-installer as part of msys2 based Windows Installer snapshot build. See patch #7738 Modified: branches/S2_6/win32/installer_msys2/Makefile Modified: branches/S2_6/win32/installer_msys2/Makefile URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/Makefile?rev=33962=33961=33962=diff == --- branches/S2_6/win32/installer_msys2/Makefile(original) +++ branches/S2_6/win32/installer_msys2/MakefileSun Oct 2 09:24:35 2016 @@ -37,9 +37,9 @@ all: gtk3-installer gtk2-installer sdl2-installer qt-installer ruledit-installer # These are what can be built in current official environment version -buildable-win32: gtk3-installer sdl2-installer - -buildable-win64: gtk3-installer sdl2-installer +buildable-win32: gtk3-installer sdl2-installer ruledit-installer + +buildable-win64: gtk3-installer sdl2-installer ruledit-installer # See comments on 'snapshot' target why this wrapping is needed buildable: buildable-$(WINARCH) ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33961 - /trunk/windows/installer_msys2/Makefile
Author: cazfi Date: Sun Oct 2 09:24:30 2016 New Revision: 33961 URL: http://svn.gna.org/viewcvs/freeciv?rev=33961=rev Log: Build Ruledit-installer as part of msys2 based Windows Installer snapshot build. See patch #7738 Modified: trunk/windows/installer_msys2/Makefile Modified: trunk/windows/installer_msys2/Makefile URL: http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_msys2/Makefile?rev=33961=33960=33961=diff == --- trunk/windows/installer_msys2/Makefile (original) +++ trunk/windows/installer_msys2/Makefile Sun Oct 2 09:24:30 2016 @@ -40,9 +40,9 @@ make GUI=gtk3x FCMP=gtk3x EXTRA_CONFIG="--disable-ruledit $(EXTRA_CONFIG)" wrap-gtk3x # These are what can be built in current official environment version -buildable-win32: gtk3-installer gtk3x-installer sdl2-installer - -buildable-win64: gtk3-installer gtk3x-installer sdl2-installer +buildable-win32: gtk3-installer gtk3x-installer sdl2-installer ruledit-installer + +buildable-win64: gtk3-installer gtk3x-installer sdl2-installer ruledit-installer # See comments on 'snapshot' target why this wrapping is needed buildable: buildable-$(WINARCH) ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33959 - /branches/S2_6/server/unithand.c
Author: cazfi
Date: Sun Oct 2 08:00:08 2016
New Revision: 33959
URL: http://svn.gna.org/viewcvs/freeciv?rev=33959=rev
Log:
Do not try to make 'disband' act like 'help wonder' for caravans.
Reported by Sveinung Kvilhaugsvik
See bug #23911
Modified:
branches/S2_6/server/unithand.c
Modified: branches/S2_6/server/unithand.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/unithand.c?rev=33959=33958=33959=diff
==
--- branches/S2_6/server/unithand.c (original)
+++ branches/S2_6/server/unithand.c Sun Oct 2 08:00:08 2016
@@ -1615,24 +1615,11 @@
* Note: Nowadays it's possible to disband unit in allied city and
* your ally receives those shields. Should it be like this? Why not?
* That's why we must use city_owner instead of pplayer -- Zamar */
-
-if (unit_can_do_action(punit, ACTION_HELP_WONDER)) {
- /* Count this just like a caravan that was added to a wonder.
- * However don't actually give the city the extra shields unless
- * they are building a wonder (but switching to a wonder later in
- * the turn will give the extra shields back). */
- pcity->caravan_shields += unit_build_shield_cost(punit);
- if (is_action_enabled_unit_on_city(ACTION_HELP_WONDER,
- punit, pcity)) {
- pcity->shield_stock += unit_build_shield_cost(punit);
- } else {
- pcity->shield_stock += unit_disband_shields(punit);
- }
-} else {
- pcity->shield_stock += unit_disband_shields(punit);
- /* If we change production later at this turn. No penalty is added. */
- pcity->disbanded_shields += unit_disband_shields(punit);
-}
+int shields = unit_disband_shields(punit);
+
+pcity->shield_stock += shields;
+/* If we change production later at this turn. No penalty is added. */
+pcity->disbanded_shields += shields;
send_city_info(city_owner(pcity), pcity);
}
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33958 - /trunk/server/unithand.c
Author: cazfi
Date: Sun Oct 2 07:59:59 2016
New Revision: 33958
URL: http://svn.gna.org/viewcvs/freeciv?rev=33958=rev
Log:
Do not try to make 'disband' act like 'help wonder' for caravans.
Reported by Sveinung Kvilhaugsvik
See bug #23911
Modified:
trunk/server/unithand.c
Modified: trunk/server/unithand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/unithand.c?rev=33958=33957=33958=diff
==
--- trunk/server/unithand.c (original)
+++ trunk/server/unithand.c Sun Oct 2 07:59:59 2016
@@ -2561,6 +2561,8 @@
struct unit *punit,
struct city *pcity)
{
+ int shields;
+
/* Sanity check: The actor still exists. */
fc_assert_ret_val(pplayer, FALSE);
fc_assert_ret_val(punit, FALSE);
@@ -2568,19 +2570,14 @@
/* Sanity check: The target city still exists. */
fc_assert_ret_val(pcity, FALSE);
+ shields = unit_disband_shields(punit);
+
/* Add the shields from recycling the unit to the city's current
* production. */
- pcity->shield_stock += unit_disband_shields(punit);
-
- if (unit_can_do_action(punit, ACTION_HELP_WONDER)) {
-/* Count this just like a caravan that was added to a wonder.
- * However don't actually give the city the extra shields. Switching
- * to a wonder later in the turn will give the extra shields back. */
-pcity->caravan_shields += unit_build_shield_cost(punit);
- } else {
-/* If we change production later at this turn. No penalty is added. */
-pcity->disbanded_shields += unit_disband_shields(punit);
- }
+ pcity->shield_stock += shields;
+
+ /* If we change production later at this turn. No penalty is added. */
+ pcity->disbanded_shields += shields;
notify_player(pplayer, city_tile(pcity), E_CARAVAN_ACTION, ftc_server,
/* TRANS: ... Ironclad ... New York */
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
