[Freeciv-commits] r24801 - /trunk/server/cityturn.c
Author: cazfi
Date: Fri Apr 25 19:34:20 2014
New Revision: 24801
URL: http://svn.gna.org/viewcvs/freeciv?rev=24801view=rev
Log:
Fixed a crash when ruleset provides no suitable pollution or fallout for a tile
selected to get such an extra.
See bug #21949
Modified:
trunk/server/cityturn.c
Modified: trunk/server/cityturn.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/cityturn.c?rev=24801r1=24800r2=24801view=diff
==
--- trunk/server/cityturn.c (original)
+++ trunk/server/cityturn.c Fri Apr 25 19:34:20 2014
@@ -2293,7 +2293,7 @@
if (!terrain_has_flag(tile_terrain(ptile), TER_NO_POLLUTION)) {
struct extra_type *pextra = rand_extra_for_tile(ptile, cause);
- if (!tile_has_extra(ptile, pextra)) {
+ if (pextra != NULL !tile_has_extra(ptile, pextra)) {
tile_add_extra(ptile, pextra);
update_tile_knowledge(ptile);
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r24802 - /trunk/tools/download.c
Author: cazfi
Date: Fri Apr 25 20:09:33 2014
New Revision: 24802
URL: http://svn.gna.org/viewcvs/freeciv?rev=24802view=rev
Log:
Fixed construction of final URL when .modpack gives relative one.
See bug #21951
Modified:
trunk/tools/download.c
Modified: trunk/tools/download.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/tools/download.c?rev=24802r1=24801r2=24802view=diff
==
--- trunk/tools/download.c (original)
+++ trunk/tools/download.c Fri Apr 25 20:09:33 2014
@@ -176,7 +176,7 @@
if (baseURLpart[0] == '.') {
char URLstart[start_idx];
-strncpy(URLstart, URL, start_idx - 2);
+strncpy(URLstart, URL, start_idx - 1);
URLstart[start_idx - 1] = '\0';
fc_snprintf(baseURL, sizeof(baseURL), %s%s,
URLstart, baseURLpart + 1);
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r24803 - in /trunk: ./ ai/default/ client/ common/ doc/
Author: jtn Date: Fri Apr 25 21:20:54 2014 New Revision: 24803 URL: http://svn.gna.org/viewcvs/freeciv?rev=24803view=rev Log: Add Team requirement range. See gna patch #4388. Modified: trunk/ai/default/aicity.c trunk/client/helpdata.c trunk/common/metaknowledge.c trunk/common/requirements.c trunk/common/requirements.h trunk/doc/README.effects trunk/fc_version [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/ai/default/aicity.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aicity.c?rev=24803r1=24802r2=24803view=diff Modified: trunk/client/helpdata.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/helpdata.c?rev=24803r1=24802r2=24803view=diff Modified: trunk/common/metaknowledge.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/metaknowledge.c?rev=24803r1=24802r2=24803view=diff Modified: trunk/common/requirements.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/requirements.c?rev=24803r1=24802r2=24803view=diff Modified: trunk/common/requirements.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/requirements.h?rev=24803r1=24802r2=24803view=diff Modified: trunk/doc/README.effects URL: http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.effects?rev=24803r1=24802r2=24803view=diff Modified: trunk/fc_version URL: http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=24803r1=24802r2=24803view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
