teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 17:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- partial cleanup of SW's game.h

Browse source 
inlined several macros, removed some unused ones, replaced a few with one or two uses and simplified some functions to remove 90's optimizations that these days have no positive effect aside from complicating the code.
This commit is contained in:
Christoph Oelckers 2020-11-23 08:39:20 +01:00
parent 6b889cbb77
commit 35f3de64f7
3 changed files with 41 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
source/sw/src/game.h
View file

@ -272,67 +272,54 @@ int StdRandomRange(int range);
#define DIST(x1, y1, x2, y2) ksqrt( SQ((x1) - (x2)) + SQ((y1) - (y2)) ) #define DIST(x1, y1, x2, y2) ksqrt( SQ((x1) - (x2)) + SQ((y1) - (y2)) )
#define PIC_SIZX(sn) (tilesiz[sprite[sn].picnum].x) inline int PIC_SIZY(int sn)
#define PIC_SIZY(sn) (tilesiz[sprite[sn].picnum].y) {
return tileHeight(sprite[sn].picnum);
}
// Distance macro - tx, ty, tmin are holding vars that must be declared in the routine // Distance macro - tx, ty, tmin are holding vars that must be declared in the routine
// that uses this macro // that uses this macro
#define DISTANCE(x1, y1, x2, y2, dist, tx, ty, tmin) \ inline void DISTANCE(int x1, int y1, int x2, int y2, int& dist, int& tx, int& ty, int& tmin)
{ \ {
tx = abs(x2-x1); \ tx = abs(x2 - x1);
ty = abs(y2-y1); \ ty = abs(y2 - y1);
tmin = min(tx,ty); \ tmin = min(tx, ty);
dist = tx + ty - DIV2(tmin); \ dist = tx + ty - (tmin >> 1);
} }
#define SPRITE_SIZE_X(sp_num) ((sprite[sp_num].xrepeat == 64) ? \ inline int SPRITEp_SIZE_X(const spritetype* sp)
tilesiz[sprite[sp_num].picnum].x : \ {
((sprite[sp_num].xrepeat * tilesiz[sprite[sp_num].picnum].x) >> 6) \ return mulscale6(tileWidth(sp->picnum), sp->xrepeat);
) }
#define SPRITE_SIZE_Y(sp_num) ((sprite[sp_num].yrepeat == 64) ? \ inline int SPRITEp_SIZE_Y(const spritetype* sp)
tilesiz[sprite[sp_num].picnum].y : \ {
((sprite[sp_num].yrepeat * tilesiz[sprite[sp_num].picnum].y) >> 6) \ return mulscale6(tileHeight(sp->picnum), sp->yrepeat);
) }
#define SPRITE_SIZE_Z(sp_num) ((sprite[sp_num].yrepeat == 64) ? \ inline int SPRITEp_SIZE_Z(const spritetype* sp)
Z(tilesiz[sprite[sp_num].picnum].y) : \ {
((sprite[sp_num].yrepeat * tilesiz[sprite[sp_num].picnum].y) << 2) \ return (tileHeight(sp->picnum) * sp->yrepeat) << 2;
) }
#define SPRITEp_SIZE_X(sp) (((sp)->xrepeat == 64) ? \
tilesiz[(sp)->picnum].x : \
(((sp)->xrepeat * tilesiz[(sp)->picnum].x) >> 6) \
)
#define SPRITEp_SIZE_Y(sp) (((sp)->yrepeat == 64) ? \
tilesiz[(sp)->picnum].y : \
(((sp)->yrepeat * tilesiz[(sp)->picnum].y) >> 6) \
)
#define SPRITEp_SIZE_Z(sp) (((sp)->yrepeat == 64) ? \
Z(tilesiz[(sp)->picnum].y) : \
(((sp)->yrepeat * tilesiz[(sp)->picnum].y) << 2) \
)
// Given a z height and sprite return the correct x repeat value
#define SPRITEp_SIZE_X_2_XREPEAT(sp, x) (((x)*64)/tilesiz[(sp)->picnum].x)
// Given a z height and sprite return the correct y repeat value // Given a z height and sprite return the correct y repeat value
#define SPRITEp_SIZE_Z_2_YREPEAT(sp, zh) ((zh)/(4*tilesiz[(sp)->picnum].y)) inline int SPRITEp_SIZE_Z_2_YREPEAT(const spritetype* sp, int zh)
#define SPRITEp_SIZE_Y_2_YREPEAT(sp, y) (((y)*64)/tilesiz[(sp)->picnum].y) {
return zh / (4 * tileHeight(sp->picnum));
}
// x & y offset of tile
#define TILE_XOFF(picnum) (tileLeftOffset(picnum))
#define TILE_YOFF(picnum) (tileTopOffset(picnum))
// x & y offset of current sprite tile
#define SPRITEp_XOFF(sp) (tileLeftOffset((sp)->picnum))
#define SPRITEp_YOFF(sp) (tileTopOffset((sp)->picnum))
// Z size of top (TOS) and bottom (BOS) part of sprite // Z size of top (TOS) and bottom (BOS) part of sprite
#define SPRITEp_SIZE_TOS(sp) (DIV2(SPRITEp_SIZE_Z(sp)) + Z(SPRITEp_YOFF(sp))) inline int SPRITEp_SIZE_TOS(const spritetype* sp)
#define SPRITEp_SIZE_BOS(sp) (DIV2(SPRITEp_SIZE_Z(sp)) - Z(SPRITEp_YOFF(sp))) {
return (DIV2(SPRITEp_SIZE_Z(sp)) + (tileTopOffset(sp->picnum) << 8));
}
inline int SPRITEp_SIZE_BOS(const spritetype* sp)
{
return (DIV2(SPRITEp_SIZE_Z(sp)) - (tileTopOffset(sp->picnum) << 8));
}
// actual Z for TOS and BOS - handles both WYSIWYG and old style // actual Z for TOS and BOS - handles both WYSIWYG and old style
#define SPRITEp_TOS(sp) (TEST((sp)->cstat, CSTAT_SPRITE_YCENTER) ? \ #define SPRITEp_TOS(sp) (TEST((sp)->cstat, CSTAT_SPRITE_YCENTER) ? \

