diff options
| author | Tim Angus <tim@ngus.net> | 2009-10-03 12:31:59 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:16:03 +0000 |
| commit | 304d4258d3a49488f570b8ad71931faa7e5d40ba (patch) | |
| tree | bf9ec15bd9154305ff9fab2943b3daf25024f8a5 /src/qcommon/q_shared.h | |
| parent | 6e90e4e7861f5cb354487d1fe0f1fd06c385308e (diff) | |
* Merge ioq3-r1498, by popular demand
Diffstat (limited to 'src/qcommon/q_shared.h')
| -rw-r--r-- | src/qcommon/q_shared.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/qcommon/q_shared.h b/src/qcommon/q_shared.h index 6eb636d6..c24fe292 100644 --- a/src/qcommon/q_shared.h +++ b/src/qcommon/q_shared.h @@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // q_shared.h -- included first by ALL program modules. // A user mod should never modify this file -#define PRODUCT_NAME "tremulous" +#define PRODUCT_NAME "tremulous" #ifdef _MSC_VER # define PRODUCT_VERSION "1.1.0" @@ -37,6 +37,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define CLIENT_WINDOW_MIN_TITLE "Tremulous" #define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION +#define GAMENAME_FOR_MASTER "Tremulous" + #define MAX_TEAMNAME 32 #ifdef _MSC_VER @@ -142,6 +144,12 @@ typedef unsigned char byte; typedef enum {qfalse, qtrue} qboolean; +typedef union { + float f; + int i; + unsigned int ui; +} floatint_t; + typedef int qhandle_t; typedef int sfxHandle_t; typedef int fileHandle_t; @@ -704,6 +712,7 @@ void SkipRestOfLine ( char **data ); void Parse1DMatrix (char **buf_p, int x, float *m); void Parse2DMatrix (char **buf_p, int y, int x, float *m); void Parse3DMatrix (char **buf_p, int z, int y, int x, float *m); +int Com_HexStrToInt( const char *str ); void QDECL Com_sprintf (char *dest, int size, const char *fmt, ...) __attribute__ ((format (printf, 3, 4))); |