Merge pull request #160 from raysfire/dev

v2020.1230

1 files changed, 14 insertions, 81 deletions

diff --git a/resource/ui/spectator.res b/resource/ui/spectator.res
index d18efc5..2ea9a8d 100644
--- a/resource/ui/spectator.res
+++ b/resource/ui/spectator.res
@@ -1,3 +1,5 @@
+#base "hudinspectpanel.res"
+
 "Resource/UI/Spectator.res"
 {
 	"Spectator"
@@ -60,10 +62,10 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ReinforcementsLabel"
-		"xpos"			"c-300"
+		"xpos"			"0"
 		"ypos"			"50"
-		"wide"			"600"
-		"tall"			"24"
+		"wide"			"f0"
+		"tall"			"25"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -71,6 +73,11 @@
 		"labelText"		"#game_respawntime_in_secs"
 		"textAlignment"	"center"
 		"font"			"HudFontMedium"
+
+		if_mvm
+		{
+			"ypos"		"90"
+		}
 	}
 
 	"BuyBackLabel"
@@ -78,16 +85,16 @@
 		"ControlName"	"CExLabel"
 		"fieldName"		"BuyBackLabel"
 		"xpos"			"0"
-		"ypos"			"0"
-		"wide"			"320"
-		"tall"			"30"
+		"ypos"			"110"
+		"wide"			"f0"
+		"tall"			"25"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"#TF_PVE_Buyback"
 		"textAlignment"	"center"
-		"font"			"HudFontMedium"
+		"font"			"HudFontSmall"
 
 		if_mvm
 		{
@@ -112,7 +119,6 @@
 		"ControlName"	"CExLabel"
 		"fieldName"		"SwitchCamModeKeyLabel"
 		"xpos"			"9999"
-
 	}
 	"SwitchCamModeLabel"
 	{
@@ -150,79 +156,6 @@
 		"fieldName"		"TipLabel"
 		"xpos"			"9999"
 	}
-	"itempanel"
-	{
-		"ControlName"	"CItemModelPanel"
-		"fieldName"		"itempanel"
-		"xpos"			"r249"
-		"ypos"			"c50"
-		"zpos"			"10"
-		"wide"			"240"
-		"tall"			"100"
-		"visible"		"0"
-		"bgcolor_override"		"255 255 255 0"
-		"paintbackground"		"1"
-		"PaintBackgroundType"	"0"
-
-		"model_ypos"		"20"
-		"model_center_x"	"1"
-		"model_wide"		"90"
-		"model_tall"		"60"
-
-		"text_xpos"			"10"
-		"text_ypos"			"10"
-		"text_wide"			"220"
-		"text_center"		"1"
-
-		"max_text_height"	"100"
-		"padding_height"	"10"
-		"resize_to_text"	"1"
-		"text_forcesize"	"2"
-
-		"ItemBG"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ItemBG"
-			"xpos"			"0"
-			"ypos"			"0"
-			"zpos"			"-1"
-			"wide"			"240"
-			"tall"			"900"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"fillcolor"		"HudBlack"
-		}
-
-		"itemmodelpanel"
-		{
-			"fieldName"		"itemmodelpanel"
-			"use_item_rendertarget" "0"
-			"useparentbg"	"1"
-			"inventory_image_type"	"1"
-		}
-
-		"ItemLabel"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ItemLabel"
-			"font"			"HudFontSmallest"
-			"xpos"			"10"
-			"ypos"			"3"
-			"zpos"			"1"
-			"wide"			"270"
-			"tall"			"16"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"#FreezePanel_Item"
-			"textAlignment"	"Left"
-			"dulltext"		"0"
-			"brighttext"	"0"
-		}
-	}
 
 	"spectator_extras"
 	{