Merge branch 'reactivedrop_beta' into TraitorIconFix

BenLubar · web-flow · commit ba550fb3e7ff · 2025-09-03T16:08:26.000-05:00
diff --git a/reactivedrop/content/traitors_challenge/resource/challenges/traitors.txt b/reactivedrop/content/traitors_challenge/resource/challenges/traitors.txt
@@ -6,6 +6,7 @@
 		"_rd_traitors_challenge_enabled" "1"
 		"rd_player_bots_allowed" "0"
 		"rd_add_index_to_name" "1"
+		"rd_restrict_aspect_width" "1.77777777"
 		"rd_draw_restricted_rectangles_coop" "1"
 		
 		"rd_auto_fast_restart" "1"
diff --git a/reactivedrop/content/traitors_challenge/scripts/vscripts/challenge_traitors.nut b/reactivedrop/content/traitors_challenge/scripts/vscripts/challenge_traitors.nut
@@ -236,7 +236,7 @@ function SetTraitorIcon(interval = 10) {
 			continue;
 		}
 
-		local hHud2 = Entities.FindByName(null, hPlayer.GetScriptScope().strHudName2);
+    local hHud2 = Entities.FindByName(null, hPlayer.GetScriptScope().strHudName2);
 		for(local i = 6;i<21;i++) {
 			hHud2.SetInt(i, list[i]);
 		}
diff --git a/src/game/client/swarm/asw_in_mouse.cpp b/src/game/client/swarm/asw_in_mouse.cpp
@@ -1,6 +1,7 @@
 #include "cbase.h"
 #include "asw_input.h"
 #include "vgui/asw_vgui_ingame_panel.h"
+#include "asw_hud_master.h"
 #include "asw_hud_crosshair.h"
 #include "c_asw_player.h"
 #include "c_asw_marine.h"
@@ -15,13 +16,6 @@
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
 
-// restricted area variables
-extern int g_nRestrictedAreaLeft;
-extern int g_nRestrictedAreaRight;
-extern int g_nScreenAreaWidth;
-extern int g_nScreenAreaHeight;
-extern bool g_bUltraWideScreen;
-
 ConVar glow_outline_color_active( "glow_outline_color_active", "153 153 204", FCVAR_NONE );
 ConVar glow_outline_color_inactive( "glow_outline_color_inactive", "77 77 77", FCVAR_NONE );
 
