icedream
/
gmod-disguiser
mirror of https://github.com/icedream/gmod-disguiser.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Only avoid disguising when color also matches. Fixes #7. Also removed AllowFullRotation code.

master
Icedream 2013-12-21 20:29:06 +01:00
parent 6104749c32
commit 72f305e004
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lua/weapons/disguiser/init.lua
View File

@ -105,7 +105,9 @@ function SWEP:Disguise(entity)
local owner = self.Owner local owner = self.Owner
// Make sure we aren't already that model // Make sure we aren't already that model
if (owner:GetModel() == entity:GetModel() && owner:GetSkin() == entity:GetSkin()) then return true end if (owner:GetModel() == entity:GetModel()
&& owner:GetSkin() == entity:GetSkin()
&& owner:GetColor() == entity:GetColor()) then return true end
// Make sure the new model is actually marked as a prop // Make sure the new model is actually marked as a prop
if ( if (
@ -125,7 +127,6 @@ function SWEP:Disguise(entity)
self.UndisguiseAsColor = owner:GetColor() self.UndisguiseAsColor = owner:GetColor()
self.UndisguiseAsBloodColor = owner:GetBloodColor() self.UndisguiseAsBloodColor = owner:GetBloodColor()
self.UndisguiseAsSolid = owner:GetSolid() self.UndisguiseAsSolid = owner:GetSolid()
self.UndisguiseAsFullRotation = owner:GetAllowFullRotation()
end end
// Disguise as given model // Disguise as given model
@ -212,7 +213,6 @@ function SWEP:Undisguise()
end end
owner:SetColor(self.UndisguiseAsColor) owner:SetColor(self.UndisguiseAsColor)
owner:SetSolid(self.UndisguiseAsSolid) owner:SetSolid(self.UndisguiseAsSolid)
owner:SetAllowFullRotation(self.UndisguiseAsFullRotation) // up/down rotation
owner:SetBloodColor(self.UndisguiseAsBloodColor) owner:SetBloodColor(self.UndisguiseAsBloodColor)
// Revert to old physics // Revert to old physics