teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-19 15:40:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

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

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

@ -108,7 +108,7 @@ inline static void ShowBoat(double x, double y, int tilenum, int shade, int orie
void displayweapon_r(int snum, double interpfrac)
{
int cw;
int i, j;
int j;
double weapon_sway, weapon_xoffset, gun_pos, looking_arc, look_anghalf, hard_landing, TiltStatus;
int pal;
int8_t shade;
@ -585,27 +585,26 @@ void displayweapon_r(int snum, double interpfrac)
auto displayrifle = [&]
{
if (*kb > 0)
gun_pos -= BobVal((*kb) << 7) * 4;
offsets.X += weapon_xoffset;
offsets.Y -= gun_pos;
if (*kb > 0 && p->GetActor()->spr.pal != 1) weapon_xoffset += 1 - (rand() & 3);
if (*kb > 0)
offsets.Y += BobVal((*kb) << 7) * 4;
if (*kb > 0 && p->GetActor()->spr.pal != 1) offsets.X += 1 - (rand() & 3);
switch (*kb)
{
case 0:
hud_drawpal(weapon_xoffset + 178 - look_anghalf + 30, looking_arc + 233 - gun_pos + 5,
RTILE_CHAINGUN, shade, o, pal);
hud_drawpal(208 + offsets.X, 238 + offsets.Y, RTILE_CHAINGUN, shade, o, pal, angle);
break;
default:
shade = 0;
if (*kb < 8)
{
i = rand() & 7;
hud_drawpal(weapon_xoffset + 178 - look_anghalf + 30, looking_arc + 233 - gun_pos + 5,
RTILE_CHAINGUN + 1, shade, o, pal);
hud_drawpal(208 + offsets.X, 238 + offsets.Y, RTILE_CHAINGUN + 1, shade, o, pal, angle);
}
else hud_drawpal(weapon_xoffset + 178 - look_anghalf + 30, looking_arc + 233 - gun_pos + 5,
RTILE_CHAINGUN + 2, shade, o, pal);
else hud_drawpal(208 + offsets.X, 238 + offsets.Y, RTILE_CHAINGUN + 2, shade, o, pal, angle);
break;
}
};