@@ -92,17 +86,15 @@ void CASWInput::ApplyMouse( int nSlot, QAngle& viewangles, CUserCmd *cmd, float
 	int current_posx, current_posy;
 	GetMousePos(current_posx, current_posy);
 
-	// restrict cursor to 16:9 area to prevent ultra-wide fov cheat
-	C_ASW_Player* asw_player = C_ASW_Player::GetLocalASWPlayer();
+	if ( ASWInput()->ControllerModeActiveMouse() )
+		return;
 
-	if (asw_player && !asw_player->GetSpectatingNPC()) 
+	CASW_Hud_Master *pHUDMaster = GET_HUDELEMENT( CASW_Hud_Master );
+	if ( pHUDMaster )
 	{
-		current_posx = clamp(current_posx, g_nRestrictedAreaLeft, g_nRestrictedAreaRight);
+		current_posx = clamp( current_posx, pHUDMaster->m_nMouseMinX, pHUDMaster->m_nMouseMaxX );
 	}
 
-	if ( ASWInput()->ControllerModeActiveMouse() )
-		return;
-
 	if ( MarineControllingTurret() )
 	{
 		// accelerate up the mouse intertia
diff --git a/src/game/client/swarm/c_asw_buzzer.cpp b/src/game/client/swarm/c_asw_buzzer.cpp
@@ -29,6 +29,11 @@ END_RECV_TABLE()
 C_ASW_Buzzer::C_ASW_Buzzer()
 {
 	m_pEngineSound1 = NULL;
+
+	// reactivedrop: workaround to fix aliens red blood
+	// m_bloodColor is not networked
+	// so setting SetBloodColor() on server doesn't affect client 
+	SetBloodColor( BLOOD_COLOR_GREEN );
 }
 
 C_ASW_Buzzer::~C_ASW_Buzzer()
diff --git a/src/game/client/swarm/c_asw_marine_resource.cpp b/src/game/client/swarm/c_asw_marine_resource.cpp
@@ -54,6 +54,7 @@ IMPLEMENT_CLIENTCLASS_DT( C_ASW_Marine_Resource, DT_ASW_Marine_Resource, CASW_Ma
 	RecvPropIntWithMinusOneFlag( RECVINFO( m_iScore ) ),
 	RecvPropFloat( RECVINFO( m_flFinishedMissionTime ) ),
 	RecvPropDataTable( RECVINFO_DT( m_EquippedItemData ), 0, &REFERENCE_RECV_TABLE( DT_RD_ItemInstances_Marine_Resource ) ),
+	RecvPropInt( RECVINFO( m_iChallengeScratch ) ),
 END_RECV_TABLE();
 
 extern ConVar asw_leadership_radius;
@@ -81,6 +82,7 @@ C_ASW_Marine_Resource::C_ASW_Marine_Resource()
 	m_flFinishedMissionTime = -1;
 	memset( m_iWeaponsInSlots, -1, sizeof( m_iWeaponsInSlots ) );
 	memset( m_iWeaponsInSlotsLastSeen, -1, sizeof( m_iWeaponsInSlotsLastSeen ) );
+	m_iChallengeScratch = 0;
 }
 
 C_ASW_Marine_Resource::~C_ASW_Marine_Resource()
diff --git a/src/game/client/swarm/c_asw_marine_resource.h b/src/game/client/swarm/c_asw_marine_resource.h
@@ -114,12 +114,13 @@ class C_ASW_Marine_Resource : public C_BaseEntity
 	float m_flScoreLastChanged;
 	int m_iPrevScore;
 	int m_iCurScore;
+	int m_iChallengeScratch;
 
 	CNetworkVarEmbedded( CRD_ItemInstances_Marine_Resource, m_EquippedItemData );
 	void ClearInvalidEquipData();
 
 private:
-	C_ASW_Marine_Resource( const C_ASW_Marine_Resource & ); // not defined, not accessible
+	C_ASW_Marine_Resource( const C_ASW_Marine_Resource & ) = delete;
 };
 
 #endif /* _INCLUDED_C_ASW_MARINE_RESOURCE_H */
diff --git a/src/game/client/swarm/c_asw_objective.cpp b/src/game/client/swarm/c_asw_objective.cpp
@@ -132,8 +132,3 @@ const char *C_ASW_Objective::GetInfoIcon( int i )
 	}
 	return NULL;
 }
-
-// allows this objective to paint its status on the HUD
-void C_ASW_Objective::PaintObjective( float &current_y )
-{
-}
diff --git a/src/game/client/swarm/c_asw_objective.h b/src/game/client/swarm/c_asw_objective.h
@@ -18,9 +18,6 @@ class C_ASW_Objective : public C_BaseEntity
 	const char *GetInfoIcon( int i );
 	const char *GetObjectiveIconName( void );
 
-	// allows this objective to paint its status on the HUD
-	virtual void PaintObjective( float &current_y );
-
 	virtual bool IsObjectiveComplete() { return m_bComplete; }
 	virtual bool IsObjectiveFailed() { return m_bFailed; }
 	virtual bool IsObjectiveOptional() { return m_bOptional; }
diff --git a/src/game/client/swarm/c_asw_player.cpp b/src/game/client/swarm/c_asw_player.cpp
@@ -270,6 +270,7 @@ BEGIN_NETWORK_TABLE( C_ASW_Player, DT_ASW_Player )
 	RecvPropQAngles( RECVINFO( m_angMarineAutoAimFromClient ) ),
 	RecvPropFloat( RECVINFO( m_flInactiveKickWarning ) ),
 	RecvPropDataTable( RECVINFO_DT( m_EquippedItemData ), 0, &REFERENCE_RECV_TABLE( DT_RD_ItemInstances_Player ) ),
