X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=common.h;h=bea8932645a557fad3996566090b597a86b5b808;hp=71713c40b9de9551b800dc0bd220005804e7e49c;hb=8b7eab5c38f9c564b4ef9bb72901a6658eba3ae6;hpb=e12d5b6c194a92ddd0a71cc8d854559130eb44a4

diff --git a/common.h b/common.h
index 71713c40..bea89326 100644
--- a/common.h
+++ b/common.h
@@ -27,8 +27,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 // MSVC has a different name for several standard functions
 #ifdef WIN32
-# define strcasecmp stricmp
-# define strncasecmp strnicmp
+# define strcasecmp _stricmp
+# define strncasecmp _strnicmp
 #endif
 
 // Create our own define for Mac OS X
@@ -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
 
 //============================================================================
@@ -60,6 +59,7 @@ void SZ_HexDumpToConsole(const sizebuf_t *buf);
 void Com_HexDumpToConsole(const unsigned char *data, int size);
 
 unsigned short CRC_Block(const unsigned char *data, size_t size);
+unsigned short CRC_Block_CaseInsensitive(const unsigned char *data, size_t size); // for hash lookup functions that use strcasecmp for comparison
 
 unsigned char COM_BlockSequenceCRCByteQW(unsigned char *base, int length, int sequence);
 
@@ -149,6 +149,9 @@ typedef enum protocolversion_e
 	PROTOCOL_NEHAHRAMOVIE, // Nehahra movie protocol, a big nasty hack dating back to early days of the Quake Standards Group (but only ever used by neh_gl.exe), this is potentially backwards compatible with quake protocol as long as no extended features are used (but in actuality the neh_gl.exe which wrote this protocol ALWAYS wrote the extended information)
 	PROTOCOL_QUAKE, // quake (aka netquake/normalquake/nq) protocol
 	PROTOCOL_QUAKEWORLD, // quakeworld protocol
+	PROTOCOL_NEHAHRABJP, // same as QUAKEDP but with 16bit modelindex
+	PROTOCOL_NEHAHRABJP2, // same as NEHAHRABJP but with 16bit soundindex
+	PROTOCOL_NEHAHRABJP3, // same as NEHAHRABJP2 but with some changes
 }
 protocolversion_t;
 
@@ -200,10 +203,16 @@ float MSG_ReadAngle (protocolversion_t protocol);
 
 //============================================================================
 
+typedef float (*COM_WordWidthFunc_t) (void *passthrough, const char *w, size_t *length, float maxWidth); // length is updated to the longest fitting string into maxWidth; if maxWidth < 0, all characters are used and length is used as is
+typedef int (*COM_LineProcessorFunc) (void *passthrough, const char *line, size_t length, float width, qboolean isContination);
+int COM_Wordwrap(const char *string, size_t length, float continuationSize, float maxWidth, COM_WordWidthFunc_t wordWidth, void *passthroughCW, COM_LineProcessorFunc processLine, void *passthroughPL);
+
 extern char com_token[MAX_INPUTLINE];
 
-int COM_ParseToken(const char **datapointer, int returnnewline);
-int COM_ParseTokenConsole(const char **datapointer);
+int COM_ParseToken_Simple(const char **datapointer, qboolean returnnewline, qboolean parsebackslash);
+int COM_ParseToken_QuakeC(const char **datapointer, qboolean returnnewline);
+int COM_ParseToken_VM_Tokenize(const char **datapointer, qboolean returnnewline);
+int COM_ParseToken_Console(const char **datapointer);
 
 extern int com_argc;
 extern const char **com_argv;
@@ -265,11 +274,15 @@ typedef enum gamemode_e
 	GAME_NEOTERIC,
 	GAME_OPENQUARTZ, //this game sucks
 	GAME_PRYDON,
-	GAME_NETHERWORLD,
+	GAME_DELUXEQUAKE,
 	GAME_THEHUNTED,
 	GAME_DEFEATINDETAIL2,
 	GAME_DARSANA,
 	GAME_CONTAGIONTHEORY,
+	GAME_EDU2P,
+	GAME_BLADEMASTER,
+	GAME_PROPHECY,
+	GAME_COUNT
 }
 gamemode_t;
 
@@ -287,8 +300,10 @@ int COM_StringBeginsWith(const char *s, const char *match);
 
 int COM_ReadAndTokenizeLine(const char **text, char **argv, int maxargc, char *tokenbuf, int tokenbufsize, const char *commentprefix);
 
-size_t COM_StringLengthNoColors(const char *s, qboolean *valid);
-qboolean COM_StringDecolorize(const char *in, char *out, size_t size_out, qboolean escape_carets);
+size_t COM_StringLengthNoColors(const char *s, size_t size_s, qboolean *valid);
+qboolean COM_StringDecolorize(const char *in, size_t size_in, char *out, size_t size_out, qboolean escape_carets);
+void COM_ToLowerString (const char *in, char *out, size_t size_out);
+void COM_ToUpperString (const char *in, char *out, size_t size_out);
 
 typedef struct stringlist_s
 {
@@ -299,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);