From 0cc4bc8c6920a3dea57bb552d898735859c75cd3 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Tue, 24 Aug 2010 16:47:39 +0900 Subject: [PATCH] Move searchpath out of quakefs.h. It's not needed, nor should it be used, anywhere else. --- include/QF/quakefs.h | 7 ------- libs/util/quakefs.c | 8 +++++++- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/include/QF/quakefs.h b/include/QF/quakefs.h index 21783d1b1..090eb5162 100644 --- a/include/QF/quakefs.h +++ b/include/QF/quakefs.h @@ -47,12 +47,6 @@ typedef struct filelist_s { int size; } filelist_t; -typedef struct searchpath_s { - char *filename; - struct pack_s *pack; // only one of filename / pack will be used - struct searchpath_s *next; -} searchpath_t; - typedef struct gamedir_s { const char *name; const char *gamedir; @@ -72,7 +66,6 @@ typedef struct gamedir_s { */ typedef void gamedir_callback_t (int phase); -extern searchpath_t *qfs_searchpaths; extern gamedir_t *qfs_gamedir; extern struct cvar_s *fs_sharepath; diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c index 16b5c9529..8b0deba88 100644 --- a/libs/util/quakefs.c +++ b/libs/util/quakefs.c @@ -133,7 +133,13 @@ VISIBLE const char *qfs_userpath; VISIBLE int qfs_filesize; -searchpath_t *qfs_searchpaths; +typedef struct searchpath_s { + char *filename; + struct pack_s *pack; // only one of filename / pack will be used + struct searchpath_s *next; +} searchpath_t; + +static searchpath_t *qfs_searchpaths; //QFS