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 displaypistol() lambda to new weapon offsets.

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

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

@ -617,35 +617,36 @@ void displayweapon_r(int snum, double interpfrac)
auto displaypistol = [&]
{
offsets.X += weapon_xoffset;
offsets.Y -= gun_pos;
double x, y;
if ((*kb) < 22)
{
static const uint8_t kb_frames[] = { 0,0,1,1,2,2,3,3,4,4,6,6,6,6,5,5,4,4,3,3,0,0 };
static const uint16_t kb_ox[] = { 194,190,185,208,215,215,216,216,201,170 };
static const uint16_t kb_oy[] = { 256,249,248,238,228,218,208,256,245,258 };
double x;
int y;
x = weapon_xoffset + (kb_ox[kb_frames[*kb]] - 12);
y = 244 - (244 - kb_oy[kb_frames[*kb]]);
x = (kb_ox[kb_frames[*kb]] - 12) + offsets.X;
y = 244 - (244 - kb_oy[kb_frames[*kb]]) + offsets.Y;
if (kb_frames[*kb])
shade = 0;
rdmyospal(x - look_anghalf,
y + looking_arc - gun_pos, RTILE_FIRSTGUN + kb_frames[*kb], shade, 0, pal);
rdmyospal(x, y, RTILE_FIRSTGUN + kb_frames[*kb], shade, 0, pal, angle);
}
else
{
static const uint8_t kb_frames[] = { 0,0,1,1,2,2,2,2,2,2,2,2,2,2,2,1,1,0,0 };
static const uint16_t kb_ox[] = { 244,244,244 };
static const uint16_t kb_oy[] = { 256,249,248 };
double x;
int dx;
int y;
int dy;
x = weapon_xoffset + (kb_ox[kb_frames[(*kb) - 22]] - 12);
y = 244 - (244 - kb_oy[kb_frames[(*kb) - 22]]);
x = (kb_ox[kb_frames[(*kb) - 22]] - 12) + offsets.X;
y = 244 - (244 - kb_oy[kb_frames[(*kb) - 22]]) + offsets.Y;
int dx, dy;
switch (*kb)
{
case 28:
@ -689,8 +690,7 @@ void displayweapon_r(int snum, double interpfrac)
dx = 0;
break;
}
rdmyospal(x - look_anghalf - dx,
y + looking_arc - gun_pos + dy, RTILE_FIRSTGUNRELOAD + kb_frames[(*kb) - 22], shade, 0, pal);
rdmyospal(x - dx, y + dy, RTILE_FIRSTGUNRELOAD + kb_frames[(*kb) - 22], shade, 0, pal, angle);
}
};