zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- floatified more of sprite.cpp

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-06 19:28:56 +02:00
parent 30d4d5ddfe
commit efe7f7c90e
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/games/sw/src/player.cpp
View file

@ -6217,8 +6217,6 @@ void DoPlayerDeathCheckKick(PLAYER* pp)
{ {
DSWActor* plActor = pp->actor; DSWActor* plActor = pp->actor;
unsigned stat; unsigned stat;
int dist;
int a,b,c;
for (stat = 0; stat < SIZ(StatDamageList); stat++) for (stat = 0; stat < SIZ(StatDamageList); stat++)
{ {
@ -6232,9 +6230,9 @@ void DoPlayerDeathCheckKick(PLAYER* pp)
if (!(itActor->spr.extra & SPRX_PLAYER_OR_ENEMY)) if (!(itActor->spr.extra & SPRX_PLAYER_OR_ENEMY))
continue; continue;
DISTANCE(itActor->spr.pos, plActor->spr.pos, dist, a, b, c); double dist = (itActor->spr.pos.XY() - plActor->spr.pos.XY()).Length();
if (unsigned(dist) < itActor->user.Radius + 100) if (dist < (itActor->user.Radius + 100) * inttoworld)
{ {
pp->KillerActor = itActor; pp->KillerActor = itActor;

18
source/games/sw/src/sprite.cpp
View file

@ -4828,7 +4828,7 @@ int DoGrating(DSWActor* actor)
const double GRATE_FACTOR = GRATE_FACTORI * maptoworld; const double GRATE_FACTOR = GRATE_FACTORI * maptoworld;
// reduce to 0 to 3 value // reduce to 0 to 3 value
dir = actor->int_ang() >> 9; dir = int(actor->spr.angle.Normalized360().Degrees()) / 90;
DVector2 v(0, 0); DVector2 v(0, 0);
if ((dir & 1) == 0) if ((dir & 1) == 0)
@ -4868,7 +4868,7 @@ int DoGrating(DSWActor* actor)
int DoKey(DSWActor* actor) int DoKey(DSWActor* actor)
{ {
actor->set_int_ang(NORM_ANGLE(actor->int_ang() + (14 * ACTORMOVETICS))); actor->spr.angle += DAngle::fromBuild(14 * ACTORMOVETICS);
DoGet(actor); DoGet(actor);
return 0; return 0;
@ -5162,7 +5162,7 @@ int DoGet(DSWActor* actor)
{ {
PLAYER* pp; PLAYER* pp;
short pnum, key_num; short pnum, key_num;
int dist, a,b,c; int a,b,c;
bool can_see; bool can_see;
// For flag stuff // For flag stuff
@ -5200,8 +5200,8 @@ int DoGet(DSWActor* actor)
if (pp->Flags & (PF_DEAD)) if (pp->Flags & (PF_DEAD))
continue; continue;
DISTANCE(pp->pos, actor->spr.pos, dist, a,b,c); double dist = (pp->pos.XY() - actor->spr.pos).Length();
if ((unsigned)dist > (plActor->user.Radius + actor->user.Radius)) if ((unsigned)dist > (plActor->user.Radius * 2 * inttoworld))
{ {
continue; continue;
} }
@ -6060,7 +6060,7 @@ void ProcessActiveVars(DSWActor* actor)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void AdjustActiveRange(PLAYER* pp, DSWActor* actor, int dist) void AdjustActiveRange(PLAYER* pp, DSWActor* actor, double dist)
{ {
DSWActor* plActor = pp->actor; DSWActor* plActor = pp->actor;
@ -6071,7 +6071,7 @@ void AdjustActiveRange(PLAYER* pp, DSWActor* actor, int dist)
actor->user.wait_active_check = 0; actor->user.wait_active_check = 0;
// check aboslute max // check aboslute max
if (dist > MAX_ACTIVE_RANGE * worldtoint) if (dist > MAX_ACTIVE_RANGE)
return; return;
// do not do a FAFcansee if your already active // do not do a FAFcansee if your already active
@ -6209,7 +6209,7 @@ void SpriteControl(void)
int32_t stat; int32_t stat;
short pnum, CloseToPlayer; short pnum, CloseToPlayer;
PLAYER* pp; PLAYER* pp;
int tx, ty, tmin, dist; int tx, ty, tmin;
short StateTics; short StateTics;
SWStatIterator it(STAT_MISC); SWStatIterator it(STAT_MISC);
@ -6248,7 +6248,7 @@ void SpriteControl(void)
pp = &Player[pnum]; pp = &Player[pnum];
// Only update the ones closest // Only update the ones closest
DISTANCE(pp->pos, actor->spr.pos, dist, tx, ty, tmin); double dist = (pp->pos.XY() - actor->spr.pos.XY()).Length();
AdjustActiveRange(pp, actor, dist); AdjustActiveRange(pp, actor, dist);