Skip to content

[MP/SP] Increase MAX_ANIM_FILES from 16 to 64 #1312

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

[MP/SP] Increase MAX_ANIM_FILES from 16 to 64 #1312

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/game/bg_public.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ class animation_t
}
}; // animation_t

#define MAX_ANIM_FILES 16
#define MAX_ANIM_FILES 64
#define MAX_ANIM_EVENTS 300

//size of Anim eventData array...
Expand Down
15 changes: 13 additions & 2 deletions codemp/game/bg_panimate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1710,6 +1710,11 @@ void BG_ClearAnimsets(void)
animation_t *BG_AnimsetAlloc(void)
{
assert (bgNumAllAnims < MAX_ANIM_FILES);
if (bgNumAllAnims >= MAX_ANIM_FILES)
{
Com_Printf(S_COLOR_YELLOW "BG_AnimsetAlloc: MAX_ANIM_FILES reached (%d)\n", MAX_ANIM_FILES);
return NULL;
}
bgAllAnims[bgNumAllAnims].anims = (animation_t *) BG_Alloc(sizeof(animation_t)*MAX_TOTALANIMATIONS);

return bgAllAnims[bgNumAllAnims].anims;
Expand Down Expand Up @@ -2129,7 +2134,7 @@ This file's presence is not required

======================
*/
bgLoadedEvents_t bgAllEvents[MAX_ANIM_FILES];
bgLoadedEvents_t bgAllEvents[MAX_ANIM_EVENT_FILES];
int bgNumAnimEvents = 1;
static int bg_animParseIncluding = 0;
int BG_ParseAnimationEvtFile( const char *as_filename, int animFileIndex, int eventFileIndex )
Expand All @@ -2148,7 +2153,7 @@ int BG_ParseAnimationEvtFile( const char *as_filename, int animFileIndex, int ev
int forcedIndex;

assert(animFileIndex < MAX_ANIM_FILES);
assert(eventFileIndex < MAX_ANIM_FILES);
assert(eventFileIndex < MAX_ANIM_EVENT_FILES);

if (eventFileIndex == -1)
{
Expand All @@ -2159,6 +2164,12 @@ int BG_ParseAnimationEvtFile( const char *as_filename, int animFileIndex, int ev
forcedIndex = eventFileIndex;
}

if (forcedIndex >= MAX_ANIM_EVENT_FILES)
{
Com_Printf(S_COLOR_YELLOW "BG_ParseAnimationEvtFile: MAX_ANIM_EVENT_FILES reached (%d), using index 0 for %s\n", MAX_ANIM_EVENT_FILES, as_filename);
return 0;
}

if (bg_animParseIncluding <= 0)
{ //if we should be parsing an included file, skip this part
if ( bgAllEvents[forcedIndex].eventsParsed )
Expand Down
5 changes: 3 additions & 2 deletions codemp/game/bg_public.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,8 @@ typedef struct animation_s {
extern qboolean BGPAFtextLoaded;
extern animation_t bgHumanoidAnimations[MAX_TOTALANIMATIONS];

#define MAX_ANIM_FILES 16
#define MAX_ANIM_FILES 64
#define MAX_ANIM_EVENT_FILES 128
#define MAX_ANIM_EVENTS 300

typedef enum
Expand Down Expand Up @@ -417,7 +418,7 @@ extern bgLoadedAnim_t bgAllAnims[MAX_ANIM_FILES];
//On the bright side this also means we're cutting a rather large size out of
//required game-side memory.
#ifndef _GAME
extern bgLoadedEvents_t bgAllEvents[MAX_ANIM_FILES];
extern bgLoadedEvents_t bgAllEvents[MAX_ANIM_EVENT_FILES];
extern int bgNumAnimEvents;
#endif

Expand Down