Committed Bull's new button models.

tmahring · Mar 16, 2011 · 0e72534 · 0e72534
1 parent 74d03ab
commit 0e72534
Showing 1 changed file with 21 additions and 18 deletions.
diff --git a/lua/entities/gmod_wire_button/init.lua b/lua/entities/gmod_wire_button/init.lua
@@ -16,17 +16,20 @@ local anims = {
 	["models/props_mining/freightelevatorbutton01.mdl"] = { 1, 2 },
 	["models/props_mining/freightelevatorbutton02.mdl"] = { 1, 2 },
 	["models/props_mining/switch01.mdl"] = { 1, 2 },
+	["models/bull/buttons/rocker_switch.mdl"] = { 1, 2 },
+	["models/bull/buttons/toggle_switch.mdl"] = { 1, 2 },
+	["models/bull/buttons/key_switch.mdl"] = { 1, 2 },
 	["models/props_mining/switch_updown01.mdl"] = { 2, 3 },
 }
 
 function ENT:Initialize()
-	self:PhysicsInit( SOLID_VPHYSICS )
-	self:SetMoveType( MOVETYPE_VPHYSICS )
-	self:SetSolid( SOLID_VPHYSICS )
-	self:SetUseType( SIMPLE_USE )
+	self.Entity:PhysicsInit( SOLID_VPHYSICS )
+	self.Entity:SetMoveType( MOVETYPE_VPHYSICS )
+	self.Entity:SetSolid( SOLID_VPHYSICS )
+	self.Entity:SetUseType( SIMPLE_USE )
 
-	self.Outputs = Wire_CreateOutputs(self, { "Out" })
-	self.Inputs = Wire_CreateInputs(self, { "Set" })
+	self.Outputs = Wire_CreateOutputs(self.Entity, { "Out" })
+	self.Inputs = Wire_CreateInputs(self.Entity, { "Set" })
 	local anim = anims[self:GetModel()]
 	if anim then self:SetSequence(anim[2]) end
 end
@@ -71,7 +74,7 @@ function ENT:Think()
 			self.podpress = nil
 		end
 
-		self:NextThink(CurTime()+0.05)
+		self.Entity:NextThink(CurTime()+0.05)
 		return true
 	end
 end
@@ -85,27 +88,27 @@ function ENT:Setup(toggle, value_off, value_on, entityout)
 	self:SetOn( false )
 
 	self:ShowOutput(self.value_off)
-	Wire_TriggerOutput(self, "Out", self.value_off)
+	Wire_TriggerOutput(self.Entity, "Out", self.value_off)
 
 	if entityout then
-		WireLib.AdjustSpecialOutputs(self, { "Out", "EntID" , "Entity" }, { "NORMAL", "NORMAL" , "ENTITY" })
-		Wire_TriggerOutput(self, "EntID", 0)
-		Wire_TriggerOutput(self, "Entity", nil)
+		WireLib.AdjustSpecialOutputs(self.Entity, { "Out", "EntID" , "Entity" }, { "NORMAL", "NORMAL" , "ENTITY" })
+		Wire_TriggerOutput(self.Entity, "EntID", 0)
+		Wire_TriggerOutput(self.Entity, "Entity", nil)
 		self.OutputEntID=true
 	else
-		Wire_AdjustOutputs(self, { "Out" })
+		Wire_AdjustOutputs(self.Entity, { "Out" })
 		self.OutputEntID=false
 	end
 
 	if toggle then
-		Wire_AdjustInputs(self, { "Set" })
+		Wire_AdjustInputs(self.Entity, { "Set" })
 	else
-		Wire_AdjustInputs(self, {})
+		Wire_AdjustInputs(self.Entity, {})
 	end
 end
 
 function ENT:Switch(on)
-	if (not self:IsValid()) then return end
+	if (not self.Entity:IsValid()) then return end
 
 	self:SetOn( on )
 
@@ -125,10 +128,10 @@ function ENT:Switch(on)
 		if self.OutputEntID then self.EntToOutput = NULL end
 	end
 
-	Wire_TriggerOutput(self, "Out", self.Value)
+	Wire_TriggerOutput(self.Entity, "Out", self.Value)
 	if self.OutputEntID then
-		Wire_TriggerOutput(self, "EntID", self.EntToOutput:EntIndex())
-		Wire_TriggerOutput(self, "Entity", self.EntToOutput)
+		Wire_TriggerOutput(self.Entity, "EntID", self.EntToOutput:EntIndex())
+		Wire_TriggerOutput(self.Entity, "Entity", self.EntToOutput)
 	end
 	return true
 end