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

- SW: Replace PLAYERstruct lv_* variables with a vector.

Browse source
This commit is contained in:
Mitchell Richters 2021-12-30 23:22:56 +11:00
parent 8f468607ff
commit 6e130d026e
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -613,7 +613,7 @@ struct PLAYERstruct
TObjPtr<DSWActor*> last_camera_act; TObjPtr<DSWActor*> last_camera_act;
// holds last valid move position // holds last valid move position
int lv_x,lv_y,lv_z; vec3_t lv;
REMOTE_CONTROL remote; REMOTE_CONTROL remote;
SECTOR_OBJECTp sop_remote; SECTOR_OBJECTp sop_remote;

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

@ -5921,14 +5921,14 @@ void DoPlayerDeathMoveHead(PLAYERp pp)
{ {
pp->cursector = pp->lv_sector; pp->cursector = pp->lv_sector;
ChangeActorSect(pp->actor, pp->lv_sector); ChangeActorSect(pp->actor, pp->lv_sector);
pp->pos.X = plActor->spr.pos.X = pp->lv_x; pp->pos.X = plActor->spr.pos.X = pp->lv.X;
pp->pos.Y = plActor->spr.pos.Y = pp->lv_y; pp->pos.Y = plActor->spr.pos.Y = pp->lv.Y;
} }
else else
{ {
pp->lv_sector = sect; pp->lv_sector = sect;
pp->lv_x = pp->pos.X; pp->lv.X = pp->pos.X;
pp->lv_y = pp->pos.Y; pp->lv.Y = pp->pos.Y;
} }
} }

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

@ -438,9 +438,9 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, PLAYERstruct& w, P
("y", w.pos.Y) ("y", w.pos.Y)
("z", w.pos.Z) ("z", w.pos.Z)
("lv_sectnum", w.lv_sector) ("lv_sectnum", w.lv_sector)
("lv_x", w.lv_x) ("lv_x", w.lv.X)
("lv_y", w.lv_y) ("lv_y", w.lv.Y)
("lv_z", w.lv_z) ("lv_z", w.lv.Z)
("remote_sprite", w.remoteActor) ("remote_sprite", w.remoteActor)
("remote", w.remote) ("remote", w.remote)
("sop_remote", w.sop_remote) ("sop_remote", w.sop_remote)