zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-13 12:32:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SW: Replace PANEL_SPRITEstruct yorig with bobpos.Y calls.

Browse source
This commit is contained in:
Mitchell Richters 2021-12-31 00:36:13 +11:00
parent d8aab1ecea
commit dc50ad154e
3 changed files with 25 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
source/games/sw/src/panel.cpp
View file

@ -1164,11 +1164,11 @@ void pSwordRest(PANEL_SPRITEp psp)
if (pWeaponHideKeys(psp, ps_SwordHide)) if (pWeaponHideKeys(psp, ps_SwordHide))
return; return;
psp->yorig += synctics; psp->bobpos.Y += synctics;
if (psp->yorig > SWORD_YOFF) if (psp->bobpos.Y > SWORD_YOFF)
{ {
psp->yorig = SWORD_YOFF; psp->bobpos.Y = SWORD_YOFF;
} }
pSwordBobSetup(psp); pSwordBobSetup(psp);
@ -2421,7 +2421,7 @@ void pUziShell(PANEL_SPRITEp psp)
psp->sin_ndx = (psp->sin_ndx + (synctics << psp->sin_arc_speed) + 1024) & 1023; psp->sin_ndx = (psp->sin_ndx + (synctics << psp->sin_arc_speed) + 1024) & 1023;
// get height // get height
psp->opos.Y = psp->pos.Y = psp->yorig; psp->opos.Y = psp->pos.Y = psp->bobpos.Y;
psp->pos.Y += psp->sin_amt * -bsinf(psp->sin_ndx, -14); psp->pos.Y += psp->sin_amt * -bsinf(psp->sin_ndx, -14);
// if off of the screen kill them // if off of the screen kill them
@ -4460,11 +4460,11 @@ void pHeartRest(PANEL_SPRITEp psp)
if (pWeaponHideKeys(psp, ps_HeartHide)) if (pWeaponHideKeys(psp, ps_HeartHide))
return; return;
psp->yorig += synctics; psp->bobpos.Y += synctics;
if (psp->yorig > HEART_YOFF) if (psp->bobpos.Y > HEART_YOFF)
{ {
psp->yorig = HEART_YOFF; psp->bobpos.Y = HEART_YOFF;
} }
pHeartBobSetup(psp); pHeartBobSetup(psp);
@ -4493,11 +4493,11 @@ void pHeartRest(PANEL_SPRITEp psp)
void pHeartAction(PANEL_SPRITEp psp) void pHeartAction(PANEL_SPRITEp psp)
{ {
psp->yorig -= synctics; psp->bobpos.Y -= synctics;
if (psp->yorig < 200) if (psp->bobpos.Y < 200)
{ {
psp->yorig = 200; psp->bobpos.Y = 200;
} }
pHeartBobSetup(psp); pHeartBobSetup(psp);
@ -4506,15 +4506,15 @@ void pHeartAction(PANEL_SPRITEp psp)
void pHeartActionBlood(PANEL_SPRITEp psp) void pHeartActionBlood(PANEL_SPRITEp psp)
{ {
psp->yorig -= synctics; psp->bobpos.Y -= synctics;
if (psp->yorig < 200) if (psp->bobpos.Y < 200)
{ {
psp->yorig = 200; psp->bobpos.Y = 200;
} }
psp->backupy(); psp->backupy();
psp->pos.Y = psp->yorig; psp->pos.Y = psp->bobpos.Y;
pHeartBobSetup(psp); pHeartBobSetup(psp);
pWeaponBob(psp, PLAYER_MOVING(psp->PlayerP)); pWeaponBob(psp, PLAYER_MOVING(psp->PlayerP));
@ -6019,11 +6019,11 @@ void pFistRest(PANEL_SPRITEp psp)
if (pWeaponHideKeys(psp, ps_FistHide)) if (pWeaponHideKeys(psp, ps_FistHide))
return; return;
psp->yorig += synctics; psp->bobpos.Y += synctics;
if (psp->yorig > FIST_YOFF) if (psp->bobpos.Y > FIST_YOFF)
{ {
psp->yorig = FIST_YOFF; psp->bobpos.Y = FIST_YOFF;
} }
pFistBobSetup(psp); pFistBobSetup(psp);
@ -6086,11 +6086,11 @@ void pFistRetract(PANEL_SPRITEp psp)
void pFistBlock(PANEL_SPRITEp psp) void pFistBlock(PANEL_SPRITEp psp)
{ {
psp->yorig += synctics; psp->bobpos.Y += synctics;
if (psp->yorig > FIST_YOFF) if (psp->bobpos.Y > FIST_YOFF)
{ {
psp->yorig = FIST_YOFF; psp->bobpos.Y = FIST_YOFF;
} }
pFistBobSetup(psp); pFistBobSetup(psp);
@ -6358,7 +6358,7 @@ void pWeaponBob(PANEL_SPRITEp psp, short condition)
psp->backupcoords(); psp->backupcoords();
psp->pos.X = psp->bobpos.X + xdiff; psp->pos.X = psp->bobpos.X + xdiff;
psp->pos.Y = psp->yorig + ydiff + UziRecoilYadj; psp->pos.Y = psp->bobpos.Y + ydiff + UziRecoilYadj;
} }

10
source/games/sw/src/panel.h
View file

@ -105,15 +105,11 @@ struct PANEL_SPRITEstruct
PANEL_SPRITEp sibling; PANEL_SPRITEp sibling;
PANEL_STATEp State, RetractState, PresentState, ActionState, RestState; PANEL_STATEp State, RetractState, PresentState, ActionState, RestState;
PLAYERp PlayerP; PLAYERp PlayerP;
// Do not change the order of this line
DVector2 pos, opos, bobpos; DVector2 pos, opos, bobpos;
double yorig; // Do not change the order of this
// line
PANEL_SPRITE_OVERLAY over[8]; PANEL_SPRITE_OVERLAY over[8];
PANEL_SPRITE_FUNCp PanelSpriteFunc; PANEL_SPRITE_FUNCp PanelSpriteFunc;
short ID; // id for finding sprite types on the short ID; // id for finding sprite types on the list
// list
short picndx; // for pip stuff in conpic.h short picndx; // for pip stuff in conpic.h
short picnum; // bypass pip stuff in conpic.h short picnum; // bypass pip stuff in conpic.h
short vel, vel_adj; short vel, vel_adj;
@ -134,8 +130,8 @@ struct PANEL_SPRITEstruct
void backupy() { opos.Y = pos.Y; }; void backupy() { opos.Y = pos.Y; };
void backupcoords() { opos = pos; }; void backupcoords() { opos = pos; };
void backupbobx() { bobpos.X = pos.X; }; void backupbobx() { bobpos.X = pos.X; };
void backupboby() { yorig = pos.Y; }; void backupboby() { bobpos.Y = pos.Y; };
void backupbobcoords() { backupbobx(); backupboby(); }; void backupbobcoords() { bobpos = pos; };
}; };
typedef struct typedef struct

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

@ -339,7 +339,7 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, PANEL_SPRITEstruct
("vel", w.vel) ("vel", w.vel)
("vel_adj", w.vel_adj) ("vel_adj", w.vel_adj)
("xorig", w.bobpos.X) ("xorig", w.bobpos.X)
("yorig", w.yorig) ("yorig", w.bobpos.Y)
("flags", w.flags) ("flags", w.flags)
("priority", w.priority) ("priority", w.priority)
("scale", w.scale) ("scale", w.scale)