[Freeciv-commits] r28072 - /trunk/data/civ2civ3/effects.ruleset
Author: jtn
Date: Tue Feb 10 09:43:55 2015
New Revision: 28072
URL: http://svn.gna.org/viewcvs/freeciv?rev=28072&view=rev
Log:
Refactor civ2civ3 Democracy unit happiness effects to fix
autogenerated help.
See gna bug #23255.
Modified:
trunk/data/civ2civ3/effects.ruleset
Modified: trunk/data/civ2civ3/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/effects.ruleset?rev=28072&r1=28071&r2=28072&view=diff
==
--- trunk/data/civ2civ3/effects.ruleset (original)
+++ trunk/data/civ2civ3/effects.ruleset Tue Feb 10 09:43:55 2015
@@ -759,25 +759,26 @@
; "Gov", "Fundamentalism", "Player", FALSE
; "Gov", "Federation", "Player", FALSE
; "Gov", "Republic", "Player", FALSE
-; "Gov", "Democracy", "Player", FALSE
-}
-
+ "Gov", "Democracy", "Player", FALSE
+}
+
+; exclusive with above
[effect_unit_unhappiness_democracy]
type= "Unhappy_Factor"
-value = 1
-reqs=
-{ "type", "name", "range", "present"
- "Gov", "Democracy", "Player", TRUE
- "Building", "Women's Suffrage", "Player", FALSE
-}
-
-[effect_unit_unhappiness_democracy_1]
-type= "Make_Content_Mil"
-value = 1
-reqs=
-{ "type", "name", "range", "present"
- "Gov", "Democracy", "Player", TRUE
- "Building", "Women's Suffrage", "Player", FALSE
+value = 2
+reqs=
+{ "type", "name", "range"
+ "Gov", "Democracy", "Player"
+}
+
+; ...except Women's Suffrage reduces it back to Republic levels
+[effect_womens_suffrage_1]
+type= "Unhappy_Factor"
+value = -1
+reqs=
+{ "type", "name", "range"
+ "Building", "Women's Suffrage", "Player"
+ "Gov", "Democracy", "Player"
}
[effect_upkeep_free_mil_1]
@@ -793,7 +794,7 @@
"Gov", "Fundamentalism", "Player", FALSE
"Gov", "Federation", "Player", FALSE
; "Gov", "Republic", "Player", FALSE
-; "Gov", "Democracy", "Player", FALSE
+ "Gov", "Democracy", "Player", FALSE
}
[effect_upkeep_free_mil_2]
@@ -809,7 +810,7 @@
; "Gov", "Fundamentalism", "Player", FALSE
; "Gov", "Federation", "Player", FALSE
"Gov", "Republic", "Player", FALSE
- "Gov", "Democracy", "Player", FALSE
+; "Gov", "Democracy", "Player", FALSE
}
[effect_upkeep_free_mil_3]
@@ -826,6 +827,17 @@
"Gov", "Federation", "Player", FALSE
"Gov", "Republic", "Player", FALSE
"Gov", "Democracy", "Player", FALSE
+}
+
+; normally 2 for Democracy, but 1 of these not needed with Women's Suffrage
+; due to reduced Unhappy_Factor
+[effect_womens_suffrage_2]
+type= "Make_Content_Mil"
+value = -1
+reqs=
+{ "type", "name", "range"
+ "Building", "Women's Suffrage", "Player"
+ "Gov", "Democracy", "Player"
}
[effect_upkeep_free_units_anarchy]
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28073 - /branches/S2_6/data/civ2civ3/effects.ruleset
Author: jtn
Date: Tue Feb 10 09:44:43 2015
New Revision: 28073
URL: http://svn.gna.org/viewcvs/freeciv?rev=28073&view=rev
Log:
Refactor civ2civ3 Democracy unit happiness effects to fix
autogenerated help.
See gna bug #23255.
Modified:
branches/S2_6/data/civ2civ3/effects.ruleset
Modified: branches/S2_6/data/civ2civ3/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/effects.ruleset?rev=28073&r1=28072&r2=28073&view=diff
==
--- branches/S2_6/data/civ2civ3/effects.ruleset (original)
+++ branches/S2_6/data/civ2civ3/effects.ruleset Tue Feb 10 09:44:43 2015
@@ -758,25 +758,26 @@
; "Gov", "Fundamentalism", "Player", FALSE
; "Gov", "Federation", "Player", FALSE
; "Gov", "Republic", "Player", FALSE
-; "Gov", "Democracy", "Player", FALSE
-}
-
+ "Gov", "Democracy", "Player", FALSE
+}
+
+; exclusive with above
[effect_unit_unhappiness_democracy]
type= "Unhappy_Factor"
-value = 1
-reqs=
-{ "type", "name", "range", "present"
- "Gov", "Democracy", "Player", TRUE
- "Building", "Women's Suffrage", "Player", FALSE
-}
-
-[effect_unit_unhappiness_democracy_1]
-type= "Make_Content_Mil"
-value = 1
-reqs=
-{ "type", "name", "range", "present"
- "Gov", "Democracy", "Player", TRUE
- "Building", "Women's Suffrage", "Player", FALSE
+value = 2
+reqs=
+{ "type", "name", "range"
+ "Gov", "Democracy", "Player"
+}
+
+; ...except Women's Suffrage reduces it back to Republic levels
+[effect_womens_suffrage_1]
+type= "Unhappy_Factor"
+value = -1
+reqs=
+{ "type", "name", "range"
+ "Building", "Women's Suffrage", "Player"
+ "Gov", "Democracy", "Player"
}
[effect_upkeep_free_mil_1]
@@ -792,7 +793,7 @@
"Gov", "Fundamentalism", "Player", FALSE
"Gov", "Federation", "Player", FALSE
; "Gov", "Republic", "Player", FALSE
-; "Gov", "Democracy", "Player", FALSE
+ "Gov", "Democracy", "Player", FALSE
}
[effect_upkeep_free_mil_2]
@@ -808,7 +809,7 @@
; "Gov", "Fundamentalism", "Player", FALSE
; "Gov", "Federation", "Player", FALSE
"Gov", "Republic", "Player", FALSE
- "Gov", "Democracy", "Player", FALSE
+; "Gov", "Democracy", "Player", FALSE
}
[effect_upkeep_free_mil_3]
@@ -825,6 +826,17 @@
"Gov", "Federation", "Player", FALSE
"Gov", "Republic", "Player", FALSE
"Gov", "Democracy", "Player", FALSE
+}
+
+; normally 2 for Democracy, but 1 of these not needed with Women's Suffrage
+; due to reduced Unhappy_Factor
+[effect_womens_suffrage_2]
+type= "Make_Content_Mil"
+value = -1
+reqs=
+{ "type", "name", "range"
+ "Building", "Women's Suffrage", "Player"
+ "Gov", "Democracy", "Player"
}
[effect_upkeep_free_units_anarchy]
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28074 - /branches/S2_5/data/civ2civ3/effects.ruleset
Author: jtn
Date: Tue Feb 10 09:45:29 2015
New Revision: 28074
URL: http://svn.gna.org/viewcvs/freeciv?rev=28074&view=rev
Log:
Refactor civ2civ3 Democracy unit happiness effects to fix
autogenerated help.
See gna bug #23255.
Modified:
branches/S2_5/data/civ2civ3/effects.ruleset
Modified: branches/S2_5/data/civ2civ3/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2civ3/effects.ruleset?rev=28074&r1=28073&r2=28074&view=diff
==
--- branches/S2_5/data/civ2civ3/effects.ruleset (original)
+++ branches/S2_5/data/civ2civ3/effects.ruleset Tue Feb 10 09:45:29 2015
@@ -715,31 +715,26 @@
; "Gov", "Fundamentalism", "Player"
; "Gov", "Federation", "Player"
; "Gov", "Republic", "Player"
-; "Gov", "Democracy", "Player"
-}
-
+ "Gov", "Democracy", "Player"
+}
+
+; exclusive with above
[effect_unit_unhappiness_democracy]
type= "Unhappy_Factor"
-value = 1
+value = 2
reqs=
{ "type", "name", "range"
"Gov", "Democracy", "Player"
}
-nreqs=
+
+; ...except Women's Suffrage reduces it back to Republic levels
+[effect_womens_suffrage_1]
+type= "Unhappy_Factor"
+value = -1
+reqs=
{ "type", "name", "range"
"Building", "Women's Suffrage", "Player"
-}
-
-[effect_unit_unhappiness_democracy_1]
-type= "Make_Content_Mil"
-value = 1
-reqs=
-{ "type", "name", "range"
"Gov", "Democracy", "Player"
-}
-nreqs=
-{ "type", "name", "range"
- "Building", "Women's Suffrage", "Player"
}
[effect_upkeep_free_mil_1]
@@ -755,7 +750,7 @@
"Gov", "Fundamentalism", "Player"
"Gov", "Federation", "Player"
; "Gov", "Republic", "Player"
-; "Gov", "Democracy", "Player"
+ "Gov", "Democracy", "Player"
}
[effect_upkeep_free_mil_2]
@@ -771,7 +766,7 @@
; "Gov", "Fundamentalism", "Player"
; "Gov", "Federation", "Player"
"Gov", "Republic", "Player"
- "Gov", "Democracy", "Player"
+; "Gov", "Democracy", "Player"
}
[effect_upkeep_free_mil_3]
@@ -790,6 +785,17 @@
"Gov", "Democracy", "Player"
}
+; normally 2 for Democracy, but 1 of these not needed with Women's Suffrage
+; due to reduced Unhappy_Factor
+[effect_womens_suffrage_2]
+type= "Make_Content_Mil"
+value = -1
+reqs=
+{ "type", "name", "range"
+ "Building", "Women's Suffrage", "Player"
+ "Gov", "Democracy", "Player"
+}
+
[effect_upkeep_free_units_anarchy]
type= "Unit_Upkeep_Free_Per_City"
value = 2
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28076 - in /branches/S2_6: ai/default/ client/ doc/ gen_headers/ m4/ server/ tools/ tools/ruledit/ utility/
Author: cazfi
Date: Tue Feb 10 18:47:01 2015
New Revision: 28076
URL: http://svn.gna.org/viewcvs/freeciv?rev=28076&view=rev
Log:
Use new public FREECIV_NDEBUG instead of NDEBUG for controlling freeciv
specific debugging facilities
See patch #5795
Modified:
branches/S2_6/ai/default/aicity.c
branches/S2_6/ai/default/aiguard.h
branches/S2_6/client/client_main.c
branches/S2_6/doc/HACKING
branches/S2_6/gen_headers/freeciv_config.h.in
branches/S2_6/m4/debug.m4
branches/S2_6/server/civserver.c
branches/S2_6/server/sanitycheck.h
branches/S2_6/server/srv_main.c
branches/S2_6/server/techtools.c
branches/S2_6/tools/civmanual.c
branches/S2_6/tools/ruledit/ruledit.cpp
branches/S2_6/utility/log.h
Modified: branches/S2_6/ai/default/aicity.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/ai/default/aicity.c?rev=28076&r1=28075&r2=28076&view=diff
==
--- branches/S2_6/ai/default/aicity.c (original)
+++ branches/S2_6/ai/default/aicity.c Tue Feb 10 18:47:01 2015
@@ -108,9 +108,9 @@
(pcity->surplus[O_SHIELD] < 0 || city_unhappy(pcity) \
|| pcity->food_stock + pcity->surplus[O_FOOD] < 0)
-#ifdef NDEBUG
+#ifdef FREECIV_NDEBUG
#define ASSERT_CHOICE(c) /* Do nothing. */
-#else
+#else /* FREECIV_NDEBUG */
#define ASSERT_CHOICE(c) \
do { \
if ((c).want > 0) { \
@@ -124,7 +124,7 @@
} \
}\
} while(FALSE);
-#endif /* NDEBUG */
+#endif /* FREECIV_NDEBUG */
static void dai_sell_obsolete_buildings(struct city *pcity);
static void resolve_city_emergency(struct ai_type *ait, struct player *pplayer,
Modified: branches/S2_6/ai/default/aiguard.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/ai/default/aiguard.h?rev=28076&r1=28075&r2=28076&view=diff
==
--- branches/S2_6/ai/default/aiguard.h (original)
+++ branches/S2_6/ai/default/aiguard.h Tue Feb 10 18:47:01 2015
@@ -17,13 +17,13 @@
#include "fc_types.h"
-#ifndef NDEBUG
+#ifndef FREECIV_NDEBUG
#define CHECK_GUARD(ait, guard) aiguard_check_guard(ait, guard)
#define CHECK_CHARGE_UNIT(ait, charge) aiguard_check_charge_unit(ait, charge)
-#else
+#else /* FREECIV_NDEBUG */
#define CHECK_GUARD(ait, guard) (void)0
#define CHECK_CHARGE_UNIT(ait, charge) (void)0
-#endif
+#endif /* FREECIV_NDEBUG */
void aiguard_check_guard(struct ai_type *ait, const struct unit *guard);
void aiguard_check_charge_unit(struct ai_type *ait, const struct unit *charge);
Modified: branches/S2_6/client/client_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/client_main.c?rev=28076&r1=28075&r2=28076&view=diff
==
--- branches/S2_6/client/client_main.c (original)
+++ branches/S2_6/client/client_main.c Tue Feb 10 18:47:01 2015
@@ -319,13 +319,13 @@
/* Load win32 post-crash debugger */
#ifdef WIN32_NATIVE
-# ifndef NDEBUG
+# ifndef FREECIV_NDEBUG
if (LoadLibrary("exchndl.dll") == NULL) {
-# ifdef DEBUG
+# ifdef FREECIV_DEBUG
fprintf(stderr, "exchndl.dll could not be loaded, no crash debugger\n");
-# endif /* DEBUG */
- }
-# endif /* NDEBUG */
+# endif /* FREECIV_DEBUG */
+ }
+# endif /* FREECIV_NDEBUG */
#endif /* WIN32_NATIVE */
i_am_client(); /* Tell to libfreeciv that we are client */
@@ -373,26 +373,26 @@
"(IPv4/IPv6/none)"));
cmdhelp_add(help, "a", "autoconnect",
_("Skip connect dialog"));
-#ifdef DEBUG
+#ifdef FREECIV_DEBUG
cmdhelp_add(help, "d",
/* TRANS: "debug" is exactly what user must type, do not
translate. */
_("debug NUM"),
_("Set debug log level (%d to %d, or "
"%d:file1,min,max:...)"), LOG_FATAL, LOG_DEBUG,
LOG_DEBUG);
-#else
+#else /* FREECIV_DEBUG */
cmdhelp_add(help, "d",
/* TRANS: "debug" is exactly what user must type, do not
translate. */
_("debug NUM"),
_("Set debug log level (%d to %d)"),
LOG_FATAL, LOG_VERBOSE);
-#endif /* DEBUG */
-#ifndef NDEBUG
+#endif /* FREECIV_DEBUG */
+#ifndef FREECIV_NDEBUG
cmdhelp_add(help, "F",
/* TRANS: "Fatal" is exactly what user must type, do not
translate. */
_("Fatal [SIGNAL]"),
_("Raise a signal on failed assertion"));
-#endif /* NDEBUG */
+#endif /* FREECIV_NDEBUG */
cmdhelp_add(help, "f",
/* TRANS: "file" is exactly what user must type, do not
[Freeciv-commits] r28075 - in /trunk: ai/default/ client/ doc/ gen_headers/ m4/ server/ tools/ tools/ruledit/ utility/
Author: cazfi
Date: Tue Feb 10 18:46:49 2015
New Revision: 28075
URL: http://svn.gna.org/viewcvs/freeciv?rev=28075&view=rev
Log:
Use new public FREECIV_NDEBUG instead of NDEBUG for controlling freeciv
specific debugging facilities
See patch #5795
Modified:
trunk/ai/default/aicity.c
trunk/ai/default/aiguard.h
trunk/client/client_main.c
trunk/doc/HACKING
trunk/gen_headers/freeciv_config.h.in
trunk/m4/debug.m4
trunk/server/civserver.c
trunk/server/sanitycheck.h
trunk/server/srv_main.c
trunk/server/techtools.c
trunk/tools/civmanual.c
trunk/tools/ruledit/ruledit.cpp
trunk/utility/log.h
Modified: trunk/ai/default/aicity.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aicity.c?rev=28075&r1=28074&r2=28075&view=diff
==
--- trunk/ai/default/aicity.c (original)
+++ trunk/ai/default/aicity.c Tue Feb 10 18:46:49 2015
@@ -108,9 +108,9 @@
(pcity->surplus[O_SHIELD] < 0 || city_unhappy(pcity) \
|| pcity->food_stock + pcity->surplus[O_FOOD] < 0)
-#ifdef NDEBUG
+#ifdef FREECIV_NDEBUG
#define ASSERT_CHOICE(c) /* Do nothing. */
-#else
+#else /* FREECIV_NDEBUG */
#define ASSERT_CHOICE(c) \
do { \
if ((c).want > 0) { \
@@ -124,7 +124,7 @@
} \
}\
} while(FALSE);
-#endif /* NDEBUG */
+#endif /* FREECIV_NDEBUG */
static void dai_sell_obsolete_buildings(struct city *pcity);
static void resolve_city_emergency(struct ai_type *ait, struct player *pplayer,
Modified: trunk/ai/default/aiguard.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aiguard.h?rev=28075&r1=28074&r2=28075&view=diff
==
--- trunk/ai/default/aiguard.h (original)
+++ trunk/ai/default/aiguard.h Tue Feb 10 18:46:49 2015
@@ -17,13 +17,13 @@
#include "fc_types.h"
-#ifndef NDEBUG
+#ifndef FREECIV_NDEBUG
#define CHECK_GUARD(ait, guard) aiguard_check_guard(ait, guard)
#define CHECK_CHARGE_UNIT(ait, charge) aiguard_check_charge_unit(ait, charge)
-#else
+#else /* FREECIV_NDEBUG */
#define CHECK_GUARD(ait, guard) (void)0
#define CHECK_CHARGE_UNIT(ait, charge) (void)0
-#endif
+#endif /* FREECIV_NDEBUG */
void aiguard_check_guard(struct ai_type *ait, const struct unit *guard);
void aiguard_check_charge_unit(struct ai_type *ait, const struct unit *charge);
Modified: trunk/client/client_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/client_main.c?rev=28075&r1=28074&r2=28075&view=diff
==
--- trunk/client/client_main.c (original)
+++ trunk/client/client_main.c Tue Feb 10 18:46:49 2015
@@ -319,13 +319,13 @@
/* Load win32 post-crash debugger */
#ifdef WIN32_NATIVE
-# ifndef NDEBUG
+# ifndef FREECIV_NDEBUG
if (LoadLibrary("exchndl.dll") == NULL) {
-# ifdef DEBUG
+# ifdef FREECIV_DEBUG
fprintf(stderr, "exchndl.dll could not be loaded, no crash debugger\n");
-# endif /* DEBUG */
- }
-# endif /* NDEBUG */
+# endif /* FREECIV_DEBUG */
+ }
+# endif /* FREECIV_NDEBUG */
#endif /* WIN32_NATIVE */
i_am_client(); /* Tell to libfreeciv that we are client */
@@ -373,26 +373,26 @@
"(IPv4/IPv6/none)"));
cmdhelp_add(help, "a", "autoconnect",
_("Skip connect dialog"));
-#ifdef DEBUG
+#ifdef FREECIV_DEBUG
cmdhelp_add(help, "d",
/* TRANS: "debug" is exactly what user must type, do not
translate. */
_("debug NUM"),
_("Set debug log level (%d to %d, or "
"%d:file1,min,max:...)"), LOG_FATAL, LOG_DEBUG,
LOG_DEBUG);
-#else
+#else /* FREECIV_DEBUG */
cmdhelp_add(help, "d",
/* TRANS: "debug" is exactly what user must type, do not
translate. */
_("debug NUM"),
_("Set debug log level (%d to %d)"),
LOG_FATAL, LOG_VERBOSE);
-#endif /* DEBUG */
-#ifndef NDEBUG
+#endif /* FREECIV_DEBUG */
+#ifndef FREECIV_NDEBUG
cmdhelp_add(help, "F",
/* TRANS: "Fatal" is exactly what user must type, do not
translate. */
_("Fatal [SIGNAL]"),
_("Raise a signal on failed assertion"));
-#endif /* NDEBUG */
+#endif /* FREECIV_NDEBUG */
cmdhelp_add(help, "f",
/* TRANS: "file" is exactly what user must type, do not
translate. */
_("file FILE"),
@@ -456,13 +456,13 @@
} else if (is_option("--version", argv[i])) {
fc_fprintf(stderr, "%s %s\n", freeciv_name_version(), client_string);
[Freeciv-commits] r28077 - /trunk/translations/freeciv/POTFILES.in
Author: cazfi Date: Tue Feb 10 18:55:10 2015 New Revision: 28077 URL: http://svn.gna.org/viewcvs/freeciv?rev=28077&view=rev Log: Removed stub-client files from POTFILES.in Modified: trunk/translations/freeciv/POTFILES.in Modified: trunk/translations/freeciv/POTFILES.in URL: http://svn.gna.org/viewcvs/freeciv/trunk/translations/freeciv/POTFILES.in?rev=28077&r1=28076&r2=28077&view=diff == --- trunk/translations/freeciv/POTFILES.in (original) +++ trunk/translations/freeciv/POTFILES.in Tue Feb 10 18:55:10 2015 @@ -164,8 +164,6 @@ client/gui-sdl2/themes.c client/gui-sdl2/themespec.c client/gui-sdl2/wldlg.c -client/gui-stub/chatline.c -client/gui-stub/mapview.c client/gui-xaw/chatline.c client/gui-xaw/citydlg.c client/gui-xaw/cityrep.c ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28080 - /branches/S2_4/po/POTFILES.in
Author: cazfi Date: Tue Feb 10 18:55:31 2015 New Revision: 28080 URL: http://svn.gna.org/viewcvs/freeciv?rev=28080&view=rev Log: Removed stub-client files from POTFILES.in Modified: branches/S2_4/po/POTFILES.in Modified: branches/S2_4/po/POTFILES.in URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_4/po/POTFILES.in?rev=28080&r1=28079&r2=28080&view=diff == --- branches/S2_4/po/POTFILES.in(original) +++ branches/S2_4/po/POTFILES.inTue Feb 10 18:55:31 2015 @@ -120,8 +120,6 @@ client/gui-sdl/themes.c client/gui-sdl/themespec.c client/gui-sdl/wldlg.c -client/gui-stub/chatline.c -client/gui-stub/mapview.c client/gui-xaw/chatline.c client/gui-xaw/citydlg.c client/gui-xaw/cityrep.c ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28078 - /branches/S2_6/translations/freeciv/POTFILES.in
Author: cazfi Date: Tue Feb 10 18:55:18 2015 New Revision: 28078 URL: http://svn.gna.org/viewcvs/freeciv?rev=28078&view=rev Log: Removed stub-client files from POTFILES.in Modified: branches/S2_6/translations/freeciv/POTFILES.in Modified: branches/S2_6/translations/freeciv/POTFILES.in URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/freeciv/POTFILES.in?rev=28078&r1=28077&r2=28078&view=diff == --- branches/S2_6/translations/freeciv/POTFILES.in (original) +++ branches/S2_6/translations/freeciv/POTFILES.in Tue Feb 10 18:55:18 2015 @@ -164,8 +164,6 @@ client/gui-sdl2/themes.c client/gui-sdl2/themespec.c client/gui-sdl2/wldlg.c -client/gui-stub/chatline.c -client/gui-stub/mapview.c client/gui-xaw/chatline.c client/gui-xaw/citydlg.c client/gui-xaw/cityrep.c ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28079 - /branches/S2_5/translations/freeciv/POTFILES.in
Author: cazfi Date: Tue Feb 10 18:55:25 2015 New Revision: 28079 URL: http://svn.gna.org/viewcvs/freeciv?rev=28079&view=rev Log: Removed stub-client files from POTFILES.in Modified: branches/S2_5/translations/freeciv/POTFILES.in Modified: branches/S2_5/translations/freeciv/POTFILES.in URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/POTFILES.in?rev=28079&r1=28078&r2=28079&view=diff == --- branches/S2_5/translations/freeciv/POTFILES.in (original) +++ branches/S2_5/translations/freeciv/POTFILES.in Tue Feb 10 18:55:25 2015 @@ -140,8 +140,6 @@ client/gui-sdl/themes.c client/gui-sdl/themespec.c client/gui-sdl/wldlg.c -client/gui-stub/chatline.c -client/gui-stub/mapview.c client/gui-xaw/chatline.c client/gui-xaw/citydlg.c client/gui-xaw/cityrep.c ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28081 - /trunk/server/report.c
Author: cazfi
Date: Tue Feb 10 19:33:55 2015
New Revision: 28081
URL: http://svn.gna.org/viewcvs/freeciv?rev=28081&view=rev
Log:
Qualified demographics category name "Literacy" to allow distinct translations
from the tech name.
See patch #5807
Modified:
trunk/server/report.c
Modified: trunk/server/report.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/report.c?rev=28081&r1=28080&r2=28081&view=diff
==
--- trunk/server/report.c (original)
+++ trunk/server/report.c Tue Feb 10 19:33:55 2015
@@ -161,7 +161,8 @@
{'A', N_("Land Area"),get_landarea,area_to_text,TRUE },
{'S', N_("Settled Area"), get_settledarea, area_to_text,TRUE },
{'R', N_("Research Speed"), get_research,science_to_text, TRUE },
- {'L', N_("Literacy"), get_literacy,percent_to_text, TRUE },
+ /* TRANS: How literate people are. */
+ {'L', N_("?ability:Literacy"), get_literacy,percent_to_text, TRUE },
{'P', N_("Production"), get_production, production_to_text, TRUE },
{'E', N_("Economics"),get_economics, economics_to_text, TRUE },
{'M', N_("Military Service"), get_mil_service, mil_service_to_text, FALSE },
@@ -1035,7 +1036,7 @@
buffer[0] = '\0';
for (i = 0; i < ARRAY_SIZE(rowtable); i++) {
if (strchr(game.server.demography, rowtable[i].key)) {
- const char *name = _(rowtable[i].name);
+ const char *name = Q_(rowtable[i].name);
cat_snprintf(buffer, sizeof(buffer), "%s", name);
cat_snprintf(buffer, sizeof(buffer), "%*s",
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28083 - /branches/S2_5/server/report.c
Author: cazfi
Date: Tue Feb 10 19:34:13 2015
New Revision: 28083
URL: http://svn.gna.org/viewcvs/freeciv?rev=28083&view=rev
Log:
Qualified demographics category name "Literacy" to allow distinct translations
from the tech name.
See patch #5807
Modified:
branches/S2_5/server/report.c
Modified: branches/S2_5/server/report.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/report.c?rev=28083&r1=28082&r2=28083&view=diff
==
--- branches/S2_5/server/report.c (original)
+++ branches/S2_5/server/report.c Tue Feb 10 19:34:13 2015
@@ -158,7 +158,8 @@
{'A', N_("Land Area"),get_landarea,area_to_text,TRUE },
{'S', N_("Settled Area"), get_settledarea, area_to_text,TRUE },
{'R', N_("Research Speed"), get_research,science_to_text, TRUE },
- {'L', N_("Literacy"), get_literacy,percent_to_text, TRUE },
+ /* TRANS: How literate people are. */
+ {'L', N_("?ability:Literacy"), get_literacy,percent_to_text, TRUE },
{'P', N_("Production"), get_production, production_to_text, TRUE },
{'E', N_("Economics"),get_economics, economics_to_text, TRUE },
{'M', N_("Military Service"), get_mil_service, mil_service_to_text, FALSE },
@@ -1011,7 +1012,7 @@
buffer[0] = '\0';
for (i = 0; i < ARRAY_SIZE(rowtable); i++) {
if (strchr(game.server.demography, rowtable[i].key)) {
- const char *name = _(rowtable[i].name);
+ const char *name = Q_(rowtable[i].name);
cat_snprintf(buffer, sizeof(buffer), "%s", name);
cat_snprintf(buffer, sizeof(buffer), "%*s",
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28082 - /branches/S2_6/server/report.c
Author: cazfi
Date: Tue Feb 10 19:34:04 2015
New Revision: 28082
URL: http://svn.gna.org/viewcvs/freeciv?rev=28082&view=rev
Log:
Qualified demographics category name "Literacy" to allow distinct translations
from the tech name.
See patch #5807
Modified:
branches/S2_6/server/report.c
Modified: branches/S2_6/server/report.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/report.c?rev=28082&r1=28081&r2=28082&view=diff
==
--- branches/S2_6/server/report.c (original)
+++ branches/S2_6/server/report.c Tue Feb 10 19:34:04 2015
@@ -161,7 +161,8 @@
{'A', N_("Land Area"),get_landarea,area_to_text,TRUE },
{'S', N_("Settled Area"), get_settledarea, area_to_text,TRUE },
{'R', N_("Research Speed"), get_research,science_to_text, TRUE },
- {'L', N_("Literacy"), get_literacy,percent_to_text, TRUE },
+ /* TRANS: How literate people are. */
+ {'L', N_("?ability:Literacy"), get_literacy,percent_to_text, TRUE },
{'P', N_("Production"), get_production, production_to_text, TRUE },
{'E', N_("Economics"),get_economics, economics_to_text, TRUE },
{'M', N_("Military Service"), get_mil_service, mil_service_to_text, FALSE },
@@ -1035,7 +1036,7 @@
buffer[0] = '\0';
for (i = 0; i < ARRAY_SIZE(rowtable); i++) {
if (strchr(game.server.demography, rowtable[i].key)) {
- const char *name = _(rowtable[i].name);
+ const char *name = Q_(rowtable[i].name);
cat_snprintf(buffer, sizeof(buffer), "%s", name);
cat_snprintf(buffer, sizeof(buffer), "%*s",
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28084 - /branches/S2_4/server/report.c
Author: cazfi
Date: Tue Feb 10 19:34:22 2015
New Revision: 28084
URL: http://svn.gna.org/viewcvs/freeciv?rev=28084&view=rev
Log:
Qualified demographics category name "Literacy" to allow distinct translations
from the tech name.
See patch #5807
Modified:
branches/S2_4/server/report.c
Modified: branches/S2_4/server/report.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/server/report.c?rev=28084&r1=28083&r2=28084&view=diff
==
--- branches/S2_4/server/report.c (original)
+++ branches/S2_4/server/report.c Tue Feb 10 19:34:22 2015
@@ -158,7 +158,8 @@
{'A', N_("Land Area"),get_landarea,area_to_text,TRUE },
{'S', N_("Settled Area"), get_settledarea, area_to_text,TRUE },
{'R', N_("Research Speed"), get_research,science_to_text, TRUE },
- {'L', N_("Literacy"), get_literacy,percent_to_text, TRUE },
+ /* TRANS: How literate people are. */
+ {'L', N_("?ability:Literacy"), get_literacy,percent_to_text, TRUE },
{'P', N_("Production"), get_production, production_to_text, TRUE },
{'E', N_("Economics"),get_economics, economics_to_text, TRUE },
{'M', N_("Military Service"), get_mil_service, mil_service_to_text, FALSE },
@@ -1011,7 +1012,7 @@
buffer[0] = '\0';
for (i = 0; i < ARRAY_SIZE(rowtable); i++) {
if (strchr(game.server.demography, rowtable[i].key)) {
- const char *name = _(rowtable[i].name);
+ const char *name = Q_(rowtable[i].name);
cat_snprintf(buffer, sizeof(buffer), "%s", name);
cat_snprintf(buffer, sizeof(buffer), "%*s",
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28085 - /branches/S2_4/po/fi.po
Author: cazfi Date: Tue Feb 10 19:40:49 2015 New Revision: 28085 URL: http://svn.gna.org/viewcvs/freeciv?rev=28085&view=rev Log: Updated Finnish translation. Modified: branches/S2_4/po/fi.po [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/S2_4/po/fi.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_4/po/fi.po?rev=28085&r1=28084&r2=28085&view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28086 - /trunk/server/ruleset.c
Author: cazfi
Date: Tue Feb 10 21:32:53 2015
New Revision: 28086
URL: http://svn.gna.org/viewcvs/freeciv?rev=28086&view=rev
Log:
Load default.lua when needed.
See bug #23251
Modified:
trunk/server/ruleset.c
Modified: trunk/server/ruleset.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/ruleset.c?rev=28086&r1=28085&r2=28086&view=diff
==
--- trunk/server/ruleset.c (original)
+++ trunk/server/ruleset.c Tue Feb 10 21:32:53 2015
@@ -6790,7 +6790,7 @@
ok = openload_script_file("script", rsdir, buffer);
}
- if (ok && buffer_script) {
+ if (ok && !buffer_script) {
ok = openload_script_file("default", rsdir, NULL);
}
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28087 - /branches/S2_6/server/ruleset.c
Author: cazfi
Date: Tue Feb 10 21:33:01 2015
New Revision: 28087
URL: http://svn.gna.org/viewcvs/freeciv?rev=28087&view=rev
Log:
Load default.lua when needed.
See bug #23251
Modified:
branches/S2_6/server/ruleset.c
Modified: branches/S2_6/server/ruleset.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/ruleset.c?rev=28087&r1=28086&r2=28087&view=diff
==
--- branches/S2_6/server/ruleset.c (original)
+++ branches/S2_6/server/ruleset.c Tue Feb 10 21:33:01 2015
@@ -6747,7 +6747,7 @@
ok = openload_script_file("script", rsdir, buffer);
}
- if (ok && buffer_script) {
+ if (ok && !buffer_script) {
ok = openload_script_file("default", rsdir, NULL);
}
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28091 - /branches/S2_4/manual/civmanual.c
Author: cazfi Date: Tue Feb 10 22:03:49 2015 New Revision: 28091 URL: http://svn.gna.org/viewcvs/freeciv?rev=28091&view=rev Log: Free nls on freeciv-manual exit See bug #23257 Modified: branches/S2_4/manual/civmanual.c Modified: branches/S2_4/manual/civmanual.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_4/manual/civmanual.c?rev=28091&r1=28090&r2=28091&view=diff == --- branches/S2_4/manual/civmanual.c(original) +++ branches/S2_4/manual/civmanual.cTue Feb 10 22:03:49 2015 @@ -560,6 +560,7 @@ FC_FREE(ruleset); con_log_close(); + free_nls(); return EXIT_SUCCESS; } ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28090 - /branches/S2_5/tools/civmanual.c
Author: cazfi Date: Tue Feb 10 22:03:42 2015 New Revision: 28090 URL: http://svn.gna.org/viewcvs/freeciv?rev=28090&view=rev Log: Free nls on freeciv-manual exit See bug #23257 Modified: branches/S2_5/tools/civmanual.c Modified: branches/S2_5/tools/civmanual.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/tools/civmanual.c?rev=28090&r1=28089&r2=28090&view=diff == --- branches/S2_5/tools/civmanual.c (original) +++ branches/S2_5/tools/civmanual.c Tue Feb 10 22:03:42 2015 @@ -618,6 +618,7 @@ con_log_close(); registry_module_close(); + free_nls(); return retval; } ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28089 - /branches/S2_6/tools/civmanual.c
Author: cazfi Date: Tue Feb 10 22:03:34 2015 New Revision: 28089 URL: http://svn.gna.org/viewcvs/freeciv?rev=28089&view=rev Log: Free nls on freeciv-manual exit See bug #23257 Modified: branches/S2_6/tools/civmanual.c Modified: branches/S2_6/tools/civmanual.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/tools/civmanual.c?rev=28089&r1=28088&r2=28089&view=diff == --- branches/S2_6/tools/civmanual.c (original) +++ branches/S2_6/tools/civmanual.c Tue Feb 10 22:03:34 2015 @@ -628,6 +628,7 @@ con_log_close(); registry_module_close(); + free_nls(); return retval; } ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28088 - /trunk/tools/civmanual.c
Author: cazfi Date: Tue Feb 10 22:03:28 2015 New Revision: 28088 URL: http://svn.gna.org/viewcvs/freeciv?rev=28088&view=rev Log: Free nls on freeciv-manual exit See bug #23257 Modified: trunk/tools/civmanual.c Modified: trunk/tools/civmanual.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/tools/civmanual.c?rev=28088&r1=28087&r2=28088&view=diff == --- trunk/tools/civmanual.c (original) +++ trunk/tools/civmanual.c Tue Feb 10 22:03:28 2015 @@ -628,6 +628,7 @@ con_log_close(); registry_module_close(); + free_nls(); return retval; } ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28092 - /trunk/ai/default/daieffects.c
Author: cazfi
Date: Tue Feb 10 22:21:21 2015
New Revision: 28092
URL: http://svn.gna.org/viewcvs/freeciv?rev=28092&view=rev
Log:
Fixed an illegal array index usage in AI effect value evaluation
when handling an city on ocean.
See bug #23250
Modified:
trunk/ai/default/daieffects.c
Modified: trunk/ai/default/daieffects.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/daieffects.c?rev=28092&r1=28091&r2=28092&view=diff
==
--- trunk/ai/default/daieffects.c (original)
+++ trunk/ai/default/daieffects.c Tue Feb 10 22:21:21 2015
@@ -450,14 +450,16 @@
}
v += (amount/20 + ai->threats.invasions - 1) * c; /* for wonder */
if (capital || affects_land_capable_units) {
- if (ai->threats.continent[tile_continent(pcity->tile)]
+ Continent_id place = tile_continent(pcity->tile);
+
+ if ((place && ai->threats.continent[place])
|| capital
|| (ai->threats.invasions
/* FIXME: This ignores riverboats on some rulesets.
We should analyze rulesets when game starts
and have relevant checks here. */
&& is_terrain_class_near_tile(pcity->tile, TC_OCEAN))) {
-if (ai->threats.continent[tile_continent(pcity->tile)]) {
+if (place && ai->threats.continent[place]) {
v += amount;
} else {
v += amount / (!ai->threats.igwall ? (15 - capital * 5) : 15);
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28093 - /branches/S2_6/ai/default/daieffects.c
Author: cazfi
Date: Tue Feb 10 22:21:27 2015
New Revision: 28093
URL: http://svn.gna.org/viewcvs/freeciv?rev=28093&view=rev
Log:
Fixed an illegal array index usage in AI effect value evaluation
when handling an city on ocean.
See bug #23250
Modified:
branches/S2_6/ai/default/daieffects.c
Modified: branches/S2_6/ai/default/daieffects.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/ai/default/daieffects.c?rev=28093&r1=28092&r2=28093&view=diff
==
--- branches/S2_6/ai/default/daieffects.c (original)
+++ branches/S2_6/ai/default/daieffects.c Tue Feb 10 22:21:27 2015
@@ -450,14 +450,16 @@
}
v += (amount/20 + ai->threats.invasions - 1) * c; /* for wonder */
if (capital || affects_land_capable_units) {
- if (ai->threats.continent[tile_continent(pcity->tile)]
+ Continent_id place = tile_continent(pcity->tile);
+
+ if ((place && ai->threats.continent[place])
|| capital
|| (ai->threats.invasions
/* FIXME: This ignores riverboats on some rulesets.
We should analyze rulesets when game starts
and have relevant checks here. */
&& is_terrain_class_near_tile(pcity->tile, TC_OCEAN))) {
-if (ai->threats.continent[tile_continent(pcity->tile)]) {
+if (place && ai->threats.continent[place]) {
v += amount;
} else {
v += amount / (!ai->threats.igwall ? (15 - capital * 5) : 15);
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28094 - /branches/S2_5/ai/default/aicity.c
Author: cazfi
Date: Tue Feb 10 22:21:34 2015
New Revision: 28094
URL: http://svn.gna.org/viewcvs/freeciv?rev=28094&view=rev
Log:
Fixed an illegal array index usage in AI effect value evaluation
when handling an city on ocean.
See bug #23250
Modified:
branches/S2_5/ai/default/aicity.c
Modified: branches/S2_5/ai/default/aicity.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/ai/default/aicity.c?rev=28094&r1=28093&r2=28094&view=diff
==
--- branches/S2_5/ai/default/aicity.c (original)
+++ branches/S2_5/ai/default/aicity.c Tue Feb 10 22:21:34 2015
@@ -1417,14 +1417,16 @@
}
v += (amount/20 + ai->threats.invasions - 1) * c; /* for wonder */
if (capital || uclass == NULL || move != UMT_SEA) {
- if (ai->threats.continent[tile_continent(pcity->tile)]
+ Continent_id place = tile_continent(pcity->tile);
+
+ if ((place > 0 && ai->threats.continent[place])
|| capital
|| (ai->threats.invasions
/* FIXME: This ignores riverboats on some rulesets.
We should analyze rulesets when game starts
and have relevant checks here. */
&& is_terrain_class_near_tile(pcity->tile, TC_OCEAN))) {
-if (ai->threats.continent[tile_continent(pcity->tile)]) {
+if (place > 0 && ai->threats.continent[place]) {
v += amount;
} else {
v += amount / (!ai->threats.igwall ? (15 - capital * 5) : 15);
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28095 - /branches/S2_4/ai/default/aicity.c
Author: cazfi
Date: Tue Feb 10 22:21:41 2015
New Revision: 28095
URL: http://svn.gna.org/viewcvs/freeciv?rev=28095&view=rev
Log:
Fixed an illegal array index usage in AI effect value evaluation
when handling an city on ocean.
See bug #23250
Modified:
branches/S2_4/ai/default/aicity.c
Modified: branches/S2_4/ai/default/aicity.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/ai/default/aicity.c?rev=28095&r1=28094&r2=28095&view=diff
==
--- branches/S2_4/ai/default/aicity.c (original)
+++ branches/S2_4/ai/default/aicity.c Tue Feb 10 22:21:41 2015
@@ -1381,14 +1381,16 @@
}
v += (amount/20 + ai->threats.invasions - 1) * c; /* for wonder */
if (capital || uclass == NULL || move != UMT_SEA) {
- if (ai->threats.continent[tile_continent(pcity->tile)]
+ Continent_id place = tile_continent(pcity->tile);
+
+ if ((place && ai->threats.continent[place])
|| capital
|| (ai->threats.invasions
/* FIXME: This ignores riverboats on some rulesets.
We should analyze rulesets when game starts
and have relevant checks here. */
&& is_ocean_near_tile(pcity->tile))) {
-if (ai->threats.continent[tile_continent(pcity->tile)]) {
+if (place && ai->threats.continent[place]) {
v += amount;
} else {
v += amount / (!ai->threats.igwall ? (15 - capital * 5) : 15);
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28096 - in /trunk/client: gui-gtk-2.0/citydlg.c gui-gtk-3.0/citydlg.c
Author: cazfi
Date: Tue Feb 10 22:32:10 2015
New Revision: 28096
URL: http://svn.gna.org/viewcvs/freeciv?rev=28096&view=rev
Log:
Marked parameter list of city_dialog_update_prev_next() void
See patch #5777
Modified:
trunk/client/gui-gtk-2.0/citydlg.c
trunk/client/gui-gtk-3.0/citydlg.c
Modified: trunk/client/gui-gtk-2.0/citydlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/citydlg.c?rev=28096&r1=28095&r2=28096&view=diff
==
--- trunk/client/gui-gtk-2.0/citydlg.c (original)
+++ trunk/client/gui-gtk-2.0/citydlg.c Tue Feb 10 22:32:10 2015
@@ -2042,7 +2042,7 @@
note: we still need the sensitivity code in create_city_dialog()
for the spied dialogs.
*/
-static void city_dialog_update_prev_next()
+static void city_dialog_update_prev_next(void)
{
int count = 0;
int city_number;
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=28096&r1=28095&r2=28096&view=diff
==
--- trunk/client/gui-gtk-3.0/citydlg.c (original)
+++ trunk/client/gui-gtk-3.0/citydlg.c Tue Feb 10 22:32:10 2015
@@ -2083,7 +2083,7 @@
note: we still need the sensitivity code in create_city_dialog()
for the spied dialogs.
*/
-static void city_dialog_update_prev_next()
+static void city_dialog_update_prev_next(void)
{
int count = 0;
int city_number;
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28097 - in /branches/S2_6/client: gui-gtk-2.0/citydlg.c gui-gtk-3.0/citydlg.c
Author: cazfi
Date: Tue Feb 10 22:32:17 2015
New Revision: 28097
URL: http://svn.gna.org/viewcvs/freeciv?rev=28097&view=rev
Log:
Marked parameter list of city_dialog_update_prev_next() void
See patch #5777
Modified:
branches/S2_6/client/gui-gtk-2.0/citydlg.c
branches/S2_6/client/gui-gtk-3.0/citydlg.c
Modified: branches/S2_6/client/gui-gtk-2.0/citydlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/citydlg.c?rev=28097&r1=28096&r2=28097&view=diff
==
--- branches/S2_6/client/gui-gtk-2.0/citydlg.c (original)
+++ branches/S2_6/client/gui-gtk-2.0/citydlg.c Tue Feb 10 22:32:17 2015
@@ -2042,7 +2042,7 @@
note: we still need the sensitivity code in create_city_dialog()
for the spied dialogs.
*/
-static void city_dialog_update_prev_next()
+static void city_dialog_update_prev_next(void)
{
int count = 0;
int city_number;
Modified: branches/S2_6/client/gui-gtk-3.0/citydlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/citydlg.c?rev=28097&r1=28096&r2=28097&view=diff
==
--- branches/S2_6/client/gui-gtk-3.0/citydlg.c (original)
+++ branches/S2_6/client/gui-gtk-3.0/citydlg.c Tue Feb 10 22:32:17 2015
@@ -2083,7 +2083,7 @@
note: we still need the sensitivity code in create_city_dialog()
for the spied dialogs.
*/
-static void city_dialog_update_prev_next()
+static void city_dialog_update_prev_next(void)
{
int count = 0;
int city_number;
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28098 - in /branches/S2_5/client: gui-gtk-2.0/citydlg.c gui-gtk-3.0/citydlg.c
Author: cazfi
Date: Tue Feb 10 22:32:24 2015
New Revision: 28098
URL: http://svn.gna.org/viewcvs/freeciv?rev=28098&view=rev
Log:
Marked parameter list of city_dialog_update_prev_next() void
See patch #5777
Modified:
branches/S2_5/client/gui-gtk-2.0/citydlg.c
branches/S2_5/client/gui-gtk-3.0/citydlg.c
Modified: branches/S2_5/client/gui-gtk-2.0/citydlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-2.0/citydlg.c?rev=28098&r1=28097&r2=28098&view=diff
==
--- branches/S2_5/client/gui-gtk-2.0/citydlg.c (original)
+++ branches/S2_5/client/gui-gtk-2.0/citydlg.c Tue Feb 10 22:32:24 2015
@@ -2035,7 +2035,7 @@
note: we still need the sensitivity code in create_city_dialog()
for the spied dialogs.
*/
-static void city_dialog_update_prev_next()
+static void city_dialog_update_prev_next(void)
{
int count = 0;
int city_number;
Modified: branches/S2_5/client/gui-gtk-3.0/citydlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/citydlg.c?rev=28098&r1=28097&r2=28098&view=diff
==
--- branches/S2_5/client/gui-gtk-3.0/citydlg.c (original)
+++ branches/S2_5/client/gui-gtk-3.0/citydlg.c Tue Feb 10 22:32:24 2015
@@ -2066,7 +2066,7 @@
note: we still need the sensitivity code in create_city_dialog()
for the spied dialogs.
*/
-static void city_dialog_update_prev_next()
+static void city_dialog_update_prev_next(void)
{
int count = 0;
int city_number;
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28099 - in /branches/S2_4/client: gui-gtk-2.0/citydlg.c gui-gtk-3.0/citydlg.c
Author: cazfi
Date: Tue Feb 10 22:32:31 2015
New Revision: 28099
URL: http://svn.gna.org/viewcvs/freeciv?rev=28099&view=rev
Log:
Marked parameter list of city_dialog_update_prev_next() void
See patch #5777
Modified:
branches/S2_4/client/gui-gtk-2.0/citydlg.c
branches/S2_4/client/gui-gtk-3.0/citydlg.c
Modified: branches/S2_4/client/gui-gtk-2.0/citydlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/client/gui-gtk-2.0/citydlg.c?rev=28099&r1=28098&r2=28099&view=diff
==
--- branches/S2_4/client/gui-gtk-2.0/citydlg.c (original)
+++ branches/S2_4/client/gui-gtk-2.0/citydlg.c Tue Feb 10 22:32:31 2015
@@ -2017,7 +2017,7 @@
note: we still need the sensitivity code in create_city_dialog()
for the spied dialogs.
*/
-static void city_dialog_update_prev_next()
+static void city_dialog_update_prev_next(void)
{
int count = 0;
int city_number;
Modified: branches/S2_4/client/gui-gtk-3.0/citydlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/client/gui-gtk-3.0/citydlg.c?rev=28099&r1=28098&r2=28099&view=diff
==
--- branches/S2_4/client/gui-gtk-3.0/citydlg.c (original)
+++ branches/S2_4/client/gui-gtk-3.0/citydlg.c Tue Feb 10 22:32:31 2015
@@ -2048,7 +2048,7 @@
note: we still need the sensitivity code in create_city_dialog()
for the spied dialogs.
*/
-static void city_dialog_update_prev_next()
+static void city_dialog_update_prev_next(void)
{
int count = 0;
int city_number;
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28100 - in /branches/S2_5: data/civ2civ3/effects.ruleset doc/README.ruleset_civ2civ3
Author: jtn
Date: Wed Feb 11 01:22:19 2015
New Revision: 28100
URL: http://svn.gna.org/viewcvs/freeciv?rev=28100&view=rev
Log:
civ2civ3: Give Tribal government 2 martial law per unit.
Increase the effect of martial law under Tribal government from 0 to 2 per
unit. This should make it a good alternative to Despotism again. (Tribal's
extra movement was replaced by a higher probability of gaining veterancy in
combat)
Patch by David Fernandez (bardo@gna), backported by me.
See patch #5763.
Modified:
branches/S2_5/data/civ2civ3/effects.ruleset
branches/S2_5/doc/README.ruleset_civ2civ3
Modified: branches/S2_5/data/civ2civ3/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2civ3/effects.ruleset?rev=28100&r1=28099&r2=28100&view=diff
==
--- branches/S2_5/data/civ2civ3/effects.ruleset (original)
+++ branches/S2_5/data/civ2civ3/effects.ruleset Wed Feb 11 01:22:19 2015
@@ -1325,6 +1325,14 @@
"Gov", "Monarchy", "Player"
}
+[effect_martial_law_each_tribal]
+type= "Martial_Law_Each"
+value = 2
+reqs=
+{ "type", "name", "range"
+ "Gov", "Tribal", "Player"
+}
+
[effect_martial_law_each_communism]
type= "Martial_Law_Each"
value = 2
@@ -1355,6 +1363,14 @@
reqs=
{ "type", "name", "range"
"Gov", "Monarchy", "Player"
+}
+
+[effect_martial_law_max_tribal]
+type= "Martial_Law_Max"
+value = 3
+reqs=
+{ "type", "name", "range"
+ "Gov", "Tribal", "Player"
}
[effect_martial_law_max_communism]
Modified: branches/S2_5/doc/README.ruleset_civ2civ3
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/doc/README.ruleset_civ2civ3?rev=28100&r1=28099&r2=28100&view=diff
==
--- branches/S2_5/doc/README.ruleset_civ2civ3 (original)
+++ branches/S2_5/doc/README.ruleset_civ2civ3 Wed Feb 11 01:22:19 2015
@@ -170,7 +170,7 @@
Unit Upkeep Shield Shield Gold Gold Gold(x2) Shield
Gold(x2) Gold(x2) Shield
Free Units2\2 2\2 2\2 3\3 2\2 1\1 1\1
2\2 3\3
Mil Unhappiness 000-1 -1 -1 -2
-1 -1
-Martial Law +1 0+1 +1 000
0+2
+Martial Law +1 +2 +1 +1 000
0+2
Civil war % 99 90 80 70 60 40 30
20 50
Empire Size 0/14 /10 /12 /20 /16 /32
/24 /28
@@ -454,6 +454,7 @@
- Removed effect that prevented extra output from cities where Irrigation and
Mine were present at same time (no longer possible).
- Reduced by one the gold upkeep of Aqueduct, Bank, Stock Exchange, Port
Facility and SDI Defense.
- Airbases and Fortresses cannot be built on river tiles.
+- Tribal government increases by half the chance of land units getting the
next veteran level after a battle (instead of the extra movement), and
increases the effect of martial law to 2.
Terrain:
- Allowed early transformation from Forest to Grassland, so it is possible to
transform Grass->Forest->Plain, and also Plain->Forest->Grass, with same
working time (25).
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
