X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=common.h;h=f3e7be34fc414a6332f2bef1e6ef72cbef7f97cb;hb=ef35a088cb3ab1900acdbd5285465cd845368e79;hp=ce8b6eaf21d3c7134d4138c490a49e33b3f4c8f9;hpb=04826446c325116c03990a9faf04d6439816a6e2;p=xonotic%2Fdarkplaces.git

diff --git a/common.h b/common.h
index ce8b6eaf..f3e7be34 100644
--- a/common.h
+++ b/common.h
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -21,11 +21,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef COMMON_H
 #define COMMON_H
 
-// LordHavoc: MSVC has a different name for snprintf
+// MSVC has a different name for several standard functions
 #ifdef WIN32
-#define snprintf _snprintf
+# define snprintf _snprintf
+# define vsnprintf _vsnprintf
+# define strcasecmp stricmp
+# define strncasecmp strnicmp
 #endif
 
+
 //============================================================================
 
 typedef struct sizebuf_s
@@ -46,6 +50,8 @@ void SZ_Write (sizebuf_t *buf, const void *data, int length);
 void SZ_Print (sizebuf_t *buf, const char *data);	// strcats onto the sizebuf
 void SZ_HexDumpToConsole(const sizebuf_t *buf);
 
+void Com_HexDumpToConsole(const qbyte *data, int size);
+
 //============================================================================
 #if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG)
 #if  defined(__i386__) || defined(__ia64__) || defined(WIN32) || (defined(__alpha__) || defined(__alpha)) || defined(__arm__) || (defined(__mips__) && defined(__MIPSEL__)) || defined(__LITTLE_ENDIAN__)
@@ -85,6 +91,12 @@ extern float (*BigFloat) (float l);
 extern float (*LittleFloat) (float l);
 #endif
 
+unsigned int BuffBigLong (const qbyte *buffer);
+unsigned short BuffBigShort (const qbyte *buffer);
+unsigned int BuffLittleLong (const qbyte *buffer);
+unsigned short BuffLittleShort (const qbyte *buffer);
+
+
 //============================================================================
 
 void MSG_WriteChar (sizebuf_t *sb, int c);
@@ -102,13 +114,20 @@ extern	int			msg_readcount;
 extern	qboolean	msg_badread;		// set if a read goes beyond end of message
 
 void MSG_BeginReading (void);
-int MSG_ReadShort (void);
-int MSG_ReadLong (void);
-float MSG_ReadFloat (void);
+int MSG_ReadLittleShort (void);
+int MSG_ReadBigShort (void);
+int MSG_ReadLittleLong (void);
+int MSG_ReadBigLong (void);
+float MSG_ReadLittleFloat (void);
+float MSG_ReadBigFloat (void);
 char *MSG_ReadString (void);
+int MSG_ReadBytes (int numbytes, unsigned char *out);
 
 #define MSG_ReadChar() (msg_readcount >= net_message.cursize ? (msg_badread = true, -1) : (signed char)net_message.data[msg_readcount++])
 #define MSG_ReadByte() (msg_readcount >= net_message.cursize ? (msg_badread = true, -1) : (unsigned char)net_message.data[msg_readcount++])
+#define MSG_ReadShort MSG_ReadLittleShort
+#define MSG_ReadLong MSG_ReadLittleLong
+#define MSG_ReadFloat MSG_ReadLittleFloat
 
 float MSG_ReadCoord (void);
 
@@ -123,17 +142,10 @@ extern int dpprotocol;
 
 //============================================================================
 
-int Q_strcasecmp (const char *s1, const char *s2);
-int Q_strncasecmp (const char *s1, const char *s2, int n);
-
-//============================================================================
-
 extern char com_token[1024];
-extern qboolean com_eof;
 
-int COM_ParseToken (const char **data);
+int COM_ParseToken(const char **datapointer, int returnnewline);
 
-extern char com_basedir[MAX_OSPATH];
 extern int com_argc;
 extern const char **com_argv;
 
@@ -142,39 +154,27 @@ void COM_Init (void);
 void COM_InitArgv (void);
 void COM_InitGameType (void);
 
-void COM_StripExtension (const char *in, char *out);
-void COM_FileBase (const char *in, char *out);
-void COM_DefaultExtension (char *path, const char *extension);
-
 char	*va(const char *format, ...);
 // does a varargs printf into a temp buffer
 
 
 //============================================================================
 
-extern int com_filesize;
-
-extern	char	com_gamedir[MAX_OSPATH];
-
-qboolean COM_WriteFile (const char *filename, void *data, int len);
-int COM_FOpenFile (const char *filename, QFile **file, qboolean quiet, qboolean zip);
-
-// set by COM_LoadFile functions
-extern int loadsize;
-qbyte *COM_LoadFile (const char *path, qboolean quiet);
-
-int COM_FileExists(const char *filename);
-
 extern	struct cvar_s	registered;
 
 #define GAME_NORMAL 0
 #define GAME_HIPNOTIC 1
 #define GAME_ROGUE 2
 #define GAME_NEHAHRA 3
-#define GAME_TRANSFUSION 4
+#define GAME_NEXUIZ 4
+#define GAME_TRANSFUSION 5
+#define GAME_GOODVSBAD2 6
+#define GAME_TEU 7
+#define GAME_BATTLEMECH 8
 
 extern int gamemode;
 extern char *gamename;
+extern char *gamedirname;
 extern char com_modname[MAX_OSPATH];
 
 // LordHavoc: useful...
@@ -192,5 +192,7 @@ int matchpattern(char *in, char *pattern, int caseinsensitive);
 stringlist_t *listdirectory(char *path);
 void freedirectory(stringlist_t *list);
 
+char *SearchInfostring(const char *infostring, const char *key);
+
 #endif