Author: cazfi
Date: Sat Mar 12 19:08:17 2016
New Revision: 32232
URL: http://svn.gna.org/viewcvs/freeciv?rev=32232&view=rev
Log:
S2_6 d3f related updated for trunk.
- Version number in supplied scenarios set to match 2.6 format
- "+Freeciv-2.6-ruleset" as the compatibility ruleset capstring
- Set soundset and musicset capability strings to stable 2.6 value
See task #7814
Modified:
trunk/client/audio.c
trunk/data/scenarios/british-isles-85x80-v2.80.sav
trunk/data/scenarios/earth-160x90-v2.sav
trunk/data/scenarios/earth-80x50-v3.sav
trunk/data/scenarios/europe-200x100-v2.sav
trunk/data/scenarios/france-140x90-v2.sav
trunk/data/scenarios/hagworld-120x60-v1.2.sav
trunk/data/scenarios/iberian-peninsula-136x100-v1.0.sav
trunk/data/scenarios/italy-100x100-v1.5.sav
trunk/data/scenarios/japan-88x100-v1.3.sav
trunk/data/scenarios/north_america_116x100-v1.2.sav
trunk/data/scenarios/tileset-demo.sav
trunk/data/scenarios/tutorial.sav
trunk/data/stdmusic.musicspec
trunk/data/stdsounds.soundspec
trunk/server/rscompat.h
Modified: trunk/client/audio.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/audio.c?rev=32232&r1=32231&r2=32232&view=diff
==============================================================================
--- trunk/client/audio.c (original)
+++ trunk/client/audio.c Sat Mar 12 19:08:17 2016
@@ -44,8 +44,8 @@
#define SNDSPEC_SUFFIX ".soundspec"
#define MUSICSPEC_SUFFIX ".musicspec"
-#define SOUNDSPEC_CAPSTR "+Freeciv-soundspec-Devel-2014.Mar.13"
-#define MUSICSPEC_CAPSTR "+Freeciv-musicspec-Devel-2014.Mar.13"
+#define SOUNDSPEC_CAPSTR "+Freeciv-2.6-soundset"
+#define MUSICSPEC_CAPSTR "+Freeciv-2.6-musicset"
/* keep it open throughout */
static struct section_file *ss_tagfile = NULL;
Modified: trunk/data/scenarios/british-isles-85x80-v2.80.sav
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/scenarios/british-isles-85x80-v2.80.sav?rev=32232&r1=32231&r2=32232&view=diff
==============================================================================
--- trunk/data/scenarios/british-isles-85x80-v2.80.sav (original)
+++ trunk/data/scenarios/british-isles-85x80-v2.80.sav Sat Mar 12 19:08:17 2016
@@ -1,7 +1,7 @@
[scenario]
is_scenario=TRUE
-game_version=20599
+game_version=20600
name=_("British Isles (classic/medium)")
description=_("Classic-style 85x80 map of the British Isles.")
save_random=FALSE
@@ -51,7 +51,7 @@
}
[game]
-version=20599
+version=20600
server_state="S_S_INITIAL"
meta_patches="none"
meta_usermessage=TRUE
Modified: trunk/data/scenarios/earth-160x90-v2.sav
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/scenarios/earth-160x90-v2.sav?rev=32232&r1=32231&r2=32232&view=diff
==============================================================================
--- trunk/data/scenarios/earth-160x90-v2.sav (original)
+++ trunk/data/scenarios/earth-160x90-v2.sav Sat Mar 12 19:08:17 2016
@@ -1,7 +1,7 @@
[scenario]
is_scenario=TRUE
-game_version=20599
+game_version=20600
name=_("Earth (classic/large)")
description=_("Classic-style 160x90 map of the Earth.")
save_random=FALSE
@@ -51,7 +51,7 @@
}
[game]
-version=20599
+version=20600
server_state="S_S_INITIAL"
meta_patches="none"
meta_usermessage=TRUE
Modified: trunk/data/scenarios/earth-80x50-v3.sav
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/scenarios/earth-80x50-v3.sav?rev=32232&r1=32231&r2=32232&view=diff
==============================================================================
--- trunk/data/scenarios/earth-80x50-v3.sav (original)
+++ trunk/data/scenarios/earth-80x50-v3.sav Sat Mar 12 19:08:17 2016
@@ -1,7 +1,7 @@
[scenario]
is_scenario=TRUE
-game_version=20599
+game_version=20600
name=_("Earth (classic/small)")
description=_("Classic-style 80x50 map of the Earth.")
save_random=FALSE
@@ -51,7 +51,7 @@
}
[game]
-version=20599
+version=20600
server_state="S_S_INITIAL"
meta_patches="none"
meta_usermessage=TRUE
Modified: trunk/data/scenarios/europe-200x100-v2.sav
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/scenarios/europe-200x100-v2.sav?rev=32232&r1=32231&r2=32232&view=diff
==============================================================================
--- trunk/data/scenarios/europe-200x100-v2.sav (original)
+++ trunk/data/scenarios/europe-200x100-v2.sav Sat Mar 12 19:08:17 2016
@@ -1,7 +1,7 @@
[scenario]
is_scenario=TRUE
-game_version=20599
+game_version=20600
name=_("Europe (classic/giant)")
description=_("Classic-style 200x100 map of Europe.")
save_random=FALSE
@@ -51,7 +51,7 @@
}
[game]
-version=20599
+version=20600
server_state="S_S_INITIAL"
meta_patches="none"
meta_usermessage=TRUE
Modified: trunk/data/scenarios/france-140x90-v2.sav
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/scenarios/france-140x90-v2.sav?rev=32232&r1=32231&r2=32232&view=diff
==============================================================================
--- trunk/data/scenarios/france-140x90-v2.sav (original)
+++ trunk/data/scenarios/france-140x90-v2.sav Sat Mar 12 19:08:17 2016
@@ -1,7 +1,7 @@
[scenario]
is_scenario=TRUE
-game_version=20599
+game_version=20600
name=_("France (classic/large)")
description=_("Classic-style 140x90 map of France.")
save_random=FALSE
@@ -51,7 +51,7 @@
}
[game]
-version=20599
+version=20600
server_state="S_S_INITIAL"
meta_patches="none"
meta_usermessage=TRUE
Modified: trunk/data/scenarios/hagworld-120x60-v1.2.sav
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/scenarios/hagworld-120x60-v1.2.sav?rev=32232&r1=32231&r2=32232&view=diff
==============================================================================
--- trunk/data/scenarios/hagworld-120x60-v1.2.sav (original)
+++ trunk/data/scenarios/hagworld-120x60-v1.2.sav Sat Mar 12 19:08:17 2016
@@ -1,7 +1,7 @@
[scenario]
is_scenario=TRUE
-game_version=20599
+game_version=20600
name=_("Earth (classic/medium)")
description=_("Classic-style 120x60 map of the Earth.")
save_random=FALSE
@@ -51,7 +51,7 @@
}
[game]
-version=20599
+version=20600
server_state="S_S_INITIAL"
meta_patches="none"
meta_usermessage=TRUE
Modified: trunk/data/scenarios/iberian-peninsula-136x100-v1.0.sav
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/scenarios/iberian-peninsula-136x100-v1.0.sav?rev=32232&r1=32231&r2=32232&view=diff
==============================================================================
--- trunk/data/scenarios/iberian-peninsula-136x100-v1.0.sav (original)
+++ trunk/data/scenarios/iberian-peninsula-136x100-v1.0.sav Sat Mar 12
19:08:17 2016
@@ -1,7 +1,7 @@
[scenario]
is_scenario=TRUE
-game_version=20599
+game_version=20600
name=_("Iberian Peninsula (classic/large)")
description=_("Classic-style 136x100 map of the Iberian Peninsula (modern-day
Spain and Portugal).")
save_random=FALSE
@@ -51,7 +51,7 @@
}
[game]
-version=20599
+version=20600
server_state="S_S_INITIAL"
meta_patches="none"
meta_usermessage=TRUE
Modified: trunk/data/scenarios/italy-100x100-v1.5.sav
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/scenarios/italy-100x100-v1.5.sav?rev=32232&r1=32231&r2=32232&view=diff
==============================================================================
--- trunk/data/scenarios/italy-100x100-v1.5.sav (original)
+++ trunk/data/scenarios/italy-100x100-v1.5.sav Sat Mar 12 19:08:17 2016
@@ -1,7 +1,7 @@
[scenario]
is_scenario=TRUE
-game_version=20599
+game_version=20600
name=_("Italy (classic/medium)")
description=_("Classic-style 100x100 map of Italy.")
save_random=FALSE
@@ -51,7 +51,7 @@
}
[game]
-version=20599
+version=20600
server_state="S_S_INITIAL"
meta_patches="none"
meta_usermessage=TRUE
Modified: trunk/data/scenarios/japan-88x100-v1.3.sav
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/scenarios/japan-88x100-v1.3.sav?rev=32232&r1=32231&r2=32232&view=diff
==============================================================================
--- trunk/data/scenarios/japan-88x100-v1.3.sav (original)
+++ trunk/data/scenarios/japan-88x100-v1.3.sav Sat Mar 12 19:08:17 2016
@@ -1,7 +1,7 @@
[scenario]
is_scenario=TRUE
-game_version=20599
+game_version=20600
name=_("Japan (classic/medium)")
description=_("Classic-style 88x100 map of Japan.")
save_random=FALSE
@@ -51,7 +51,7 @@
}
[game]
-version=20599
+version=20600
server_state="S_S_INITIAL"
meta_patches="none"
meta_usermessage=TRUE
Modified: trunk/data/scenarios/north_america_116x100-v1.2.sav
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/scenarios/north_america_116x100-v1.2.sav?rev=32232&r1=32231&r2=32232&view=diff
==============================================================================
--- trunk/data/scenarios/north_america_116x100-v1.2.sav (original)
+++ trunk/data/scenarios/north_america_116x100-v1.2.sav Sat Mar 12 19:08:17 2016
@@ -1,7 +1,7 @@
[scenario]
is_scenario=TRUE
-game_version=20599
+game_version=20600
name=_("North America (classic/medium)")
description=_("Classic-style 116x100 map of North America.")
save_random=FALSE
@@ -51,7 +51,7 @@
}
[game]
-version=20599
+version=20600
server_state="S_S_INITIAL"
meta_patches="none"
meta_usermessage=TRUE
Modified: trunk/data/scenarios/tileset-demo.sav
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/scenarios/tileset-demo.sav?rev=32232&r1=32231&r2=32232&view=diff
==============================================================================
--- trunk/data/scenarios/tileset-demo.sav (original)
+++ trunk/data/scenarios/tileset-demo.sav Sat Mar 12 19:08:17 2016
@@ -1,7 +1,7 @@
[scenario]
is_scenario=TRUE
-game_version=20599
+game_version=20600
name=_("Tileset Demo")
save_random=TRUE
players=TRUE
@@ -49,7 +49,7 @@
}
[game]
-version=20599
+version=20600
server_state="S_S_RUNNING"
meta_patches="none"
meta_usermessage=TRUE
Modified: trunk/data/scenarios/tutorial.sav
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/scenarios/tutorial.sav?rev=32232&r1=32231&r2=32232&view=diff
==============================================================================
--- trunk/data/scenarios/tutorial.sav (original)
+++ trunk/data/scenarios/tutorial.sav Sat Mar 12 19:08:17 2016
@@ -1,7 +1,7 @@
[scenario]
is_scenario=TRUE
-game_version=20599
+game_version=20600
name=_("Tutorial")
description=_("Play this tutorial scenario to get an introduction to Freeciv.\
This is intended for single-player games.")
@@ -52,7 +52,7 @@
}
[game]
-version=20599
+version=20600
server_state="S_S_INITIAL"
meta_patches=""
meta_usermessage=FALSE
Modified: trunk/data/stdmusic.musicspec
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/stdmusic.musicspec?rev=32232&r1=32231&r2=32232&view=diff
==============================================================================
--- trunk/data/stdmusic.musicspec (original)
+++ trunk/data/stdmusic.musicspec Sat Mar 12 19:08:17 2016
@@ -1,6 +1,6 @@
[musicspec]
; Format and options of this spec file:
-options = "+Freeciv-musicspec-Devel-2014.Mar.13"
+options = "+Freeciv-2.6-musicset"
[info]
artists = "\
Modified: trunk/data/stdsounds.soundspec
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/stdsounds.soundspec?rev=32232&r1=32231&r2=32232&view=diff
==============================================================================
--- trunk/data/stdsounds.soundspec (original)
+++ trunk/data/stdsounds.soundspec Sat Mar 12 19:08:17 2016
@@ -1,6 +1,6 @@
[soundspec]
; Format and options of this spec file:
-options = "+Freeciv-soundspec-Devel-2014.Mar.13"
+options = "+Freeciv-2.6-soundset"
[info]
artists = "\
Modified: trunk/server/rscompat.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/rscompat.h?rev=32232&r1=32231&r2=32232&view=diff
==============================================================================
--- trunk/server/rscompat.h (original)
+++ trunk/server/rscompat.h Sat Mar 12 19:08:17 2016
@@ -20,7 +20,7 @@
/* utility */
#include "support.h"
-#define RULESET_COMPAT_CAP "+Freeciv-ruleset-Devel-2014.September.14c"
+#define RULESET_COMPAT_CAP "+Freeciv-2.6-ruleset"
struct rscompat_info
{
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
