diff --git a/quakespasm/MacOSX/SDL.framework/Versions/A/SDL b/quakespasm/MacOSX/SDL.framework/Versions/A/SDL index f11f3dbb..5aaaeb60 100755 Binary files a/quakespasm/MacOSX/SDL.framework/Versions/A/SDL and b/quakespasm/MacOSX/SDL.framework/Versions/A/SDL differ diff --git a/quakespasm/Quake/console.c b/quakespasm/Quake/console.c index aeb0cb4c..6044323e 100644 --- a/quakespasm/Quake/console.c +++ b/quakespasm/Quake/console.c @@ -821,17 +821,6 @@ void AddToTabList (const char *name, const char *type) } } -// This is redefined from host_cmd.c -typedef struct filelist_item_s -{ - char name[32]; - struct filelist_item_s *next; -} filelist_item_t; - -extern filelist_item_t *extralevels; -extern filelist_item_t *modlist; -extern filelist_item_t *demolist; - typedef struct arg_completion_type_s { const char *command; diff --git a/quakespasm/Quake/host_cmd.c b/quakespasm/Quake/host_cmd.c index 4383c67d..b17c7bf1 100644 --- a/quakespasm/Quake/host_cmd.c +++ b/quakespasm/Quake/host_cmd.c @@ -55,14 +55,6 @@ void Host_Quit_f (void) //johnfitz -- extramaps management //============================================================================== -// ericw -- was extralevel_t, renamed and now used with mods list as well -// to simplify completion code -typedef struct filelist_item_s -{ - char name[32]; - struct filelist_item_s *next; -} filelist_item_t; - /* ================== FileList_Add diff --git a/quakespasm/Quake/quakedef.h b/quakespasm/Quake/quakedef.h index d4d07ca0..a5332599 100644 --- a/quakespasm/Quake/quakedef.h +++ b/quakespasm/Quake/quakedef.h @@ -308,6 +308,16 @@ extern int host_framecount; // incremented every frame, never reset extern double realtime; // not bounded in any way, changed at // start of every frame, never reset +typedef struct filelist_item_s +{ + char name[32]; + struct filelist_item_s *next; +} filelist_item_t; + +extern filelist_item_t *modlist; +extern filelist_item_t *extralevels; +extern filelist_item_t *demolist; + void Host_ClearMemory (void); void Host_ServerFrame (void); void Host_InitCommands (void); diff --git a/quakespasm/Windows/SDL/lib/SDL.dll b/quakespasm/Windows/SDL/lib/SDL.dll index 096cbde7..930fa24f 100644 Binary files a/quakespasm/Windows/SDL/lib/SDL.dll and b/quakespasm/Windows/SDL/lib/SDL.dll differ diff --git a/quakespasm/Windows/SDL/lib64/SDL.dll b/quakespasm/Windows/SDL/lib64/SDL.dll index ef77f3b6..1e0f4101 100644 Binary files a/quakespasm/Windows/SDL/lib64/SDL.dll and b/quakespasm/Windows/SDL/lib64/SDL.dll differ