diff options
| author | enneract <trem.redman@gmail.com> | 2014-12-06 23:35:11 +0100 |
|---|---|---|
| committer | enneract <trem.redman@gmail.com> | 2014-12-06 23:35:11 +0100 |
| commit | 05fc0ccd95f486c79e1b073f80245c6cd0179e62 (patch) | |
| tree | bdcbb5e32992291580982b2afd10f9e63cae2640 /src/cgame/cg_buildable.c | |
| parent | 58903527dbf5fc7d8035ac2349174fe5f58ba2ac (diff) | |
| parent | 1a59a05174d3ed6e6b75b8d9e2b5b074ebf41b38 (diff) | |
Merge branch 'master' of https://github.com/mtiusane/new-edge into bp-on-hud
Diffstat (limited to 'src/cgame/cg_buildable.c')
| -rw-r--r-- | src/cgame/cg_buildable.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/cgame/cg_buildable.c b/src/cgame/cg_buildable.c index aaeaf11..909615f 100644 --- a/src/cgame/cg_buildable.c +++ b/src/cgame/cg_buildable.c @@ -436,7 +436,7 @@ void CG_InitBuildables( void ) } cgs.media.teslaZapTS = CG_RegisterTrailSystem( "models/buildables/tesla/zap" ); - //für slime + //f\FCr slime cgs.media.slimeTS = CG_RegisterTrailSystem( "models/buildables/infestationslime" ); } @@ -1229,7 +1229,6 @@ static qboolean CG_PlayerIsBuilder( buildable_t buildable ) switch( cg.predictedPlayerState.weapon ) { case WP_ABUILD: - case WP_ABUILD2: case WP_HBUILD: return BG_Buildable( buildable )->team == BG_Weapon( cg.predictedPlayerState.weapon )->team; |