Skip to content

[SP] Fix animation event sounds not playing for NPC variants #1310

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
dpiers wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[SP] Fix animation event sounds not playing for NPC variants #1310

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion code/cgame/cg_players.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1220,7 +1220,9 @@ static void CG_PlayerAnimEvents( int animFileIndex, qboolean torso, int oldFrame
}
}

hstring myModel = g_entities[entNum].NPC_type; //apparently NPC_type is always the same as the model name???
// Use the anim file set's model name instead of NPC_type, since NPC variants
// (e.g., "stormtrooper2") share the same model and anim events as the base NPC
hstring myModel = level.knownAnimFileSets[animFileIndex].filename;

// Check for anim event
for ( i=0; i < MAX_ANIM_EVENTS; ++i )
Expand Down