more script fixes

userraw/maps/mp/gametypes/_weapons.gsc

@@ -2689,6 +2689,42 @@ detach_hip_weapon()
 }
 
 
+FixHideTagList( hideTagList, stowWeapon )
+{
+	answer = [];
+
+	for ( i = 0; i < hideTagList.size; i++ )
+	{
+		tag = hideTagList[ i ];
+
+		if ( stowWeapon == "weapon_ak74u" )
+		{
+			if ( tag == "tag_reflex_sight" || tag == "tag_acog" || tag == "tag_ak47_mount" )
+				continue;
+		}
+		else if ( stowWeapon == "weapon_ak47_classic" )
+		{
+			if ( tag == "tag_reflex_sight" || tag == "tag_acog" || tag == "tag_ak47_mount" )
+				continue;
+		}
+		else if ( stowWeapon == "worldmodel_bo2_peacekeeper" )
+		{
+			if ( tag == "tag_holo" || tag == "tag_reflex" || tag == "tag_silencer" )
+				continue;
+		}
+		else if ( stowWeapon == "weapon_beretta" )
+		{
+			if ( tag == "tag_knife" )
+				continue;
+		}
+
+		answer[ answer.size ] = tag;
+	}
+
+	return answer;
+}
+
+
 stow_on_back()
 {
 	prof_begin( "stow_on_back" );
@@ -2779,6 +2815,8 @@ stow_on_back()
 		return;
 	}
 	
+	hideTagList = FixHideTagList( hideTagList, self.tag_stowed_back );
+
 	for ( i = 0; i < hideTagList.size; i++ )
 		self HidePart( hideTagList[ i ], self.tag_stowed_back );
 	
@@ -2816,6 +2854,8 @@ stow_on_hip()
 	if ( !isDefined( hideTagList ) )
 		return;
 
+	hideTagList = FixHideTagList( hideTagList, self.tag_stowed_hip );
+	
 	for ( i = 0; i < hideTagList.size; i++ )
 		self HidePart( hideTagList[ i ], self.tag_stowed_hip );
 }

userraw/maps/mp/killstreaks/_killstreaks.gsc

@@ -231,7 +231,9 @@ waitForChangeTeam()
 	for ( ;; )
 	{
 		self waittill ( "joined_team" );
-		clearKillstreaks();
+		self clearKillstreaks();
+
+		if ( self isUsingRemote() )
 			self clearUsingRemote();
 	}
 }
@@ -861,6 +863,8 @@ clearRideIntro( delay )
 destroyOnEvents(elem)
 {
 	self waittill_either("disconnect", "start_killstreak_hud");
+
+	if ( isDefined( elem ) )
 		elem destroy();
 }
 

userraw/scripts/showHP.gsc

@@ -36,7 +36,11 @@ destoryHPdraw()
 {
 	self endon( "disconnect" );
 	self waittill( "death" );
+
+	if ( isDefined( self.drawHP ) )
 		self.drawHP destroy();
+
+	if ( isDefined( self.drawSpeed ) )
 		self.drawSpeed destroy();
 }