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

- SW: floatified DoPlayerTeleportToSprite

Browse source
This commit is contained in:
Christoph Oelckers 2022-08-30 21:20:45 +02:00
parent 161153c783
commit 94e198f9a9
1 changed files with 6 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1269,22 +1269,13 @@ void DoPlayerTeleportPause(PLAYER* pp)
} }
} }
void DoPlayerTeleportToSprite(PLAYER* pp, vec3_t* pos, int ang) void DoPlayerTeleportToSprite(PLAYER* pp, DVector3& pos, DAngle ang)
{ {
pp->angle.ang = pp->angle.oang = DAngle::fromBuild(ang); pp->angle.ang = pp->angle.oang = ang;
pp->set_int_ppos_XY(pos->XY()); pp->opos = pp->pos= pos.plusZ(-PLAYER_HEIGHTF);
pp->oldpos.XY() = pp->pos.XY();
pp->oldpos.XY() = pp->opos.XY() = pp->pos.XY(); updatesector(pp->pos, &pp->cursector);
//getzsofslopeptr(actor->s
// ector(), pp->posx, pp->posy, &cz, &fz);
//pp->posz = pp->oposz = fz - PLAYER_HEIGHT;
pp->set_int_ppos_Z(pos->Z - PLAYER_HEIGHT);
pp->opos.Z = pp->pos.Z;
updatesector(pp->int_ppos().X, pp->int_ppos().Y, &pp->cursector);
pp->Flags2 |= (PF2_TELEPORTED); pp->Flags2 |= (PF2_TELEPORTED);
} }
@ -1365,9 +1356,7 @@ void DoPlayerWarpTeleporter(PLAYER* pp)
break; break;
default: default:
{ {
auto pos = act_warp->int_pos(); DoPlayerTeleportToSprite(pp, act_warp->spr.pos, act_warp->spr.angle);
DoPlayerTeleportToSprite(pp, &pos, act_warp->int_ang());
act_warp->set_int_pos(pos);
PlaySound(DIGI_TELEPORT, pp, v3df_none); PlaySound(DIGI_TELEPORT, pp, v3df_none);