[Freeciv-commits] r25393 - in /trunk/client: packhand.c tilespec.c
Author: pepeto
Date: Sun Jul 6 10:23:07 2014
New Revision: 25393
URL: http://svn.gna.org/viewcvs/freeciv?rev=25393view=rev
Log:
Downgrade Map topology and tileset incompatible message to
LOG_NORMAL to avoid error messages (and backtraces), but keep
the popup for warning the user.
See gna bug #22258
Modified:
trunk/client/packhand.c
trunk/client/tilespec.c
Modified: trunk/client/packhand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/packhand.c?rev=25393r1=25392r2=25393view=diff
==
--- trunk/client/packhand.c (original)
+++ trunk/client/packhand.c Sun Jul 6 10:23:07 2014
@@ -1750,7 +1750,7 @@
map.ysize = ysize;
if (!tileset_map_topo_compatible(topology_id, tileset)) {
-tileset_error(LOG_ERROR, _(Map topology and tileset incompatible.));
+tileset_error(LOG_NORMAL, _(Map topology and tileset incompatible.));
}
map.topology_id = topology_id;
Modified: trunk/client/tilespec.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/tilespec.c?rev=25393r1=25392r2=25393view=diff
==
--- trunk/client/tilespec.c (original)
+++ trunk/client/tilespec.c Sun Jul 6 10:23:07 2014
@@ -581,7 +581,7 @@
log_base(level, %s, buf);
- if (level = LOG_ERROR) {
+ if (level = LOG_NORMAL) {
show_tileset_error(buf);
}
@@ -1172,7 +1172,7 @@
}
if (!tileset_map_topo_compatible(map.topology_id, tileset)) {
-tileset_error(LOG_ERROR, _(Map topology and tileset incompatible.));
+tileset_error(LOG_NORMAL, _(Map topology and tileset incompatible.));
}
terrain_type_iterate(pterrain) {
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25394 - in /trunk: ai/default/ client/ client/gui-gtk-2.0/ client/gui-gtk-3.0/ client/gui-qt/ client/gui-sdl/ client/gui-sd...
Author: pepeto Date: Sun Jul 6 10:34:55 2014 New Revision: 25394 URL: http://svn.gna.org/viewcvs/freeciv?rev=25394view=rev Log: Move the research advance name accessor from common/tech.[ch] to research.[ch]. Renumbered A_UNSET, A_FUTURE and A_UNKNOWN. See gna patch #4888 Modified: trunk/ai/default/advdiplomacy.c trunk/ai/default/ailog.c trunk/ai/default/aiparatrooper.c trunk/ai/default/aitech.c trunk/client/climisc.c trunk/client/gui-gtk-2.0/dialogs.c trunk/client/gui-gtk-2.0/diplomat_dialog.c trunk/client/gui-gtk-2.0/helpdlg.c trunk/client/gui-gtk-2.0/inteldlg.c trunk/client/gui-gtk-2.0/repodlgs.c trunk/client/gui-gtk-3.0/dialogs.c trunk/client/gui-gtk-3.0/diplomat_dialog.c trunk/client/gui-gtk-3.0/helpdlg.c trunk/client/gui-gtk-3.0/inteldlg.c trunk/client/gui-gtk-3.0/repodlgs.c trunk/client/gui-qt/dialogs.cpp trunk/client/gui-qt/plrdlg.cpp trunk/client/gui-sdl/inteldlg.c trunk/client/gui-sdl/mapview.c trunk/client/gui-sdl/repodlgs.c trunk/client/gui-sdl2/inteldlg.c trunk/client/gui-sdl2/mapview.c trunk/client/gui-sdl2/repodlgs.c trunk/client/gui-xaw/helpdlg.c trunk/client/gui-xaw/inteldlg.c trunk/client/gui-xaw/repodlgs.c trunk/client/helpdata.c trunk/client/packhand.c trunk/client/reqtree.c trunk/client/text.c trunk/common/research.c trunk/common/research.h trunk/common/tech.c trunk/common/tech.h trunk/server/cityturn.c trunk/server/diplhand.c trunk/server/ruleset.c trunk/server/savegame.c trunk/server/savegame2.c trunk/server/techtools.c trunk/server/unittools.c trunk/tools/ruledit/tab_tech.cpp [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/ai/default/advdiplomacy.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/advdiplomacy.c?rev=25394r1=25393r2=25394view=diff Modified: trunk/ai/default/ailog.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/ailog.c?rev=25394r1=25393r2=25394view=diff Modified: trunk/ai/default/aiparatrooper.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aiparatrooper.c?rev=25394r1=25393r2=25394view=diff Modified: trunk/ai/default/aitech.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aitech.c?rev=25394r1=25393r2=25394view=diff Modified: trunk/client/climisc.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/climisc.c?rev=25394r1=25393r2=25394view=diff Modified: trunk/client/gui-gtk-2.0/dialogs.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/dialogs.c?rev=25394r1=25393r2=25394view=diff Modified: trunk/client/gui-gtk-2.0/diplomat_dialog.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/diplomat_dialog.c?rev=25394r1=25393r2=25394view=diff Modified: trunk/client/gui-gtk-2.0/helpdlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/helpdlg.c?rev=25394r1=25393r2=25394view=diff Modified: trunk/client/gui-gtk-2.0/inteldlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/inteldlg.c?rev=25394r1=25393r2=25394view=diff Modified: trunk/client/gui-gtk-2.0/repodlgs.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/repodlgs.c?rev=25394r1=25393r2=25394view=diff Modified: trunk/client/gui-gtk-3.0/dialogs.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/dialogs.c?rev=25394r1=25393r2=25394view=diff Modified: trunk/client/gui-gtk-3.0/diplomat_dialog.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/diplomat_dialog.c?rev=25394r1=25393r2=25394view=diff Modified: trunk/client/gui-gtk-3.0/helpdlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/helpdlg.c?rev=25394r1=25393r2=25394view=diff Modified: trunk/client/gui-gtk-3.0/inteldlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/inteldlg.c?rev=25394r1=25393r2=25394view=diff Modified: trunk/client/gui-gtk-3.0/repodlgs.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/repodlgs.c?rev=25394r1=25393r2=25394view=diff Modified: trunk/client/gui-qt/dialogs.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/dialogs.cpp?rev=25394r1=25393r2=25394view=diff Modified: trunk/client/gui-qt/plrdlg.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/plrdlg.cpp?rev=25394r1=25393r2=25394view=diff Modified: trunk/client/gui-sdl/inteldlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl/inteldlg.c?rev=25394r1=25393r2=25394view=diff Modified: trunk/client/gui-sdl/mapview.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl/mapview.c?rev=25394r1=25393r2=25394view=diff Modified: trunk/client/gui-sdl/repodlgs.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl/repodlgs.c?rev=25394r1=25393r2=25394view=diff Modified: trunk/client/gui-sdl2/inteldlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/inteldlg.c?rev=25394r1=25393r2=25394view=diff
[Freeciv-commits] r25395 - in /trunk: client/packhand.c server/edithand.c
Author: pepeto
Date: Sun Jul 6 10:40:36 2014
New Revision: 25395
URL: http://svn.gna.org/viewcvs/freeciv?rev=25395view=rev
Log:
Send research info when editing the advances for a player via
the editor. Also, handle correctly this case in client side.
Reported by Marko Lindqvist (cazfi@gna)
See gna bug #22252
Modified:
trunk/client/packhand.c
trunk/server/edithand.c
Modified: trunk/client/packhand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/packhand.c?rev=25395r1=25394r2=25395view=diff
==
--- trunk/client/packhand.c (original)
+++ trunk/client/packhand.c Sun Jul 6 10:40:36 2014
@@ -2141,22 +2141,29 @@
break;
} research_players_iterate_end;
- if (C_S_RUNNING == client_state()
- client_has_player()
- presearch == research_get(client_player())) {
-if (poptechup !client_player()-ai_controlled) {
- science_report_dialog_popup(FALSE);
-}
-science_report_dialog_update();
-if (tech_changed) {
- /* If we just learned bridge building and focus is on a settler
- * on a river the road menu item will remain disabled unless we
- * do this. (applies in other cases as well.) */
- if (0 get_num_units_in_focus()) {
-menus_update();
+ if (C_S_RUNNING == client_state()) {
+if (presearch == research_get(client_player())) {
+ if (poptechup !client_player()-ai_controlled) {
+science_report_dialog_popup(FALSE);
}
- /* If we got a new tech the tech tree news an update. */
- science_report_dialog_redraw();
+ science_report_dialog_update();
+ if (tech_changed) {
+/* If we just learned bridge building and focus is on a settler
+ * on a river the road menu item will remain disabled unless we
+ * do this. (applies in other cases as well.) */
+if (0 get_num_units_in_focus()) {
+ menus_update();
+}
+/* If we got a new tech the tech tree news an update. */
+science_report_dialog_redraw();
+ }
+}
+if (editor_is_active()) {
+ editgui_refresh();
+ research_players_iterate(presearch, pplayer) {
+editgui_notify_object_changed(OBJTYPE_PLAYER, player_number(pplayer),
+ FALSE);
+ } research_players_iterate_end;
}
}
}
Modified: trunk/server/edithand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/edithand.c?rev=25395r1=25394r2=25395view=diff
==
--- trunk/server/edithand.c (original)
+++ trunk/server/edithand.c Sun Jul 6 10:40:36 2014
@@ -1277,6 +1277,7 @@
/* Inform everybody about global advances */
send_game_info(NULL);
+send_research_info(research, NULL);
}
if (changed) {
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25396 - in /trunk/common: tech.c tech.h
Author: pepeto
Date: Sun Jul 6 10:48:40 2014
New Revision: 25396
URL: http://svn.gna.org/viewcvs/freeciv?rev=25396view=rev
Log:
Add utility for iterating all requirements for reaching an
advance, instead of building recursive functions.
See gna patch #4890
Modified:
trunk/common/tech.c
trunk/common/tech.h
Modified: trunk/common/tech.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/tech.c?rev=25396r1=25395r2=25396view=diff
==
--- trunk/common/tech.c (original)
+++ trunk/common/tech.c Sun Jul 6 10:48:40 2014
@@ -21,7 +21,7 @@
/* utility */
#include fcintl.h
-#include game.h
+#include iterator.h
#include log.h
#include mem.h/* free */
#include shared.h /* ARRAY_SIZE */
@@ -29,14 +29,23 @@
#include support.h
/* common */
+#include game.h
#include research.h
-
#include tech.h
+
/* Define this for additional debug information about the tech status
* (in player_research_update()). */
#undef DEBUG_TECH
+
+struct advance_req_iter {
+ struct iterator base;
+ bv_techs done;
+ const struct advance *array[A_LAST];
+ const struct advance **current, **end;
+};
+#define ADVANCE_REQ_ITER(it) ((struct advance_req_iter *) it)
/* the advances array is now setup in:
* server/ruleset.c (for the server)
@@ -935,3 +944,80 @@
tech_free(i);
} advance_index_iterate_end;
}
+
+
+/
+ Return the size of the advance requirements iterator.
+/
+size_t advance_req_iter_sizeof(void)
+{
+ return sizeof(struct advance_req_iter);
+}
+
+/
+ Return the current advance.
+/
+static void *advance_req_iter_get(const struct iterator *it)
+{
+ return (void *) *ADVANCE_REQ_ITER(it)-current;
+}
+
+/
+ Jump to next advance requirement.
+/
+static void advance_req_iter_next(struct iterator *it)
+{
+ struct advance_req_iter *iter = ADVANCE_REQ_ITER(it);
+ const struct advance *padvance = *iter-current, *preq;
+ enum tech_req req;
+ bool new = FALSE;
+
+ for (req = AR_ONE; req AR_SIZE; req++) {
+preq = valid_advance(advance_requires(padvance, req));
+if (NULL != preq
+ A_NONE != advance_number(preq)
+ !BV_ISSET(iter-done, advance_number(preq))) {
+ BV_SET(iter-done, advance_number(preq));
+ if (new) {
+*iter-end++ = preq;
+ } else {
+*iter-current = preq;
+new = TRUE;
+ }
+}
+ }
+
+ if (!new) {
+iter-current++;
+ }
+}
+
+/
+ Return whether we finished to iterate or not.
+/
+static bool advance_req_iter_valid(const struct iterator *it)
+{
+ const struct advance_req_iter *iter = ADVANCE_REQ_ITER(it);
+
+ return iter-current iter-end;
+}
+
+/
+ Initialize an advance requirements iterator.
+/
+struct iterator *advance_req_iter_init(struct advance_req_iter *it,
+ const struct advance *goal)
+{
+ struct iterator *base = ITERATOR(it);
+
+ base-get = advance_req_iter_get;
+ base-next = advance_req_iter_next;
+ base-valid = advance_req_iter_valid;
+
+ BV_CLR_ALL(it-done);
+ it-current = it-array;
+ *it-current = goal;
+ it-end = it-current + 1;
+
+ return base;
+}
Modified: trunk/common/tech.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/tech.h?rev=25396r1=25395r2=25396view=diff
==
--- trunk/common/tech.h (original)
+++ trunk/common/tech.h Sun Jul 6 10:48:40 2014
@@ -220,6 +220,19 @@
}\
}
+/* Advance requirements iterator. */
+struct advance_req_iter;
+
+size_t advance_req_iter_sizeof(void);
+struct iterator *advance_req_iter_init(struct advance_req_iter *it,
+ const struct advance *goal);
+
+#define advance_req_iterate(_goal, _padvance) \
+ generic_iterate(struct advance_req_iter, const struct advance *, \
+ _padvance, advance_req_iter_sizeof, advance_req_iter_init,\
+ _goal)
+#define advance_req_iterate_end generic_iterate_end
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
___
Freeciv-commits mailing
[Freeciv-commits] r25397 - in /trunk: ./ client/ common/ server/
Author: pepeto
Date: Sun Jul 6 10:59:49 2014
New Revision: 25397
URL: http://svn.gna.org/viewcvs/freeciv?rev=25397view=rev
Log:
precalc_tech_data() renamed tech_precalc_data(). This function
is now called only in server side. The client just admits the
values the server send to it. Base tech costs are now cached
into the advance structure, instead of having a separate static
array.
See gna patch #4891
Modified:
trunk/client/client_main.c
trunk/client/packhand.c
trunk/common/packets.def
trunk/common/tech.c
trunk/common/tech.h
trunk/fc_version
trunk/server/ruleset.c
Modified: trunk/client/client_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/client_main.c?rev=25397r1=25396r2=25397view=diff
==
--- trunk/client/client_main.c (original)
+++ trunk/client/client_main.c Sun Jul 6 10:59:49 2014
@@ -830,7 +830,6 @@
init_city_report_game_data();
options_dialogs_set();
create_event(NULL, E_GAME_START, ftc_client, _(Game started.));
-precalc_tech_data();
if (pplayer) {
player_research_update(pplayer);
}
@@ -878,7 +877,6 @@
/* From C_S_PREPARING. */
init_city_report_game_data();
options_dialogs_set();
- precalc_tech_data();
if (pplayer) {
player_research_update(pplayer);
}
Modified: trunk/client/packhand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/packhand.c?rev=25397r1=25396r2=25397view=diff
==
--- trunk/client/packhand.c (original)
+++ trunk/client/packhand.c Sun Jul 6 10:59:49 2014
@@ -3049,7 +3049,7 @@
a-require[AR_TWO] = advance_by_number(p-req[AR_TWO]);
a-require[AR_ROOT] = advance_by_number(p-root_req);
a-flags = p-flags;
- a-preset_cost = p-preset_cost;
+ a-cost = p-cost;
a-num_reqs = p-num_reqs;
PACKET_STRVEC_EXTRACT(a-helptext, p-helptext);
Modified: trunk/common/packets.def
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/packets.def?rev=25397r1=25396r2=25397view=diff
==
--- trunk/common/packets.def(original)
+++ trunk/common/packets.defSun Jul 6 10:59:49 2014
@@ -1333,7 +1333,8 @@
TECH req[2];
TECH root_req;
BV_TECH_FLAGS flags;
- UINT32 preset_cost, num_reqs;
+ FLOAT10x7 cost;
+ UINT32 num_reqs;
STRING name[MAX_LEN_NAME];
STRING rule_name[MAX_LEN_NAME];
STRING helptext[MAX_LEN_PACKET];
Modified: trunk/common/tech.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/tech.c?rev=25397r1=25396r2=25397view=diff
==
--- trunk/common/tech.c (original)
+++ trunk/common/tech.c Sun Jul 6 10:59:49 2014
@@ -52,10 +52,6 @@
* client/packhand.c (for the client)
*/
struct advance advances[A_LAST];
-
-/* Precalculated costs according to techcost style 1. These do not include
- * the sciencebox multiplier. */
-static double techcoststyle1[A_LAST];
static int tech_upkeep_calc(const struct player *pplayer);
@@ -336,44 +332,29 @@
static int tech_upkeep_calc(const struct player *pplayer)
{
struct research *research = research_get(pplayer);
- int tech_cost_style = game.info.tech_cost_style;
int f = research-future_tech, t = research-techs_researched;
- double tech_bulb_sum = 0.0;
-
- if (!pplayer) {
-return 0;
- }
+ double tech_bulb_sum;
/* upkeep cost for 'normal' techs (t) */
- switch (tech_cost_style) {
+ switch (game.info.tech_cost_style) {
case 0:
/* sum_1^t x = t * (t + 1) / 2 */
-tech_bulb_sum += (double)t * (t + 1) / 2 * game.info.base_tech_cost;
+tech_bulb_sum += game.info.base_tech_cost * t * (t + 1) / 2;
break;
case 1:
+ case 2:
case 3:
-advance_index_iterate(A_NONE, i) {
- if (research_invention_state(research, i) == TECH_KNOWN) {
-tech_bulb_sum += techcoststyle1[i];
- }
-} advance_index_iterate_end;
-break;
- case 2:
case 4:
advance_index_iterate(A_NONE, i) {
if (research_invention_state(research, i) == TECH_KNOWN) {
-if (advances[i].preset_cost != -1) {
- tech_bulb_sum += advances[i].preset_cost;
-} else {
- tech_bulb_sum += techcoststyle1[i];
-}
+tech_bulb_sum += advances[i].cost;
}
} advance_index_iterate_end;
break;
default:
-fc_assert_ret_val_msg(FALSE, 0, Invalid tech_cost_style %d %d,
- game.info.tech_cost_style,
- tech_cost_style);
+fc_assert_msg(FALSE, Invalid tech_cost_style %d,
+ game.info.tech_cost_style);
+tech_bulb_sum = 0.0;
}
/* upkeep cost for future techs (f) are calculated using style 0:
@@ -580,32 +561,18 @@
tech_cost_style = 0;
}
- if (tech_cost_style == 2 advances[tech].preset_cost == -1) {
-/* No preset,
[Freeciv-commits] r25398 - in /trunk: ai/default/ client/ client/gui-gtk-2.0/ client/gui-gtk-3.0/ client/gui-sdl/ client/gui-sdl2/ client/gui-...
Author: pepeto Date: Sun Jul 6 11:11:36 2014 New Revision: 25398 URL: http://svn.gna.org/viewcvs/freeciv?rev=25398view=rev Log: Move num_unknown_techs_for_goal(), total_bulbs_required_for_goal() and is_tech_a_req_for_goal() from common/tech.[ch] to common/research.[ch] as research_goal_unknown_techs(), research_goal_bulbs_required() and research_goal_tech_req(). Implement their behavior when NULL is passed as research pointer. See gna patch #4892 Modified: trunk/ai/default/advdiplomacy.c trunk/ai/default/advmilitary.c trunk/ai/default/aicity.c trunk/ai/default/ailog.c trunk/ai/default/aiparatrooper.c trunk/ai/default/aitech.c trunk/ai/default/daieffects.c trunk/client/gui-gtk-2.0/helpdlg.c trunk/client/gui-gtk-2.0/repodlgs.c trunk/client/gui-gtk-3.0/helpdlg.c trunk/client/gui-gtk-3.0/repodlgs.c trunk/client/gui-sdl/repodlgs.c trunk/client/gui-sdl2/repodlgs.c trunk/client/gui-xaw/helpdlg.c trunk/client/gui-xaw/repodlgs.c trunk/client/helpdata.c trunk/client/reqtree.c trunk/client/text.c trunk/common/research.c trunk/common/research.h trunk/common/tech.c trunk/common/tech.h trunk/server/advisors/advdata.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/ai/default/advdiplomacy.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/advdiplomacy.c?rev=25398r1=25397r2=25398view=diff Modified: trunk/ai/default/advmilitary.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/advmilitary.c?rev=25398r1=25397r2=25398view=diff Modified: trunk/ai/default/aicity.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aicity.c?rev=25398r1=25397r2=25398view=diff Modified: trunk/ai/default/ailog.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/ailog.c?rev=25398r1=25397r2=25398view=diff Modified: trunk/ai/default/aiparatrooper.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aiparatrooper.c?rev=25398r1=25397r2=25398view=diff Modified: trunk/ai/default/aitech.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aitech.c?rev=25398r1=25397r2=25398view=diff Modified: trunk/ai/default/daieffects.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/daieffects.c?rev=25398r1=25397r2=25398view=diff Modified: trunk/client/gui-gtk-2.0/helpdlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/helpdlg.c?rev=25398r1=25397r2=25398view=diff Modified: trunk/client/gui-gtk-2.0/repodlgs.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/repodlgs.c?rev=25398r1=25397r2=25398view=diff Modified: trunk/client/gui-gtk-3.0/helpdlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/helpdlg.c?rev=25398r1=25397r2=25398view=diff Modified: trunk/client/gui-gtk-3.0/repodlgs.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/repodlgs.c?rev=25398r1=25397r2=25398view=diff Modified: trunk/client/gui-sdl/repodlgs.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl/repodlgs.c?rev=25398r1=25397r2=25398view=diff Modified: trunk/client/gui-sdl2/repodlgs.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/repodlgs.c?rev=25398r1=25397r2=25398view=diff Modified: trunk/client/gui-xaw/helpdlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-xaw/helpdlg.c?rev=25398r1=25397r2=25398view=diff Modified: trunk/client/gui-xaw/repodlgs.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-xaw/repodlgs.c?rev=25398r1=25397r2=25398view=diff Modified: trunk/client/helpdata.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/helpdata.c?rev=25398r1=25397r2=25398view=diff Modified: trunk/client/reqtree.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/reqtree.c?rev=25398r1=25397r2=25398view=diff Modified: trunk/client/text.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/text.c?rev=25398r1=25397r2=25398view=diff Modified: trunk/common/research.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/research.c?rev=25398r1=25397r2=25398view=diff Modified: trunk/common/research.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/research.h?rev=25398r1=25397r2=25398view=diff Modified: trunk/common/tech.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/tech.c?rev=25398r1=25397r2=25398view=diff Modified: trunk/common/tech.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/tech.h?rev=25398r1=25397r2=25398view=diff Modified: trunk/server/advisors/advdata.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/advisors/advdata.c?rev=25398r1=25397r2=25398view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25399 - /branches/S2_4/po/en_GB.po
Author: jtn Date: Sun Jul 6 17:26:52 2014 New Revision: 25399 URL: http://svn.gna.org/viewcvs/freeciv?rev=25399view=rev Log: en_GB: fix a civilization that had slipped through Modified: branches/S2_4/po/en_GB.po Modified: branches/S2_4/po/en_GB.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_4/po/en_GB.po?rev=25399r1=25398r2=25399view=diff == --- branches/S2_4/po/en_GB.po (original) +++ branches/S2_4/po/en_GB.po Sun Jul 6 17:26:52 2014 @@ -66,7 +66,7 @@ Project-Id-Version: Freeciv 2.3.0\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2014-07-04 22:22+0100\n -PO-Revision-Date: 2014-07-05 00:36+0100\n +PO-Revision-Date: 2014-07-06 16:22+0100\n Last-Translator: Jacob Nevins 0jacobnk@chiark.greenend.org.uk\n Language-Team: \n Language: en_GB\n @@ -24968,7 +24968,7 @@ #. TRANS: Legend for nation in core set #: data/nation/arab.ruleset:7 msgid The Arab/Islamic civilization of 622 to 1495 CE. -msgstr The Arab/Islamic civilization of 622 to 1495 CE. +msgstr The Arab/Islamic civilisation of 622 to 1495 CE. #: data/nation/aragonese.ruleset:3 msgid Aragonese ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25400 - in /branches/S2_5/translations: freeciv/en_GB.po nations/en_GB.po
Author: jtn Date: Sun Jul 6 17:35:52 2014 New Revision: 25400 URL: http://svn.gna.org/viewcvs/freeciv?rev=25400view=rev Log: Copied current S2_4 en_GB.po (r25399) to S2_5. Distributed to separate po-files according to the procedure in patch #4650. Stats on S2_5: freeciv: 91%: 5354 translated, 414 fuzzy, 138 untranslated. nations: 97.2%: 1795 translated, 26 fuzzy, 25 untranslated. Modified: branches/S2_5/translations/freeciv/en_GB.po branches/S2_5/translations/nations/en_GB.po [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/S2_5/translations/freeciv/en_GB.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/en_GB.po?rev=25400r1=25399r2=25400view=diff Modified: branches/S2_5/translations/nations/en_GB.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/nations/en_GB.po?rev=25400r1=25399r2=25400view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25401 - /trunk/tools/ruledit/rulesave.c
Author: sveinung
Date: Sun Jul 6 21:01:52 2014
New Revision: 25401
URL: http://svn.gna.org/viewcvs/freeciv?rev=25401view=rev
Log:
Make ruledit compile again
SVN commit 25397 renamed the advance field preset_cost to cost without updating
its use in ruledit's rulesave.c. Update it.
See bug bug #22286
Modified:
trunk/tools/ruledit/rulesave.c
Modified: trunk/tools/ruledit/rulesave.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/rulesave.c?rev=25401r1=25400r2=25401view=diff
==
--- trunk/tools/ruledit/rulesave.c (original)
+++ trunk/tools/ruledit/rulesave.c Sun Jul 6 21:01:52 2014
@@ -1323,8 +1323,8 @@
secfile_insert_str_vec(sfile, flag_names, set_count,
%s.flags, path);
}
- if (pa-preset_cost = 0) {
-secfile_insert_int(sfile, pa-preset_cost, %s.cost, path);
+ if (pa-cost = 0) {
+secfile_insert_int(sfile, pa-cost, %s.cost, path);
}
save_strvec(sfile, pa-helptext, path, helptext);
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25404 - /branches/S2_4/configure.ac
Author: cazfi
Date: Sun Jul 6 23:25:44 2014
New Revision: 25404
URL: http://svn.gna.org/viewcvs/freeciv?rev=25404view=rev
Log:
Add -lintl to UTILITY_LIBS when we notice that we need it.
See bug #22266
Modified:
branches/S2_4/configure.ac
Modified: branches/S2_4/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/configure.ac?rev=25404r1=25403r2=25404view=diff
==
--- branches/S2_4/configure.ac (original)
+++ branches/S2_4/configure.ac Sun Jul 6 23:25:44 2014
@@ -461,9 +461,10 @@
FC_CHECK_NGETTEXT_RUNTIME(,have_working_ngettext=1,)],)
if test $have_working_ngettext = 0; then
-AC_CHECK_LIB(intl, ngettext,
- [AC_MSG_CHECKING(whether libintl's ngettext works at runtime)
- FC_CHECK_NGETTEXT_RUNTIME(-lintl,have_working_ngettext=1,)],)
+AC_CHECK_LIB([intl], [ngettext],
+ [AC_MSG_CHECKING([whether libintl's ngettext works at runtime])
+ FC_CHECK_NGETTEXT_RUNTIME([-lintl],[have_working_ngettext=1
+UTILITY_LIBS=${UTILITY_LIBS} -lintl],)],)
fi
if test $have_working_ngettext = 0; then
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25403 - /branches/S2_5/configure.ac
Author: cazfi
Date: Sun Jul 6 23:25:38 2014
New Revision: 25403
URL: http://svn.gna.org/viewcvs/freeciv?rev=25403view=rev
Log:
Add -lintl to UTILITY_LIBS when we notice that we need it.
See bug #22266
Modified:
branches/S2_5/configure.ac
Modified: branches/S2_5/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/configure.ac?rev=25403r1=25402r2=25403view=diff
==
--- branches/S2_5/configure.ac (original)
+++ branches/S2_5/configure.ac Sun Jul 6 23:25:38 2014
@@ -513,9 +513,10 @@
FC_CHECK_NGETTEXT_RUNTIME(,have_working_ngettext=1,)],)
if test $have_working_ngettext = 0; then
-AC_CHECK_LIB(intl, ngettext,
- [AC_MSG_CHECKING(whether libintl's ngettext works at runtime)
- FC_CHECK_NGETTEXT_RUNTIME(-lintl,have_working_ngettext=1,)],)
+AC_CHECK_LIB([intl], [ngettext],
+ [AC_MSG_CHECKING([whether libintl's ngettext works at runtime])
+ FC_CHECK_NGETTEXT_RUNTIME([-lintl],[have_working_ngettext=1
+UTILITY_LIBS=${UTILITY_LIBS} -lintl],)],)
fi
if test $have_working_ngettext = 0; then
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25402 - /trunk/configure.ac
Author: cazfi
Date: Sun Jul 6 23:25:33 2014
New Revision: 25402
URL: http://svn.gna.org/viewcvs/freeciv?rev=25402view=rev
Log:
Add -lintl to UTILITY_LIBS when we notice that we need it.
See bug #22266
Modified:
trunk/configure.ac
Modified: trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=25402r1=25401r2=25402view=diff
==
--- trunk/configure.ac (original)
+++ trunk/configure.ac Sun Jul 6 23:25:33 2014
@@ -521,9 +521,10 @@
FC_CHECK_NGETTEXT_RUNTIME(,have_working_ngettext=1,)],)
if test $have_working_ngettext = 0; then
-AC_CHECK_LIB(intl, ngettext,
- [AC_MSG_CHECKING(whether libintl's ngettext works at runtime)
- FC_CHECK_NGETTEXT_RUNTIME(-lintl,have_working_ngettext=1,)],)
+AC_CHECK_LIB([intl], [ngettext],
+ [AC_MSG_CHECKING([whether libintl's ngettext works at runtime])
+ FC_CHECK_NGETTEXT_RUNTIME([-lintl],[have_working_ngettext=1
+UTILITY_LIBS=${UTILITY_LIBS} -lintl],)],)
fi
if test $have_working_ngettext = 0; then
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25406 - /branches/S2_5/client/gui-sdl/wldlg.c
Author: cazfi
Date: Sun Jul 6 23:38:44 2014
New Revision: 25406
URL: http://svn.gna.org/viewcvs/freeciv?rev=25406view=rev
Log:
Revert sdl-client (but not sdl2-client) change that redundant buildings
are shown with their name strikken through, as we can't rely on SDL_ttf to
provide support for that.
Reported by Jacob Nevins jtn
See patch #4879
Modified:
branches/S2_5/client/gui-sdl/wldlg.c
Modified: branches/S2_5/client/gui-sdl/wldlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-sdl/wldlg.c?rev=25406r1=25405r2=25406view=diff
==
--- branches/S2_5/client/gui-sdl/wldlg.c(original)
+++ branches/S2_5/client/gui-sdl/wldlg.cSun Jul 6 23:38:44 2014
@@ -1360,10 +1360,6 @@
fc_snprintf(cBuf, sizeof(cBuf), %s,
improvement_name_translation(pImprove));
copy_chars_to_string16(pStr, cBuf);
pStr-style |= TTF_STYLE_BOLD;
-
- if (is_improvement_redundant(pCity, pImprove)) {
-pStr-style |= TTF_STYLE_STRIKETHROUGH;
- }
pText_Name = create_text_surf_smaller_that_w(pStr, pIcon-w - 4);
@@ -1451,8 +1447,7 @@
copy_chars_to_string16(pStr, cBuf);
pStr-style = ~TTF_STYLE_BOLD;
- pStr-style = ~TTF_STYLE_STRIKETHROUGH;
-
+
pText = create_text_surf_from_str16(pStr);
/*-*/
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25407 - /trunk/win32/installer/Makefile
Author: cazfi Date: Sun Jul 6 23:44:34 2014 New Revision: 25407 URL: http://svn.gna.org/viewcvs/freeciv?rev=25407view=rev Log: Preserve translations of all freeciv domains in Windows Installer builds. See bug #22184 Modified: trunk/win32/installer/Makefile Modified: trunk/win32/installer/Makefile URL: http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer/Makefile?rev=25407r1=25406r2=25407view=diff == --- trunk/win32/installer/Makefile (original) +++ trunk/win32/installer/Makefile Sun Jul 6 23:44:34 2014 @@ -150,7 +150,7 @@ mkdir -p install-$(GUI)/lib/gtk-3.0/ cp -R /lib/gtk-3.0/3.0.0 install-$(GUI)/lib/gtk-3.0/ cp -R /share/locale install-$(GUI)/share/ - find install-$(GUI)/share/locale -type f -not -name freeciv.mo -and -not -name gtk30.mo -delete + find install-$(GUI)/share/locale -type f -not -name freeciv*.mo -and -not -name gtk30.mo -delete install-env-gtk3: install-env-default-fcmp @@ -167,7 +167,7 @@ mkdir -p install-$(GUI)/lib/gtk-2.0/ cp -R /lib/gtk-2.0/2.10.0 install-$(GUI)/lib/gtk-2.0/ cp -R /share/locale install-$(GUI)/share/ - find install-$(GUI)/share/locale -type f -not -name freeciv.mo -and -not -name gtk30.mo -and -not -name gtk20.mo -delete + find install-$(GUI)/share/locale -type f -not -name freeciv*.mo -and -not -name gtk20.mo -delete SDL_DLLS := \ libpng12-0.dll \ ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25408 - /branches/S2_5/win32/installer/Makefile
Author: cazfi Date: Sun Jul 6 23:44:39 2014 New Revision: 25408 URL: http://svn.gna.org/viewcvs/freeciv?rev=25408view=rev Log: Preserve translations of all freeciv domains in Windows Installer builds. See bug #22184 Modified: branches/S2_5/win32/installer/Makefile Modified: branches/S2_5/win32/installer/Makefile URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/win32/installer/Makefile?rev=25408r1=25407r2=25408view=diff == --- branches/S2_5/win32/installer/Makefile (original) +++ branches/S2_5/win32/installer/Makefile Sun Jul 6 23:44:39 2014 @@ -150,7 +150,7 @@ mkdir -p install-$(GUI)/lib/gtk-3.0/ cp -R /lib/gtk-3.0/3.0.0 install-$(GUI)/lib/gtk-3.0/ cp -R /share/locale install-$(GUI)/share/ - find install-$(GUI)/share/locale -type f -not -name freeciv.mo -and -not -name gtk30.mo -delete + find install-$(GUI)/share/locale -type f -not -name freeciv*.mo -and -not -name gtk30.mo -delete install-env-gtk3: install-env-default-fcmp @@ -167,7 +167,7 @@ mkdir -p install-$(GUI)/lib/gtk-2.0/ cp -R /lib/gtk-2.0/2.10.0 install-$(GUI)/lib/gtk-2.0/ cp -R /share/locale install-$(GUI)/share/ - find install-$(GUI)/share/locale -type f -not -name freeciv.mo -and -not -name gtk30.mo -and -not -name gtk20.mo -delete + find install-$(GUI)/share/locale -type f -not -name freeciv*.mo -and -not -name gtk20.mo -delete SDL_DLLS := \ libpng12-0.dll \ ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25409 - in /trunk: ai/threaded/ client/ common/ data/alien/ data/civ1/ data/civ2/ data/civ2civ3/ data/classic/ data/experim...
Author: cazfi
Date: Mon Jul 7 02:02:43 2014
New Revision: 25409
URL: http://svn.gna.org/viewcvs/freeciv?rev=25409view=rev
Log:
Obsoleted NoBonus road move mode. Such roads should have move_cost set to -1
instead,
and mode to what ever mode should be used in determining move restrictions.
See patch #4877
Modified:
trunk/ai/threaded/taicity.c
trunk/client/helpdata.c
trunk/common/map.c
trunk/common/movement.c
trunk/common/road.c
trunk/common/road.h
trunk/data/alien/terrain.ruleset
trunk/data/civ1/terrain.ruleset
trunk/data/civ2/terrain.ruleset
trunk/data/civ2civ3/terrain.ruleset
trunk/data/classic/terrain.ruleset
trunk/data/experimental/terrain.ruleset
trunk/data/multiplayer/terrain.ruleset
trunk/data/stub/terrain.ruleset
trunk/server/advisors/autosettlers.c
Modified: trunk/ai/threaded/taicity.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/ai/threaded/taicity.c?rev=25409r1=25408r2=25409view=diff
==
--- trunk/ai/threaded/taicity.c (original)
+++ trunk/ai/threaded/taicity.c Mon Jul 7 02:02:43 2014
@@ -117,7 +117,7 @@
road_type_iterate(pold) {
if (tile_has_road(ptile, pold)) {
- if (pold-move_mode != RMM_NO_BONUS
+ if (road_provides_move_bonus(pold)
pold-move_cost old_move_cost) {
old_move_cost = pold-move_cost;
}
Modified: trunk/client/helpdata.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/helpdata.c?rev=25409r1=25408r2=25409view=diff
==
--- trunk/client/helpdata.c (original)
+++ trunk/client/helpdata.c Mon Jul 7 02:02:43 2014
@@ -3651,7 +3651,7 @@
}
}
- if (proad != NULL proad-move_mode != RMM_NO_BONUS) {
+ if (proad != NULL road_provides_move_bonus(proad)) {
if (proad-move_cost == 0) {
CATLSTR(buf, bufsz, _(* Allows infinite movement.\n));
} else {
Modified: trunk/common/map.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/map.c?rev=25409r1=25408r2=25409view=diff
==
--- trunk/common/map.c (original)
+++ trunk/common/map.c Mon Jul 7 02:02:43 2014
@@ -741,7 +741,7 @@
(!pclass
|| is_native_extra_to_uclass(road_extra_get(proad), pclass))) {
road_type_list_iterate(proad-integrators, iroad) {
-if (iroad-move_mode != RMM_NO_BONUS
+if (road_provides_move_bonus(iroad)
cost iroad-move_cost
tile_has_road(t2, iroad)
(!pclass
@@ -772,9 +772,6 @@
case RMM_FAST_ALWAYS:
cost = iroad-move_cost;
break;
- case RMM_NO_BONUS:
-fc_assert(proad-move_mode != RMM_NO_BONUS);
-break;
}
}
} road_type_list_iterate_end;
Modified: trunk/common/movement.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/movement.c?rev=25409r1=25408r2=25409view=diff
==
--- trunk/common/movement.c (original)
+++ trunk/common/movement.c Mon Jul 7 02:02:43 2014
@@ -347,7 +347,6 @@
}
switch (iroad-move_mode) {
case RMM_FAST_ALWAYS:
- case RMM_NO_BONUS:
/* Road connects source and destination, so we're fine. */
return TRUE;
case RMM_CARDINAL:
Modified: trunk/common/road.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/road.c?rev=25409r1=25408r2=25409view=diff
==
--- trunk/common/road.c (original)
+++ trunk/common/road.c Mon Jul 7 02:02:43 2014
@@ -547,3 +547,11 @@
return proad-move_mode == RMM_CARDINAL || proad-move_mode == RMM_RELAXED;
}
+
+/
+ Does road type provide move bonus
+/
+bool road_provides_move_bonus(const struct road_type *proad)
+{
+ return proad-move_cost = 0;
+}
Modified: trunk/common/road.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/road.h?rev=25409r1=25408r2=25409view=diff
==
--- trunk/common/road.h (original)
+++ trunk/common/road.h Mon Jul 7 02:02:43 2014
@@ -33,14 +33,12 @@
/* Used in the network protocol. */
#define SPECENUM_NAME road_move_mode
-#define SPECENUM_VALUE0 RMM_NO_BONUS
-#define SPECENUM_VALUE0NAME NoBonus
-#define SPECENUM_VALUE1 RMM_CARDINAL
-#define SPECENUM_VALUE1NAME Cardinal
-#define SPECENUM_VALUE2 RMM_RELAXED
-#define SPECENUM_VALUE2NAME Relaxed
-#define SPECENUM_VALUE3 RMM_FAST_ALWAYS
-#define SPECENUM_VALUE3NAME FastAlways
+#define SPECENUM_VALUE0 RMM_CARDINAL
+#define SPECENUM_VALUE0NAME Cardinal
+#define SPECENUM_VALUE1 RMM_RELAXED
[Freeciv-commits] r25410 - in /trunk: client/helpdata.c common/fc_types.h common/requirements.c server/cityturn.c
Author: sveinung
Date: Mon Jul 7 02:39:27 2014
New Revision: 25410
URL: http://svn.gna.org/viewcvs/freeciv?rev=25410view=rev
Log:
Coding style: rename maxTileUnits to max_tile_units
The rest of the Freeciv C code use KR style variable names in stead of camel
case.
See patch #4903
Modified:
trunk/client/helpdata.c
trunk/common/fc_types.h
trunk/common/requirements.c
trunk/server/cityturn.c
Modified: trunk/client/helpdata.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/helpdata.c?rev=25410r1=25409r2=25410view=diff
==
--- trunk/client/helpdata.c (original)
+++ trunk/client/helpdata.c Mon Jul 7 02:39:27 2014
@@ -1604,16 +1604,16 @@
cat_snprintf(buf, bufsz,
PL_(At most %d unit may be present on the tile.\n,
At most %d units may be present on the tile.\n,
- preq-source.value.maxTileUnits),
- preq-source.value.maxTileUnits);
+ preq-source.value.max_tile_units),
+ preq-source.value.max_tile_units);
} else {
cat_snprintf(buf, bufsz,
PL_(There must be more than %d unit present on
the tile.\n,
There must be more than %d units present on
the tile.\n,
- preq-source.value.maxTileUnits),
- preq-source.value.maxTileUnits);
+ preq-source.value.max_tile_units),
+ preq-source.value.max_tile_units);
}
return TRUE;
case REQ_RANGE_CADJACENT:
@@ -1623,16 +1623,16 @@
must have %d unit or fewer.\n,
The tile or at least one cardinally adjacent tile
must have %d units or fewer.\n,
- preq-source.value.maxTileUnits),
- preq-source.value.maxTileUnits);
+ preq-source.value.max_tile_units),
+ preq-source.value.max_tile_units);
} else {
cat_snprintf(buf, bufsz,
PL_(The tile and all cardinally adjacent tiles must
have more than %d unit each.\n,
The tile and all cardinally adjacent tiles must
have more than %d units each.\n,
- preq-source.value.maxTileUnits),
- preq-source.value.maxTileUnits);
+ preq-source.value.max_tile_units),
+ preq-source.value.max_tile_units);
}
return TRUE;
case REQ_RANGE_ADJACENT:
@@ -1642,16 +1642,16 @@
%d unit or fewer.\n,
The tile or at least one adjacent tile must have
%d units or fewer.\n,
- preq-source.value.maxTileUnits),
- preq-source.value.maxTileUnits);
+ preq-source.value.max_tile_units),
+ preq-source.value.max_tile_units);
} else {
cat_snprintf(buf, bufsz,
PL_(The tile and all adjacent tiles must have more
than %d unit each.\n,
The tile and all adjacent tiles must have more
than %d units each.\n,
- preq-source.value.maxTileUnits),
- preq-source.value.maxTileUnits);
+ preq-source.value.max_tile_units),
+ preq-source.value.max_tile_units);
}
return TRUE;
case REQ_RANGE_CITY:
Modified: trunk/common/fc_types.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/fc_types.h?rev=25410r1=25409r2=25410view=diff
==
--- trunk/common/fc_types.h (original)
+++ trunk/common/fc_types.h Mon Jul 7 02:39:27 2014
@@ -311,7 +311,7 @@
int roadflag; /* enum road_flag_id */
int diplrel; /* enum diplstate_type or
enum diplrel_asym */
- int maxTileUnits;
+ int max_tile_units;
} universals_u;
/* The kind of universals_u (value_union_type was req_source_type).
Modified: trunk/common/requirements.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/requirements.c?rev=25410r1=25409r2=25410view=diff
==
--- trunk/common/requirements.c (original)
+++ trunk/common/requirements.c Mon Jul 7 02:39:27 2014
@@ -195,8 +195,8 @@
}
break;
case VUT_MAXTILEUNITS:
-source.value.maxTileUnits = atoi(value);
-if (0 = source.value.maxTileUnits) {
+source.value.max_tile_units = atoi(value);
+if (0 =
