rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-04-07 02:22:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Enabled weapon/item menus in CTF

Browse source
This commit is contained in:
Andrei Drexler 2002-06-24 12:29:43 +00:00
parent a0649c963b
commit d0f11a3c36
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reaction/ta_ui/ui_atoms.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.13 2002/06/24 12:29:43 makro
// Enabled weapon/item menus in CTF
//
// Revision 1.12 2002/06/16 20:06:14 jbravo
// Reindented all the source files with "indent -kr -ut -i8 -l120 -lc120 -sob -bad -bap"
//
@ -419,7 +422,7 @@ qboolean UI_ConsoleCommand(int realTime)
}
//Makro - adding popup for choose commands
if (Q_stricmp(cmd, "ui_RQ3_loadout") == 0) {
if (trap_Cvar_VariableValue("g_gametype") == GT_TEAMPLAY)
if (trap_Cvar_VariableValue("g_gametype") == GT_TEAMPLAY || trap_Cvar_VariableValue("g_gametype") == GT_CTF)
_UI_SetActiveMenu(UIMENU_RQ3_WEAPON);
else
Com_Printf("Not playing teamplay.\n");

5
reaction/ta_ui/ui_main.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.36 2002/06/24 12:29:43 makro
// Enabled weapon/item menus in CTF
//
// Revision 1.35 2002/06/24 12:21:09 makro
// New UI sscript that uses the "settings" command
//
@ -4063,7 +4066,7 @@ static void UI_RunMenuScript(char **args)
//Makro - weapon menu after joining a team
} else if (Q_stricmp(name, "weapAfterJoin") == 0) {
//only in teamplay
if (trap_Cvar_VariableValue("g_gametype") == GT_TEAMPLAY) {
if (trap_Cvar_VariableValue("g_gametype") == GT_TEAMPLAY || trap_Cvar_VariableValue("g_gametype") == GT_CTF) {
if (ui_RQ3_weapAfterJoin.integer) {
_UI_SetActiveMenu(UIMENU_RQ3_WEAPON);
}