[Freeciv-commits] r32597 - in /trunk/client: gui-gtk-2.0/ gui-gtk-3.0/ gui-gtk-3.x/
Author: cazfi Date: Thu May 5 21:42:35 2016 New Revision: 32597 URL: http://svn.gna.org/viewcvs/freeciv?rev=32597=rev Log: Fixed "GtkDialog mapped without a transient parent." warning about policies dialog. See bug #24619 Modified: trunk/client/gui-gtk-2.0/gamedlgs.c trunk/client/gui-gtk-2.0/gui_stuff.c trunk/client/gui-gtk-3.0/gamedlgs.c trunk/client/gui-gtk-3.0/gui_stuff.c trunk/client/gui-gtk-3.x/gamedlgs.c trunk/client/gui-gtk-3.x/gui_stuff.c Modified: trunk/client/gui-gtk-2.0/gamedlgs.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/gamedlgs.c?rev=32597=32596=32597=diff == --- trunk/client/gui-gtk-2.0/gamedlgs.c (original) +++ trunk/client/gui-gtk-2.0/gamedlgs.c Thu May 5 21:42:35 2016 @@ -1,4 +1,4 @@ -/** +/*** Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -333,6 +333,7 @@ GTK_RESPONSE_CLOSE, NULL); } + setup_dialog(shell, toplevel); gtk_window_set_position(GTK_WINDOW(shell), GTK_WIN_POS_MOUSE); content = gtk_dialog_get_content_area(GTK_DIALOG(shell)); Modified: trunk/client/gui-gtk-2.0/gui_stuff.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/gui_stuff.c?rev=32597=32596=32597=diff == --- trunk/client/gui-gtk-2.0/gui_stuff.c(original) +++ trunk/client/gui-gtk-2.0/gui_stuff.cThu May 5 21:42:35 2016 @@ -1,4 +1,4 @@ -/** +/*** Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -314,7 +314,6 @@ g_signal_connect_after(shell, "close", G_CALLBACK(close_callback), shell); } } - /** Emit a dialog response. Modified: trunk/client/gui-gtk-3.0/gamedlgs.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/gamedlgs.c?rev=32597=32596=32597=diff == --- trunk/client/gui-gtk-3.0/gamedlgs.c (original) +++ trunk/client/gui-gtk-3.0/gamedlgs.c Thu May 5 21:42:35 2016 @@ -327,6 +327,7 @@ GTK_RESPONSE_CLOSE, NULL); } + setup_dialog(shell, toplevel); gtk_window_set_position(GTK_WINDOW(shell), GTK_WIN_POS_MOUSE); content = gtk_dialog_get_content_area(GTK_DIALOG(shell)); Modified: trunk/client/gui-gtk-3.0/gui_stuff.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/gui_stuff.c?rev=32597=32596=32597=diff == --- trunk/client/gui-gtk-3.0/gui_stuff.c(original) +++ trunk/client/gui-gtk-3.0/gui_stuff.cThu May 5 21:42:35 2016 @@ -1,4 +1,4 @@ -/** +/*** Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -293,7 +293,6 @@ g_signal_connect_after(shell, "close", G_CALLBACK(close_callback), shell); } } - /** Emit a dialog response. Modified: trunk/client/gui-gtk-3.x/gamedlgs.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/gamedlgs.c?rev=32597=32596=32597=diff == --- trunk/client/gui-gtk-3.x/gamedlgs.c (original) +++ trunk/client/gui-gtk-3.x/gamedlgs.c Thu May 5 21:42:35 2016 @@ -327,6 +327,7 @@ GTK_RESPONSE_CLOSE, NULL); } + setup_dialog(shell, toplevel); gtk_window_set_position(GTK_WINDOW(shell), GTK_WIN_POS_MOUSE); content = gtk_dialog_get_content_area(GTK_DIALOG(shell)); Modified: trunk/client/gui-gtk-3.x/gui_stuff.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/gui_stuff.c?rev=32597=32596=32597=diff == --- trunk/client/gui-gtk-3.x/gui_stuff.c(original) +++
[Freeciv-commits] r32592 - /branches/S2_6/utility/shared.h
Author: cazfi Date: Thu May 5 19:08:21 2016 New Revision: 32592 URL: http://svn.gna.org/viewcvs/freeciv?rev=32592=rev Log: Fixed typo in the name of the FREECIV_MSWINDOWS macro being checked See bug #24635 Modified: branches/S2_6/utility/shared.h Modified: branches/S2_6/utility/shared.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/shared.h?rev=32592=32591=32592=diff == --- branches/S2_6/utility/shared.h (original) +++ branches/S2_6/utility/shared.h Thu May 5 19:08:21 2016 @@ -109,7 +109,7 @@ } #ifndef PATH_SEPARATOR -#if defined(FREECIV_MS_WINDOWS) || defined(_WIN32) || defined(__WIN32__) || defined(__EMX__) || defined(__DJGPP__) +#if defined(FREECIV_MSWINDOWS) || defined(_WIN32) || defined(__WIN32__) || defined(__EMX__) || defined(__DJGPP__) /* Win32, OS/2, DOS */ # define PATH_SEPARATOR ";" #else @@ -119,7 +119,7 @@ #endif /* PATH_SEPARATOR */ #ifndef DIR_SEPARATOR -#if defined(FREECIV_MS_WINDOWS) || defined(_WIN32) || defined(__WIN32__) || defined(__EMX__) || defined(__DJGPP__) +#if defined(FREECIV_MSWINDOWS) || defined(_WIN32) || defined(__WIN32__) || defined(__EMX__) || defined(__DJGPP__) /* Win32, OS/2, DOS */ # define DIR_SEPARATOR "\\" # define DIR_SEPARATOR_CHAR '\\' ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r32591 - /trunk/utility/shared.h
Author: cazfi Date: Thu May 5 19:07:14 2016 New Revision: 32591 URL: http://svn.gna.org/viewcvs/freeciv?rev=32591=rev Log: Fixed typo in the name of the FREECIV_MSWINDOWS macro being checked See bug #24635 Modified: trunk/utility/shared.h Modified: trunk/utility/shared.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/utility/shared.h?rev=32591=32590=32591=diff == --- trunk/utility/shared.h (original) +++ trunk/utility/shared.h Thu May 5 19:07:14 2016 @@ -108,7 +108,7 @@ } #ifndef PATH_SEPARATOR -#if defined(FREECIV_MS_WINDOWS) || defined(_WIN32) || defined(__WIN32__) || defined(__EMX__) || defined(__DJGPP__) +#if defined(FREECIV_MSWINDOWS) || defined(_WIN32) || defined(__WIN32__) || defined(__EMX__) || defined(__DJGPP__) /* Win32, OS/2, DOS */ # define PATH_SEPARATOR ";" #else @@ -118,7 +118,7 @@ #endif /* PATH_SEPARATOR */ #ifndef DIR_SEPARATOR -#if defined(FREECIV_MS_WINDOWS) || defined(_WIN32) || defined(__WIN32__) || defined(__EMX__) || defined(__DJGPP__) +#if defined(FREECIV_MSWINDOWS) || defined(_WIN32) || defined(__WIN32__) || defined(__EMX__) || defined(__DJGPP__) /* Win32, OS/2, DOS */ # define DIR_SEPARATOR "\\" # define DIR_SEPARATOR_CHAR '\\' ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r32596 - /trunk/server/savegame3.c
Author: cazfi
Date: Thu May 5 20:29:04 2016
New Revision: 32596
URL: http://svn.gna.org/viewcvs/freeciv?rev=32596=rev
Log:
Do not save player tile resources separately. They are already part of extras.
See patch #7168
Modified:
trunk/server/savegame3.c
Modified: trunk/server/savegame3.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame3.c?rev=32596=32595=32596=diff
==
--- trunk/server/savegame3.c(original)
+++ trunk/server/savegame3.cThu May 5 20:29:04 2016
@@ -308,8 +308,6 @@
static void sg_extras_set(bv_extras *extras, char ch, struct extra_type **idx);
static char sg_extras_get(bv_extras extras, struct resource_type *presource,
const int *idx);
-static struct resource_type *char2resource(char c);
-static char resource2char(const struct resource_type *presource);
static char num2char(unsigned int num);
static int char2num(char ch);
static struct terrain *char2terrain(char ch);
@@ -1145,27 +1143,6 @@
}
return hex_chars[bin];
-}
-
-/
- Return the resource for the given identifier.
-/
-static struct resource_type *char2resource(char c)
-{
- /* speed common values */
- if (c == RESOURCE_NULL_IDENTIFIER
- || c == RESOURCE_NONE_IDENTIFIER) {
-return NULL;
- }
- return resource_by_identifier(c);
-}
-
-/
- Return the identifier for the given resource.
-/
-static char resource2char(const struct resource_type *presource)
-{
- return presource ? presource->id_old_save : RESOURCE_NONE_IDENTIFIER;
}
/
@@ -6029,12 +6006,6 @@
= char2terrain(ch), loading->file,
"player%d.map_t%04d", plrno);
- /* Load player map (resources). */
- LOAD_MAP_CHAR(ch, ptile,
-map_get_player_tile(ptile, plr)->resource
- = char2resource(ch), loading->file,
-"player%d.map_res%04d", plrno);
-
/* Load player map (extras). */
halfbyte_iterate_extras(j, loading->extra.size) {
LOAD_MAP_CHAR(ch, ptile,
@@ -6264,11 +6235,6 @@
SAVE_MAP_CHAR(ptile,
terrain2char(map_get_player_tile(ptile, plr)->terrain),
saving->file, "player%d.map_t%04d", plrno);
-
- /* Save the map (resources). */
- SAVE_MAP_CHAR(ptile,
-resource2char(map_get_player_tile(ptile, plr)->resource),
-saving->file, "player%d.map_res%04d", plrno);
if (game.server.foggedborders) {
/* Save the map (borders). */
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r32594 - /branches/S2_6/common/unit.c
Author: cazfi Date: Thu May 5 20:03:36 2016 New Revision: 32594 URL: http://svn.gna.org/viewcvs/freeciv?rev=32594=rev Log: Removed outdated comment from unit.c Reported by Michal Mazurek See bug #19047 Modified: branches/S2_6/common/unit.c Modified: branches/S2_6/common/unit.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/unit.c?rev=32594=32593=32594=diff == --- branches/S2_6/common/unit.c (original) +++ branches/S2_6/common/unit.c Thu May 5 20:03:36 2016 @@ -896,10 +896,6 @@ /** Return TRUE if the unit can do the targeted activity at the given location. - - Note that if you make changes here you should also change the code for - autosettlers in server/settler.c. The code there does not use this - function as it would be a major CPU hog. **/ bool can_unit_do_activity_targeted_at(const struct unit *punit, enum unit_activity activity, ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r32593 - /trunk/common/unit.c
Author: cazfi Date: Thu May 5 20:03:28 2016 New Revision: 32593 URL: http://svn.gna.org/viewcvs/freeciv?rev=32593=rev Log: Removed outdated comment from unit.c Reported by Michal Mazurek See bug #19047 Modified: trunk/common/unit.c Modified: trunk/common/unit.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/unit.c?rev=32593=32592=32593=diff == --- trunk/common/unit.c (original) +++ trunk/common/unit.c Thu May 5 20:03:28 2016 @@ -777,10 +777,6 @@ /** Return TRUE if the unit can do the targeted activity at the given location. - - Note that if you make changes here you should also change the code for - autosettlers in server/settler.c. The code there does not use this - function as it would be a major CPU hog. **/ bool can_unit_do_activity_targeted_at(const struct unit *punit, enum unit_activity activity, ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r32595 - /branches/S2_5/common/unit.c
Author: cazfi Date: Thu May 5 20:03:52 2016 New Revision: 32595 URL: http://svn.gna.org/viewcvs/freeciv?rev=32595=rev Log: Removed outdated comment from unit.c Reported by Michal Mazurek See bug #19047 Modified: branches/S2_5/common/unit.c Modified: branches/S2_5/common/unit.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/unit.c?rev=32595=32594=32595=diff == --- branches/S2_5/common/unit.c (original) +++ branches/S2_5/common/unit.c Thu May 5 20:03:52 2016 @@ -1049,10 +1049,6 @@ /** Return TRUE if the unit can do the targeted activity at the given location. - - Note that if you make changes here you should also change the code for - autosettlers in server/settler.c. The code there does not use this - function as it would be a major CPU hog. **/ bool can_unit_do_activity_targeted_at(const struct unit *punit, enum unit_activity activity, ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r32601 - in /branches/S2_6: ai/default/ client/ client/agents/ client/gui-gtk-2.0/ client/gui-gtk-3.0/ client/gui-qt/ client...
Author: cazfi Date: Fri May 6 06:22:55 2016 New Revision: 32601 URL: http://svn.gna.org/viewcvs/freeciv?rev=32601=rev Log: Fixed some shadow warnings seen on OpenBSD. See patch #7181 Modified: branches/S2_6/ai/default/daidiplomacy.c branches/S2_6/client/agents/cma_core.c branches/S2_6/client/agents/cma_fec.c branches/S2_6/client/agents/cma_fec.h branches/S2_6/client/climisc.c branches/S2_6/client/gui-gtk-2.0/editgui.c branches/S2_6/client/gui-gtk-3.0/editgui.c branches/S2_6/client/gui-qt/gui_main.cpp branches/S2_6/client/gui-qt/qtg_cxxside.h branches/S2_6/client/gui-sdl/gui_main.c branches/S2_6/client/gui-sdl2/gui_main.c branches/S2_6/client/gui-stub/gui_main.c branches/S2_6/client/gui-xaw/gui_main.c branches/S2_6/client/gui_interface.c branches/S2_6/client/gui_interface.h branches/S2_6/client/helpdata.c branches/S2_6/client/include/editgui_g.h branches/S2_6/client/mapview_common.c branches/S2_6/client/packhand.c branches/S2_6/client/tilespec.c branches/S2_6/client/tilespec.h branches/S2_6/common/packets.def branches/S2_6/server/edithand.c branches/S2_6/server/unithand.c branches/S2_6/tools/civmanual.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/S2_6/ai/default/daidiplomacy.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/ai/default/daidiplomacy.c?rev=32601=32600=32601=diff Modified: branches/S2_6/client/agents/cma_core.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/agents/cma_core.c?rev=32601=32600=32601=diff Modified: branches/S2_6/client/agents/cma_fec.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/agents/cma_fec.c?rev=32601=32600=32601=diff Modified: branches/S2_6/client/agents/cma_fec.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/agents/cma_fec.h?rev=32601=32600=32601=diff Modified: branches/S2_6/client/climisc.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/climisc.c?rev=32601=32600=32601=diff Modified: branches/S2_6/client/gui-gtk-2.0/editgui.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/editgui.c?rev=32601=32600=32601=diff Modified: branches/S2_6/client/gui-gtk-3.0/editgui.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/editgui.c?rev=32601=32600=32601=diff Modified: branches/S2_6/client/gui-qt/gui_main.cpp URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/gui_main.cpp?rev=32601=32600=32601=diff Modified: branches/S2_6/client/gui-qt/qtg_cxxside.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/qtg_cxxside.h?rev=32601=32600=32601=diff Modified: branches/S2_6/client/gui-sdl/gui_main.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/gui_main.c?rev=32601=32600=32601=diff Modified: branches/S2_6/client/gui-sdl2/gui_main.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/gui_main.c?rev=32601=32600=32601=diff Modified: branches/S2_6/client/gui-stub/gui_main.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-stub/gui_main.c?rev=32601=32600=32601=diff Modified: branches/S2_6/client/gui-xaw/gui_main.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-xaw/gui_main.c?rev=32601=32600=32601=diff Modified: branches/S2_6/client/gui_interface.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui_interface.c?rev=32601=32600=32601=diff Modified: branches/S2_6/client/gui_interface.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui_interface.h?rev=32601=32600=32601=diff Modified: branches/S2_6/client/helpdata.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/helpdata.c?rev=32601=32600=32601=diff Modified: branches/S2_6/client/include/editgui_g.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/include/editgui_g.h?rev=32601=32600=32601=diff Modified: branches/S2_6/client/mapview_common.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/mapview_common.c?rev=32601=32600=32601=diff Modified: branches/S2_6/client/packhand.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/packhand.c?rev=32601=32600=32601=diff Modified: branches/S2_6/client/tilespec.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/tilespec.c?rev=32601=32600=32601=diff Modified: branches/S2_6/client/tilespec.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/tilespec.h?rev=32601=32600=32601=diff Modified: branches/S2_6/common/packets.def URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/packets.def?rev=32601=32600=32601=diff Modified: branches/S2_6/server/edithand.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/edithand.c?rev=32601=32600=32601=diff Modified: branches/S2_6/server/unithand.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/unithand.c?rev=32601=32600=32601=diff Modified:
[Freeciv-commits] r32600 - in /trunk: ai/default/ client/ client/agents/ client/gui-gtk-2.0/ client/gui-gtk-3.0/ client/gui-gtk-3.x/ client/gu...
Author: cazfi Date: Fri May 6 06:22:45 2016 New Revision: 32600 URL: http://svn.gna.org/viewcvs/freeciv?rev=32600=rev Log: Fixed some shadow warnings seen on OpenBSD. See patch #7181 Modified: trunk/ai/default/daidiplomacy.c trunk/client/agents/cma_core.c trunk/client/agents/cma_fec.c trunk/client/agents/cma_fec.h trunk/client/climisc.c trunk/client/gui-gtk-2.0/editgui.c trunk/client/gui-gtk-3.0/editgui.c trunk/client/gui-gtk-3.x/editgui.c trunk/client/gui-qt/gui_main.cpp trunk/client/gui-qt/qtg_cxxside.h trunk/client/gui-sdl2/gui_main.c trunk/client/gui-stub/gui_main.c trunk/client/gui_interface.c trunk/client/gui_interface.h trunk/client/helpdata.c trunk/client/include/editgui_g.h trunk/client/mapview_common.c trunk/client/packhand.c trunk/client/tilespec.c trunk/client/tilespec.h trunk/common/packets.def trunk/server/edithand.c trunk/server/unithand.c trunk/tools/civmanual.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/ai/default/daidiplomacy.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/daidiplomacy.c?rev=32600=32599=32600=diff Modified: trunk/client/agents/cma_core.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/agents/cma_core.c?rev=32600=32599=32600=diff Modified: trunk/client/agents/cma_fec.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/agents/cma_fec.c?rev=32600=32599=32600=diff Modified: trunk/client/agents/cma_fec.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/agents/cma_fec.h?rev=32600=32599=32600=diff Modified: trunk/client/climisc.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/climisc.c?rev=32600=32599=32600=diff Modified: trunk/client/gui-gtk-2.0/editgui.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/editgui.c?rev=32600=32599=32600=diff Modified: trunk/client/gui-gtk-3.0/editgui.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/editgui.c?rev=32600=32599=32600=diff Modified: trunk/client/gui-gtk-3.x/editgui.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/editgui.c?rev=32600=32599=32600=diff Modified: trunk/client/gui-qt/gui_main.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/gui_main.cpp?rev=32600=32599=32600=diff Modified: trunk/client/gui-qt/qtg_cxxside.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/qtg_cxxside.h?rev=32600=32599=32600=diff Modified: trunk/client/gui-sdl2/gui_main.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/gui_main.c?rev=32600=32599=32600=diff Modified: trunk/client/gui-stub/gui_main.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-stub/gui_main.c?rev=32600=32599=32600=diff Modified: trunk/client/gui_interface.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui_interface.c?rev=32600=32599=32600=diff Modified: trunk/client/gui_interface.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui_interface.h?rev=32600=32599=32600=diff Modified: trunk/client/helpdata.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/helpdata.c?rev=32600=32599=32600=diff Modified: trunk/client/include/editgui_g.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/include/editgui_g.h?rev=32600=32599=32600=diff Modified: trunk/client/mapview_common.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/mapview_common.c?rev=32600=32599=32600=diff Modified: trunk/client/packhand.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/packhand.c?rev=32600=32599=32600=diff Modified: trunk/client/tilespec.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/tilespec.c?rev=32600=32599=32600=diff Modified: trunk/client/tilespec.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/tilespec.h?rev=32600=32599=32600=diff Modified: trunk/common/packets.def URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/packets.def?rev=32600=32599=32600=diff Modified: trunk/server/edithand.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/edithand.c?rev=32600=32599=32600=diff Modified: trunk/server/unithand.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/unithand.c?rev=32600=32599=32600=diff Modified: trunk/tools/civmanual.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/tools/civmanual.c?rev=32600=32599=32600=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r32599 - in /trunk: ./ tools/ tools/ruledit/ tools/ruleutil/
Author: cazfi Date: Fri May 6 06:00:27 2016 New Revision: 32599 URL: http://svn.gna.org/viewcvs/freeciv?rev=32599=rev Log: Moved ruleset saving related code from ruledit to a new ruleutil library. See patch #7186 Added: trunk/tools/ruleutil/ trunk/tools/ruleutil/Makefile.am trunk/tools/ruleutil/comments.c - copied unchanged from r32598, trunk/tools/ruledit/comments.c trunk/tools/ruleutil/comments.h - copied unchanged from r32598, trunk/tools/ruledit/comments.h trunk/tools/ruleutil/rulesave.c - copied unchanged from r32598, trunk/tools/ruledit/rulesave.c trunk/tools/ruleutil/rulesave.h - copied unchanged from r32598, trunk/tools/ruledit/rulesave.h Removed: trunk/tools/ruledit/comments.c trunk/tools/ruledit/comments.h trunk/tools/ruledit/rulesave.c trunk/tools/ruledit/rulesave.h Modified: trunk/configure.ac trunk/tools/Makefile.am trunk/tools/ruledit/Makefile.am [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/configure.ac URL: http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=32599=32598=32599=diff Modified: trunk/tools/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/tools/Makefile.am?rev=32599=32598=32599=diff Modified: trunk/tools/ruledit/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/Makefile.am?rev=32599=32598=32599=diff Removed: trunk/tools/ruledit/comments.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/comments.c?rev=32598=auto Removed: trunk/tools/ruledit/comments.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/comments.h?rev=32598=auto Removed: trunk/tools/ruledit/rulesave.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/rulesave.c?rev=32598=auto Removed: trunk/tools/ruledit/rulesave.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/rulesave.h?rev=32598=auto Added: trunk/tools/ruleutil/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruleutil/Makefile.am?rev=32599=auto ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r32589 - in /trunk/bootstrap: fcgui.in fcruledit.in fcser.in
Author: cazfi
Date: Thu May 5 17:09:30 2016
New Revision: 32589
URL: http://svn.gna.org/viewcvs/freeciv?rev=32589=rev
Log:
Set paths in fcser/fcgui/fcruledit with correct dir separator
See patch #7175
Modified:
trunk/bootstrap/fcgui.in
trunk/bootstrap/fcruledit.in
trunk/bootstrap/fcser.in
Modified: trunk/bootstrap/fcgui.in
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/bootstrap/fcgui.in?rev=32589=32588=32589=diff
==
--- trunk/bootstrap/fcgui.in(original)
+++ trunk/bootstrap/fcgui.inThu May 5 17:09:30 2016
@@ -1,5 +1,5 @@
#!/bin/sh
-#/**
+#/***
# Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
# script by Rene Schalburg
# This program is free software; you can redistribute it and/or modify
@@ -51,21 +51,21 @@
fi
if test "x$FREECIV_DATA_PATH" = "x" ; then
-
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@/@DATASUBDIR@"
+
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@@HOST_DIR_SEPARATOR@@DATASUBDIR@"
fi
-FREECIV_DATA_PATH="${FREECIV_DATA_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@/data@HOST_PATH_SEPARATOR@@abs_top_srcdir@/data"
+FREECIV_DATA_PATH="${FREECIV_DATA_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@@HOST_DIR_SEPARATOR@data@HOST_PATH_SEPARATOR@@abs_top_srcdir@@HOST_DIR_SEPARATOR@data"
export FREECIV_DATA_PATH
if test "x$FREECIV_SAVE_PATH" = "x" ; then
- FREECIV_SAVE_PATH=".@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@/saves"
+
FREECIV_SAVE_PATH=".@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@@HOST_DIR_SEPARATOR@saves"
fi
FREECIV_SAVE_PATH="${FREECIV_SAVE_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@@HOST_PATH_SEPARATOR@@abs_top_srcdir@"
export FREECIV_SAVE_PATH
if test "x$FREECIV_SCENARIO_PATH" = "x" ; then
-
FREECIV_SCENARIO_PATH=".@HOST_PATH_SEPARATOR@data/scenarios@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@/@DATASUBDIR@/scenarios@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@/scenarios"
+
FREECIV_SCENARIO_PATH=".@HOST_PATH_SEPARATOR@data@HOST_DIR_SEPARATOR@scenarios@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@@HOST_DIR_SEPARATOR@@DATASUBDIR@@HOST_DIR_SEPARATOR@scenarios@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@@HOST_DIR_SEPARATOR@scenarios"
fi
-FREECIV_SCENARIO_PATH="${FREECIV_SCENARIO_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@/data/scenarios@HOST_PATH_SEPARATOR@@abs_top_srcdir@/data/scenarios"
+FREECIV_SCENARIO_PATH="${FREECIV_SCENARIO_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@@HOST_DIR_SEPARATOR@data@HOST_DIR_SEPARATOR@scenarios@HOST_PATH_SEPARATOR@@abs_top_srcdir@@HOST_DIR_SEPARATOR@data@HOST_DIR_SEPARATOR@scenarios"
export FREECIV_SCENARIO_PATH
echo "Running $EXE"
Modified: trunk/bootstrap/fcruledit.in
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/bootstrap/fcruledit.in?rev=32589=32588=32589=diff
==
--- trunk/bootstrap/fcruledit.in(original)
+++ trunk/bootstrap/fcruledit.inThu May 5 17:09:30 2016
@@ -1,5 +1,5 @@
#!/bin/sh
-#/**
+#/***
# Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
# script by Rene Schalburg
# This program is free software; you can redistribute it and/or modify
@@ -28,9 +28,9 @@
fi
if test "x$FREECIV_DATA_PATH" = "x" ; then
-
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@/@DATASUBDIR@"
+
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@@HOST_DIR_SEPARATOR@@DATASUBDIR@"
fi
-FREECIV_DATA_PATH="${FREECIV_DATA_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@/data@HOST_PATH_SEPARATOR@@abs_top_srcdir@/data"
+FREECIV_DATA_PATH="${FREECIV_DATA_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@@HOST_DIR_SEPARATOR@data@HOST_PATH_SEPARATOR@@abs_top_srcdir@@HOST_DIR_SEPARATOR@data"
export FREECIV_DATA_PATH
echo "Running $EXE"
Modified: trunk/bootstrap/fcser.in
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/bootstrap/fcser.in?rev=32589=32588=32589=diff
==
--- trunk/bootstrap/fcser.in(original)
+++ trunk/bootstrap/fcser.inThu May 5 17:09:30 2016
@@ -1,5 +1,5 @@
#!/bin/sh
-#/**
+#/***
# Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
# script by Rene Schalburg
# This program is free software; you can redistribute it and/or modify
@@ -18,21 +18,21 @@
EXENAME=freeciv-server@EXEEXT@
if test "x$FREECIV_DATA_PATH" = "x" ; then
-
