zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 19:20:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't spawn TRANSPORTERSTAR if FURY

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@8032 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-08-16 12:05:21 +00:00 committed by Christoph Oelckers
parent 3dcbf9955d
commit 1b5edf9551
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/duke3d/src/actors.cpp
View file

@ -2985,6 +2985,7 @@ ACTOR_STATIC void Proj_MoveCustom(int const spriteNum)
int playerNum = P_Get(otherSprite); int playerNum = P_Get(otherSprite);
#ifndef EDUKE32_STANDALONE #ifndef EDUKE32_STANDALONE
if (!FURY)
A_PlaySound(PISTOL_BODYHIT, otherSprite); A_PlaySound(PISTOL_BODYHIT, otherSprite);
#endif #endif
if (pProj->workslike & PROJECTILE_SPIT) if (pProj->workslike & PROJECTILE_SPIT)
@ -3020,7 +3021,10 @@ ACTOR_STATIC void Proj_MoveCustom(int const spriteNum)
{ {
Proj_BounceOffWall(pSprite, otherSprite); Proj_BounceOffWall(pSprite, otherSprite);
pSprite->owner = spriteNum; pSprite->owner = spriteNum;
#ifndef EDUKE32_STANDALONE
if (!FURY)
A_Spawn(spriteNum, TRANSPORTERSTAR); A_Spawn(spriteNum, TRANSPORTERSTAR);
#endif
return; return;
} }
else else
@ -3103,6 +3107,9 @@ ACTOR_STATIC void G_MoveWeapons(void)
goto next_sprite; goto next_sprite;
} }
if (FURY)
goto next_sprite;
// hard coded projectiles // hard coded projectiles
switch (DYNAMICTILEMAP(pSprite->picnum)) switch (DYNAMICTILEMAP(pSprite->picnum))
{ {

6
source/duke3d/src/sector.cpp
View file

@ -1018,9 +1018,13 @@ void G_OperateRespawns(int lotag)
{ {
if (!ud.monsters_off || !A_CheckEnemyTile(pSprite->hitag)) if (!ud.monsters_off || !A_CheckEnemyTile(pSprite->hitag))
{ {
#ifndef EDUKE32_STANDALONE
if (!FURY)
{
int const j = A_Spawn(spriteNum, TRANSPORTERSTAR); int const j = A_Spawn(spriteNum, TRANSPORTERSTAR);
sprite[j].z -= ZOFFSET5; sprite[j].z -= ZOFFSET5;
}
#endif
// Just a way to killit (see G_MoveFX(): RESPAWN__STATIC) // Just a way to killit (see G_MoveFX(): RESPAWN__STATIC)
pSprite->extra = 66-12; pSprite->extra = 66-12;
} }