diff options
Diffstat (limited to 'src/game/g_local.h')
| -rw-r--r-- | src/game/g_local.h | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/src/game/g_local.h b/src/game/g_local.h index 5df8b2bf..255359f5 100644 --- a/src/game/g_local.h +++ b/src/game/g_local.h @@ -37,11 +37,8 @@ typedef struct gclient_s gclient_t; #define INFINITE 1000000 #define FRAMETIME 100 // msec -#define CARNAGE_REWARD_TIME 3000 -#define REWARD_SPRITE_TIME 2000 #define INTERMISSION_DELAY_TIME 1000 -#define SP_INTERMISSION_DELAY_TIME 5000 // gentity->flags #define FL_GODMODE 0x00000010 @@ -72,8 +69,6 @@ typedef enum MODEL_2TO1 } moverState_t; -#define SP_PODIUM_MODEL "models/mapobjects/podium/podium4.md3" - //============================================================================ struct gentity_s @@ -253,11 +248,6 @@ typedef enum CON_CONNECTED } clientConnected_t; -// the auto following clients don't follow a specific client -// number, but instead follow the first two active players -#define FOLLOW_ACTIVE1 -1 -#define FOLLOW_ACTIVE2 -2 - // client data that stays across multiple levels or tournament restarts // this is achieved by writing all the data to cvar strings at game shutdown // time and reading them back at connection time. Anything added here @@ -323,7 +313,7 @@ typedef struct namelog_t *namelog; g_admin_admin_t *admin; - int aliveSeconds; // time player has been alive in seconds + int secondsAlive; // time player has been alive in seconds qboolean hasHealed; // has healed a player (basi regen aura) in the last 10sec (for score use) // used to save persistant[] values while in SPECTATOR_FOLLOW mode @@ -542,7 +532,7 @@ typedef struct struct gentity_s *gentities; int gentitySize; - int num_entities; // current number, <= MAX_GENTITIES + int num_entities; // MAX_CLIENTS <= num_entities <= ENTITYNUM_MAX_NORMAL int warmupTime; // restart match at this time @@ -619,8 +609,8 @@ typedef struct float averageNumHumanClients; int numHumanSamples; - int numLiveAlienClients; - int numLiveHumanClients; + int numAlienClientsAlive; + int numHumanClientsAlive; int alienBuildPoints; int alienBuildPointQueue; @@ -689,7 +679,7 @@ typedef struct #define CMD_SPEC 0x0010 // must be a spectator #define CMD_ALIEN 0x0020 #define CMD_HUMAN 0x0040 -#define CMD_LIVING 0x0080 +#define CMD_ALIVE 0x0080 #define CMD_INTERMISSION 0x0100 // valid during intermission typedef struct @@ -840,9 +830,7 @@ void G_FreeEntity( gentity_t *e ); qboolean G_EntitiesFree( void ); void G_TouchTriggers( gentity_t *ent ); -void G_TouchSolids( gentity_t *ent ); -float *tv( float x, float y, float z ); char *vtos( const vec3_t v ); float vectoyaw( const vec3_t vec ); @@ -850,7 +838,7 @@ float vectoyaw( const vec3_t vec ); void G_AddPredictableEvent( gentity_t *ent, int event, int eventParm ); void G_AddEvent( gentity_t *ent, int event, int eventParm ); void G_BroadcastEvent( int event, int eventParm ); -void G_SetOrigin( gentity_t *ent, vec3_t origin ); +void G_SetOrigin( gentity_t *ent, const vec3_t origin ); void AddRemap(const char *oldShader, const char *newShader, float timeOffset); const char *BuildShaderStateConfig( void ); @@ -877,7 +865,6 @@ qboolean G_RadiusDamage( vec3_t origin, gentity_t *attacker, float damage, floa qboolean G_SelectiveRadiusDamage( vec3_t origin, gentity_t *attacker, float damage, float radius, gentity_t *ignore, int mod, int team ); float G_RewardAttackers( gentity_t *self ); -void body_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int damage, int meansOfDeath ); void AddScore( gentity_t *ent, int score ); void G_LogDestruction( gentity_t *self, gentity_t *actor, int mod ); @@ -962,7 +949,6 @@ void G_ClearPlayerZapEffects( gentity_t *player ); // g_client.c // void G_AddCreditToClient( gclient_t *client, short credit, qboolean cap ); -team_t TeamCount( int ignoreClientNum, int team ); void G_SetClientViewAngle( gentity_t *ent, vec3_t angle ); gentity_t *G_SelectTremulousSpawnPoint( team_t team, vec3_t preference, vec3_t origin, vec3_t angles ); gentity_t *G_SelectSpawnPoint( vec3_t avoidPoint, vec3_t origin, vec3_t angles ); @@ -1220,8 +1206,6 @@ void trap_LinkEntity( gentity_t *ent ); void trap_UnlinkEntity( gentity_t *ent ); int trap_EntitiesInBox( const vec3_t mins, const vec3_t maxs, int *entityList, int maxcount ); qboolean trap_EntityContact( const vec3_t mins, const vec3_t maxs, const gentity_t *ent ); -int trap_BotAllocateClient( void ); -void trap_BotFreeClient( int clientNum ); void trap_GetUsercmd( int clientNum, usercmd_t *cmd ); qboolean trap_GetEntityToken( char *buffer, int bufferSize ); |