[Freeciv-commits] r35583 - /branches/S3_0/common/server_settings.h

2017-05-14 Thread sveinung84 
Author: sveinung
Date: Mon May 15 02:39:31 2017
New Revision: 35583

URL: http://svn.gna.org/viewcvs/freeciv?rev=35583=rev
Log:
Change comment style from C++ style to C style.

See doc/CodingStyle

Modified:
branches/S3_0/common/server_settings.h

Modified: branches/S3_0/common/server_settings.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/common/server_settings.h?rev=35583=35582=35583=diff
==
--- branches/S3_0/common/server_settings.h  (original)
+++ branches/S3_0/common/server_settings.h  Mon May 15 02:39:31 2017
@@ -40,4 +40,4 @@
 }
 #endif /* __cplusplus */
 
-#endif // FC_SERVER_SETTINGS_H
+#endif /* FC_SERVER_SETTINGS_H */


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35582 - /trunk/common/server_settings.h

2017-05-14 Thread sveinung84 
Author: sveinung
Date: Mon May 15 02:38:59 2017
New Revision: 35582

URL: http://svn.gna.org/viewcvs/freeciv?rev=35582=rev
Log:
Change comment style from C++ style to C style.

See doc/CodingStyle

Modified:
trunk/common/server_settings.h

Modified: trunk/common/server_settings.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/server_settings.h?rev=35582=35581=35582=diff
==
--- trunk/common/server_settings.h  (original)
+++ trunk/common/server_settings.h  Mon May 15 02:38:59 2017
@@ -40,4 +40,4 @@
 }
 #endif /* __cplusplus */
 
-#endif // FC_SERVER_SETTINGS_H
+#endif /* FC_SERVER_SETTINGS_H */


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35581 - in /branches/S3_0: client/ common/ server/ tools/ tools/ruledit/

2017-05-14 Thread cazfi74 
Author: cazfi
Date: Mon May 15 00:56:12 2017
New Revision: 35581

URL: http://svn.gna.org/viewcvs/freeciv?rev=35581=rev
Log:
Reload current ruleset when loading !ruleset_locked scenario

See hrm Bug #659453

Modified:
branches/S3_0/client/client_main.c
branches/S3_0/common/game.c
branches/S3_0/common/game.h
branches/S3_0/server/savegame3.c
branches/S3_0/server/srv_main.c
branches/S3_0/server/srv_main.h
branches/S3_0/server/stdinhand.c
branches/S3_0/tools/civmanual.c
branches/S3_0/tools/ruledit/ruledit.cpp
branches/S3_0/tools/ruleup.c

Modified: branches/S3_0/client/client_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/client_main.c?rev=35581=35580=35581=diff
==
--- branches/S3_0/client/client_main.c  (original)
+++ branches/S3_0/client/client_main.c  Mon May 15 00:56:12 2017
@@ -249,7 +249,7 @@
   client.conn.playing = NULL;
   client.conn.observer = FALSE;
 
-  game_init();
+  game_init(FALSE);
   attribute_init();
   agents_init();
   control_init();

Modified: branches/S3_0/common/game.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/common/game.c?rev=35581=35580=35581=diff
==
--- branches/S3_0/common/game.c (original)
+++ branches/S3_0/common/game.c Mon May 15 00:56:12 2017
@@ -59,7 +59,7 @@
 
 bool am_i_server = FALSE;
 
-static void game_defaults(void);
+static void game_defaults(bool keep_ruleset_value);
 
 /**
   Is program type server?
@@ -227,7 +227,7 @@
 /
   Set default game values.
 /
-static void game_defaults(void)
+static void game_defaults(bool keep_ruleset_value)
 {
   int i;
 
@@ -394,7 +394,9 @@
 game.server.razechance= GAME_DEFAULT_RAZECHANCE;
 game.server.revealmap = GAME_DEFAULT_REVEALMAP;
 game.server.revolution_length = GAME_DEFAULT_REVOLUTION_LENGTH;
-sz_strlcpy(game.server.rulesetdir, GAME_DEFAULT_RULESETDIR);
+if (!keep_ruleset_value) {
+  sz_strlcpy(game.server.rulesetdir, GAME_DEFAULT_RULESETDIR);
+}
 game.server.save_compress_level = GAME_DEFAULT_COMPRESS_LEVEL;
 game.server.save_compress_type = GAME_DEFAULT_COMPRESS_TYPE;
 sz_strlcpy(game.server.save_name, GAME_DEFAULT_SAVE_NAME);
@@ -432,9 +434,9 @@
 
   The variables are listed in alphabetical order.
 /
-void game_init(void)
-{
-  game_defaults();
+void game_init(bool keep_ruleset_value)
+{
+  game_defaults(keep_ruleset_value);
   player_slots_init();
   map_init();
   team_slots_init();
@@ -481,7 +483,7 @@
 {
   if (is_server()) {
 game_free();
-game_init();
+game_init(FALSE);
   } else {
 /* Reset the players infos. */
 players_iterate(pplayer) {

Modified: branches/S3_0/common/game.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/common/game.h?rev=35581=35580=35581=diff
==
--- branches/S3_0/common/game.h (original)
+++ branches/S3_0/common/game.h Mon May 15 00:56:12 2017
@@ -291,7 +291,7 @@
   i_am_server(); /* No difference between a tool and server at the moment */
 }
 
-void game_init(void);
+void game_init(bool keep_ruleset_value);
 void game_map_init(void);
 void game_free(void);
 void game_reset(void);

