teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 00:41:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Mitchell Richters 2022-12-11 11:23:37 +11:00 committed by Christoph Oelckers
parent 6d9b53af3d
commit 7ec2c1a0fa
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -796,32 +796,29 @@ void displayweapon_r(int snum, double interpfrac)
auto displaysaw = [&] auto displaysaw = [&]
{ {
weapon_xoffset += 28; offsets.X += weapon_xoffset + 28;
looking_arc += 18; offsets.Y -= gun_pos - 18;
if ((*kb) == 0) if ((*kb) == 0)
{ {
rd2myospal(weapon_xoffset + 188 - look_anghalf, rd2myospal(188 + offsets.X, 240 + offsets.Y, RTILE_SHRINKER, shade, o, pal, angle);
looking_arc + 240 - gun_pos, RTILE_SHRINKER, shade, o, pal);
} }
else else
{ {
if (p->GetActor()->spr.pal != 1) if (p->GetActor()->spr.pal != 1)
{ {
weapon_xoffset += rand() & 3; offsets.X += rand() & 3;
gun_pos += (rand() & 3); offsets.Y -= rand() & 3;
} }
if (cw == BUZZSAW_WEAPON) if (cw == BUZZSAW_WEAPON)
{ {
rd2myospal(weapon_xoffset + 184 - look_anghalf, rd2myospal(184 + offsets.X, 240 + offsets.Y, RTILE_GROWSPARK + ((*kb) & 2), shade, o, 0, angle);
looking_arc + 240 - gun_pos, RTILE_GROWSPARK + ((*kb) & 2), shade, o, 0);
} }
else else
{ {
static const int8_t kb_frames[] = { 1,1,1,1,1,2,2,2,2,2,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0 }; static const int8_t kb_frames[] = { 1,1,1,1,1,2,2,2,2,2,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0 };
int frm = kb_frames[*kb]; rd2myospal(184 + offsets.X, 240 + offsets.Y, RTILE_SHRINKER + kb_frames[*kb], shade, o, 0, angle);
rd2myospal(weapon_xoffset + 184 - look_anghalf,
looking_arc + 240 - gun_pos, RTILE_SHRINKER + frm, shade, o, 0);
} }
} }
}; };