diff options
| -rw-r--r-- | src/cgame/cg_players.c | 3 | ||||
| -rw-r--r-- | src/game/g_client.c | 40 | ||||
| -rw-r--r-- | src/game/g_combat.c | 1 | ||||
| -rw-r--r-- | src/game/tremulous.h | 4 |
4 files changed, 20 insertions, 28 deletions
diff --git a/src/cgame/cg_players.c b/src/cgame/cg_players.c index 30c16d9a..a5ce2a53 100644 --- a/src/cgame/cg_players.c +++ b/src/cgame/cg_players.c @@ -2189,11 +2189,13 @@ void CG_Corpse( centity_t *cent ) legs.oldframe = legs.frame = torso.oldframe = torso.frame = 0; else if( !ci->nonsegmented ) { + memset( ¢->pe.legs, 0, sizeof( lerpFrame_t ) ); CG_RunLerpFrame( ci, ¢->pe.legs, es->legsAnim, 1 ); legs.oldframe = cent->pe.legs.oldFrame; legs.frame = cent->pe.legs.frame; legs.backlerp = cent->pe.legs.backlerp; + memset( ¢->pe.torso, 0, sizeof( lerpFrame_t ) ); CG_RunLerpFrame( ci, ¢->pe.torso, es->torsoAnim, 1 ); torso.oldframe = cent->pe.torso.oldFrame; torso.frame = cent->pe.torso.frame; @@ -2201,6 +2203,7 @@ void CG_Corpse( centity_t *cent ) } else { + memset( ¢->pe.nonseg, 0, sizeof( lerpFrame_t ) ); CG_RunLerpFrame( ci, ¢->pe.nonseg, es->legsAnim, 1 ); legs.oldframe = cent->pe.nonseg.oldFrame; legs.frame = cent->pe.nonseg.frame; diff --git a/src/game/g_client.c b/src/game/g_client.c index fe220be9..0dfcbebe 100644 --- a/src/game/g_client.c +++ b/src/game/g_client.c @@ -290,7 +290,7 @@ gentity_t *SelectAlienSpawnPoint( void ) while( ( spot = G_Find( spot, FOFS( classname ), BG_FindEntityNameForBuildable( BA_A_SPAWN ) ) ) != NULL ) { - if( SpotWouldTelefrag( spot ) || ( spot->health <= 0 ) ) + if( spot->health <= 0 ) continue; if( !spot->s.groundEntityNum ) @@ -307,21 +307,16 @@ gentity_t *SelectAlienSpawnPoint( void ) if( ent->s.eType == ET_BUILDABLE || ent->s.number == ENTITYNUM_WORLD ) continue; + //spawn is blocked + if( tr.fraction < 1.0f ) + continue; + spots[ count ] = spot; count++; } if( !count ) - { - // no spots that won't telefrag - spot = G_Find( NULL, FOFS( classname ), - BG_FindEntityNameForBuildable( BA_A_SPAWN ) ); - - if( spot->health > 0 ) - return spot; - else - return NULL; - } + return NULL; selection = rand() % count; return spots[ selection ]; @@ -353,7 +348,7 @@ gentity_t *SelectHumanSpawnPoint( void ) while( ( spot = G_Find( spot, FOFS( classname ), BG_FindEntityNameForBuildable( BA_H_SPAWN ) ) ) != NULL ) { - if( SpotWouldTelefrag( spot ) || ( spot->health <= 0 ) ) + if( spot->health <= 0 ) continue; if( !spot->s.groundEntityNum ) @@ -369,21 +364,16 @@ gentity_t *SelectHumanSpawnPoint( void ) if( ent->s.eType == ET_BUILDABLE || ent->s.number == ENTITYNUM_WORLD ) continue; + //spawn is blocked + if( tr.fraction < 1.0f ) + continue; + spots[ count ] = spot; count++; } if( !count ) - { - // no spots that won't telefrag - spot = G_Find( NULL, FOFS( classname ), - BG_FindEntityNameForBuildable( BA_H_SPAWN ) ); - - if( spot->health > 0 ) - return spot; - else - return NULL; - } + return NULL; selection = rand() % count; return spots[ selection ]; @@ -1358,11 +1348,11 @@ void ClientSpawn( gentity_t *ent, gentity_t *spawn ) if( client->sess.sessionTeam == TEAM_SPECTATOR ) { if( teamLocal == PTE_NONE ) - spawnPoint = SelectSpectatorSpawnPoint ( spawn_origin, spawn_angles ); + spawnPoint = SelectSpectatorSpawnPoint( spawn_origin, spawn_angles ); else if( teamLocal == PTE_ALIENS ) - spawnPoint = SelectAlienLockSpawnPoint ( spawn_origin, spawn_angles ); + spawnPoint = SelectAlienLockSpawnPoint( spawn_origin, spawn_angles ); else if( teamLocal == PTE_HUMANS ) - spawnPoint = SelectHumanLockSpawnPoint ( spawn_origin, spawn_angles ); + spawnPoint = SelectHumanLockSpawnPoint( spawn_origin, spawn_angles ); } else { diff --git a/src/game/g_combat.c b/src/game/g_combat.c index 8f472550..17ef67e8 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -693,7 +693,6 @@ float G_CalcDamageModifier( vec3_t point, gentity_t *targ, gentity_t *attacker, } } - G_Printf( "%f\n", modifier ); return modifier; } diff --git a/src/game/tremulous.h b/src/game/tremulous.h index 7d068c75..7f98afe6 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -363,8 +363,8 @@ #define BATTPACK_MODIFIER 2.0f //modifier for extra energy storage available #define JETPACK_PRICE 120 -#define JETPACK_FLOAT_SPEED 48.0f //up movement speed -#define JETPACK_SINK_SPEED 96.0f //down movement speed +#define JETPACK_FLOAT_SPEED 256.0f //up movement speed +#define JETPACK_SINK_SPEED 384.0f //down movement speed #define BSUIT_PRICE 200 |