From f8ba5c7b1fe907fc69d334ee15d227349962f461 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Fri, 9 Jun 2017 06:22:24 -0400 Subject: [PATCH 1/3] - fixed: Updating your sigil (Strife) should not override the number of 'deselect' pieces you have when swapping to another weapon. --- wadsrc/static/zscript/strife/sigil.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/wadsrc/static/zscript/strife/sigil.txt b/wadsrc/static/zscript/strife/sigil.txt index bfdcae77a..77ebbfe1c 100644 --- a/wadsrc/static/zscript/strife/sigil.txt +++ b/wadsrc/static/zscript/strife/sigil.txt @@ -203,6 +203,7 @@ class Sigil : Weapon } PSprite pspr = player.GetPSprite(PSP_WEAPON); pspr.SetState(pspr.CurState + invoker.health); + invoker.downpieces = 0; } //============================================================================ From 7a29128f6b6319687b256f91d6429db7ce37c9b3 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Fri, 9 Jun 2017 14:08:26 +0300 Subject: [PATCH 2/3] Fixed menu class replacement https://forum.zdoom.org/viewtopic.php?t=56824 --- src/menu/menudef.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/menu/menudef.cpp b/src/menu/menudef.cpp index 25cf6b8f8..37ca2fc0a 100644 --- a/src/menu/menudef.cpp +++ b/src/menu/menudef.cpp @@ -512,7 +512,7 @@ static void ParseListMenuBody(FScanner &sc, DListMenuDescriptor *desc) static bool CheckCompatible(DMenuDescriptor *newd, DMenuDescriptor *oldd) { if (oldd->mClass == nullptr) return true; - return oldd->mClass == newd->mClass; + return newd->mClass->IsDescendantOf(oldd->mClass); } static bool ReplaceMenu(FScanner &sc, DMenuDescriptor *desc) From 99d89f07302e6334fd5dc58f6c4f363eb081ac6d Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Fri, 9 Jun 2017 15:08:01 +0300 Subject: [PATCH 3/3] Fixed position of Targeter's markers during wearing out https://forum.zdoom.org/viewtopic.php?t=56811 --- wadsrc/static/zscript/inventory/powerups.txt | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/wadsrc/static/zscript/inventory/powerups.txt b/wadsrc/static/zscript/inventory/powerups.txt index 055fd518f..6fb35b067 100644 --- a/wadsrc/static/zscript/inventory/powerups.txt +++ b/wadsrc/static/zscript/inventory/powerups.txt @@ -1295,6 +1295,9 @@ class PowerTargeter : Powerup InitEffect (); } + const POS_X = 160 - 3; + const POS_Y = 100 - 3; + override void InitEffect () { // Why is this called when the inventory isn't even attached yet @@ -1318,10 +1321,10 @@ class PowerTargeter : Powerup player.SetPsprite(PSprite.TARGETRIGHT, stat + 2); } - player.GetPSprite(PSprite.TARGETCENTER).x = (160-3); - player.GetPSprite(PSprite.TARGETCENTER).y = - player.GetPSprite(PSprite.TARGETLEFT).y = - player.GetPSprite(PSprite.TARGETRIGHT).y = (100-3); + PSprite center = player.GetPSprite(PSprite.TARGETCENTER); + center.x = POS_X; + center.y = POS_Y; + PositionAccuracy (); } @@ -1397,8 +1400,13 @@ class PowerTargeter : Powerup if (player != null) { - player.GetPSprite(PSprite.TARGETLEFT).x = (160-3) - ((100 - player.mo.accuracy)); - player.GetPSprite(PSprite.TARGETRIGHT).x = (160-3)+ ((100 - player.mo.accuracy)); + PSprite left = player.GetPSprite(PSprite.TARGETLEFT); + left.x = POS_X - (100 - player.mo.accuracy); + left.y = POS_Y; + + PSprite right = player.GetPSprite(PSprite.TARGETRIGHT); + right.x = POS_X + (100 - player.mo.accuracy); + right.y = POS_Y; } }