zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Mitchell Richters 2022-12-11 10:36:41 +11:00 committed by Christoph Oelckers
parent 70d7210462
commit 717955d5ab
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
source/games/duke/src/hudweapon_r.cpp
View file

@ -716,12 +716,12 @@ void displayweapon_r(int snum, double interpfrac)
auto displaythrowingdynamite = [&]
{
int dx;
int x;
int dy;
dx = 25;
x = 100;
dy = 20;
offsets.X += weapon_xoffset;
offsets.Y -= gun_pos;
int dx = 25;
int dy = 20;
if ((*kb) < 20)
{
if (!(gs.displayflags & DUKE3D_NO_WIDESCREEN_PINNING)) pin = RS_ALIGN_R;
@ -731,21 +731,17 @@ void displayweapon_r(int snum, double interpfrac)
{
if ((*kb) < 5)
{
rdmyospal(weapon_xoffset + x + 190 - look_anghalf - dx,
looking_arc + 258 - gun_pos - 64 + p->detonate_count - dy, RTILE_RRTILE1752, 0, o | pin, pal);
rdmyospal(290 + offsets.X - dx, 258 + offsets.Y - 64 + p->detonate_count - dy, RTILE_RRTILE1752, 0, o | pin, pal, angle);
}
rdmyospal(weapon_xoffset + x + 190 - look_anghalf,
looking_arc + 258 - gun_pos - dy, RTILE_HANDTHROW + remote_frames[*kb], shade, o | pin, pal);
rdmyospal(290 + offsets.X, 258 + offsets.Y - dy, RTILE_HANDTHROW + remote_frames[*kb], shade, o | pin, pal, angle);
}
else
{
if ((*kb) < 5)
{
rdmyospal(weapon_xoffset + x + 190 - look_anghalf - dx,
looking_arc + 258 - gun_pos - 64 + p->detonate_count - dy, RTILE_RRTILE1752, 0, o | pin, pal);
rdmyospal(290 + offsets.X - dx, 258 + offsets.Y - 64 + p->detonate_count - dy, RTILE_RRTILE1752, 0, o | pin, pal, angle);
}
rdmyospal(weapon_xoffset + x + 190 - look_anghalf,
looking_arc + 258 - gun_pos - dy, RTILE_HANDTHROW + 1, shade, o | pin, pal);
rdmyospal(290 + offsets.X, 258 + offsets.Y - dy, RTILE_HANDTHROW + 1, shade, o | pin, pal, angle);
}
}
};