From 2c65d5b8f593d89615a54ee28a3ec28b5b86f2d5 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 25 Feb 2009 22:10:06 +0000 Subject: [PATCH] - fixed: level.flags2 was not stored in savegames. Also bumped min. savegame version and removed old compatibility handlings. SVN r1448 (trunk) --- docs/rh-log.txt | 6 +++++- src/d_netinfo.cpp | 5 ----- src/g_level.cpp | 1 + src/s_sound.cpp | 11 ++--------- src/version.h | 2 +- 5 files changed, 9 insertions(+), 16 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index a03e27750..f41067cd9 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,8 @@ -February 25, 2009 +February 25, 2009 (Changes by Graf Zahl) +- fixed: level.flags2 was not stored in savegames. Also bumped min. savegame + version and removed old compatibility handlings. + +February 25, 2009 - Removed the delay for starting all sounds from one tic at exactly the same DSP position. Without also synchronizing the stopping of sounds, it can cause problems with things like the chainsaw where the sound is stopped and diff --git a/src/d_netinfo.cpp b/src/d_netinfo.cpp index 3c94a4703..9cc4b14a6 100644 --- a/src/d_netinfo.cpp +++ b/src/d_netinfo.cpp @@ -806,11 +806,6 @@ FArchive &operator<< (FArchive &arc, userinfo_t &info) arc.Read (&info.netname, sizeof(info.netname)); } arc << info.team << info.aimdist << info.color << info.skin << info.gender << info.neverswitch; - if (SaveVersion >= 1333 && SaveVersion <= 1355) - { - int savedaimdist; - arc << savedaimdist; - } return arc; } diff --git a/src/g_level.cpp b/src/g_level.cpp index dbdb97c44..935b2de74 100644 --- a/src/g_level.cpp +++ b/src/g_level.cpp @@ -1400,6 +1400,7 @@ void G_SerializeLevel (FArchive &arc, bool hubLoad) int i = level.totaltime; arc << level.flags + << level.flags2 << level.fadeto << level.found_secrets << level.found_items diff --git a/src/s_sound.cpp b/src/s_sound.cpp index 2b6235391..ce604f5fe 100644 --- a/src/s_sound.cpp +++ b/src/s_sound.cpp @@ -2010,15 +2010,8 @@ static FArchive &operator<<(FArchive &arc, FSoundChan &chan) << chan.StartTime << chan.Rolloff.RolloffType << chan.Rolloff.MinDistance - << chan.Rolloff.MaxDistance; - - if (SaveVersion >= 1416) - { - arc << chan.LimitRange; - } - else - { - chan.LimitRange = 256*256; + << chan.Rolloff.MaxDistance + << chan.LimitRange; } if (arc.IsLoading()) diff --git a/src/version.h b/src/version.h index b11e719a2..ea6ff1034 100644 --- a/src/version.h +++ b/src/version.h @@ -75,7 +75,7 @@ // SAVESIG should match SAVEVER. // MINSAVEVER is the minimum level snapshot version that can be loaded. -#define MINSAVEVER 1393 +#define MINSAVEVER 1447 #if SVN_REVISION_NUMBER < MINSAVEVER // Never write a savegame with a version lower than what we need