diff options
| author | Tim Angus <tim@ngus.net> | 2006-12-30 00:24:08 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2006-12-30 00:24:08 +0000 |
| commit | 0a683f6a82be6e2b3aa4eeea3bec163a3276f9c1 (patch) | |
| tree | 48a657ea50c0ef0389ed0b4ac4338dceb495d00f | |
| parent | 9ed2e16fd1561c57275967569452678e860cfae7 (diff) | |
* (bug 2960) Pain indication no longer displayed during intermission
* (bug 2858) Wrong collision mask allowing bad spawns
* Adv Granger spit now slows players as it was always supposed to
| -rw-r--r-- | src/cgame/cg_draw.c | 2 | ||||
| -rw-r--r-- | src/game/g_active.c | 4 | ||||
| -rw-r--r-- | src/game/g_buildable.c | 4 | ||||
| -rw-r--r-- | src/game/tremulous.h | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c index 3cb74ab0..f5527348 100644 --- a/src/cgame/cg_draw.c +++ b/src/cgame/cg_draw.c @@ -3354,7 +3354,7 @@ static void CG_PainBlend( void ) float x, y, w, h; float s1, t1, s2, t2; - if( cg.snap->ps.persistant[ PERS_TEAM ] == TEAM_SPECTATOR ) + if( cg.snap->ps.persistant[ PERS_TEAM ] == TEAM_SPECTATOR || cg.intermissionStarted ) return; damage = cg.lastHealth - cg.snap->ps.stats[ STAT_HEALTH ]; diff --git a/src/game/g_active.c b/src/game/g_active.c index 508da305..d7776991 100644 --- a/src/game/g_active.c +++ b/src/game/g_active.c @@ -1353,11 +1353,11 @@ void ClientThink_real( gentity_t *ent ) client->ps.stats[ STAT_STATE ] &= ~SS_GRABBED; if( client->ps.stats[ STAT_STATE ] & SS_BLOBLOCKED && - client->lastLockTime + 5000 < level.time ) + client->lastLockTime + LOCKBLOB_LOCKTIME < level.time ) client->ps.stats[ STAT_STATE ] &= ~SS_BLOBLOCKED; if( client->ps.stats[ STAT_STATE ] & SS_SLOWLOCKED && - client->lastLockTime + ABUILDER_BLOB_TIME < level.time ) + client->lastSlowTime + ABUILDER_BLOB_TIME < level.time ) client->ps.stats[ STAT_STATE ] &= ~SS_SLOWLOCKED; client->ps.stats[ STAT_BOOSTTIME ] = level.time - client->lastBoostedTime; diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c index 8bf17b24..727be461 100644 --- a/src/game/g_buildable.c +++ b/src/game/g_buildable.c @@ -88,7 +88,7 @@ gentity_t *G_CheckSpawnPoint( int spawnNum, vec3_t origin, vec3_t normal, if( tr.entityNum != ENTITYNUM_NONE ) return &g_entities[ tr.entityNum ]; - trap_Trace( &tr, localOrigin, cmins, cmaxs, localOrigin, -1, MASK_SHOT ); + trap_Trace( &tr, localOrigin, cmins, cmaxs, localOrigin, -1, MASK_PLAYERSOLID ); if( tr.entityNum == ENTITYNUM_NONE ) { @@ -112,7 +112,7 @@ gentity_t *G_CheckSpawnPoint( int spawnNum, vec3_t origin, vec3_t normal, if( tr.entityNum != ENTITYNUM_NONE ) return &g_entities[ tr.entityNum ]; - trap_Trace( &tr, localOrigin, cmins, cmaxs, localOrigin, -1, MASK_SHOT ); + trap_Trace( &tr, localOrigin, cmins, cmaxs, localOrigin, -1, MASK_PLAYERSOLID ); if( tr.entityNum == ENTITYNUM_NONE ) { diff --git a/src/game/tremulous.h b/src/game/tremulous.h index 9edfbbb9..f7ccc38d 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -286,6 +286,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define TRAPPER_REPEAT 1000 #define TRAPPER_K_SCALE 1.0f #define LOCKBLOB_SPEED 650.0f +#define LOCKBLOB_LOCKTIME 5000 #define LOCKBLOB_DOT 0.85f // max angle = acos( LOCKBLOB_DOT ) #define LOCKBLOB_K_SCALE 1.0f |