diff options
| author | Tim Angus <tim@ngus.net> | 2004-01-12 04:53:29 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2004-01-12 04:53:29 +0000 |
| commit | 8a60a08eb78f047f35305cecb195e160035bdce6 (patch) | |
| tree | 7f541e0742ec8c22b28468b4b30924114adb4943 /src/ui | |
| parent | 5b4909a3e494eb8c677e3ae65818469fa9c22e3c (diff) | |
* Poison now does 30 damage max
* Crosshair names (re)implemented
* Mofo attack anims randomised
* Mofo charge anim triggered
* Switched the order of the spawn menus
* Stamina no longer interferes with the jet pack
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/ui_main.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c index 5a98d881..15b43c67 100644 --- a/src/ui/ui_main.c +++ b/src/ui/ui_main.c @@ -3343,24 +3343,24 @@ static void UI_LoadTremAlienClasses( void ) uiInfo.tremAlienClassCount = 2; + uiInfo.tremAlienClassList[ 0 ].text = + String_Alloc( BG_FindHumanNameForClassNum( PCL_A_O_BASE ) ); + uiInfo.tremAlienClassList[ 0 ].cmd = + String_Alloc( va( "cmd class %s", BG_FindNameForClassNum( PCL_A_O_BASE ) ) ); + uiInfo.tremAlienClassList[ 0 ].infopane = + UI_FindInfoPaneByName( va( "%sclass", BG_FindNameForClassNum( PCL_A_O_BASE ) ) ); + if( BG_FindStagesForClass( PCL_A_B_LEV1, UI_GetCurrentAlienStage( ) ) ) bClass = PCL_A_B_LEV1; else bClass = PCL_A_B_BASE; - - uiInfo.tremAlienClassList[ 0 ].text = - String_Alloc( BG_FindHumanNameForClassNum( bClass ) ); - uiInfo.tremAlienClassList[ 0 ].cmd = - String_Alloc( va( "cmd class %s", BG_FindNameForClassNum( bClass ) ) ); - uiInfo.tremAlienClassList[ 0 ].infopane = - UI_FindInfoPaneByName( va( "%sclass", BG_FindNameForClassNum( bClass ) ) ); uiInfo.tremAlienClassList[ 1 ].text = - String_Alloc( BG_FindHumanNameForClassNum( PCL_A_O_BASE ) ); + String_Alloc( BG_FindHumanNameForClassNum( bClass ) ); uiInfo.tremAlienClassList[ 1 ].cmd = - String_Alloc( va( "cmd class %s", BG_FindNameForClassNum( PCL_A_O_BASE ) ) ); + String_Alloc( va( "cmd class %s", BG_FindNameForClassNum( bClass ) ) ); uiInfo.tremAlienClassList[ 1 ].infopane = - UI_FindInfoPaneByName( va( "%sclass", BG_FindNameForClassNum( PCL_A_O_BASE ) ) ); + UI_FindInfoPaneByName( va( "%sclass", BG_FindNameForClassNum( bClass ) ) ); } /* @@ -3371,20 +3371,20 @@ UI_LoadTremHumanItems static void UI_LoadTremHumanItems( void ) { uiInfo.tremHumanItemCount = 2; - + uiInfo.tremHumanItemList[ 0 ].text = - String_Alloc( BG_FindHumanNameForWeapon( WP_HBUILD ) ); + String_Alloc( BG_FindHumanNameForWeapon( WP_MACHINEGUN ) ); uiInfo.tremHumanItemList[ 0 ].cmd = - String_Alloc( va( "cmd class %s", BG_FindNameForWeapon( WP_HBUILD ) ) ); + String_Alloc( va( "cmd class %s", BG_FindNameForWeapon( WP_MACHINEGUN ) ) ); uiInfo.tremHumanItemList[ 0 ].infopane = - UI_FindInfoPaneByName( va( "%sitem", BG_FindNameForWeapon( WP_HBUILD ) ) ); - + UI_FindInfoPaneByName( va( "%sitem", BG_FindNameForWeapon( WP_MACHINEGUN ) ) ); + uiInfo.tremHumanItemList[ 1 ].text = - String_Alloc( BG_FindHumanNameForWeapon( WP_MACHINEGUN ) ); + String_Alloc( BG_FindHumanNameForWeapon( WP_HBUILD ) ); uiInfo.tremHumanItemList[ 1 ].cmd = - String_Alloc( va( "cmd class %s", BG_FindNameForWeapon( WP_MACHINEGUN ) ) ); + String_Alloc( va( "cmd class %s", BG_FindNameForWeapon( WP_HBUILD ) ) ); uiInfo.tremHumanItemList[ 1 ].infopane = - UI_FindInfoPaneByName( va( "%sitem", BG_FindNameForWeapon( WP_MACHINEGUN ) ) ); + UI_FindInfoPaneByName( va( "%sitem", BG_FindNameForWeapon( WP_HBUILD ) ) ); } /* |