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

- floatified parts of InitLaser and InitRail

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

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

@ -12747,7 +12747,6 @@ int InitShotgun(PLAYER* pp)
int InitLaser(PLAYER* pp) int InitLaser(PLAYER* pp)
{ {
DSWActor* actor = pp->actor; DSWActor* actor = pp->actor;
int nx, ny, nz;
DoPlayerBeginRecoil(pp, RAIL_RECOIL_AMT); DoPlayerBeginRecoil(pp, RAIL_RECOIL_AMT);
PlayerUpdateAmmo(pp, actor->user.WeaponNum, -1); PlayerUpdateAmmo(pp, actor->user.WeaponNum, -1);
@ -12756,16 +12755,12 @@ int InitLaser(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;
nz = pp->int_ppos().Z + pp->int_bob_z() + Z(8);
// Spawn a shot // Spawn a shot
// Inserting and setting up variables // Inserting and setting up variables
auto actorNew = SpawnActor(STAT_MISSILE, BOLT_THINMAN_R0, s_Laser, pp->cursector, auto actorNew = SpawnActor(STAT_MISSILE, BOLT_THINMAN_R0, s_Laser, pp->cursector, pos, pp->angle.ang, 300);
nx, ny, nz, pp->angle.ang.Buildang(), 300);
actorNew->spr.hitag = LUMINOUS; //Always full brightness actorNew->spr.hitag = LUMINOUS; //Always full brightness
SetOwner(pp->actor, actorNew); SetOwner(pp->actor, actorNew);
@ -12856,16 +12851,12 @@ int InitRail(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 + 11);
ny = pp->int_ppos().Y;
nz = pp->int_ppos().Z + pp->int_bob_z() + Z(11);
// Spawn a shot // Spawn a shot
// Inserting and setting up variables // Inserting and setting up variables
auto actorNew = SpawnActor(STAT_MISSILE, BOLT_THINMAN_R1, &s_Rail[0][0], pp->cursector, auto actorNew = SpawnActor(STAT_MISSILE, BOLT_THINMAN_R1, &s_Rail[0][0], pp->cursector, pos, pp->angle.ang, 1200);
nx, ny, nz, pp->angle.ang.Buildang(), 1200);
SetOwner(pp->actor, actorNew); SetOwner(pp->actor, actorNew);