diff options
| author | Tim Angus <tim@ngus.net> | 2002-02-16 01:22:56 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2002-02-16 01:22:56 +0000 |
| commit | 1377fc75295277a46f7d5b314e7f91dfab218b13 (patch) | |
| tree | baf84603aafd00ea269455c632fa578c17ee3de2 /src/game | |
| parent | 0a4865223bf1d5796fa8924e8eb60f961dc04b50 (diff) | |
Alien sense updates, among other things
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/bg_public.h | 3 | ||||
| -rw-r--r-- | src/game/g_active.c | 12 | ||||
| -rw-r--r-- | src/game/g_cmds.c | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/src/game/bg_public.h b/src/game/bg_public.h index da8d65fa..9238fca1 100644 --- a/src/game/bg_public.h +++ b/src/game/bg_public.h @@ -224,6 +224,7 @@ typedef enum { STAT_STAMINA, //TA: stamina (human only) STAT_STATE, //TA: client states e.g. wall climbing STAT_CREDIT, //TA: human credit + STAT_BANK, //TA: human credit in the bank STAT_MISC, //TA: for uh...misc stuff STAT_BUILDABLE //TA: which ghost model to display for building } statIndex_t; @@ -249,6 +250,8 @@ typedef enum { #define SB_VALID_TOGGLEBIT 16384 +#define MAX_STAMINA 1000 + // player_state->persistant[] indexes // these fields are the only part of player_state that isn't // cleared on respawn diff --git a/src/game/g_active.c b/src/game/g_active.c index 8d281f1b..d78e0f1c 100644 --- a/src/game/g_active.c +++ b/src/game/g_active.c @@ -442,8 +442,8 @@ void ClientTimerActions( gentity_t *ent, int msec ) else client->ps.stats[ STAT_STAMINA ] -= STAMINA_SPRINT_TAKE; - if( client->ps.stats[ STAT_STAMINA ] < -1000 ) - client->ps.stats[ STAT_STAMINA ] = -1000; + if( client->ps.stats[ STAT_STAMINA ] < -MAX_STAMINA ) + client->ps.stats[ STAT_STAMINA ] = -MAX_STAMINA; } if( ( aForward <= 64 && aForward > 5 ) || ( aRight <= 64 && aRight > 5 ) ) @@ -451,16 +451,16 @@ void ClientTimerActions( gentity_t *ent, int msec ) //restore stamina client->ps.stats[ STAT_STAMINA ] += STAMINA_WALK_RESTORE; - if( client->ps.stats[ STAT_STAMINA ] > 1000 ) - client->ps.stats[ STAT_STAMINA ] = 1000; + if( client->ps.stats[ STAT_STAMINA ] > MAX_STAMINA ) + client->ps.stats[ STAT_STAMINA ] = MAX_STAMINA; } else if( aForward <= 5 && aRight <= 5 ) { //restore stamina faster client->ps.stats[ STAT_STAMINA ] += STAMINA_STOP_RESTORE; - if( client->ps.stats[ STAT_STAMINA ] > 1000 ) - client->ps.stats[ STAT_STAMINA ] = 1000; + if( client->ps.stats[ STAT_STAMINA ] > MAX_STAMINA ) + client->ps.stats[ STAT_STAMINA ] = MAX_STAMINA; } //client is poisoned diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c index 92ed0311..c69e6da4 100644 --- a/src/game/g_cmds.c +++ b/src/game/g_cmds.c @@ -2098,6 +2098,7 @@ void Cmd_Deposit_f( gentity_t *ent ) if( amount <= ent->client->ps.stats[ STAT_CREDIT ] ) { ent->client->ps.stats[ STAT_CREDIT ] -= amount; + ent->client->ps.stats[ STAT_BANK ] += amount; level.bankCredits[ ent->client->ps.clientNum ] += amount; } else @@ -2153,6 +2154,7 @@ void Cmd_Withdraw_f( gentity_t *ent ) if( amount <= level.bankCredits[ ent->client->ps.clientNum ] ) { ent->client->ps.stats[ STAT_CREDIT ] += amount; + ent->client->ps.stats[ STAT_BANK ] -= amount; level.bankCredits[ ent->client->ps.clientNum ] -= amount; } else |