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

- clean out some stuff

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-03 10:47:36 +02:00
parent b84158ecec
commit 712d28ff40
5 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/build/src/clip.cpp
View file

@ -1133,7 +1133,9 @@ static inline void hit_set(HitInfoBase *hit, sectortype* sect, walltype* wal, DC
hit->hitSector = sect; hit->hitSector = sect;
hit->hitWall = wal; hit->hitWall = wal;
hit->hitActor = actor; hit->hitActor = actor;
hit->set_int_hitpos(x, y, z); hit->hitpos.X = x * inttoworld;
hit->hitpos.Y = y * inttoworld;
hit->hitpos.Z = z * zinttoworld;
} }
static int32_t hitscan_hitsectcf=-1; static int32_t hitscan_hitsectcf=-1;
@ -1212,7 +1214,8 @@ int hitscan(const vec3_t& start, const sectortype* startsect, const vec3_t& dire
if (startsect == nullptr) if (startsect == nullptr)
return -1; return -1;
hitinfo. set_int_hitpos_xy(hitscangoal.X, hitscangoal.Y); hitinfo.hitpos.X = hitscangoal.X * inttoworld;
hitinfo.hitpos.Y = hitscangoal.Y * inttoworld;
BFSSectorSearch search(startsect); BFSSectorSearch search(startsect);
while (auto sec = search.GetNext()) while (auto sec = search.GetNext())
@ -1282,10 +1285,7 @@ int hitscan(const vec3_t& start, const sectortype* startsect, const vec3_t& dire
auto v = hitinfo.int_hitpos(); auto v = hitinfo.int_hitpos();
if (try_facespr_intersect(actor, *sv, vx, vy, vz, &v, 0)) if (try_facespr_intersect(actor, *sv, vx, vy, vz, &v, 0))
{ {
hitinfo.hitSector = sec; hit_set(&hitinfo, sec, nullptr, actor, v.X, v.Y, v.Z);
hitinfo.hitWall = nullptr;
hitinfo.hitActor = actor;
hitinfo.set_int_hitpos(v.X, v.Y, v.Z);
} }
break; break;

7
source/core/coreactor.h
View file

@ -352,13 +352,6 @@ struct HitInfoBase
return { int(hitpos.X * worldtoint), int(hitpos.Y * worldtoint), int(hitpos.Z * zworldtoint), }; return { int(hitpos.X * worldtoint), int(hitpos.Y * worldtoint), int(hitpos.Z * zworldtoint), };
} }
void set_int_hitpos(int x, int y, int z)
{
hitpos.X = x * inttoworld;
hitpos.Y = y * inttoworld;
hitpos.Z = z * zinttoworld;
}
void set_int_hitpos_xy(int x, int y) void set_int_hitpos_xy(int x, int y)
{ {
hitpos.X = x * inttoworld; hitpos.X = x * inttoworld;

2
source/games/duke/src/player_d.cpp
View file

@ -3039,7 +3039,7 @@ HORIZONLY:
if (ud.clipping) if (ud.clipping)
{ {
p->player_add_int_xy({ p->vel.X >> 14, p->vel.Y >> 14 }); p->player_add_int_xy({ p->vel.X >> 14, p->vel.Y >> 14 });
updatesector(p->player_int_pos().X, p->player_int_pos().Y, &p->cursector); updatesector(p->pos, &p->cursector);
ChangeActorSect(pact, p->cursector); ChangeActorSect(pact, p->cursector);
} }
else else

2
source/games/sw/src/game.h
View file

@ -625,7 +625,7 @@ struct PLAYER
DVector3 si; // save player interp position for PlayerSprite DVector3 si; // save player interp position for PlayerSprite
DAngle siang; DAngle siang;
vec2_t vect, ovect, slide_vect; // these need floatification, but must be done together. vec2_t vect, ovect, slide_vect; // these need floatification, but must be done together. vect is in 14.18 format!
int friction; int friction;
int16_t slide_ang; // todo: floatify int16_t slide_ang; // todo: floatify
int slide_dec; int slide_dec;

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

@ -2001,7 +2001,7 @@ void DoPlayerMove(PLAYER* pp)
pp->opos.XY() = pp->pos.XY(); pp->opos.XY() = pp->pos.XY();
} }
pp->add_int_ppos_XY({ pp->vect.X >> 14, pp->vect.Y >> 14 }); pp->add_int_ppos_XY({ pp->vect.X >> 14, pp->vect.Y >> 14 });
updatesector(pp->int_ppos().X, pp->int_ppos().Y, &sect); updatesector(pp->pos, &sect);
if (sect != nullptr) if (sect != nullptr)
pp->cursector = sect; pp->cursector = sect;
} }