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

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

Browse source
This commit is contained in:
Mitchell Richters 2022-12-11 10:22:45 +11:00 committed by Christoph Oelckers
parent c6380bfd7a
commit 82e9b96174
1 changed files with 84 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -479,40 +479,40 @@ void displayweapon_r(int snum, double interpfrac)
auto displayshotgun = [&] auto displayshotgun = [&]
{ {
weapon_xoffset -= 8; offsets.X += weapon_xoffset - 8;
offsets.Y -= gun_pos;
{
double x; double x;
int y; double y;
static const uint8_t kb_frames3[] = { 0,0,1,1,2,2,5,5,6,6,7,7,8,8,0,0,0,0,0,0,0 }; static const uint8_t kb_frames3[] = { 0,0,1,1,2,2,5,5,6,6,7,7,8,8,0,0,0,0,0,0,0 };
static const uint8_t kb_frames2[] = { 0,0,3,3,4,4,5,5,6,6,7,7,8,8,0,0,20,20,21,21,21,21,20,20,20,20,0,0 }; static const uint8_t kb_frames2[] = { 0,0,3,3,4,4,5,5,6,6,7,7,8,8,0,0,20,20,21,21,21,21,20,20,20,20,0,0 };
static const uint8_t kb_frames[] = { 0,0,1,1,2,2,3,3,4,4,5,5,5,5,6,6,6,6,7,7,7,7,8,8,0,0,20,20,21,21,21,21,20,20,20,20,0,0 }; static const uint8_t kb_frames[] = { 0,0,1,1,2,2,3,3,4,4,5,5,5,5,6,6,6,6,7,7,7,7,8,8,0,0,20,20,21,21,21,21,20,20,20,20,0,0 };
static const uint16_t kb_ox[] = { 300,300,300,300,300,330,320,310,305,306,302 }; static const uint16_t kb_ox[] = { 300,300,300,300,300,330,320,310,305,306,302 };
static const uint16_t kb_oy[] = { 315,300,302,305,302,302,303,306,302,404,384 }; static const uint16_t kb_oy[] = { 315,300,302,305,302,302,303,306,302,404,384 };
int tm; int tm = 180;
tm = 180;
if (p->shotgun_state[1]) if (p->shotgun_state[1])
{ {
if ((*kb) < 26) if ((*kb) < 26)
{ {
if (kb_frames[*kb] == 3 || kb_frames[*kb] == 4) if (kb_frames[*kb] == 3 || kb_frames[*kb] == 4)
shade = 0; shade = 0;
x = weapon_xoffset + ((kb_ox[kb_frames[*kb]] >> 1) - 12); x = ((kb_ox[kb_frames[*kb]] >> 1) - 12) + offsets.X;
y = tm - (244 - kb_oy[kb_frames[*kb]]); y = tm - (244 - kb_oy[kb_frames[*kb]]) + offsets.Y;
hud_drawpal(x + 64 - look_anghalf, hud_drawpal(x + 64, y, RTILE_SHOTGUN + kb_frames[*kb], shade, 0, pal, angle);
y + looking_arc - gun_pos, RTILE_SHOTGUN + kb_frames[*kb], shade, 0, pal);
} }
else else
{ {
if (kb_frames[*kb] > 0) if (kb_frames[*kb] > 0)
{ {
x = weapon_xoffset + ((kb_ox[kb_frames[(*kb) - 11]] >> 1) - 12); x = ((kb_ox[kb_frames[(*kb) - 11]] >> 1) - 12) + offsets.X;
y = tm - (244 - kb_oy[kb_frames[(*kb) - 11]]); y = tm - (244 - kb_oy[kb_frames[(*kb) - 11]]) + offsets.Y;
} }
else else
{ {
x = weapon_xoffset + ((kb_ox[kb_frames[*kb]] >> 1) - 12); x = ((kb_ox[kb_frames[*kb]] >> 1) - 12) + offsets.X;
y = tm - (244 - kb_oy[kb_frames[*kb]]); y = tm - (244 - kb_oy[kb_frames[*kb]]) + offsets.Y;
} }
switch (*kb) switch (*kb)
{ {
@ -523,9 +523,9 @@ void displayweapon_r(int snum, double interpfrac)
y += 30; y += 30;
break; break;
} }
hud_drawpal(x + 64 - look_anghalf, y + looking_arc - gun_pos, RTILE_SHOTGUN + kb_frames[*kb], shade, 0, pal); hud_drawpal(x + 64, y, RTILE_SHOTGUN + kb_frames[*kb], shade, 0, pal, angle);
if (kb_frames[*kb] == 21) if (kb_frames[*kb] == 21)
hud_drawpal(x + 96 - look_anghalf, y + looking_arc - gun_pos, RTILE_SHOTGUNSHELLS, shade, 0, pal); hud_drawpal(x + 96, y, RTILE_SHOTGUNSHELLS, shade, 0, pal, angle);
} }
} }
else else
@ -536,32 +536,30 @@ void displayweapon_r(int snum, double interpfrac)
{ {
if (kb_frames2[*kb] == 3 || kb_frames2[*kb] == 4) if (kb_frames2[*kb] == 3 || kb_frames2[*kb] == 4)
shade = 0; shade = 0;
x = weapon_xoffset + ((kb_ox[kb_frames2[*kb]] >> 1) - 12); x = ((kb_ox[kb_frames2[*kb]] >> 1) - 12) + offsets.X;
y = tm - (244 - kb_oy[kb_frames2[*kb]]); y = tm - (244 - kb_oy[kb_frames2[*kb]]) + offsets.Y;
hud_drawpal(x + 64 - look_anghalf, hud_drawpal(x + 64, y, RTILE_SHOTGUN + kb_frames2[*kb], shade, 0, pal, angle);
y + looking_arc - gun_pos, RTILE_SHOTGUN + kb_frames2[*kb], shade, 0, pal);
} }
else else
{ {
if (kb_frames3[*kb] == 1 || kb_frames3[*kb] == 2) if (kb_frames3[*kb] == 1 || kb_frames3[*kb] == 2)
shade = 0; shade = 0;
x = weapon_xoffset + ((kb_ox[kb_frames3[*kb]] >> 1) - 12); x = ((kb_ox[kb_frames3[*kb]] >> 1) - 12) + offsets.X;
y = tm - (244 - kb_oy[kb_frames3[*kb]]); y = tm - (244 - kb_oy[kb_frames3[*kb]]) + offsets.Y;
hud_drawpal(x + 64 - look_anghalf, hud_drawpal(x + 64, y, RTILE_SHOTGUN + kb_frames3[*kb], shade, 0, pal, angle);
y + looking_arc - gun_pos, RTILE_SHOTGUN + kb_frames3[*kb], shade, 0, pal);
} }
} }
else if (p->shotgun_state[0]) else if (p->shotgun_state[0])
{ {
if (kb_frames2[*kb] > 0) if (kb_frames2[*kb] > 0)
{ {
x = weapon_xoffset + ((kb_ox[kb_frames2[(*kb) - 11]] >> 1) - 12); x = ((kb_ox[kb_frames2[(*kb) - 11]] >> 1) - 12) + offsets.X;
y = tm - (244 - kb_oy[kb_frames2[(*kb) - 11]]); y = tm - (244 - kb_oy[kb_frames2[(*kb) - 11]]) + offsets.Y;
} }
else else
{ {
x = weapon_xoffset + ((kb_ox[kb_frames2[*kb]] >> 1) - 12); x = ((kb_ox[kb_frames2[*kb]] >> 1) - 12) + offsets.X;
y = tm - (244 - kb_oy[kb_frames2[*kb]]); y = tm - (244 - kb_oy[kb_frames2[*kb]]) + offsets.Y;
} }
switch (*kb) switch (*kb)
{ {
@ -572,10 +570,9 @@ void displayweapon_r(int snum, double interpfrac)
y += 30; y += 30;
break; break;
} }
hud_drawpal(x + 64 - look_anghalf, y + looking_arc - gun_pos, RTILE_SHOTGUN + kb_frames2[*kb], shade, 0, pal); hud_drawpal(x + 64, y, RTILE_SHOTGUN + kb_frames2[*kb], shade, 0, pal, angle);
if (kb_frames2[*kb] == 21) if (kb_frames2[*kb] == 21)
hud_drawpal(x + 96 - look_anghalf, y + looking_arc - gun_pos, RTILE_SHOTGUNSHELLS, shade, 0, pal); hud_drawpal(x + 96, y, RTILE_SHOTGUNSHELLS, shade, 0, pal, angle);
}
} }
} }
}; };