[Freeciv-commits] r34018 - in /trunk: ./ ai/default/ client/ client/gui-gtk-2.0/ client/gui-gtk-3.0/ client/gui-gtk-3.22/ client/gui-qt/ clien...
Author: sveinung
Date: Thu Oct 6 14:03:55 2016
New Revision: 34018
URL: http://svn.gna.org/viewcvs/freeciv?rev=34018=rev
Log:
Add the new unit action "Heal Unit".
This allows medic units etc. A healing restores 25% of the target's hit
points are restored each healing. Healing spends all the actor's movement
points.
See patch #7774
Modified:
trunk/ai/default/aicity.c
trunk/client/gui-gtk-2.0/action_dialog.c
trunk/client/gui-gtk-3.0/action_dialog.c
trunk/client/gui-gtk-3.22/action_dialog.c
trunk/client/gui-qt/dialogs.cpp
trunk/client/gui-sdl2/action_dialog.c
trunk/client/packhand.c
trunk/common/actions.c
trunk/common/actions.h
trunk/doc/README.actions
trunk/fc_version
trunk/server/advisors/advdata.c
trunk/server/ruleset.c
trunk/server/unithand.c
trunk/tools/ruleutil/rulesave.c
Modified: trunk/ai/default/aicity.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aicity.c?rev=34018=34017=34018=diff
==
--- trunk/ai/default/aicity.c (original)
+++ trunk/ai/default/aicity.c Thu Oct 6 14:03:55 2016
@@ -1224,6 +1224,7 @@
case ACTION_NUKE:
case ACTION_PARADROP:
case ACTION_ATTACK:
+ case ACTION_HEAL_UNIT:
case ACTION_COUNT:
fc_assert_msg(action_id_get_target_kind(action_id) == ATK_CITY,
"Action not aimed at cities");
Modified: trunk/client/gui-gtk-2.0/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/action_dialog.c?rev=34018=34017=34018=diff
==
--- trunk/client/gui-gtk-2.0/action_dialog.c(original)
+++ trunk/client/gui-gtk-2.0/action_dialog.cThu Oct 6 14:03:55 2016
@@ -488,6 +488,20 @@
struct action_data *args = (struct action_data *)data;
request_do_action(ACTION_SPY_SABOTAGE_UNIT, args->actor_unit_id,
+args->target_unit_id, 0, "");
+
+ gtk_widget_destroy(act_sel_dialog);
+ free(args);
+}
+
+/*
+ User selected "Heal Unit" from choice dialog
+*/
+static void heal_unit_callback(GtkWidget *w, gpointer data)
+{
+ struct action_data *args = (struct action_data *)data;
+
+ request_do_action(ACTION_HEAL_UNIT, args->actor_unit_id,
args->target_unit_id, 0, "");
gtk_widget_destroy(act_sel_dialog);
@@ -1278,6 +1292,7 @@
/* Unit acting against a unit target. */
[ACTION_SPY_BRIBE_UNIT] = (GCallback)diplomat_bribe_callback,
[ACTION_SPY_SABOTAGE_UNIT] = (GCallback)spy_sabotage_unit_callback,
+ [ACTION_HEAL_UNIT] = (GCallback)heal_unit_callback,
/* Unit acting against all units at a tile. */
[ACTION_CAPTURE_UNITS] = (GCallback)capture_units_callback,
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=34018=34017=34018=diff
==
--- trunk/client/gui-gtk-3.0/action_dialog.c(original)
+++ trunk/client/gui-gtk-3.0/action_dialog.cThu Oct 6 14:03:55 2016
@@ -498,6 +498,20 @@
struct action_data *args = (struct action_data *)data;
request_do_action(ACTION_SPY_SABOTAGE_UNIT, args->actor_unit_id,
+args->target_unit_id, 0, "");
+
+ gtk_widget_destroy(act_sel_dialog);
+ free(args);
+}
+
+/*
+ User selected "Heal Unit" from choice dialog
+*/
+static void heal_unit_callback(GtkWidget *w, gpointer data)
+{
+ struct action_data *args = (struct action_data *)data;
+
+ request_do_action(ACTION_HEAL_UNIT, args->actor_unit_id,
args->target_unit_id, 0, "");
gtk_widget_destroy(act_sel_dialog);
@@ -1372,6 +1386,7 @@
/* Unit acting against a unit target. */
[ACTION_SPY_BRIBE_UNIT] = (GCallback)diplomat_bribe_callback,
[ACTION_SPY_SABOTAGE_UNIT] = (GCallback)spy_sabotage_unit_callback,
+ [ACTION_HEAL_UNIT] = (GCallback)heal_unit_callback,
/* Unit acting against all units at a tile. */
[ACTION_CAPTURE_UNITS] = (GCallback)capture_units_callback,
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=34018=34017=34018=diff
==
--- trunk/client/gui-gtk-3.22/action_dialog.c (original)
+++ trunk/client/gui-gtk-3.22/action_dialog.c Thu Oct 6 14:03:55 2016
@@ -498,6 +498,20 @@
struct action_data *args = (struct action_data *)data;
request_do_action(ACTION_SPY_SABOTAGE_UNIT, args->actor_unit_id,
+args->target_unit_id, 0, "");
+
+ gtk_widget_destroy(act_sel_dialog);
+ free(args);
+}
+
[Freeciv-commits] r34020 - /trunk/data/webperimental/game.ruleset
Author: sveinung
Date: Thu Oct 6 14:05:59 2016
New Revision: 34020
URL: http://svn.gna.org/viewcvs/freeciv?rev=34020=rev
Log:
webperimental: let the Leader heal its units.
Give the Leader unit the ability to do "Heal Unit" to domestic and allied
light weight units, including it self. The ability to heal it self and any
light weight escorts makes it a bit harder to kill the Leader. It could also
give a (small) incentive to take the Leader into the field in the beginning
of the game (when most land units have the LightWeight unit type flag).
See patch #7775
Modified:
trunk/data/webperimental/game.ruleset
Modified: trunk/data/webperimental/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/webperimental/game.ruleset?rev=34020=34019=34020=diff
==
--- trunk/data/webperimental/game.ruleset (original)
+++ trunk/data/webperimental/game.ruleset Thu Oct 6 14:05:59 2016
@@ -61,6 +61,8 @@
- Killing an enemy Leader gives you a few of his cities, some of his gold \
and some of his knowledge. Not all his cities will follow you. Some will \
rather turn barbarian.\n\
+- The Leader can heal light weight units belonging to you or to your \
+allies.\n\
- Labels the year using AD/BC.\n\
- All units can be airlifted:\n\
- Light weight units can be airlifted once Flight is known.\n\
@@ -660,6 +662,24 @@
"UnitFlag", "AddToCity", "Local", TRUE
"DiplRel", "Is foreign", "Local", FALSE
"MinMoveFrags", "1", "Local", TRUE
+}
+
+[actionenabler_heal]
+action = "Heal Unit"
+actor_reqs=
+{ "type", "name", "range", "present"
+ "UnitFlag", "GameLoss", "Local", TRUE
+ "DiplRel", "War", "Local", FALSE
+ "DiplRel", "Cease-fire","Local", FALSE
+ "DiplRel", "Armistice", "Local", FALSE
+ "DiplRel", "Peace", "Local", FALSE
+ "DiplRel", "Never met", "Local", FALSE
+ "MinMoveFrags", "1", "Local", TRUE
+ "UnitState","OnLivableTile", "Local", TRUE
+}
+target_reqs=
+{ "type", "name", "range", "present"
+ "UnitFlag", "LightWeight", "Local", TRUE
}
[actionenabler_border_police]
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r34021 - /trunk/common/movement.c
Author: sveinung Date: Thu Oct 6 14:06:32 2016 New Revision: 34021 URL: http://svn.gna.org/viewcvs/freeciv?rev=34021=rev Log: Comment spell fix: un-allied -> non allied. Modified: trunk/common/movement.c Modified: trunk/common/movement.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/movement.c?rev=34021=34020=34021=diff == --- trunk/common/movement.c (original) +++ trunk/common/movement.c Thu Oct 6 14:06:32 2016 @@ -542,8 +542,8 @@ 4) Animals cannot move out from home terrains 5) Unit can move to a tile where it can't survive on its own if there is free transport capacity. -6) There are no peaceful but un-allied units on the target tile. -7) There is not a un-allied city on the target tile when +6) There are no peaceful but non allied units on the target tile. +7) There is not a non allied city on the target tile when enter_enemy_city is false. When enter_enemy_city is true a non peaceful city is also accepted. 8) There is no non-allied unit blocking (zoc) [or igzoc is true]. ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r34019 - /trunk/server/savegame3.c
Author: sveinung
Date: Thu Oct 6 14:05:31 2016
New Revision: 34019
URL: http://svn.gna.org/viewcvs/freeciv?rev=34019=rev
Log:
savegame3: add all actions to order validation.
The unit action order target validation code didn't handle all actions. Have
it handle all currently existing actions. Make it object when a new action
is added but not handled.
See bug #25152
Modified:
trunk/server/savegame3.c
Modified: trunk/server/savegame3.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame3.c?rev=34019=34018=34019=diff
==
--- trunk/server/savegame3.c(original)
+++ trunk/server/savegame3.cThu Oct 6 14:05:31 2016
@@ -5460,7 +5460,7 @@
unitstr, j);
if (order->order == ORDER_PERFORM_ACTION) {
- switch (order->action) {
+ switch ((enum gen_action)order->action) {
case ACTION_SPY_TARGETED_SABOTAGE_CITY:
/* Sabotage target is production (-1) or a building. */
if (!(order_tgt - 1 == -1
@@ -5506,6 +5506,15 @@
case ACTION_NUKE:
case ACTION_DESTROY_CITY:
case ACTION_EXPEL_UNIT:
+ case ACTION_RECYCLE_UNIT:
+ case ACTION_DISBAND_UNIT:
+ case ACTION_HOME_CITY:
+ case ACTION_UPGRADE_UNIT:
+ case ACTION_PARADROP:
+ case ACTION_AIRLIFT:
+ case ACTION_ATTACK:
+ case ACTION_CONQUER_CITY:
+ case ACTION_HEAL_UNIT:
case ACTION_COUNT:
/* Target in order unsupported. */
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r34026 - /branches/S2_5/translations/freeciv/uk.po
Author: swiatos Date: Fri Oct 7 03:29:51 2016 New Revision: 34026 URL: http://svn.gna.org/viewcvs/freeciv?rev=34026=rev Log: update for uk.po, corrections + removed few fuzzies & empties. left: 21695-26793. Modified: branches/S2_5/translations/freeciv/uk.po [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/S2_5/translations/freeciv/uk.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/uk.po?rev=34026=34025=34026=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r34024 - in /trunk/data: civ1/game.ruleset civ1/nations.ruleset civ2/game.ruleset civ2/nations.ruleset
Author: cazfi Date: Fri Oct 7 01:39:50 2016 New Revision: 34024 URL: http://svn.gna.org/viewcvs/freeciv?rev=34024=rev Log: Specified border colors for civ1 and civ2 ruleset nations and set plrcolormode to "NATION_ORDER" by default on those rulesets. Requested by Jacob Nevins See patch #3927 Modified: trunk/data/civ1/game.ruleset trunk/data/civ1/nations.ruleset trunk/data/civ2/game.ruleset trunk/data/civ2/nations.ruleset Modified: trunk/data/civ1/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/game.ruleset?rev=34024=34023=34024=diff == --- trunk/data/civ1/game.ruleset(original) +++ trunk/data/civ1/game.rulesetFri Oct 7 01:39:50 2016 @@ -919,4 +919,5 @@ ; Ruleset has no trait ranges, so player choosing EVEN would have ; no effect anyway "traitdistribution", "FIXED", TRUE -} + "plrcolormode", "NATION_ORDER", FALSE +} Modified: trunk/data/civ1/nations.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/nations.ruleset?rev=34024=34023=34024=diff == --- trunk/data/civ1/nations.ruleset (original) +++ trunk/data/civ1/nations.ruleset Fri Oct 7 01:39:50 2016 @@ -127,6 +127,10 @@ flag="usa" flag_alt="-" style = "Celtic" + +color.r = 115 +color.g = 255 +color.b = 255 init_techs="" init_buildings="" @@ -238,6 +242,10 @@ flag_alt="-" style = "Tropical" +color.r = 230 +color.g = 230 +color.b = 74 + init_techs="" init_buildings="" init_units="" @@ -335,6 +343,10 @@ flag_alt="-" style = "Babylonian" +color.r = 115 +color.g = 255 +color.b = 67 + init_techs="" init_buildings="" init_units="" @@ -401,6 +413,10 @@ flag="han" flag_alt="-" style = "Asian" + +color.r = 90 +color.g = 230 +color.b = 230 init_techs="" init_buildings="" @@ -542,6 +558,10 @@ flag_alt="-" style = "Babylonian" +color.r = 255 +color.g = 255 +color.b = 99 + init_techs="" init_buildings="" init_units="" @@ -618,6 +638,10 @@ flag="england" flag_alt="-" style = "European" + +color.r = 230 +color.g = 138 +color.b = 10 init_techs="" init_buildings="" @@ -728,6 +752,10 @@ flag="france_old" flag_alt="-" style = "Celtic" + +color.r = 90 +color.g = 42 +color.b = 230 init_techs="" init_buildings="" @@ -851,6 +879,10 @@ flag = "hre" flag_alt = "-" style= "European" + +color.r = 115 +color.g = 67 +color.b = 255 init_techs = "" init_buildings="" @@ -1000,6 +1032,10 @@ flag_alt="-" style = "Classical" +color.r = 255 +color.g = 163 +color.b = 35 + init_techs="" init_buildings="" init_units="" @@ -1150,6 +1186,10 @@ flag_alt="-" style = "Asian" +color.r = 255 +color.g = 51 +color.b = 255 + init_techs="" init_buildings="" init_units="" @@ -1244,6 +1284,10 @@ flag_alt="-" style = "Asian" +color.r = 230 +color.g = 26 +color.b = 230 + init_techs="" init_buildings="" init_units="" @@ -1308,6 +1352,10 @@ flag_alt="-" style = "Classical" +color.r = 255 +color.g = 255 +color.b = 255 + init_techs="" init_buildings="" init_units="" @@ -1363,6 +1411,10 @@ flag="kiev" flag_alt = "-" style = "European" + +color.r = 230 +color.g = 230 +color.b = 230 init_techs="" init_buildings="" @@ -1451,6 +1503,10 @@ flag_alt="-" style = "Tropical" +color.r = 90 +color.g = 230 +color.b = 42 + init_techs="" init_buildings="" init_units="" @@ -1516,6 +1572,10 @@ flag_alt = "-" style = "European" +color.r = 255 +color.g = 67 +color.b = 67 + init_techs="" init_buildings="" init_units="" @@ -1554,6 +1614,10 @@ flag_alt = "-" style = "European" +color.r = 255 +color.g = 67 +color.b = 67 + init_techs="" init_buildings="" init_units="" Modified: trunk/data/civ2/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/game.ruleset?rev=34024=34023=34024=diff == --- trunk/data/civ2/game.ruleset(original) +++ trunk/data/civ2/game.rulesetFri Oct 7 01:39:50 2016 @@ -952,4 +952,5 @@ ; Ruleset has no trait ranges, so player choosing EVEN would have ; no effect anyway "traitdistribution", "FIXED", TRUE -} + "plrcolormode", "NATION_ORDER", FALSE +} Modified: trunk/data/civ2/nations.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/nations.ruleset?rev=34024=34023=34024=diff == --- trunk/data/civ2/nations.ruleset (original) +++ trunk/data/civ2/nations.ruleset Fri Oct 7 01:39:50 2016 @@ -131,6 +131,10 @@ flag="usa" flag_alt="-" style = "Celtic" + +color.r = 115 +color.g = 255 +color.b = 255 init_techs="" init_buildings="" @@ -243,6 +247,10 @@ flag_alt="-" style = "Tropical" +color.r = 230 +color.g = 230 +color.b = 74 + init_techs="" init_buildings="" init_units="" @@
[Freeciv-commits] r34025 - in /branches/S2_6/data: civ1/game.ruleset civ1/nations.ruleset civ2/game.ruleset civ2/nations.ruleset
Author: cazfi Date: Fri Oct 7 01:39:58 2016 New Revision: 34025 URL: http://svn.gna.org/viewcvs/freeciv?rev=34025=rev Log: Specified border colors for civ1 and civ2 ruleset nations and set plrcolormode to "NATION_ORDER" by default on those rulesets. Requested by Jacob Nevins See patch #3927 Modified: branches/S2_6/data/civ1/game.ruleset branches/S2_6/data/civ1/nations.ruleset branches/S2_6/data/civ2/game.ruleset branches/S2_6/data/civ2/nations.ruleset Modified: branches/S2_6/data/civ1/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ1/game.ruleset?rev=34025=34024=34025=diff == --- branches/S2_6/data/civ1/game.ruleset(original) +++ branches/S2_6/data/civ1/game.rulesetFri Oct 7 01:39:58 2016 @@ -655,4 +655,5 @@ ; Ruleset has no trait ranges, so player choosing EVEN would have ; no effect anyway "traitdistribution", "FIXED", TRUE -} + "plrcolormode", "NATION_ORDER", FALSE +} Modified: branches/S2_6/data/civ1/nations.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ1/nations.ruleset?rev=34025=34024=34025=diff == --- branches/S2_6/data/civ1/nations.ruleset (original) +++ branches/S2_6/data/civ1/nations.ruleset Fri Oct 7 01:39:58 2016 @@ -126,6 +126,10 @@ flag="usa" flag_alt="-" style = "Celtic" + +color.r = 115 +color.g = 255 +color.b = 255 init_techs="" init_buildings="" @@ -237,6 +241,10 @@ flag_alt="-" style = "Tropical" +color.r = 230 +color.g = 230 +color.b = 74 + init_techs="" init_buildings="" init_units="" @@ -334,6 +342,10 @@ flag_alt="-" style = "Babylonian" +color.r = 115 +color.g = 255 +color.b = 67 + init_techs="" init_buildings="" init_units="" @@ -400,6 +412,10 @@ flag="han" flag_alt="-" style = "Asian" + +color.r = 90 +color.g = 230 +color.b = 230 init_techs="" init_buildings="" @@ -541,6 +557,10 @@ flag_alt="-" style = "Babylonian" +color.r = 255 +color.g = 255 +color.b = 99 + init_techs="" init_buildings="" init_units="" @@ -617,6 +637,10 @@ flag="england" flag_alt="-" style = "European" + +color.r = 230 +color.g = 138 +color.b = 10 init_techs="" init_buildings="" @@ -727,6 +751,10 @@ flag="france_old" flag_alt="-" style = "Celtic" + +color.r = 90 +color.g = 42 +color.b = 230 init_techs="" init_buildings="" @@ -850,6 +878,10 @@ flag = "hre" flag_alt = "-" style= "European" + +color.r = 115 +color.g = 67 +color.b = 255 init_techs = "" init_buildings="" @@ -999,6 +1031,10 @@ flag_alt="-" style = "Classical" +color.r = 255 +color.g = 163 +color.b = 35 + init_techs="" init_buildings="" init_units="" @@ -1149,6 +1185,10 @@ flag_alt="-" style = "Asian" +color.r = 255 +color.g = 51 +color.b = 255 + init_techs="" init_buildings="" init_units="" @@ -1243,6 +1283,10 @@ flag_alt="-" style = "Asian" +color.r = 230 +color.g = 26 +color.b = 230 + init_techs="" init_buildings="" init_units="" @@ -1307,6 +1351,10 @@ flag_alt="-" style = "Classical" +color.r = 255 +color.g = 255 +color.b = 255 + init_techs="" init_buildings="" init_units="" @@ -1362,6 +1410,10 @@ flag="kiev" flag_alt = "-" style = "European" + +color.r = 230 +color.g = 230 +color.b = 230 init_techs="" init_buildings="" @@ -1450,6 +1502,10 @@ flag_alt="-" style = "Tropical" +color.r = 90 +color.g = 230 +color.b = 42 + init_techs="" init_buildings="" init_units="" @@ -1515,6 +1571,10 @@ flag_alt = "-" style = "European" +color.r = 255 +color.g = 67 +color.b = 67 + init_techs="" init_buildings="" init_units="" @@ -1551,6 +1611,10 @@ flag_alt = "-" style = "European" +color.r = 255 +color.g = 67 +color.b = 67 + init_techs="" init_buildings="" init_units="" Modified: branches/S2_6/data/civ2/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2/game.ruleset?rev=34025=34024=34025=diff == --- branches/S2_6/data/civ2/game.ruleset(original) +++ branches/S2_6/data/civ2/game.rulesetFri Oct 7 01:39:58 2016 @@ -650,4 +650,5 @@ ; Ruleset has no trait ranges, so player choosing EVEN would have ; no effect anyway "traitdistribution", "FIXED", TRUE -} + "plrcolormode", "NATION_ORDER", FALSE +} Modified: branches/S2_6/data/civ2/nations.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2/nations.ruleset?rev=34025=34024=34025=diff == --- branches/S2_6/data/civ2/nations.ruleset (original) +++ branches/S2_6/data/civ2/nations.ruleset Fri Oct 7 01:39:58 2016 @@ -130,6 +130,10 @@ flag="usa" flag_alt="-" style = "Celtic" + +color.r = 115 +color.g = 255 +color.b = 255 init_techs="" init_buildings=""
[Freeciv-commits] r34027 - /branches/S2_6/client/gui-gtk-3.22/
Author: cazfi Date: Fri Oct 7 05:06:54 2016 New Revision: 34027 URL: http://svn.gna.org/viewcvs/freeciv?rev=34027=rev Log: Copied gui-gtk-3.0 as base for gui-gtk-3.22 See patch #7762 Added: branches/S2_6/client/gui-gtk-3.22/ - copied from r34026, branches/S2_6/client/gui-gtk-3.0/ ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r34029 - /branches/S2_6/client/gui-gtk-3.22/Makefile.am
Author: cazfi Date: Fri Oct 7 05:10:02 2016 New Revision: 34029 URL: http://svn.gna.org/viewcvs/freeciv?rev=34029=rev Log: Renamed gtk3.22-client library as libgui-gtk3_22 See patch #7766 Modified: branches/S2_6/client/gui-gtk-3.22/Makefile.am Modified: branches/S2_6/client/gui-gtk-3.22/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.22/Makefile.am?rev=34029=34028=34029=diff == --- branches/S2_6/client/gui-gtk-3.22/Makefile.am (original) +++ branches/S2_6/client/gui-gtk-3.22/Makefile.am Fri Oct 7 05:10:02 2016 @@ -1,13 +1,13 @@ ## Process this file with automake to produce Makefile.in -noinst_LTLIBRARIES = libgui-gtk3.la +noinst_LTLIBRARIES = libgui-gtk3_22.la AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../include \ -I$(top_srcdir)/utility -I$(top_srcdir)/common \ -I$(top_srcdir)/common/aicore -I$(top_srcdir)/common/scriptcore \ -I$(srcdir)/../agents -I$(srcdir)/../luascript \ - $(gui_gtk3_cflags) $(SOUND_CFLAGS) + $(gui_gtk3_22_cflags) $(SOUND_CFLAGS) -libgui_gtk3_la_SOURCES = \ +libgui_gtk3_22_la_SOURCES = \ action_dialog.c \ canvas.c\ canvas.h\ @@ -97,4 +97,4 @@ wldlg.c \ wldlg.h -libgui_gtk3_la_LIBADD = -lm +libgui_gtk3_22_la_LIBADD = -lm ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r34028 - /branches/S2_6/m4/gtk3.22-client.m4
Author: cazfi Date: Fri Oct 7 05:08:36 2016 New Revision: 34028 URL: http://svn.gna.org/viewcvs/freeciv?rev=34028=rev Log: Added gtk3.22-client.m4 See patch #7765 Added: branches/S2_6/m4/gtk3.22-client.m4 Added: branches/S2_6/m4/gtk3.22-client.m4 URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/m4/gtk3.22-client.m4?rev=34028=auto == --- branches/S2_6/m4/gtk3.22-client.m4 (added) +++ branches/S2_6/m4/gtk3.22-client.m4 Fri Oct 7 05:08:36 2016 @@ -0,0 +1,31 @@ +# Try to configure the GTK+-3.22 client (gui-gtk-3.22) + +# FC_GTK3_22_CLIENT +# Test for GTK+-3.0 libraries needed for gui-gtk-3.22 + +AC_DEFUN([FC_GTK3_22_CLIENT], +[ + # Add check "x$client" = "xauto" when this becomes supported client + if test "x$gui_gtk3_22" = "xyes" || + test "x$client" = "xall" ; then +PKG_CHECK_MODULES([GTK3_22], [gtk+-3.0 >= 3.8.0], + [ +GTK3_22_CFLAGS="$GTK3_22_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_8" +GTK3_22_CFLAGS="$GTK3_22_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36" +gui_gtk3_22=yes +if test "x$client" = "xauto" ; then + client=yes +fi +gui_gtk3_22_cflags="$GTK3_22_CFLAGS" +gui_gtk3_22_libs="$GTK3_22_LIBS" +if test "x$MINGW" = "xyes"; then + dnl Required to compile gtk3 on Windows platform + gui_gtk3_22_cflags="$gui_gtk3_22_cflags -mms-bitfields" + gui_gtk3_22_ldflags="$gui_gtk3_22_ldflags -mwindows" +fi + ], + [ +FC_NO_CLIENT([gtk3_22], [GTK+-3.22 libraries not found]) + ]) + fi +]) ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r34017 - /trunk/ai/default/daimilitary.c
Author: sveinung
Date: Thu Oct 6 14:03:28 2016
New Revision: 34017
URL: http://svn.gna.org/viewcvs/freeciv?rev=34017=rev
Log:
ai: consider actions when assessing danger.
"Attack" and "Occupy City" are action enabler controlled. Look at the
actions to take more unit requirements into account.
See patch #7773
Modified:
trunk/ai/default/daimilitary.c
Modified: trunk/ai/default/daimilitary.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/daimilitary.c?rev=34017=34016=34017=diff
==
--- trunk/ai/default/daimilitary.c (original)
+++ trunk/ai/default/daimilitary.c Thu Oct 6 14:03:28 2016
@@ -555,9 +555,8 @@
if (!utai->carries_occupiers
&& !utype_acts_hostile(utype)
&& (utype_has_flag(utype, UTYF_CIVILIAN)
- || (0 >= utype->attack_strength
- && !uclass_has_flag(utype_class(utype),
- UCF_CAN_OCCUPY_CITY {
+ || (!utype_can_do_action(utype, ACTION_ATTACK)
+ && !utype_can_take_over(utype {
/* Harmless unit. */
continue;
}
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r34016 - /trunk/server/unithand.c
Author: sveinung
Date: Thu Oct 6 14:03:00 2016
New Revision: 34016
URL: http://svn.gna.org/viewcvs/freeciv?rev=34016=rev
Log:
Remove redundant unit order validation.
There is no need to validate that no action order contains "Paradrop Unit"
or "Airlift Unit". Any long range action is caught above.
Remove target kind specific validation. It never got any checks.
See patch #7772
Modified:
trunk/server/unithand.c
Modified: trunk/server/unithand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/unithand.c?rev=34016=34015=34016=diff
==
--- trunk/server/unithand.c (original)
+++ trunk/server/unithand.c Thu Oct 6 14:03:00 2016
@@ -4739,17 +4739,9 @@
case ACTION_UPGRADE_UNIT:
case ACTION_ATTACK:
case ACTION_CONQUER_CITY:
-/* No validation required. */
-break;
case ACTION_PARADROP:
case ACTION_AIRLIFT:
-/* Can't specify target tile in the current order packet format.
- * Should have been caught above. */
-log_error("Action %s isn't supported in orders. "
- "It was sent in order number %d from %s to "
- "unit number %d.",
- action_get_ui_name(packet->action[i]), i,
- player_name(pplayer), packet->unit_id);
+/* No validation required. */
break;
/* Invalid action. Should have been caught above. */
case ACTION_COUNT:
@@ -4759,30 +4751,15 @@
i, player_name(pplayer), packet->unit_id);
}
- switch (action_id_get_target_kind(packet->action[i])) {
- case ATK_CITY:
-/* Don't validate that the target tile really contains a city or
- * that the actor player's map think the target tile has one.
- * The player may target a city from its player map that isn't
- * there any more and a city that he think is there even if his
- * player map doesn't have it.
- *
- * With that said: The client should probably at least have an
- * option to only aim city targeted actions at cities. */
-break;
- case ATK_UNIT:
-break;
- case ATK_UNITS:
-break;
- case ATK_TILE:
-break;
- case ATK_SELF:
-break;
- case ATK_COUNT:
-fc_assert(action_id_get_target_kind(packet->action[i])
- != ATK_COUNT);
-break;
- }
+ /* Don't validate that the target tile really contains a target or
+ * that the actor player's map think the target tile has one.
+ * The player may target a something from his player map that isn't
+ * there any more, a target he thinks is there even if his player map
+ * doesn't have it or even a target he assumes will be there when the
+ * unit reaches the target tile.
+ *
+ * With that said: The client should probably at least have an
+ * option to only aim city targeted actions at cities. */
break;
case ORDER_FULL_MP:
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r34022 - /branches/S2_6/data/sandbox/README.sandbox
Author: sveinung Date: Thu Oct 6 14:07:36 2016 New Revision: 34022 URL: http://svn.gna.org/viewcvs/freeciv?rev=34022=rev Log: README.sandbox spelling fix: along -> alone. See bug #25148 Modified: branches/S2_6/data/sandbox/README.sandbox Modified: branches/S2_6/data/sandbox/README.sandbox URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/sandbox/README.sandbox?rev=34022=34021=34022=diff == --- branches/S2_6/data/sandbox/README.sandbox (original) +++ branches/S2_6/data/sandbox/README.sandbox Thu Oct 6 14:07:36 2016 @@ -36,7 +36,7 @@ Units can establish embassies directly from boats without disembarking. -Units can be bribed/sabotaged if not along on their tile: +Units can be bribed/sabotaged if not alone on their tile: Being part of a unit stack won't protect against spy actions. Merchant movement restrictions: ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
