zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-11 18:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

EDUKE32_STANDALONE crap

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@8083 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-09-08 01:01:26 +00:00 committed by Christoph Oelckers
parent aa8ce8d42a
commit 12eea3740c
1 changed files with 35 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2313,33 +2313,37 @@ void A_DamageObject_Internal(int spriteNum, int const dmgSrc)
if (A_CheckEnemySprite(&sprite[spriteNum]) == 1) if (A_CheckEnemySprite(&sprite[spriteNum]) == 1)
{ {
#ifndef EDUKE32_STANDALONE #ifndef EDUKE32_STANDALONE
if (sprite[dmgSrc].picnum == RPG) if (!FURY)
sprite[dmgSrc].extra <<= 1; {
if (sprite[dmgSrc].picnum == RPG)
sprite[dmgSrc].extra <<= 1;
if ((PN(spriteNum) != DRONE) && (PN(spriteNum) != ROTATEGUN) && (PN(spriteNum) != COMMANDER) && (PN(spriteNum) < GREENSLIME || PN(spriteNum) > GREENSLIME+7)) if ((PN(spriteNum) != DRONE) && (PN(spriteNum) != ROTATEGUN) && (PN(spriteNum) != COMMANDER)
if (sprite[dmgSrc].picnum != FREEZEBLAST) && (PN(spriteNum) < GREENSLIME || PN(spriteNum) > GREENSLIME + 7))
if (!A_CheckSpriteFlags(spriteNum, SFLAG_BADGUY) || A_CheckSpriteFlags(spriteNum, SFLAG_HURTSPAWNBLOOD)) if (sprite[dmgSrc].picnum != FREEZEBLAST)
{ if (!A_CheckSpriteFlags(spriteNum, SFLAG_BADGUY) || A_CheckSpriteFlags(spriteNum, SFLAG_HURTSPAWNBLOOD))
int const newSprite = A_Spawn(dmgSrc, JIBS6); {
sprite[newSprite].z += ZOFFSET6; int const newSprite = A_Spawn(dmgSrc, JIBS6);
if (sprite[dmgSrc].pal == 6) sprite[newSprite].z += ZOFFSET6;
sprite[newSprite].pal = 6; if (sprite[dmgSrc].pal == 6)
sprite[newSprite].xvel = 16; sprite[newSprite].pal = 6;
sprite[newSprite].xrepeat = sprite[newSprite].yrepeat = 24; sprite[newSprite].xvel = 16;
sprite[newSprite].ang += 32 - (krand() & 63); sprite[newSprite].xrepeat = sprite[newSprite].yrepeat = 24;
} sprite[newSprite].ang += 32 - (krand() & 63);
}
int const damageOwner = sprite[dmgSrc].owner; int const damageOwner = sprite[dmgSrc].owner;
if (damageOwner >= 0 && sprite[damageOwner].picnum == APLAYER && PN(spriteNum) != ROTATEGUN && PN(spriteNum) != DRONE) if (damageOwner >= 0 && sprite[damageOwner].picnum == APLAYER && PN(spriteNum) != ROTATEGUN && PN(spriteNum) != DRONE)
if (g_player[P_Get(damageOwner)].ps->curr_weapon == SHOTGUN_WEAPON) if (g_player[P_Get(damageOwner)].ps->curr_weapon == SHOTGUN_WEAPON)
if (!A_CheckSpriteFlags(spriteNum, SFLAG_BADGUY) || A_CheckSpriteFlags(spriteNum, SFLAG_HURTSPAWNBLOOD)) if (!A_CheckSpriteFlags(spriteNum, SFLAG_BADGUY) || A_CheckSpriteFlags(spriteNum, SFLAG_HURTSPAWNBLOOD))
{ {
A_Shoot(spriteNum, BLOODSPLAT3); A_Shoot(spriteNum, BLOODSPLAT3);
A_Shoot(spriteNum, BLOODSPLAT1); A_Shoot(spriteNum, BLOODSPLAT1);
A_Shoot(spriteNum, BLOODSPLAT2); A_Shoot(spriteNum, BLOODSPLAT2);
A_Shoot(spriteNum, BLOODSPLAT4); A_Shoot(spriteNum, BLOODSPLAT4);
} }
}
#endif #endif
if (!A_CheckSpriteFlags(spriteNum, SFLAG_NODAMAGEPUSH)) if (!A_CheckSpriteFlags(spriteNum, SFLAG_NODAMAGEPUSH))
@ -2361,15 +2365,16 @@ void A_DamageObject_Internal(int spriteNum, int const dmgSrc)
changespritestat(spriteNum, STAT_ACTOR); changespritestat(spriteNum, STAT_ACTOR);
actor[spriteNum].timetosleep = SLEEPTIME; actor[spriteNum].timetosleep = SLEEPTIME;
} }
#ifndef EDUKE32_STANDALONE
if ((sprite[spriteNum].xrepeat < 24 || PN(spriteNum) == SHARK) && sprite[dmgSrc].picnum == SHRINKSPARK) if (!FURY && (sprite[spriteNum].xrepeat < 24 || PN(spriteNum) == SHARK) && sprite[dmgSrc].picnum == SHRINKSPARK)
return; return;
#endif
} }
if (sprite[spriteNum].statnum != STAT_ZOMBIEACTOR) if (sprite[spriteNum].statnum != STAT_ZOMBIEACTOR)
{ {
#ifndef EDUKE32_STANDALONE #ifndef EDUKE32_STANDALONE
if (sprite[dmgSrc].picnum == FREEZEBLAST && ((PN(spriteNum) == APLAYER && sprite[spriteNum].pal == 1) || (g_freezerSelfDamage == 0 && sprite[dmgSrc].owner == spriteNum))) if (!FURY && sprite[dmgSrc].picnum == FREEZEBLAST && ((PN(spriteNum) == APLAYER && sprite[spriteNum].pal == 1) || (g_freezerSelfDamage == 0 && sprite[dmgSrc].owner == spriteNum)))
return; return;
#endif #endif
actor[spriteNum].picnum = sprite[dmgSrc].picnum; actor[spriteNum].picnum = sprite[dmgSrc].picnum;
@ -2388,9 +2393,10 @@ void A_DamageObject_Internal(int spriteNum, int const dmgSrc)
if (ps->newowner >= 0) if (ps->newowner >= 0)
G_ClearCameraView(ps); G_ClearCameraView(ps);
if (sprite[spriteNum].xrepeat < 24 && sprite[dmgSrc].picnum == SHRINKSPARK) #ifndef EDUKE32_STANDALONE
if (!FURY && sprite[spriteNum].xrepeat < 24 && sprite[dmgSrc].picnum == SHRINKSPARK)
return; return;
#endif
if (sprite[actor[spriteNum].owner].picnum != APLAYER) if (sprite[actor[spriteNum].owner].picnum != APLAYER)
if (ud.player_skill >= 3) if (ud.player_skill >= 3)
sprite[dmgSrc].extra += (sprite[dmgSrc].extra>>1); sprite[dmgSrc].extra += (sprite[dmgSrc].extra>>1);