teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-02-21 19:21:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SpawnGrenadeExp

Browse source 
# Conflicts:
#	source/games/sw/src/weapon.h
This commit is contained in:
Christoph Oelckers 2021-11-05 00:18:16 +01:00
parent 28c07b6b3c
commit f3037a0b0c
4 changed files with 24 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/sw/src/jweapon.cpp
View file

@ -2225,7 +2225,7 @@ int DoCarryFlag(DSWActor* actor)
u->Counter2++; u->Counter2++;
break; break;
case FLAG_DETONATE_STATE + 1: case FLAG_DETONATE_STATE + 1:
SpawnGrenadeExp(actor->GetSpriteIndex()); SpawnGrenadeExp(actor);
SetSuicide(actor); SetSuicide(actor);
return false; return false;
break; break;

58
source/games/sw/src/weapon.cpp
View file

@ -8873,7 +8873,7 @@ DoGrenade(DSWActor* actor)
InitPhosphorus(actor); InitPhosphorus(actor);
} }
} }
SpawnGrenadeExp(Weapon); SpawnGrenadeExp(actor);
KillActor(actor); KillActor(actor);
return true; return true;
} }
@ -8945,7 +8945,7 @@ DoGrenade(DSWActor* actor)
InitPhosphorus(actor); InitPhosphorus(actor);
} }
} }
SpawnGrenadeExp(Weapon); SpawnGrenadeExp(actor);
KillActor(actor); KillActor(actor);
return true; return true;
} }
@ -8988,8 +8988,7 @@ DoGrenade(DSWActor* actor)
InitPhosphorus(actor); InitPhosphorus(actor);
} }
} }
//WeaponMoveHit(Weapon); SpawnGrenadeExp(actor);
SpawnGrenadeExp(Weapon);
KillActor(actor); KillActor(actor);
return true; return true;
} }
@ -9009,7 +9008,7 @@ DoGrenade(DSWActor* actor)
if (u->bounce > 10) if (u->bounce > 10)
{ {
SpawnGrenadeExp(Weapon); SpawnGrenadeExp(actor);
KillActor(actor); KillActor(actor);
return true; return true;
} }
@ -11400,28 +11399,26 @@ SpawnGrenadeSmallExp(DSWActor* actor)
return 0; return 0;
} }
int void SpawnGrenadeExp(DSWActor* actor)
SpawnGrenadeExp(int16_t Weapon)
{ {
SPRITEp sp = &sprite[Weapon]; SPRITEp sp = &actor->s();
USERp u = User[Weapon].Data(); USERp u = actor->u();
SPRITEp exp; SPRITEp exp;
USERp eu; USERp eu;
short explosion;
int dx,dy,dz; int dx,dy,dz;
ASSERT(u); ASSERT(u);
if (u && TEST(u->Flags, SPR_SUICIDE)) if (u && TEST(u->Flags, SPR_SUICIDE))
return -1; return;
PlaySound(DIGI_30MMEXPLODE, sp, v3df_none); PlaySound(DIGI_30MMEXPLODE, actor, v3df_none);
if (RandomRange(1000) > 990) if (RandomRange(1000) > 990)
{ {
if (sp->owner >= 0 && User[sp->owner].Data() && User[sp->owner]->PlayerP) auto own = GetOwner(actor);
if (own != nullptr && own->hasU() && own->u()->PlayerP)
{ {
PLAYERp pp = User[sp->owner]->PlayerP; PlayerSound(DIGI_LIKEFIREWORKS, v3df_follow|v3df_dontpan, own->u()->PlayerP);
PlayerSound(DIGI_LIKEFIREWORKS, v3df_follow|v3df_dontpan,pp);
} }
} }
@ -11436,14 +11433,14 @@ SpawnGrenadeExp(int16_t Weapon)
dz = SPRITEp_MID(sp) + RandomRange(1000)-RandomRange(1000); dz = SPRITEp_MID(sp) + RandomRange(1000)-RandomRange(1000);
} }
explosion = SpawnSprite(STAT_MISSILE, GRENADE_EXP, s_GrenadeExp, sp->sectnum, auto expActor = SpawnActor(STAT_MISSILE, GRENADE_EXP, s_GrenadeExp, sp->sectnum,
dx, dy, dz, sp->ang, 0); dx, dy, dz, sp->ang, 0);
auto expActor = &swActors[explosion];
exp = &sprite[explosion]; exp = &expActor->s();
eu = User[explosion].Data(); eu = expActor->u();
exp->hitag = LUMINOUS; //Always full brightness exp->hitag = LUMINOUS; //Always full brightness
SetOwner(sp->owner, explosion); SetOwner(GetOwner(actor), expActor);
exp->shade = -40; exp->shade = -40;
exp->xrepeat = 64 + 32; exp->xrepeat = 64 + 32;
exp->yrepeat = 64 + 32; exp->yrepeat = 64 + 32;
@ -11457,31 +11454,18 @@ SpawnGrenadeExp(int16_t Weapon)
// ceilings // ceilings
// //
SpawnExpZadjust(Weapon, exp, Z(100), Z(30)); SpawnExpZadjust(actor->GetSpriteIndex(), exp, Z(100), Z(30));
DoExpDamageTest(expActor); DoExpDamageTest(expActor);
SetExpQuake(explosion); SetExpQuake(expActor->GetSpriteIndex());
SpawnVis(nullptr, exp->sectnum, exp->x, exp->y, exp->z, 0); SpawnVis(nullptr, exp->sectnum, exp->x, exp->y, exp->z, 0);
#if 0
short ang;
ang = RANDOM_P2(2048);
SpawnGrenadeSecondaryExp(explosion, ang);
ang = ang + 512 + RANDOM_P2(256);
SpawnGrenadeSecondaryExp(explosion, ang);
ang = ang + 512 + RANDOM_P2(256);
SpawnGrenadeSecondaryExp(explosion, ang);
ang = ang + 512 + RANDOM_P2(256);
SpawnGrenadeSecondaryExp(explosion, ang);
#endif
return explosion;
} }
void SpawnExpZadjust(short Weapon, SPRITEp exp, int upper_zsize, int lower_zsize) void SpawnExpZadjust(short Weapon, SPRITEp exp, int upper_zsize, int lower_zsize)
{ {
USERp u = User[Weapon].Data(); auto actor = &swActors[Weapon];
USERp u = actor->u();
USERp eu = User[exp - sprite].Data(); USERp eu = User[exp - sprite].Data();
int tos_z, bos_z; int tos_z, bos_z;

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

@ -84,7 +84,7 @@ DSWActor* SpawnBubble(DSWActor*);
int SpawnFireballExp(DSWActor*); int SpawnFireballExp(DSWActor*);
void SpawnFireballFlames(int16_t SpriteNum,int16_t enemy); void SpawnFireballFlames(int16_t SpriteNum,int16_t enemy);
int SpawnRadiationCloud(DSWActor* actor); int SpawnRadiationCloud(DSWActor* actor);
int SpawnGrenadeExp(int16_t Weapon); void SpawnGrenadeExp(DSWActor*);
DSWActor* SpawnSectorExp(DSWActor*); DSWActor* SpawnSectorExp(DSWActor*);
int DoShrapVelocity(DSWActor*); int DoShrapVelocity(DSWActor*);
int ShrapKillSprite(DSWActor*); int ShrapKillSprite(DSWActor*);

4
source/games/sw/src/zilla.cpp
View file

@ -745,15 +745,13 @@ int DoZillaStomp(DSWActor* actor)
return 0; return 0;
} }
extern int SpawnGrenadeExp(int16_t Weapon);
int DoZillaDeathMelt(DSWActor* actor) int DoZillaDeathMelt(DSWActor* actor)
{ {
USER* u = actor->u(); USER* u = actor->u();
SPRITEp sp = &actor->s(); SPRITEp sp = &actor->s();
if (RandomRange(1000) > 800) if (RandomRange(1000) > 800)
SpawnGrenadeExp(actor->GetSpriteIndex()); SpawnGrenadeExp(actor);
u->ID = ZILLA_RUN_R0; u->ID = ZILLA_RUN_R0;
RESET(u->Flags, SPR_JUMPING|SPR_FALLING|SPR_MOVED); RESET(u->Flags, SPR_JUMPING|SPR_FALLING|SPR_MOVED);