Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Richard Gobeille
EDuke32
Commits
283c4f14
Commit
283c4f14
authored
Feb 21, 2021
by
Evan Ramos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Duke3D: Minor cleanup to FLAMETHROWER_WEAPON draw code
parent
fa9e9de4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
source/duke3d/src/player.cpp
source/duke3d/src/player.cpp
+4
-4
No files found.
source/duke3d/src/player.cpp
View file @
283c4f14
...
...
@@ -2866,9 +2866,9 @@ void P_DisplayWeapon(void)
break
;
case
FLAMETHROWER_WEAPON
:
if
((
*
weaponFrame
)
<
(
PWEAPON
(
screenpeek
,
pPlayer
->
curr_weapon
,
TotalTime
)
+
1
)
&&
(
*
weaponFrame
)
>
=
1
&&
sector
[
pPlayer
->
cursectnum
].
lotag
!=
ST_2_UNDERWATER
)
if
((
*
weaponFrame
)
<
(
PWEAPON
(
screenpeek
,
pPlayer
->
curr_weapon
,
TotalTime
)
+
1
)
&&
(
*
weaponFrame
)
>
0
&&
sector
[
pPlayer
->
cursectnum
].
lotag
!=
ST_2_UNDERWATER
)
{
static
uint8_t
freeze
rFrames
[]
=
{
0
,
0
,
1
,
1
,
2
,
2
};
static
uint8_t
incinerato
rFrames
[]
=
{
0
,
0
,
1
,
1
,
2
,
2
};
if
(
doAnim
)
{
...
...
@@ -2879,13 +2879,13 @@ void P_DisplayWeapon(void)
G_DrawWeaponTileWithID
(
currentWeapon
<<
1
,
weaponX
+
210
-
(
pPlayer
->
look_ang
>>
1
),
weaponY
+
261
-
weaponYOffset
,
FLAMETHROWERFIRE
,
-
32
,
weaponBits
,
weaponPal
);
G_DrawWeaponTileWithID
(
currentWeapon
,
weaponX
+
210
-
(
pPlayer
->
look_ang
>>
1
),
weaponY
+
235
-
weaponYOffset
,
FLAMETHROWERFIRE
+
1
+
freeze
rFrames
[
*
weaponFrame
%
6
],
-
32
,
weaponBits
,
weaponPal
);
FLAMETHROWERFIRE
+
1
+
incinerato
rFrames
[
*
weaponFrame
%
6
],
-
32
,
weaponBits
,
weaponPal
);
}
else
{
G_DrawWeaponTileWithID
(
currentWeapon
,
weaponX
+
210
-
(
pPlayer
->
look_ang
>>
1
),
weaponY
+
261
-
weaponYOffset
,
FLAMETHROWER
,
weaponShade
,
weaponBits
,
weaponPal
);
G_DrawWeaponTileWithID
(
currentWeapon
,
weaponX
+
210
-
(
pPlayer
->
look_ang
>>
1
),
weaponY
+
261
-
weaponYOffset
,
G_DrawWeaponTileWithID
(
currentWeapon
<<
1
,
weaponX
+
210
-
(
pPlayer
->
look_ang
>>
1
),
weaponY
+
261
-
weaponYOffset
,
FLAMETHROWERPILOT
,
weaponShade
,
weaponBits
,
weaponPal
);
}
break
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment