diff --git a/reaction/ta_ui/ui_atoms.c b/reaction/ta_ui/ui_atoms.c index 7196fe06..85dcdfb8 100644 --- a/reaction/ta_ui/ui_atoms.c +++ b/reaction/ta_ui/ui_atoms.c @@ -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"); diff --git a/reaction/ta_ui/ui_main.c b/reaction/ta_ui/ui_main.c index 1423b57c..b6973d3e 100644 --- a/reaction/ta_ui/ui_main.c +++ b/reaction/ta_ui/ui_main.c @@ -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); }