OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Fix duplication of SWWMGlobals on map change.

Browse source
This commit is contained in:
Mari the Deer 2023-07-01 14:10:36 +02:00
commit 06c3aec3b4
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
language.version
View file

@ -1,3 +1,3 @@
[default]
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r793 \cu(Mon 26 Jun 23:56:53 CEST 2023)\c-";
SWWM_SHORTVER="\cw1.3pre r793 \cu(2023-06-26 23:56:53)\c-";
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r794 \cu(Sat 1 Jul 14:30:33 CEST 2023)\c-";
SWWM_SHORTVER="\cw1.3pre r794 \cu(2023-07-01 14:30:33)\c-";

2
zscript/handler/swwm_handler.zsc
View file

@ -150,8 +150,6 @@ Class SWWMHandler : EventHandler
while ( sv = si.Next() ) funtagsv.Push(sv);
si = ServiceIterator.Find("MergeMonsterService");
while ( sv = si.Next() ) mergemonstersv.Push(sv);
// session globals
gdat = SWWMGlobals.Get();
// start profiling
if ( swwm_profstart <= 0 ) return;
bprofiletics = profiletics = swwm_profstart;

3
zscript/handler/swwm_handler_worldload.zsc
View file

@ -324,6 +324,9 @@ extend Class SWWMHandler
override void WorldLoaded( WorldEvent e )
{
// session globals must be loaded here
// (if we do it in OnRegister the existing thinker might not have been deserialized yet)
gdat = SWWMGlobals.Get();
if ( e.IsReopen ) return;
MapStartDialogues();
if ( gamestate != GS_TITLELEVEL )