diff options
| author | Tim Angus <tim@ngus.net> | 2002-03-04 01:13:59 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2002-03-04 01:13:59 +0000 |
| commit | eaa6b49c006a7fac3958b977cf1e510711677f87 (patch) | |
| tree | 492266e56a7244d9229aa9f802ce1271f4828334 /src/ui | |
| parent | 4d7d480cbdc687423723f47c0e43325c09be5f86 (diff) | |
Organ bank
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/ui_local.h | 2 | ||||
| -rw-r--r-- | src/ui/ui_main.c | 26 |
2 files changed, 18 insertions, 10 deletions
diff --git a/src/ui/ui_local.h b/src/ui/ui_local.h index 75d81f77..98626059 100644 --- a/src/ui/ui_local.h +++ b/src/ui/ui_local.h @@ -836,7 +836,7 @@ typedef struct { int tremHumanMCUSellCount; int tremHumanMCUSellIndex; - tremMenuItem_t tremAlienUpgradeList[ 3 ]; + tremMenuItem_t tremAlienUpgradeList[ 16 ]; int tremAlienUpgradeCount; int tremAlienUpgradeIndex; diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c index 80bf8420..845c5917 100644 --- a/src/ui/ui_main.c +++ b/src/ui/ui_main.c @@ -2889,16 +2889,16 @@ UI_LoadTremHumanItems static void UI_LoadTremHumanItems( ) { uiInfo.tremHumanItemCount = 2; - + uiInfo.tremHumanItemList[ 0 ].text = - String_Alloc( BG_FindHumanNameForWeapon( WP_MACHINEGUN ) ); + String_Alloc( BG_FindHumanNameForWeapon( WP_HBUILD ) ); uiInfo.tremHumanItemList[ 0 ].cmd = - String_Alloc( va( "cmd class %s", BG_FindNameForWeapon( WP_MACHINEGUN ) ) ); - + String_Alloc( va( "cmd class %s", BG_FindNameForWeapon( WP_HBUILD ) ) ); + uiInfo.tremHumanItemList[ 1 ].text = - String_Alloc( BG_FindHumanNameForWeapon( WP_HBUILD ) ); + String_Alloc( BG_FindHumanNameForWeapon( WP_MACHINEGUN ) ); uiInfo.tremHumanItemList[ 1 ].cmd = - String_Alloc( va( "cmd class %s", BG_FindNameForWeapon( WP_HBUILD ) ) ); + String_Alloc( va( "cmd class %s", BG_FindNameForWeapon( WP_MACHINEGUN ) ) ); } /* @@ -3043,20 +3043,24 @@ static void UI_LoadTremHumanMCUSells( ) /* =============== -UI_LoadTremAlienUpgrades( ) +UI_LoadTremAlienUpgrades =============== */ static void UI_LoadTremAlienUpgrades( ) { int i, j = 0; - int class = trap_Cvar_VariableValue( "ui_currentClass" ); + int class, credits; + char ui_currentClass[ MAX_STRING_CHARS ]; stage_t stage = UI_GetCurrentAlienStage( ); + trap_Cvar_VariableStringBuffer( "ui_currentClass", ui_currentClass, MAX_STRING_CHARS ); + sscanf( ui_currentClass, "%d %d", &class, &credits ); + uiInfo.tremAlienUpgradeCount = 0; for( i = PCL_NONE + 1; i < PCL_NUM_CLASSES; i++ ) { - if( BG_ClassCanEvolveFromTo( class, i ) && + if( BG_ClassCanEvolveFromTo( class, i, credits ) && BG_FindStagesForClass( i, stage ) ) { uiInfo.tremAlienUpgradeList[ j ].text = String_Alloc( BG_FindNameForClassNum( i ) ); @@ -3066,6 +3070,10 @@ static void UI_LoadTremAlienUpgrades( ) uiInfo.tremAlienUpgradeCount++; } } + + uiInfo.tremAlienUpgradeList[ j ].text = String_Alloc( "Store" ); + uiInfo.tremAlienUpgradeList[ j++ ].cmd = String_Alloc( "cmd class store" ); + uiInfo.tremAlienUpgradeCount++; } /* |