[Freeciv-commits] r30401 - in /branches: S2_4/po/fr.po S2_5/translations/freeciv/fr.po S2_5/translations/nations/fr.po
Author: igx31 Date: Wed Nov 4 06:35:18 2015 New Revision: 30401 URL: http://svn.gna.org/viewcvs/freeciv?rev=30401&view=rev Log: Updated French translations Modified: branches/S2_4/po/fr.po branches/S2_5/translations/freeciv/fr.po branches/S2_5/translations/nations/fr.po [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/S2_4/po/fr.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_4/po/fr.po?rev=30401&r1=30400&r2=30401&view=diff Modified: branches/S2_5/translations/freeciv/fr.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/fr.po?rev=30401&r1=30400&r2=30401&view=diff Modified: branches/S2_5/translations/nations/fr.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/nations/fr.po?rev=30401&r1=30400&r2=30401&view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r30400 - /trunk/server/plrhand.c
Author: cazfi
Date: Tue Nov 3 23:54:47 2015
New Revision: 30400
URL: http://svn.gna.org/viewcvs/freeciv?rev=30400&view=rev
Log:
Remove trade routes when cities are removed as part of player removal.
See bug #23970
Modified:
trunk/server/plrhand.c
Modified: trunk/server/plrhand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/plrhand.c?rev=30400&r1=30399&r2=30400&view=diff
==
--- trunk/server/plrhand.c (original)
+++ trunk/server/plrhand.c Tue Nov 3 23:54:47 2015
@@ -1629,6 +1629,7 @@
cities_iterate(pcity) {
if (city_owner(pcity) != pplayer) {
citizens nationality = citizens_nation_get(pcity, pplayer->slot);
+
if (nationality != 0) {
/* Change nationality of the citizens to the nationality of the
* city owner. */
@@ -1644,6 +1645,14 @@
/* AI type lost control of this player */
CALL_PLR_AI_FUNC(lost_control, pplayer, pplayer);
+
+ /* Clear all trade routes. This is needed for the other end not
+ * to point to a city removed by player_clear() */
+ city_list_iterate(pplayer->cities, pcity) {
+trade_routes_iterate_safe(pcity, proute) {
+ remove_trade_route(pcity, proute, TRUE, TRUE);
+} trade_routes_iterate_safe_end;
+ } city_list_iterate_end;
/* We have to clear all player data before the ai memory is freed because
* some function may depend on it. */
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r30399 - in /branches/S2_6/data: alien/ civ1/ civ2/ civ2civ3/ classic/ multiplayer/
Author: jtn
Date: Tue Nov 3 23:15:12 2015
New Revision: 30399
URL: http://svn.gna.org/viewcvs/freeciv?rev=30399&view=rev
Log:
Define AI trait ranges for the civ2civ3, classic, and multiplayer rulesets
(based on those for the experimental ruleset). This doesn't change
default behaviour but allows players to see an effect from changing the
'traitdistribution' setting.
civ1/civ2/alien rulesets do not define trait ranges, so disallow
changing 'traitdistribution' in those rulesets, since it would have no
effect.
See gna patch #6516.
Modified:
branches/S2_6/data/alien/game.ruleset
branches/S2_6/data/civ1/game.ruleset
branches/S2_6/data/civ2/game.ruleset
branches/S2_6/data/civ2civ3/nations.ruleset
branches/S2_6/data/classic/nations.ruleset
branches/S2_6/data/multiplayer/nations.ruleset
Modified: branches/S2_6/data/alien/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/alien/game.ruleset?rev=30399&r1=30398&r2=30399&view=diff
==
--- branches/S2_6/data/alien/game.ruleset (original)
+++ branches/S2_6/data/alien/game.ruleset Tue Nov 3 23:15:12 2015
@@ -562,15 +562,18 @@
[settings]
; freeciv game settings for the alien ruleset
set =
- { "name", "value"
- "topology", "WRAPX|WRAPY|ISO|HEX"
- "mapsize","PLAYER"
- "tilesperplayer", 300
- "aifill", 7
- "sciencebox", 150
- "foodbox",150
- "revolen",7
- "citymindist",3
- "startunits", "cx"
- "plrcolormode", "NATION_ORDER"
+ { "name", "value", "lock"
+ "topology", "WRAPX|WRAPY|ISO|HEX", FALSE
+ "mapsize","PLAYER",FALSE
+ "tilesperplayer", 300, FALSE
+ "aifill", 7, FALSE
+ "sciencebox", 150, FALSE
+ "foodbox",150, FALSE
+ "revolen",7, FALSE
+ "citymindist",3, FALSE
+ "startunits", "cx",FALSE
+ "plrcolormode", "NATION_ORDER", FALSE
+ ; Ruleset has no trait ranges, so player choosing EVEN would have
+ ; no effect anyway
+ "traitdistribution", "FIXED", TRUE
}
Modified: branches/S2_6/data/civ1/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ1/game.ruleset?rev=30399&r1=30398&r2=30399&view=diff
==
--- branches/S2_6/data/civ1/game.ruleset(original)
+++ branches/S2_6/data/civ1/game.rulesetTue Nov 3 23:15:12 2015
@@ -634,4 +634,7 @@
"startunits", "c", FALSE
"borders", "DISABLED", FALSE
"citymindist", 1, FALSE
-}
+ ; Ruleset has no trait ranges, so player choosing EVEN would have
+ ; no effect anyway
+ "traitdistribution", "FIXED", TRUE
+}
Modified: branches/S2_6/data/civ2/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2/game.ruleset?rev=30399&r1=30398&r2=30399&view=diff
==
--- branches/S2_6/data/civ2/game.ruleset(original)
+++ branches/S2_6/data/civ2/game.rulesetTue Nov 3 23:15:12 2015
@@ -629,4 +629,7 @@
"sciencebox", 50, FALSE
"startunits", "cc", FALSE
"borders", "DISABLED", FALSE
-}
+ ; Ruleset has no trait ranges, so player choosing EVEN would have
+ ; no effect anyway
+ "traitdistribution", "FIXED", TRUE
+}
Modified: branches/S2_6/data/civ2civ3/nations.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/nations.ruleset?rev=30399&r1=30398&r2=30399&view=diff
==
--- branches/S2_6/data/civ2civ3/nations.ruleset (original)
+++ branches/S2_6/data/civ2civ3/nations.ruleset Tue Nov 3 23:15:12 2015
@@ -29,15 +29,15 @@
default_government = "Despotism"
[default_traits]
-;expansionist_min = 50
-;expansionist_max = 50
-;expansionist_default = 50
-;trader_min = 50
-;trader_max = 50
-;trader_default = 50
-;aggressive_min = 50
-;aggressive_max = 50
-;aggressive_default = 50
+expansionist_min = 30
+expansionist_max = 90
+expansionist_default = 50
+trader_min = 30
+trader_max = 90
+trader_default = 50
+aggressive_min = 30
+aggressive_max = 90
+aggressive_default = 50
; Please keep [ruledit] section in sync with these includes
*include "default/nationlist.ruleset"
Modified: branches/S2_6/data/classic/nations.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/classic/nations.ruleset?rev=30399&r1=30398&r2=30399&view=diff
==
--- branches/S2_6/data/classic/nations.ruleset (original)
+++ branches/S2_6/data/classic/nations.ruleset Tue Nov 3 23:15:12
[Freeciv-commits] r30398 - /branches/S2_6/data/experimental/nations.ruleset
Author: jtn Date: Tue Nov 3 23:15:09 2015 New Revision: 30398 URL: http://svn.gna.org/viewcvs/freeciv?rev=30398&view=rev Log: Tweak experimental ruleset trait ranges to be in line with those play-tested by cazfi in the 'variant2' ruleset. See gna patch #6515. Modified: branches/S2_6/data/experimental/nations.ruleset Modified: branches/S2_6/data/experimental/nations.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/experimental/nations.ruleset?rev=30398&r1=30397&r2=30398&view=diff == --- branches/S2_6/data/experimental/nations.ruleset (original) +++ branches/S2_6/data/experimental/nations.ruleset Tue Nov 3 23:15:09 2015 @@ -29,14 +29,14 @@ default_government = "Despotism" [default_traits] -expansionist_min = 35 -expansionist_max = 80 +expansionist_min = 30 +expansionist_max = 90 expansionist_default = 50 -trader_min = 35 -trader_max = 80 +trader_min = 30 +trader_max = 90 trader_default = 50 -aggressive_min = 35 -aggressive_max = 80 +aggressive_min = 30 +aggressive_max = 90 aggressive_default = 50 ; Please keep [ruledit] section in sync with these includes ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r30395 - /trunk/data/experimental/nations.ruleset
Author: jtn Date: Tue Nov 3 23:05:56 2015 New Revision: 30395 URL: http://svn.gna.org/viewcvs/freeciv?rev=30395&view=rev Log: Tweak experimental ruleset trait ranges to be in line with those play-tested by cazfi in the 'variant2' ruleset. See gna patch #6515. Modified: trunk/data/experimental/nations.ruleset Modified: trunk/data/experimental/nations.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/nations.ruleset?rev=30395&r1=30394&r2=30395&view=diff == --- trunk/data/experimental/nations.ruleset (original) +++ trunk/data/experimental/nations.ruleset Tue Nov 3 23:05:56 2015 @@ -30,14 +30,14 @@ default_government = "Despotism" [default_traits] -expansionist_min = 35 -expansionist_max = 80 +expansionist_min = 30 +expansionist_max = 90 expansionist_default = 50 -trader_min = 35 -trader_max = 80 +trader_min = 30 +trader_max = 90 trader_default = 50 -aggressive_min = 35 -aggressive_max = 80 +aggressive_min = 30 +aggressive_max = 90 aggressive_default = 50 ; Please keep [ruledit] section in sync with these includes ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r30397 - /trunk/data/classic/game.ruleset
Author: jtn
Date: Tue Nov 3 23:06:03 2015
New Revision: 30397
URL: http://svn.gna.org/viewcvs/freeciv?rev=30397&view=rev
Log:
Classic ruleset description acknowledges that it was once the default
ruleset, and now is not.
See gna patch #6517.
Modified:
trunk/data/classic/game.ruleset
Modified: trunk/data/classic/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/game.ruleset?rev=30397&r1=30396&r2=30397&view=diff
==
--- trunk/data/classic/game.ruleset (original)
+++ trunk/data/classic/game.ruleset Tue Nov 3 23:06:03 2015
@@ -23,7 +23,8 @@
; Summary of the ruleset
summary = _("\
-You are playing with classic Freeciv rules for single player games.\
+You are playing with classic Freeciv rules for single player games. \
+These were the default rules until Freeciv 2.6.\
")
; Detailed description
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r30396 - in /trunk/data: alien/ civ1/ civ2/ civ2civ3/ classic/ multiplayer/
Author: jtn
Date: Tue Nov 3 23:05:59 2015
New Revision: 30396
URL: http://svn.gna.org/viewcvs/freeciv?rev=30396&view=rev
Log:
Define AI trait ranges for the civ2civ3, classic, and multiplayer rulesets
(based on those for the experimental ruleset). This doesn't change
default behaviour but allows players to see an effect from changing the
'traitdistribution' setting.
civ1/civ2/alien rulesets do not define trait ranges, so disallow
changing 'traitdistribution' in those rulesets, since it would have no
effect.
See gna patch #6516.
Modified:
trunk/data/alien/game.ruleset
trunk/data/civ1/game.ruleset
trunk/data/civ2/game.ruleset
trunk/data/civ2civ3/nations.ruleset
trunk/data/classic/nations.ruleset
trunk/data/multiplayer/nations.ruleset
Modified: trunk/data/alien/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/game.ruleset?rev=30396&r1=30395&r2=30396&view=diff
==
--- trunk/data/alien/game.ruleset (original)
+++ trunk/data/alien/game.ruleset Tue Nov 3 23:05:59 2015
@@ -690,15 +690,18 @@
[settings]
; freeciv game settings for the alien ruleset
set =
- { "name", "value"
- "topology", "WRAPX|WRAPY|ISO|HEX"
- "mapsize","PLAYER"
- "tilesperplayer", 300
- "aifill", 7
- "sciencebox", 150
- "foodbox",150
- "revolen",7
- "citymindist",3
- "startunits", "cx"
- "plrcolormode", "NATION_ORDER"
+ { "name", "value", "lock"
+ "topology", "WRAPX|WRAPY|ISO|HEX", FALSE
+ "mapsize","PLAYER",FALSE
+ "tilesperplayer", 300, FALSE
+ "aifill", 7, FALSE
+ "sciencebox", 150, FALSE
+ "foodbox",150, FALSE
+ "revolen",7, FALSE
+ "citymindist",3, FALSE
+ "startunits", "cx",FALSE
+ "plrcolormode", "NATION_ORDER", FALSE
+ ; Ruleset has no trait ranges, so player choosing EVEN would have
+ ; no effect anyway
+ "traitdistribution", "FIXED", TRUE
}
Modified: trunk/data/civ1/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/game.ruleset?rev=30396&r1=30395&r2=30396&view=diff
==
--- trunk/data/civ1/game.ruleset(original)
+++ trunk/data/civ1/game.rulesetTue Nov 3 23:05:59 2015
@@ -739,4 +739,7 @@
"startunits", "c", FALSE
"borders", "DISABLED", FALSE
"citymindist", 1, FALSE
-}
+ ; Ruleset has no trait ranges, so player choosing EVEN would have
+ ; no effect anyway
+ "traitdistribution", "FIXED", TRUE
+}
Modified: trunk/data/civ2/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/game.ruleset?rev=30396&r1=30395&r2=30396&view=diff
==
--- trunk/data/civ2/game.ruleset(original)
+++ trunk/data/civ2/game.rulesetTue Nov 3 23:05:59 2015
@@ -749,4 +749,7 @@
"sciencebox", 50, FALSE
"startunits", "cc", FALSE
"borders", "DISABLED", FALSE
-}
+ ; Ruleset has no trait ranges, so player choosing EVEN would have
+ ; no effect anyway
+ "traitdistribution", "FIXED", TRUE
+}
Modified: trunk/data/civ2civ3/nations.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/nations.ruleset?rev=30396&r1=30395&r2=30396&view=diff
==
--- trunk/data/civ2civ3/nations.ruleset (original)
+++ trunk/data/civ2civ3/nations.ruleset Tue Nov 3 23:05:59 2015
@@ -30,15 +30,15 @@
default_government = "Despotism"
[default_traits]
-;expansionist_min = 50
-;expansionist_max = 50
-;expansionist_default = 50
-;trader_min = 50
-;trader_max = 50
-;trader_default = 50
-;aggressive_min = 50
-;aggressive_max = 50
-;aggressive_default = 50
+expansionist_min = 30
+expansionist_max = 90
+expansionist_default = 50
+trader_min = 30
+trader_max = 90
+trader_default = 50
+aggressive_min = 30
+aggressive_max = 90
+aggressive_default = 50
; Please keep [ruledit] section in sync with these includes
*include "default/nationlist.ruleset"
Modified: trunk/data/classic/nations.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/nations.ruleset?rev=30396&r1=30395&r2=30396&view=diff
==
--- trunk/data/classic/nations.ruleset (original)
+++ trunk/data/classic/nations.ruleset Tue Nov 3 23:05:59 2015
@@ -30,15 +30,15 @@
default_government = "Despotism"
[default_traits]
-;expansionist_min = 50
-;expansionist_max = 50
-;expansionist_default = 50
-;trader_min = 50
-;trader_max = 50
-;trader_default
[Freeciv-commits] r30393 - in /trunk: ./ client/ client/gui-sdl2/ common/ dependencies/lua-5.3/src/ gen_headers/ server/ utility/
Author: cazfi Date: Tue Nov 3 20:58:45 2015 New Revision: 30393 URL: http://svn.gna.org/viewcvs/freeciv?rev=30393&view=rev Log: Made macros used in netintf.h publicly available in freeciv_config.h. See bug #23989 Modified: trunk/client/clinet.c trunk/client/gui-sdl2/gui_main.c trunk/client/servers.c trunk/common/connection.c trunk/common/connection.h trunk/common/dataio.c trunk/common/dataio_json.c trunk/common/game.h trunk/common/packets.c trunk/configure.ac trunk/dependencies/lua-5.3/src/localluaconf.h trunk/gen_headers/freeciv_config.h.in trunk/server/meta.c trunk/server/sernet.c trunk/server/srv_main.c trunk/utility/netintf.c trunk/utility/netintf.h trunk/utility/support.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/client/clinet.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/clinet.c?rev=30393&r1=30392&r2=30393&view=diff Modified: trunk/client/gui-sdl2/gui_main.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/gui_main.c?rev=30393&r1=30392&r2=30393&view=diff Modified: trunk/client/servers.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/servers.c?rev=30393&r1=30392&r2=30393&view=diff Modified: trunk/common/connection.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/connection.c?rev=30393&r1=30392&r2=30393&view=diff Modified: trunk/common/connection.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/connection.h?rev=30393&r1=30392&r2=30393&view=diff Modified: trunk/common/dataio.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/dataio.c?rev=30393&r1=30392&r2=30393&view=diff Modified: trunk/common/dataio_json.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/dataio_json.c?rev=30393&r1=30392&r2=30393&view=diff Modified: trunk/common/game.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/game.h?rev=30393&r1=30392&r2=30393&view=diff Modified: trunk/common/packets.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/packets.c?rev=30393&r1=30392&r2=30393&view=diff Modified: trunk/configure.ac URL: http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=30393&r1=30392&r2=30393&view=diff Modified: trunk/dependencies/lua-5.3/src/localluaconf.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/dependencies/lua-5.3/src/localluaconf.h?rev=30393&r1=30392&r2=30393&view=diff Modified: trunk/gen_headers/freeciv_config.h.in URL: http://svn.gna.org/viewcvs/freeciv/trunk/gen_headers/freeciv_config.h.in?rev=30393&r1=30392&r2=30393&view=diff Modified: trunk/server/meta.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/meta.c?rev=30393&r1=30392&r2=30393&view=diff Modified: trunk/server/sernet.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/sernet.c?rev=30393&r1=30392&r2=30393&view=diff Modified: trunk/server/srv_main.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/srv_main.c?rev=30393&r1=30392&r2=30393&view=diff Modified: trunk/utility/netintf.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/utility/netintf.c?rev=30393&r1=30392&r2=30393&view=diff Modified: trunk/utility/netintf.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/utility/netintf.h?rev=30393&r1=30392&r2=30393&view=diff Modified: trunk/utility/support.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/utility/support.c?rev=30393&r1=30392&r2=30393&view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r30394 - in /branches/S2_6: ./ client/ client/gui-sdl/ client/gui-sdl2/ common/ dependencies/lua-5.3/src/ gen_headers/ serve...
Author: cazfi Date: Tue Nov 3 20:58:55 2015 New Revision: 30394 URL: http://svn.gna.org/viewcvs/freeciv?rev=30394&view=rev Log: Made macros used in netintf.h publicly available in freeciv_config.h. See bug #23989 Modified: branches/S2_6/client/clinet.c branches/S2_6/client/gui-sdl/gui_main.c branches/S2_6/client/gui-sdl2/gui_main.c branches/S2_6/client/servers.c branches/S2_6/common/connection.c branches/S2_6/common/connection.h branches/S2_6/common/dataio.c branches/S2_6/common/game.h branches/S2_6/common/packets.c branches/S2_6/configure.ac branches/S2_6/dependencies/lua-5.3/src/localluaconf.h branches/S2_6/gen_headers/freeciv_config.h.in branches/S2_6/server/meta.c branches/S2_6/server/sernet.c branches/S2_6/server/srv_main.c branches/S2_6/utility/netintf.c branches/S2_6/utility/netintf.h branches/S2_6/utility/support.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/S2_6/client/clinet.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/clinet.c?rev=30394&r1=30393&r2=30394&view=diff Modified: branches/S2_6/client/gui-sdl/gui_main.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/gui_main.c?rev=30394&r1=30393&r2=30394&view=diff Modified: branches/S2_6/client/gui-sdl2/gui_main.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/gui_main.c?rev=30394&r1=30393&r2=30394&view=diff Modified: branches/S2_6/client/servers.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/servers.c?rev=30394&r1=30393&r2=30394&view=diff Modified: branches/S2_6/common/connection.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/connection.c?rev=30394&r1=30393&r2=30394&view=diff Modified: branches/S2_6/common/connection.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/connection.h?rev=30394&r1=30393&r2=30394&view=diff Modified: branches/S2_6/common/dataio.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/dataio.c?rev=30394&r1=30393&r2=30394&view=diff Modified: branches/S2_6/common/game.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/game.h?rev=30394&r1=30393&r2=30394&view=diff Modified: branches/S2_6/common/packets.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/packets.c?rev=30394&r1=30393&r2=30394&view=diff Modified: branches/S2_6/configure.ac URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/configure.ac?rev=30394&r1=30393&r2=30394&view=diff Modified: branches/S2_6/dependencies/lua-5.3/src/localluaconf.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/dependencies/lua-5.3/src/localluaconf.h?rev=30394&r1=30393&r2=30394&view=diff Modified: branches/S2_6/gen_headers/freeciv_config.h.in URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/gen_headers/freeciv_config.h.in?rev=30394&r1=30393&r2=30394&view=diff Modified: branches/S2_6/server/meta.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/meta.c?rev=30394&r1=30393&r2=30394&view=diff Modified: branches/S2_6/server/sernet.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/sernet.c?rev=30394&r1=30393&r2=30394&view=diff Modified: branches/S2_6/server/srv_main.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/srv_main.c?rev=30394&r1=30393&r2=30394&view=diff Modified: branches/S2_6/utility/netintf.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/netintf.c?rev=30394&r1=30393&r2=30394&view=diff Modified: branches/S2_6/utility/netintf.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/netintf.h?rev=30394&r1=30393&r2=30394&view=diff Modified: branches/S2_6/utility/support.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/support.c?rev=30394&r1=30393&r2=30394&view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r30392 - in /branches/S2_6/client/gui-sdl2: graphics.c graphics.h sprite.c
Author: cazfi
Date: Tue Nov 3 20:50:49 2015
New Revision: 30392
URL: http://svn.gna.org/viewcvs/freeciv?rev=30392&view=rev
Log:
Added paletted pngs support to sdl2-client.
See bug #24014
Modified:
branches/S2_6/client/gui-sdl2/graphics.c
branches/S2_6/client/gui-sdl2/graphics.h
branches/S2_6/client/gui-sdl2/sprite.c
Modified: branches/S2_6/client/gui-sdl2/graphics.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/graphics.c?rev=30392&r1=30391&r2=30392&view=diff
==
--- branches/S2_6/client/gui-sdl2/graphics.c(original)
+++ branches/S2_6/client/gui-sdl2/graphics.cTue Nov 3 20:50:49 2015
@@ -244,22 +244,11 @@
{
SDL_Surface *pDest = NULL;
int row, col;
- // bool free_pMask = FALSE;
Uint32 *pSrc_Pixel = NULL;
Uint32 *pDest_Pixel = NULL;
Uint32 *pMask_Pixel = NULL;
unsigned char src_alpha, mask_alpha;
-#if 0
- if (!pMask->format->Amask) {
-pMask = SDL_DisplayFormatAlpha(pMask);
-free_pMask = TRUE;
- }
-
- pSrc = SDL_DisplayFormatAlpha(pSrc);
- pDest = SDL_DisplayFormatAlpha(pSrc);
-#endif /* 0 */
-
pDest = copy_surface(pSrc);
lock_surf(pSrc);
@@ -288,14 +277,6 @@
unlock_surf(pDest);
unlock_surf(pMask);
unlock_surf(pSrc);
-
-#if 0
- if (free_pMask) {
-FREESURFACE(pMask);
- }
-
- FREESURFACE(pSrc); /* result of SDL_DisplayFormatAlpha() */
-#endif /* 0 */
return pDest;
}
@@ -396,6 +377,14 @@
SDL_Surface *create_surf(int width, int height, Uint32 flags)
{
return create_surf_with_format(main_surface->format, width, height, flags);
+}
+
+/**
+ Convert surface to the main window format.
+**/
+SDL_Surface *convert_surf(SDL_Surface *surf_in)
+{
+ return SDL_ConvertSurface(surf_in, main_surface->format, 0);
}
/**
Modified: branches/S2_6/client/gui-sdl2/graphics.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/graphics.h?rev=30392&r1=30391&r2=30392&view=diff
==
--- branches/S2_6/client/gui-sdl2/graphics.h(original)
+++ branches/S2_6/client/gui-sdl2/graphics.hTue Nov 3 20:50:49 2015
@@ -232,6 +232,7 @@
SDL_Surface *create_surf_with_format(SDL_PixelFormat *pf,
int width, int height, Uint32 flags);
SDL_Surface *create_surf(int width, int height, Uint32 flags);
+SDL_Surface *convert_surf(SDL_Surface *surf_in);
SDL_Surface *create_filled_surface(Uint16 w, Uint16 h, Uint32 iFlags,
SDL_Color *pColor);
Modified: branches/S2_6/client/gui-sdl2/sprite.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/sprite.c?rev=30392&r1=30391&r2=30392&view=diff
==
--- branches/S2_6/client/gui-sdl2/sprite.c (original)
+++ branches/S2_6/client/gui-sdl2/sprite.c Tue Nov 3 20:50:49 2015
@@ -55,27 +55,21 @@
/
struct sprite *load_gfxfile(const char *filename)
{
- SDL_Surface *pNew = NULL;
- SDL_Surface *pBuf = NULL;
+ SDL_Surface *pbuf = NULL;
- if ((pBuf = IMG_Load(filename)) == NULL) {
+ if ((pbuf = IMG_Load(filename)) == NULL) {
log_error(_("load_gfxfile: Unable to load graphic file %s!"), filename);
return NULL; /* Should I use abort() ? */
}
-#if 0
- if (pBuf->flags & SDL_SRCCOLORKEY) {
-/* convert colorkey to alpha */
-SDL_SetColorKey(pBuf, SDL_SRCCOLORKEY, pBuf->format->colorkey);
-pNew = SDL_DisplayFormatAlpha(pBuf);
-FREESURFACE(pBuf);
-pBuf = pNew;
+ if (pbuf->format->palette != NULL) {
+SDL_Surface *pnew = convert_surf(pbuf);
+
+FREESURFACE(pbuf);
+pbuf = pnew;
}
-#endif /* 0 */
- pNew = pBuf;
-
- return ctor_sprite(pNew);
+ return ctor_sprite(pbuf);
}
/
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r30391 - in /trunk/client/gui-sdl2: graphics.c graphics.h sprite.c
Author: cazfi
Date: Tue Nov 3 20:50:40 2015
New Revision: 30391
URL: http://svn.gna.org/viewcvs/freeciv?rev=30391&view=rev
Log:
Added paletted pngs support to sdl2-client.
See bug #24014
Modified:
trunk/client/gui-sdl2/graphics.c
trunk/client/gui-sdl2/graphics.h
trunk/client/gui-sdl2/sprite.c
Modified: trunk/client/gui-sdl2/graphics.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/graphics.c?rev=30391&r1=30390&r2=30391&view=diff
==
--- trunk/client/gui-sdl2/graphics.c(original)
+++ trunk/client/gui-sdl2/graphics.cTue Nov 3 20:50:40 2015
@@ -244,22 +244,11 @@
{
SDL_Surface *pDest = NULL;
int row, col;
- // bool free_pMask = FALSE;
Uint32 *pSrc_Pixel = NULL;
Uint32 *pDest_Pixel = NULL;
Uint32 *pMask_Pixel = NULL;
unsigned char src_alpha, mask_alpha;
-#if 0
- if (!pMask->format->Amask) {
-pMask = SDL_DisplayFormatAlpha(pMask);
-free_pMask = TRUE;
- }
-
- pSrc = SDL_DisplayFormatAlpha(pSrc);
- pDest = SDL_DisplayFormatAlpha(pSrc);
-#endif /* 0 */
-
pDest = copy_surface(pSrc);
lock_surf(pSrc);
@@ -288,14 +277,6 @@
unlock_surf(pDest);
unlock_surf(pMask);
unlock_surf(pSrc);
-
-#if 0
- if (free_pMask) {
-FREESURFACE(pMask);
- }
-
- FREESURFACE(pSrc); /* result of SDL_DisplayFormatAlpha() */
-#endif /* 0 */
return pDest;
}
@@ -396,6 +377,14 @@
SDL_Surface *create_surf(int width, int height, Uint32 flags)
{
return create_surf_with_format(main_surface->format, width, height, flags);
+}
+
+/**
+ Convert surface to the main window format.
+**/
+SDL_Surface *convert_surf(SDL_Surface *surf_in)
+{
+ return SDL_ConvertSurface(surf_in, main_surface->format, 0);
}
/**
Modified: trunk/client/gui-sdl2/graphics.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/graphics.h?rev=30391&r1=30390&r2=30391&view=diff
==
--- trunk/client/gui-sdl2/graphics.h(original)
+++ trunk/client/gui-sdl2/graphics.hTue Nov 3 20:50:40 2015
@@ -232,6 +232,7 @@
SDL_Surface *create_surf_with_format(SDL_PixelFormat *pf,
int width, int height, Uint32 flags);
SDL_Surface *create_surf(int width, int height, Uint32 flags);
+SDL_Surface *convert_surf(SDL_Surface *surf_in);
SDL_Surface *create_filled_surface(Uint16 w, Uint16 h, Uint32 iFlags,
SDL_Color *pColor);
Modified: trunk/client/gui-sdl2/sprite.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/sprite.c?rev=30391&r1=30390&r2=30391&view=diff
==
--- trunk/client/gui-sdl2/sprite.c (original)
+++ trunk/client/gui-sdl2/sprite.c Tue Nov 3 20:50:40 2015
@@ -55,27 +55,21 @@
/
struct sprite *load_gfxfile(const char *filename)
{
- SDL_Surface *pNew = NULL;
- SDL_Surface *pBuf = NULL;
+ SDL_Surface *pbuf = NULL;
- if ((pBuf = IMG_Load(filename)) == NULL) {
+ if ((pbuf = IMG_Load(filename)) == NULL) {
log_error(_("load_gfxfile: Unable to load graphic file %s!"), filename);
return NULL; /* Should I use abort() ? */
}
-#if 0
- if (pBuf->flags & SDL_SRCCOLORKEY) {
-/* convert colorkey to alpha */
-SDL_SetColorKey(pBuf, SDL_SRCCOLORKEY, pBuf->format->colorkey);
-pNew = SDL_DisplayFormatAlpha(pBuf);
-FREESURFACE(pBuf);
-pBuf = pNew;
+ if (pbuf->format->palette != NULL) {
+SDL_Surface *pnew = convert_surf(pbuf);
+
+FREESURFACE(pbuf);
+pbuf = pnew;
}
-#endif /* 0 */
- pNew = pBuf;
-
- return ctor_sprite(pNew);
+ return ctor_sprite(pbuf);
}
/
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r30389 - /branches/S2_6/client/gui-gtk-3.0/sprite.h
Author: cazfi
Date: Tue Nov 3 19:08:32 2015
New Revision: 30389
URL: http://svn.gna.org/viewcvs/freeciv?rev=30389&view=rev
Log:
Removed outdated comment, derived from gtk2-client, from gtk3-client sprite.h
Modified:
branches/S2_6/client/gui-gtk-3.0/sprite.h
Modified: branches/S2_6/client/gui-gtk-3.0/sprite.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/sprite.h?rev=30389&r1=30388&r2=30389&view=diff
==
--- branches/S2_6/client/gui-gtk-3.0/sprite.h (original)
+++ branches/S2_6/client/gui-gtk-3.0/sprite.h Tue Nov 3 19:08:32 2015
@@ -15,17 +15,12 @@
#include
+/* client */
#include "sprite_g.h"
struct sprite
{
- /* A pixmap + mask is used if there's a 1-bit alpha channel. mask may be
- * NULL if there's no alpha. For multi-bit alpha levels, a pixbuf will be
- * used instead. For consistency a pixbuf may be generated on-demand when
- * doing drawing (into a gtkpixcomm or gtkimage), so it's important that
- * the sprite data not be changed after the sprite is loaded. */
cairo_surface_t *surface;
-
};
struct sprite *sprite_scale(struct sprite *src, int new_w, int new_h);
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r30390 - /branches/S2_5/client/gui-gtk-3.0/sprite.h
Author: cazfi
Date: Tue Nov 3 19:08:58 2015
New Revision: 30390
URL: http://svn.gna.org/viewcvs/freeciv?rev=30390&view=rev
Log:
Removed outdated comment, derived from gtk2-client, from gtk3-client sprite.h
Modified:
branches/S2_5/client/gui-gtk-3.0/sprite.h
Modified: branches/S2_5/client/gui-gtk-3.0/sprite.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/sprite.h?rev=30390&r1=30389&r2=30390&view=diff
==
--- branches/S2_5/client/gui-gtk-3.0/sprite.h (original)
+++ branches/S2_5/client/gui-gtk-3.0/sprite.h Tue Nov 3 19:08:58 2015
@@ -15,17 +15,12 @@
#include
+/* client */
#include "sprite_g.h"
struct sprite
{
- /* A pixmap + mask is used if there's a 1-bit alpha channel. mask may be
- * NULL if there's no alpha. For multi-bit alpha levels, a pixbuf will be
- * used instead. For consistency a pixbuf may be generated on-demand when
- * doing drawing (into a gtkpixcomm or gtkimage), so it's important that
- * the sprite data not be changed after the sprite is loaded. */
cairo_surface_t *surface;
-
};
struct sprite *sprite_scale(struct sprite *src, int new_w, int new_h);
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r30388 - /trunk/client/gui-gtk-3.0/sprite.h
Author: cazfi
Date: Tue Nov 3 19:08:04 2015
New Revision: 30388
URL: http://svn.gna.org/viewcvs/freeciv?rev=30388&view=rev
Log:
Removed outdated comment, derived from gtk2-client, from gtk3-client sprite.h
Modified:
trunk/client/gui-gtk-3.0/sprite.h
Modified: trunk/client/gui-gtk-3.0/sprite.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/sprite.h?rev=30388&r1=30387&r2=30388&view=diff
==
--- trunk/client/gui-gtk-3.0/sprite.h (original)
+++ trunk/client/gui-gtk-3.0/sprite.h Tue Nov 3 19:08:04 2015
@@ -15,17 +15,12 @@
#include
+/* client */
#include "sprite_g.h"
struct sprite
{
- /* A pixmap + mask is used if there's a 1-bit alpha channel. mask may be
- * NULL if there's no alpha. For multi-bit alpha levels, a pixbuf will be
- * used instead. For consistency a pixbuf may be generated on-demand when
- * doing drawing (into a gtkpixcomm or gtkimage), so it's important that
- * the sprite data not be changed after the sprite is loaded. */
cairo_surface_t *surface;
-
};
struct sprite *sprite_scale(struct sprite *src, int new_w, int new_h);
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r30387 - /branches/S2_5/server/citytools.c
Author: cazfi
Date: Tue Nov 3 17:42:06 2015
New Revision: 30387
URL: http://svn.gna.org/viewcvs/freeciv?rev=30387&view=rev
Log:
Avoid a couple of cases where remove_city() could a pointer to already
recursively, from
a called lua-script, freed city.
See bug #24016
Modified:
branches/S2_5/server/citytools.c
Modified: branches/S2_5/server/citytools.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/citytools.c?rev=30387&r1=30386&r2=30387&view=diff
==
--- branches/S2_5/server/citytools.c(original)
+++ branches/S2_5/server/citytools.cTue Nov 3 17:42:06 2015
@@ -1609,6 +1609,7 @@
const citizens old_angry_citizens = player_angry_citizens(powner);
struct dbv tile_processed;
struct tile_list *process_queue;
+ const char *ctl = city_tile_link(pcity);
BV_CLR_ALL(had_small_wonders);
city_built_iterate(pcity, pimprove) {
@@ -1653,8 +1654,7 @@
E_UNIT_RELOCATED, ftc_server,
_("Moved %s out of disbanded city %s "
"since it cannot stay on %s."),
- unit_link(punit),
- city_tile_link(pcity),
+ unit_link(punit), ctl,
terrain_name_translation(tile_terrain(pcenter)));
break;
}
@@ -1666,7 +1666,7 @@
E_UNIT_LOST_MISC, ftc_server,
_("When %s was disbanded your %s could not "
"get out, and it was therefore lost."),
-city_link(pcity),
+ctl,
unit_tile_link(punit));
wipe_unit(punit, ULR_CITY_LOST, NULL);
}
@@ -1699,7 +1699,7 @@
E_UNIT_LOST_MISC, ftc_server,
_("When %s was disbanded your %s in %s was trapped, "
"and it was therefore lost."),
- city_link(pcity),
+ ctl,
unit_tile_link(punit),
city_link(other_city));
wipe_unit(punit, ULR_CITY_LOST, NULL);
@@ -1711,10 +1711,11 @@
} adjc_iterate_end;
}
-dbv_free(&tile_processed);
-tile_list_destroy(process_queue);
+ dbv_free(&tile_processed);
+ tile_list_destroy(process_queue);
if (!city_exist(id)) {
+/* Wiping trapped units caused city to disappear. */
return;
}
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r30386 - /branches/S2_6/server/citytools.c
Author: cazfi
Date: Tue Nov 3 17:42:00 2015
New Revision: 30386
URL: http://svn.gna.org/viewcvs/freeciv?rev=30386&view=rev
Log:
Avoid a couple of cases where remove_city() could a pointer to already
recursively, from
a called lua-script, freed city.
See bug #24016
Modified:
branches/S2_6/server/citytools.c
Modified: branches/S2_6/server/citytools.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/citytools.c?rev=30386&r1=30385&r2=30386&view=diff
==
--- branches/S2_6/server/citytools.c(original)
+++ branches/S2_6/server/citytools.cTue Nov 3 17:42:00 2015
@@ -1587,6 +1587,7 @@
const citizens old_angry_citizens = player_angry_citizens(powner);
struct dbv tile_processed;
struct tile_list *process_queue;
+ const char *ctl = city_tile_link(pcity);
CALL_PLR_AI_FUNC(city_lost, powner, powner, pcity);
@@ -1633,8 +1634,7 @@
E_UNIT_RELOCATED, ftc_server,
_("Moved %s out of disbanded city %s "
"since it cannot stay on %s."),
- unit_link(punit),
- city_tile_link(pcity),
+ unit_link(punit), ctl,
terrain_name_translation(tile_terrain(pcenter)));
break;
}
@@ -1646,7 +1646,7 @@
E_UNIT_LOST_MISC, ftc_server,
_("When %s was disbanded your %s could not "
"get out, and it was therefore lost."),
-city_link(pcity),
+ctl,
unit_tile_link(punit));
wipe_unit(punit, ULR_CITY_LOST, NULL);
}
@@ -1679,7 +1679,7 @@
E_UNIT_LOST_MISC, ftc_server,
_("When %s was disbanded your %s in %s was trapped, "
"and it was therefore lost."),
- city_link(pcity),
+ ctl,
unit_tile_link(punit),
city_link(other_city));
wipe_unit(punit, ULR_CITY_LOST, NULL);
@@ -1691,10 +1691,11 @@
} adjc_iterate_end;
}
-dbv_free(&tile_processed);
-tile_list_destroy(process_queue);
+ dbv_free(&tile_processed);
+ tile_list_destroy(process_queue);
if (!city_exist(id)) {
+/* Wiping trapped units caused city to disappear. */
return;
}
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r30385 - /trunk/server/citytools.c
Author: cazfi
Date: Tue Nov 3 17:41:53 2015
New Revision: 30385
URL: http://svn.gna.org/viewcvs/freeciv?rev=30385&view=rev
Log:
Avoid a couple of cases where remove_city() could a pointer to already
recursively, from
a called lua-script, freed city.
See bug #24016
Modified:
trunk/server/citytools.c
Modified: trunk/server/citytools.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/citytools.c?rev=30385&r1=30384&r2=30385&view=diff
==
--- trunk/server/citytools.c(original)
+++ trunk/server/citytools.cTue Nov 3 17:41:53 2015
@@ -1593,6 +1593,7 @@
const citizens old_angry_citizens = player_angry_citizens(powner);
struct dbv tile_processed;
struct tile_list *process_queue;
+ const char *ctl = city_tile_link(pcity);
CALL_PLR_AI_FUNC(city_lost, powner, powner, pcity);
@@ -1639,8 +1640,7 @@
E_UNIT_RELOCATED, ftc_server,
_("Moved %s out of disbanded city %s "
"since it cannot stay on %s."),
- unit_link(punit),
- city_tile_link(pcity),
+ unit_link(punit), ctl,
terrain_name_translation(tile_terrain(pcenter)));
break;
}
@@ -1652,7 +1652,7 @@
E_UNIT_LOST_MISC, ftc_server,
_("When %s was disbanded your %s could not "
"get out, and it was therefore lost."),
-city_link(pcity),
+ctl,
unit_tile_link(punit));
wipe_unit(punit, ULR_CITY_LOST, NULL);
}
@@ -1685,7 +1685,7 @@
E_UNIT_LOST_MISC, ftc_server,
_("When %s was disbanded your %s in %s was trapped, "
"and it was therefore lost."),
- city_link(pcity),
+ ctl,
unit_tile_link(punit),
city_link(other_city));
wipe_unit(punit, ULR_CITY_LOST, NULL);
@@ -1697,10 +1697,11 @@
} adjc_iterate_end;
}
-dbv_free(&tile_processed);
-tile_list_destroy(process_queue);
+ dbv_free(&tile_processed);
+ tile_list_destroy(process_queue);
if (!city_exist(id)) {
+/* Wiping trapped units caused city to disappear. */
return;
}
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
