Author: cazfi
Date: Fri Jan 8 08:54:22 2016
New Revision: 31409
URL: http://svn.gna.org/viewcvs/freeciv?rev=31409&view=rev
Log:
Add version number of the freeciv that created the save also to [scenario] in
case of scenarios
for fast lookup.
See patch #6756
Modified:
branches/S2_6/data/scenarios/british-isles-85x80-v2.80.sav
branches/S2_6/data/scenarios/earth-160x90-v2.sav
branches/S2_6/data/scenarios/earth-80x50-v3.sav
branches/S2_6/data/scenarios/europe-200x100-v2.sav
branches/S2_6/data/scenarios/france-140x90-v2.sav
branches/S2_6/data/scenarios/hagworld-120x60-v1.2.sav
branches/S2_6/data/scenarios/iberian-peninsula-136x100-v1.0.sav
branches/S2_6/data/scenarios/italy-100x100-v1.5.sav
branches/S2_6/data/scenarios/japan-88x100-v1.3.sav
branches/S2_6/data/scenarios/north_america_116x100-v1.2.sav
branches/S2_6/data/scenarios/tileset-demo.sav
branches/S2_6/data/scenarios/tutorial.sav
branches/S2_6/server/savegame2.c
Modified: branches/S2_6/data/scenarios/british-isles-85x80-v2.80.sav
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/scenarios/british-isles-85x80-v2.80.sav?rev=31409&r1=31408&r2=31409&view=diff
==============================================================================
--- branches/S2_6/data/scenarios/british-isles-85x80-v2.80.sav (original)
+++ branches/S2_6/data/scenarios/british-isles-85x80-v2.80.sav Fri Jan 8
08:54:22 2016
@@ -1,6 +1,7 @@
[scenario]
is_scenario=TRUE
+game_version=20599
name=_("British Isles (classic/medium)")
description=_("Classic-style 85x80 map of the British Isles.")
save_random=FALSE
Modified: branches/S2_6/data/scenarios/earth-160x90-v2.sav
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/scenarios/earth-160x90-v2.sav?rev=31409&r1=31408&r2=31409&view=diff
==============================================================================
--- branches/S2_6/data/scenarios/earth-160x90-v2.sav (original)
+++ branches/S2_6/data/scenarios/earth-160x90-v2.sav Fri Jan 8 08:54:22 2016
@@ -1,6 +1,7 @@
[scenario]
is_scenario=TRUE
+game_version=20599
name=_("Earth (classic/large)")
description=_("Classic-style 160x90 map of the Earth.")
save_random=FALSE
Modified: branches/S2_6/data/scenarios/earth-80x50-v3.sav
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/scenarios/earth-80x50-v3.sav?rev=31409&r1=31408&r2=31409&view=diff
==============================================================================
--- branches/S2_6/data/scenarios/earth-80x50-v3.sav (original)
+++ branches/S2_6/data/scenarios/earth-80x50-v3.sav Fri Jan 8 08:54:22 2016
@@ -1,6 +1,7 @@
[scenario]
is_scenario=TRUE
+game_version=20599
name=_("Earth (classic/small)")
description=_("Classic-style 80x50 map of the Earth.")
save_random=FALSE
Modified: branches/S2_6/data/scenarios/europe-200x100-v2.sav
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/scenarios/europe-200x100-v2.sav?rev=31409&r1=31408&r2=31409&view=diff
==============================================================================
--- branches/S2_6/data/scenarios/europe-200x100-v2.sav (original)
+++ branches/S2_6/data/scenarios/europe-200x100-v2.sav Fri Jan 8 08:54:22 2016
@@ -1,6 +1,7 @@
[scenario]
is_scenario=TRUE
+game_version=20599
name=_("Europe (classic/giant)")
description=_("Classic-style 200x100 map of Europe.")
players=FALSE
Modified: branches/S2_6/data/scenarios/france-140x90-v2.sav
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/scenarios/france-140x90-v2.sav?rev=31409&r1=31408&r2=31409&view=diff
==============================================================================
--- branches/S2_6/data/scenarios/france-140x90-v2.sav (original)
+++ branches/S2_6/data/scenarios/france-140x90-v2.sav Fri Jan 8 08:54:22 2016
@@ -1,6 +1,7 @@
[scenario]
is_scenario=TRUE
+game_version=20599
name=_("France (classic/large)")
description=_("Classic-style 140x90 map of France.")
save_random=FALSE
Modified: branches/S2_6/data/scenarios/hagworld-120x60-v1.2.sav
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/scenarios/hagworld-120x60-v1.2.sav?rev=31409&r1=31408&r2=31409&view=diff
==============================================================================
--- branches/S2_6/data/scenarios/hagworld-120x60-v1.2.sav (original)
+++ branches/S2_6/data/scenarios/hagworld-120x60-v1.2.sav Fri Jan 8
08:54:22 2016
@@ -1,6 +1,7 @@
[scenario]
is_scenario=TRUE
+game_version=20599
name=_("Earth (classic/medium)")
description=_("Classic-style 120x60 map of the Earth.")
save_random=FALSE
Modified: branches/S2_6/data/scenarios/iberian-peninsula-136x100-v1.0.sav
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/scenarios/iberian-peninsula-136x100-v1.0.sav?rev=31409&r1=31408&r2=31409&view=diff
==============================================================================
--- branches/S2_6/data/scenarios/iberian-peninsula-136x100-v1.0.sav
(original)
+++ branches/S2_6/data/scenarios/iberian-peninsula-136x100-v1.0.sav Fri Jan
8 08:54:22 2016
@@ -1,6 +1,7 @@
[scenario]
is_scenario=TRUE
+game_version=20599
name=_("Iberian Peninsula (classic/large)")
description=_("Classic-style 136x100 map of the Iberian Peninsula (modern-day
Spain and Portugal).")
save_random=FALSE
Modified: branches/S2_6/data/scenarios/italy-100x100-v1.5.sav
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/scenarios/italy-100x100-v1.5.sav?rev=31409&r1=31408&r2=31409&view=diff
==============================================================================
--- branches/S2_6/data/scenarios/italy-100x100-v1.5.sav (original)
+++ branches/S2_6/data/scenarios/italy-100x100-v1.5.sav Fri Jan 8 08:54:22 2016
@@ -1,6 +1,7 @@
[scenario]
is_scenario=TRUE
+game_version=20599
name=_("Italy (classic/medium)")
description=_("Classic-style 100x100 map of Italy.")
save_random=FALSE
Modified: branches/S2_6/data/scenarios/japan-88x100-v1.3.sav
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/scenarios/japan-88x100-v1.3.sav?rev=31409&r1=31408&r2=31409&view=diff
==============================================================================
--- branches/S2_6/data/scenarios/japan-88x100-v1.3.sav (original)
+++ branches/S2_6/data/scenarios/japan-88x100-v1.3.sav Fri Jan 8 08:54:22 2016
@@ -1,6 +1,7 @@
[scenario]
is_scenario=TRUE
+game_version=20599
name=_("Japan (classic/medium)")
description=_("Classic-style 88x100 map of Japan.")
save_random=FALSE
Modified: branches/S2_6/data/scenarios/north_america_116x100-v1.2.sav
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/scenarios/north_america_116x100-v1.2.sav?rev=31409&r1=31408&r2=31409&view=diff
==============================================================================
--- branches/S2_6/data/scenarios/north_america_116x100-v1.2.sav (original)
+++ branches/S2_6/data/scenarios/north_america_116x100-v1.2.sav Fri Jan 8
08:54:22 2016
@@ -1,6 +1,7 @@
[scenario]
is_scenario=TRUE
+game_version=20599
name=_("North America (classic/medium)")
description=_("Classic-style 116x100 map of North America.")
save_random=FALSE
Modified: branches/S2_6/data/scenarios/tileset-demo.sav
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/scenarios/tileset-demo.sav?rev=31409&r1=31408&r2=31409&view=diff
==============================================================================
--- branches/S2_6/data/scenarios/tileset-demo.sav (original)
+++ branches/S2_6/data/scenarios/tileset-demo.sav Fri Jan 8 08:54:22 2016
@@ -1,6 +1,7 @@
[scenario]
is_scenario=TRUE
+game_version=20599
save_random=TRUE
players=TRUE
startpos_nations=FALSE
Modified: branches/S2_6/data/scenarios/tutorial.sav
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/scenarios/tutorial.sav?rev=31409&r1=31408&r2=31409&view=diff
==============================================================================
--- branches/S2_6/data/scenarios/tutorial.sav (original)
+++ branches/S2_6/data/scenarios/tutorial.sav Fri Jan 8 08:54:22 2016
@@ -1,6 +1,7 @@
[scenario]
is_scenario=TRUE
+game_version=20599
name=_("Tutorial")
description=_("Play this tutorial scenario to get an introduction to Freeciv.")
save_random=FALSE
Modified: branches/S2_6/server/savegame2.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/savegame2.c?rev=31409&r1=31408&r2=31409&view=diff
==============================================================================
--- branches/S2_6/server/savegame2.c (original)
+++ branches/S2_6/server/savegame2.c Fri Jan 8 08:54:22 2016
@@ -2633,6 +2633,7 @@
static void sg_save_scenario(struct savedata *saving)
{
struct entry *mod_entry;
+ int game_version;
/* Check status and return if not OK (sg_success != TRUE). */
sg_check_ret();
@@ -2643,6 +2644,9 @@
}
secfile_insert_bool(saving->file, TRUE, "scenario.is_scenario");
+
+ game_version = MAJOR_VERSION * 10000 + MINOR_VERSION * 100 + PATCH_VERSION;
+ secfile_insert_int(saving->file, game_version, "scenario.game_version");
/* Name is mandatory to the level that is saved even if empty. */
mod_entry = secfile_insert_str(saving->file, game.scenario.name,
"scenario.name");
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
