Merge remote branch 'origin/master' into akari/irc

[xonotic/darkplaces.git] / common.h

diff --git a/common.h b/common.h
index ecd8b8569f481420691605d12d04c72007f10a67..bd715ed65eeb2cc9259b33bfabb116c5db959b6a 100644 (file)
--- a/common.h
+++ b/common.h
@@ -251,6 +251,16 @@ extern int dpvsnprintf (char *buffer, size_t buffersize, const char *format, va_
 extern struct cvar_s   registered;
 extern struct cvar_s   cmdline;
 
+typedef enum userdirmode_e
+{
+       USERDIRMODE_NOHOME, // basedir only
+       USERDIRMODE_HOME, // Windows basedir, general POSIX (~/.)
+       USERDIRMODE_MYGAMES, // pre-Vista (My Documents/My Games/), general POSIX (~/.)
+       USERDIRMODE_SAVEDGAMES, // Vista (%USERPROFILE%/Saved Games/), OSX (~/Library/Application Support/), Linux (~/.config)
+       USERDIRMODE_COUNT
+}
+userdirmode_t;
+
 typedef enum gamemode_e
 {
        GAME_NORMAL,
@@ -319,7 +329,7 @@ int matchpattern_with_separator(const char *in, const char *pattern, int caseins
 void stringlistinit(stringlist_t *list);
 void stringlistfreecontents(stringlist_t *list);
 void stringlistappend(stringlist_t *list, const char *text);
-void stringlistsort(stringlist_t *list);
+void stringlistsort(stringlist_t *list, qboolean uniq);
 void listdirectory(stringlist_t *list, const char *basepath, const char *path);
 
 char *SearchInfostring(const char *infostring, const char *key);