X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=common.h;h=7d084f47f3fbc55ab44e16fd9bb2bb52ec9d6e73;hb=2eb150850a003f37581a3b84594c45e7400096de;hp=c772fef8ee1acce7020575ad1903098f66bd3db0;hpb=95b881bd92f57e84a2fb4c8d52ca7cd84f04cb02;p=xonotic%2Fdarkplaces.git

diff --git a/common.h b/common.h
index c772fef8..7d084f47 100644
--- a/common.h
+++ b/common.h
@@ -19,52 +19,30 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // comndef.h  -- general definitions
 
-#if !defined BYTE_DEFINED
-typedef unsigned char 		byte;
-#define BYTE_DEFINED 1
-#endif
-
-#undef true
-#undef false
-
-typedef enum {false, true}	qboolean;
-
-#include "quakeio.h"
-
 // LordHavoc: MSVC has a different name for snprintf
-#ifndef snprintf
+#ifdef WIN32
 #define snprintf _snprintf
 #endif
 
 //============================================================================
 
-extern void *qmalloc(unsigned int size);
-extern void qfree(void *mem);
-
-//============================================================================
-
 typedef struct sizebuf_s
 {
 	qboolean	allowoverflow;	// if false, do a Sys_Error
 	qboolean	overflowed;		// set to true if the buffer size failed
-	byte	*data;
-	int		maxsize;
-	int		cursize;
+	byte		*data;
+	mempool_t	*mempool;
+	int			maxsize;
+	int			cursize;
 } sizebuf_t;
 
-void SZ_Alloc (sizebuf_t *buf, int startsize);
+void SZ_Alloc (sizebuf_t *buf, int startsize, char *name);
 void SZ_Free (sizebuf_t *buf);
 void SZ_Clear (sizebuf_t *buf);
 void *SZ_GetSpace (sizebuf_t *buf, int length);
 void SZ_Write (sizebuf_t *buf, void *data, int length);
 void SZ_Print (sizebuf_t *buf, char *data);	// strcats onto the sizebuf
 
-//============================================================================
-
-#ifndef NULL
-#define NULL ((void *)0)
-#endif
-
 //============================================================================
 #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__)
@@ -179,7 +157,7 @@ extern	int		com_argc;
 extern	char	**com_argv;
 
 int COM_CheckParm (char *parm);
-void COM_Init (char *path);
+void COM_Init (void);
 void COM_InitArgv (int argc, char **argv);
 
 char *COM_SkipPath (char *pathname);
@@ -194,7 +172,6 @@ char	*va(char *format, ...);
 //============================================================================
 
 extern int com_filesize;
-struct cache_user_s;
 
 extern	char	com_gamedir[MAX_OSPATH];
 
@@ -203,17 +180,21 @@ int COM_FOpenFile (char *filename, QFile **file, qboolean quiet, qboolean zip);
 
 // set by COM_LoadFile functions
 extern int loadsize;
-byte *COM_LoadHunkFile (char *path, qboolean quiet);
-byte *COM_LoadMallocFile (char *path, qboolean quiet);
-//void COM_LoadCacheFile (char *path, struct cache_user_s *cu, qboolean quiet);
-
-byte *COM_LoadFile (char *path, int usehunk, qboolean quiet);
+byte *COM_LoadFile (char *path, qboolean quiet);
 
 int COM_FileExists(char *filename);
 
 extern	struct cvar_s	registered;
 
-extern qboolean		standard_quake, rogue, hipnotic, nehahra;
+#define GAME_NORMAL 0
+#define GAME_HIPNOTIC 1
+#define GAME_ROGUE 2
+#define GAME_NEHAHRA 3
+#define GAME_FIENDARENA 4
+#define GAME_ZYMOTIC 5
+
+extern int gamemode;
+extern char *gamename;
 
 // LordHavoc: useful...
 extern void COM_ToLowerString(char *in, char *out);