Skip to content

[SP] Fix animation events not playing for certain npc variants #1333

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

[SP] Fix animation events not playing for certain npc variants #1333

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion code/cgame/cg_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ typedef std::map< sstring_t, unsigned char > namePrecache_m;
extern namePrecache_m *as_preCacheMap;
extern void CG_RegisterNPCCustomSounds( clientInfo_t *ci );
extern qboolean G_AddSexToMunroString ( char *string, qboolean qDoBoth );
extern int G_ParseAnimFileSet( const char *skeletonName, const char *modelName=0);
extern int G_ParseAnimFileSet( const char *skeletonName, const char *modelName=0, const char *npcType=0);
extern void CG_DrawDataPadInventorySelect( void );

void CG_Init( int serverCommandSequence );
Expand Down
2 changes: 1 addition & 1 deletion code/game/NPC.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2579,7 +2579,7 @@ void NPC_InitAnimTable( void )
}
}

extern int G_ParseAnimFileSet( const char *skeletonName, const char *modelName=0);
extern int G_ParseAnimFileSet( const char *skeletonName, const char *modelName=0, const char *npcType=0);
void NPC_InitGame( void )
{
// globals.NPCs = (gNPC_t *) gi.TagMalloc(game.maxclients * sizeof(game.bots[0]), TAG_GAME);
Expand Down
24 changes: 16 additions & 8 deletions code/game/NPC_stats.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@ This file's presence is not required
======================
*/
static
void G_ParseAnimationEvtFile(int glaIndex, const char* eventsDirectory, int fileIndex, int iRealGLAIndex = -1, bool modelSpecific = false)
void G_ParseAnimationEvtFile(int glaIndex, const char* eventsDirectory, int fileIndex, int iRealGLAIndex = -1, bool modelSpecific = false, const char* npcType=0)
{
int len;
const char* token;
Expand Down Expand Up @@ -837,7 +837,7 @@ void G_ParseAnimationEvtFile(int glaIndex, const char* eventsDirectory, int file

if (modelSpecific)
{
hstring modelName(eventsDirectory);
hstring modelName(!npcType ? eventsDirectory : npcType);
modelIndex = modelName.handle();
}

Expand Down Expand Up @@ -1037,7 +1037,7 @@ qboolean G_ParseAnimationFile(int glaIndex, const char *skeletonName, int fileIn
// the animation event file.
//
////////////////////////////////////////////////////////////////////////
int G_ParseAnimFileSet(const char *skeletonName, const char *modelName=0)
int G_ParseAnimFileSet(const char *skeletonName, const char *modelName=0, const char *npcType=0)
{
int fileIndex=0;

Expand Down Expand Up @@ -1161,10 +1161,18 @@ int G_ParseAnimFileSet(const char *skeletonName, const char *modelName=0)
//--------------------------------------
if (modelName)
{
char npcTypeLwr[MAX_QPATH];

if (npcType)
{
Q_strncpyz(npcTypeLwr, npcType, sizeof(npcTypeLwr));
Q_strlwr(npcTypeLwr);
}

// Quick Search To See If We've Already Loaded This Model
//--------------------------------------------------------
int curModel=0;
hstring curModelName(modelName);
hstring curModelName(!npcTypeLwr ? modelName : npcTypeLwr);
while (curModel<MAX_MODELS_PER_LEVEL && !modelsAlreadyDone[curModel].empty())
{
if (modelsAlreadyDone[curModel]==curModelName)
Expand All @@ -1189,15 +1197,15 @@ int G_ParseAnimFileSet(const char *skeletonName, const char *modelName=0)
{
const int iGLAIndexToCheckForSkip = (Q_stricmp(skeletonName, "_humanoid")?-1:gi.G2API_PrecacheGhoul2Model("models/players/_humanoid/_humanoid.gla")); // ;-)

G_ParseAnimationEvtFile(0, modelName, fileIndex, iGLAIndexToCheckForSkip, true);
G_ParseAnimationEvtFile(0, modelName, fileIndex, iGLAIndexToCheckForSkip, true, npcTypeLwr);
}
}

return fileIndex;
}

extern cvar_t *g_char_model;
void G_LoadAnimFileSet( gentity_t *ent, const char *pModelName )
void G_LoadAnimFileSet( gentity_t *ent, const char *pModelName, const char *npcType=0 )
{
//load its animation config
char animName[MAX_QPATH];
Expand Down Expand Up @@ -1237,7 +1245,7 @@ void G_LoadAnimFileSet( gentity_t *ent, const char *pModelName )
}

//now load and parse the animation.cfg, animevents.cfg and set the animFileIndex
ent->client->clientInfo.animFileIndex = G_ParseAnimFileSet(strippedName, modelName);
ent->client->clientInfo.animFileIndex = G_ParseAnimFileSet(strippedName, modelName, npcType);

if (ent->client->clientInfo.animFileIndex<0)
{
Expand Down Expand Up @@ -1353,7 +1361,7 @@ void NPC_PrecacheAnimationCFG( const char *NPC_type )
//must copy data out of this pointer into a different part of memory because the funcs we're about to call will call COM_ParseExt
Q_strncpyz( filename, value, sizeof( filename ) );

G_ParseAnimFileSet(strippedName, filename);
G_ParseAnimFileSet(strippedName, filename, NPC_type);
COM_EndParseSession( );
return;
}
Expand Down
4 changes: 2 additions & 2 deletions code/game/g_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1111,7 +1111,7 @@ void G_BoneOrientationsForClass( int NPC_class, const char *boneName, Eorientati
}
}

extern void G_LoadAnimFileSet( gentity_t *ent, const char *modelName );
extern void G_LoadAnimFileSet( gentity_t *ent, const char *modelName, const char *npcType=0 );
qboolean G_SetG2PlayerModelInfo( gentity_t *ent, const char *modelName, const char *customSkin, const char *surfOff, const char *surfOn )
{
if ( ent->playerModel != -1 )
Expand Down Expand Up @@ -1159,7 +1159,7 @@ qboolean G_SetG2PlayerModelInfo( gentity_t *ent, const char *modelName, const ch
gi.G2API_SetSurfaceOnOff( &ent->ghoul2[ent->playerModel], "l_arm_key", 0 );
}

G_LoadAnimFileSet( ent, modelName );
G_LoadAnimFileSet( ent, modelName, ent->NPC_type );

ent->headBolt = ent->cervicalBolt = ent->torsoBolt = ent->gutBolt = ent->chestBolt =
ent->crotchBolt = ent->elbowLBolt = ent->elbowRBolt = ent->handLBolt =
Expand Down
2 changes: 1 addition & 1 deletion code/game/g_misc_model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ void CrystalAmmoSettings(gentity_t *ent)
*/
//------------------------------------------------------------
#include "anims.h"
extern int G_ParseAnimFileSet( const char *skeletonName, const char *modelName=0);
extern int G_ParseAnimFileSet( const char *skeletonName, const char *modelName=0, const char *npcType=0);
int temp_animFileIndex;
void set_MiscAnim( gentity_t *ent)
{
Expand Down
Loading