Merge branch 'master' into qss-r7-admod

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;

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

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);