- remove bitwise & operations on calls to calcSinTableValue() since they're no longer necessary, and remove last use of sintable[] from hudweapon_d.cpp.

This commit is contained in:
Mitchell Richters 2020-08-03 09:19:14 +10:00
parent ae2d2c7948
commit 70794df76c

View file

@ -70,9 +70,9 @@ void displayloogie(short snum)
y = (ps[snum].loogcnt << 2); y = (ps[snum].loogcnt << 2);
for (i = 0; i < ps[snum].numloogs; i++) for (i = 0; i < ps[snum].numloogs; i++)
{ {
a = abs(sintable[((ps[snum].loogcnt + i) << 5) & 2047]) >> 5; a = abs(xs_CRoundToInt(calcSinTableValue((ps[snum].loogcnt + i) << 5))) >> 5;
z = 4096 + ((ps[snum].loogcnt + i) << 9); z = 4096 + ((ps[snum].loogcnt + i) << 9);
x = (-getavel(snum)) + (calcSinTableValue(((ps[snum].loogcnt + i) << 6) & 2047) / 1024.); x = (-getavel(snum)) + (calcSinTableValue((ps[snum].loogcnt + i) << 6) / 1024.);
hud_drawsprite( hud_drawsprite(
(ps[snum].loogiex[i] + x), (200 + ps[snum].loogiey[i] - y), z - (i << 8), 256 - a, (ps[snum].loogiex[i] + x), (200 + ps[snum].loogiey[i] - y), z - (i << 8), 256 - a,
@ -98,7 +98,7 @@ int animatefist(int gs, int snum)
looking_arc = fabs(ps[snum].q16look_ang / (double)(FRACUNIT)) / 9.; looking_arc = fabs(ps[snum].q16look_ang / (double)(FRACUNIT)) / 9.;
fistzoom = 65536L - (sintable[(512 + (fisti << 6)) & 2047] << 2); fistzoom = 65536L - (calcSinTableValue(512 + (fisti << 6)) * 4);
if (fistzoom > 90612L) if (fistzoom > 90612L)
fistzoom = 90612L; fistzoom = 90612L;
if (fistzoom < 40920) if (fistzoom < 40920)
@ -369,14 +369,14 @@ void displayweapon_d(int snum, double smoothratio)
fistsign += i >> 1; fistsign += i >> 1;
} }
cw = weapon_xoffset; cw = weapon_xoffset;
weapon_xoffset += calcSinTableValue(fistsign & 2047) / 1024.; weapon_xoffset += calcSinTableValue(fistsign) / 1024.;
hud_draw(weapon_xoffset + 250 - p->lookanghalf(), hud_draw(weapon_xoffset + 250 - p->lookanghalf(),
looking_arc + 258 - (fabs(calcSinTableValue(fistsign & 2047) / 256.)), looking_arc + 258 - (fabs(calcSinTableValue(fistsign) / 256.)),
FIST, gs, o); FIST, gs, o);
weapon_xoffset = cw; weapon_xoffset = cw;
weapon_xoffset -= calcSinTableValue(fistsign & 2047) / 1024.; weapon_xoffset -= calcSinTableValue(fistsign) / 1024.;
hud_draw(weapon_xoffset + 40 - p->lookanghalf(), hud_draw(weapon_xoffset + 40 - p->lookanghalf(),
looking_arc + 200 + (fabs(calcSinTableValue(fistsign & 2047) / 256.)), looking_arc + 200 + (fabs(calcSinTableValue(fistsign) / 256.)),
FIST, gs, o | 4); FIST, gs, o | 4);
} }
else else
@ -460,8 +460,8 @@ void displayweapon_d(int snum, double smoothratio)
pal = 1; pal = 1;
else pal = sector[p->cursectnum].floorpal; else pal = sector[p->cursectnum].floorpal;
weapon_xoffset -= calcSinTableValue((768 + (p->kickback_pic << 7)) & 2047) / 2048.; weapon_xoffset -= calcSinTableValue(768 + (p->kickback_pic << 7)) / 2048.;
gun_pos += calcSinTableValue((768 + (p->kickback_pic << 7)) & 2047) / 2048.; gun_pos += calcSinTableValue(768 + (p->kickback_pic << 7)) / 2048.;
if (*kb > 0) if (*kb > 0)
{ {
@ -1127,7 +1127,7 @@ void displayweapon_d(int snum, double smoothratio)
hud_drawpal(weapon_xoffset + 184 - p->lookanghalf(), hud_drawpal(weapon_xoffset + 184 - p->lookanghalf(),
looking_arc + 240 - gun_pos, SHRINKER + 2, looking_arc + 240 - gun_pos, SHRINKER + 2,
16 - (calcSinTableValue(p->random_club_frame & 2047) / 1024.), 16 - (calcSinTableValue(p->random_club_frame) / 1024.),
o, 0); o, 0);
hud_drawpal(weapon_xoffset + 188 - p->lookanghalf(), hud_drawpal(weapon_xoffset + 188 - p->lookanghalf(),
@ -1284,7 +1284,7 @@ void displayweapon_d(int snum, double smoothratio)
{ {
hud_drawpal(weapon_xoffset + 184 - p->lookanghalf(), hud_drawpal(weapon_xoffset + 184 - p->lookanghalf(),
looking_arc + 240 - gun_pos, SHRINKER + 2, looking_arc + 240 - gun_pos, SHRINKER + 2,
16 - (calcSinTableValue(p->random_club_frame & 2047) / 1024.), 16 - (calcSinTableValue(p->random_club_frame) / 1024.),
o, 2); o, 2);
hud_drawpal(weapon_xoffset + 188 - p->lookanghalf(), hud_drawpal(weapon_xoffset + 188 - p->lookanghalf(),
@ -1294,7 +1294,7 @@ void displayweapon_d(int snum, double smoothratio)
{ {
hud_drawpal(weapon_xoffset + 184 - p->lookanghalf(), hud_drawpal(weapon_xoffset + 184 - p->lookanghalf(),
looking_arc + 240 - gun_pos, SHRINKER + 2, looking_arc + 240 - gun_pos, SHRINKER + 2,
16 - (calcSinTableValue(p->random_club_frame & 2047) / 1024.), 16 - (calcSinTableValue(p->random_club_frame) / 1024.),
o, 0); o, 0);
hud_drawpal(weapon_xoffset + 188 - p->lookanghalf(), hud_drawpal(weapon_xoffset + 188 - p->lookanghalf(),