zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-22 11:31:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Mitchell Richters 2022-12-11 10:14:57 +11:00 committed by Christoph Oelckers
parent 79ae9e1f97
commit c6380bfd7a
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -424,23 +424,25 @@ void displayweapon_r(int snum, double interpfrac)
auto displaychicken = [&] auto displaychicken = [&]
{ {
if (!(gs.displayflags & DUKE3D_NO_WIDESCREEN_PINNING)) pin = RS_ALIGN_R; if (!(gs.displayflags & DUKE3D_NO_WIDESCREEN_PINNING)) pin = RS_ALIGN_R;
offsets.X += weapon_xoffset;
offsets.Y -= gun_pos;
if (*kb) if (*kb)
{ {
static const uint8_t kb_frames[] = { 0,1,1,2,2,3,2,3,2,3,2,2,2,2,2,2,2,2,2,4,4,4,4,5,5,5,5,6,6,6,6,6,6,7,7,7,7,7,7 }; static const uint8_t kb_frames[] = { 0,1,1,2,2,3,2,3,2,3,2,2,2,2,2,2,2,2,2,4,4,4,4,5,5,5,5,6,6,6,6,6,6,7,7,7,7,7,7 };
if (kb_frames[*kb] == 2 || kb_frames[*kb] == 3) if (kb_frames[*kb] == 2 || kb_frames[*kb] == 3)
{ {
rdmyospal((weapon_xoffset + 200) - look_anghalf, rdmyospal(200 + offsets.X, 250 + offsets.Y, RTILE_RPGGUN2 + kb_frames[*kb], shade, o | pin, pal, angle);
looking_arc + 250 - gun_pos, RTILE_RPGGUN2 + kb_frames[*kb], shade, o | pin, pal);
} }
else if (kb_frames[*kb] == 1) else if (kb_frames[*kb] == 1)
{ {
rdmyospal((weapon_xoffset + 200) - look_anghalf, rdmyospal(200 + offsets.X, 250 + offsets.Y, RTILE_RPGGUN2 + kb_frames[*kb], 0, o | pin, pal, angle);
looking_arc + 250 - gun_pos, RTILE_RPGGUN2 + kb_frames[*kb], 0, o | pin, pal);
} }
else else
{ {
rdmyospal((weapon_xoffset + 210) - look_anghalf, rdmyospal(210 + offsets.X, 255 + offsets.Y, RTILE_RPGGUN2 + kb_frames[*kb], shade, o | pin, pal, angle);
looking_arc + 255 - gun_pos, RTILE_RPGGUN2 + kb_frames[*kb], shade, o | pin, pal);
} }
} }
else else
@ -449,26 +451,22 @@ void displayweapon_r(int snum, double interpfrac)
{ {
if (chickenphase) if (chickenphase)
{ {
rdmyospal((weapon_xoffset + 210) - look_anghalf, rdmyospal(210 + offsets.X, 222 + offsets.Y, RTILE_RPGGUN2 + 7, shade, o | pin, pal, angle);
looking_arc + 222 - gun_pos, RTILE_RPGGUN2 + 7, shade, o | pin, pal);
} }
else if ((krand() & 15) == 5) else if ((krand() & 15) == 5)
{ {
S_PlayActorSound(327, p->GetActor()); S_PlayActorSound(327, p->GetActor());
rdmyospal((weapon_xoffset + 210) - look_anghalf, rdmyospal(210 + offsets.X, 222 + offsets.Y, RTILE_RPGGUN2 + 7, shade, o | pin, pal, angle);
looking_arc + 222 - gun_pos, RTILE_RPGGUN2 + 7, shade, o | pin, pal);
chickenphase = 6; chickenphase = 6;
} }
else else
{ {
rdmyospal((weapon_xoffset + 210) - look_anghalf, rdmyospal(210 + offsets.X, 225 + offsets.Y, RTILE_RPGGUN2, shade, o | pin, pal, angle);
looking_arc + 225 - gun_pos, RTILE_RPGGUN2, shade, o | pin, pal);
} }
} }
else else
{ {
rdmyospal((weapon_xoffset + 210) - look_anghalf, rdmyospal(210 + offsets.X, 225 + offsets.Y, RTILE_RPGGUN2, shade, o | pin, pal, angle);
looking_arc + 225 - gun_pos, RTILE_RPGGUN2, shade, o | pin, pal);
} }
} }
}; };