rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-27 14:32:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bots stfy about flags. Its cases. Teamname fixes. TP style TP fixes.

Browse source
This commit is contained in:
Richard Allen 2003-02-27 07:33:58 +00:00
parent 7aed83dd84
commit a9d2263dd5
3 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reaction/ChangeLog
View file

@ -1,5 +1,7 @@
# List fixes here for the 2.3 release # List fixes here for the 2.3 release
* Bots dont talk about flags any more.
* The wepons menu now shows up where its supposed to (incl. TP style TDM)
* Grenades now also included in the fixed FF system. * Grenades now also included in the fixed FF system.
* Fixed FF system. * Fixed FF system.
* Added color to important error messages * Added color to important error messages

11
reaction/game/ai_dmq3.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.54 2003/02/27 07:33:58 jbravo
// Bots stfy about flags. Its cases. Teamname fixes. TP style TP fixes.
//
// Revision 1.53 2003/01/08 04:46:26 jbravo // Revision 1.53 2003/01/08 04:46:26 jbravo
// Wrote a new hackish model replacement system // Wrote a new hackish model replacement system
// //
@ -5455,10 +5458,10 @@ void BotSetupDeathmatchAI(void)
trap_Cvar_Register(&g_spSkill, "g_spSkill", "2", 0); trap_Cvar_Register(&g_spSkill, "g_spSkill", "2", 0);
// //
if (gametype == GT_CTF) { if (gametype == GT_CTF) {
if (trap_BotGetLevelItemGoal(-1, "Red Flag", &ctf_redflag) < 0) if (trap_BotGetLevelItemGoal(-1, "Silver Case", &ctf_redflag) < 0)
BotAI_Print(PRT_WARNING, "CTF without Red Flag\n"); BotAI_Print(PRT_WARNING, "CTB without Silver Case\n");
if (trap_BotGetLevelItemGoal(-1, "Blue Flag", &ctf_blueflag) < 0) if (trap_BotGetLevelItemGoal(-1, "Black Case", &ctf_blueflag) < 0)
BotAI_Print(PRT_WARNING, "CTF without Blue Flag\n"); BotAI_Print(PRT_WARNING, "CTB without Black Case\n");
} }
max_bspmodelindex = 0; max_bspmodelindex = 0;
for (ent = trap_AAS_NextBSPEntity(0); ent; ent = trap_AAS_NextBSPEntity(ent)) { for (ent = trap_AAS_NextBSPEntity(0); ent; ent = trap_AAS_NextBSPEntity(ent)) {

16
reaction/game/g_main.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.133 2003/02/27 07:33:58 jbravo
// Bots stfy about flags. Its cases. Teamname fixes. TP style TP fixes.
//
// Revision 1.132 2003/02/27 03:58:35 jbravo // Revision 1.132 2003/02/27 03:58:35 jbravo
// Fixed the FF system after adding TDM broke it. Added color to error messages // Fixed the FF system after adding TDM broke it. Added color to error messages
// //
@ -613,8 +616,8 @@ static cvarTable_t gameCvarTable[] = {
{&g_RQ3_tgren, "g_RQ3_tgren", "0", CVAR_ARCHIVE, 0, qtrue}, {&g_RQ3_tgren, "g_RQ3_tgren", "0", CVAR_ARCHIVE, 0, qtrue},
{&g_RQ3_limchasecam, "g_RQ3_limchasecam", "0", CVAR_ARCHIVE, 0, qtrue}, {&g_RQ3_limchasecam, "g_RQ3_limchasecam", "0", CVAR_ARCHIVE, 0, qtrue},
{&g_RQ3_sniperup, "g_RQ3_sniperup", "0", CVAR_ARCHIVE, 0, qtrue}, {&g_RQ3_sniperup, "g_RQ3_sniperup", "0", CVAR_ARCHIVE, 0, qtrue},
{&g_RQ3_team1name, "g_RQ3_team1name", "Robbers", CVAR_SYSTEMINFO | CVAR_SERVERINFO, 0, qfalse}, {&g_RQ3_team1name, "g_RQ3_team1name", "Team 1", CVAR_SYSTEMINFO | CVAR_SERVERINFO, 0, qfalse},
{&g_RQ3_team2name, "g_RQ3_team2name", "Swat", CVAR_SYSTEMINFO | CVAR_SERVERINFO, 0, qfalse}, {&g_RQ3_team2name, "g_RQ3_team2name", "Team 2", CVAR_SYSTEMINFO | CVAR_SERVERINFO, 0, qfalse},
{&g_RQ3_team1model, "g_RQ3_team1model", "grunt/robber", CVAR_SYSTEMINFO, 0, qfalse}, {&g_RQ3_team1model, "g_RQ3_team1model", "grunt/robber", CVAR_SYSTEMINFO, 0, qfalse},
{&g_RQ3_team2model, "g_RQ3_team2model", "grunt/police", CVAR_SYSTEMINFO, 0, qfalse}, {&g_RQ3_team2model, "g_RQ3_team2model", "grunt/police", CVAR_SYSTEMINFO, 0, qfalse},
{&g_RQ3_tpcountdown, "g_RQ3_tpcountdown", "0", CVAR_ARCHIVE, 0, qfalse}, {&g_RQ3_tpcountdown, "g_RQ3_tpcountdown", "0", CVAR_ARCHIVE, 0, qfalse},
@ -833,8 +836,17 @@ void G_RegisterCvars(void)
if (g_gametype.integer == GT_CTF) { if (g_gametype.integer == GT_CTF) {
trap_Cvar_Set("g_RQ3_team1name", "SILVER"); trap_Cvar_Set("g_RQ3_team1name", "SILVER");
trap_Cvar_Set("g_RQ3_team2name", "BLACK"); trap_Cvar_Set("g_RQ3_team2name", "BLACK");
} else {
if (Q_stricmp(g_RQ3_team1name.string, "SILVER") == 0)
trap_Cvar_Set("g_RQ3_team1name", "Team 1");
if (Q_stricmp(g_RQ3_team2name.string, "BLACK") == 0)
trap_Cvar_Set("g_RQ3_team2name", "Team 2");
} }
// JBravo: tdmMode now used to control the weapon/item menu in the UI
if (g_gametype.integer < GT_TEAM || g_gametype.integer > GT_TEAM)
trap_Cvar_Set("g_RQ3_tdmMode", "0");
level.warmupModificationCount = g_warmup.modificationCount; level.warmupModificationCount = g_warmup.modificationCount;
} }