zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-21 19:11:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke: Replace player_orig ox with opos.X calls.

Browse source
This commit is contained in:
Mitchell Richters 2021-12-30 22:19:38 +11:00
parent 8a94022f5d
commit c5d94f9a8e
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/games/duke/src/actors.cpp
View file

@ -2860,7 +2860,7 @@ void handle_se14(DDukeActor* actor, bool checkstat, int RPG, int JIBS6)
{ {
if (po[p].os == actor->spr.sector()) if (po[p].os == actor->spr.sector())
{ {
po[p].ox += m; po[p].opos.X += m;
po[p].oy += x; po[p].oy += x;
} }
@ -3052,7 +3052,7 @@ void handle_se30(DDukeActor *actor, int JIBS6)
if (po[p].os == actor->spr.sector()) if (po[p].os == actor->spr.sector())
{ {
po[p].ox += l; po[p].opos.X += l;
po[p].oy += x; po[p].oy += x;
} }
} }

4
source/games/duke/src/premap.cpp
View file

@ -60,7 +60,7 @@ void pickrandomspot(int snum)
i = krand()%numplayersprites; i = krand()%numplayersprites;
else i = snum; else i = snum;
p->bobposx = p->opos.X = p->pos.X = po[i].ox; p->bobposx = p->opos.X = p->pos.X = po[i].opos.X;
p->bobposy = p->opos.Y = p->pos.Y = po[i].oy; p->bobposy = p->opos.Y = p->pos.Y = po[i].oy;
p->opos.Z = p->pos.Z = po[i].oz; p->opos.Z = p->pos.Z = po[i].oz;
p->angle.oang = p->angle.ang = buildang(po[i].oa); p->angle.oang = p->angle.ang = buildang(po[i].oa);
@ -581,7 +581,7 @@ void resetpspritevars(int g)
firsty = ps[0].pos.Y; firsty = ps[0].pos.Y;
} }
po[numplayersprites].ox = act->spr.pos.X; po[numplayersprites].opos.X = act->spr.pos.X;
po[numplayersprites].oy = act->spr.pos.Y; po[numplayersprites].oy = act->spr.pos.Y;
po[numplayersprites].oz = act->spr.pos.Z; po[numplayersprites].oz = act->spr.pos.Z;
po[numplayersprites].oa = act->spr.ang; po[numplayersprites].oa = act->spr.ang;

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

@ -93,7 +93,7 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, player_orig& w, pl
{ {
if (arc.BeginObject(keyname)) if (arc.BeginObject(keyname))
{ {
arc("ox", w.ox) arc("ox", w.opos.X)
("oy", w.oy) ("oy", w.oy)
("oz", w.oz) ("oz", w.oz)
("oa", w.oa) ("oa", w.oa)

3
source/games/duke/src/types.h
View file

@ -156,7 +156,8 @@ struct user_defs
struct player_orig struct player_orig
{ {
int ox, oy, oz; vec3_t opos;
int oy, oz;
short oa; short oa;
sectortype* os; sectortype* os;
}; };