X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=common.h;h=c48ed390b4d54b3e73c390af75f11823eb8b2e89;hb=ccdbec607e5598abe174006228368c1efc2e84d5;hp=d464958371021229494a5ba7e6d27ee069841df8;hpb=0c2fe5508d2cbafb6d3d2d003c819e9d1b72c6f5;p=xonotic%2Fdarkplaces.git

diff --git a/common.h b/common.h
index d4649583..c48ed390 100644
--- a/common.h
+++ b/common.h
@@ -38,7 +38,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #ifdef SUNOS
 #include <sys/file.h>		// Needed for FNDELAY
-# define model_t dp_model_t // Workaround conflict with /usr/include/sys/model.h
 #endif
 
 //============================================================================
@@ -282,6 +281,7 @@ typedef enum gamemode_e
 	GAME_CONTAGIONTHEORY,
 	GAME_EDU2P,
 	GAME_BLADEMASTER,
+	GAME_PROPHECY,
 	GAME_COUNT
 }
 gamemode_t;
@@ -314,11 +314,12 @@ typedef struct stringlist_s
 } stringlist_t;
 
 int matchpattern(const char *in, const char *pattern, int caseinsensitive);
+int matchpattern_with_separator(const char *in, const char *pattern, int caseinsensitive, const char *separators, qboolean wildcard_least_one);
 void stringlistinit(stringlist_t *list);
 void stringlistfreecontents(stringlist_t *list);
-void stringlistappend(stringlist_t *list, char *text);
+void stringlistappend(stringlist_t *list, const char *text);
 void stringlistsort(stringlist_t *list);
-void listdirectory(stringlist_t *list, const char *path);
+void listdirectory(stringlist_t *list, const char *basepath, const char *path);
 
 char *SearchInfostring(const char *infostring, const char *key);
 
@@ -354,5 +355,7 @@ size_t strlcpy(char *dst, const char *src, size_t siz);
 
 #endif  // #ifndef HAVE_STRLCPY
 
+void FindFraction(double val, int *num, int *denom, int denomMax);
+
 #endif