Merge pull request #573 from robotboy655/machinima

Machinima-friendly changes
Facepunch · Jan 21, 2014 · f1c5eb8 · f1c5eb8
2 parents ebdb94f + 2366ebf
commit f1c5eb8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/garrysmod/gamemodes/base/entities/entities/prop_effect.lua b/garrysmod/gamemodes/base/entities/entities/prop_effect.lua
@@ -1,6 +1,10 @@
 
 AddCSLuaFile()
 
+if ( CLIENT ) then
+	CreateConVar( "cl_draweffectrings", "1", 0, "Should the effect green rings be visible?" )
+end
+
 ENT.Type = "anim"
 
 ENT.PrintName			= ""
@@ -70,6 +74,8 @@ end
    Name: Draw
 -----------------------------------------------------------]]
 function ENT:Draw()
+
+	if ( GetConVarNumber( "cl_draweffectrings" ) == 0 ) then return end
 	
 	-- Don't draw the grip if there's no chance of us picking it up
 	local ply = LocalPlayer()

diff --git a/garrysmod/gamemodes/base/gamemode/cl_deathnotice.lua b/garrysmod/gamemodes/base/gamemode/cl_deathnotice.lua
@@ -192,6 +192,8 @@ end
 
 function GM:DrawDeathNotice( x, y )
 
+	if ( GetConVarNumber( "cl_drawhud" ) == 0 ) then return end
+
 	local hud_deathnotice_time = hud_deathnotice_time:GetFloat()
 
 	x = x * ScrW()

diff --git a/garrysmod/gamemodes/sandbox/entities/entities/gmod_thruster.lua b/garrysmod/gamemodes/sandbox/entities/entities/gmod_thruster.lua
@@ -91,6 +91,8 @@ end
 
 function ENT:Draw()
 
+	if ( self.ShouldDraw == 0 ) then return end
+
 	BaseClass.Draw( self )
 
 end

diff --git a/garrysmod/lua/autorun/menubar/display_options.lua b/garrysmod/lua/autorun/menubar/display_options.lua
@@ -8,10 +8,13 @@ hook.Add( "PopulateMenuBar", "DisplayOptions_MenuBar", function( menubar )
 
 	m:AddSpacer()
 
+	m:AddCVar( "Draw HUD", "cl_drawhud", "1", "0" )
 	m:AddCVar( "Draw Freeze", "effects_freeze", "1", "0" )
+	m:AddCVar( "Draw Cameras", "cl_drawcameras", "1", "0" )
 	m:AddCVar( "Draw Unfreeze", "effects_unfreeze", "1", "0" )
 	m:AddCVar( "Draw Thrusters", "cl_drawthrusterseffects", "1", "0" )
-	m:AddCVar( "Draw Cameras", "cl_drawcameras", "1", "0" )
+	m:AddCVar( "Draw Toolgun Help", "gmod_drawhelp", "1", "0" )
+	m:AddCVar( "Draw Effect Rings", "cl_draweffectrings", "1", "0" )
 	m:AddCVar( "Draw Spawn Effect", "cl_drawspawneffect", "1", "0" )
 	m:AddCVar( "Draw World Tooltips", "cl_drawworldtooltips", "1", "0" )
 
@@ -31,4 +34,3 @@ hook.Add( "PopulateMenuBar", "DisplayOptions_MenuBar", function( menubar )
 	m:AddCVar( "Hints", "cl_showhints", "1", "0" )
 
 end )
-