Fixed/Improved thruster rendering

No longer has halo around effects, effects now draw properly over the model
Facepunch · Apr 20, 2016 · e456d6f · e456d6f
1 parent 14c4309
commit e456d6f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/garrysmod/gamemodes/sandbox/entities/entities/base_gmodentity.lua b/garrysmod/gamemodes/sandbox/entities/entities/base_gmodentity.lua
@@ -52,7 +52,6 @@ function ENT:GetOverlayText()
 
 end
 
-
 function ENT:SetPlayer( ply )
 
 	if ( IsValid(ply) ) then

diff --git a/garrysmod/gamemodes/sandbox/entities/entities/gmod_thruster.lua b/garrysmod/gamemodes/sandbox/entities/entities/gmod_thruster.lua
@@ -3,7 +3,6 @@ AddCSLuaFile()
 DEFINE_BASECLASS( "base_gmodentity" )
 
 ENT.Spawnable = false
-ENT.RenderGroup = RENDERGROUP_BOTH
 
 local matHeatWave = Material( "sprites/heatwave" )
 local matFire = Material( "effects/fire_cloud1" )
@@ -88,15 +87,9 @@ function ENT:Draw()
 
 	if ( self.ShouldDraw == 0 ) then return end
 
-	BaseClass.Draw( self )
+	self:DrawModel()
 
-end
-
-function ENT:DrawTranslucent()
-
-	if ( self.ShouldDraw == 0 ) then return end
-
-	BaseClass.DrawTranslucent( self )
+	if ( halo.RenderedEntity() == self ) then return end
 
 	if ( !self:IsOn() ) then
 		self.OnStart = nil
@@ -108,7 +101,6 @@ function ENT:DrawTranslucent()
 
 	local EffectThink = self[ "EffectDraw_" .. self:GetEffect() ]
 	if ( EffectThink ) then EffectThink( self ) end
-
 end
 
 function ENT:Think()