summaryrefslogtreecommitdiff
path: root/src/game/g_active.c
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2006-01-18 01:54:21 +0000
committerTim Angus <tim@ngus.net>2006-01-18 01:54:21 +0000
commitb5a24aab3dbb3d65950843c19ab2fa9934064281 (patch)
treefef77c5cc94e3376442747136421f07f9bea74b0 /src/game/g_active.c
parent5cf09669133da12cf82ee3168e57a781e47b9e92 (diff)
* Added BG_FindUsableForUpgrade
* Added BG_UpgradeClassAvailable * Added generalised BG_*IsAllowed functions * Added some binding traps to cgame * Added tutorial mode (cg_tutorial)
Diffstat (limited to 'src/game/g_active.c')
-rw-r--r--src/game/g_active.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/src/game/g_active.c b/src/game/g_active.c
index 86bfbdc5..9c8f8a1c 100644
--- a/src/game/g_active.c
+++ b/src/game/g_active.c
@@ -1292,8 +1292,6 @@ void ClientThink_real( gentity_t *ent )
vec3_t range = { USE_OBJECT_RANGE, USE_OBJECT_RANGE, USE_OBJECT_RANGE };
vec3_t mins, maxs;
int i, num;
- int j;
- qboolean upgrade = qfalse;
//TA: look for object infront of player
AngleVectors( client->ps.viewangles, view, NULL, NULL );
@@ -1325,18 +1323,7 @@ void ClientThink_real( gentity_t *ent )
if( i == num && client->ps.stats[ STAT_PTEAM ] == PTE_ALIENS )
{
- for( j = PCL_NONE + 1; j < PCL_NUM_CLASSES; j++ )
- {
- if( BG_ClassCanEvolveFromTo( client->ps.stats[ STAT_PCLASS ], j,
- client->ps.persistant[ PERS_CREDIT ], 0 ) >= 0 &&
- BG_FindStagesForClass( j, g_alienStage.integer ) && G_ClassIsAllowed( j ) )
- {
- upgrade = qtrue;
- break;
- }
- }
-
- if( upgrade )
+ if( BG_UpgradeClassAvailable( &client->ps ) )
{
//no nearby objects and alien - show class menu
G_TriggerMenu( ent->client->ps.clientNum, MN_A_INFEST );