+	RecvPropInt( RECVINFO( m_iChallengeScratch ) ),
 END_RECV_TABLE()
 
 BEGIN_PREDICTION_DATA( C_ASW_Player )
@@ -357,6 +358,7 @@ C_ASW_Player::C_ASW_Player() :
 	m_flInactiveKickWarning = 0.0f;
 	m_nLastInactiveKickWarning = 0;
 	m_flNextServerInfoUpdate = 0.0f;
+	m_iChallengeScratch = 0;
 }
 
 
diff --git a/src/game/client/swarm/c_asw_player.h b/src/game/client/swarm/c_asw_player.h
@@ -359,6 +359,8 @@ class C_ASW_Player : public C_BasePlayer, public IASWPlayerAnimStateHelpers
 	STEAM_CALLBACK( C_ASW_Player, Steam_OnUserStatsStored, UserStatsStored_t );
 #endif
 
+	int m_iChallengeScratch;
+
 private:
 	C_ASW_Player( const C_ASW_Player & );
 };
diff --git a/src/game/client/swarm/vgui/asw_hud_3dmarinenames.cpp b/src/game/client/swarm/vgui/asw_hud_3dmarinenames.cpp
@@ -37,6 +37,7 @@
 #include "c_playerresource.h"
 #include "datacache/imdlcache.h"
 #include "asw_util_shared.h"
+#include "asw_hud_master.h"
 #include "asw_hud_objective.h"
 #include "voice_status.h"
 #include "cdll_bounded_cvars.h"
@@ -46,12 +47,6 @@
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
 
-// restricted area variables and cvars
-extern int g_nRestrictedAreaLeft;
-extern bool g_bUltraWideScreen;
-extern ConVar rd_draw_restricted_rectangles_coop;
-extern ConVar rd_draw_restricted_rectangles_dm;
-
 extern ConVar asw_draw_hud;
 extern ConVar asw_hud_alpha;
 extern ConVar asw_DebugAutoAim;
