Skip to content

Commit

Permalink
Minor gameplay fixes.
Browse files Browse the repository at this point in the history
Hummel can no longer fly if there's no overmind around.
Human radar update rate back to 1Hz.
Evolving from basi to adv basi retains the reload timer.
  • Loading branch information
Mikko Tiusanen committed May 31, 2015
1 parent 05e4e14 commit 528aaa3
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/cgame/cg_scanner.c
Expand Up @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

static entityPos_t entityPositions;

#define HUMAN_SCANNER_UPDATE_PERIOD 25
#define HUMAN_SCANNER_UPDATE_PERIOD 1000

/*
=============
Expand Down
2 changes: 1 addition & 1 deletion src/game/g_active.c
Expand Up @@ -1751,7 +1751,7 @@ void ClientThink_real( gentity_t *ent )
client->ps.pm_type = PM_GRABBED;
else if( BG_InventoryContainsUpgrade( UP_JETPACK, client->ps.stats ) && BG_UpgradeIsActive( UP_JETPACK, client->ps.stats ) )
client->ps.pm_type = PM_JETPACK;
else if( client->ps.weapon == WP_ALEVEL5 )
else if( client->ps.weapon == WP_ALEVEL5 && G_Overmind() )
//hummel fly
client->ps.pm_type = PM_HUMMEL;
else
Expand Down
8 changes: 7 additions & 1 deletion src/game/g_cmds.c
Expand Up @@ -1665,7 +1665,7 @@ void Cmd_Class_f( gentity_t *ent )
vec3_t mins, maxs;
int num;
gentity_t *other;
int oldBoostTime = -1;
int oldBoostTime = -1,oldTimeStamp;
vec3_t oldVel;

clientNum = ent->client - level.clients;
Expand Down Expand Up @@ -1835,6 +1835,7 @@ void Cmd_Class_f( gentity_t *ent )

if( ent->client->ps.stats[ STAT_STATE ] & SS_BOOSTED )
oldBoostTime = ent->client->boostedTime;
oldTimeStamp = ( ent->client->ps.weapon == WP_ALEVEL1 ) ? ent->timestamp : 0;

ClientSpawn( ent, ent, ent->s.pos.trBase, ent->s.apos.trBase );

Expand All @@ -1844,6 +1845,11 @@ void Cmd_Class_f( gentity_t *ent )
ent->client->boostedTime = oldBoostTime;
ent->client->ps.stats[ STAT_STATE ] |= SS_BOOSTED;
}
if( newClass == PCL_ALIEN_LEVEL1_UPG )
{
ent->timestamp = oldTimeStamp;
ent->client->ps.ammo = 0;
}
}
else
G_TriggerMenuArgs( clientNum, MN_A_CANTEVOLVE, newClass );
Expand Down

0 comments on commit 528aaa3

Please sign in to comment.