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

- SW: Replace PANEL_SPRITEstruct y with pos.Y calls.

Browse source
This commit is contained in:
Mitchell Richters 2021-12-31 00:32:00 +11:00
parent defdb23533
commit 145028bc16
3 changed files with 228 additions and 228 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

File diff suppressed because it is too large Load diff

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

@ -108,7 +108,7 @@ struct PANEL_SPRITEstruct
// Do not change the order of this line // Do not change the order of this line
DVector2 pos; DVector2 pos;
double xorig; double xorig;
double y, yorig; // Do not change the order of this double yorig; // Do not change the order of this
// line // line
PANEL_SPRITE_OVERLAY over[8]; PANEL_SPRITE_OVERLAY over[8];
@ -135,10 +135,10 @@ struct PANEL_SPRITEstruct
// Inline helpers. // Inline helpers.
void backupx() { ox = pos.X; }; void backupx() { ox = pos.X; };
void backupy() { oy = y; }; void backupy() { oy = pos.Y; };
void backupcoords() { backupx(); backupy(); }; void backupcoords() { backupx(); backupy(); };
void backupbobx() { xorig = pos.X; }; void backupbobx() { xorig = pos.X; };
void backupboby() { yorig = y; }; void backupboby() { yorig = pos.Y; };
void backupbobcoords() { backupbobx(); backupboby(); }; void backupbobcoords() { backupbobx(); backupboby(); };
}; };

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

@ -331,7 +331,7 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, PANEL_SPRITEstruct
("ox", w.ox) ("ox", w.ox)
("oy", w.oy) ("oy", w.oy)
("x", w.pos.X) ("x", w.pos.X)
("y", w.y) ("y", w.pos.Y)
.Array("over", w.over, countof(w.over)) .Array("over", w.over, countof(w.over))
("id", w.ID) ("id", w.ID)
("picndx", w.picndx) ("picndx", w.picndx)
@ -367,7 +367,7 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, PANEL_SPRITEstruct
if (arc.isReading()) if (arc.isReading())
{ {
w.ox = w.pos.X; w.ox = w.pos.X;
w.oy = w.y; w.oy = w.pos.Y;
} }
return arc; return arc;
} }