X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=common.h;h=95a12ab3b98c081c04573ab7e9531df8262a8e79;hp=b18064b1d46094048f59d00d9d3f9e714e414211;hb=4048c5cdec22f262fb5925aea3eb0d6941c4d0c5;hpb=0a9cb13c130407234be6c297af3006258e90bf3d diff --git a/common.h b/common.h index b18064b1..95a12ab3 100644 --- a/common.h +++ b/common.h @@ -1,5 +1,6 @@ /* Copyright (C) 1996-1997 Id Software, Inc. +Copyright (C) 2000-2020 DarkPlaces contributors This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -21,11 +22,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef COMMON_H #define COMMON_H +#include +#include +#include "qtypes.h" +#include "qdefs.h" /// MSVC has a different name for several standard functions #ifdef WIN32 # define strcasecmp _stricmp # define strncasecmp _strnicmp +#else +#include "strings.h" #endif // Create our own define for Mac OS X @@ -33,21 +40,20 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # define MACOSX #endif -#ifdef SUNOS -#include ///< Needed for FNDELAY -#endif //============================================================================ +#define ContainerOf(ptr, type, member) ((type *)((char *)(ptr) - offsetof(type, member))) + typedef struct sizebuf_s { - qboolean allowoverflow; ///< if false, do a Sys_Error - qboolean overflowed; ///< set to true if the buffer size failed + qbool allowoverflow; ///< if false, do a Sys_Error + qbool overflowed; ///< set to true if the buffer size failed unsigned char *data; int maxsize; int cursize; int readcount; - qboolean badread; // set if a read goes beyond end of message + qbool badread; // set if a read goes beyond end of message } sizebuf_t; void SZ_Clear (sizebuf_t *buf); @@ -125,6 +131,7 @@ void StoreLittleShort (unsigned char *buffer, unsigned short i); typedef enum protocolversion_e { PROTOCOL_UNKNOWN, + PROTOCOL_DARKPLACES8, ///< wip PROTOCOL_DARKPLACES7, ///< added QuakeWorld-style movement protocol to allow more consistent prediction PROTOCOL_DARKPLACES6, ///< various changes PROTOCOL_DARKPLACES5, ///< uses EntityFrame5 entity snapshot encoder/decoder which is based on a Tribes networking article at http://www.garagegames.com/articles/networking1/ @@ -194,21 +201,16 @@ float MSG_ReadAngle (sizebuf_t *sb, protocolversion_t protocol); //============================================================================ typedef float (*COM_WordWidthFunc_t) (void *passthrough, const char *w, size_t *length, float maxWidth); // length is updated to the longest fitting string into maxWidth; if maxWidth < 0, all characters are used and length is used as is -typedef int (*COM_LineProcessorFunc) (void *passthrough, const char *line, size_t length, float width, qboolean isContination); +typedef int (*COM_LineProcessorFunc) (void *passthrough, const char *line, size_t length, float width, qbool isContination); int COM_Wordwrap(const char *string, size_t length, float continuationSize, float maxWidth, COM_WordWidthFunc_t wordWidth, void *passthroughCW, COM_LineProcessorFunc processLine, void *passthroughPL); extern char com_token[MAX_INPUTLINE]; -int COM_ParseToken_Simple(const char **datapointer, qboolean returnnewline, qboolean parsebackslash, qboolean parsecomments); -int COM_ParseToken_QuakeC(const char **datapointer, qboolean returnnewline); -int COM_ParseToken_VM_Tokenize(const char **datapointer, qboolean returnnewline); +int COM_ParseToken_Simple(const char **datapointer, qbool returnnewline, qbool parsebackslash, qbool parsecomments); +int COM_ParseToken_QuakeC(const char **datapointer, qbool returnnewline); +int COM_ParseToken_VM_Tokenize(const char **datapointer, qbool returnnewline); int COM_ParseToken_Console(const char **datapointer); -extern int com_argc; -extern const char **com_argv; -extern int com_selffd; - -int COM_CheckParm (const char *parm); void COM_Init (void); void COM_Shutdown (void); void COM_InitGameType (void); @@ -216,16 +218,22 @@ void COM_InitGameType (void); char *va(char *buf, size_t buflen, const char *format, ...) DP_FUNC_PRINTF(3); // does a varargs printf into provided buffer, returns buffer (so it can be called in-line unlike dpsnprintf) +// GCC with -Werror=c++-compat will error out if static_assert is used even though the macro is valid C11... +#ifndef __cplusplus +#define DP_STATIC_ASSERT(expr, str) _Static_assert(expr, str) +#else +#define DP_STATIC_ASSERT(expr, str) static_assert(expr, str) +#endif // snprintf and vsnprintf are NOT portable. Use their DP counterparts instead #ifdef snprintf # undef snprintf #endif -#define snprintf DO_NOT_USE_SNPRINTF__USE_DPSNPRINTF +#define snprintf DP_STATIC_ASSERT(0, "snprintf is forbidden for portability reasons. Use dpsnprintf instead.") #ifdef vsnprintf # undef vsnprintf #endif -#define vsnprintf DO_NOT_USE_VSNPRINTF__USE_DPVSNPRINTF +#define vsnprintf DP_STATIC_ASSERT(0, "vsnprintf is forbidden for portability reasons. Use dpvsnprintf instead.") // dpsnprintf and dpvsnprintf // return the number of printed characters, excluding the final '\0' @@ -235,17 +243,17 @@ extern int dpsnprintf (char *buffer, size_t buffersize, const char *format, ...) extern int dpvsnprintf (char *buffer, size_t buffersize, const char *format, va_list args); // A bunch of functions are forbidden for security reasons (and also to please MSVS 2005, for some of them) -// LordHavoc: added #undef lines here to avoid warnings in Linux +// LadyHavoc: added #undef lines here to avoid warnings in Linux #undef strcat -#define strcat DO_NOT_USE_STRCAT__USE_STRLCAT_OR_MEMCPY +#define strcat DP_STATIC_ASSERT(0, "strcat is forbidden for security reasons. Use strlcat or memcpy instead.") #undef strncat -#define strncat DO_NOT_USE_STRNCAT__USE_STRLCAT_OR_MEMCPY +#define strncat DP_STATIC_ASSERT(0, "strncat is forbidden for security reasons. Use strlcat or memcpy instead.") #undef strcpy -#define strcpy DO_NOT_USE_STRCPY__USE_STRLCPY_OR_MEMCPY +#define strcpy DP_STATIC_ASSERT(0, "strcpy is forbidden for security reasons. Use strlcpy or memcpy instead.") #undef strncpy -#define strncpy DO_NOT_USE_STRNCPY__USE_STRLCPY_OR_MEMCPY -//#undef sprintf -//#define sprintf DO_NOT_USE_SPRINTF__USE_DPSNPRINTF +#define strncpy DP_STATIC_ASSERT(0, "strncpy is forbidden for security reasons. Use strlcpy or memcpy instead.") +#undef sprintf +#define sprintf DP_STATIC_ASSERT(0, "sprintf is forbidden for security reasons. Use dpsnprintf instead.") //============================================================================ @@ -292,16 +300,26 @@ typedef enum gamemode_e GAME_BLOODOMNICIDE, GAME_STEELSTORM, // added by motorsep GAME_STEELSTORM2, // added by motorsep + GAME_SSAMMO, // added by motorsep + GAME_STEELSTORMREVENANTS, // added by motorsep 07/19/2015 GAME_TOMESOFMEPHISTOPHELES, // added by motorsep GAME_STRAPBOMB, // added by motorsep for Urre GAME_MOONHELM, GAME_VORETOURNAMENT, + GAME_DOOMBRINGER, // added by Cloudwalk for kristus + GAME_BATTLEMETAL, // added by Cloudwalk for Subject9x GAME_COUNT } gamemode_t; +// Master switch for some hacks/changes that eventually should become cvars. +#define IS_NEXUIZ_DERIVED(g) ((g) == GAME_NEXUIZ || (g) == GAME_XONOTIC || (g) == GAME_VORETOURNAMENT) +// Pre-csqcmodels era. +#define IS_OLDNEXUIZ_DERIVED(g) ((g) == GAME_NEXUIZ || (g) == GAME_VORETOURNAMENT) + extern gamemode_t gamemode; extern const char *gamename; +extern const char *gamenetworkfiltername; extern const char *gamedirname1; extern const char *gamedirname2; extern const char *gamescreenshotname; @@ -316,8 +334,8 @@ int COM_StringBeginsWith(const char *s, const char *match); int COM_ReadAndTokenizeLine(const char **text, char **argv, int maxargc, char *tokenbuf, int tokenbufsize, const char *commentprefix); -size_t COM_StringLengthNoColors(const char *s, size_t size_s, qboolean *valid); -qboolean COM_StringDecolorize(const char *in, size_t size_in, char *out, size_t size_out, qboolean escape_carets); +size_t COM_StringLengthNoColors(const char *s, size_t size_s, qbool *valid); +qbool COM_StringDecolorize(const char *in, size_t size_in, char *out, size_t size_out, qbool escape_carets); void COM_ToLowerString (const char *in, char *out, size_t size_out); void COM_ToUpperString (const char *in, char *out, size_t size_out); @@ -330,11 +348,11 @@ typedef struct stringlist_s } stringlist_t; int matchpattern(const char *in, const char *pattern, int caseinsensitive); -int matchpattern_with_separator(const char *in, const char *pattern, int caseinsensitive, const char *separators, qboolean wildcard_least_one); +int matchpattern_with_separator(const char *in, const char *pattern, int caseinsensitive, const char *separators, qbool wildcard_least_one); void stringlistinit(stringlist_t *list); void stringlistfreecontents(stringlist_t *list); void stringlistappend(stringlist_t *list, const char *text); -void stringlistsort(stringlist_t *list, qboolean uniq); +void stringlistsort(stringlist_t *list, qbool uniq); void listdirectory(stringlist_t *list, const char *basepath, const char *path); char *InfoString_GetValue(const char *buffer, const char *key, char *value, size_t valuelength); @@ -376,5 +394,9 @@ char **XPM_DecodeString(const char *in); size_t base64_encode(unsigned char *buf, size_t buflen, size_t outbuflen); +#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) + +float Com_CalcRoll (const vec3_t angles, const vec3_t velocity, const vec_t angleval, const vec_t velocityval); + #endif