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

- floatified parts of InitRocket and InitBunnyRocket

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-01 19:17:51 +02:00
parent 8eab80bad2
commit 80034445b2
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12982,7 +12982,6 @@ int InitZillaRail(DSWActor* actor)
int InitRocket(PLAYER* pp) int InitRocket(PLAYER* pp)
{ {
DSWActor* actor = pp->actor; DSWActor* actor = pp->actor;
int nx, ny, nz;
int zvel; int zvel;
DoPlayerBeginRecoil(pp, ROCKET_RECOIL_AMT); DoPlayerBeginRecoil(pp, ROCKET_RECOIL_AMT);
@ -13007,15 +13006,12 @@ int InitRocket(PLAYER* pp)
if (!pp->insector()) if (!pp->insector())
return 0; return 0;
nx = pp->int_ppos().X; auto pos = pp->pos.plusZ(pp->bob_z + 8);
ny = pp->int_ppos().Y;
// Spawn a shot // Spawn a shot
// Inserting and setting up variables // Inserting and setting up variables
nz = pp->int_ppos().Z + pp->int_bob_z() + Z(8); auto actorNew = SpawnActor(STAT_MISSILE, BOLT_THINMAN_R0, &s_Rocket[0][0], pp->cursector, pos, pp->angle.ang, ROCKET_VELOCITY);
auto actorNew = SpawnActor(STAT_MISSILE, BOLT_THINMAN_R0, &s_Rocket[0][0], pp->cursector,
nx, ny, nz, pp->angle.ang.Buildang(), ROCKET_VELOCITY);
SetOwner(pp->actor, actorNew); SetOwner(pp->actor, actorNew);
actorNew->spr.yrepeat = 90; actorNew->spr.yrepeat = 90;
@ -13113,16 +13109,12 @@ int InitBunnyRocket(PLAYER* pp)
if (!pp->insector()) if (!pp->insector())
return 0; return 0;
nx = pp->int_ppos().X; auto pos = pp->pos.plusZ(pp->bob_z + 8);
ny = pp->int_ppos().Y;
// Spawn a shot // Spawn a shot
// Inserting and setting up variables // Inserting and setting up variables
//nz = pp->posz + pp->int_bob_z() + Z(12); auto actorNew = SpawnActor(STAT_MISSILE, BOLT_THINMAN_R4, &s_BunnyRocket[0][0], pp->cursector, pos, pp->angle.ang, ROCKET_VELOCITY);
nz = pp->int_ppos().Z + pp->int_bob_z() + Z(8);
auto actorNew = SpawnActor(STAT_MISSILE, BOLT_THINMAN_R4, &s_BunnyRocket[0][0], pp->cursector,
nx, ny, nz, pp->angle.ang.Buildang(), ROCKET_VELOCITY);
SetOwner(pp->actor, actorNew); SetOwner(pp->actor, actorNew);
actorNew->spr.yrepeat = 64; actorNew->spr.yrepeat = 64;