zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge https://github.com/rheit/zdoom

This commit is contained in:
Rachael Alexanderson 2016-12-12 08:26:19 -05:00
parent 79ad5d2a2a f3762934e3
commit b50ff986a6
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/p_pspr.cpp
View File

@ -136,6 +136,7 @@ DPSprite::DPSprite(player_t *owner, AActor *caller, int id)
: x(.0), y(.0), : x(.0), y(.0),
oldx(.0), oldy(.0), oldx(.0), oldy(.0),
firstTic(true), firstTic(true),
Sprite(0),
Flags(0), Flags(0),
Caller(caller), Caller(caller),
Owner(owner), Owner(owner),

2
wadsrc/static/zscript/strife/strifefunctions.txt
View File

@ -164,7 +164,7 @@ extend class Actor
{ {
target = self; 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; target = self.target;
} }