Author: cazfi Date: Thu Feb 11 14:32:48 2016 New Revision: 31873 URL: http://svn.gna.org/viewcvs/freeciv?rev=31873&view=rev Log: Make version numbers in savegame3 100 times bigger
See patch #6935 Modified: trunk/server/savecompat.c trunk/server/savegame3.c Modified: trunk/server/savecompat.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/savecompat.c?rev=31873&r1=31872&r2=31873&view=diff ============================================================================== --- trunk/server/savecompat.c (original) +++ trunk/server/savecompat.c Thu Feb 11 14:32:48 2016 @@ -1312,9 +1312,13 @@ } } + if (game_version < 1000000) { + game_version *= 100; + } + nplayers = secfile_lookup_int_default(loading->file, 0, "players.nplayers"); - if (game_version < 29100) { + if (game_version < 2910000) { /* Early 3.0 development version save. */ /* Rename "random.save" as "random.saved", if not already saved by later name */ Modified: trunk/server/savegame3.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame3.c?rev=31873&r1=31872&r2=31873&view=diff ============================================================================== --- trunk/server/savegame3.c (original) +++ trunk/server/savegame3.c Thu Feb 11 14:32:48 2016 @@ -2143,7 +2143,8 @@ /* Load version. */ game_version = secfile_lookup_int_default(loading->file, 0, "scenario.game_version"); - /* We require at least version 2.90.99 */ + /* We require at least version 2.90.99 - and at that time we saved version + * numbers as 10000*MAJOR+100*MINOR+PATCH */ sg_failure_ret(29099 <= game_version, "Saved game is too old, at least " "version 2.90.99 required."); @@ -2218,7 +2219,7 @@ /* Check status and return if not OK (sg_success != TRUE). */ sg_check_ret(); - game_version = MAJOR_VERSION * 10000 + MINOR_VERSION * 100 + PATCH_VERSION; + game_version = MAJOR_VERSION * 1000000 + MINOR_VERSION * 10000 + PATCH_VERSION * 100; secfile_insert_int(saving->file, game_version, "scenario.game_version"); if (!saving->scenario || !game.scenario.is_scenario) { _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits