Code clenup.

Author: ethanblazkowicz

src/Export/Launch.lua

@@ -67,7 +67,7 @@ function launch:OnFrame()
 		self:DrawPopup(r, g, b, "^0%s", self.promptMsg)
 	end
 	if self.doRestart then
-		local screenW, screenH = GetVirtualScreenSize()
+		local screenW, screenH = GetScreenSize()
 		SetDrawColor(0, 0, 0, 0.75)
 		DrawImage(nil, 0, 0, screenW, screenH)
 		SetDrawColor(1, 1, 1)
@@ -180,7 +180,7 @@ function launch:RunPromptFunc(key)
 end
 
 function launch:DrawPopup(r, g, b, fmt, ...)
-	local screenW, screenH = GetVirtualScreenSize()
+	local screenW, screenH = GetScreenSize()
 	SetDrawColor(0, 0, 0, 0.5)
 	DrawImage(nil, 0, 0, screenW, screenH)
 	local txt = string.format(fmt, ...)

src/Export/Main.lua

@@ -415,7 +415,7 @@ function main:Shutdown()
 end
 
 function main:OnFrame()
-	self.screenW, self.screenH = GetVirtualScreenSize()
+	self.screenW, self.screenH = GetScreenSize()
 
 	self.viewPort = { x = 0, y = 0, width = self.screenW, height = self.screenH }
 

src/HeadlessWrapper.lua

@@ -51,9 +51,6 @@ end
 function GetScreenScale()
 	return 1
 end
-function GetVirtualScreenSize()
-	return GetScreenSize()
-end
 function GetDPIScaleOverridePercent()
 	return 1
 end

src/Launch.lua

@@ -126,7 +126,7 @@ function launch:OnFrame()
 		self:DrawPopup(r, g, b, "^0%s", self.promptMsg)
 	end
 	if self.doRestart then
-		local screenW, screenH = GetVirtualScreenSize()
+		local screenW, screenH = GetScreenSize()
 		SetDrawColor(0, 0, 0, 0.75)
 		DrawImage(nil, 0, 0, screenW, screenH)
 		SetDrawColor(1, 1, 1)
@@ -391,7 +391,7 @@ function launch:RunPromptFunc(key)
 end
 
 function launch:DrawPopup(r, g, b, fmt, ...)
-	local screenW, screenH = GetVirtualScreenSize()
+	local screenW, screenH = GetScreenSize()
 	SetDrawColor(0, 0, 0, 0.5)
 	DrawImage(nil, 0, 0, screenW, screenH)
 	local txt = string.format(fmt, ...)

src/Modules/Common.lua

@@ -973,8 +973,3 @@ function ImportBuild(importLink, callback)
 		callback(Inflate(common.base64.decode(importLink:gsub("-", "+"):gsub("_", "/"))), nil)
 	end
 end
-
--- Returns virtual screen size
-function GetVirtualScreenSize()
-	return GetScreenSize()
-end

src/Modules/Main.lua

@@ -339,7 +339,7 @@ function main:Shutdown()
 end
 
 function main:OnFrame()
-	self.screenW, self.screenH = GetVirtualScreenSize()
+	self.screenW, self.screenH = GetScreenSize()
 
 	if self.screenH > self.screenW then
 		self.portraitMode = true
@@ -926,7 +926,7 @@ function main:OpenOptionsPopup(savedState)
 	}, function(index, value)
 		self.dpiScaleOverridePercent = value.percent
 		SetDPIScaleOverridePercent(value.percent)
-		self.screenW, self.screenH = GetVirtualScreenSize() -- refresh screen size immediately
+		self.screenW, self.screenH = GetScreenSize() -- refresh screen size immediately
 		self:ClosePopup()
 		self:OpenOptionsPopup(savedState)
 	end)