Fix bounding box & font issues

Closes #21 Closes #42
Cherry · Oct 28, 2018 · 3069092 · 3069092
1 parent bd8570e
commit 3069092
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 22 deletions.
diff --git a/lua/autorun/textscreens_util.lua b/lua/autorun/textscreens_util.lua
@@ -5,7 +5,7 @@ if SERVER then
 	CreateConVar("sbox_maxtextscreens", "100", {FCVAR_NOTIFY, FCVAR_REPLICATED})
 	CreateConVar("ss_call_to_home", 0, {FCVAR_NOTIFY, FCVAR_REPLICATED})
 
-	local version = "1.8.2"
+	local version = "1.9.0"
 
 	local function GetOS()
 		if system.IsLinux() then return "linux" end

diff --git a/lua/entities/sammyservers_textscreen/init.lua b/lua/entities/sammyservers_textscreen/init.lua
@@ -11,8 +11,13 @@ function ENT:Initialize()
 	self:SetMaterial("models/effects/vol_light001")
 	self:SetSolid(SOLID_VPHYSICS)
 	self:SetCollisionGroup(COLLISION_GROUP_WORLD)
+	self:PhysicsInit(SOLID_VPHYSICS)
+	self:SetMoveType(MOVETYPE_VPHYSICS)
+	local phys = self:GetPhysicsObject()
+	if IsValid(phys) then
+		phys:EnableMotion(false)
+	end
 	self.heldby = 0
-	self:SetMoveType(MOVETYPE_NONE)
 end
 
 function ENT:PhysicsUpdate(phys)
@@ -31,6 +36,10 @@ hook.Add("PhysgunPickup", "textScreensPreventTravelPickup", textScreenPickup)
 local function textScreenDrop(ply, ent)
 	if IsValid(ent) and ent:GetClass() == "sammyservers_textscreen" then
 		ent.heldby = ent.heldby - 1
+		local phys = ent:GetPhysicsObject()
+		if IsValid(phys) then
+			ent:PhysicsUpdate(phys)
+		end
 	end
 end
 hook.Add("PhysgunDrop", "textScreensPreventTravelDrop", textScreenDrop)

diff --git a/lua/textscreens_config.lua b/lua/textscreens_config.lua
@@ -34,14 +34,14 @@ addFont("Coolvetica", {
 
 -- Trebuchet
 addFont("Screens_Trebuchet outlined", {
-	font = "Trebuchet18",
+	font = "Trebuchet MS",
 	weight = 400,
 	antialias = false,
 	outline = true
 })
 
 addFont("Screens_Trebuchet", {
-	font = "Trebuchet18",
+	font = "Trebuchet MS",
 	weight = 400,
 	antialias = false,
 	outline = false
@@ -93,36 +93,20 @@ addFont("Screens_Helvetica", {
 })
 
 -- akbar
-addFont("Screens_akbar outlined", {
+addFont("Screens_Akbar outlined", {
 	font = "akbar",
 	weight = 400,
 	antialias = false,
 	outline = true
 })
 
-addFont("Screens_akbar", {
+addFont("Screens_Akbar", {
 	font = "akbar",
 	weight = 400,
 	antialias = false,
 	outline = false
 })
 
-
--- boogaloo
-addFont("Screens_boogaloo outlined", {
-	font = "boogaloo",
-	weight = 400,
-	antialias = false,
-	outline = true
-})
-
-addFont("Screens_boogaloo", {
-	font = "boogaloo",
-	weight = 400,
-	antialias = false,
-	outline = false
-})
-
 -- csd
 addFont("Screens_csd outlined", {
 	font = "csd",