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

- InitGrenade

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-04 00:20:03 +01:00
parent 2515a663cd
commit 614757cda4
1 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18769,14 +18769,13 @@ InitEnemyUzi(DSWActor* actor)
} }
int int InitGrenade(PLAYERp pp)
InitGrenade(PLAYERp pp)
{ {
USERp u = User[pp->PlayerSprite].Data(); USERp u = pp->Actor()->u();
auto sp = &pp->Actor()->s();
USERp wu; USERp wu;
SPRITEp wp; SPRITEp wp;
int nx, ny, nz; int nx, ny, nz;
short w;
int zvel; int zvel;
bool auto_aim = false; bool auto_aim = false;
@ -18799,11 +18798,11 @@ InitGrenade(PLAYERp pp)
// Spawn a shot // Spawn a shot
// Inserting and setting up variables // Inserting and setting up variables
w = SpawnSprite(STAT_MISSILE, GRENADE, &s_Grenade[0][0], pp->cursectnum, auto actorNew = SpawnActor(STAT_MISSILE, GRENADE, &s_Grenade[0][0], pp->cursectnum,
nx, ny, nz, pp->angle.ang.asbuild(), GRENADE_VELOCITY); nx, ny, nz, pp->angle.ang.asbuild(), GRENADE_VELOCITY);
wp = &sprite[w]; wp = &actorNew->s();
wu = User[w].Data(); wu = actorNew->u();
// don't throw it as far if crawling // don't throw it as far if crawling
if (TEST(pp->Flags, PF_CRAWLING)) if (TEST(pp->Flags, PF_CRAWLING))
@ -18812,10 +18811,10 @@ InitGrenade(PLAYERp pp)
} }
wu->RotNum = 5; wu->RotNum = 5;
NewStateGroup(&swActors[w], &sg_Grenade[0]); NewStateGroup(actorNew, &sg_Grenade[0]);
SET(wu->Flags, SPR_XFLIP_TOGGLE); SET(wu->Flags, SPR_XFLIP_TOGGLE);
SetOwner(pp->PlayerSprite, w); SetOwner(pp->Actor(), actorNew);
wp->yrepeat = 32; wp->yrepeat = 32;
wp->xrepeat = 32; wp->xrepeat = 32;
wp->shade = -15; wp->shade = -15;
@ -18834,29 +18833,22 @@ InitGrenade(PLAYERp pp)
wp->zvel = -pp->horizon.horiz.asq16() >> 9; wp->zvel = -pp->horizon.horiz.asq16() >> 9;
////DSPRINTF(ds,"horiz %d, ho %d, ho+ho %d", pp->horizon.horiz.asbuild()), pp->horizon.horizoff.asbuild()), pp->horizon.horizoff.asbuild() + pp->horizon.horiz.asbuild());
//MONO_PRINT(ds);
auto oclipdist = pp->SpriteP->clipdist; auto oclipdist = pp->SpriteP->clipdist;
pp->SpriteP->clipdist = 0; pp->SpriteP->clipdist = 0;
wp->ang = NORM_ANGLE(wp->ang + 512); wp->ang = NORM_ANGLE(wp->ang + 512);
HelpMissileLateral(w, 800); HelpMissileLateral(actorNew->GetSpriteIndex(), 800);
wp->ang = NORM_ANGLE(wp->ang - 512); wp->ang = NORM_ANGLE(wp->ang - 512);
// don't do smoke for this movement // don't do smoke for this movement
SET(wu->Flags, SPR_BOUNCE); SET(wu->Flags, SPR_BOUNCE);
MissileSetPos(w, DoGrenade, 1000); MissileSetPos(actorNew->GetSpriteIndex(), DoGrenade, 1000);
RESET(wu->Flags, SPR_BOUNCE); RESET(wu->Flags, SPR_BOUNCE);
pp->SpriteP->clipdist = oclipdist; sp->clipdist = oclipdist;
// int dist;
//dist = FindDistance2D(pp->xvect, pp->yvect)>>12;
//dist = dist - (dist/2);
zvel = wp->zvel; zvel = wp->zvel;
if (WeaponAutoAim(pp->SpriteP, w, 32, false) >= 0) if (WeaponAutoAim(sp, actorNew->GetSpriteIndex(), 32, false) >= 0)
{ {
auto_aim = true; auto_aim = true;
} }