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

- Duke: Store some repeated aplWeapon*() calls.

Browse source
This commit is contained in:
Mitchell Richters 2022-10-14 12:19:36 +11:00 committed by Christoph Oelckers
parent 59bafd6a37
commit c48e95a710
1 changed files with 33 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
source/games/duke/src/hudweapon_d.cpp
View file

@ -281,6 +281,10 @@ void displayweapon_d(int snum, double interpfrac)
} }
else else
{ {
auto weapTotalTime = aplWeaponTotalTime(p->curr_weapon, snum);
auto weapFireDelay = aplWeaponFireDelay(p->curr_weapon, snum);
auto weapReload = aplWeaponReload(p->curr_weapon, snum);
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// //
// //
@ -343,15 +347,15 @@ void displayweapon_d(int snum, double interpfrac)
else if (isWW2GI()) else if (isWW2GI())
{ {
// else we are in 'reload time' // else we are in 'reload time'
if (*kb < ((aplWeaponReload(p->curr_weapon, snum) - aplWeaponTotalTime(p->curr_weapon, snum)) / 2 + aplWeaponTotalTime(p->curr_weapon, snum))) if (*kb < ((weapReload - weapTotalTime) / 2 + weapTotalTime))
{ {
// down // down
offsets.Y += 10 * (kickback_pic - aplWeaponTotalTime(p->curr_weapon, snum)); //D offsets.Y += 10 * (kickback_pic - weapTotalTime); //D
} }
else else
{ {
// up and left // up and left
offsets.Y += 10 * (aplWeaponReload(p->curr_weapon, snum) - kickback_pic); //U offsets.Y += 10 * (weapReload - kickback_pic); //U
} }
} }
} }
@ -386,15 +390,15 @@ void displayweapon_d(int snum, double interpfrac)
pic += 1; pic += 1;
} }
// else we are in 'reload time' // else we are in 'reload time'
else if (*kb < ((aplWeaponReload(p->curr_weapon, snum) - aplWeaponTotalTime(p->curr_weapon, snum)) / 2 + aplWeaponTotalTime(p->curr_weapon, snum))) else if (*kb < ((weapReload - weapTotalTime) / 2 + weapTotalTime))
{ {
// down // down
offsets.Y += 10 * (kickback_pic - aplWeaponTotalTime(p->curr_weapon, snum)); //D offsets.Y += 10 * (kickback_pic - weapTotalTime); //D
} }
else else
{ {
// up and left // up and left
offsets.Y += 10 * (aplWeaponReload(p->curr_weapon, snum) - kickback_pic); //U offsets.Y += 10 * (weapReload - kickback_pic); //U
} }
hud_drawpal(146 + offsets.X, 202 + offsets.Y, pic, shade, o, pal, angle); hud_drawpal(146 + offsets.X, 202 + offsets.Y, pic, shade, o, pal, angle);
@ -502,27 +506,27 @@ void displayweapon_d(int snum, double interpfrac)
double adj; double adj;
int pic; int pic;
const int iFifths = max((aplWeaponReload(p->curr_weapon, snum) - aplWeaponTotalTime(p->curr_weapon, snum)) / 5, 1); const int iFifths = max((weapReload - weapTotalTime) / 5, 1);
if (*kb < (iFifths + aplWeaponTotalTime(p->curr_weapon, snum))) if (*kb < (iFifths + weapTotalTime))
{ {
// first segment // first segment
pic = 2519; pic = 2519;
adj = 80 - (10 * (aplWeaponTotalTime(p->curr_weapon, snum) + iFifths - kickback_pic)); adj = 80 - (10 * (weapTotalTime + iFifths - kickback_pic));
} }
else if (*kb < (iFifths * 2 + aplWeaponTotalTime(p->curr_weapon, snum))) else if (*kb < (iFifths * 2 + weapTotalTime))
{ {
// second segment (down) // second segment (down)
pic = 2518; pic = 2518;
adj = 80; adj = 80;
} }
else if (*kb < (iFifths * 3 + aplWeaponTotalTime(p->curr_weapon, snum))) else if (*kb < (iFifths * 3 + weapTotalTime))
{ {
// third segment (up) // third segment (up)
pic = 2517; pic = 2517;
adj = 80; adj = 80;
} }
else if (*kb < (iFifths * 4 + aplWeaponTotalTime(p->curr_weapon, snum))) else if (*kb < (iFifths * 4 + weapTotalTime))
{ {
// fourth segment (down) // fourth segment (down)
pic = 2518; pic = 2518;
@ -532,7 +536,7 @@ void displayweapon_d(int snum, double interpfrac)
{ {
// up and left // up and left
pic = 2519; pic = 2519;
adj = 10 * (aplWeaponReload(p->curr_weapon, snum) - kickback_pic); adj = 10 * (weapReload - kickback_pic);
} }
hud_drawpal(168 + offsets.X + adj, 260 + offsets.Y - adj, pic, shade, o, pal, angle); hud_drawpal(168 + offsets.X + adj, 260 + offsets.Y - adj, pic, shade, o, pal, angle);
@ -712,7 +716,7 @@ void displayweapon_d(int snum, double interpfrac)
{ {
if (*kb) if (*kb)
{ {
if (*kb < aplWeaponTotalTime(p->curr_weapon, snum)) if (*kb < weapTotalTime)
{ {
const int i = Sgn(*kb >> 2); const int i = Sgn(*kb >> 2);
@ -728,10 +732,10 @@ void displayweapon_d(int snum, double interpfrac)
} }
} }
// else we are in 'reload time' // else we are in 'reload time'
else if (*kb < ((aplWeaponReload(p->curr_weapon, snum) - aplWeaponTotalTime(p->curr_weapon, snum)) / 2 + aplWeaponTotalTime(p->curr_weapon, snum))) else if (*kb < ((weapReload - weapTotalTime) / 2 + weapTotalTime))
{ {
// down // down
offsets.Y += 10 * (kickback_pic - aplWeaponTotalTime(p->curr_weapon, snum)); //D offsets.Y += 10 * (kickback_pic - weapTotalTime); //D
// offsets.X += 80 * (*kb - aplWeaponTotalTime[cw][snum]); // offsets.X += 80 * (*kb - aplWeaponTotalTime[cw][snum]);
hud_drawpal(268 + offsets.X, 238 + offsets.Y, DEVISTATOR, shade, o, pal, angle); hud_drawpal(268 + offsets.X, 238 + offsets.Y, DEVISTATOR, shade, o, pal, angle);
hud_drawpal(30 + offsets.X, 240 + offsets.Y, DEVISTATOR, shade, o | 4, pal, angle); hud_drawpal(30 + offsets.X, 240 + offsets.Y, DEVISTATOR, shade, o | 4, pal, angle);
@ -739,7 +743,7 @@ void displayweapon_d(int snum, double interpfrac)
else else
{ {
// up and left // up and left
offsets.Y += 10 * (aplWeaponReload(p->curr_weapon, snum) - kickback_pic); //U offsets.Y += 10 * (weapReload - kickback_pic); //U
// offsets.X += 80 * (*kb - aplWeaponTotalTime[cw][snum]); // offsets.X += 80 * (*kb - aplWeaponTotalTime[cw][snum]);
hud_drawpal(268 + offsets.X, 238 + offsets.Y, DEVISTATOR, shade, o, pal, angle); hud_drawpal(268 + offsets.X, 238 + offsets.Y, DEVISTATOR, shade, o, pal, angle);
hud_drawpal(30 + offsets.X, 240 + offsets.Y, DEVISTATOR, shade, o | 4, pal, angle); hud_drawpal(30 + offsets.X, 240 + offsets.Y, DEVISTATOR, shade, o | 4, pal, angle);
@ -849,24 +853,24 @@ void displayweapon_d(int snum, double interpfrac)
} }
if (*kb < aplWeaponTotalTime(p->curr_weapon, snum)) if (*kb < weapTotalTime)
{ {
if (!(*kb < aplWeaponFireDelay(p->curr_weapon, snum))) if (!(*kb < weapFireDelay))
{ {
// lower weapon to reload cartridge (not clip) // lower weapon to reload cartridge (not clip)
offsets.Y += 10 * (aplWeaponTotalTime(p->curr_weapon, snum) - kickback_pic); offsets.Y += 10 * (weapTotalTime - kickback_pic);
} }
} }
// else we are in 'reload time' // else we are in 'reload time'
else if (*kb < ((aplWeaponReload(p->curr_weapon, snum) - aplWeaponTotalTime(p->curr_weapon, snum)) / 2 + aplWeaponTotalTime(p->curr_weapon, snum))) else if (*kb < ((weapReload - weapTotalTime) / 2 + weapTotalTime))
{ {
// down // down
offsets.Y += 10 * (kickback_pic - aplWeaponTotalTime(p->curr_weapon, snum)); //D offsets.Y += 10 * (kickback_pic - weapTotalTime); //D
} }
else else
{ {
// up // up
offsets.Y += 10 * (aplWeaponReload(p->curr_weapon, snum) - kickback_pic); //U offsets.Y += 10 * (weapReload - kickback_pic); //U
} }
// draw weapon // draw weapon
@ -898,24 +902,24 @@ void displayweapon_d(int snum, double interpfrac)
offsets.Y -= rand() & 3; offsets.Y -= rand() & 3;
} }
if (*kb < aplWeaponTotalTime(p->curr_weapon, snum)) if (*kb < weapTotalTime)
{ {
if (!(*kb < aplWeaponFireDelay(p->curr_weapon, snum))) if (!(*kb < weapFireDelay))
{ {
// lower weapon to reload cartridge (not clip) // lower weapon to reload cartridge (not clip)
offsets.Y += 15 * (aplWeaponTotalTime(p->curr_weapon, snum) - kickback_pic); offsets.Y += 15 * (weapTotalTime - kickback_pic);
} }
} }
// else we are in 'reload time' // else we are in 'reload time'
else if (*kb < ((aplWeaponReload(p->curr_weapon, snum) - aplWeaponTotalTime(p->curr_weapon, snum)) / 2 + aplWeaponTotalTime(p->curr_weapon, snum))) else if (*kb < ((weapReload - weapTotalTime) / 2 + weapTotalTime))
{ {
// down // down
offsets.Y += 5 * (kickback_pic - aplWeaponTotalTime(p->curr_weapon, snum)); offsets.Y += 5 * (kickback_pic - weapTotalTime);
} }
else else
{ {
// up // up
offsets.Y += 10 * (aplWeaponReload(p->curr_weapon, snum) - kickback_pic); offsets.Y += 10 * (weapReload - kickback_pic);
} }
// display weapon // display weapon