Nuke MAX_GAMEDIR_CALLBACKS

The number of gamedir callbacks is now unlimited.
This commit is contained in:
Bill Currie 2010-08-24 16:33:22 +09:00
parent a51e888a1b
commit 478394ef81
2 changed files with 10 additions and 5 deletions

View file

@ -41,8 +41,6 @@
//============================================================================
#define MAX_GAMEDIR_CALLBACKS 128 // most QFS_GamedirCallback calls.
typedef struct filelist_s {
char **list;
int count;

View file

@ -201,8 +201,10 @@ static const char *qfs_default_dirconf =
"}";
static gamedir_callback_t *gamedir_callbacks[MAX_GAMEDIR_CALLBACKS];
#define GAMEDIR_CALLBACK_CHUNK 16
static gamedir_callback_t **gamedir_callbacks;
static int num_gamedir_callbacks;
static int max_gamedir_callbacks;
static const char *
qfs_var_get_key (void *_v, void *unused)
@ -1229,8 +1231,13 @@ QFS_Gamedir (const char *dir)
VISIBLE void
QFS_GamedirCallback (gamedir_callback_t *func)
{
if (num_gamedir_callbacks == MAX_GAMEDIR_CALLBACKS) {
Sys_Error ("Too many gamedir callbacks!\n");
if (num_gamedir_callbacks == max_gamedir_callbacks) {
size_t size = (max_gamedir_callbacks + GAMEDIR_CALLBACK_CHUNK)
* sizeof (gamedir_callback_t *);
gamedir_callbacks = realloc (gamedir_callbacks, size);
if (!gamedir_callbacks)
Sys_Error ("Too many gamedir callbacks!\n");
max_gamedir_callbacks += GAMEDIR_CALLBACK_CHUNK;
}
if (!func) {