X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=common.h;h=ce8b6eaf21d3c7134d4138c490a49e33b3f4c8f9;hb=a2abf4addfa875d01c2775098277fea38ee99e24;hp=c7a0be34ac525a6b95bdeb4565e94d2fce4c547f;hpb=45982a9894c5bff60ff494a0f82865ec267d52f7;p=xonotic%2Fdarkplaces.git diff --git a/common.h b/common.h index c7a0be34..ce8b6eaf 100644 --- a/common.h +++ b/common.h @@ -17,19 +17,9 @@ along with this program; if not, write to the Free Software 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" +#ifndef COMMON_H +#define COMMON_H // LordHavoc: MSVC has a different name for snprintf #ifdef WIN32 @@ -38,32 +28,23 @@ typedef enum {false, true} qboolean; //============================================================================ -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; + qbyte *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, const 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 +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); //============================================================================ #if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG) @@ -111,19 +92,16 @@ void MSG_WriteByte (sizebuf_t *sb, int c); void MSG_WriteShort (sizebuf_t *sb, int c); void MSG_WriteLong (sizebuf_t *sb, int c); void MSG_WriteFloat (sizebuf_t *sb, float f); -void MSG_WriteString (sizebuf_t *sb, char *s); +void MSG_WriteString (sizebuf_t *sb, const char *s); void MSG_WriteCoord (sizebuf_t *sb, float f); void MSG_WriteAngle (sizebuf_t *sb, float f); void MSG_WritePreciseAngle (sizebuf_t *sb, float f); - -#define MSG_WriteFloatCoord MSG_WriteFloat +void MSG_WriteDPCoord (sizebuf_t *sb, float f); extern int msg_readcount; extern qboolean msg_badread; // set if a read goes beyond end of message void MSG_BeginReading (void); -//int MSG_ReadChar (void); -//int MSG_ReadByte (void); int MSG_ReadShort (void); int MSG_ReadLong (void); float MSG_ReadFloat (void); @@ -131,85 +109,61 @@ char *MSG_ReadString (void); #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_readcount + 2) > net_message.cursize ? (msg_badread = true, -1) : (short)net_message.data[msg_readcount+=2, msg_readcount-2] | (net_message.data[msg_readcount-1] << 8)) -//#define MSG_ReadLong() ((msg_readcount + 4) > net_message.cursize ? (msg_badread = true, -1) : (int)net_message.data[msg_readcount+=4, msg_readcount-4] | (net_message.data[msg_readcount-3] << 8) | (net_message.data[msg_readcount-2] << 16) | (net_message.data[msg_readcount-1] << 24)) float MSG_ReadCoord (void); -//float MSG_ReadAngle (void); -#define MSG_ReadFloatCoord MSG_ReadFloat +float MSG_ReadDPCoord (void); #define MSG_ReadAngle() (MSG_ReadByte() * (360.0f / 256.0f)) #define MSG_ReadPreciseAngle() (MSG_ReadShort() * (360.0f / 65536.0f)) #define MSG_ReadVector(v) {(v)[0] = MSG_ReadCoord();(v)[1] = MSG_ReadCoord();(v)[2] = MSG_ReadCoord();} -extern qboolean dpprotocol; +extern int dpprotocol; //============================================================================ -/* -void Q_memset (void *dest, int fill, int count); -void Q_memcpy (void *dest, void *src, int count); -int Q_memcmp (void *m1, void *m2, int count); -void Q_strcpy (char *dest, char *src); -void Q_strncpy (char *dest, char *src, int count); -int Q_strlen (char *str); -char *Q_strrchr (char *s, char c); -void Q_strcat (char *dest, char *src); -int Q_strcmp (char *s1, char *s2); -int Q_strncmp (char *s1, char *s2, int count); -*/ -int Q_strcasecmp (char *s1, char *s2); -int Q_strncasecmp (char *s1, char *s2, int n); -/* -int Q_atoi (char *str); -float Q_atof (char *str); -*/ +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; - -char *COM_Parse (char *data); +extern char com_token[1024]; +extern qboolean com_eof; +int COM_ParseToken (const char **data); -extern int com_argc; -extern char **com_argv; +extern char com_basedir[MAX_OSPATH]; +extern int com_argc; +extern const char **com_argv; -int COM_CheckParm (char *parm); -void COM_Init (char *path); -void COM_InitArgv (int argc, char **argv); +int COM_CheckParm (const char *parm); +void COM_Init (void); +void COM_InitArgv (void); +void COM_InitGameType (void); -char *COM_SkipPath (char *pathname); -void COM_StripExtension (char *in, char *out); -void COM_FileBase (char *in, char *out); -void COM_DefaultExtension (char *path, char *extension); +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(char *format, ...); +char *va(const char *format, ...); // does a varargs printf into a temp buffer //============================================================================ extern int com_filesize; -struct cache_user_s; extern char com_gamedir[MAX_OSPATH]; -void COM_WriteFile (char *filename, void *data, int len); -int COM_FOpenFile (char *filename, QFile **file, qboolean quiet, qboolean zip); +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; -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); +qbyte *COM_LoadFile (const char *path, qboolean quiet); -int COM_FileExists(char *filename); +int COM_FileExists(const char *filename); extern struct cvar_s registered; @@ -217,12 +171,26 @@ extern struct cvar_s registered; #define GAME_HIPNOTIC 1 #define GAME_ROGUE 2 #define GAME_NEHAHRA 3 -#define GAME_FIENDARENA 4 -#define GAME_ZYMOTIC 5 +#define GAME_TRANSFUSION 4 extern int gamemode; extern char *gamename; +extern char com_modname[MAX_OSPATH]; // LordHavoc: useful... -extern void COM_ToLowerString(char *in, char *out); -extern void COM_ToUpperString(char *in, char *out); +void COM_ToLowerString(const char *in, char *out); +void COM_ToUpperString(const char *in, char *out); +int COM_StringBeginsWith(const char *s, const char *match); + +typedef struct stringlist_s +{ + struct stringlist_s *next; + char *text; +} stringlist_t; + +int matchpattern(char *in, char *pattern, int caseinsensitive); +stringlist_t *listdirectory(char *path); +void freedirectory(stringlist_t *list); + +#endif +