From 50c51831a363cd4bf44973a9d43fb2bde632c768 Mon Sep 17 00:00:00 2001 From: Andrei Drexler Date: Sun, 9 Jun 2002 18:56:53 +0000 Subject: [PATCH] Removed teamcount cvars --- reaction/ta_ui/ui_local.h | 10 +++++++--- reaction/ta_ui/ui_main.c | 17 +++++++++++------ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/reaction/ta_ui/ui_local.h b/reaction/ta_ui/ui_local.h index a6ce5799..d6e97c9d 100644 --- a/reaction/ta_ui/ui_local.h +++ b/reaction/ta_ui/ui_local.h @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.13 2002/06/09 18:56:53 makro +// Removed teamcount cvars +// // Revision 1.12 2002/06/09 15:35:23 makro // "wait" command is no longer executed before adding a bot // when starting a server from the UI @@ -151,9 +154,10 @@ extern vmCvar_t ui_serverStatusTimeOut; //Makro - cvar for player model display extern vmCvar_t ui_RQ3_modelCommand; //Makro - team counts for the join menu -extern vmCvar_t ui_RQ3_teamCount1; -extern vmCvar_t ui_RQ3_teamCount2; -extern vmCvar_t ui_RQ3_numSpectators; +//Handled in cgame now +//extern vmCvar_t ui_RQ3_teamCount1; +//extern vmCvar_t ui_RQ3_teamCount2; +//extern vmCvar_t ui_RQ3_numSpectators; //Makro - weapon menu after joining a team extern vmCvar_t ui_RQ3_weapAfterJoin; //Makro - specify server option diff --git a/reaction/ta_ui/ui_main.c b/reaction/ta_ui/ui_main.c index 37b780d6..b38424f1 100644 --- a/reaction/ta_ui/ui_main.c +++ b/reaction/ta_ui/ui_main.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.30 2002/06/09 18:56:53 makro +// Removed teamcount cvars +// // Revision 1.29 2002/06/09 15:35:23 makro // "wait" command is no longer executed before adding a bot // when starting a server from the UI @@ -6191,9 +6194,10 @@ vmCvar_t ui_RQ3_ssgCrosshair; //Makro - activate the weapon menu after a team join vmCvar_t ui_RQ3_weapAfterJoin; //Makro - team counts -vmCvar_t ui_RQ3_teamCount1; -vmCvar_t ui_RQ3_teamCount2; -vmCvar_t ui_RQ3_numSpectators; +//Handled in cgame now +//vmCvar_t ui_RQ3_teamCount1; +//vmCvar_t ui_RQ3_teamCount2; +//vmCvar_t ui_RQ3_numSpectators; //Makro - specify server option vmCvar_t ui_RQ3_joinAddress; vmCvar_t ui_RQ3_joinPort; @@ -6327,9 +6331,10 @@ static cvarTable_t cvarTable[] = { { &ui_RQ3_ssgCrosshair, "ui_RQ3_ssgCrosshair", "0", 0}, { &ui_RQ3_weapAfterJoin, "ui_RQ3_weapAfterJoin", "1", CVAR_ARCHIVE}, //Makro - team counts - { &ui_RQ3_teamCount1, "g_RQ3_teamCount1", "0", 0}, - { &ui_RQ3_teamCount2, "g_RQ3_teamCount2", "0", 0}, - { &ui_RQ3_numSpectators, "g_RQ3_numSpectators", "0", 0}, + //Handled in cgame now + //{ &ui_RQ3_teamCount1, "g_RQ3_teamCount1", "0", 0}, + //{ &ui_RQ3_teamCount2, "g_RQ3_teamCount2", "0", 0}, + //{ &ui_RQ3_numSpectators, "g_RQ3_numSpectators", "0", 0}, //Makro - specify server option { &ui_RQ3_joinAddress, "ui_RQ3_joinAddress", "", CVAR_ARCHIVE}, { &ui_RQ3_joinPort, "ui_RQ3_joinPort", "27960", CVAR_ARCHIVE},