rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-23 20:52:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanups for colors and stopped bots looking for team leaders in TP

Browse source
This commit is contained in:
Richard Allen 2002-06-22 00:19:57 +00:00
parent 24ea9661ef
commit 02ef3cbf7f
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reaction/game/ai_team.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.10 2002/06/22 00:19:57 jbravo
// Cleanups for colors and stopped bots looking for team leaders in TP
//
// Revision 1.9 2002/06/16 20:06:13 jbravo // Revision 1.9 2002/06/16 20:06:13 jbravo
// Reindented all the source files with "indent -kr -ut -i8 -l120 -lc120 -sob -bad -bap" // Reindented all the source files with "indent -kr -ut -i8 -l120 -lc120 -sob -bad -bap"
// //
@ -1109,8 +1112,8 @@ void BotTeamAI(bot_state_t * bs)
return; return;
//make sure we've got a valid team leader //make sure we've got a valid team leader
if (!BotValidTeamLeader(bs)) { if (!BotValidTeamLeader(bs)) {
// // JBravo: try to stop that teamleader crap in TP
if (!FindHumanTeamLeader(bs)) { if (!FindHumanTeamLeader(bs) && gametype != GT_TEAMPLAY) {
// //
if (!bs->askteamleader_time && !bs->becometeamleader_time) { if (!bs->askteamleader_time && !bs->becometeamleader_time) {
if (bs->entergame_time + 10 > FloatTime()) { if (bs->entergame_time + 10 > FloatTime()) {

7
reaction/game/g_teamplay.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.113 2002/06/22 00:19:57 jbravo
// Cleanups for colors and stopped bots looking for team leaders in TP
//
// Revision 1.112 2002/06/21 15:04:55 makro // Revision 1.112 2002/06/21 15:04:55 makro
// Health functionality for movers should be complete now // Health functionality for movers should be complete now
// //
@ -371,7 +374,6 @@ void RQ3_SetupTeamSpawnPoints(void);
gitem_t *BG_FindItemForHoldable(holdable_t pw); gitem_t *BG_FindItemForHoldable(holdable_t pw);
char *ConcatArgs(int start); char *ConcatArgs(int start);
int touch[MAX_GENTITIES]; int touch[MAX_GENTITIES];
void ResetKills(gentity_t * ent);
void ClearBodyQue(void); void ClearBodyQue(void);
void Cmd_DropItem_f(gentity_t * ent); void Cmd_DropItem_f(gentity_t * ent);
void Cmd_DropWeapon_f(gentity_t * ent); void Cmd_DropWeapon_f(gentity_t * ent);
@ -1750,13 +1752,16 @@ void GetNearbyTeammates(gentity_t * self, char *buf)
if (nearby_teammates_num == 2) { if (nearby_teammates_num == 2) {
strcat(buf, "^5 and "); strcat(buf, "^5 and ");
strcat(buf, nearby_teammates[l]); strcat(buf, nearby_teammates[l]);
strcat(buf, "^5");
} else { } else {
if (l == (nearby_teammates_num - 1)) { if (l == (nearby_teammates_num - 1)) {
strcat(buf, "^5, and "); strcat(buf, "^5, and ");
strcat(buf, nearby_teammates[l]); strcat(buf, nearby_teammates[l]);
strcat(buf, "^5");
} else { } else {
strcat(buf, "^5, "); strcat(buf, "^5, ");
strcat(buf, nearby_teammates[l]); strcat(buf, nearby_teammates[l]);
strcat(buf, "^5, ");
} }
} }
} }

5
reaction/game/g_teamplay.h
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.20 2002/06/22 00:19:57 jbravo
// Cleanups for colors and stopped bots looking for team leaders in TP
//
// Revision 1.19 2002/06/19 18:13:57 jbravo // Revision 1.19 2002/06/19 18:13:57 jbravo
// New TNG spawning system :) // New TNG spawning system :)
// //
@ -119,3 +122,5 @@ void Cmd_Ignoreclear_f(gentity_t * ent);
void Cmd_Playerlist_f(gentity_t * ent); void Cmd_Playerlist_f(gentity_t * ent);
int IsInIgnoreList(gentity_t * source, gentity_t * subject); int IsInIgnoreList(gentity_t * source, gentity_t * subject);
void RQ3_GetSpawnPoints (void); void RQ3_GetSpawnPoints (void);
void ResetKills(gentity_t * ent);
void AddKilledPlayer(gentity_t * self, gentity_t * ent);