From 56a42a26b2dc85abd4d957604171516819bbbef8 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 12 Dec 2016 12:32:48 +0100 Subject: [PATCH 1/2] - fixed: DPSprite's constructor did not initialize the 'Sprite' member variable. This can cause problems if some weapon starts with a placeholder sprite in the first state. --- src/p_pspr.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/p_pspr.cpp b/src/p_pspr.cpp index 3ef74da73..238412bb6 100644 --- a/src/p_pspr.cpp +++ b/src/p_pspr.cpp @@ -136,6 +136,7 @@ DPSprite::DPSprite(player_t *owner, AActor *caller, int id) : x(.0), y(.0), oldx(.0), oldy(.0), firstTic(true), + Sprite(0), Flags(0), Caller(caller), Owner(owner), From f3762934e3d314105a3a67351845a37c26b550a8 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 12 Dec 2016 12:50:17 +0100 Subject: [PATCH 2/2] - fixed: A_AlertMonsters lost one 'self.' during conversion. --- wadsrc/static/zscript/strife/strifefunctions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wadsrc/static/zscript/strife/strifefunctions.txt b/wadsrc/static/zscript/strife/strifefunctions.txt index 3a0dec22f..ed6c3854e 100644 --- a/wadsrc/static/zscript/strife/strifefunctions.txt +++ b/wadsrc/static/zscript/strife/strifefunctions.txt @@ -164,7 +164,7 @@ extend class Actor { target = self; } - else if (target != null && (self.target.player != null || (Flags & AMF_TARGETNONPLAYER))) + else if (self.target != null && (self.target.player != null || (Flags & AMF_TARGETNONPLAYER))) { target = self.target; }