From b70bc2b152d85dc98c352d7a8dabcdb00111cef3 Mon Sep 17 00:00:00 2001 From: Major Cooke Date: Sat, 9 May 2020 16:16:45 -0500 Subject: [PATCH 1/6] Fixed an issue where multiple invulnerability powerups could cancel each other out from just one expiring. --- wadsrc/static/zscript/actors/inventory/powerups.zs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wadsrc/static/zscript/actors/inventory/powerups.zs b/wadsrc/static/zscript/actors/inventory/powerups.zs index 6ac852aba0..aaea851425 100644 --- a/wadsrc/static/zscript/actors/inventory/powerups.zs +++ b/wadsrc/static/zscript/actors/inventory/powerups.zs @@ -356,7 +356,7 @@ class PowerInvulnerable : Powerup { return; } - + Owner.bInvulnerable = true; if (Mode == 'Ghost') { if (!Owner.bShadow) From 079e7ee4e9760a66ca830d4c803075db293dfd90 Mon Sep 17 00:00:00 2001 From: Major Cooke Date: Sat, 9 May 2020 16:44:23 -0500 Subject: [PATCH 2/6] Enforce the reflective flag as well. --- wadsrc/static/zscript/actors/inventory/powerups.zs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wadsrc/static/zscript/actors/inventory/powerups.zs b/wadsrc/static/zscript/actors/inventory/powerups.zs index aaea851425..157fab1b22 100644 --- a/wadsrc/static/zscript/actors/inventory/powerups.zs +++ b/wadsrc/static/zscript/actors/inventory/powerups.zs @@ -357,6 +357,10 @@ class PowerInvulnerable : Powerup return; } Owner.bInvulnerable = true; + if (Mode == 'Reflective') + { + Owner.bReflective = true; + } if (Mode == 'Ghost') { if (!Owner.bShadow) From 0631670a66800c7af47ac06e434b363c101620c6 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Mon, 18 May 2020 13:58:22 +0300 Subject: [PATCH 3/6] - restored warning about missing aiming camera target --- wadsrc/static/zscript/actors/shared/camera.zs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wadsrc/static/zscript/actors/shared/camera.zs b/wadsrc/static/zscript/actors/shared/camera.zs index 91923b1335..74d0a4b398 100644 --- a/wadsrc/static/zscript/actors/shared/camera.zs +++ b/wadsrc/static/zscript/actors/shared/camera.zs @@ -70,7 +70,7 @@ class AimingCamera : SecurityCamera 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. From 1fd2ea46d216398f44c4ec5ff73987843c74957f Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Mon, 18 May 2020 14:00:48 +0300 Subject: [PATCH 4/6] - fixed aiming camera that didn't follow target https://forum.zdoom.org/viewtopic.php?t=68600 --- wadsrc/static/zscript/actors/shared/camera.zs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wadsrc/static/zscript/actors/shared/camera.zs b/wadsrc/static/zscript/actors/shared/camera.zs index 74d0a4b398..d9e579284b 100644 --- a/wadsrc/static/zscript/actors/shared/camera.zs +++ b/wadsrc/static/zscript/actors/shared/camera.zs @@ -63,7 +63,7 @@ class AimingCamera : SecurityCamera args[2] = 0; Super.PostBeginPlay (); - MaxPitchChange = double(changepitch / TICRATE); + MaxPitchChange = double(changepitch) / TICRATE; Range /= TICRATE; ActorIterator it = Level.CreateActorIterator(args[3]); From dd40778c75796511804f66334ac2544a96e365eb Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Mon, 18 May 2020 17:48:10 +0300 Subject: [PATCH 5/6] - fixed map things erroneously treated as polyobject anchors/spots https://forum.zdoom.org/viewtopic.php?t=68601 --- src/maploader/polyobjects.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/maploader/polyobjects.cpp b/src/maploader/polyobjects.cpp index 3c0a567adb..d1516e84b8 100644 --- a/src/maploader/polyobjects.cpp +++ b/src/maploader/polyobjects.cpp @@ -331,7 +331,7 @@ void MapLoader::PO_Init (void) TArray 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) From 53ea19c6a8cdc92a62985398f175f245f4439a8b Mon Sep 17 00:00:00 2001 From: Alexander Kromm Date: Mon, 18 May 2020 22:47:11 +0700 Subject: [PATCH 6/6] fix "'ictionary' is freed outside the GC process" warning --- src/common/scripting/core/dictionary.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/scripting/core/dictionary.cpp b/src/common/scripting/core/dictionary.cpp index b8dacd2bcd..b3d78d0cc3 100644 --- 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(); } }