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

- Duke: Tidy up old multiplayer variables to modern standards.

Browse source
This commit is contained in:
Mitchell Richters 2022-09-08 20:47:21 +10:00 committed by Christoph Oelckers
parent e737551b64
commit ea3ca4a4ea
5 changed files with 33 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -305,9 +305,7 @@ void animatesprites_d(tspriteArray& tsprites, int x, int y, int a, double interp
#if 0 // multiplayer only
if (screenpeek == myconnectindex && numplayers >= 2)
{
t->x = interpolatedvalue(omyx, myx, interpfrac);
t->y = interpolatedvalue(omyy, myy, interpfrac);
t->z = interpolatedvalue(omyz, myz, interpfrac) + gs_playerheight;
t->pos = interpolatedvalue(omypos, mypos, interpfrac).plusZ(gs_playerheight);
t->ang = interpolatedvalue(omyang, myang, interpfrac).asbuild();
t->sector = mycursectnum;
}

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

@ -347,9 +347,7 @@ void animatesprites_r(tspriteArray& tsprites, int x, int y, int a, double interp
#if 0 // multiplayer only
if (screenpeek == myconnectindex && numplayers >= 2)
{
t->x = interpolatedvalue(omyx, myx, interpfrac);
t->y = interpolatedvalue(omyy, myy, interpfrac);
t->z = interpolatedvalue(omyz, myz, interpfrac) + gs.playerheight;
t->pos = interpolatedvalue(omypos, mypos, interpfrac).plusZ(gs_playerheight);
t->ang = interpolatedvalue(omyang, myang, interpfrac).asbuild();
t->sector = mycursectnum;
}

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

@ -266,7 +266,7 @@ void drawoverlays(double interpfrac)
{
if (screenpeek == myconnectindex && numplayers > 1)
{
cposxy = DVector2(interpolatedvalue(omyx, myx, interpfrac), interpolatedvalue(omyy, myy, interpfrac)) * inttoworld;
cposxy = interpolatedvalue(omypos, mypos, interpfrac).XY();
cang = !SyncInput() ? myang : interpolatedvalue(omyang, myang, interpfrac);
}
else

57
source/games/duke/src/prediction.cpp
View file

@ -36,7 +36,8 @@ Modifications for JonoF's port by Jonathon Fowler (jf@jonof.id.au)
BEGIN_DUKE_NS
int myx, omyx, myxvel, myy, omyy, myyvel, myz, omyz, myzvel;
DVector3 omypos, mypos;
int myxvel, myyvel, myzvel;
int globalskillsound;
DAngle myang, omyang;
fixedhoriz myhoriz, omyhoriz, myhorizoff, omyhorizoff;
@ -50,9 +51,7 @@ short myangbak[MOVEFIFOSIZ];
void resetmys()
{
myx = omyx = ps[myconnectindex].pos.X;
myy = omyy = ps[myconnectindex].pos.Y;
myz = omyz = ps[myconnectindex].pos.Z;
mypos = omypos = ps[myconnectindex].pos;
myxvel = myyvel = myzvel = 0;
myang = ps[myconnectindex].angle.ang;
myhoriz = omyhoriz = ps[myconnectindex].horizon.horiz;
@ -67,32 +66,34 @@ void resetmys()
#if 0 // todo: fix this when networking works again
void fakedomovethingscorrect(void)
{
int i;
player_struct* p;
int i;
player_struct* p;
if (numplayers < 2) return;
if (numplayers < 2) return;
i = ((movefifoplc-1)&(MOVEFIFOSIZ-1));
p = &ps[myconnectindex];
i = ((movefifoplc-1)&(MOVEFIFOSIZ-1));
p = &ps[myconnectindex];
if (p->pos.x == myxbak[i] && p->pos.y == myybak[i] && p->pos.z == myzbak[i]
&& p->horiz == myhorizbak[i] && p->ang == myangbak[i]) return;
if (p->pos.x == myxbak[i] && p->pos.y == myybak[i] && p->pos.z == myzbak[i]
&& p->horiz == myhorizbak[i] && p->ang == myangbak[i]) return;
myx = p->pos.x; omyx = p->oposx; myxvel = p->posxv;
myy = p->pos.y; omyy = p->oposy; myyvel = p->posyv;
myz = p->pos.z; omyz = p->oposz; myzvel = p->poszv;
myang = p->ang; omyang = p->oang;
mycursectnum = p->cursector;
myhoriz = p->horiz; omyhoriz = p->ohoriz;
myhorizoff = p->horizoff; omyhorizoff = p->ohorizoff;
myjumpingcounter = p->jumping_counter;
myjumpingtoggle = p->jumping_toggle;
myonground = p->on_ground;
myhardlanding = p->hard_landing;
omypos = p->opos;
mypos = p->pos;
myxvel = p->vel.X;
myyvel = p->vel.Y;
myzvel = p->vel.Z;
myang = p->ang; omyang = p->oang;
mycursectnum = p->cursector;
myhoriz = p->horiz; omyhoriz = p->ohoriz;
myhorizoff = p->horizoff; omyhorizoff = p->ohorizoff;
myjumpingcounter = p->jumping_counter;
myjumpingtoggle = p->jumping_toggle;
myonground = p->on_ground;
myhardlanding = p->hard_landing;
fakemovefifoplc = movefifoplc;
while (fakemovefifoplc < movefifoend[myconnectindex])
fakedomovethings();
fakemovefifoplc = movefifoplc;
while (fakemovefifoplc < movefifoend[myconnectindex])
fakedomovethings();
}
@ -124,13 +125,11 @@ void fakedomovethings(void)
if( ud.clipping == 0 && ( psect->floorpicnum == MIRROR || psect == nullptr) )
{
myx = omyx;
myy = omyy;
mypos.XY() = omypos.XY();
}
else
{
omyx = myx;
omyy = myy;
omypos.XY() = mypos.XY();
}
omyhoriz = myhoriz;

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

@ -2,7 +2,8 @@
BEGIN_DUKE_NS
extern int myx, omyx, myxvel, myy, omyy, myyvel, myz, omyz, myzvel;
extern DVector3 omypos, mypos;
extern int myxvel, myyvel, myzvel;
extern int globalskillsound;
extern int mycursectnum, myjumpingcounter;
extern DAngle myang, omyang;