Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/g_local.h
Original file line number Diff line number Diff line change
Expand Up @@ -894,6 +894,7 @@ void CA_player_pre_think(void);
void CA_spectator_think(void);
void CA_Frame(void);
void CA_PutClientInServer(void);
void CA_AddLatePlayer(gedict_t *p, char *team);
qbool CA_can_fire(gedict_t *p);

// captain.c
Expand Down
10 changes: 7 additions & 3 deletions include/progs.h
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,8 @@ typedef enum
etCaptain,
etCoach,
etAdmin,
etSuggestColor
etSuggestColor,
etLateJoin
} electType_t;

// store player votes here
Expand Down Expand Up @@ -1062,10 +1063,12 @@ typedef struct gedict_s
qbool ca_alive;
qbool ca_ready;
qbool can_respawn;
qbool is_solo; // is player a one-man team?
qbool in_play; // is player still fighting?
qbool in_limbo; // waiting to respawn during wipeout
qbool last_alive_active; // if last alive timer is active
qbool no_pain; // if player can take any damage to health or armor
qbool lj_accepted; // if late-join request was accepted
float ca_round_frags;
float ca_round_kills;
float ca_round_dmg;
Expand All @@ -1077,12 +1080,13 @@ typedef struct gedict_s
float ca_round_rldirect;
float ca_round_lghit;
float ca_round_lgfired;
float alive_time; // number of seconds player is in play
float regen_timer; // when the regen timer is started
float time_of_respawn; // server time player respawned or round started
float seconds_to_respawn; // number of seconds until respawn
float escape_time; // number of seconds after "escaping"
char *teamcolor; // color of player's team
char cptext[100]; // centerprint for player
char cptext[1024]; // centerprint for player
char ljteam[1024]; // team that player is requesting to join
int ca_ammo_grenades; // grenade ammo
int tracking_enabled;
int round_deaths; // number of times player has died in the round
Expand Down
Loading
Loading