X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=common.h;h=80d80e48af8477e3712348912ac85a6db88d4207;hb=2861288617172d7be2fc45c92b3bc1adb04f8a2a;hp=80998f8e7de530fb1c8b1154c0172decb50e4a0e;hpb=97776cf6e852959237922f395185c83c5165974f;p=xonotic%2Fdarkplaces.git diff --git a/common.h b/common.h index 80998f8e..80d80e48 100644 --- a/common.h +++ b/common.h @@ -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 @@ -38,12 +42,15 @@ typedef struct sizebuf_s int cursize; } sizebuf_t; -void SZ_Alloc (sizebuf_t *buf, int startsize, char *name); +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 +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) @@ -91,7 +98,7 @@ 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); @@ -122,64 +129,42 @@ extern int dpprotocol; //============================================================================ -int Q_strcasecmp (char *s1, char *s2); -int Q_strncasecmp (char *s1, char *s2, int n); - -//============================================================================ - -extern char com_token[1024]; -extern qboolean com_eof; - -char *COM_Parse (char *data); +extern char com_token[1024]; +int COM_ParseToken (const char **data); -extern int com_argc; -extern char **com_argv; +extern int com_argc; +extern const char **com_argv; -int COM_CheckParm (char *parm); +int COM_CheckParm (const char *parm); void COM_Init (void); -void COM_InitArgv (int argc, char **argv); +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); - -char *va(char *format, ...); +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 (char *filename, void *data, int len); -int COM_FOpenFile (char *filename, QFile **file, qboolean quiet, qboolean zip); - -// set by COM_LoadFile functions -extern int loadsize; -qbyte *COM_LoadFile (char *path, qboolean quiet); - -int COM_FileExists(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_FIENDARENA 4 -#define GAME_ZYMOTIC 5 -#define GAME_TRANSFUSION 6 +#define GAME_NEXIUZ 4 +#define GAME_TRANSFUSION 5 extern int gamemode; extern char *gamename; +extern char *gamedirname; +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 { @@ -187,7 +172,7 @@ typedef struct stringlist_s char *text; } stringlist_t; -int matchpattern(char *in, char *pattern); +int matchpattern(char *in, char *pattern, int caseinsensitive); stringlist_t *listdirectory(char *path); void freedirectory(stringlist_t *list);