diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h index 06303e93..8fd37acd 100644 --- a/code/qcommon/q_shared.h +++ b/code/qcommon/q_shared.h @@ -828,7 +828,8 @@ float erandom( float mean ); void vectoangles( const vec3_t value1, vec3_t angles ); void VectorToAngles( const vec3_t vec, vec3_t angles ); -void AnglesToAxis( const vec3_t angles, vec3_t axis[3] ); +void AnglesToAxis(const vec3_t angles, vec3_t axis[3]); +void YawToAxis(float yaw, float axis[2]); static void init( void ); float noise1(float arg); @@ -2180,6 +2181,24 @@ typedef enum _flag_status { FLAG_DROPPED } flagStatus_t; +// +// Radar system +// +typedef struct { + int time; + int lastSpeakTime; + qboolean bValid; + float origin[2]; + float axis[2]; +} radarClient_t; + +typedef struct { + int clientNum; + float x; + float y; + float yaw; +} radarUnpacked_t; + #define MAX_GLOBAL_SERVERS 2048 #define MAX_OTHER_SERVERS 128 #define MAX_PINGREQUESTS 32 diff --git a/code/server/server.h b/code/server/server.h index dc0b3be5..d3d228a3 100644 --- a/code/server/server.h +++ b/code/server/server.h @@ -90,13 +90,6 @@ typedef struct { int gameClientSize; // will be > sizeof(playerState_t) due to game private data } server_t; -typedef struct { - int clientNum; - float x; - float y; - float yaw; -} radarUnpacked_t; - typedef struct { int areabytes; byte areabits[MAX_MAP_AREA_BYTES]; // portalarea visibility bits