diff options
| author | Tim Angus <tim@ngus.net> | 2001-09-25 22:27:28 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2001-09-25 22:27:28 +0000 |
| commit | 688d528f2860d456248363cb1c041de7dabe1911 (patch) | |
| tree | bb7dc0f1d009f29ed6ca91628523d7c442aaf371 /src/game/g_active.c | |
| parent | d511ec1caee3717f9652c8366a054c3046f6e2f6 (diff) | |
Added 2 experimental weapons
Diffstat (limited to 'src/game/g_active.c')
| -rw-r--r-- | src/game/g_active.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/game/g_active.c b/src/game/g_active.c index 5abeeaf8..3bff151b 100644 --- a/src/game/g_active.c +++ b/src/game/g_active.c @@ -412,6 +412,7 @@ qboolean ClientInactivityTimer( gclient_t *client ) { #define STAMINA_STOP_RESTORE 10 #define STAMINA_WALK_RESTORE 5 #define STAMINA_SPRINT_TAKE 10 +#define STAMINA_LARMOUR_TAKE 5 /* ================== @@ -446,7 +447,10 @@ void ClientTimerActions( gentity_t *ent, int msec ) if( ( client->ps.stats[ STAT_STATE ] & SS_SPEEDBOOST ) && ucmd->upmove >= 0 ) { //subtract stamina - client->ps.stats[ STAT_STAMINA ] -= STAMINA_SPRINT_TAKE; + if( BG_gotItem( UP_LIMBARMOUR, client->ps.stats ) ) + client->ps.stats[ STAT_STAMINA ] -= STAMINA_LARMOUR_TAKE; + else + client->ps.stats[ STAT_STAMINA ] -= STAMINA_SPRINT_TAKE; if( client->ps.stats[ STAT_STAMINA ] < -1000 ) client->ps.stats[ STAT_STAMINA ] = -1000; @@ -608,12 +612,12 @@ void ClientEvents( gentity_t *ent, int oldEventSequence ) { if ( item ) { drop = Drop_Item( ent, item, 0 ); // decide how many seconds it has left - drop->count = ( ent->client->ps.powerups[ j ] - level.time ) / 1000; + /*drop->count = ( ent->client->ps.powerups[ j ] - level.time ) / 1000;*/ if ( drop->count < 1 ) { drop->count = 1; } - ent->client->ps.powerups[ j ] = 0; + /*ent->client->ps.powerups[ j ] = 0;*/ } SelectSpawnPoint( ent->client->ps.origin, origin, angles ); @@ -1164,11 +1168,11 @@ void ClientEndFrame( gentity_t *ent ) { pers = &ent->client->pers; // turn off any expired powerups - for ( i = 0 ; i < MAX_POWERUPS ; i++ ) { +/* for ( i = 0 ; i < MAX_POWERUPS ; i++ ) { if ( ent->client->ps.powerups[ i ] < level.time ) { ent->client->ps.powerups[ i ] = 0; } - } + }*/ // save network bandwidth #if 0 |