@@ -105,6 +100,8 @@ ConVar rd_strange_notification_timing_2( "rd_strange_notification_timing_2", "0.
 ConVar rd_strange_notification_timing_3( "rd_strange_notification_timing_3", "1", FCVAR_NONE, "Fade-in time" );
 ConVar rd_strange_notification_timing_4( "rd_strange_notification_timing_4", "0.4", FCVAR_NONE, "Glow flare time" );
 ConVar rd_strange_notification_timing_5( "rd_strange_notification_timing_5", "0.5", FCVAR_NONE, "Fade-out time" );
+extern ConVar rd_draw_restricted_rectangles_coop;
+extern ConVar rd_draw_restricted_rectangles_dm;
 
 #define ASW_MIN_MARINE_ARROW_SIZE 20
 #define ASW_MAX_MARINE_ARROW_SIZE 60
@@ -616,13 +613,13 @@ void CASWHud3DMarineNames::PaintMarineLabel( int iMyMarineNum, C_ASW_Marine *RES
 		*/
 		// the presence or absence and size of these elements depends on a variety of factors.
 		// first, is the marine on screen?
-		bool bMarineOnScreen = (screenPos.x >= 0) && (screenPos.x <= nMaxX) &&
-			(screenPos.y >= 0) && (screenPos.y <= nMaxY);
+		bool bMarineOnScreen = ( screenPos.x >= 0 ) && ( screenPos.x <= nMaxX ) && ( screenPos.y >= 0 ) && ( screenPos.y <= nMaxY );
 		int nRestrictedAreaOffset = 0;
-		if (g_bUltraWideScreen && ((rd_draw_restricted_rectangles_coop.GetBool() && !ASWDeathmatchMode()) || (rd_draw_restricted_rectangles_dm.GetBool() && ASWDeathmatchMode()))) {
-			bMarineOnScreen = (screenPos.x >= g_nRestrictedAreaLeft) && (screenPos.x <= nMaxX - g_nRestrictedAreaLeft) &&
-				(screenPos.y >= 0) && (screenPos.y <= nMaxY);
-			nRestrictedAreaOffset = g_nRestrictedAreaLeft;
+		CASW_Hud_Master *pHUDMaster = GET_HUDELEMENT( CASW_Hud_Master );
+		if ( pHUDMaster && ( ASWDeathmatchMode() ? rd_draw_restricted_rectangles_dm.GetBool() : rd_draw_restricted_rectangles_coop.GetBool() ) )
+		{
+			bMarineOnScreen = ( screenPos.x >= pHUDMaster->m_nMouseMinX ) && ( screenPos.x <= pHUDMaster->m_nMouseMaxX ) && ( screenPos.y >= 0 ) && ( screenPos.y <= nMaxY );
+			nRestrictedAreaOffset = pHUDMaster->m_nMouseMinX;
 		}
 
 		// COPYPASTA: if the marine isn't on screen, compute an appropriate screen point to use
diff --git a/src/game/client/swarm/vgui/asw_hud_emotes.cpp b/src/game/client/swarm/vgui/asw_hud_emotes.cpp
@@ -38,7 +38,8 @@
 using namespace vgui;
 
 extern ConVar asw_draw_hud;
-ConVar _rd_traitors_challenge_enabled("_rd_traitors_challenge_enabled", "0", FCVAR_REPLICATED | FCVAR_HIDDEN, "An internal convar to indicate whether the traitors challenge is enabled or not. This is used to determine whether the traitor emotes should be shown or not.");
+extern ConVar _rd_traitors_challenge_enabled;
+
 
 //-----------------------------------------------------------------------------
 // Purpose: Shows the marines emote graphics
@@ -67,9 +68,11 @@ class CASWHudEmotes : public CASW_HudElement, public vgui::Panel
 	CPanelAnimationVarAliasType( int, m_nAnimeTexture, "AnimeEmoteTexture", "vgui/swarm/Emotes/EmoteAnime", "textureid" );
 	CPanelAnimationVarAliasType( int, m_nQuestionTexture, "QuestionTexture", "vgui/swarm/Emotes/EmoteQuestion", "textureid" );
 	CPanelAnimationVarAliasType( int, m_nThanksTexture, "ThanksTexture", "vgui/swarm/Emotes/EmoteThanks", "textureid" );
+
 	CPanelAnimationVarAliasType( int, m_nWrenchTexture, "WrenchTexture", "vgui/swarm/ClassIcons/EngineerIcon", "textureid" );
 	CPanelAnimationVarAliasType( int, m_nSentryUpTexture, "SentryUpTexture", "vgui/swarm/ClassIcons/SentryBuild", "textureid" );
 	CPanelAnimationVarAliasType( int, m_nSentryDnTexture, "SentryDnTexture", "vgui/swarm/ClassIcons/SentryDismantle", "textureid" );
+
 	CPanelAnimationVarAliasType( int, m_nHackTexture, "HackTexture", "vgui/swarm/ClassIcons/HackIcon", "textureid" );
 	CPanelAnimationVarAliasType( int, m_nWeldTexture, "WeldTexture", "vgui/swarm/ClassIcons/WeldIcon", "textureid" );
 	CPanelAnimationVarAliasType( int, m_nReviveMarineTexture, "ReviveMarineTexture", "vgui/swarm/ClassIcons/revivemarine", "textureid" );
diff --git a/src/game/client/swarm/vgui/asw_hud_master.cpp b/src/game/client/swarm/vgui/asw_hud_master.cpp
@@ -45,17 +45,12 @@ ConVar rd_draw_timer( "rd_draw_timer", "0", FCVAR_ARCHIVE, "Display the current
 ConVar rd_draw_timer_color( "rd_draw_timer_color", "255 255 255 255", FCVAR_ARCHIVE, "The color of the current mission time" );
 ConVar rd_draw_marine_health_counter( "rd_draw_marine_health_counter", "0", FCVAR_ARCHIVE, "Display a numeric counter for marine health on the HUD" );
 
-// restricted area variables
-int g_nRestrictedAreaLeft;
-int g_nRestrictedAreaRight;
-int g_nScreenAreaWidth;
-int g_nScreenAreaHeight;
-bool g_bUltraWideScreen;
 // restricted area cvars
 ConVar rd_draw_restricted_borders( "rd_draw_restricted_borders", "1", FCVAR_ARCHIVE, "Display the restricted cursor area when using ultra-wide resolution" );
 ConVar rd_draw_restricted_borders_color("rd_draw_restricted_borders_color", "128 128 128 128", 0, "Color of the restricted cursor area borders");
-ConVar rd_draw_restricted_rectangles_coop("rd_draw_restricted_rectangles_coop", "1", FCVAR_REPLICATED, "Fill extra side FOVs with black on ultra-wide resolution in coop mode.");
-ConVar rd_draw_restricted_rectangles_dm("rd_draw_restricted_rectangles_dm", "1", FCVAR_REPLICATED | FCVAR_CHEAT, "Fill extra side FOVs with black on ultra-wide resolution in deathmatch mode.");
+extern ConVar rd_restrict_aspect_width;
+extern ConVar rd_draw_restricted_rectangles_coop;
+extern ConVar rd_draw_restricted_rectangles_dm;
 
 using namespace vgui;
 
@@ -445,24 +440,20 @@ void CASW_Hud_Master::OnThink()
 		}
 	}
 
-	g_nScreenAreaWidth = ScreenWidth();
-	g_nScreenAreaHeight = ScreenHeight();
-	int nStandardWidth = (int)(g_nScreenAreaHeight * 16.0f / 9.0f ) + 1;
-	if (g_nScreenAreaWidth > nStandardWidth)
+	int w, h;
+	GetHudSize( w, h );
+
+	int nMaxWidth = rd_restrict_aspect_width.GetFloat() <= 0 ? INT32_MAX : (int)( h * rd_restrict_aspect_width.GetFloat() + 1 );
+	if ( w > nMaxWidth )
 	{
-		g_nRestrictedAreaLeft = (g_nScreenAreaWidth - nStandardWidth) >> 1;
-		g_nRestrictedAreaRight = g_nScreenAreaWidth - g_nRestrictedAreaLeft;
-		g_bUltraWideScreen = true;
-		m_nMarinePortrait_x = g_nRestrictedAreaLeft;
+		m_nMouseMinX = ( w - nMaxWidth ) / 2;
+		m_nMouseMaxX = w - m_nMouseMinX;
 	}
 	else
 	{
-		g_nRestrictedAreaLeft = 0;
-		g_nRestrictedAreaRight = g_nScreenAreaWidth;
-		g_bUltraWideScreen = false;
-		m_nMarinePortrait_x = 0;
+		m_nMouseMinX = 0;
+		m_nMouseMaxX = w;
 	}
-
 }
 
 void CASW_Hud_Master::Paint( void )
@@ -516,26 +507,19 @@ void CASW_Hud_Master::Paint( void )
 	if ( m_pLocalMarineResource )
 	{
 		// Block extra side FOVs
-		if (g_bUltraWideScreen && ((rd_draw_restricted_rectangles_coop.GetBool() && !ASWDeathmatchMode()) || (rd_draw_restricted_rectangles_dm.GetBool() && ASWDeathmatchMode())) && !pPlayer->GetSpectatingNPC()) {
-			//	(0,0)-----(L,0)       (R,0)-----(W,0)
-			//	  |//////////|            |/////////|
-			//	  |//////////|            |/////////|
-			//	(0,H)-----(L,H)       (R,H)-----(W,H)
-			surface()->DrawSetColor(Color(0, 0, 0, 255));
-			surface()->DrawFilledRect(0, 0, g_nRestrictedAreaLeft, g_nScreenAreaHeight);
-			surface()->DrawFilledRect(g_nRestrictedAreaRight, 0, g_nScreenAreaWidth, g_nScreenAreaHeight);
-			//Msg("%d\t%d\n", x1, x2);
+		if ( ( ASWDeathmatchMode() ? rd_draw_restricted_rectangles_dm.GetBool() : rd_draw_restricted_rectangles_dm.GetBool() ) && !pPlayer->GetSpectatingNPC() )
+		{
+			surface()->DrawSetColor( Color( 0, 0, 0, 255 ) );
+			surface()->DrawFilledRect( 0, 0, m_nMouseMinX, ScreenHeight() );
+			surface()->DrawFilledRect( m_nMouseMaxX, 0, ScreenWidth(), ScreenHeight() );
 		}
 
 		// draw restricted borders for ultra-wide screen
-		if (g_bUltraWideScreen && rd_draw_restricted_borders.GetBool() && !pPlayer->GetSpectatingNPC()) {
-			//	(L,0)-----------(R,0)
-			//	  |               |
-			//	  |               |
-			//	(L,H)-----------(R,H)
-			surface()->DrawSetColor(rd_draw_restricted_borders_color.GetColor());
-			surface()->DrawLine(g_nRestrictedAreaLeft, 0, g_nRestrictedAreaLeft, g_nScreenAreaHeight);
-			surface()->DrawLine(g_nRestrictedAreaRight, 0, g_nRestrictedAreaRight, g_nScreenAreaHeight);
+		if ( m_nMouseMinX != 0 && rd_draw_restricted_borders.GetBool() && !pPlayer->GetSpectatingNPC() )
+		{
+			surface()->DrawSetColor( rd_draw_restricted_borders_color.GetColor() );
+			surface()->DrawLine( m_nMouseMinX, 0, m_nMouseMinX, ScreenHeight() );
+			surface()->DrawLine( m_nMouseMaxX, 0, m_nMouseMaxX, ScreenHeight() );
 		}
 
 		C_ASW_Marine_Resource *pMR = m_pLocalMarineResource;
diff --git a/src/game/client/swarm/vgui/asw_hud_master.h b/src/game/client/swarm/vgui/asw_hud_master.h
@@ -296,6 +296,10 @@ class CASW_Hud_Master : public CASW_HudElement, public vgui::Panel
 	HotbarOrderEffectsList_t m_hHotbarOrderEffects;
 
 	vgui::Label *m_pLblTimer;
+
+public:
+	int m_nMouseMinX;
+	int m_nMouseMaxX;
 };
 
 
diff --git a/src/game/client/swarm/vgui/asw_hud_objective.cpp b/src/game/client/swarm/vgui/asw_hud_objective.cpp
@@ -28,9 +28,6 @@
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
 
-// restricted area variables
-extern int g_nRestrictedAreaLeft;
-
 extern ConVar asw_draw_hud;
 extern ConVar asw_hud_alpha;
 extern ConVar rd_points_delay;
@@ -188,7 +185,7 @@ void CASWHudObjective::Paint( void )
 		m_pHeaderLabel->GetPos(tx, ty);
 		float fScale = ScreenWidth() / 1024.0f;
 		int width = 213 * fScale;
-		int left_side = tx - 4.0f * fScale + g_nRestrictedAreaLeft;
+		int left_side = tx - 4.0f * fScale;
 		int top = ty - 4.0f * fScale;
 		int height = th + 8.0f * fScale;
 		vgui::Vertex_t points[4] = 
@@ -197,7 +194,7 @@ void CASWHudObjective::Paint( void )
 		vgui::Vertex_t( Vector2D(left_side + width, top),		Vector2D(1,0) ), 
 		vgui::Vertex_t( Vector2D(left_side + width - height, top + height),		Vector2D(1,1) ), 
 		vgui::Vertex_t( Vector2D(left_side, top + height),	Vector2D(0,1) )
-		}; 
+		};
 		vgui::surface()->DrawTexturedPolygon( 4, points );
 	}
 
