Merge branch 'master' into opfor

Author: nekonomicon

dlls/maprules.cpp

@@ -110,6 +110,7 @@ class CRuleBrushEntity : public CRuleEntity
 {
 public:
 	void		Spawn( void );
+	int ObjectCaps() { return CRuleEntity::ObjectCaps() & ~FCAP_ACROSS_TRANSITION; }
 
 private:
 };
@@ -168,7 +169,7 @@ void CGameScore::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE us
 		return;
 
 	// Only players can use this
-	if( pActivator->IsPlayer() )
+	if( pActivator && pActivator->IsPlayer() )
 	{
 		if( AwardToTeam() )
 		{

dlls/multiplay_gamerules.cpp

@@ -622,11 +622,6 @@ int CHalfLifeMultiplay::IPointsForKill( CBasePlayer *pAttacker, CBasePlayer *pKi
 //=========================================================
 void CHalfLifeMultiplay::PlayerKilled( CBasePlayer *pVictim, entvars_t *pKiller, entvars_t *pInflictor )
 {
-	DeathNotice( pVictim, pKiller, pInflictor );
-
-	pVictim->m_iDeaths += 1;
-
-	FireTargets( "game_playerdie", pVictim, pVictim, USE_TOGGLE, 0 );
 	CBasePlayer *peKiller = NULL;
 	CBaseEntity *ktmp = CBaseEntity::Instance( pKiller );
 	if( ktmp && (ktmp->Classify() == CLASS_PLAYER ) )
@@ -642,6 +637,12 @@ void CHalfLifeMultiplay::PlayerKilled( CBasePlayer *pVictim, entvars_t *pKiller,
 		}
 	}
 
+	DeathNotice( pVictim, pKiller, pInflictor );
+
+	pVictim->m_iDeaths += 1;
+
+	FireTargets( "game_playerdie", pVictim, pVictim, USE_TOGGLE, 0 );
+
 	if( pVictim->pev == pKiller )
 	{
 		// killed self

dlls/player.cpp

@@ -2952,13 +2952,24 @@ edict_t *EntSelectSpawnPoint( CBaseEntity *pPlayer )
 	CBaseEntity *pSpot;
 	edict_t *player;
 
+	int nNumRandomSpawnsToTry = 10;
+
 	player = pPlayer->edict();
 
 	if( !strnicmp( STRING( gpGlobals->mapname ), "op4ctf", 6 ) )
 	{
+		if( !g_pLastSpawn )
+		{
+			nNumRandomSpawnsToTry = 0;
+			CBaseEntity* pEnt = 0;
+
+			while( ( pEnt = UTIL_FindEntityByClassname( 0, "info_ctfspawn" )))
+				nNumRandomSpawnsToTry++;
+		}
+
 		pSpot = g_pLastSpawn;
 		// Randomize the start spot
-		for( int i = RANDOM_LONG( 1, 9 ); i > 0; i-- )
+		for( int i = RANDOM_LONG( 1, nNumRandomSpawnsToTry - 1 ); i > 0; i-- )
 			pSpot = UTIL_FindEntityByClassname( pSpot, "info_ctfspawn" );
 		if( FNullEnt( pSpot ) )  // skip over the null point
 			pSpot = UTIL_FindEntityByClassname( pSpot, "info_ctfspawn" );
@@ -3013,9 +3024,18 @@ edict_t *EntSelectSpawnPoint( CBaseEntity *pPlayer )
 		}
 		else if( g_pGameRules->IsDeathmatch() )
 		{
+			if( !g_pLastSpawn )
+			{
+				nNumRandomSpawnsToTry = 0;
+				CBaseEntity* pEnt = 0;
+
+				while( ( pEnt = UTIL_FindEntityByClassname( 0, "info_ctfspawn" )))
+					nNumRandomSpawnsToTry++;
+			}
+
 			pSpot = g_pLastSpawn;
 			// Randomize the start spot
-			for( int i = RANDOM_LONG( 1, 9 ); i > 0; i-- )
+			for( int i = RANDOM_LONG( 1, nNumRandomSpawnsToTry - 1 ); i > 0; i-- )
 				pSpot = UTIL_FindEntityByClassname( pSpot, "info_player_deathmatch" );
 			if( FNullEnt( pSpot ) )  // skip over the null point
 				pSpot = UTIL_FindEntityByClassname( pSpot, "info_player_deathmatch" );

dlls/rpg.cpp

@@ -400,7 +400,7 @@ int CRpg::GetItemInfo( ItemInfo *p )
 	p->iSlot = 3;
 	p->iPosition = 0;
 	p->iId = m_iId = WEAPON_RPG;
-	p->iFlags = ITEM_FLAG_NOCHOICE;
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHTO;
 	p->iWeight = RPG_WEIGHT;
 
 	return 1;

dlls/singleplay_gamerules.cpp

@@ -119,7 +119,7 @@ BOOL HLGetNextBestWeapon(CBasePlayer *pPlayer, CBasePlayerItem *pCurrentWeapon )
 
 		while( pCheck )
 		{
-			if( !FBitSet( pCheck->iFlags(), ITEM_FLAG_NOCHOICE ))
+			if( !FBitSet( pCheck->iFlags(), ITEM_FLAG_NOAUTOSWITCHTO ))
 			{
 				if( pCheck->iWeight() > -1 && pCheck->iWeight() == pCurrentWeapon->iWeight() && pCheck != pCurrentWeapon )
 				{

dlls/weapons.h

@@ -230,7 +230,7 @@ typedef	enum
 #define ITEM_FLAG_NOAUTOSWITCHEMPTY	4
 #define ITEM_FLAG_LIMITINWORLD		8
 #define ITEM_FLAG_EXHAUSTIBLE		16 // A player can totally exhaust their ammo supply and lose this weapon
-#define ITEM_FLAG_NOCHOICE		32
+#define ITEM_FLAG_NOAUTOSWITCHTO	32
 
 #define WEAPON_IS_ONTARGET 0x40
 

pm_shared/pm_shared.c

@@ -972,7 +972,10 @@ int PM_FlyMove( void )
 
 		// modify original_velocity so it parallels all of the clip planes
 		//
-		if( pmove->movetype == MOVETYPE_WALK && ( ( pmove->onground == -1 ) || ( pmove->friction != 1 ) ) )	// relfect player velocity
+		// reflect player velocity
+		// Only give this a try for first impact plane because you can get yourself stuck in an acute corner by jumping in place
+		// and pressing forward and nobody was really using this bounce/reflection feature anyway...
+		if( numplanes == 1 && pmove->movetype == MOVETYPE_WALK && ( ( pmove->onground == -1 ) || ( pmove->friction != 1 )))
 		{
 			for( i = 0; i < numplanes; i++ )
 			{
@@ -2886,6 +2889,15 @@ void PM_CheckParamters( void )
 		pmove->maxspeed = min( maxspeed, pmove->maxspeed );
 	}
 
+	// Slow down, I'm pulling it! (a box maybe) but only when I'm standing on ground
+	//
+	// JoshA: Moved this to CheckParamters rather than working on the velocity,
+	// as otherwise it affects every integration step incorrectly.
+	if( ( pmove->onground != -1 ) && ( pmove->cmd.buttons & IN_USE ))
+	{
+		pmove->maxspeed *= 1.0f / 3.0f;
+	}
+
 	if( ( spd != 0.0f ) && ( spd > pmove->maxspeed ) )
 	{
 		float fRatio = pmove->maxspeed / spd;
@@ -3006,7 +3018,11 @@ void PM_PlayerMove( qboolean server )
 	{
 		if( PM_CheckStuck() )
 		{
-			return;  // Can't move, we're stuck
+			// Let the user try to duck to get unstuck
+			PM_Duck();
+
+			if( PM_CheckStuck() )
+				return;  // Can't move, we're stuck
 		}
 	}
 
@@ -3052,12 +3068,6 @@ void PM_PlayerMove( qboolean server )
 		}
 	}
 
-	// Slow down, I'm pulling it! (a box maybe) but only when I'm standing on ground
-	if( ( pmove->onground != -1 ) && ( pmove->cmd.buttons & IN_USE ) )
-	{
-		VectorScale( pmove->velocity, 0.3, pmove->velocity );
-	}
-
 	// Handle movement
 	switch( pmove->movetype )
 	{