diff options
| author | Tim Angus <tim@ngus.net> | 2004-02-28 16:35:39 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2004-02-28 16:35:39 +0000 |
| commit | d1318515a8a9d2b8369e136fa91ff1a1f159a168 (patch) | |
| tree | a4ff45828c70434fd2fe08b52e11a38b1b3a253f /src/ui | |
| parent | 478b83d361938d4c4d21ffc97e25504323e18645 (diff) | |
* Added missing \n after server speech
* Added auto select option to team menu
* g_teamForceBalance now works
* Added "reload" command
* cg_lagometer now works
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/ui_local.h | 2 | ||||
| -rw-r--r-- | src/ui/ui_main.c | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/ui/ui_local.h b/src/ui/ui_local.h index 0519abdf..aa8d7aa7 100644 --- a/src/ui/ui_local.h +++ b/src/ui/ui_local.h @@ -854,7 +854,7 @@ typedef struct { int tremInfoPaneCount; //TA: tremulous menus - tremMenuItem_t tremTeamList[ 3 ]; + tremMenuItem_t tremTeamList[ 4 ]; int tremTeamCount; int tremTeamIndex; diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c index 4fb2ecf3..941ec2f0 100644 --- a/src/ui/ui_main.c +++ b/src/ui/ui_main.c @@ -3318,7 +3318,8 @@ UI_LoadTremTeams */ static void UI_LoadTremTeams( void ) { - uiInfo.tremTeamCount = 3; + uiInfo.tremTeamCount = 4; + uiInfo.tremTeamList[ 0 ].text = String_Alloc( "Aliens" ); uiInfo.tremTeamList[ 0 ].cmd = String_Alloc( "cmd team aliens\n" ); uiInfo.tremTeamList[ 0 ].infopane = UI_FindInfoPaneByName( "alienteam" ); @@ -3330,6 +3331,10 @@ static void UI_LoadTremTeams( void ) uiInfo.tremTeamList[ 2 ].text = String_Alloc( "Spectate" ); uiInfo.tremTeamList[ 2 ].cmd = String_Alloc( "cmd team spectate\n" ); uiInfo.tremTeamList[ 2 ].infopane = UI_FindInfoPaneByName( "spectateteam" ); + + uiInfo.tremTeamList[ 3 ].text = String_Alloc( "Auto select" ); + uiInfo.tremTeamList[ 3 ].cmd = String_Alloc( "cmd team auto\n" ); + uiInfo.tremTeamList[ 3 ].infopane = UI_FindInfoPaneByName( "autoteam" ); } /* @@ -3475,7 +3480,7 @@ static void UI_LoadTremHumanArmouryBuys( ) uiInfo.tremHumanArmouryBuyCount = 0; - for( i = WP_NONE +1; i < WP_NUM_WEAPONS; i++ ) + for( i = WP_NONE + 1; i < WP_NUM_WEAPONS; i++ ) { if( BG_FindTeamForWeapon( i ) == WUT_HUMANS && BG_FindPurchasableForWeapon( i ) && @@ -3496,7 +3501,7 @@ static void UI_LoadTremHumanArmouryBuys( ) } } - for( i = UP_NONE +1; i < UP_NUM_UPGRADES; i++ ) + for( i = UP_NONE + 1; i < UP_NUM_UPGRADES; i++ ) { if( BG_FindTeamForUpgrade( i ) == WUT_HUMANS && BG_FindStagesForUpgrade( i, stage ) && |