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

- floatify InitTurretMicro

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-08 17:38:02 +02:00
parent fdabd75422
commit 622dea3ebf
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15877,16 +15877,14 @@ int InitTankShell(DSWActor* actor, PLAYER* pp)
int InitTurretMicro(DSWActor* actor, PLAYER* pp) int InitTurretMicro(DSWActor* actor, PLAYER* pp)
{ {
DSWActor* plActor = pp->actor; DSWActor* plActor = pp->actor;
int nx, ny, nz;
short i,ang;
TARGET_SORT* ts = TargetSort; TARGET_SORT* ts = TargetSort;
DSWActor* picked = nullptr; DSWActor* picked = nullptr;
DAngle angle;
if (SW_SHAREWARE) return false; // JBF: verify if (SW_SHAREWARE) return false; // JBF: verify
nx = actor->int_pos().X; auto npos = actor->spr.pos;
ny = actor->int_pos().Y;
const int MAX_TURRET_MICRO = 10; const int MAX_TURRET_MICRO = 10;
@ -15895,48 +15893,45 @@ int InitTurretMicro(DSWActor* actor, PLAYER* pp)
if (TargetSortCount > MAX_TURRET_MICRO) if (TargetSortCount > MAX_TURRET_MICRO)
TargetSortCount = MAX_TURRET_MICRO; TargetSortCount = MAX_TURRET_MICRO;
for (i = 0; i < MAX_TURRET_MICRO; i++) for (int i = 0; i < MAX_TURRET_MICRO; i++)
{ {
if (ts < &TargetSort[TargetSortCount] && ts->actor != nullptr) if (ts < &TargetSort[TargetSortCount] && ts->actor != nullptr)
{ {
picked = ts->actor; picked = ts->actor;
ang = getangle(picked->int_pos().X - nx, picked->int_pos().Y - ny); angle = VecToAngle(picked->spr.pos - npos);
ts++; ts++;
} }
else else
{ {
picked = nullptr; picked = nullptr;
ang = actor->int_ang(); angle = actor->spr.angle;
} }
npos.Z = actor->spr.pos.Z + (RandomRangeF(20) - 10);
nz = actor->int_pos().Z;
nz += Z(RandomRange(20)) - Z(10);
// 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_Micro[0][0], actor->sector(), auto actorNew = SpawnActor(STAT_MISSILE, BOLT_THINMAN_R0, &s_Micro[0][0], actor->sector(),
actor->spr.pos.plusZ(10 + RandomRangeF(20)), DAngle::fromBuild(ang), 75); actor->spr.pos.plusZ(10 + RandomRangeF(20)), angle, 75);
SetOwner(plActor, actorNew); SetOwner(plActor, actorNew);
actorNew->spr.yrepeat = 24; actorNew->spr.yrepeat = 24;
actorNew->spr.xrepeat = 24; actorNew->spr.xrepeat = 24;
actorNew->spr.shade = -15; actorNew->spr.shade = -15;
actorNew->set_int_zvel(-pp->horizon.horiz.asq16() >> 9); actorNew->vel.Z = -pp->horizon.horiz.asbuildf() * HORIZ_MULTF + RandomRangeF(8) - 5;
actorNew->spr.clipdist = 64L>>2; actorNew->spr.clipdist = 64L>>2;
// randomize zvelocity
actorNew->add_int_zvel( RandomRange(Z(8)) - Z(5));
actorNew->user.RotNum = 5; actorNew->user.RotNum = 5;
NewStateGroup(actorNew, &sg_Micro[0]); NewStateGroup(actorNew, &sg_Micro[0]);
actorNew->user.WeaponNum = plActor->user.WeaponNum; actorNew->user.WeaponNum = plActor->user.WeaponNum;
actorNew->user.Radius = 200; actorNew->user.Radius = 200;
actorNew->user.ceiling_dist = (2); actorNew->user.ceiling_dist = 2;
actorNew->user.floor_dist = (2); actorNew->user.floor_dist = 2;
actorNew->spr.cstat &= ~(CSTAT_SPRITE_BLOCK|CSTAT_SPRITE_BLOCK_HITSCAN); actorNew->spr.cstat &= ~(CSTAT_SPRITE_BLOCK|CSTAT_SPRITE_BLOCK_HITSCAN);
actorNew->spr.cstat |= (CSTAT_SPRITE_YCENTER); actorNew->spr.cstat |= (CSTAT_SPRITE_YCENTER);
actorNew->spr.cstat |= (CSTAT_SPRITE_INVISIBLE); actorNew->spr.cstat |= (CSTAT_SPRITE_INVISIBLE);