zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-01-18 23:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge https://github.com/coelckers/gzdoom

Browse source
This commit is contained in:
Rachael Alexanderson 2017-06-10 01:00:38 -04:00
commit a48203ef1d
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/menu/menudef.cpp
View file

@ -512,7 +512,7 @@ static void ParseListMenuBody(FScanner &sc, DListMenuDescriptor *desc)
static bool CheckCompatible(DMenuDescriptor *newd, DMenuDescriptor *oldd) static bool CheckCompatible(DMenuDescriptor *newd, DMenuDescriptor *oldd)
{ {
if (oldd->mClass == nullptr) return true; if (oldd->mClass == nullptr) return true;
return oldd->mClass == newd->mClass; return newd->mClass->IsDescendantOf(oldd->mClass);
} }
static bool ReplaceMenu(FScanner &sc, DMenuDescriptor *desc) static bool ReplaceMenu(FScanner &sc, DMenuDescriptor *desc)

20
wadsrc/static/zscript/inventory/powerups.txt
View file

@ -1295,6 +1295,9 @@ class PowerTargeter : Powerup
InitEffect (); InitEffect ();
} }
const POS_X = 160 - 3;
const POS_Y = 100 - 3;
override void InitEffect () override void InitEffect ()
{ {
// Why is this called when the inventory isn't even attached yet // 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.SetPsprite(PSprite.TARGETRIGHT, stat + 2);
} }
player.GetPSprite(PSprite.TARGETCENTER).x = (160-3); PSprite center = player.GetPSprite(PSprite.TARGETCENTER);
player.GetPSprite(PSprite.TARGETCENTER).y = center.x = POS_X;
player.GetPSprite(PSprite.TARGETLEFT).y = center.y = POS_Y;
player.GetPSprite(PSprite.TARGETRIGHT).y = (100-3);
PositionAccuracy (); PositionAccuracy ();
} }
@ -1397,8 +1400,13 @@ class PowerTargeter : Powerup
if (player != null) if (player != null)
{ {
player.GetPSprite(PSprite.TARGETLEFT).x = (160-3) - ((100 - player.mo.accuracy)); PSprite left = player.GetPSprite(PSprite.TARGETLEFT);
player.GetPSprite(PSprite.TARGETRIGHT).x = (160-3)+ ((100 - player.mo.accuracy)); 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;
} }
} }

1
wadsrc/static/zscript/strife/sigil.txt
View file

@ -203,6 +203,7 @@ class Sigil : Weapon
} }
PSprite pspr = player.GetPSprite(PSP_WEAPON); PSprite pspr = player.GetPSprite(PSP_WEAPON);
pspr.SetState(pspr.CurState + invoker.health); pspr.SetState(pspr.CurState + invoker.health);
invoker.downpieces = 0;
} }
//============================================================================ //============================================================================