- fixed: 'level.frozen' still needs to be writable and have an effect.

coelckers · Feb 8, 2019 · 449610496fb117358b1de229407f55880fcb47e4 · 4496104
1 parent 584dae8
commit 449610496fb117358b1de229407f55880fcb47e4
Unified Split

Showing with 3 additions and 6 deletions.

+1 −1 src/g_levellocals.h

+1 −1 src/gamedata/g_mapinfo.h

+1 −4 src/scripting/vmthunks.cpp
diff --git a/src/g_levellocals.h b/src/g_levellocals.h
@@ -618,7 +618,7 @@ struct FLevelLocals
 	bool		FromSnapshot;			// The current map was restored from a snapshot
 	bool		HasHeightSecs;			// true if some Transfer_Heights effects are present in the map. If this is false, some checks in the renderer can be shortcut.
 	bool		HasDynamicLights;		// Another render optimization for maps with no lights at all.
-  
-	uint8_t		frozenstate;
+  
+	int		frozenstate;
 	double		teamdamage;

diff --git a/src/gamedata/g_mapinfo.h b/src/gamedata/g_mapinfo.h
@@ -201,7 +201,7 @@ enum ELevelFlags : unsigned int
 	LEVEL2_LAXACTIVATIONMAPINFO	= 0x00000008,	// LEVEL_LAXMONSTERACTIVATION is not a default.
 	LEVEL2_MISSILESACTIVATEIMPACT=0x00000010,	// Missiles are the activators of SPAC_IMPACT events, not their shooters
-  
-	LEVEL2_FROZEN				= 0x00000020,	// Game is frozen by a TimeFreezer
+  
+	//							= 0x00000020,	// unused
 	LEVEL2_KEEPFULLINVENTORY	= 0x00000040,	// doesn't reduce the amount of inventory items to 1

diff --git a/src/scripting/vmthunks.cpp b/src/scripting/vmthunks.cpp
@@ -2797,9 +2797,6 @@ DEFINE_ACTION_FUNCTION_NATIVE(FLevelLocals, isFrozen, isFrozen)
 void setFrozen(FLevelLocals *self, int on)
 {
 	self->frozenstate = (self->frozenstate & ~1) | !!on;
-  
-	// For compatibility. The engine itself never checks this.
-  
-	if (on) self->flags2 |= LEVEL2_FROZEN;
-  
-	else  self->flags2 &= ~LEVEL2_FROZEN;
 }
 DEFINE_ACTION_FUNCTION_NATIVE(FLevelLocals, setFrozen, setFrozen)
@@ -2889,6 +2886,7 @@ DEFINE_FIELD(FLevelLocals, outsidefogdensity)
 DEFINE_FIELD(FLevelLocals, skyfog)
 DEFINE_FIELD(FLevelLocals, pixelstretch)
 DEFINE_FIELD(FLevelLocals, deathsequence)
+  
+DEFINE_FIELD_BIT(FLevelLocals, frozenstate, frozen, 1)	// still needed for backwards compatibility.
 DEFINE_FIELD_BIT(FLevelLocals, flags, noinventorybar, LEVEL_NOINVENTORYBAR)
 DEFINE_FIELD_BIT(FLevelLocals, flags, monsterstelefrag, LEVEL_MONSTERSTELEFRAG)
@@ -2901,7 +2899,6 @@ DEFINE_FIELD_BIT(FLevelLocals, flags2, checkswitchrange, LEVEL2_CHECKSWITCHRANGE
 DEFINE_FIELD_BIT(FLevelLocals, flags2, polygrind, LEVEL2_POLYGRIND)
 DEFINE_FIELD_BIT(FLevelLocals, flags2, allowrespawn, LEVEL2_ALLOWRESPAWN)
 DEFINE_FIELD_BIT(FLevelLocals, flags2, nomonsters, LEVEL2_NOMONSTERS)
-  
-DEFINE_FIELD_BIT(FLevelLocals, flags2, frozen, LEVEL2_FROZEN)
 DEFINE_FIELD_BIT(FLevelLocals, flags2, infinite_flight, LEVEL2_INFINITE_FLIGHT)
 DEFINE_FIELD_BIT(FLevelLocals, flags2, no_dlg_freeze, LEVEL2_CONV_SINGLE_UNFREEZE)
 DEFINE_FIELD_BIT(FLevelLocals, flags2, keepfullinventory, LEVEL2_KEEPFULLINVENTORY)