[Freeciv-commits] r27472 - in /trunk/translations: freeciv/ nations/ ruledit/
Author: cazfi Date: Thu Jan 1 23:10:27 2015 New Revision: 27472 URL: http://svn.gna.org/viewcvs/freeciv?rev=27472view=rev Log: Msgmerged po-files against latest pot-files before branching S2_6 Modified: trunk/translations/freeciv/ar.po trunk/translations/freeciv/bg.po trunk/translations/freeciv/ca.po trunk/translations/freeciv/cs.po trunk/translations/freeciv/da.po trunk/translations/freeciv/de.po trunk/translations/freeciv/el.po trunk/translations/freeciv/en_GB.po trunk/translations/freeciv/eo.po trunk/translations/freeciv/es.po trunk/translations/freeciv/et.po trunk/translations/freeciv/fa.po trunk/translations/freeciv/fi.po trunk/translations/freeciv/fr.po trunk/translations/freeciv/ga.po trunk/translations/freeciv/gd.po trunk/translations/freeciv/he.po trunk/translations/freeciv/hu.po trunk/translations/freeciv/id.po trunk/translations/freeciv/it.po trunk/translations/freeciv/ja.po trunk/translations/freeciv/ko.po trunk/translations/freeciv/lt.po trunk/translations/freeciv/nb.po trunk/translations/freeciv/nl.po trunk/translations/freeciv/pl.po trunk/translations/freeciv/pt.po trunk/translations/freeciv/pt_BR.po trunk/translations/freeciv/ro.po trunk/translations/freeciv/ru.po trunk/translations/freeciv/sr.po trunk/translations/freeciv/sv.po trunk/translations/freeciv/tr.po trunk/translations/freeciv/uk.po trunk/translations/freeciv/zh_CN.po trunk/translations/freeciv/zh_TW.po trunk/translations/nations/ar.po trunk/translations/nations/bg.po trunk/translations/nations/ca.po trunk/translations/nations/cs.po trunk/translations/nations/da.po trunk/translations/nations/de.po trunk/translations/nations/el.po trunk/translations/nations/en_GB.po trunk/translations/nations/eo.po trunk/translations/nations/es.po trunk/translations/nations/et.po trunk/translations/nations/fa.po trunk/translations/nations/fi.po trunk/translations/nations/fr.po trunk/translations/nations/ga.po trunk/translations/nations/gd.po trunk/translations/nations/he.po trunk/translations/nations/hu.po trunk/translations/nations/id.po trunk/translations/nations/it.po trunk/translations/nations/ja.po trunk/translations/nations/ko.po trunk/translations/nations/lt.po trunk/translations/nations/nb.po trunk/translations/nations/nl.po trunk/translations/nations/pl.po trunk/translations/nations/pt.po trunk/translations/nations/pt_BR.po trunk/translations/nations/ro.po trunk/translations/nations/ru.po trunk/translations/nations/sr.po trunk/translations/nations/sv.po trunk/translations/nations/tr.po trunk/translations/nations/uk.po trunk/translations/nations/zh_CN.po trunk/translations/nations/zh_TW.po trunk/translations/ruledit/ar.po trunk/translations/ruledit/bg.po trunk/translations/ruledit/ca.po trunk/translations/ruledit/cs.po trunk/translations/ruledit/da.po trunk/translations/ruledit/de.po trunk/translations/ruledit/el.po trunk/translations/ruledit/en_GB.po trunk/translations/ruledit/eo.po trunk/translations/ruledit/es.po trunk/translations/ruledit/et.po trunk/translations/ruledit/fa.po trunk/translations/ruledit/fi.po trunk/translations/ruledit/fr.po trunk/translations/ruledit/ga.po trunk/translations/ruledit/gd.po trunk/translations/ruledit/he.po trunk/translations/ruledit/hu.po trunk/translations/ruledit/id.po trunk/translations/ruledit/it.po trunk/translations/ruledit/ja.po trunk/translations/ruledit/ko.po trunk/translations/ruledit/lt.po trunk/translations/ruledit/nb.po trunk/translations/ruledit/nl.po trunk/translations/ruledit/pl.po trunk/translations/ruledit/pt.po trunk/translations/ruledit/pt_BR.po trunk/translations/ruledit/ro.po trunk/translations/ruledit/ru.po trunk/translations/ruledit/sr.po trunk/translations/ruledit/sv.po trunk/translations/ruledit/tr.po trunk/translations/ruledit/uk.po trunk/translations/ruledit/zh_CN.po trunk/translations/ruledit/zh_TW.po [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/translations/freeciv/ar.po URL: http://svn.gna.org/viewcvs/freeciv/trunk/translations/freeciv/ar.po?rev=27472r1=27471r2=27472view=diff Modified: trunk/translations/freeciv/bg.po URL: http://svn.gna.org/viewcvs/freeciv/trunk/translations/freeciv/bg.po?rev=27472r1=27471r2=27472view=diff Modified: trunk/translations/freeciv/ca.po URL: http://svn.gna.org/viewcvs/freeciv/trunk/translations/freeciv/ca.po?rev=27472r1=27471r2=27472view=diff Modified: trunk/translations/freeciv/cs.po URL: http://svn.gna.org/viewcvs/freeciv/trunk/translations/freeciv/cs.po?rev=27472r1=27471r2=27472view=diff Modified: trunk/translations/freeciv/da.po URL:
[Freeciv-commits] r27471 - in /trunk/client/gui-sdl2: citydlg.c connectdlg.c
Author: cazfi Date: Thu Jan 1 18:11:08 2015 New Revision: 27471 URL: http://svn.gna.org/viewcvs/freeciv?rev=27471view=rev Log: Replaced outcommented and non-working putframe() calls targeted to a renderer with create_frame() calls targeting to a proper surface. See patch #5619 Modified: trunk/client/gui-sdl2/citydlg.c trunk/client/gui-sdl2/connectdlg.c Modified: trunk/client/gui-sdl2/citydlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/citydlg.c?rev=27471r1=27470r2=27471view=diff == --- trunk/client/gui-sdl2/citydlg.c (original) +++ trunk/client/gui-sdl2/citydlg.c Thu Jan 1 18:11:08 2015 @@ -3044,11 +3044,9 @@ fill_rect_alpha(pWindow-dst-surface, dest, get_theme_color(COLOR_THEME_CITYDLG_GRANARY)); -#if 0 -putframe(pWindow-dst-renderer, - dest.x - 1, dest.y - 1, dest.x + dest.w, dest.y + dest.h, - get_theme_color(COLOR_THEME_CITYDLG_FRAME)); -#endif +create_frame(pWindow-dst-surface, + dest.x - 1, dest.y - 1, dest.w, dest.h, + get_theme_color(COLOR_THEME_CITYDLG_FRAME)); /* draw bcgd stocks*/ dest.x = pWindow-size.x + adj_size(550); @@ -3056,11 +3054,9 @@ fill_rect_alpha(pWindow-dst-surface, dest, get_theme_color(COLOR_THEME_CITYDLG_STOCKS)); -#if 0 -putframe(pWindow-dst-renderer, - dest.x - 1, dest.y - 1, dest.x + dest.w, dest.y + dest.h, - get_theme_color(COLOR_THEME_CITYDLG_FRAME)); -#endif +create_frame(pWindow-dst-surface, + dest.x - 1, dest.y - 1, dest.w, dest.h, + get_theme_color(COLOR_THEME_CITYDLG_FRAME)); /* draw stocks icons */ cost = city_granary_size(city_size_get(pCity)); @@ -3151,11 +3147,9 @@ fill_rect_alpha(pWindow-dst-surface, dest, get_theme_color(COLOR_THEME_CITYDLG_FOODSTOCK)); -#if 0 -putframe(pWindow-dst-renderer, - dest.x - 1, dest.y - 1, dest.x + dest.w, dest.y + dest.h, - get_theme_color(COLOR_THEME_CITYDLG_FRAME)); -#endif +create_frame(pWindow-dst-surface, + dest.x - 1, dest.y - 1, dest.w, dest.h, + get_theme_color(COLOR_THEME_CITYDLG_FRAME)); /* draw icons */ cost = city_granary_size(city_size_get(pCity)); @@ -3295,11 +3289,9 @@ fill_rect_alpha(pWindow-dst-surface, dest, get_theme_color(COLOR_THEME_CITYDLG_SHIELDSTOCK)); -#if 0 -putframe(pWindow-dst-renderer, - dest.x - 1, dest.y - 1, dest.x + dest.w, dest.y + dest.h, - get_theme_color(COLOR_THEME_CITYDLG_FRAME)); -#endif +create_frame(pWindow-dst-surface, + dest.x - 1, dest.y - 1, dest.w, dest.h, + get_theme_color(COLOR_THEME_CITYDLG_FRAME)); /* draw production progres text */ dest.y = pWindow-size.y + adj_size(270) + dest.h + 1; Modified: trunk/client/gui-sdl2/connectdlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/connectdlg.c?rev=27471r1=27470r2=27471view=diff == --- trunk/client/gui-sdl2/connectdlg.c (original) +++ trunk/client/gui-sdl2/connectdlg.c Thu Jan 1 18:11:08 2015 @@ -445,20 +445,16 @@ fill_rect_alpha(pWindow-dst-surface, area2, bg_color); -#if 0 - putframe(pWindow-dst-renderer, - area2.x - 1, area2.y - 1, area2.x + area2.w, area2.y + area2.h, - get_theme_color(COLOR_THEME_CONNECTDLG_INNERFRAME)); -#endif + create_frame(pWindow-dst-surface, + area2.x - 1, area2.y - 1, area2.w, area2.h, + get_theme_color(COLOR_THEME_CONNECTDLG_INNERFRAME)); redraw_group(pMeta_Server-pBeginWidgetList, pWindow-prev, 0); -#if 0 - putframe(pWindow-dst-renderer, - pWindow-size.x, pWindow-size.y, - area.x + area.w - 1, area.y + area.h - 1, - get_theme_color(COLOR_THEME_CONNECTDLG_FRAME)); -#endif + create_frame(pWindow-dst-surface, + pWindow-size.x, pWindow-size.y, + area.w - 1, area.h - 1, + get_theme_color(COLOR_THEME_CONNECTDLG_FRAME)); widget_flush(pWindow); } ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27468 - in /branches/S2_5/common: unit.c unit.h
Author: cazfi
Date: Thu Jan 1 09:25:02 2015
New Revision: 27468
URL: http://svn.gna.org/viewcvs/freeciv?rev=27468view=rev
Log:
Made unit_owner() and unit_tile() macros to avoid function call overhead
See patch #5633
Modified:
branches/S2_5/common/unit.c
branches/S2_5/common/unit.h
Modified: branches/S2_5/common/unit.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/unit.c?rev=27468r1=27467r2=27468view=diff
==
--- branches/S2_5/common/unit.c (original)
+++ branches/S2_5/common/unit.c Thu Jan 1 09:25:02 2015
@@ -1630,32 +1630,12 @@
}
/**
- Return the owner of the unit.
-**/
-struct player *unit_owner(const struct unit *punit)
-{
- fc_assert_ret_val(NULL != punit, NULL);
- fc_assert(NULL != punit-owner);
- return punit-owner;
-}
-
-/**
Return the nationality of the unit.
**/
struct player *unit_nationality(const struct unit *punit)
{
fc_assert_ret_val(NULL != punit, NULL);
return punit-nationality;
-}
-
-/**
- Return the tile location of the unit.
- Not (yet) always used, mostly for debugging.
-**/
-struct tile *unit_tile(const struct unit *punit)
-{
- fc_assert_ret_val(NULL != punit, NULL);
- return punit-tile;
}
/*
Modified: branches/S2_5/common/unit.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/unit.h?rev=27468r1=27467r2=27468view=diff
==
--- branches/S2_5/common/unit.h (original)
+++ branches/S2_5/common/unit.h Thu Jan 1 09:25:02 2015
@@ -340,9 +340,9 @@
int get_transporter_capacity(const struct unit *punit);
-struct player *unit_owner(const struct unit *punit);
+#define unit_owner(_pu) ((_pu)-owner)
+#define unit_tile(_pu) ((_pu)-tile)
struct player *unit_nationality(const struct unit *punit);
-struct tile *unit_tile(const struct unit *punit);
void unit_tile_set(struct unit *punit, struct tile *ptile);
struct unit *is_allied_unit_tile(const struct tile *ptile,
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27467 - in /trunk/common: unit.c unit.h
Author: cazfi
Date: Thu Jan 1 09:24:55 2015
New Revision: 27467
URL: http://svn.gna.org/viewcvs/freeciv?rev=27467view=rev
Log:
Made unit_owner() and unit_tile() macros to avoid function call overhead
See patch #5633
Modified:
trunk/common/unit.c
trunk/common/unit.h
Modified: trunk/common/unit.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/unit.c?rev=27467r1=27466r2=27467view=diff
==
--- trunk/common/unit.c (original)
+++ trunk/common/unit.c Thu Jan 1 09:24:55 2015
@@ -1446,32 +1446,12 @@
}
/**
- Return the owner of the unit.
-**/
-struct player *unit_owner(const struct unit *punit)
-{
- fc_assert_ret_val(NULL != punit, NULL);
- fc_assert(NULL != punit-owner);
- return punit-owner;
-}
-
-/**
Return the nationality of the unit.
**/
struct player *unit_nationality(const struct unit *punit)
{
fc_assert_ret_val(NULL != punit, NULL);
return punit-nationality;
-}
-
-/**
- Return the tile location of the unit.
- Not (yet) always used, mostly for debugging.
-**/
-struct tile *unit_tile(const struct unit *punit)
-{
- fc_assert_ret_val(NULL != punit, NULL);
- return punit-tile;
}
/*
Modified: trunk/common/unit.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/unit.h?rev=27467r1=27466r2=27467view=diff
==
--- trunk/common/unit.h (original)
+++ trunk/common/unit.h Thu Jan 1 09:24:55 2015
@@ -309,9 +309,9 @@
int get_transporter_capacity(const struct unit *punit);
-struct player *unit_owner(const struct unit *punit);
+#define unit_owner(_pu) ((_pu)-owner)
+#define unit_tile(_pu) ((_pu)-tile)
struct player *unit_nationality(const struct unit *punit);
-struct tile *unit_tile(const struct unit *punit);
void unit_tile_set(struct unit *punit, struct tile *ptile);
struct unit *is_allied_unit_tile(const struct tile *ptile,
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27469 - in /trunk/client: gui-gtk-2.0/menu.c gui-gtk-3.0/menu.c
Author: sveinung
Date: Thu Jan 1 10:42:21 2015
New Revision: 27469
URL: http://svn.gna.org/viewcvs/freeciv?rev=27469view=rev
Log:
Gtk clients: ability to help wonder names menu item.
Name menu item based on the ability to do the Help Wonder Action rather
than the presence of the HelpWonder unit type flag.
See patch #5625
Modified:
trunk/client/gui-gtk-2.0/menu.c
trunk/client/gui-gtk-3.0/menu.c
Modified: trunk/client/gui-gtk-2.0/menu.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/menu.c?rev=27469r1=27468r2=27469view=diff
==
--- trunk/client/gui-gtk-2.0/menu.c (original)
+++ trunk/client/gui-gtk-2.0/menu.c Thu Jan 1 10:42:21 2015
@@ -2273,7 +2273,7 @@
menus_set_sensitive(unit_group, EXPLODE_NUKE,
units_have_type_flag(punits, UTYF_NUCLEAR, TRUE));
- if (units_have_type_flag(punits, UTYF_HELP_WONDER, TRUE)) {
+ if (units_can_do_action(punits, ACTION_HELP_WONDER, TRUE)) {
menus_rename(unit_group, BUILD_CITY, _(Help _Build Wonder));
} else {
bool city_on_tile = FALSE;
Modified: trunk/client/gui-gtk-3.0/menu.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/menu.c?rev=27469r1=27468r2=27469view=diff
==
--- trunk/client/gui-gtk-3.0/menu.c (original)
+++ trunk/client/gui-gtk-3.0/menu.c Thu Jan 1 10:42:21 2015
@@ -2274,7 +2274,7 @@
menus_set_sensitive(unit_group, EXPLODE_NUKE,
units_have_type_flag(punits, UTYF_NUCLEAR, TRUE));
- if (units_have_type_flag(punits, UTYF_HELP_WONDER, TRUE)) {
+ if (units_can_do_action(punits, ACTION_HELP_WONDER, TRUE)) {
menus_rename(unit_group, BUILD_CITY, _(Help _Build Wonder));
} else {
bool city_on_tile = FALSE;
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27470 - /trunk/tools/ruledit/validity.c
Author: cazfi
Date: Thu Jan 1 18:07:06 2015
New Revision: 27470
URL: http://svn.gna.org/viewcvs/freeciv?rev=27470view=rev
Log:
Marked requirer type Action Enabler for translation
See patch #5635
Modified:
trunk/tools/ruledit/validity.c
Modified: trunk/tools/ruledit/validity.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/validity.c?rev=27470r1=27469r2=27470view=diff
==
--- trunk/tools/ruledit/validity.c (original)
+++ trunk/tools/ruledit/validity.c Thu Jan 1 18:07:06 2015
@@ -122,7 +122,7 @@
action_enabler_list_iterate(action_enablers_for_action(act), enabler) {
if (universal_in_req_vec(uni, (enabler-actor_reqs))
|| universal_in_req_vec(uni, (enabler-target_reqs))) {
-cb(Action Enabler);
+cb(R__(Action Enabler));
needed = TRUE;
}
} action_enabler_list_iterate_end;
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27466 - /trunk/dependencies/lua-5.3/src/Makefile.am
Author: cazfi Date: Thu Jan 1 09:13:43 2015 New Revision: 27466 URL: http://svn.gna.org/viewcvs/freeciv?rev=27466view=rev Log: Added lprefix.h to the list of files in lua-5.3 Makefile.am See bug #23125 Modified: trunk/dependencies/lua-5.3/src/Makefile.am Modified: trunk/dependencies/lua-5.3/src/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/dependencies/lua-5.3/src/Makefile.am?rev=27466r1=27465r2=27466view=diff == --- trunk/dependencies/lua-5.3/src/Makefile.am (original) +++ trunk/dependencies/lua-5.3/src/Makefile.am Thu Jan 1 09:13:43 2015 @@ -45,6 +45,7 @@ loslib.c\ lparser.c \ lparser.h \ + lprefix.h \ lstate.c\ lstate.h\ lstring.c \ ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27475 - in /trunk: ./ doc/ server/ tools/ruledit/ translations/ win32/installer/
Author: cazfi Date: Thu Jan 1 23:25:16 2015 New Revision: 27475 URL: http://svn.gna.org/viewcvs/freeciv?rev=27475view=rev Log: Prepared trunk for 3.0 development. See patch #4759 Modified: trunk/doc/BUGS trunk/doc/README trunk/doc/README.packaging trunk/doc/README.ruleset_civ2civ3 trunk/doc/README.rulesets trunk/doc/README.tilesets trunk/fc_version trunk/server/savecompat.c trunk/tools/ruledit/rulesave.c trunk/translations/Strings.txt trunk/win32/installer/Makefile Modified: trunk/doc/BUGS URL: http://svn.gna.org/viewcvs/freeciv/trunk/doc/BUGS?rev=27475r1=27474r2=27475view=diff == --- trunk/doc/BUGS (original) +++ trunk/doc/BUGS Thu Jan 1 23:25:16 2015 @@ -2,7 +2,7 @@ BUGS -Freeciv 2.6 certainly contains some bugs. Please report all +Freeciv 3.0 certainly contains some bugs. Please report all you find to http://gna.org/bugs/?func=additemgroup=freeciv. Modified: trunk/doc/README URL: http://svn.gna.org/viewcvs/freeciv/trunk/doc/README?rev=27475r1=27474r2=27475view=diff == --- trunk/doc/README(original) +++ trunk/doc/READMEThu Jan 1 23:25:16 2015 @@ -1,5 +1,5 @@ === -Freeciv Version 2.6 +Freeciv Version 3.0 === Welcome to Freeciv! Modified: trunk/doc/README.packaging URL: http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.packaging?rev=27475r1=27474r2=27475view=diff == --- trunk/doc/README.packaging (original) +++ trunk/doc/README.packaging Thu Jan 1 23:25:16 2015 @@ -7,39 +7,16 @@ create Freeciv fork. -- -Updating from 2.5 to 2.6 +Updating from 2.6 to 3.0 -* Client uses ~/.freeciv/freeciv-client-rc-2.6 for storing its options. +* Client uses ~/.freeciv/freeciv-client-rc-3.0 for storing its options. Options are always saved to that file. Loading of options first tries to get options from - ~/.freeciv/freeciv-client-rc-2.6. If that file does not exist it tries to + ~/.freeciv/freeciv-client-rc-3.0. If that file does not exist it tries to load options from old client files generated by former version of Freeciv - (e.g. ~/.freeciv-client-rc-2.5 generated by Freeciv 2.5 or ~/.civclientrc - generated by Freeciv version = 2.1). -* gtk3-client is now the default client -* Minimum gtk3 requirement for building gtk3-client is now 3.8. -* There's new experimental sdl2-client. It can be built with - --enable-client=sdl2 -* Development of ruleset editor, freeciv-ruledit, has begun. - It has same Qt5 dependencies as other Qt programs in Freeciv distribution. -* System lua library is now used by default. Copy of lua distributed - with freeciv is used only if system lua is not found, or it's - explicitly requested with configure option --disable-sys-lua -* There's new configure option --enable-sys-tolua-cmd to use tolua - command from the build system when generating lua bindings. Plain - --enable-sys-tolua-cmd searches tolua from the PATH, other values - are treated as full path to executable. You have to use system - tolua when cross-compiling. -* Minimum libtool version is now 1.5.2 -* For translation support minimum gettext version is now 0.14. It's - still possible to build completely without translation support - with configure option --disable-nls -* SDL2-mixer is now the default. To build clients to still use - SDL1.2-mixer, configure with --enable-sdlmixer=sdl1.2. sdl-client - cannot be built with SDL2-mixer, nor can sdl2-client be built with - SDL1.2-mixer -* Server now saves its readline history to file - ~/.freeciv/freeciv-server_history instead of ~/.freeciv-server_history + (e.g. ~/.freeciv/freeciv-client-rc-2.6 generated by Freeciv 2.6, + ~/.freeciv-client-rc-2.5 generated by Freeciv 2.5, + or ~/.civclientrc generated by Freeciv version = 2.1). -- Compatibility of modified versions @@ -108,7 +85,7 @@ This is list of files Freeciv might generate to filesystem when running. You may want to remove some of these when Freeciv is uninstalled. -* Client saves its options to file ~/.freeciv/freeciv-client-rc-2.6 +* Client saves its options to file ~/.freeciv/freeciv-client-rc-3.0 * Server saves its readline history to file ~/.freeciv/freeciv-server_history * When running local single player games, challenge files with name like ~/.freeciv/challenge_*_* are generated @@ -117,7 +94,7 @@ * When saving game in independently launched server, savegames go to directory specified with -s command line option, defaulting to working directory -* freeciv-modpack saves data under ~/.freeciv/2.6/ and +* freeciv-modpack saves data under ~/.freeciv/3.0/ and
[Freeciv-commits] r27481 - in /trunk: server/ tools/ tools/ruledit/
Author: cazfi
Date: Thu Jan 1 23:59:10 2015
New Revision: 27481
URL: http://svn.gna.org/viewcvs/freeciv?rev=27481view=rev
Log:
Added flag to ruleset loading telling if compatibility mode to allow loading
rulesets from the previous version should be used.
Outside the compatibility mode, using 'name' instead of 'type' in effect
definitions
is no longer accepted.
See patch #5308
Modified:
trunk/server/ruleset.c
trunk/server/ruleset.h
trunk/server/savegame.c
trunk/server/savegame2.c
trunk/server/savegame3.c
trunk/server/srv_main.c
trunk/server/stdinhand.c
trunk/tools/civmanual.c
trunk/tools/ruledit/ruledit_qt.cpp
Modified: trunk/server/ruleset.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/ruleset.c?rev=27481r1=27480r2=27481view=diff
==
--- trunk/server/ruleset.c (original)
+++ trunk/server/ruleset.c Thu Jan 1 23:59:10 2015
@@ -116,7 +116,8 @@
static char *base_sections = NULL;
static char *road_sections = NULL;
-static bool load_rulesetdir(const char *rsdir, bool act, bool save_script);
+static bool load_rulesetdir(const char *rsdir, bool compat_mode,
+bool act, bool save_script);
static struct section_file *openload_ruleset_file(const char *whichset,
const char *rsdir);
static const char *check_ruleset_capabilities(struct section_file *file,
@@ -145,7 +146,7 @@
static bool load_ruleset_terrain(struct section_file *file);
static bool load_ruleset_styles(struct section_file *file);
static bool load_ruleset_cities(struct section_file *file);
-static bool load_ruleset_effects(struct section_file *file);
+static bool load_ruleset_effects(struct section_file *file, bool compat_mode);
static bool load_ruleset_game(struct section_file *file, bool act);
@@ -4582,7 +4583,7 @@
/**
Load effects.ruleset file
**/
-static bool load_ruleset_effects(struct section_file *file)
+static bool load_ruleset_effects(struct section_file *file, bool compat_mode)
{
struct section_list *sec;
const char *type;
@@ -4607,12 +4608,12 @@
struct requirement_vector *reqs;
type = secfile_lookup_str(file, %s.type, sec_name);
-if (type == NULL) {
+if (type == NULL compat_mode) {
/* Backward compatibility. Field used to be named name */
type = secfile_lookup_str(file, %s.name, sec_name);
}
if (type == NULL) {
- ruleset_error(LOG_ERROR, \%s\ [%s] missing effect name., filename,
sec_name);
+ ruleset_error(LOG_ERROR, \%s\ [%s] missing effect type., filename,
sec_name);
ok = FALSE;
break;
}
@@ -6525,15 +6526,16 @@
/**
Loads the rulesets.
**/
-bool load_rulesets(const char *restore, bool act, bool save_script)
-{
- if (load_rulesetdir(game.server.rulesetdir, act, save_script)) {
+bool load_rulesets(const char *restore, bool compat_mode,
+ bool act, bool save_script)
+{
+ if (load_rulesetdir(game.server.rulesetdir, compat_mode, act, save_script)) {
return TRUE;
}
/* Fallback to previous one. */
if (restore != NULL) {
-if (load_rulesetdir(restore, act, save_script)) {
+if (load_rulesetdir(restore, compat_mode, act, save_script)) {
sz_strlcpy(game.server.rulesetdir, restore);
notify_ruleset_fallback(_(Ruleset couldn't be loaded. Keeping previous
one.));
@@ -6548,7 +6550,7 @@
/* Fallback to default one, but not if that's what we tried already */
if (strcmp(GAME_DEFAULT_RULESETDIR, game.server.rulesetdir)
(restore == NULL || strcmp(GAME_DEFAULT_RULESETDIR, restore))) {
-if (load_rulesetdir(GAME_DEFAULT_RULESETDIR, act, save_script)) {
+if (load_rulesetdir(GAME_DEFAULT_RULESETDIR, FALSE, act, save_script)) {
/* We're in sane state as fallback ruleset loading succeeded,
* but return failure to indicate that this is not what caller
* wanted. */
@@ -6583,7 +6585,8 @@
Loads the rulesets from directory.
This may be called more than once and it will free any stale data.
**/
-static bool load_rulesetdir(const char *rsdir, bool act, bool save_script)
+static bool load_rulesetdir(const char *rsdir, bool compat_mode,
+bool act, bool save_script)
{
struct section_file *techfile, *unitfile, *buildfile, *govfile, *terrfile;
struct section_file *stylefile, *cityfile, *nationfile, *effectfile,
*gamefile;
@@ -6664,7 +6667,7 @@
ok = load_ruleset_nations(nationfile);
}
if (ok) {
-ok = load_ruleset_effects(effectfile);
+ok =
[Freeciv-commits] r27477 - in /branches/S2_6: configure.ac data/Makefile.am doc/Makefile.am translations/freeciv/POTFILES.in
Author: cazfi Date: Thu Jan 1 23:33:19 2015 New Revision: 27477 URL: http://svn.gna.org/viewcvs/freeciv?rev=27477view=rev Log: Dropped alien ruleset from S2_6 tarball. See patch #4655 Modified: branches/S2_6/configure.ac branches/S2_6/data/Makefile.am branches/S2_6/doc/Makefile.am branches/S2_6/translations/freeciv/POTFILES.in Modified: branches/S2_6/configure.ac URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/configure.ac?rev=27477r1=27476r2=27477view=diff == --- branches/S2_6/configure.ac (original) +++ branches/S2_6/configure.ac Thu Jan 1 23:33:19 2015 @@ -1386,7 +1386,6 @@ data/classic/Makefile data/multiplayer/Makefile data/experimental/Makefile - data/alien/Makefile data/civ2civ3/Makefile data/civ1/Makefile data/civ2/Makefile Modified: branches/S2_6/data/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/Makefile.am?rev=27477r1=27476r2=27477view=diff == --- branches/S2_6/data/Makefile.am (original) +++ branches/S2_6/data/Makefile.am Thu Jan 1 23:33:19 2015 @@ -40,7 +40,6 @@ default.serv \ experimental.serv \ multiplayer.serv \ - alien.serv \ civ2civ3.serv SERVER_CONF = database.lua @@ -78,7 +77,6 @@ default.serv\ experimental.serv \ multiplayer.serv \ - alien.serv \ civ2civ3.serv if CLIENT @@ -89,7 +87,7 @@ endif if SERVER -SERVERDATADIRS = default classic civ1 civ2 experimental multiplayer alien civ2civ3 scenarios nation +SERVERDATADIRS = default classic civ1 civ2 experimental multiplayer civ2civ3 scenarios nation else SERVERDATADIRS = endif Modified: branches/S2_6/doc/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/Makefile.am?rev=27477r1=27476r2=27477view=diff == --- branches/S2_6/doc/Makefile.am (original) +++ branches/S2_6/doc/Makefile.am Thu Jan 1 23:33:19 2015 @@ -22,7 +22,6 @@ README.graphics \ README.nations \ README.packaging\ - README.ruleset_alien\ README.ruleset_experimental \ README.ruleset_multiplayer \ README.ruleset_civ2civ3 \ Modified: branches/S2_6/translations/freeciv/POTFILES.in URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/freeciv/POTFILES.in?rev=27477r1=27476r2=27477view=diff == --- branches/S2_6/translations/freeciv/POTFILES.in (original) +++ branches/S2_6/translations/freeciv/POTFILES.in Thu Jan 1 23:33:19 2015 @@ -271,25 +271,6 @@ data/civ2civ3/techs.ruleset data/civ2civ3/terrain.ruleset data/civ2civ3/units.ruleset -data/alien/buildings.ruleset -data/alien/cities.ruleset -data/alien/game.ruleset -data/alien/governments.ruleset -data/alien/nations.ruleset -data/alien/script.lua -data/alien/styles.ruleset -data/alien/techs.ruleset -data/alien/terrain.ruleset -data/alien/units.ruleset -data/alien/nation/adventurers.ruleset -data/alien/nation/galacticsound.ruleset -data/alien/nation/jw.ruleset -data/alien/nation/kindergarden.ruleset -data/alien/nation/lunatics.ruleset -data/alien/nation/madmen.ruleset -data/alien/nation/mathclub.ruleset -data/alien/nation/secretsociety.ruleset -data/alien/nation/teamgladiators.ruleset data/Freeciv.in data/helpdata.txt data/multiplayer/buildings.ruleset ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27480 - in /trunk: INSTALL Makefile.am autogen.sh configure.ac
Author: cazfi Date: Thu Jan 1 23:54:46 2015 New Revision: 27480 URL: http://svn.gna.org/viewcvs/freeciv?rev=27480view=rev Log: Replaced creation of bz2 compressed tarballs with xz-compressed one. Minimum automake version bumped to 1.11 for this to work. See patch #3301 Modified: trunk/INSTALL trunk/Makefile.am trunk/autogen.sh trunk/configure.ac Modified: trunk/INSTALL URL: http://svn.gna.org/viewcvs/freeciv/trunk/INSTALL?rev=27480r1=27479r2=27480view=diff == --- trunk/INSTALL (original) +++ trunk/INSTALL Thu Jan 1 23:54:46 2015 @@ -86,7 +86,7 @@ Autoconf is required to create configure from configure.ac. - - GNU automake version 1.9 or better + - GNU automake version 1.11 or better Automake is required to create the various Makefile.in from Makefile.am. Modified: trunk/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/Makefile.am?rev=27480r1=27479r2=27480view=diff == --- trunk/Makefile.am (original) +++ trunk/Makefile.am Thu Jan 1 23:54:46 2015 @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in ACLOCAL_AMFLAGS = -I m4 -I dependencies/m4 -AM_DIST_FORMATS = gzip bzip2 zip +AM_DIST_FORMATS = gzip xz zip if CLIENT CSUBDIRS = client Modified: trunk/autogen.sh URL: http://svn.gna.org/viewcvs/freeciv/trunk/autogen.sh?rev=27480r1=27479r2=27480view=diff == --- trunk/autogen.sh(original) +++ trunk/autogen.shThu Jan 1 23:54:46 2015 @@ -233,9 +233,9 @@ AUTOHEADER=$REALPKGNAME # automake and aclocal version numbers must be kept in sync -real_package_name automake ftp://ftp.gnu.org/pub/gnu/automake/; 1 9 || DIE=1 +real_package_name automake ftp://ftp.gnu.org/pub/gnu/automake/; 1 11 || DIE=1 AUTOMAKE=$REALPKGNAME -real_package_name aclocal ftp://ftp.gnu.org/pub/gnu/automake/; 1 9 || DIE=1 +real_package_name aclocal ftp://ftp.gnu.org/pub/gnu/automake/; 1 11 || DIE=1 ACLOCAL=$REALPKGNAME real_package_name libtoolize ftp://ftp.gnu.org/pub/gnu/libtool/; 1 5 2 || DIE=1 LIBTOOLIZE=$REALPKGNAME Modified: trunk/configure.ac URL: http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=27480r1=27479r2=27480view=diff == --- trunk/configure.ac (original) +++ trunk/configure.ac Thu Jan 1 23:54:46 2015 @@ -67,7 +67,7 @@ [Distribution this freeciv is built for]) dnl Initialize automake stuff -AM_INIT_AUTOMAKE([subdir-objects dist-bzip2 dist-zip]) +AM_INIT_AUTOMAKE([subdir-objects dist-zip dist-xz]) dnl Use Automake 1.11 silent rules by default if available dnl verbose build using make V=1 ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27482 - in /trunk: configure.ac dependencies/Makefile.am
Author: cazfi Date: Fri Jan 2 00:02:45 2015 New Revision: 27482 URL: http://svn.gna.org/viewcvs/freeciv?rev=27482view=rev Log: Use lua-5.3, despite it still being only in rc2 level. See patch #5021 Modified: trunk/configure.ac trunk/dependencies/Makefile.am Modified: trunk/configure.ac URL: http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=27482r1=27481r2=27482view=diff == --- trunk/configure.ac (original) +++ trunk/configure.ac Fri Jan 2 00:02:45 2015 @@ -1219,9 +1219,9 @@ dnl There's wide divergence on what the pkg-config file for Lua is called dnl See http://lua-users.org/lists/lua-l/2008-09/msg00184.html if test x$sys_lua = xtrue || test x$sys_lua = xtest ; then - PKG_CHECK_MODULES([LUA], [lua5.2], [sys_lua=true], -[PKG_CHECK_MODULES([LUA], [lua-5.2], [sys_lua=true], - [PKG_CHECK_MODULES([LUA], [lua = 5.2 lua 5.3], [sys_lua=true], + PKG_CHECK_MODULES([LUA], [lua5.3], [sys_lua=true], +[PKG_CHECK_MODULES([LUA], [lua-5.3], [sys_lua=true], + [PKG_CHECK_MODULES([LUA], [lua = 5.3 lua 5.4], [sys_lua=true], [if test x$sys_lua = xtrue ; then AC_MSG_ERROR([Use of included lua disabled, and no lua found from system]) fi @@ -1237,8 +1237,8 @@ fi AC_CHECK_FUNCS([isatty popen _longjmp _setjmp]) - LUA_CFLAGS=-I\$(top_srcdir)/dependencies/lua-5.2/src - LUA_LIBS=\$(top_builddir)/dependencies/lua-5.2/src/liblua.la + LUA_CFLAGS=-I\$(top_srcdir)/dependencies/lua-5.3/src + LUA_LIBS=\$(top_builddir)/dependencies/lua-5.3/src/liblua.la fi AC_SUBST([LUA_CFLAGS]) @@ -1445,8 +1445,8 @@ data/icons/Makefile utility/Makefile dependencies/Makefile - dependencies/lua-5.2/Makefile - dependencies/lua-5.2/src/Makefile + dependencies/lua-5.3/Makefile + dependencies/lua-5.3/src/Makefile dependencies/tolua-5.2/Makefile dependencies/tolua-5.2/src/Makefile dependencies/tolua-5.2/src/lib/Makefile Modified: trunk/dependencies/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/dependencies/Makefile.am?rev=27482r1=27481r2=27482view=diff == --- trunk/dependencies/Makefile.am (original) +++ trunk/dependencies/Makefile.am Fri Jan 2 00:02:45 2015 @@ -3,7 +3,7 @@ if SYS_LUA LUASUBDIR = else -LUASUBDIR = lua-5.2 +LUASUBDIR = lua-5.3 endif SUBDIRS = $(LUASUBDIR) tolua-5.2 cvercmp ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27478 - in /trunk/server: Makefile.am savegame2.c savegame2.h savegame3.c savegame3.h srv_main.c stdinhand.c
Author: cazfi Date: Thu Jan 1 23:47:53 2015 New Revision: 27478 URL: http://svn.gna.org/viewcvs/freeciv?rev=27478view=rev Log: Introduced savegame3.[ch] module. It takes care of saving the games, and loading savegames from freeciv-3.0 and later. savegame2.c loads older savegames. See patch #4928 Added: trunk/server/savegame3.c - copied, changed from r27471, trunk/server/savegame2.c trunk/server/savegame3.h - copied, changed from r27471, trunk/server/savegame2.h Modified: trunk/server/Makefile.am trunk/server/savegame2.c trunk/server/savegame2.h trunk/server/srv_main.c trunk/server/stdinhand.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/server/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/Makefile.am?rev=27478r1=27477r2=27478view=diff Modified: trunk/server/savegame2.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame2.c?rev=27478r1=27477r2=27478view=diff Modified: trunk/server/savegame2.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame2.h?rev=27478r1=27477r2=27478view=diff Copied: trunk/server/savegame3.c (from r27471, trunk/server/savegame2.c) URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame3.c?p2=trunk/server/savegame3.cp1=trunk/server/savegame2.cr1=27471r2=27478rev=27478view=diff Copied: trunk/server/savegame3.h (from r27471, trunk/server/savegame2.h) URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame3.h?p2=trunk/server/savegame3.hp1=trunk/server/savegame2.hr1=27471r2=27478rev=27478view=diff Modified: trunk/server/srv_main.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/srv_main.c?rev=27478r1=27477r2=27478view=diff Modified: trunk/server/stdinhand.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/stdinhand.c?rev=27478r1=27477r2=27478view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27476 - /branches/S2_6/fc_version
Author: cazfi Date: Thu Jan 1 23:29:29 2015 New Revision: 27476 URL: http://svn.gna.org/viewcvs/freeciv?rev=27476view=rev Log: Set S2_6 to alpha phase. See patch #4760 Modified: branches/S2_6/fc_version Modified: branches/S2_6/fc_version URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/fc_version?rev=27476r1=27475r2=27476view=diff == --- branches/S2_6/fc_version(original) +++ branches/S2_6/fc_versionThu Jan 1 23:29:29 2015 @@ -7,7 +7,7 @@ MAJOR_VERSION=2 MINOR_VERSION=5 PATCH_VERSION=99 -VERSION_LABEL=-dev +VERSION_LABEL=-alpha # 1) Development until MAJOR and MINOR version numbers are #set to new release series: @@ -41,7 +41,7 @@ # 0 to disable display of release month until we can make better estimate RELEASE_MONTH=0 -DATASUBDIR=dev +DATASUBDIR=test DEFAULT_FOLLOW_TAG=S2_6 # Freeciv network capstring: see documentation in common/capstr.c ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27473 - /trunk/ChangeLog
Author: cazfi Date: Thu Jan 1 23:18:14 2015 New Revision: 27473 URL: http://svn.gna.org/viewcvs/freeciv?rev=27473view=rev Log: Updated ChangeLog before branching S2_6 Modified: trunk/ChangeLog [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/ChangeLog URL: http://svn.gna.org/viewcvs/freeciv/trunk/ChangeLog?rev=27473r1=27472r2=27473view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27474 - /branches/S2_6/
Author: cazfi Date: Thu Jan 1 23:19:57 2015 New Revision: 27474 URL: http://svn.gna.org/viewcvs/freeciv?rev=27474view=rev Log: Created stable 2.6 branch S2_6. Added: branches/S2_6/ - copied from r27473, trunk/ ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
