diff options
| author | Ben Millwood <thebenmachine@gmail.com> | 2009-10-03 12:15:17 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:15:47 +0000 |
| commit | bbf9693d114d11df15b8e9157a134733e4aa49bd (patch) | |
| tree | ea3b93a16c0aca311400a8bc566d38b439a667fa /src/cgame | |
| parent | 0dff9796f8a2921844e84eaa00a550a0b6dcac09 (diff) | |
* Remove SS_INFESTING and PM_SPINTERMISSION since they were not used
* Merge SS_WALLCLIMBINGCEILING and EF_WALLCLIMBCEILING
* Remove ui_emoticons, using the value of cg_emoticons for both contexts.
* Add PM_Paralyzed() to get rid of all the silly >= PM_DEAD comparisons
* Don't allow players to taunt while dead
* Fix full ammo check in reload (oops)
* Fiddle with bg_lib.h _MAX/_MIN defines, fix min(), add [u]intX_t typedefs
* Remove non-functional cgame command (thanks Amanieu for spotting)
Diffstat (limited to 'src/cgame')
| -rw-r--r-- | src/cgame/cg_consolecmds.c | 16 | ||||
| -rw-r--r-- | src/cgame/cg_draw.c | 4 | ||||
| -rw-r--r-- | src/cgame/cg_weapons.c | 1 |
3 files changed, 1 insertions, 20 deletions
diff --git a/src/cgame/cg_consolecmds.c b/src/cgame/cg_consolecmds.c index 47aadece..e1354f37 100644 --- a/src/cgame/cg_consolecmds.c +++ b/src/cgame/cg_consolecmds.c @@ -29,21 +29,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -void CG_TargetCommand_f( void ) -{ - int targetNum; - char test[ 4 ]; - - targetNum = CG_CrosshairPlayer( ); - if( !targetNum ) - return; - - trap_Argv( 1, test, 4 ); - trap_SendConsoleCommand( va( "gc %i %i", targetNum, atoi( test ) ) ); -} - - - /* ================= CG_SizeUp_f @@ -214,7 +199,6 @@ static consoleCommand_t commands[ ] = { "weapon", CG_Weapon_f }, { "tell_target", CG_TellTarget_f }, { "tell_attacker", CG_TellAttacker_f }, - { "tcmd", CG_TargetCommand_f }, { "testPS", CG_TestPS_f }, { "destroyTestPS", CG_DestroyTestPS_f }, { "testTS", CG_TestTS_f }, diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c index bdff5eed..a2e5fc91 100644 --- a/src/cgame/cg_draw.c +++ b/src/cgame/cg_draw.c @@ -2175,7 +2175,6 @@ static void CG_DrawCrosshair( rectDef_t *rect, vec4_t color ) return; if( ( cg.snap->ps.persistant[ PERS_SPECSTATE ] != SPECTATOR_NOT ) || - ( cg.snap->ps.stats[ STAT_STATE ] & SS_INFESTING ) || ( cg.snap->ps.stats[ STAT_STATE ] & SS_HOVELING ) ) return; @@ -3054,8 +3053,7 @@ static void CG_Draw2D( void ) else menu = Menus_FindByName( BG_ClassConfig( cg.predictedPlayerState.stats[ STAT_CLASS ] )->hudName ); - if( !( cg.snap->ps.stats[ STAT_STATE ] & SS_INFESTING ) && - !( cg.snap->ps.stats[ STAT_STATE ] & SS_HOVELING ) && menu && + if( menu && !( cg.snap->ps.stats[ STAT_STATE ] & SS_HOVELING ) && ( cg.snap->ps.stats[ STAT_HEALTH ] > 0 ) ) { CG_DrawBuildableStatus( ); diff --git a/src/cgame/cg_weapons.c b/src/cgame/cg_weapons.c index 55a0a2ff..ac0f6a14 100644 --- a/src/cgame/cg_weapons.c +++ b/src/cgame/cg_weapons.c @@ -1219,7 +1219,6 @@ void CG_AddViewWeapon( playerState_t *ps ) cent = &cg.predictedPlayerEntity; // &cg_entities[cg.snap->ps.clientNum]; if( ( ps->persistant[PERS_SPECSTATE] != SPECTATOR_NOT ) || - ( ps->stats[ STAT_STATE ] & SS_INFESTING ) || ( ps->stats[ STAT_STATE ] & SS_HOVELING ) ) return; |