Playermodel legs and other player anim improvements

sp/src/game/client/c_basecombatweapon.cpp

@@ -90,11 +90,10 @@ static inline bool ShouldDrawLocalPlayerViewModel( void )
 	C_BasePlayer *localplayer = C_BasePlayer::GetLocalPlayer();
 	if (localplayer)
 	{
-		if (localplayer->m_bDrawPlayerModelExternally)
+		if (localplayer->DrawingPlayerModelExternally() && localplayer->InFirstPersonView())
 		{
 			// If this isn't the main view, draw the weapon.
-			view_id_t viewID = CurrentViewID();
-			if (viewID != VIEW_MAIN && viewID != VIEW_INTRO_CAMERA)
+			if (!localplayer->InPerspectiveView())
 				return false;
 		}
 
@@ -224,8 +223,16 @@ ShadowType_t C_BaseCombatWeapon::ShadowCastType()
 	if (!IsBeingCarried())
 		return SHADOWS_RENDER_TO_TEXTURE;
 
-	if (IsCarriedByLocalPlayer() && !C_BasePlayer::ShouldDrawLocalPlayer())
-		return SHADOWS_NONE;
+	if (IsCarriedByLocalPlayer())
+	{
+		if (!C_BasePlayer::ShouldDrawLocalPlayer())
+			return SHADOWS_NONE;
+
+#ifdef MAPBASE
+		if (C_BasePlayer::GetLocalPlayer() && C_BasePlayer::GetLocalPlayer()->ShadowCastType() == SHADOWS_NONE)
+			return SHADOWS_NONE;
+#endif
+	}
 
 	return SHADOWS_RENDER_TO_TEXTURE;
 }
@@ -458,7 +465,7 @@ bool C_BaseCombatWeapon::ShouldDraw( void )
 
 #ifdef MAPBASE
 		// We're drawing this in non-main views, handle it in DrawModel()
-		if ( pLocalPlayer->m_bDrawPlayerModelExternally )
+		if ( pLocalPlayer->DrawingPlayerModelExternally() )
 			return true;
 #endif
 
@@ -511,11 +518,10 @@ int C_BaseCombatWeapon::DrawModel( int flags )
 	if ( localplayer )
 	{
 #ifdef MAPBASE
-		if (localplayer->m_bDrawPlayerModelExternally)
+		if (GetOwner() == localplayer && localplayer->DrawingPlayerModelExternally())
 		{
 			// If this isn't the main view, draw the weapon.
-			view_id_t viewID = CurrentViewID();
-			if ( (!localplayer->InFirstPersonView() || (viewID != VIEW_MAIN && viewID != VIEW_INTRO_CAMERA)) && (viewID != VIEW_SHADOW_DEPTH_TEXTURE || !localplayer->IsEffectActive(EF_DIMLIGHT)) )
+			if ( (!localplayer->InPerspectiveView() || !localplayer->InFirstPersonView()) && (CurrentViewID() != VIEW_SHADOW_DEPTH_TEXTURE || !localplayer->IsEffectActive(EF_DIMLIGHT)))
 			{
 				// TODO: Is this inefficient?
 				int nModelIndex = GetModelIndex();
@@ -534,6 +540,10 @@ int C_BaseCombatWeapon::DrawModel( int flags )
 
 				return iDraw;
 			}
+			else
+			{
+				return 0;
+			}
 		}
 #endif
 		if ( localplayer->IsObserver() && GetOwner() )
@@ -551,6 +561,24 @@ int C_BaseCombatWeapon::DrawModel( int flags )
 	return BaseClass::DrawModel( flags );
 }
 
+#ifdef MAPBASE
+//-----------------------------------------------------------------------------
+// Purpose:	
+//-----------------------------------------------------------------------------
+bool C_BaseCombatWeapon::DispatchMuzzleEffect( const char *options, bool isFirstPerson )
+{
+	// Don't show muzzle flashes in first-person
+	C_BasePlayer *pPlayer = ToBasePlayer( GetOwner() );
+	if (pPlayer)
+	{
+		if (pPlayer->DrawingPlayerModelExternally() && pPlayer->InFirstPersonView())
+			return false;
+	}
+
+	return BaseClass::DispatchMuzzleEffect( options, isFirstPerson );
+}
+#endif
+
 
 //-----------------------------------------------------------------------------
 // Allows the client-side entity to override what the network tells it to use for