Modified: branches/S3_0/server/savegame3.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/server/savegame3.c?rev=35581=35580=35581=diff
==
--- branches/S3_0/server/savegame3.c(original)
+++ branches/S3_0/server/savegame3.cMon May 15 00:56:12 2017
@@ -1310,10 +1310,11 @@
* are special scenarios. */
   sz_strlcpy(game.server.rulesetdir, GAME_DEFAULT_RULESETDIR);
 }
-if (!load_rulesets(NULL, FALSE, TRUE, FALSE)) {
-  /* Failed to load correct ruleset */
-  sg_failure_ret(FALSE, "Failed to load ruleset");
-}
+  }
+
+  if (!load_rulesets(NULL, FALSE, TRUE, FALSE)) {
+/* Failed to load correct ruleset */
+sg_failure_ret(FALSE, "Failed to load ruleset");
   }
 
   /* This is in the savegame only if the game has been started before 
savegame3.c time,

Modified: branches/S3_0/server/srv_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/server/srv_main.c?rev=35581=35580=35581=diff
==
--- branches/S3_0/server/srv_main.c (original)
+++ branches/S3_0/server/srv_main.c Mon May 15 00:56:12 2017
@@ -2745,7 +2745,7 @@
   voting_init();
   ai_timer_init();
 
-  server_game_init();
+  server_game_init(FALSE);

[Freeciv-commits] r35580 - in /trunk: client/ common/ server/ tools/ tools/ruledit/

2017-05-14 Thread cazfi74 
Author: cazfi
Date: Mon May 15 00:56:02 2017
New Revision: 35580

URL: http://svn.gna.org/viewcvs/freeciv?rev=35580=rev
Log:
Reload current ruleset when loading !ruleset_locked scenario

See hrm Bug #659453

Modified:
trunk/client/client_main.c
trunk/common/game.c
trunk/common/game.h
trunk/server/savegame3.c
trunk/server/srv_main.c
trunk/server/srv_main.h
trunk/server/stdinhand.c
trunk/tools/civmanual.c
trunk/tools/ruledit/ruledit.cpp
trunk/tools/ruleup.c

Modified: trunk/client/client_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/client_main.c?rev=35580=35579=35580=diff
==
--- trunk/client/client_main.c  (original)
+++ trunk/client/client_main.c  Mon May 15 00:56:02 2017
@@ -249,7 +249,7 @@
   client.conn.playing = NULL;
   client.conn.observer = FALSE;
 
-  game_init();
+  game_init(FALSE);
   attribute_init();
   agents_init();
   control_init();

Modified: trunk/common/game.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/game.c?rev=35580=35579=35580=diff
==
--- trunk/common/game.c (original)
+++ trunk/common/game.c Mon May 15 00:56:02 2017
@@ -59,7 +59,7 @@
 
 bool am_i_server = FALSE;
 
-static void game_defaults(void);
+static void game_defaults(bool keep_ruleset_value);
 
 /**
   Is program type server?
@@ -227,7 +227,7 @@
 /
   Set default game values.
 /
-static void game_defaults(void)
+static void game_defaults(bool keep_ruleset_value)
 {
   int i;
 
@@ -394,7 +394,9 @@
 game.server.razechance= GAME_DEFAULT_RAZECHANCE;
 game.server.revealmap = GAME_DEFAULT_REVEALMAP;
 game.server.revolution_length = GAME_DEFAULT_REVOLUTION_LENGTH;
-sz_strlcpy(game.server.rulesetdir, GAME_DEFAULT_RULESETDIR);
+if (!keep_ruleset_value) {
+  sz_strlcpy(game.server.rulesetdir, GAME_DEFAULT_RULESETDIR);
+}
 game.server.save_compress_level = GAME_DEFAULT_COMPRESS_LEVEL;
 game.server.save_compress_type = GAME_DEFAULT_COMPRESS_TYPE;
 sz_strlcpy(game.server.save_name, GAME_DEFAULT_SAVE_NAME);
@@ -432,9 +434,9 @@
 
   The variables are listed in alphabetical order.
 /
-void game_init(void)
-{
-  game_defaults();
+void game_init(bool keep_ruleset_value)
+{
+  game_defaults(keep_ruleset_value);
   player_slots_init();
   map_init(, is_server());
   team_slots_init();
@@ -482,7 +484,7 @@
 {
   if (is_server()) {
 game_free();
-game_init();
+game_init(FALSE);
   } else {
 /* Reset the players infos. */
 players_iterate(pplayer) {

Modified: trunk/common/game.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/game.h?rev=35580=35579=35580=diff
==
--- trunk/common/game.h (original)
+++ trunk/common/game.h Mon May 15 00:56:02 2017
@@ -291,7 +291,7 @@
   i_am_server(); /* No difference between a tool and server at the moment */
 }
 
-void game_init(void);
+void game_init(bool keep_ruleset_value);
 void game_map_init(void);
 void game_free(void);
 void game_reset(void);

Modified: trunk/server/savegame3.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame3.c?rev=35580=35579=35580=diff
==
--- trunk/server/savegame3.c(original)
+++ trunk/server/savegame3.cMon May 15 00:56:02 2017
@@ -1316,10 +1316,11 @@
* are special scenarios. */
   sz_strlcpy(game.server.rulesetdir, GAME_DEFAULT_RULESETDIR);
 }
