From 89704044e8055ebd1435900480cb2c049ea03d4f Mon Sep 17 00:00:00 2001
From: Michael Fabian 'Xaymar' Dirks <info@xaymar.com>
Date: Thu, 15 Aug 2019 00:39:01 +0200
Subject: [PATCH] gamemode: Update init files

---
 .../prophuntextended/gamemode/cl_init.lua     | 22 +++++++++----------
 .../prophuntextended/gamemode/init.lua        | 10 ++++++---
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/source/gamemodes/prophuntextended/gamemode/cl_init.lua b/source/gamemodes/prophuntextended/gamemode/cl_init.lua
index 8aba248..82fb0ee 100644
--- a/source/gamemodes/prophuntextended/gamemode/cl_init.lua
+++ b/source/gamemodes/prophuntextended/gamemode/cl_init.lua
@@ -26,11 +26,13 @@
 --! Includes
 -- ------------------------------------------------------------------------- --
 include("sh_init.lua")
-include("derma/dscoreboard.lua")
-
-GM.UI = {}
-include("client/fontmanager.lua")
-include("client/uimanager.lua")
+include("vgui/dlabeldpi.lua")
+include("vgui/dframedpi.lua")
+include("vgui/fontmanager.lua")
+include("vgui/uimanager.lua")
+include("client/ui/scoreboard.lua")
+include("client/ui/help.lua")
+include("client/ui/settings.lua")
 include("client/hud/gamestatedisplay.lua")
 include("client/cl_ui_help.lua")
 include("client/cl_ui_teamselection.lua")
@@ -45,12 +47,10 @@ function GM:Initialize()
 	print("Prop Hunt CL: Preparing data...")
 	self.Data = {}
 	
-	print("Prop Hunt CL: Preparing User Interface...")
-	self.FontManager = FontManager()
-	self.UIManager = UIManager()
-	
 	print("Prop Hunt CL: Creating User Interface...")
-	self.FontManager:Request("RobotoBoldCondensed160", {font="Roboto Bold Condensed", extended=true, size=160, weight=800, antialias=true})
+	FontManager:Request("RobotoBoldCondensed160", {font="Roboto Bold Condensed", extended=true, size=160, weight=800, antialias=true})
+	self.UI = {}
+	self.UI.Help = vgui.Create("PHE_HelpUI")
 	self.UI.Scoreboard = vgui.Create("DScoreBoard")
 	self.UI.GameStateDisplay = vgui.Create("PHEHUDGameStateDisplay")
 	
@@ -59,7 +59,7 @@ function GM:Initialize()
 end
 
 function GM:Think()
-	self.UIManager:Tick()
+	UIManager:Tick()
 end
 
 function GM:InitialPlayerSpawn()
diff --git a/source/gamemodes/prophuntextended/gamemode/init.lua b/source/gamemodes/prophuntextended/gamemode/init.lua
index 82f3ba8..bf125f6 100644
--- a/source/gamemodes/prophuntextended/gamemode/init.lua
+++ b/source/gamemodes/prophuntextended/gamemode/init.lua
@@ -35,12 +35,16 @@ AddCSLuaFile("player_class/class_seeker.lua")
 AddCSLuaFile("player_class/class_hider.lua")
 
 -- Client-Only
-AddCSLuaFile("client/fontmanager.lua")
-AddCSLuaFile("client/uimanager.lua")
+AddCSLuaFile("vgui/fontmanager.lua")
+AddCSLuaFile("vgui/uimanager.lua")
+AddCSLuaFile("vgui/dlabeldpi.lua")
+AddCSLuaFile("vgui/dframedpi.lua")
+AddCSLuaFile("client/ui/help.lua")
+AddCSLuaFile("client/ui/settings.lua")
+AddCSLuaFile("client/ui/scoreboard.lua")
 AddCSLuaFile("client/hud/gamestatedisplay.lua")
 AddCSLuaFile("client/cl_ui_help.lua")
 AddCSLuaFile("client/cl_ui_teamselection.lua")
-AddCSLuaFile("derma/dscoreboard.lua")
 
 -- Client Init
 AddCSLuaFile("cl_init.lua") -- Immediately executed when downloaded, weird bug.