Merge pull request #572 from robotboy655/emitter

Tool fixes
Facepunch · Jan 21, 2014 · ebdb94f · ebdb94f
2 parents 99ae118 + 9aebac4
commit ebdb94f
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 27 deletions.
diff --git a/garrysmod/gamemodes/sandbox/entities/entities/gmod_cameraprop.lua b/garrysmod/gamemodes/sandbox/entities/entities/gmod_cameraprop.lua
@@ -74,13 +74,10 @@ function ENT:SetLocked( locked )
 	
 		self.PhysgunDisabled = true
 		
-		local phys = self:GetPhysicsObject()
-		if ( phys:IsValid() ) then
-			phys:EnableMotion( false )
-		end
-		
 		self:SetMoveType( MOVETYPE_NONE )
 		self:SetSolid( SOLID_BBOX )
+		
+		self:SetCollisionGroup( COLLISION_GROUP_WORLD )
 	
 	else
 	
@@ -217,7 +214,7 @@ end
 
 function ENT:Draw()	
 
-	if ( self.ShouldDraw == 0 ) then return end
+	if ( GetConVarNumber( "cl_drawcameras" ) == 0 ) then return end
 
 	-- Don't draw the camera if we're taking pics
 	local ply = LocalPlayer()

diff --git a/garrysmod/gamemodes/sandbox/entities/weapons/gmod_tool/stools/camera.lua b/garrysmod/gamemodes/sandbox/entities/weapons/gmod_tool/stools/camera.lua
@@ -14,27 +14,26 @@ local function MakeCamera( ply, key, locked, toggle, Data )
 
 	if ( !IsValid( ent ) ) then return end
 
-	if ( key && IsValid( ply ) && IsValid( ply[ "Camera"..key ] ) ) then
-		ply[ "Camera"..key ]:Remove();
-		ply[ "Camera"..key ] = nil
-	end	
-
 	duplicator.DoGeneric( ent, Data )
 
 	if ( key ) then 
+		for id, camera in pairs( ents.FindByClass( "gmod_cameraprop" ) ) do
+			if ( camera.controlkey && camera.controlkey == key ) then
+				camera:Remove()
+			end
+		end
+
 		ent:SetKey( key ) 
-		ent.controlkey	= key
+		ent.controlkey = key
 	end
 
 	ent:SetPlayer( ply )
-
 
 	ent.toggle		= toggle
 	ent.locked		= locked
-
 
 	ent:Spawn()
-		
+
 	ent:SetTracking( NULL, Vector(0) )
 	ent:SetLocked( locked )
 
@@ -54,10 +53,6 @@ local function MakeCamera( ply, key, locked, toggle, Data )
 
 		ply:AddCleanup( "cameras", ent )
 
-		if ( key ) then
-			ply[ "Camera"..key ] = ent
-		end
-
 	end
 
 	return ent

diff --git a/garrysmod/gamemodes/sandbox/entities/weapons/gmod_tool/stools/emitter.lua b/garrysmod/gamemodes/sandbox/entities/weapons/gmod_tool/stools/emitter.lua
@@ -110,7 +110,7 @@ if ( SERVER ) then
 		emitter:SetDelay( delay )
 		emitter:SetToggle( toggle )
 		emitter:SetOn( starton )
-		emitter:SetScale( scale )
+		emitter:SetScale( scale or 1 )
 
 		emitter:Spawn()
 

diff --git a/garrysmod/gamemodes/sandbox/entities/weapons/gmod_tool/stools/trails.lua b/garrysmod/gamemodes/sandbox/entities/weapons/gmod_tool/stools/trails.lua
@@ -17,7 +17,7 @@ cleanup.Register( "trails" )
 
 local function SetTrails( Player, Entity, Data )
 
-	if ( Entity.SToolTrail ) then
+	if ( IsValid( Entity.SToolTrail ) ) then
 
 		Entity.SToolTrail:Remove()
 		Entity.SToolTrail = nil
@@ -96,14 +96,17 @@ function TOOL:LeftClick( trace )
 
 	end
 
-	local Trail = SetTrails( self:GetOwner(), trace.Entity, { Color = Color( r, g, b, a ), 
-																	Length = length, 
-																	StartSize = startsize, 
-																	EndSize = endsize,
-																	Material = Mat } )
+	local Trail = SetTrails( self:GetOwner(), trace.Entity, {
+		Color = Color( r, g, b, a ), 
+		Length = length, 
+		StartSize = startsize, 
+		EndSize = endsize,
+		Material = Mat
+	} )
+
 	undo.Create("Trail")
 		undo.AddEntity( Trail )
-		undo.SetPlayer( ply )
+		undo.SetPlayer( self:GetOwner() )
 	undo.Finish()
 
 	return true