X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=common.h;h=274f0240b49b8ba5dfda9b8b94fe09eab01ecba4;hb=efd89dee09ac8a3c6b31dd71d61dd5bca54ca6eb;hp=3d2275f422a08e7f74b6cec4643516d3dd28d2f7;hpb=3b6d4a802e35f12543af6aca48a5c8c23369aec8;p=xonotic%2Fdarkplaces.git diff --git a/common.h b/common.h index 3d2275f4..274f0240 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 @@ -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) @@ -84,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); @@ -91,7 +104,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); @@ -101,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); @@ -122,63 +142,43 @@ 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; +extern char com_token[1024]; -char *COM_Parse (char *data); +int COM_ParseToken (const char **data); -extern char com_basedir[MAX_OSPATH]; extern int com_argc; -extern char **com_argv; +extern const char **com_argv; -int COM_CheckParm (char *parm); +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); - -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_TRANSFUSION 4 +#define GAME_NEXUIZ 4 +#define GAME_TRANSFUSION 5 +#define GAME_GOODVSBAD2 6 +#define GAME_TEU 7 extern int gamemode; extern char *gamename; +extern char *gamedirname; +extern char com_modname[MAX_OSPATH]; // LordHavoc: useful... -void COM_ToLowerString(char *in, char *out); -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,9 +187,11 @@ 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); +char *SearchInfostring(const char *infostring, const char *key); + #endif