teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-31 13:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke: Move displaygrower_ww() lambda to new weapon offsets.

Browse source
This commit is contained in:
Mitchell Richters 2022-10-14 00:33:43 +11:00 committed by Christoph Oelckers
parent 68291bb595
commit ec3ccc18a5
1 changed files with 12 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -935,67 +935,44 @@ void displayweapon_d(int snum, double interpfrac)
auto displaygrower_ww = [&]
{
weapon_xoffset += 28;
looking_arc += 18;
offsets.X += weapon_xoffset + 28;
offsets.Y -= gun_pos - 18;
if (*kb == 0)
{
{
hud_drawpal(weapon_xoffset + 188 - look_anghalf,
looking_arc + 240 - gun_pos, SHRINKER - 2, shade, o, pal);
}
hud_drawpal(188 + offsets.X, 240 + offsets.Y, SHRINKER - 2, shade, o, pal, angle);
}
else
{
if (p->GetActor()->spr.pal != 1)
{
weapon_xoffset += rand() & 3;
gun_pos += (rand() & 3);
offsets.X += rand() & 3;
offsets.Y -= rand() & 3;
}
if (*kb < aplWeaponTotalTime(p->curr_weapon, snum))
{
if (*kb < aplWeaponFireDelay(p->curr_weapon, snum))
if (!(*kb < aplWeaponFireDelay(p->curr_weapon, snum)))
{
// before fire time.
// nothing to modify
}
else
{
// after fire time.
// lower weapon to reload cartridge (not clip)
gun_pos -= 15 * (aplWeaponTotalTime(p->curr_weapon, snum) - kickback_pic);
offsets.Y += 15 * (aplWeaponTotalTime(p->curr_weapon, snum) - kickback_pic);
}
}
// 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 < ((aplWeaponReload(p->curr_weapon, snum) - aplWeaponTotalTime(p->curr_weapon, snum)) / 2 + aplWeaponTotalTime(p->curr_weapon, snum)))
{
// down
gun_pos -= 5 * (kickback_pic - aplWeaponTotalTime(p->curr_weapon, snum)); //D
offsets.Y += 5 * (kickback_pic - aplWeaponTotalTime(p->curr_weapon, snum));
}
else
{
// up
gun_pos -= 10 * (aplWeaponReload(p->curr_weapon, snum) - kickback_pic); //U
offsets.Y += 10 * (aplWeaponReload(p->curr_weapon, snum) - kickback_pic);
}
// display weapon
{
hud_drawpal(weapon_xoffset + 184 - look_anghalf,
looking_arc + 240 - gun_pos, SHRINKER + 3 + (*kb & 3), -32,
o, 2);
hud_drawpal(weapon_xoffset + 188 - look_anghalf,
looking_arc + 240 - gun_pos, SHRINKER - 1, shade, o, pal);
}
hud_drawpal(184 + offsets.X, 240 + offsets.Y, SHRINKER + 3 + (*kb & 3), -32, o, 2, angle);
hud_drawpal(188 + offsets.X, 240 + offsets.Y, SHRINKER - 1, shade, o, pal, angle);
}
};