@@ -248,19 +245,6 @@ void CASWHudObjective::Paint( void )
 	}
 
 	BaseClass::Paint();
-
-	// allow custom painting
-	int ob_x = g_nRestrictedAreaLeft;
-	int ob_y = 0;
-	for (int i=0;i<ASW_MAX_OBJECTIVES;i++)
-	{
-		if (m_hObjectives[i].Get() != NULL && m_pObjectiveLabel[i])
-		{
-			m_pObjectiveLabel[i]->GetPos(ob_x, ob_y);
-			float f = ob_y;
-			m_hObjectives[i]->PaintObjective(f);
-		}
-	}
 }
 
 void CASWHudObjective::UpdateObjectiveList()
@@ -455,7 +439,7 @@ void CASWHudObjective::LayoutObjectives()
 	float fScale = (ScreenHeight() / 768.0f) * asw_hud_scale.GetFloat();
 	int icon_size = 16.0f * fScale;
 	int tick_size = 16.0f * fScale;
-	int border = 14.0f * fScale + g_nRestrictedAreaLeft;
+	int border = 14.0f * fScale;
 	int label_x = border + tick_size + icon_size;
 	int font_tall = vgui::surface()->GetFontTall(m_font);
 	int header_y = 14.0f * fScale;
diff --git a/src/game/server/swarm/asw_marine_resource.cpp b/src/game/server/swarm/asw_marine_resource.cpp
diff --git a/src/game/server/swarm/asw_marine_resource.h b/src/game/server/swarm/asw_marine_resource.h
diff --git a/src/game/server/swarm/asw_player.cpp b/src/game/server/swarm/asw_player.cpp
diff --git a/src/game/server/swarm/asw_player.h b/src/game/server/swarm/asw_player.h
diff --git a/src/game/shared/swarm/asw_gamerules.cpp b/src/game/shared/swarm/asw_gamerules.cpp

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ function SetTraitorIcon(interval = 10) {`
`236`	`236`	`continue;`
`237`	`237`	`}`
`238`	`238`
`239`		`- local hHud2 = Entities.FindByName(null, hPlayer.GetScriptScope().strHudName2);`
	`239`	`+ local hHud2 = Entities.FindByName(null, hPlayer.GetScriptScope().strHudName2);`
`240`	`240`	`for(local i = 6;i<21;i++) {`
`241`	`241`	`hHud2.SetInt(i, list[i]);`
`242`	`242`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,11 @@ END_RECV_TABLE()`
`29`	`29`	`C_ASW_Buzzer::C_ASW_Buzzer()`
`30`	`30`	`{`
`31`	`31`	`m_pEngineSound1 = NULL;`
	`32`	`+`
	`33`	`+ // reactivedrop: workaround to fix aliens red blood`
	`34`	`+ // m_bloodColor is not networked`
	`35`	`+ // so setting SetBloodColor() on server doesn't affect client`
	`36`	`+ SetBloodColor( BLOOD_COLOR_GREEN );`
`32`	`37`	`}`
`33`	`38`
`34`	`39`	`C_ASW_Buzzer::~C_ASW_Buzzer()`
Original file line number	Diff line number	Diff line change
`@@ -132,8 +132,3 @@ const char *C_ASW_Objective::GetInfoIcon( int i )`
`132`	`132`	`}`
`133`	`133`	`return NULL;`
`134`	`134`	`}`
`135`		`-`
`136`		`-// allows this objective to paint its status on the HUD`
`137`		`-void C_ASW_Objective::PaintObjective( float &current_y )`
`138`		`-{`
`139`		`-}`