Skip to content

TD & Mine animation fix #592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jerethk wants to merge 2 commits into
base: master
Choose a base branch
from
Open

TD & Mine animation fix #592

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb28104
Bug fix - when throwing final TD, the empty hand should not show unti…
jerethk Oct 13, 2025
c8c2774
Bug fix - using MAXOUT and POSTAL cheats while mines or TD are select…
jerethk Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions TheForceEngine/TFE_DarkForces/weapon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,10 @@ namespace TFE_DarkForces
{
weapon->frame = 2;
}
else
{
weapon->frame = 0;
}
}

void weapon_computeMatrix(fixed16_16* mtx, angle14_32 pitch, angle14_32 yaw)
Expand Down Expand Up @@ -775,7 +779,7 @@ namespace TFE_DarkForces
// s_prevWeapon is the weapon we are switching away from.
s_weaponAnimState =
{
0, // frame
s_curPlayerWeapon->frame, // frame
30, 40, // startOffsetX, startOffsetY: was 14, 40
-3, -4, // xSpeed, ySpeed
10, s_superCharge ? 1u : 2u // frameCount, ticksPerFrame
Expand Down Expand Up @@ -1020,10 +1024,6 @@ namespace TFE_DarkForces

const u8* atten = RClassic_Fixed::computeLighting(weaponLightingZDist, 0);
TextureData* tex = weapon->frames[weapon->frame];
if (weapon->ammo && *weapon->ammo == 0 && (weapon->ammo == &s_playerInfo.ammoDetonator || weapon->ammo == &s_playerInfo.ammoMine))
{
tex = s_playerWeaponList[WPN_FIST].frames[0];
}

u32 dispWidth, dispHeight;
vfb_getResolution(&dispWidth, &dispHeight);
Expand Down