5
source/sw/src/player.cpp
View file

@ -6304,7 +6304,8 @@ SPRITEp DoPlayerDeathCheckKick(PLAYERp pp)
SPRITEp sp = pp->SpriteP, hp; SPRITEp sp = pp->SpriteP, hp;
USERp u = User[pp->PlayerSprite], hu; USERp u = User[pp->PlayerSprite], hu;
int i; int i;
unsigned stat,dist; unsigned stat;
int dist;
int a,b,c; int a,b,c;
for (stat = 0; stat < SIZ(StatDamageList); stat++) for (stat = 0; stat < SIZ(StatDamageList); stat++)
@ -6324,7 +6325,7 @@ SPRITEp DoPlayerDeathCheckKick(PLAYERp pp)
DISTANCE(hp->x, hp->y, sp->x, sp->y, dist, a, b, c); DISTANCE(hp->x, hp->y, sp->x, sp->y, dist, a, b, c);
if (dist < hu->Radius + 100) if (unsigned(dist) < hu->Radius + 100)
{ {
pp->Killer = i; pp->Killer = i;

4
source/sw/src/skull.cpp
View file

@ -245,7 +245,7 @@ SetupSkull(short SpriteNum)
if (SPRITEp_BOS(sp) > u->loz - Z(16)) if (SPRITEp_BOS(sp) > u->loz - Z(16))
{ {
sp->z = u->loz + Z(SPRITEp_YOFF(sp)); sp->z = u->loz + Z(tileTopOffset(sp->picnum));
u->loz = sp->z; u->loz = sp->z;
// leave 8 pixels above the ground // leave 8 pixels above the ground
@ -663,7 +663,7 @@ SetupBetty(short SpriteNum)
if (SPRITEp_BOS(sp) > u->loz - Z(16)) if (SPRITEp_BOS(sp) > u->loz - Z(16))
{ {
sp->z = u->loz + Z(SPRITEp_YOFF(sp)); sp->z = u->loz + Z(tileTopOffset(sp->picnum));
u->loz = sp->z; u->loz = sp->z;
// leave 8 pixels above the ground // leave 8 pixels above the ground