From 8a99ae2abfd4e40f9d7add5dd9ab841d4af41d0d Mon Sep 17 00:00:00 2001
From: Michael Fabian 'Xaymar' Dirks <info@xaymar.com>
Date: Mon, 21 Dec 2020 03:08:50 +0100
Subject: [PATCH] client: Unify layout

---
 .../gamemode/{vgui => client/ui}/fontmanager.lua     |  0
 .../gamemode/{vgui => client/ui}/uimanager.lua       | 12 +++++++-----
 .../gamemode/{ => client}/vgui/dframedpi.lua         |  0
 .../gamemode/{ => client}/vgui/dlabeldpi.lua         |  0
 4 files changed, 7 insertions(+), 5 deletions(-)
 rename source/gamemodes/prophuntextended/gamemode/{vgui => client/ui}/fontmanager.lua (100%)
 rename source/gamemodes/prophuntextended/gamemode/{vgui => client/ui}/uimanager.lua (93%)
 rename source/gamemodes/prophuntextended/gamemode/{ => client}/vgui/dframedpi.lua (100%)
 rename source/gamemodes/prophuntextended/gamemode/{ => client}/vgui/dlabeldpi.lua (100%)

diff --git a/source/gamemodes/prophuntextended/gamemode/vgui/fontmanager.lua b/source/gamemodes/prophuntextended/gamemode/client/ui/fontmanager.lua
similarity index 100%
rename from source/gamemodes/prophuntextended/gamemode/vgui/fontmanager.lua
rename to source/gamemodes/prophuntextended/gamemode/client/ui/fontmanager.lua
diff --git a/source/gamemodes/prophuntextended/gamemode/vgui/uimanager.lua b/source/gamemodes/prophuntextended/gamemode/client/ui/uimanager.lua
similarity index 93%
rename from source/gamemodes/prophuntextended/gamemode/vgui/uimanager.lua
rename to source/gamemodes/prophuntextended/gamemode/client/ui/uimanager.lua
index 7c2614d..90c3d91 100644
--- a/source/gamemodes/prophuntextended/gamemode/vgui/uimanager.lua
+++ b/source/gamemodes/prophuntextended/gamemode/client/ui/uimanager.lua
@@ -68,8 +68,8 @@ function UIManagerMeta:InitializeEvents()
 end
 
 function UIManagerMeta:Listen(event, uniqueName, callback)
-	assert(type(event) == "string", "UIManager:Listen(event<string>, callback<function>): event must be a string")
-	assert(type(callback) == "function", "UIManager:Listen(event<string>, callback<function>): callback must be a function")
+	assert(type(event) == "string", "UIManager:Listen(event<string>, uniqueName<any>, callback<function>): event must be a string")
+	assert(type(callback) == "function", "UIManager:Listen(event<string>, uniqueName<any>, callback<function>): callback must be a function")
 	
 	if (self.events[event] == nil) then
 		self.events[event] = {}
@@ -80,6 +80,8 @@ function UIManagerMeta:Listen(event, uniqueName, callback)
 end
 
 function UIManagerMeta:Silence(event, uniqueName)
+	assert(type(event) == "string", "UIManager:Silence(event<string>, uniqueName<any>): event must be a string")
+
 	if (self.events[event] == nil) then
 		return false
 	end
@@ -128,12 +130,12 @@ function UIManagerMeta:InitializeDPI()
 	self.dpi = {}
 	-- Calculate DPI using these base sizes.
 	self.dpi.base = {}
-	self.dpi.base.width = 1920
-	self.dpi.base.height = 1080
+	self.dpi.base.width = 1280
+	self.dpi.base.height = 720
 	-- Limits
 	self.dpi.limits = {}
 	self.dpi.limits.min = 0.25
-	self.dpi.limits.max = 4.00
+	self.dpi.limits.max = 10.00
 	-- Final Value
 	self.dpi.override = nil
 	self.dpi.calculated = self:CalculateDPI()
diff --git a/source/gamemodes/prophuntextended/gamemode/vgui/dframedpi.lua b/source/gamemodes/prophuntextended/gamemode/client/vgui/dframedpi.lua
similarity index 100%
rename from source/gamemodes/prophuntextended/gamemode/vgui/dframedpi.lua
rename to source/gamemodes/prophuntextended/gamemode/client/vgui/dframedpi.lua
diff --git a/source/gamemodes/prophuntextended/gamemode/vgui/dlabeldpi.lua b/source/gamemodes/prophuntextended/gamemode/client/vgui/dlabeldpi.lua
similarity index 100%
rename from source/gamemodes/prophuntextended/gamemode/vgui/dlabeldpi.lua
rename to source/gamemodes/prophuntextended/gamemode/client/vgui/dlabeldpi.lua