diff options
| author | Michael Levin <risujin@fastmail.fm> | 2009-10-03 11:18:02 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:14:51 +0000 |
| commit | 6bff95c5978a0d4e0cb7e99232a1e61678fcf81b (patch) | |
| tree | 6a6788b2b51c50707bc7f2dbdccb8cc40aab4e9c /src/cgame/cg_draw.c | |
| parent | 75002f6c61b3e7e3521819df0216d52c14374520 (diff) | |
* Per Lakitu7's suggestion, changed spectator bounding box to match the dretch bounding box. Prevents spectators from getting stuck in the floor.
* Buildables round their health up when encoding health information for transmission, no more 0 hp buildables that aren't dead
* Removed the devmap credits hack I put in earlier
* Can now use \itemact weapon to switch to weapon, also \itemact weapon/blaster will not repeatedly force a weapon change if that weapon is already selected
* Options menu entry for "Sprint" changed to "Sprint / Dodge" with correct bind (+button6)
Norfenstein decided to switch to fractional "frags" (aka evos) for Aliens:
* BG_ClassCanEvolveFromTo rewritten to be more robust in case classes are shuffled around later
* CG_AtHighestClass and BG_UpgradeClassAvailable merged into BG_AlienCanEvolve
* Changed BG_GetValueOfHuman to BG_GetValueOfPlayer which now accomodates Aliens too
* Aliens now must receive 400 credits per frag point (9 evos = 3600 credits!)
* Aliens can only spend whole points
* TK/Suicide penalties moved to tremulous.h and converted to credit values
* Complex nasty Alien land goes bye-bye
Diffstat (limited to 'src/cgame/cg_draw.c')
| -rw-r--r-- | src/cgame/cg_draw.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c index c8f75da0..374c7a75 100644 --- a/src/cgame/cg_draw.c +++ b/src/cgame/cg_draw.c @@ -316,14 +316,17 @@ static void CG_DrawPlayerCreditsValue( rectDef_t *rect, vec4_t color, qboolean p value = ps->persistant[ PERS_CREDIT ]; if( value > -1 ) { - if( cg.predictedPlayerState.stats[ STAT_PTEAM ] == PTE_ALIENS && - !CG_AtHighestClass( ) ) + if( cg.predictedPlayerState.stats[ STAT_PTEAM ] == PTE_ALIENS ) { - if( cg.time - cg.lastEvolveAttempt <= NO_CREDITS_TIME ) + if( !BG_AlienCanEvolve( cg.predictedPlayerState.stats[ STAT_PCLASS ], + value, cgs.alienStage ) && + cg.time - cg.lastEvolveAttempt <= NO_CREDITS_TIME && + ( ( cg.time - cg.lastEvolveAttempt ) / 300 ) & 1 ) { - if( ( ( cg.time - cg.lastEvolveAttempt ) / 300 ) % 2 ) - color[ 3 ] = 0.0f; + color[ 3 ] = 0.0f; } + + value /= ALIEN_CREDITS_PER_FRAG; } trap_R_SetColor( color ); @@ -1931,7 +1934,9 @@ void CG_DrawWeaponIcon( rectDef_t *rect, vec4_t color ) } } - if( cg.predictedPlayerState.stats[ STAT_PTEAM ] == PTE_ALIENS && CG_AtHighestClass( ) ) + if( cg.predictedPlayerState.stats[ STAT_PTEAM ] == PTE_ALIENS && + !BG_AlienCanEvolve( cg.predictedPlayerState.stats[ STAT_PCLASS ], + ps->persistant[ PERS_CREDIT ], cgs.alienStage ) ) { if( cg.time - cg.lastEvolveAttempt <= NO_CREDITS_TIME ) { |