Merge branch 'master' of https://github.com/coelckers/gzdoom into tex…

…ture_rework
ZDoom · May 19, 2020 · 58b3cb0 · 58b3cb0
2 parents 6e3ec96 + 53ea19c
commit 58b3cb0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/src/common/scripting/core/dictionary.cpp b/src/common/scripting/core/dictionary.cpp
@@ -43,7 +43,7 @@ void Dictionary::Serialize(FSerializer &arc)
 		Dictionary *pointerToDeserializedDictionary;
 		arc(key, pointerToDeserializedDictionary);
 		Map.TransferFrom(pointerToDeserializedDictionary->Map);
-		delete pointerToDeserializedDictionary;
+		pointerToDeserializedDictionary->Destroy();
 	}
 }
 

diff --git a/src/maploader/polyobjects.cpp b/src/maploader/polyobjects.cpp
@@ -331,7 +331,7 @@ void MapLoader::PO_Init (void)
 	TArray<FMapThing *> polythings;
 	for (auto &mthing : MapThingsConverted)
 	{
-		if (mthing.EdNum == 0 || mthing.EdNum == -1 || mthing.info == nullptr) continue;
+		if (mthing.EdNum == 0 || mthing.EdNum == -1 || mthing.info == nullptr || mthing.info->Type != nullptr) continue;
 
 		FDoomEdEntry *mentry = mthing.info;
 		switch (mentry->Special)

diff --git a/wadsrc/static/zscript/actors/inventory/powerups.zs b/wadsrc/static/zscript/actors/inventory/powerups.zs
@@ -356,7 +356,11 @@ class PowerInvulnerable : Powerup
 		{
 			return;
 		}
-
+		Owner.bInvulnerable = true;
+		if (Mode == 'Reflective')
+		{
+			Owner.bReflective = true;
+		}
 		if (Mode == 'Ghost')
 		{
 			if (!Owner.bShadow)

diff --git a/wadsrc/static/zscript/actors/shared/camera.zs b/wadsrc/static/zscript/actors/shared/camera.zs
@@ -63,14 +63,14 @@ class AimingCamera : SecurityCamera
 
 		args[2] = 0;
 		Super.PostBeginPlay ();
-		MaxPitchChange = double(changepitch / TICRATE);
+		MaxPitchChange = double(changepitch) / TICRATE;
 		Range /= TICRATE;
 
 		ActorIterator it = Level.CreateActorIterator(args[3]);
 		tracer = it.Next ();
 		if (tracer == NULL)
 		{
-			//Printf ("AimingCamera %d: Can't find TID %d\n", tid, args[3]);
+			console.Printf ("AimingCamera %d: Can't find TID %d\n", tid, args[3]);
 		}
 		else
 		{ // Don't try for a new target upon losing this one.