[Freeciv-commits] r28442 - /branches/S2_5/translations/freeciv/es.po
Author: jtn Date: Sat Mar 7 15:00:55 2015 New Revision: 28442 URL: http://svn.gna.org/viewcvs/freeciv?rev=28442view=rev Log: Updated Spanish translation by Jordi Negrevernis i Font. freeciv: 91%: 5599 translated, 357 fuzzy, 215 untranslated. Modified: branches/S2_5/translations/freeciv/es.po [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/S2_5/translations/freeciv/es.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/es.po?rev=28442r1=28441r2=28442view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28443 - /branches/S2_6/translations/freeciv/es.po
Author: jtn Date: Sat Mar 7 15:09:54 2015 New Revision: 28443 URL: http://svn.gna.org/viewcvs/freeciv?rev=28443view=rev Log: Updated Spanish translation by Jordi Negrevernis i Font msgmerged from S2_5 r28442. Stats on S2_6: freeciv: 85%: 5329 translated, 664 fuzzy, 290 untranslated. Modified: branches/S2_6/translations/freeciv/es.po [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/S2_6/translations/freeciv/es.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/freeciv/es.po?rev=28443r1=28442r2=28443view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28445 - in /trunk: data/experimental/buildings.ruleset data/experimental/effects.ruleset doc/README.ruleset_experimental
Author: cazfi
Date: Sat Mar 7 20:31:10 2015
New Revision: 28445
URL: http://svn.gna.org/viewcvs/freeciv?rev=28445view=rev
Log:
Changed Marco Polo's Embassy in experimental ruleset to grant embassies with
already met players only
See patch #5889
Modified:
trunk/data/experimental/buildings.ruleset
trunk/data/experimental/effects.ruleset
trunk/doc/README.ruleset_experimental
Modified: trunk/data/experimental/buildings.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/buildings.ruleset?rev=28445r1=28444r2=28445view=diff
==
--- trunk/data/experimental/buildings.ruleset (original)
+++ trunk/data/experimental/buildings.ruleset Sat Mar 7 20:31:10 2015
@@ -1609,7 +1609,8 @@
sound = w_marco_polos_embassy
sound_alt = w_generic
helptext = _(\
-The player who owns it gets an embassy with all players.\
+The player who owns it gets an embassy with all players with whom one has ever\
+ had contact with.\
)
[building_michelangelos_chapel]
Modified: trunk/data/experimental/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/effects.ruleset?rev=28445r1=28444r2=28445view=diff
==
--- trunk/data/experimental/effects.ruleset (original)
+++ trunk/data/experimental/effects.ruleset Sat Mar 7 20:31:10 2015
@@ -2214,14 +2214,6 @@
Building, Manhattan Project, World, TRUE
}
-[effect_marco_polos_contact]
-type= Have_Contacts
-value = 1
-reqs =
-{ type, name, range
- Building, Marco Polo's Embassy, Player
-}
-
[effect_marco_polos_embassy]
type= Have_Embassies
value = 1
Modified: trunk/doc/README.ruleset_experimental
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.ruleset_experimental?rev=28445r1=28444r2=28445view=diff
==
--- trunk/doc/README.ruleset_experimental (original)
+++ trunk/doc/README.ruleset_experimental Sat Mar 7 20:31:10 2015
@@ -118,6 +118,9 @@
- Being part of a unit stack won't protect against spy actions.
+- Marco Polo's Embassy does not grant new connections, nor embassies, to
players
+ one has never met. It grants embassy with already met players only.
+
2. Use the new ruleset
---
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28440 - /tags/R2_5_0_RC2/
Author: jtn Date: Sat Mar 7 12:20:45 2015 New Revision: 28440 URL: http://svn.gna.org/viewcvs/freeciv?rev=28440view=rev Log: Tag second release candidate for 2.5.0 (2.5.0-RC2). Added: tags/R2_5_0_RC2/ - copied from r28439, branches/S2_5/ ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28444 - /trunk/translations/freeciv/es.po
Author: jtn Date: Sat Mar 7 15:21:04 2015 New Revision: 28444 URL: http://svn.gna.org/viewcvs/freeciv?rev=28444view=rev Log: Updated Spanish translation by Jordi Negrevernis i Font msgmerged from S2_5 r28442. Stats on trunk: freeciv: 80%: 5325 translated, 800 fuzzy, 508 untranslated. Modified: trunk/translations/freeciv/es.po [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/translations/freeciv/es.po URL: http://svn.gna.org/viewcvs/freeciv/trunk/translations/freeciv/es.po?rev=28444r1=28443r2=28444view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28435 - /trunk/common/packets_json.c
Author: cazfi
Date: Sat Mar 7 09:01:13 2015
New Revision: 28435
URL: http://svn.gna.org/viewcvs/freeciv?rev=28435view=rev
Log:
Fixed json parsing error message to show the packet content correctly.
See bug #23347
Modified:
trunk/common/packets_json.c
Modified: trunk/common/packets_json.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/packets_json.c?rev=28435r1=28434r2=28435view=diff
==
--- trunk/common/packets_json.c (original)
+++ trunk/common/packets_json.c Sat Mar 7 09:01:13 2015
@@ -332,7 +332,7 @@
pc-buffer-ndata = 0;
if (!pc-json_packet) {
-log_error(ERROR: Unable to parse packet: %s, pc-buffer-data);
+log_error(ERROR: Unable to parse packet: %s, pc-buffer-data + 2);
return NULL;
}
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28441 - /tags/R2_5_0_RC2/fc_version
Author: jtn Date: Sat Mar 7 12:27:16 2015 New Revision: 28441 URL: http://svn.gna.org/viewcvs/freeciv?rev=28441view=rev Log: Strip '+' from version string for release. Modified: tags/R2_5_0_RC2/fc_version Modified: tags/R2_5_0_RC2/fc_version URL: http://svn.gna.org/viewcvs/freeciv/tags/R2_5_0_RC2/fc_version?rev=28441r1=28440r2=28441view=diff == --- tags/R2_5_0_RC2/fc_version (original) +++ tags/R2_5_0_RC2/fc_version Sat Mar 7 12:27:16 2015 @@ -7,7 +7,7 @@ MAJOR_VERSION=2 MINOR_VERSION=5 PATCH_VERSION=0 -VERSION_LABEL=-RC2+ +VERSION_LABEL=-RC2 # 1) Development until MAJOR and MINOR version numbers are #set to new release series: ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28437 - in /branches/S2_5: NEWS NEWS-2.5
Author: jtn Date: Sat Mar 7 12:11:26 2015 New Revision: 28437 URL: http://svn.gna.org/viewcvs/freeciv?rev=28437view=rev Log: Refresh NEWS files for 2.5.0-RC2. NEWS is refreshed from wiki NEWS-2.5.0. NEWS-2.5 updated from wiki NEWS-2.5.0-RC2. Modified: branches/S2_5/NEWS branches/S2_5/NEWS-2.5 Modified: branches/S2_5/NEWS URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/NEWS?rev=28437r1=28436r2=28437view=diff == --- branches/S2_5/NEWS (original) +++ branches/S2_5/NEWS Sat Mar 7 12:11:26 2015 @@ -498,9 +498,9 @@ Clients - * (as of beta2) The Qt client is now substantially complete, and an - experimental Windows build is available. A Qt version of the - modpack installer is also available. + * (as of beta2) The Qt client is now substantially complete, and a + Windows build is available. A Qt version of the modpack installer + is also available. * The city map size in the city dialog now adapts to the ruleset. This means that the city dialog in the SDL client is no longer unusably small with the classic and similar rulesets. GNAPATCH#4389 @@ -534,21 +534,25 @@ * The icons for entertainers, scientists, and tax collectors now have both male and female versions. GNAPATCH#4506 * The activity icons shown near units building roads and bases in - Cimpletoon and Amplio2 are now small versions of the extras - themselves. GNAPATCH#4059 GNA#20032 + Cimpletoon, Amplio2, and Trident are now small versions of the + extras themselves. GNAPATCH#4059 GNA#20032 GNAPATCH#5856 + * (as of RC2) The Trident tileset has been updated for various + recently added game elements, including lake and maglev. + GNAPATCH#5856 GNAPATCH#5877 * Improve colors for global warming / nuclear winter progress indicators. GNAPATCH#4827 * Made a few specialist icons available for custom rulesets (worker, farmer, merchant) for use by modpacks. These are not used in the supplied rulesets. GNAPATCH#4467 - * (as of RC1) The Cimpletoon and Amplio2 tilesets have 'outpost' and - 'airstrip' graphics for use by modpacks. GNAPATCH#5027 + * The Cimpletoon and Amplio2 (as of RC1) and Trident (as of RC2) + tilesets have 'outpost' and 'airstrip' graphics for use by + modpacks. GNAPATCH#5027 Translations * Updated French, Polish, Catalan, Russian, Korean, Scottish Gaelic, - British English, traditional Chinese, Spanish, German, and Japanese - localizations. + British English, traditional Chinese, Spanish, German, Japanese, + and Finnish localizations. Build/portability Modified: branches/S2_5/NEWS-2.5 URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/NEWS-2.5?rev=28437r1=28436r2=28437view=diff == --- branches/S2_5/NEWS-2.5 (original) +++ branches/S2_5/NEWS-2.5 Sat Mar 7 12:11:26 2015 @@ -1,10 +1,49 @@ -== -Welcome to Freeciv 2.5.0-beta2 -== + +Welcome to Freeciv 2.5.0-RC2 + The changes in the 2.5.x series are summarised below. For changes prior to 2.5, see NEWS. For more detailed changes, see the ChangeLog file. + + +CHANGES FROM 2.5.0-RC1 TO 2.5.0-RC2 +--- + + (from http://www.freeciv.org/wiki/NEWS-2.5.0-RC2) + + Since RC1 there have been some bugfixes and improvements: + * When autosettlers were considering improving terrain, their + thoughts could accidentally be sent to the client, so the client + would display tiles with the wrong terrain temporarily. GNA#23286 + * Various bugfixes to the Qt client: + + Changing ruleset caused the Qt client to crash. GNA#23322 + + Changing tileset could cause the Qt client to crash and other +misbehavior. GNA#23326 GNA#23327 + + Fix some black-text-on-black-background tooltips. GNA#23325 + + Avoid scrollbars in the city production popup on Windows. +GNA#23032 + * Clients failed to display unit nationality. GNA#23311 + * Fix a remaining crash in the Gtk2 client if the tileset is changed + with the science dialog open. GNA#22625 + * An empty 'startunits' setting will now be rejected rather than + causing a crash. GNA#23346 + * The Austrian nation was not being localized. GNA#23309 + * Updated Trident tileset with support for new game elements: lake, + maglev, unit upkeep 2, unit activity icons, plus extras for + modpacks (outpost, airstrip, aluminum, uranium, saltpeter, + elephant). GNAPATCH#5856 GNAPATCH#5877 + * Fix minor misalignment of some city food/production/trade numbers + in many supplied tilesets. GNA#23332 + * Other very
[Freeciv-commits] r28438 - /branches/S2_5/fc_version
Author: jtn Date: Sat Mar 7 12:11:29 2015 New Revision: 28438 URL: http://svn.gna.org/viewcvs/freeciv?rev=28438view=rev Log: Bump version number to '2.5.0-RC2+'. Modified: branches/S2_5/fc_version Modified: branches/S2_5/fc_version URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/fc_version?rev=28438r1=28437r2=28438view=diff == --- branches/S2_5/fc_version(original) +++ branches/S2_5/fc_versionSat Mar 7 12:11:29 2015 @@ -7,7 +7,7 @@ MAJOR_VERSION=2 MINOR_VERSION=5 PATCH_VERSION=0 -VERSION_LABEL=-RC1+ +VERSION_LABEL=-RC2+ # 1) Development until MAJOR and MINOR version numbers are #set to new release series: ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28436 - in /branches/S2_5/translations: freeciv/ nations/
Author: jtn Date: Sat Mar 7 11:55:13 2015 New Revision: 28436 URL: http://svn.gna.org/viewcvs/freeciv?rev=28436view=rev Log: Results of running make update-po in translations/freeciv/ and translations/nations/ Modified: branches/S2_5/translations/freeciv/ar.po branches/S2_5/translations/freeciv/bg.po branches/S2_5/translations/freeciv/ca.po branches/S2_5/translations/freeciv/cs.po branches/S2_5/translations/freeciv/da.po branches/S2_5/translations/freeciv/de.po branches/S2_5/translations/freeciv/el.po branches/S2_5/translations/freeciv/en_GB.po branches/S2_5/translations/freeciv/eo.po branches/S2_5/translations/freeciv/es.po branches/S2_5/translations/freeciv/et.po branches/S2_5/translations/freeciv/fa.po branches/S2_5/translations/freeciv/fi.po branches/S2_5/translations/freeciv/fr.po branches/S2_5/translations/freeciv/ga.po branches/S2_5/translations/freeciv/gd.po branches/S2_5/translations/freeciv/he.po branches/S2_5/translations/freeciv/hu.po branches/S2_5/translations/freeciv/id.po branches/S2_5/translations/freeciv/it.po branches/S2_5/translations/freeciv/ja.po branches/S2_5/translations/freeciv/ko.po branches/S2_5/translations/freeciv/lt.po branches/S2_5/translations/freeciv/nb.po branches/S2_5/translations/freeciv/nl.po branches/S2_5/translations/freeciv/pl.po branches/S2_5/translations/freeciv/pt.po branches/S2_5/translations/freeciv/pt_BR.po branches/S2_5/translations/freeciv/ro.po branches/S2_5/translations/freeciv/ru.po branches/S2_5/translations/freeciv/sr.po branches/S2_5/translations/freeciv/sv.po branches/S2_5/translations/freeciv/tr.po branches/S2_5/translations/freeciv/uk.po branches/S2_5/translations/freeciv/zh_CN.po branches/S2_5/translations/freeciv/zh_TW.po branches/S2_5/translations/nations/ar.po branches/S2_5/translations/nations/bg.po branches/S2_5/translations/nations/ca.po branches/S2_5/translations/nations/cs.po branches/S2_5/translations/nations/da.po branches/S2_5/translations/nations/de.po branches/S2_5/translations/nations/el.po branches/S2_5/translations/nations/en_GB.po branches/S2_5/translations/nations/eo.po branches/S2_5/translations/nations/es.po branches/S2_5/translations/nations/et.po branches/S2_5/translations/nations/fa.po branches/S2_5/translations/nations/fi.po branches/S2_5/translations/nations/fr.po branches/S2_5/translations/nations/ga.po branches/S2_5/translations/nations/gd.po branches/S2_5/translations/nations/he.po branches/S2_5/translations/nations/hu.po branches/S2_5/translations/nations/id.po branches/S2_5/translations/nations/it.po branches/S2_5/translations/nations/ja.po branches/S2_5/translations/nations/ko.po branches/S2_5/translations/nations/lt.po branches/S2_5/translations/nations/nb.po branches/S2_5/translations/nations/nl.po branches/S2_5/translations/nations/pl.po branches/S2_5/translations/nations/pt.po branches/S2_5/translations/nations/pt_BR.po branches/S2_5/translations/nations/ro.po branches/S2_5/translations/nations/ru.po branches/S2_5/translations/nations/sr.po branches/S2_5/translations/nations/sv.po branches/S2_5/translations/nations/tr.po branches/S2_5/translations/nations/uk.po branches/S2_5/translations/nations/zh_CN.po branches/S2_5/translations/nations/zh_TW.po [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/S2_5/translations/freeciv/ar.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/ar.po?rev=28436r1=28435r2=28436view=diff Modified: branches/S2_5/translations/freeciv/bg.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/bg.po?rev=28436r1=28435r2=28436view=diff Modified: branches/S2_5/translations/freeciv/ca.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/ca.po?rev=28436r1=28435r2=28436view=diff Modified: branches/S2_5/translations/freeciv/cs.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/cs.po?rev=28436r1=28435r2=28436view=diff Modified: branches/S2_5/translations/freeciv/da.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/da.po?rev=28436r1=28435r2=28436view=diff Modified: branches/S2_5/translations/freeciv/de.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/de.po?rev=28436r1=28435r2=28436view=diff Modified: branches/S2_5/translations/freeciv/el.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/el.po?rev=28436r1=28435r2=28436view=diff Modified: branches/S2_5/translations/freeciv/en_GB.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/en_GB.po?rev=28436r1=28435r2=28436view=diff Modified: branches/S2_5/translations/freeciv/eo.po URL:
[Freeciv-commits] r28439 - /branches/S2_5/ChangeLog
Author: jtn Date: Sat Mar 7 12:17:56 2015 New Revision: 28439 URL: http://svn.gna.org/viewcvs/freeciv?rev=28439view=rev Log: Update ChangeLog as of S2_5 r28438. Modified: branches/S2_5/ChangeLog Modified: branches/S2_5/ChangeLog URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/ChangeLog?rev=28439r1=28438r2=28439view=diff == --- branches/S2_5/ChangeLog (original) +++ branches/S2_5/ChangeLog Sat Mar 7 12:17:56 2015 @@ -1,3 +1,416 @@ + +r28438 | jtn | 2015-03-07 11:11:29 + (Sat, 07 Mar 2015) | 1 line +Changed paths: + M /branches/S2_5/fc_version + +Bump version number to '2.5.0-RC2+'. + +r28437 | jtn | 2015-03-07 11:11:26 + (Sat, 07 Mar 2015) | 3 lines +Changed paths: + M /branches/S2_5/NEWS + M /branches/S2_5/NEWS-2.5 + +Refresh NEWS files for 2.5.0-RC2. +NEWS is refreshed from wiki NEWS-2.5.0. +NEWS-2.5 updated from wiki NEWS-2.5.0-RC2. + +r28436 | jtn | 2015-03-07 10:55:13 + (Sat, 07 Mar 2015) | 3 lines +Changed paths: + M /branches/S2_5/translations/freeciv/ar.po + M /branches/S2_5/translations/freeciv/bg.po + M /branches/S2_5/translations/freeciv/ca.po + M /branches/S2_5/translations/freeciv/cs.po + M /branches/S2_5/translations/freeciv/da.po + M /branches/S2_5/translations/freeciv/de.po + M /branches/S2_5/translations/freeciv/el.po + M /branches/S2_5/translations/freeciv/en_GB.po + M /branches/S2_5/translations/freeciv/eo.po + M /branches/S2_5/translations/freeciv/es.po + M /branches/S2_5/translations/freeciv/et.po + M /branches/S2_5/translations/freeciv/fa.po + M /branches/S2_5/translations/freeciv/fi.po + M /branches/S2_5/translations/freeciv/fr.po + M /branches/S2_5/translations/freeciv/ga.po + M /branches/S2_5/translations/freeciv/gd.po + M /branches/S2_5/translations/freeciv/he.po + M /branches/S2_5/translations/freeciv/hu.po + M /branches/S2_5/translations/freeciv/id.po + M /branches/S2_5/translations/freeciv/it.po + M /branches/S2_5/translations/freeciv/ja.po + M /branches/S2_5/translations/freeciv/ko.po + M /branches/S2_5/translations/freeciv/lt.po + M /branches/S2_5/translations/freeciv/nb.po + M /branches/S2_5/translations/freeciv/nl.po + M /branches/S2_5/translations/freeciv/pl.po + M /branches/S2_5/translations/freeciv/pt.po + M /branches/S2_5/translations/freeciv/pt_BR.po + M /branches/S2_5/translations/freeciv/ro.po + M /branches/S2_5/translations/freeciv/ru.po + M /branches/S2_5/translations/freeciv/sr.po + M /branches/S2_5/translations/freeciv/sv.po + M /branches/S2_5/translations/freeciv/tr.po + M /branches/S2_5/translations/freeciv/uk.po + M /branches/S2_5/translations/freeciv/zh_CN.po + M /branches/S2_5/translations/freeciv/zh_TW.po + M /branches/S2_5/translations/nations/ar.po + M /branches/S2_5/translations/nations/bg.po + M /branches/S2_5/translations/nations/ca.po + M /branches/S2_5/translations/nations/cs.po + M /branches/S2_5/translations/nations/da.po + M /branches/S2_5/translations/nations/de.po + M /branches/S2_5/translations/nations/el.po + M /branches/S2_5/translations/nations/en_GB.po + M /branches/S2_5/translations/nations/eo.po + M /branches/S2_5/translations/nations/es.po + M /branches/S2_5/translations/nations/et.po + M /branches/S2_5/translations/nations/fa.po + M /branches/S2_5/translations/nations/fi.po + M /branches/S2_5/translations/nations/fr.po + M /branches/S2_5/translations/nations/ga.po + M /branches/S2_5/translations/nations/gd.po + M /branches/S2_5/translations/nations/he.po + M /branches/S2_5/translations/nations/hu.po + M /branches/S2_5/translations/nations/id.po + M /branches/S2_5/translations/nations/it.po + M /branches/S2_5/translations/nations/ja.po + M /branches/S2_5/translations/nations/ko.po + M /branches/S2_5/translations/nations/lt.po + M /branches/S2_5/translations/nations/nb.po + M /branches/S2_5/translations/nations/nl.po + M /branches/S2_5/translations/nations/pl.po + M /branches/S2_5/translations/nations/pt.po + M /branches/S2_5/translations/nations/pt_BR.po + M /branches/S2_5/translations/nations/ro.po + M /branches/S2_5/translations/nations/ru.po + M /branches/S2_5/translations/nations/sr.po + M /branches/S2_5/translations/nations/sv.po + M /branches/S2_5/translations/nations/tr.po + M /branches/S2_5/translations/nations/uk.po + M /branches/S2_5/translations/nations/zh_CN.po + M /branches/S2_5/translations/nations/zh_TW.po + +Results of running make update-po +in translations/freeciv/ and translations/nations/ + + +r28421 | cazfi | 2015-03-05 19:01:26 + (Thu, 05 Mar 2015) | 4 lines +Changed
[Freeciv-commits] r28446 - /trunk/m4/qt5.m4
Author: cazfi Date: Sat Mar 7 22:19:18 2015 New Revision: 28446 URL: http://svn.gna.org/viewcvs/freeciv?rev=28446view=rev Log: Made configure to consider failure to find Qt headers or libs from explicitly given path fatal one. Also do not check any additional paths. Previously it was possible that it ended up using versions other than user intended, even when the correct one was found. See bug #23348 Modified: trunk/m4/qt5.m4 Modified: trunk/m4/qt5.m4 URL: http://svn.gna.org/viewcvs/freeciv/trunk/m4/qt5.m4?rev=28446r1=28445r2=28446view=diff == --- trunk/m4/qt5.m4 (original) +++ trunk/m4/qt5.m4 Sat Mar 7 22:19:18 2015 @@ -8,22 +8,25 @@ AC_ARG_WITH([qt5-includes], AS_HELP_STRING([--with-qt5-includes], [path to Qt5 includes]), - [FC_QT5_COMPILETEST([$withval])], + [FC_QT5_COMPILETEST([$withval]) + qt5_hdr_check_finish=true], [POTENTIAL_PATHS=/usr/include /usr/include/qt5 -# search multiarch paths too (if the multiarch tuple can be found) -FC_MULTIARCH_TUPLE() -AS_IF(test x$MULTIARCH_TUPLE != x, - POTENTIAL_PATHS=$POTENTIAL_PATHS /usr/include/$MULTIARCH_TUPLE/qt5) + if test x$qt5_hdr_check_finish != xtrue ; then +# search multiarch paths too (if the multiarch tuple can be found) +FC_MULTIARCH_TUPLE() +AS_IF(test x$MULTIARCH_TUPLE != x, + POTENTIAL_PATHS=$POTENTIAL_PATHS /usr/include/$MULTIARCH_TUPLE/qt5) -dnl First test without any additional include paths to see if it works already -FC_QT5_COMPILETEST -for TEST_PATH in $POTENTIAL_PATHS -do - if test x$qt5_headers != xyes ; then -FC_QT5_COMPILETEST($TEST_PATH) +dnl First test without any additional include paths to see if it works already +FC_QT5_COMPILETEST +for TEST_PATH in $POTENTIAL_PATHS +do + if test x$qt5_headers != xyes ; then +FC_QT5_COMPILETEST($TEST_PATH) + fi +done]) fi -done]) if test x$qt5_headers = xyes ; then AC_MSG_RESULT([found]) @@ -31,23 +34,25 @@ AC_MSG_CHECKING([Qt5 libraries]) AC_ARG_WITH([qt5-libs], AS_HELP_STRING([--with-qt5-libs], [path to Qt5 libraries]), -[FC_QT5_LINKTEST([$withval])], +[FC_QT5_LINKTEST([$withval]) + qt5_lib_check_finish=true], [POTENTIAL_PATHS=/usr/lib/qt5 -# search multiarch paths too (if the multiarch tuple can be found) -FC_MULTIARCH_TUPLE() -AS_IF(test x$MULTIARCH_TUPLE != x, - POTENTIAL_PATHS=$POTENTIAL_PATHS /usr/lib/$MULTIARCH_TUPLE/qt5) +if test x$qt5_lib_check_finish != xtrue ; then + # search multiarch paths too (if the multiarch tuple can be found) + FC_MULTIARCH_TUPLE() + AS_IF(test x$MULTIARCH_TUPLE != x, +POTENTIAL_PATHS=$POTENTIAL_PATHS /usr/lib/$MULTIARCH_TUPLE/qt5) -dnl First test without any additional library paths to see if it works already -FC_QT5_LINKTEST -for TEST_PATH in $POTENTIAL_PATHS -do - if test x$qt5_libs != xyes ; then -FC_QT5_LINKTEST($TEST_PATH) - fi -done]) - + dnl First test without any additional library paths to see if it works already + FC_QT5_LINKTEST + for TEST_PATH in $POTENTIAL_PATHS + do +if test x$qt5_libs != xyes ; then + FC_QT5_LINKTEST($TEST_PATH) +fi + done]) +fi fi AC_LANG_POP([C++]) ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28447 - /branches/S2_6/m4/qt5.m4
Author: cazfi Date: Sat Mar 7 22:19:25 2015 New Revision: 28447 URL: http://svn.gna.org/viewcvs/freeciv?rev=28447view=rev Log: Made configure to consider failure to find Qt headers or libs from explicitly given path fatal one. Also do not check any additional paths. Previously it was possible that it ended up using versions other than user intended, even when the correct one was found. See bug #23348 Modified: branches/S2_6/m4/qt5.m4 Modified: branches/S2_6/m4/qt5.m4 URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/m4/qt5.m4?rev=28447r1=28446r2=28447view=diff == --- branches/S2_6/m4/qt5.m4 (original) +++ branches/S2_6/m4/qt5.m4 Sat Mar 7 22:19:25 2015 @@ -8,22 +8,25 @@ AC_ARG_WITH([qt5-includes], AS_HELP_STRING([--with-qt5-includes], [path to Qt5 includes]), - [FC_QT5_COMPILETEST([$withval])], + [FC_QT5_COMPILETEST([$withval]) + qt5_hdr_check_finish=true], [POTENTIAL_PATHS=/usr/include /usr/include/qt5 -# search multiarch paths too (if the multiarch tuple can be found) -FC_MULTIARCH_TUPLE() -AS_IF(test x$MULTIARCH_TUPLE != x, - POTENTIAL_PATHS=$POTENTIAL_PATHS /usr/include/$MULTIARCH_TUPLE/qt5) + if test x$qt5_hdr_check_finish != xtrue ; then +# search multiarch paths too (if the multiarch tuple can be found) +FC_MULTIARCH_TUPLE() +AS_IF(test x$MULTIARCH_TUPLE != x, + POTENTIAL_PATHS=$POTENTIAL_PATHS /usr/include/$MULTIARCH_TUPLE/qt5) -dnl First test without any additional include paths to see if it works already -FC_QT5_COMPILETEST -for TEST_PATH in $POTENTIAL_PATHS -do - if test x$qt5_headers != xyes ; then -FC_QT5_COMPILETEST($TEST_PATH) +dnl First test without any additional include paths to see if it works already +FC_QT5_COMPILETEST +for TEST_PATH in $POTENTIAL_PATHS +do + if test x$qt5_headers != xyes ; then +FC_QT5_COMPILETEST($TEST_PATH) + fi +done]) fi -done]) if test x$qt5_headers = xyes ; then AC_MSG_RESULT([found]) @@ -31,23 +34,25 @@ AC_MSG_CHECKING([Qt5 libraries]) AC_ARG_WITH([qt5-libs], AS_HELP_STRING([--with-qt5-libs], [path to Qt5 libraries]), -[FC_QT5_LINKTEST([$withval])], +[FC_QT5_LINKTEST([$withval]) + qt5_lib_check_finish=true], [POTENTIAL_PATHS=/usr/lib/qt5 -# search multiarch paths too (if the multiarch tuple can be found) -FC_MULTIARCH_TUPLE() -AS_IF(test x$MULTIARCH_TUPLE != x, - POTENTIAL_PATHS=$POTENTIAL_PATHS /usr/lib/$MULTIARCH_TUPLE/qt5) +if test x$qt5_lib_check_finish != xtrue ; then + # search multiarch paths too (if the multiarch tuple can be found) + FC_MULTIARCH_TUPLE() + AS_IF(test x$MULTIARCH_TUPLE != x, +POTENTIAL_PATHS=$POTENTIAL_PATHS /usr/lib/$MULTIARCH_TUPLE/qt5) -dnl First test without any additional library paths to see if it works already -FC_QT5_LINKTEST -for TEST_PATH in $POTENTIAL_PATHS -do - if test x$qt5_libs != xyes ; then -FC_QT5_LINKTEST($TEST_PATH) - fi -done]) - + dnl First test without any additional library paths to see if it works already + FC_QT5_LINKTEST + for TEST_PATH in $POTENTIAL_PATHS + do +if test x$qt5_libs != xyes ; then + FC_QT5_LINKTEST($TEST_PATH) +fi + done]) +fi fi AC_LANG_POP([C++]) ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28451 - in /branches/S2_6/data: amplio2.tilespec cimpletoon.tilespec hexemplio.tilespec toonhex.tilespec trident.tilespec
Author: cazfi Date: Sat Mar 7 23:06:35 2015 New Revision: 28451 URL: http://svn.gna.org/viewcvs/freeciv?rev=28451view=rev Log: Added outpost extrastyle definition to all tilesets where fort was renamed as outpost. See bug #23351 Modified: branches/S2_6/data/amplio2.tilespec branches/S2_6/data/cimpletoon.tilespec branches/S2_6/data/hexemplio.tilespec branches/S2_6/data/toonhex.tilespec branches/S2_6/data/trident.tilespec Modified: branches/S2_6/data/amplio2.tilespec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/amplio2.tilespec?rev=28451r1=28450r2=28451view=diff == --- branches/S2_6/data/amplio2.tilespec (original) +++ branches/S2_6/data/amplio2.tilespec Sat Mar 7 23:06:35 2015 @@ -226,7 +226,7 @@ tx.pollution, Single2 tx.fallout,Single2 tx.village,Single1 - base.fort, 3Layer + base.outpost, 3Layer base.fortress, 3Layer base.airstrip, 3Layer base.airbase, 3Layer Modified: branches/S2_6/data/cimpletoon.tilespec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/cimpletoon.tilespec?rev=28451r1=28450r2=28451view=diff == --- branches/S2_6/data/cimpletoon.tilespec (original) +++ branches/S2_6/data/cimpletoon.tilespec Sat Mar 7 23:06:35 2015 @@ -225,7 +225,7 @@ tx.pollution, Single2 tx.fallout,Single2 tx.village,Single1 - base.fort, 3Layer + base.outpost, 3Layer base.fortress, 3Layer base.airfield, 3Layer base.airbase, 3Layer Modified: branches/S2_6/data/hexemplio.tilespec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/hexemplio.tilespec?rev=28451r1=28450r2=28451view=diff == --- branches/S2_6/data/hexemplio.tilespec (original) +++ branches/S2_6/data/hexemplio.tilespec Sat Mar 7 23:06:35 2015 @@ -304,7 +304,7 @@ tx.pollution, Single2 tx.fallout,Single2 tx.village,Single1 - base.fort, 3Layer + base.outpost, 3Layer base.fortress, 3Layer base.airfield, 3Layer base.airbase, 3layer Modified: branches/S2_6/data/toonhex.tilespec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/toonhex.tilespec?rev=28451r1=28450r2=28451view=diff == --- branches/S2_6/data/toonhex.tilespec (original) +++ branches/S2_6/data/toonhex.tilespec Sat Mar 7 23:06:35 2015 @@ -305,7 +305,7 @@ tx.pollution, Single2 tx.fallout,Single2 tx.village,Single1 - base.fort, 3Layer + base.outpost, 3Layer base.fortress, 3Layer base.airfield, 3Layer base.airbase, 3layer Modified: branches/S2_6/data/trident.tilespec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/trident.tilespec?rev=28451r1=28450r2=28451view=diff == --- branches/S2_6/data/trident.tilespec (original) +++ branches/S2_6/data/trident.tilespec Sat Mar 7 23:06:35 2015 @@ -234,7 +234,9 @@ tx.pollution, Single2 tx.fallout,Single2 tx.village,Single1 + base.outpost, 3Layer base.fortress, 3Layer + base.airstrip, 3Layer base.airbase, 3Layer base.ruins,3Layer } ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28452 - /trunk/server/rssanity.c
Author: cazfi
Date: Sat Mar 7 23:51:49 2015
New Revision: 28452
URL: http://svn.gna.org/viewcvs/freeciv?rev=28452view=rev
Log:
Typofix in ruleset sanity check message: thouugh - though
See patch #5898
Modified:
trunk/server/rssanity.c
Modified: trunk/server/rssanity.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/rssanity.c?rev=28452r1=28451r2=28452view=diff
==
--- trunk/server/rssanity.c (original)
+++ trunk/server/rssanity.c Sat Mar 7 23:51:49 2015
@@ -762,7 +762,7 @@
achievements_iterate(pach) {
if (!pach-unique pach-cons_msg == NULL) {
ruleset_error(LOG_ERROR,
-Achievement %s has no message for consecutive gainers
thouugh
+Achievement %s has no message for consecutive gainers
though
it's possible to be gained by multiple players,
achievement_rule_name(pach));
ok = FALSE;
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28456 - /trunk/doc/README.packaging
Author: cazfi Date: Sat Mar 7 23:57:50 2015 New Revision: 28456 URL: http://svn.gna.org/viewcvs/freeciv?rev=28456view=rev Log: Add entry about tinycthreads to README.packaging list of changes since 2.6 See patch #5900 Modified: trunk/doc/README.packaging Modified: trunk/doc/README.packaging URL: http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.packaging?rev=28456r1=28455r2=28456view=diff == --- trunk/doc/README.packaging (original) +++ trunk/doc/README.packaging Sat Mar 7 23:57:50 2015 @@ -18,6 +18,8 @@ ~/.freeciv-client-rc-2.5 generated by Freeciv 2.5, or ~/.civclientrc generated by Freeciv version = 2.1). * Minimum autoconf version is now 2.62, automake 1.11 +* Tinycthreads can be used as threading implementation. Copy of tinycthreads + can be compiled in to freeciv by configuring with --with-tinycthread. -- Compatibility of modified versions ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28457 - in /trunk/client: gui-gtk-2.0/helpdlg.c gui-gtk-3.0/helpdlg.c
Author: cazfi
Date: Sun Mar 8 00:33:45 2015
New Revision: 28457
URL: http://svn.gna.org/viewcvs/freeciv?rev=28457view=rev
Log:
List terrain specific extra build time in terrain help pages.
See patch #5895
Modified:
trunk/client/gui-gtk-2.0/helpdlg.c
trunk/client/gui-gtk-3.0/helpdlg.c
Modified: trunk/client/gui-gtk-2.0/helpdlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/helpdlg.c?rev=28457r1=28456r2=28457view=diff
==
--- trunk/client/gui-gtk-2.0/helpdlg.c (original)
+++ trunk/client/gui-gtk-2.0/helpdlg.c Sun Mar 8 00:33:45 2015
@@ -1082,15 +1082,19 @@
/**
Create widgets about all extras of one cause buildable to the terrain.
**/
-static void help_extras_of_cause_for_terrain(struct terrain *pterr, enum
extra_cause cause,
- char *label)
+static void help_extras_of_act_for_terrain(struct terrain *pterr,
+ enum unit_activity act,
+ char *label)
{
struct universal for_terr = { .kind = VUT_TERRAIN, .value = { .terrain =
pterr }};
+ enum extra_cause cause = activity_to_extra_cause(act);
extra_type_by_cause_iterate(cause, pextra) {
if (pextra-buildable universal_fulfills_requirement(FALSE,
(pextra-reqs), for_terr)) {
GtkWidget *w;
GtkWidget *hbox;
+ char buffer[1024];
+ int btime;
hbox = gtk_hbox_new(FALSE, 0);
gtk_container_add(GTK_CONTAINER(help_vbox), hbox);
@@ -1098,6 +1102,12 @@
gtk_box_pack_start(GTK_BOX(hbox), w, FALSE, FALSE, 0);
w = help_slink_new(extra_name_translation(pextra), HELP_EXTRA);
gtk_box_pack_start(GTK_BOX(hbox), w, FALSE, FALSE, 0);
+
+ btime = terrain_extra_build_time(pterr, act, pextra);
+ fc_snprintf(buffer, sizeof(buffer), PL_(%d turn, %d turns, btime),
btime);
+ w = gtk_label_new(buffer);
+ gtk_box_pack_start(GTK_BOX(hbox), w, FALSE, FALSE, 0);
+
gtk_widget_show_all(hbox);
}
} extra_type_by_cause_iterate_end;
@@ -1178,14 +1188,14 @@
gtk_container_foreach(GTK_CONTAINER(help_vbox),
(GtkCallback)gtk_widget_destroy, NULL);
if (pterrain-irrigation_result == pterrain
effect_cumulative_max(EFT_IRRIG_POSSIBLE, for_terr) 0) {
- help_extras_of_cause_for_terrain(pterrain, EC_IRRIGATION, _(Build as
irrigation));
+ help_extras_of_act_for_terrain(pterrain, ACTIVITY_IRRIGATE, _(Build as
irrigation));
}
if (pterrain-mining_result == pterrain
effect_cumulative_max(EFT_MINING_POSSIBLE, for_terr) 0) {
- help_extras_of_cause_for_terrain(pterrain, EC_MINE, _(Build as mine));
-}
-help_extras_of_cause_for_terrain(pterrain, EC_ROAD, _(Build as road));
-help_extras_of_cause_for_terrain(pterrain, EC_BASE, _(Build as base));
+ help_extras_of_act_for_terrain(pterrain, ACTIVITY_MINE, _(Build as
mine));
+}
+help_extras_of_act_for_terrain(pterrain, ACTIVITY_GEN_ROAD, _(Build as
road));
+help_extras_of_act_for_terrain(pterrain, ACTIVITY_BASE, _(Build as
base));
gtk_widget_show(help_vbox);
}
Modified: trunk/client/gui-gtk-3.0/helpdlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/helpdlg.c?rev=28457r1=28456r2=28457view=diff
==
--- trunk/client/gui-gtk-3.0/helpdlg.c (original)
+++ trunk/client/gui-gtk-3.0/helpdlg.c Sun Mar 8 00:33:45 2015
@@ -1105,24 +1105,34 @@
}
/**
- Create widgets about all extras of one cause buildable to the terrain.
-**/
-static void help_extras_of_cause_for_terrain(struct terrain *pterr, enum
extra_cause cause,
- char *label)
+ Create widgets about all extras of one cause activity to the terrain.
+**/
+static void help_extras_of_act_for_terrain(struct terrain *pterr,
+ enum unit_activity act,
+ char *label)
{
struct universal for_terr = { .kind = VUT_TERRAIN, .value = { .terrain =
pterr }};
+ enum extra_cause cause = activity_to_extra_cause(act);
extra_type_by_cause_iterate(cause, pextra) {
if (pextra-buildable universal_fulfills_requirement(FALSE,
(pextra-reqs), for_terr)) {
GtkWidget *w;
GtkWidget *hbox;
+ char buffer[1024];
+ int btime;
hbox = gtk_grid_new();
gtk_container_add(GTK_CONTAINER(help_vbox), hbox);
- w = gtk_label_new((label));
+ w = gtk_label_new(label);
[Freeciv-commits] r28453 - /branches/S2_6/server/rssanity.c
Author: cazfi
Date: Sat Mar 7 23:51:55 2015
New Revision: 28453
URL: http://svn.gna.org/viewcvs/freeciv?rev=28453view=rev
Log:
Typofix in ruleset sanity check message: thouugh - though
See patch #5898
Modified:
branches/S2_6/server/rssanity.c
Modified: branches/S2_6/server/rssanity.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/rssanity.c?rev=28453r1=28452r2=28453view=diff
==
--- branches/S2_6/server/rssanity.c (original)
+++ branches/S2_6/server/rssanity.c Sat Mar 7 23:51:55 2015
@@ -762,7 +762,7 @@
achievements_iterate(pach) {
if (!pach-unique pach-cons_msg == NULL) {
ruleset_error(LOG_ERROR,
-Achievement %s has no message for consecutive gainers
thouugh
+Achievement %s has no message for consecutive gainers
though
it's possible to be gained by multiple players,
achievement_rule_name(pach));
ok = FALSE;
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28450 - in /trunk/data: amplio2.tilespec cimpletoon.tilespec hexemplio.tilespec toonhex.tilespec trident.tilespec
Author: cazfi Date: Sat Mar 7 23:06:28 2015 New Revision: 28450 URL: http://svn.gna.org/viewcvs/freeciv?rev=28450view=rev Log: Added outpost extrastyle definition to all tilesets where fort was renamed as outpost. See bug #23351 Modified: trunk/data/amplio2.tilespec trunk/data/cimpletoon.tilespec trunk/data/hexemplio.tilespec trunk/data/toonhex.tilespec trunk/data/trident.tilespec Modified: trunk/data/amplio2.tilespec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/amplio2.tilespec?rev=28450r1=28449r2=28450view=diff == --- trunk/data/amplio2.tilespec (original) +++ trunk/data/amplio2.tilespec Sat Mar 7 23:06:28 2015 @@ -226,7 +226,7 @@ tx.pollution, Single2 tx.fallout,Single2 tx.village,Single1 - base.fort, 3Layer + base.outpost, 3Layer base.fortress, 3Layer base.airstrip, 3Layer base.airbase, 3Layer Modified: trunk/data/cimpletoon.tilespec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/cimpletoon.tilespec?rev=28450r1=28449r2=28450view=diff == --- trunk/data/cimpletoon.tilespec (original) +++ trunk/data/cimpletoon.tilespec Sat Mar 7 23:06:28 2015 @@ -225,7 +225,7 @@ tx.pollution, Single2 tx.fallout,Single2 tx.village,Single1 - base.fort, 3Layer + base.outpost, 3Layer base.fortress, 3Layer base.airfield, 3Layer base.airbase, 3Layer Modified: trunk/data/hexemplio.tilespec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/hexemplio.tilespec?rev=28450r1=28449r2=28450view=diff == --- trunk/data/hexemplio.tilespec (original) +++ trunk/data/hexemplio.tilespec Sat Mar 7 23:06:28 2015 @@ -304,7 +304,7 @@ tx.pollution, Single2 tx.fallout,Single2 tx.village,Single1 - base.fort, 3Layer + base.outpost, 3Layer base.fortress, 3Layer base.airfield, 3Layer base.airbase, 3layer Modified: trunk/data/toonhex.tilespec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/toonhex.tilespec?rev=28450r1=28449r2=28450view=diff == --- trunk/data/toonhex.tilespec (original) +++ trunk/data/toonhex.tilespec Sat Mar 7 23:06:28 2015 @@ -305,7 +305,7 @@ tx.pollution, Single2 tx.fallout,Single2 tx.village,Single1 - base.fort, 3Layer + base.outpost, 3Layer base.fortress, 3Layer base.airfield, 3Layer base.airbase, 3layer Modified: trunk/data/trident.tilespec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/trident.tilespec?rev=28450r1=28449r2=28450view=diff == --- trunk/data/trident.tilespec (original) +++ trunk/data/trident.tilespec Sat Mar 7 23:06:28 2015 @@ -234,7 +234,9 @@ tx.pollution, Single2 tx.fallout,Single2 tx.village,Single1 + base.outpost, 3Layer base.fortress, 3Layer + base.airstrip, 3Layer base.airbase, 3Layer base.ruins,3Layer } ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28455 - /branches/S2_6/common/game.c
Author: cazfi
Date: Sat Mar 7 23:55:10 2015
New Revision: 28455
URL: http://svn.gna.org/viewcvs/freeciv?rev=28455view=rev
Log:
Initialize game.server.ruledit.nationlist
See bug #23352
Modified:
branches/S2_6/common/game.c
Modified: branches/S2_6/common/game.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/game.c?rev=28455r1=28454r2=28455view=diff
==
--- branches/S2_6/common/game.c (original)
+++ branches/S2_6/common/game.c Sat Mar 7 23:55:10 2015
@@ -524,6 +524,10 @@
user_terrain_flags_init();
user_tech_flags_init();
multipliers_init();
+
+ if (is_server()) {
+game.server.ruledit.nationlist = NULL;
+ }
}
/***
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28454 - /trunk/common/game.c
Author: cazfi
Date: Sat Mar 7 23:55:04 2015
New Revision: 28454
URL: http://svn.gna.org/viewcvs/freeciv?rev=28454view=rev
Log:
Initialize game.server.ruledit.nationlist
See bug #23352
Modified:
trunk/common/game.c
Modified: trunk/common/game.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/game.c?rev=28454r1=28453r2=28454view=diff
==
--- trunk/common/game.c (original)
+++ trunk/common/game.c Sat Mar 7 23:55:04 2015
@@ -524,6 +524,10 @@
user_terrain_flags_init();
user_tech_flags_init();
multipliers_init();
+
+ if (is_server()) {
+game.server.ruledit.nationlist = NULL;
+ }
}
/***
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28448 - /trunk/data/alien/script.lua
Author: cazfi
Date: Sat Mar 7 22:30:53 2015
New Revision: 28448
URL: http://svn.gna.org/viewcvs/freeciv?rev=28448view=rev
Log:
Alien ruleset uses its own script for hut_enter signal. It's copy of the
default one with user
visible messages changed to match the world of alien ruleset. Also removed the
chance of getting
mercenary units.
See patch #5896
Modified:
trunk/data/alien/script.lua
Modified: trunk/data/alien/script.lua
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/script.lua?rev=28448r1=28447r2=28448view=diff
==
--- trunk/data/alien/script.lua (original)
+++ trunk/data/alien/script.lua Sat Mar 7 22:30:53 2015
@@ -9,6 +9,110 @@
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- GNU General Public License for more details.
+-- default.lua callback overrides
+
+-- Get gold from entering a hut.
+function alien_hut_get_gold(unit, gold)
+ local owner = unit.owner
+
+ notify.event(owner, unit.tile, E.HUT_GOLD, PL_(It was a safe containing %d
gold.,
+ It was a safe containing %d
gold., gold),
+ gold)
+ owner:change_gold(gold)
+end
+
+-- Get a tech from entering a hut.
+function alien_hut_get_tech(unit)
+ local owner = unit.owner
+ local tech = owner:give_technology(nil, hut)
+
+ if tech then
+notify.event(owner, unit.tile, E.HUT_TECH,
+ _(There was a datapod containing research info about %s.),
+ tech:name_translation())
+notify.embassies(owner, unit.tile, E.HUT_TECH,
+ _(The %s have acquired %s from Space Capsule they found.),
+ owner.nation:plural_translation(),
+ tech:name_translation())
+return true
+ else
+return false
+ end
+end
+
+-- Get new city from hut
+function alien_hut_get_city(unit)
+ local owner = unit.owner
+
+ if unit:is_on_possible_city_tile() then
+owner:create_city(unit.tile, )
+notify.event(owner, unit.tile, E.HUT_CITY,
+ _(You found a base starting kit.))
+return true
+ else
+return false
+ end
+end
+
+-- Get barbarians from hut, unless close to a city, king enters, or
+-- barbarians are disabled
+-- Unit may die: returns true if unit is alive
+function alien_hut_get_barbarians(unit)
+ local tile = unit.tile
+ local type = unit.utype
+ local owner = unit.owner
+
+ if server.setting.get(barbarians) == DISABLED
+or unit.tile:city_exists_within_max_city_map(true)
+or type:has_flag('Gameloss') then
+ notify.event(owner, unit.tile, E.HUT_BARB_CITY_NEAR,
+ _(The Space Capsule was already scavenged by someone.))
+return true
+ end
+
+ local alive = tile:unleash_barbarians()
+ if alive then
+notify.event(owner, tile, E.HUT_BARB,
+ _(It was a trap! Set by the outcasts.));
+ else
+notify.event(owner, tile, E.HUT_BARB_KILLED,
+ _(Your %s has been killed by outcasts!),
+ type:name_translation());
+ end
+ return alive
+end
+
+-- Randomly choose a hut event
+function alien_hut_enter_callback(unit)
+ local chance = random(0, 11)
+ local alive = true
+
+ if chance == 0 then
+alien_hut_get_gold(unit, 25)
+ elseif chance == 1 or chance == 2 or chance == 3 then
+alien_hut_get_gold(unit, 50)
+ elseif chance == 4 then
+alien_hut_get_gold(unit, 100)
+ elseif chance == 5 or chance == 6 or chance == 7 then
+alien_hut_get_tech(unit)
+ elseif chance == 8 or chance == 9 then
+alien_hut_get_gold(unit, 25)
+ elseif chance == 10 then
+alive = alien_hut_get_barbarians(unit)
+ elseif chance == 11 then
+if not alien_hut_get_city(unit) then
+ alien_hut_get_gold(unit, 50)
+end
+ end
+
+ -- do not process default.lua
+ return true
+end
+
+signal.connect(hut_enter, alien_hut_enter_callback)
+
+-- Alien ruleset specific callbacks
+
-- Show a pop up telling the beginning of the story when the game starts.
function turn_callback(turn, year)
if turn == 0 then
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28459 - /trunk/server/rssanity.c
Author: cazfi
Date: Sun Mar 8 01:12:58 2015
New Revision: 28459
URL: http://svn.gna.org/viewcvs/freeciv?rev=28459view=rev
Log:
List terrain specific extra build time in terrain help pages.
See patch #5892
Modified:
trunk/server/rssanity.c
Modified: trunk/server/rssanity.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/rssanity.c?rev=28459r1=28458r2=28459view=diff
==
--- trunk/server/rssanity.c (original)
+++ trunk/server/rssanity.c Sun Mar 8 01:12:58 2015
@@ -430,6 +430,13 @@
}
}
+ if (num_role_units(L_PARTISAN) == 0
+ effect_cumulative_max(EFT_INSPIRE_PARTISANS, NULL) 0) {
+ruleset_error(LOG_ERROR,
+ Inspire_Partisans effect present, but no units with
partisan role.);
+return FALSE;
+ }
+
return TRUE;
}
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28462 - /branches/S2_6/client/tilespec.c
Author: cazfi
Date: Sun Mar 8 02:46:05 2015
New Revision: 28462
URL: http://svn.gna.org/viewcvs/freeciv?rev=28462view=rev
Log:
Draw city grids even if in addition to map grids.
Requested by Jacob Nevins jtn
See bug #23302
Modified:
branches/S2_6/client/tilespec.c
Modified: branches/S2_6/client/tilespec.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/tilespec.c?rev=28462r1=28461r2=28462view=diff
==
--- branches/S2_6/client/tilespec.c (original)
+++ branches/S2_6/client/tilespec.c Sun Mar 8 02:46:05 2015
@@ -4683,20 +4683,23 @@
(is_ocean_tile(pedge-tile[0])
^ is_ocean_tile(pedge-tile[1]))) {
ADD_SPRITE_SIMPLE(t-sprites.grid.coastline[pedge-type]);
-} else if (options.draw_map_grid) {
- if (worked[0] || worked[1]) {
- ADD_SPRITE_SIMPLE(t-sprites.grid.worked[pedge-type]);
- } else if (city[0] || city[1]) {
- ADD_SPRITE_SIMPLE(t-sprites.grid.city[pedge-type]);
- } else if (known[0] || known[1]) {
- ADD_SPRITE_SIMPLE(t-sprites.grid.main[pedge-type]);
- }
-} else if (options.draw_city_outlines) {
- if (XOR(city[0], city[1])) {
- ADD_SPRITE_SIMPLE(t-sprites.grid.city[pedge-type]);
- }
- if (XOR(unit[0], unit[1])) {
- ADD_SPRITE_SIMPLE(t-sprites.grid.worked[pedge-type]);
+} else {
+ if (options.draw_map_grid) {
+if (worked[0] || worked[1]) {
+ ADD_SPRITE_SIMPLE(t-sprites.grid.worked[pedge-type]);
+} else if (city[0] || city[1]) {
+ ADD_SPRITE_SIMPLE(t-sprites.grid.city[pedge-type]);
+} else if (known[0] || known[1]) {
+ ADD_SPRITE_SIMPLE(t-sprites.grid.main[pedge-type]);
+}
+ }
+ if (options.draw_city_outlines) {
+if (XOR(city[0], city[1])) {
+ ADD_SPRITE_SIMPLE(t-sprites.grid.city[pedge-type]);
+}
+if (XOR(unit[0], unit[1])) {
+ ADD_SPRITE_SIMPLE(t-sprites.grid.worked[pedge-type]);
+}
}
}
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28461 - /trunk/client/tilespec.c
Author: cazfi
Date: Sun Mar 8 02:45:56 2015
New Revision: 28461
URL: http://svn.gna.org/viewcvs/freeciv?rev=28461view=rev
Log:
Draw city grids even if in addition to map grids.
Requested by Jacob Nevins jtn
See bug #23302
Modified:
trunk/client/tilespec.c
Modified: trunk/client/tilespec.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/tilespec.c?rev=28461r1=28460r2=28461view=diff
==
--- trunk/client/tilespec.c (original)
+++ trunk/client/tilespec.c Sun Mar 8 02:45:56 2015
@@ -4687,20 +4687,23 @@
(is_ocean_tile(pedge-tile[0])
^ is_ocean_tile(pedge-tile[1]))) {
ADD_SPRITE_SIMPLE(t-sprites.grid.coastline[pedge-type]);
-} else if (options.draw_map_grid) {
- if (worked[0] || worked[1]) {
- ADD_SPRITE_SIMPLE(t-sprites.grid.worked[pedge-type]);
- } else if (city[0] || city[1]) {
- ADD_SPRITE_SIMPLE(t-sprites.grid.city[pedge-type]);
- } else if (known[0] || known[1]) {
- ADD_SPRITE_SIMPLE(t-sprites.grid.main[pedge-type]);
- }
-} else if (options.draw_city_outlines) {
- if (XOR(city[0], city[1])) {
- ADD_SPRITE_SIMPLE(t-sprites.grid.city[pedge-type]);
- }
- if (XOR(unit[0], unit[1])) {
- ADD_SPRITE_SIMPLE(t-sprites.grid.worked[pedge-type]);
+} else {
+ if (options.draw_map_grid) {
+if (worked[0] || worked[1]) {
+ ADD_SPRITE_SIMPLE(t-sprites.grid.worked[pedge-type]);
+} else if (city[0] || city[1]) {
+ ADD_SPRITE_SIMPLE(t-sprites.grid.city[pedge-type]);
+} else if (known[0] || known[1]) {
+ ADD_SPRITE_SIMPLE(t-sprites.grid.main[pedge-type]);
+}
+ }
+ if (options.draw_city_outlines) {
+if (XOR(city[0], city[1])) {
+ ADD_SPRITE_SIMPLE(t-sprites.grid.city[pedge-type]);
+}
+if (XOR(unit[0], unit[1])) {
+ ADD_SPRITE_SIMPLE(t-sprites.grid.worked[pedge-type]);
+}
}
}
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28463 - in /trunk: configure.ac translations/freeciv/Makevars translations/nations/Makevars translations/ruledit/Makevars
Author: cazfi
Date: Sun Mar 8 04:03:00 2015
New Revision: 28463
URL: http://svn.gna.org/viewcvs/freeciv?rev=28463view=rev
Log:
Replaced --escape addition configure sed-magic by having it in Makevars
XGETTEXT_PARAMETERS
See patch #5874
Modified:
trunk/configure.ac
trunk/translations/freeciv/Makevars
trunk/translations/nations/Makevars
trunk/translations/ruledit/Makevars
Modified: trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=28463r1=28462r2=28463view=diff
==
--- trunk/configure.ac (original)
+++ trunk/configure.ac Sun Mar 8 04:03:00 2015
@@ -1329,17 +1329,15 @@
dnl Most of the C comments copied to freeciv.pot are spurious;
dnl change to only copy those with prefix TRANS:
-dnl Also add --escape to the arguments to convert extended
-dnl characters to escape characters.
AC_CONFIG_COMMANDS([fc_default-4],[[for domain in $PODOMAINS ; do
if test -f translations/${domain}/Makefile ; then
- if grep 'add-comments=TRANS: --escape' translations/${domain}/Makefile
/dev/null 21 ; then
+ if grep 'add-comments=TRANS:' translations/${domain}/Makefile
/dev/null 21 ; then
# has already been modified
:
else
echo modifying translations/${domain}/Makefile add-comments/escape
mv -f translations/${domain}/Makefile
translations/${domain}/Makefile.tmp
- sed -e 's/add-comments=TRANSLATORS:/add-comments=TRANS: --escape/'
translations/${domain}/Makefile.tmp translations/${domain}/Makefile
+ sed -e 's/add-comments=TRANSLATORS:/add-comments=TRANS:/'
translations/${domain}/Makefile.tmp translations/${domain}/Makefile
rm translations/${domain}/Makefile.tmp
fi
fi
Modified: trunk/translations/freeciv/Makevars
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/translations/freeciv/Makevars?rev=28463r1=28462r2=28463view=diff
==
--- trunk/translations/freeciv/Makevars (original)
+++ trunk/translations/freeciv/Makevars Sun Mar 8 04:03:00 2015
@@ -13,7 +13,7 @@
--keyword=N_ --flag=N_:1:pass-c-format \
--keyword=--keyword=Q_ --keyword=PL_:1,2 \
--flag=error:3:c-format --flag=error_at_line:5:c-format \
- --language=C
+ --language=C --escape
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
Modified: trunk/translations/nations/Makevars
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/translations/nations/Makevars?rev=28463r1=28462r2=28463view=diff
==
--- trunk/translations/nations/Makevars (original)
+++ trunk/translations/nations/Makevars Sun Mar 8 04:03:00 2015
@@ -13,7 +13,7 @@
--keyword=N_ --flag=N_:1:pass-c-format \
--keyword=--keyword=Q_ --keyword=PL_:1,2 \
--flag=error:3:c-format --flag=error_at_line:5:c-format \
- --language=C
+ --language=C --escape
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
Modified: trunk/translations/ruledit/Makevars
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/translations/ruledit/Makevars?rev=28463r1=28462r2=28463view=diff
==
--- trunk/translations/ruledit/Makevars (original)
+++ trunk/translations/ruledit/Makevars Sun Mar 8 04:03:00 2015
@@ -14,7 +14,7 @@
--keyword=--keyword=Q_ --keyword=PL_:1,2 \
--keyword=R__ \
--flag=error:3:c-format --flag=error_at_line:5:c-format \
- --language=C
+ --language=C --escape
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r28464 - in /branches/S2_6: ./ translations/freeciv/ translations/nations/ translations/ruledit/
Author: cazfi
Date: Sun Mar 8 04:03:08 2015
New Revision: 28464
URL: http://svn.gna.org/viewcvs/freeciv?rev=28464view=rev
Log:
Replaced --escape addition configure sed-magic by having it in Makevars
XGETTEXT_PARAMETERS
See patch #5874
Modified:
branches/S2_6/configure.ac
branches/S2_6/translations/freeciv/Makevars
branches/S2_6/translations/nations/Makevars
branches/S2_6/translations/ruledit/Makevars
Modified: branches/S2_6/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/configure.ac?rev=28464r1=28463r2=28464view=diff
==
--- branches/S2_6/configure.ac (original)
+++ branches/S2_6/configure.ac Sun Mar 8 04:03:08 2015
@@ -1303,17 +1303,15 @@
dnl Most of the C comments copied to freeciv.pot are spurious;
dnl change to only copy those with prefix TRANS:
-dnl Also add --escape to the arguments to convert extended
-dnl characters to escape characters.
AC_CONFIG_COMMANDS([fc_default-4],[[for domain in $PODOMAINS ; do
if test -f translations/${domain}/Makefile ; then
- if grep 'add-comments=TRANS: --escape' translations/${domain}/Makefile
/dev/null 21 ; then
+ if grep 'add-comments=TRANS:' translations/${domain}/Makefile
/dev/null 21 ; then
# has already been modified
:
else
echo modifying translations/${domain}/Makefile add-comments/escape
mv -f translations/${domain}/Makefile
translations/${domain}/Makefile.tmp
- sed -e 's/add-comments=TRANSLATORS:/add-comments=TRANS: --escape/'
translations/${domain}/Makefile.tmp translations/${domain}/Makefile
+ sed -e 's/add-comments=TRANSLATORS:/add-comments=TRANS:/'
translations/${domain}/Makefile.tmp translations/${domain}/Makefile
rm translations/${domain}/Makefile.tmp
fi
fi
Modified: branches/S2_6/translations/freeciv/Makevars
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/freeciv/Makevars?rev=28464r1=28463r2=28464view=diff
==
--- branches/S2_6/translations/freeciv/Makevars (original)
+++ branches/S2_6/translations/freeciv/Makevars Sun Mar 8 04:03:08 2015
@@ -13,7 +13,7 @@
--keyword=N_ --flag=N_:1:pass-c-format \
--keyword=--keyword=Q_ --keyword=PL_:1,2 \
--flag=error:3:c-format --flag=error_at_line:5:c-format \
- --language=C
+ --language=C --escape
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
Modified: branches/S2_6/translations/nations/Makevars
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/nations/Makevars?rev=28464r1=28463r2=28464view=diff
==
--- branches/S2_6/translations/nations/Makevars (original)
+++ branches/S2_6/translations/nations/Makevars Sun Mar 8 04:03:08 2015
@@ -13,7 +13,7 @@
--keyword=N_ --flag=N_:1:pass-c-format \
--keyword=--keyword=Q_ --keyword=PL_:1,2 \
--flag=error:3:c-format --flag=error_at_line:5:c-format \
- --language=C
+ --language=C --escape
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
Modified: branches/S2_6/translations/ruledit/Makevars
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/ruledit/Makevars?rev=28464r1=28463r2=28464view=diff
==
--- branches/S2_6/translations/ruledit/Makevars (original)
+++ branches/S2_6/translations/ruledit/Makevars Sun Mar 8 04:03:08 2015
@@ -14,7 +14,7 @@
--keyword=--keyword=Q_ --keyword=PL_:1,2 \
--keyword=R__ \
--flag=error:3:c-format --flag=error_at_line:5:c-format \
- --language=C
+ --language=C --escape
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