-if (!load_rulesets(NULL, FALSE, TRUE, FALSE)) {
-  /* Failed to load correct ruleset */
-  sg_failure_ret(FALSE, "Failed to load ruleset");
-}
+  }
+
+  if (!load_rulesets(NULL, FALSE, TRUE, FALSE)) {
+/* Failed to load correct ruleset */
+sg_failure_ret(FALSE, "Failed to load ruleset");
   }
 
   /* This is in the savegame only if the game has been started before 
savegame3.c time,

Modified: trunk/server/srv_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/srv_main.c?rev=35580=35579=35580=diff
==
--- trunk/server/srv_main.c (original)
+++ trunk/server/srv_main.c Mon May 15 00:56:02 2017
@@ -2746,7 +2746,7 @@
   voting_init();
   ai_timer_init();
 
-  server_game_init();
+  server_game_init(FALSE);
   mapimg_init(mapimg_server_tile_known, mapimg_server_tile_terrain,
   mapimg_server_tile_owner, mapimg_server_tile_city,
   mapimg_server_tile_unit, mapimg_server_plrcolor_count,
@@ -3110,7 +3110,7 @@

[Freeciv-commits] r35579 - in /branches/S3_0/ai/default: aicity.c aicity.h daidomestic.c

2017-05-14 Thread cazfi74 
Author: cazfi
Date: Sun May 14 22:07:57 2017
New Revision: 35579

URL: http://svn.gna.org/viewcvs/freeciv?rev=35579=rev
Log:
Rename settler_want as worker_want

See hrm Feature #660200

Modified:
branches/S3_0/ai/default/aicity.c
branches/S3_0/ai/default/aicity.h
branches/S3_0/ai/default/daidomestic.c

Modified: branches/S3_0/ai/default/aicity.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/ai/default/aicity.c?rev=35579=35578=35579=diff
==
--- branches/S3_0/ai/default/aicity.c   (original)
+++ branches/S3_0/ai/default/aicity.c   Sun May 14 22:07:57 2017
@@ -744,7 +744,7 @@
 return;
   }
 
-  city_data->settler_want = 0; /* Make sure old want does not stay if we don't 
want now */
+  city_data->worker_want = 0; /* Make sure old want does not stay if we don't 
want now */
 
   utype = dai_role_utype_for_terrain_class(pcity, UTYF_SETTLERS, TC_LAND);
 
@@ -807,8 +807,8 @@
 
   fc_assert(want >= 0);
 
-  city_data->settler_want = want;
-  city_data->settler_type = dai_role_utype_for_terrain_class(pcity, 
UTYF_SETTLERS,
+  city_data->worker_want = want;
+  city_data->worker_type = dai_role_utype_for_terrain_class(pcity, 
UTYF_SETTLERS,
  TC_LAND);
 }
 
@@ -881,14 +881,14 @@
 adv_free_choice(choice);
 TIMING_LOG(AIT_CITY_MILITARY, TIMER_STOP);
 if (dai_on_war_footing(ait, pplayer) && city_data->choice.want > 0) {
-  city_data->settler_want = 0;
+  city_data->worker_want = 0;
   city_data->founder_want = 0;
   city_data->founder_turn = game.info.turn; /* Do not consider zero we set 
here
  * valid value, if real want 
is needed.
  * Recalculate immediately in 
such situation. */
   continue; /* Go, soldiers! */
 }
-/* Will record its findings in pcity->settler_want */ 
+/* Will record its findings in pcity->worker_want */ 
 TIMING_LOG(AIT_CITY_TERRAIN, TIMER_START);
 contemplate_terrain_improvements(ait, pcity);
 TIMING_LOG(AIT_CITY_TERRAIN, TIMER_STOP);

Modified: branches/S3_0/ai/default/aicity.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/ai/default/aicity.h?rev=35579=35578=35579=diff
==
--- branches/S3_0/ai/default/aicity.h   (original)
+++ branches/S3_0/ai/default/aicity.h   Sun May 14 22:07:57 2017
@@ -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
@@ -64,8 +64,8 @@
   bool founder_boat;/* city founder will need a boat */
   int founder_turn; /* only recalculate every Nth turn */
   int founder_want;
-  int settler_want;
-  struct unit_type *settler_type;
+  int worker_want;
+  struct unit_type *worker_type;
 };
 
 void dai_manage_cities(struct ai_type *ait, struct player *pplayer);

