diff options
Diffstat (limited to 'src/game/q_shared.h')
-rw-r--r-- | src/game/q_shared.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/game/q_shared.h b/src/game/q_shared.h index 69496267..e9c09c48 100644 --- a/src/game/q_shared.h +++ b/src/game/q_shared.h @@ -136,7 +136,7 @@ float FloatSwap (const float *f); #endif #endif -#define ID_INLINE __inline +#define ID_INLINE __inline static ID_INLINE short BigShort( short l) { return ShortSwap(l); } #define LittleShort @@ -157,7 +157,7 @@ static ID_INLINE float BigFloat(const float *l) { FloatSwap(l); } #define __cdecl #define __declspec(x) #define stricmp strcasecmp -#define ID_INLINE inline +#define ID_INLINE inline #ifdef __ppc__ #define CPUSTRING "MacOSX-ppc" @@ -174,21 +174,21 @@ static ID_INLINE float BigFloat(const float *l) { FloatSwap(l); } static inline unsigned int __lwbrx(register void *addr, register int offset) { register unsigned int word; - + asm("lwbrx %0,%2,%1" : "=r" (word) : "r" (addr), "b" (offset)); return word; } static inline unsigned short __lhbrx(register void *addr, register int offset) { register unsigned short halfword; - + asm("lhbrx %0,%2,%1" : "=r" (halfword) : "r" (addr), "b" (offset)); return halfword; } static inline float __fctiw(register float f) { register float fi; - + asm("fctiw %0,%1" : "=f" (fi) : "f" (f)); return fi; @@ -209,7 +209,7 @@ static inline float LittleFloat (const float l) { return FloatSwap(&l); } #include <MacTypes.h> #define MAC_STATIC -#define ID_INLINE inline +#define ID_INLINE inline #define CPUSTRING "MacOS-PPC" @@ -236,7 +236,7 @@ static inline float LittleFloat (const float l) { return FloatSwap(&l); } #define stricmp strcasecmp #define MAC_STATIC // bk: FIXME -#define ID_INLINE inline +#define ID_INLINE inline #ifdef __i386__ #define CPUSTRING "linux-i386" @@ -280,7 +280,7 @@ inline static float LittleFloat (const float *l) { return FloatSwap(l); } #define stricmp strcasecmp #define MAC_STATIC -#define ID_INLINE inline +#define ID_INLINE inline #ifdef __i386__ #define CPUSTRING "freebsd-i386" @@ -565,7 +565,7 @@ extern vec3_t axisDefault[3]; static inline float Q_rsqrt( float number ) { float x = 0.5f * number; float y; -#ifdef __GNUC__ +#ifdef __GNUC__ asm("frsqrte %0,%1" : "=f" (y) : "f" (number)); #else y = __frsqrte( number ); @@ -573,10 +573,10 @@ static inline float Q_rsqrt( float number ) { return y * (1.5f - (x * y * y)); } -#ifdef __GNUC__ +#ifdef __GNUC__ static inline float Q_fabs(float x) { float abs_x; - + asm("fabs %0,%1" : "=f" (abs_x) : "f" (x)); return abs_x; } @@ -658,7 +658,7 @@ void AddPointToBounds( const vec3_t v, vec3_t mins, vec3_t maxs ); static ID_INLINE int VectorCompare( const vec3_t v1, const vec3_t v2 ) { if (v1[0] != v2[0] || v1[1] != v2[1] || v1[2] != v2[2]) { return 0; - } + } return 1; } @@ -719,7 +719,7 @@ vec_t VectorLengthSquared( const vec3_t v ); vec_t Distance( const vec3_t p1, const vec3_t p2 ); vec_t DistanceSquared( const vec3_t p1, const vec3_t p2 ); - + void VectorNormalizeFast( vec3_t v ); void VectorInverse( vec3_t v ); @@ -1125,7 +1125,7 @@ typedef struct { #define MAX_STATS 16 #define MAX_PERSISTANT 16 #define MAX_POWERUPS 16 -#define MAX_WEAPONS 16 +#define MAX_WEAPONS 16 #define MAX_PS_EVENTS 2 @@ -1245,7 +1245,7 @@ typedef struct usercmd_s { int serverTime; int angles[3]; int buttons; - byte weapon; // weapon + byte weapon; // weapon signed char forwardmove, rightmove, upmove; } usercmd_t; @@ -1326,7 +1326,7 @@ typedef struct entityState_s { typedef enum { CA_UNINITIALIZED, CA_DISCONNECTED, // not talking to a server - CA_AUTHORIZING, // not used any more, was checking cd key + CA_AUTHORIZING, // not used any more, was checking cd key CA_CONNECTING, // sending request packets to the server CA_CHALLENGING, // sending challenge packets to the server CA_CONNECTED, // netchan_t established, getting gamestate @@ -1336,7 +1336,7 @@ typedef enum { CA_CINEMATIC // playing a cinematic or a static pic, not connected to a server } connstate_t; -// font support +// font support #define GLYPH_START 0 #define GLYPH_END 255 |