zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-13 20:42:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

- CanGetWeapon

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-06 10:29:48 +01:00
parent 88a5a95cde
commit 56760d1824
2 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
source/games/sw/src/sprite.cpp
View file

@ -5248,9 +5248,9 @@ void ChoosePlayerGetSound(PLAYERp pp)
PlayerSound(PlayerGetItemVocs[choose_snd], v3df_follow|v3df_dontpan,pp);
}
bool CanGetWeapon(PLAYERp pp, short SpriteNum, int WPN)
bool CanGetWeapon(PLAYERp pp, DSWActor* actor, int WPN)
{
USERp u = User[SpriteNum].Data();
USERp u = actor->u();
switch (gNet.MultiGameType)
{
@ -5297,13 +5297,14 @@ struct InventoryDecl_t InventoryDecls[InvDecl_TOTAL] =
{100 },
};
#define ITEMFLASHAMT -8
#define ITEMFLASHCLR 144
int
DoGet(DSWActor* actor)
enum
{
ITEMFLASHAMT = -8,
ITEMFLASHCLR = 144
};
int DoGet(DSWActor* actor)
{
USER* u = actor->u();
int SpriteNum = u->SpriteNum;
USERp pu;
SPRITEp sp = &actor->s();
PLAYERp pp;
@ -5663,7 +5664,7 @@ KeyMain:
//
case ICON_STAR:
if (!CanGetWeapon(pp, SpriteNum, WPN_STAR))
if (!CanGetWeapon(pp, actor, WPN_STAR))
break;
SET(pp->WpnGotOnceFlags, BIT(WPN_STAR));
@ -5690,7 +5691,7 @@ KeyMain:
case ICON_LG_MINE:
if (!CanGetWeapon(pp, SpriteNum, WPN_MINE))
if (!CanGetWeapon(pp, actor, WPN_MINE))
break;
SET(pp->WpnGotOnceFlags, BIT(WPN_MINE));
@ -5719,7 +5720,7 @@ KeyMain:
case ICON_UZI:
case ICON_UZIFLOOR:
if (!CanGetWeapon(pp, SpriteNum, WPN_UZI))
if (!CanGetWeapon(pp, actor, WPN_UZI))
break;
SET(pp->WpnGotOnceFlags, BIT(WPN_UZI));
@ -5775,7 +5776,7 @@ KeyMain:
case ICON_MICRO_GUN:
if (!CanGetWeapon(pp, SpriteNum, WPN_MICRO))
if (!CanGetWeapon(pp, actor, WPN_MICRO))
break;
SET(pp->WpnGotOnceFlags, BIT(WPN_MICRO));
@ -5842,7 +5843,7 @@ KeyMain:
break;
case ICON_GRENADE_LAUNCHER:
if (!CanGetWeapon(pp, SpriteNum, WPN_GRENADE))
if (!CanGetWeapon(pp, actor, WPN_GRENADE))
break;
SET(pp->WpnGotOnceFlags, BIT(WPN_GRENADE));
@ -5912,7 +5913,7 @@ KeyMain:
case ICON_RAIL_GUN:
if (SW_SHAREWARE) { KillActor(actor); break; }
if (!CanGetWeapon(pp, SpriteNum, WPN_RAIL))
if (!CanGetWeapon(pp, actor, WPN_RAIL))
break;
SET(pp->WpnGotOnceFlags, BIT(WPN_RAIL));
@ -5960,7 +5961,7 @@ KeyMain:
break;
case ICON_SHOTGUN:
if (!CanGetWeapon(pp, SpriteNum, WPN_SHOTGUN))
if (!CanGetWeapon(pp, actor, WPN_SHOTGUN))
break;
SET(pp->WpnGotOnceFlags, BIT(WPN_SHOTGUN));
@ -6027,7 +6028,7 @@ KeyMain:
case ICON_GUARD_HEAD:
if (SW_SHAREWARE) { KillActor(actor); break; }
if (!CanGetWeapon(pp, SpriteNum, WPN_HOTHEAD))
if (!CanGetWeapon(pp, actor, WPN_HOTHEAD))
break;
SET(pp->WpnGotOnceFlags, BIT(WPN_HOTHEAD));
@ -6072,7 +6073,7 @@ KeyMain:
case ICON_HEART:
if (SW_SHAREWARE) { KillActor(actor); break; }
if (!CanGetWeapon(pp, SpriteNum, WPN_HEART))
if (!CanGetWeapon(pp, actor, WPN_HEART))
break;
SET(pp->WpnGotOnceFlags, BIT(WPN_HEART));

2
source/games/sw/src/sprite.h
View file

@ -41,8 +41,6 @@ short PlayerVisible(short sn);
short SpriteLookSector(short SpriteNum, short range);
short SpriteCanGoForward(short SpriteNum, short range);
void SpriteFindNewDirection(short SpriteNum, short range);
int DoWalk(short SpriteNum);
int DoBody(short SpriteNum);
bool CanMoveHere(int16_t spritenum);
bool SpriteOverlap(DSWActor*, DSWActor*);
int DoActorDie(DSWActor* actor, DSWActor* weapActor, int meansofdeath);