Modified: branches/S3_0/ai/default/daidomestic.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/ai/default/daidomestic.c?rev=35579=35578=35579=diff
==
--- branches/S3_0/ai/default/daidomestic.c  (original)
+++ branches/S3_0/ai/default/daidomestic.c  Sun May 14 22:07:57 2017
@@ -459,44 +459,44 @@
 {
   struct adv_data *adv = adv_data_get(pplayer, NULL);
   /* Unit type with certain role */
-  struct unit_type *settler_type;
+  struct unit_type *worker_type;
   struct unit_type *founder_type;
-  adv_want settler_want, founder_want;
+  adv_want worker_want, founder_want;
   struct ai_city *city_data = def_ai_city_data(pcity, ait);
   struct adv_choice *choice = adv_new_choice();
 
   /* Find out desire for workers (terrain improvers) */
-  settler_type = city_data->settler_type;
+  worker_type = city_data->worker_type;
 
   /* The worker want is calculated in aicity.c called from
* dai_manage_cities.  The expand value is the % that the AI should
* value expansion (basically to handicap easier difficulty levels)
* and is set when the difficulty level is changed (difficulty.c). */
-  settler_want = city_data->settler_want * pplayer->ai_common.expand / 100;
+  worker_want = city_data->worker_want * pplayer->ai_common.expand / 100;
 
   if (adv->wonder_city == pcity->id) {
-if (!settler_type || settler_type->pop_cost > 0) {
-  settler_want /= 5;
+if (!worker_type || worker_type->pop_cost > 0) {
+  worker_want /= 5;
 } else {
-  settler_want /= 2;
-}
-  }
-
-  if (settler_type
-  && pcity->surplus[O_FOOD] > utype_upkeep_cost(settler_type,
+  worker_want /= 2;
+

[Freeciv-commits] r35578 - in /trunk/ai/default: aicity.c aicity.h daidomestic.c

2017-05-14 Thread cazfi74 
Author: cazfi
Date: Sun May 14 22:07:51 2017
New Revision: 35578

URL: http://svn.gna.org/viewcvs/freeciv?rev=35578=rev
Log:
Rename settler_want as worker_want

See hrm Feature #660200

Modified:
trunk/ai/default/aicity.c
trunk/ai/default/aicity.h
trunk/ai/default/daidomestic.c

Modified: trunk/ai/default/aicity.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aicity.c?rev=35578=35577=35578=diff
==
--- trunk/ai/default/aicity.c   (original)
+++ trunk/ai/default/aicity.c   Sun May 14 22:07:51 2017
@@ -744,7 +744,7 @@
 return;
   }
 
-  city_data->settler_want = 0; /* Make sure old want does not stay if we don't 
want now */
+  city_data->worker_want = 0; /* Make sure old want does not stay if we don't 
want now */
 
   utype = dai_role_utype_for_terrain_class(pcity, UTYF_SETTLERS, TC_LAND);
 
@@ -807,8 +807,8 @@
 
   fc_assert(want >= 0);
 
-  city_data->settler_want = want;
-  city_data->settler_type = dai_role_utype_for_terrain_class(pcity, 
UTYF_SETTLERS,
+  city_data->worker_want = want;
+  city_data->worker_type = dai_role_utype_for_terrain_class(pcity, 
UTYF_SETTLERS,
  TC_LAND);
 }
 
@@ -881,14 +881,14 @@
 adv_free_choice(choice);
 TIMING_LOG(AIT_CITY_MILITARY, TIMER_STOP);
 if (dai_on_war_footing(ait, pplayer) && city_data->choice.want > 0) {
-  city_data->settler_want = 0;
+  city_data->worker_want = 0;
   city_data->founder_want = 0;
   city_data->founder_turn = game.info.turn; /* Do not consider zero we set 
here
  * valid value, if real want 
is needed.
  * Recalculate immediately in 
such situation. */
   continue; /* Go, soldiers! */
 }
-/* Will record its findings in pcity->settler_want */ 
+/* Will record its findings in pcity->worker_want */ 
 TIMING_LOG(AIT_CITY_TERRAIN, TIMER_START);
 contemplate_terrain_improvements(ait, pcity);
 TIMING_LOG(AIT_CITY_TERRAIN, TIMER_STOP);

Modified: trunk/ai/default/aicity.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aicity.h?rev=35578=35577=35578=diff
==
--- trunk/ai/default/aicity.h   (original)
+++ trunk/ai/default/aicity.h   Sun May 14 22:07:51 2017
@@ -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
@@ -64,8 +64,8 @@
   bool founder_boat;/* city founder will need a boat */
   int founder_turn; /* only recalculate every Nth turn */
   int founder_want;
-  int settler_want;
-  struct unit_type *settler_type;
+  int worker_want;
+  struct unit_type *worker_type;
 };
 
 void dai_manage_cities(struct ai_type *ait, struct player *pplayer);

Modified: trunk/ai/default/daidomestic.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/daidomestic.c?rev=35578=35577=35578=diff
==
--- trunk/ai/default/daidomestic.c  (original)
+++ trunk/ai/default/daidomestic.c  Sun May 14 22:07:51 2017
@@ -459,44 +459,44 @@
 {
   struct adv_data *adv = adv_data_get(pplayer, NULL);
   /* Unit type with certain role */
-  struct unit_type *settler_type;
+  struct unit_type *worker_type;
   struct unit_type *founder_type;
-  adv_want settler_want, founder_want;
+  adv_want worker_want, founder_want;
   struct ai_city *city_data = def_ai_city_data(pcity, ait);
   struct adv_choice *choice = adv_new_choice();
 
   /* Find out desire for workers (terrain improvers) */
-  settler_type = city_data->settler_type;
+  worker_type = city_data->worker_type;
 
   /* The worker want is calculated in aicity.c called from
* dai_manage_cities.  The expand value is the % that the AI should
* value expansion (basically to handicap easier difficulty levels)
* and is set when the difficulty level is changed (difficulty.c). */
-  settler_want = city_data->settler_want * pplayer->ai_common.expand / 100;
+  worker_want = city_data->worker_want * pplayer->ai_common.expand / 100;
 
   if (adv->wonder_city == pcity->id) {
-if (!settler_type || settler_type->pop_cost > 0) {
-  settler_want /= 5;
+if (!worker_type || worker_type->pop_cost > 0) {
+  worker_want /= 5;
 } else {
-  settler_want /= 2;
-}
-  }
-
-  if (settler_type
-  && pcity->surplus[O_FOOD] > utype_upkeep_cost(settler_type,
+  worker_want /= 2;
+}
+  }
+
+  if (worker_type != NULL
+  && pcity->surplus[O_FOOD] > utype_upkeep_cost(worker_type,

[Freeciv-commits] r35577 - in /trunk/tools/ruledit: effect_edit.cpp tab_misc.cpp tab_misc.h

2017-05-14 Thread cazfi74 
Author: cazfi
Date: Sun May 14 21:47:15 2017
New Revision: 35577

URL: http://svn.gna.org/viewcvs/freeciv?rev=35577=rev
Log:
Add editing of always active effects

See hrm Feature #659227

Modified:
trunk/tools/ruledit/effect_edit.cpp
trunk/tools/ruledit/tab_misc.cpp
trunk/tools/ruledit/tab_misc.h

Modified: trunk/tools/ruledit/effect_edit.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/effect_edit.cpp?rev=35577=35576=35577=diff
==
--- trunk/tools/ruledit/effect_edit.cpp (original)
+++ trunk/tools/ruledit/effect_edit.cpp Sun May 14 21:47:15 2017
@@ -52,7 +52,11 @@
 
   ui = ui_in;
   selected = nullptr;
-  filter = *filter_in;
+  if (filter_in == nullptr) {
+filter.kind = VUT_NONE;
+  } else {
+filter = *filter_in;
+  }
   name = target;
 
   list_widget = new QListWidget(this);
@@ -108,7 +112,7 @@
 {
   struct effect_list_fill_data *cbdata = (struct effect_list_fill_data *)data;
 
-  if (cbdata->filter == nullptr) {
+  if (cbdata->filter->kind == VUT_NONE) {
 // Look for empty req lists.
 if (requirement_vector_size(>reqs) == 0) {
   cbdata->edit->add_effect_to_list(peffect, cbdata);

Modified: trunk/tools/ruledit/tab_misc.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/tab_misc.cpp?rev=35577=35576=35577=diff
==
--- trunk/tools/ruledit/tab_misc.cpp(original)
+++ trunk/tools/ruledit/tab_misc.cppSun May 14 21:47:15 2017
@@ -39,6 +39,7 @@
 #include "rssanity.h"
 
 // ruledit
+#include "effect_edit.h"
 #include "ruledit.h"
 #include "ruledit_qt.h"
 #include "rulesave.h"
@@ -56,6 +57,7 @@
   QLabel *name_label;
   QLabel *version_label;
   QPushButton *save_button;
+  QPushButton *always_active_effects;
   QPushButton *refresh_button;
   int row = 0;
   QTableWidgetItem *item;
@@ -89,6 +91,9 @@
   save_button = new QPushButton(QString::fromUtf8(R__("Save now")), this);
   connect(save_button, SIGNAL(pressed()), this, SLOT(save_now()));
   main_layout->addWidget(save_button, row++, 1);
+  always_active_effects = new QPushButton(QString::fromUtf8(R__("Always active 
Effects")), this);
+  connect(always_active_effects, SIGNAL(pressed()), this, 
SLOT(edit_aae_effects()));
+  main_layout->addWidget(always_active_effects, row++, 1);
 
   stats = new QTableWidget(this);
   stats->setColumnCount(8);
@@ -336,3 +341,16 @@
 
   stats->resizeColumnsToContents();
 }
+
+/**
+  User wants to edit always active effects
+**/
+void tab_misc::edit_aae_effects()
+{
+  effect_edit *e_edit;
+
+  e_edit = new effect_edit(ui, QString::fromUtf8(R__("Always active")),
+   nullptr);
+
+  e_edit->show();
+}

Modified: trunk/tools/ruledit/tab_misc.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/tab_misc.h?rev=35577=35576=35577=diff
==
--- trunk/tools/ruledit/tab_misc.h  (original)
+++ trunk/tools/ruledit/tab_misc.h  Sun May 14 21:47:15 2017
@@ -35,6 +35,7 @@
   private slots:
 void save_now();
 void refresh_stats();
+void edit_aae_effects();
 
   private:
 ruledit_gui *ui;


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35576 - in /trunk/windows/installer_cross/helpers: installer-helper-gtk3.cmd installer-helper-qt.cmd

2017-05-14 Thread cazfi74 
Author: cazfi
Date: Sun May 14 15:54:06 2017
New Revision: 35576

URL: http://svn.gna.org/viewcvs/freeciv?rev=35576=rev
Log:
Set eol-style of new .cmd files to CRLF

Modified:
trunk/windows/installer_cross/helpers/installer-helper-gtk3.cmd   
(contents, props changed)
trunk/windows/installer_cross/helpers/installer-helper-qt.cmd   (contents, 
props changed)

Modified: trunk/windows/installer_cross/helpers/installer-helper-gtk3.cmd
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_cross/helpers/installer-helper-gtk3.cmd?rev=35576=35575=35576=diff
==
--- trunk/windows/installer_cross/helpers/installer-helper-gtk3.cmd 
(original)
+++ trunk/windows/installer_cross/helpers/installer-helper-gtk3.cmd Sun May 
14 15:54:06 2017
@@ -1,3 +1,3 @@
-cd %~dp0\..
-
-bin\gdk-pixbuf-query-loaders.exe > lib\gdk-pixbuf-2.0\2.10.0\loaders.cache
+cd %~dp0\..
+
+bin\gdk-pixbuf-query-loaders.exe > lib\gdk-pixbuf-2.0\2.10.0\loaders.cache

Propchange: trunk/windows/installer_cross/helpers/installer-helper-gtk3.cmd
--
svn:eol-style = CRLF

Modified: trunk/windows/installer_cross/helpers/installer-helper-qt.cmd
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_cross/helpers/installer-helper-qt.cmd?rev=35576=35575=35576=diff
==
--- trunk/windows/installer_cross/helpers/installer-helper-qt.cmd   
(original)
+++ trunk/windows/installer_cross/helpers/installer-helper-qt.cmd   Sun May 
14 15:54:06 2017
@@ -1,3 +1,3 @@
-cd %~dp0\..
-
-echo "No special install helper actions needed"
+cd %~dp0\..
+
+echo "No special install helper actions needed"

Propchange: trunk/windows/installer_cross/helpers/installer-helper-qt.cmd
--
svn:eol-style = CRLF


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35575 - in /branches/S3_0/windows/installer_cross/helpers: installer-helper-gtk3.cmd installer-helper-qt.cmd

2017-05-14 Thread cazfi74 
Author: cazfi
Date: Sun May 14 15:53:25 2017
New Revision: 35575

URL: http://svn.gna.org/viewcvs/freeciv?rev=35575=rev
Log:
Set eol-style of new .cmd files to CRLF

Modified:
branches/S3_0/windows/installer_cross/helpers/installer-helper-gtk3.cmd   
(contents, props changed)
branches/S3_0/windows/installer_cross/helpers/installer-helper-qt.cmd   
(contents, props changed)

Modified: 
branches/S3_0/windows/installer_cross/helpers/installer-helper-gtk3.cmd
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/windows/installer_cross/helpers/installer-helper-gtk3.cmd?rev=35575=35574=35575=diff
==
--- branches/S3_0/windows/installer_cross/helpers/installer-helper-gtk3.cmd 
(original)
+++ branches/S3_0/windows/installer_cross/helpers/installer-helper-gtk3.cmd 
Sun May 14 15:53:25 2017
@@ -1,3 +1,3 @@
-cd %~dp0\..
-
-bin\gdk-pixbuf-query-loaders.exe > lib\gdk-pixbuf-2.0\2.10.0\loaders.cache
+cd %~dp0\..
+
+bin\gdk-pixbuf-query-loaders.exe > lib\gdk-pixbuf-2.0\2.10.0\loaders.cache

Propchange: 
branches/S3_0/windows/installer_cross/helpers/installer-helper-gtk3.cmd
--
svn:eol-style = CRLF

Modified: branches/S3_0/windows/installer_cross/helpers/installer-helper-qt.cmd
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/windows/installer_cross/helpers/installer-helper-qt.cmd?rev=35575=35574=35575=diff
==
--- branches/S3_0/windows/installer_cross/helpers/installer-helper-qt.cmd   
(original)
+++ branches/S3_0/windows/installer_cross/helpers/installer-helper-qt.cmd   
Sun May 14 15:53:25 2017
@@ -1,3 +1,3 @@
-cd %~dp0\..
-
-echo "No special install helper actions needed"
+cd %~dp0\..
+
+echo "No special install helper actions needed"

Propchange: 
branches/S3_0/windows/installer_cross/helpers/installer-helper-qt.cmd
--
svn:eol-style = CRLF


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35574 - /branches/S3_0/translations/core/POTFILES.in

2017-05-14 Thread cazfi74 
Author: cazfi
Date: Sun May 14 11:14:58 2017
New Revision: 35574

URL: http://svn.gna.org/viewcvs/freeciv?rev=35574=rev
Log:
Update POTFILES.in to tex AI rename

Modified:
branches/S3_0/translations/core/POTFILES.in

Modified: branches/S3_0/translations/core/POTFILES.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/translations/core/POTFILES.in?rev=35574=35573=35574=diff
==
--- branches/S3_0/translations/core/POTFILES.in (original)
+++ branches/S3_0/translations/core/POTFILES.in Sun May 14 11:14:58 2017
@@ -3,7 +3,7 @@
 ai/default/aicity.c
 ai/default/daidiplomacy.c
 ai/threaded/threadedai.c
-ai/threxpr/threxprai.c
+ai/tex/texai.c
 client/agents/cma_core.c
 client/agents/cma_fec.c
 client/attribute.c


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35573 - /trunk/translations/core/POTFILES.in

2017-05-14 Thread cazfi74 
Author: cazfi
Date: Sun May 14 11:14:46 2017
New Revision: 35573

URL: http://svn.gna.org/viewcvs/freeciv?rev=35573=rev
Log:
Update POTFILES.in to tex AI rename

Modified:
trunk/translations/core/POTFILES.in

Modified: trunk/translations/core/POTFILES.in
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/translations/core/POTFILES.in?rev=35573=35572=35573=diff
==
--- trunk/translations/core/POTFILES.in (original)
+++ trunk/translations/core/POTFILES.in Sun May 14 11:14:46 2017
@@ -3,7 +3,7 @@
 ai/default/aicity.c
 ai/default/daidiplomacy.c
 ai/threaded/threadedai.c
-ai/threxpr/threxprai.c
+ai/tex/texai.c
 client/agents/cma_core.c
 client/agents/cma_fec.c
 client/attribute.c


___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

[Freeciv-commits] r35571 - in /trunk/windows: ./ installer_cross/ installer_cross/helpers/

2017-05-14 Thread cazfi74 
Author: cazfi
Date: Sun May 14 10:59:03 2017
New Revision: 35571

URL: http://svn.gna.org/viewcvs/freeciv?rev=35571=rev
Log:
installer_cross: Execute gdk-pixbuf-query-loaders.exe when installing

See hrm Feature #660105

Added:
trunk/windows/installer_cross/helpers/
trunk/windows/installer_cross/helpers/installer-helper-gtk3.cmd   (with 
props)
trunk/windows/installer_cross/helpers/installer-helper-qt.cmd   (with props)
Modified:
trunk/windows/Makefile.am
trunk/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh
trunk/windows/installer_cross/create-freeciv-sdl2-nsi.sh
trunk/windows/installer_cross/installer_build.sh

Modified: trunk/windows/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/windows/Makefile.am?rev=35571=35570=35571=diff
==
--- trunk/windows/Makefile.am   (original)
+++ trunk/windows/Makefile.am   Sun May 14 10:59:03 2017
@@ -39,7 +39,9 @@
installer_cross/freeciv-mp-qt.cmd   \
installer_cross/freeciv-sdl2.cmd\
installer_cross/freeciv-ruledit.cmd \
-   installer_cross/licenses/COPYING.installer
+   installer_cross/licenses/COPYING.installer  \
+   installer_cross/helpers/installer-helper-gtk3.cmd \
+   installer_cross/helpers/installer-helper-qt.cmd
 
 if MINGW
 nodist_noinst_DATA =   \

Modified: trunk/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh?rev=35571=35570=35571=diff
==
--- trunk/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh  (original)
+++ trunk/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh  Sun May 14 
10:59:03 2017
@@ -56,6 +56,8 @@
 
 !insertmacro MUI_PAGE_STARTMENU "Application" \$STARTMENU_FOLDER
 !insertmacro MUI_PAGE_INSTFILES
+
+Page custom HelperScriptFunction
 
 !define MUI_FINISHPAGE_RUN
 !define MUI_FINISHPAGE_RUN_FUNCTION RunFreeciv
@@ -263,6 +265,10 @@
 cat  lib\gdk-pixbuf-2.0\2.10.0\loaders.cache

Propchange: trunk/windows/installer_cross/helpers/installer-helper-gtk3.cmd
--
svn:executable = *

Added: trunk/windows/installer_cross/helpers/installer-helper-qt.cmd
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_cross/helpers/installer-helper-qt.cmd?rev=35571=auto
==
--- trunk/windows/installer_cross/helpers/installer-helper-qt.cmd   (added)
+++ trunk/windows/installer_cross/helpers/installer-helper-qt.cmd   Sun May 
14 10:59:03 2017
@@ -0,0 +1,3 @@
+cd %~dp0\..
+
+echo "No special install helper actions needed"

Propchange: trunk/windows/installer_cross/helpers/installer-helper-qt.cmd
--
svn:executable = *

Modified: trunk/windows/installer_cross/installer_build.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_cross/installer_build.sh?rev=35571=35570=35571=diff
==
--- trunk/windows/installer_cross/installer_build.sh(original)
+++ trunk/windows/installer_cross/installer_build.shSun May 14 10:59:03 2017
@@ -32,7 +32,8 @@
   cp $1/bin/libxml2-2.dll $2/ &&
   cp $1/bin/libharfbuzz-0.dll $2/ &&
   mkdir -p $2/bin &&
-  cp $1/bin/gdk-pixbuf-query-loaders.exe $2/bin/
+  cp $1/bin/gdk-pixbuf-query-loaders.exe $2/bin/ &&
+  cp ./helpers/installer-helper-gtk3.cmd $2/bin/installer-helper.cmd
 }
 
 add_sdl2_mixer_env() {
@@ -54,7 +55,9 @@
   cp -R $1/plugins $2/ &&
   cp $1/bin/Qt5Core.dll $2/ &&
   cp $1/bin/Qt5Gui.dll $2/ &&
-  cp

[Freeciv-commits] r35572 - in /branches/S3_0/windows: ./ installer_cross/ installer_cross/helpers/

2017-05-14 Thread cazfi74 
Author: cazfi
Date: Sun May 14 10:59:10 2017
New Revision: 35572

URL: http://svn.gna.org/viewcvs/freeciv?rev=35572=rev
Log:
installer_cross: Execute gdk-pixbuf-query-loaders.exe when installing

See hrm Feature #660105

Added:
branches/S3_0/windows/installer_cross/helpers/
branches/S3_0/windows/installer_cross/helpers/installer-helper-gtk3.cmd   
(with props)
branches/S3_0/windows/installer_cross/helpers/installer-helper-qt.cmd   
(with props)
Modified:
branches/S3_0/windows/Makefile.am
branches/S3_0/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh
branches/S3_0/windows/installer_cross/create-freeciv-sdl2-nsi.sh
branches/S3_0/windows/installer_cross/installer_build.sh

Modified: branches/S3_0/windows/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/windows/Makefile.am?rev=35572=35571=35572=diff
==
--- branches/S3_0/windows/Makefile.am   (original)
+++ branches/S3_0/windows/Makefile.am   Sun May 14 10:59:10 2017
@@ -42,7 +42,9 @@
installer_cross/freeciv-mp-qt.cmd   \
installer_cross/freeciv-sdl2.cmd\
installer_cross/freeciv-ruledit.cmd \
-   installer_cross/licenses/COPYING.installer
+   installer_cross/licenses/COPYING.installer  \
+   installer_cross/helpers/installer-helper-gtk3.cmd \
+   installer_cross/helpers/installer-helper-qt.cmd
 
 if MINGW
 nodist_noinst_DATA =   \

Modified: branches/S3_0/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh?rev=35572=35571=35572=diff
==
--- branches/S3_0/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh  
(original)
+++ branches/S3_0/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh  Sun May 
14 10:59:10 2017
@@ -56,6 +56,8 @@
 
 !insertmacro MUI_PAGE_STARTMENU "Application" \$STARTMENU_FOLDER
 !insertmacro MUI_PAGE_INSTFILES
+
+Page custom HelperScriptFunction
 
 !define MUI_FINISHPAGE_RUN
 !define MUI_FINISHPAGE_RUN_FUNCTION RunFreeciv
@@ -263,6 +265,10 @@
 cat  lib\gdk-pixbuf-2.0\2.10.0\loaders.cache

Propchange: 
branches/S3_0/windows/installer_cross/helpers/installer-helper-gtk3.cmd
--
svn:executable = *

Added: branches/S3_0/windows/installer_cross/helpers/installer-helper-qt.cmd
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/windows/installer_cross/helpers/installer-helper-qt.cmd?rev=35572=auto
==
--- branches/S3_0/windows/installer_cross/helpers/installer-helper-qt.cmd   
(added)
+++ branches/S3_0/windows/installer_cross/helpers/installer-helper-qt.cmd   
Sun May 14 10:59:10 2017
@@ -0,0 +1,3 @@
+cd %~dp0\..
+
+echo "No special install helper actions needed"

Propchange: 
branches/S3_0/windows/installer_cross/helpers/installer-helper-qt.cmd
--
svn:executable = *

Modified: branches/S3_0/windows/installer_cross/installer_build.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/windows/installer_cross/installer_build.sh?rev=35572=35571=35572=diff
==
--- branches/S3_0/windows/installer_cross/installer_build.sh(original)
+++ branches/S3_0/windows/installer_cross/installer_build.shSun May 14 
10:59:10 2017
@@ -32,7 +32,8 @@
   cp $1/bin/libxml2-2.dll $2/ &&
   cp $1/bin/libharfbuzz-0.dll $2/ &&
   mkdir -p $2/bin &&
-  cp $1/bin/gdk-pixbuf-query-loaders.exe $2/bin/
+  cp

[Freeciv-commits] r35570 - in /trunk: ai/default/ client/ client/gui-gtk-3.0/ client/gui-gtk-3.22/ client/gui-gtk-4.0/ client/gui-qt/ client/g...

2017-05-14 Thread cazfi74 
Author: cazfi
Date: Sun May 14 10:30:35 2017
New Revision: 35570

URL: http://svn.gna.org/viewcvs/freeciv?rev=35570=rev
Log:
Add map parameter to can_exist_at family of functions

See hrm Feature #660079

Modified:
trunk/ai/default/aiunit.c
trunk/ai/default/daimilitary.c
trunk/client/control.c
trunk/client/goto.c
trunk/client/gui-gtk-3.0/action_dialog.c
trunk/client/gui-gtk-3.0/citydlg.c
trunk/client/gui-gtk-3.0/editprop.c
trunk/client/gui-gtk-3.22/action_dialog.c
trunk/client/gui-gtk-3.22/citydlg.c
trunk/client/gui-gtk-3.22/editprop.c
trunk/client/gui-gtk-4.0/action_dialog.c
trunk/client/gui-gtk-4.0/citydlg.c
trunk/client/gui-gtk-4.0/editprop.c
trunk/client/gui-qt/dialogs.cpp
trunk/client/gui-qt/hudwidget.cpp
trunk/client/gui-sdl2/action_dialog.c
trunk/common/actions.c
trunk/common/aicore/pf_tools.c
trunk/common/city.c
trunk/common/combat.c
trunk/common/map.c
trunk/common/map.h
trunk/common/movement.c
trunk/common/movement.h
trunk/common/reqtext.c
trunk/common/requirements.c
trunk/common/scriptcore/api_game_methods.c
trunk/common/unit.c
trunk/common/unitlist.c
trunk/server/advisors/advgoto.c
trunk/server/advisors/advruleset.c
trunk/server/advisors/autoexplorer.c
trunk/server/animals.c
trunk/server/barbarian.c
trunk/server/citytools.c
trunk/server/edithand.c
trunk/server/maphand.c
trunk/server/plrhand.c
trunk/server/sanitycheck.c
trunk/server/savegame2.c
trunk/server/savegame3.c
trunk/server/scripting/api_server_edit.c
trunk/server/unithand.c
trunk/server/unittools.c

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: trunk/ai/default/aiunit.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aiunit.c?rev=35570=35569=35570=diff

Modified: trunk/ai/default/daimilitary.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/daimilitary.c?rev=35570=35569=35570=diff

Modified: trunk/client/control.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/control.c?rev=35570=35569=35570=diff

Modified: trunk/client/goto.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/goto.c?rev=35570=35569=35570=diff

Modified: trunk/client/gui-gtk-3.0/action_dialog.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/action_dialog.c?rev=35570=35569=35570=diff

Modified: trunk/client/gui-gtk-3.0/citydlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/citydlg.c?rev=35570=35569=35570=diff

Modified: trunk/client/gui-gtk-3.0/editprop.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/editprop.c?rev=35570=35569=35570=diff

Modified: trunk/client/gui-gtk-3.22/action_dialog.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.22/action_dialog.c?rev=35570=35569=35570=diff

Modified: trunk/client/gui-gtk-3.22/citydlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.22/citydlg.c?rev=35570=35569=35570=diff

Modified: trunk/client/gui-gtk-3.22/editprop.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.22/editprop.c?rev=35570=35569=35570=diff

Modified: trunk/client/gui-gtk-4.0/action_dialog.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-4.0/action_dialog.c?rev=35570=35569=35570=diff

Modified: trunk/client/gui-gtk-4.0/citydlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-4.0/citydlg.c?rev=35570=35569=35570=diff

Modified: trunk/client/gui-gtk-4.0/editprop.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-4.0/editprop.c?rev=35570=35569=35570=diff

Modified: trunk/client/gui-qt/dialogs.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/dialogs.cpp?rev=35570=35569=35570=diff

Modified: trunk/client/gui-qt/hudwidget.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/hudwidget.cpp?rev=35570=35569=35570=diff

Modified: trunk/client/gui-sdl2/action_dialog.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/action_dialog.c?rev=35570=35569=35570=diff

Modified: trunk/common/actions.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/actions.c?rev=35570=35569=35570=diff

Modified: trunk/common/aicore/pf_tools.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/aicore/pf_tools.c?rev=35570=35569=35570=diff

Modified: trunk/common/city.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/city.c?rev=35570=35569=35570=diff

Modified: trunk/common/combat.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/combat.c?rev=35570=35569=35570=diff

Modified: trunk/common/map.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/map.c?rev=35570=35569=35570=diff

Modified: trunk/common/map.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/map.h?rev=35570=35569=35570=diff

Modified: trunk/common/movement.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/movement.c?rev=35570=35569=35570=diff

Modified: trunk/common/movement.h