diff options
| author | Alexander Pickering <alexandermpickering@gmail.com> | 2016-05-29 20:33:29 -0400 |
|---|---|---|
| committer | Alexander Pickering <alexandermpickering@gmail.com> | 2016-05-29 20:33:29 -0400 |
| commit | af7ee9e0e69e4f8f0a09f2795f5cde14e738a8b1 (patch) | |
| tree | 2da23880f562ff5682769728ff5e767e708108a3 | |
| parent | 14514c06cf8101b949dcc37499acbb50b8aebb25 (diff) | |
| download | wintersurvival2-af7ee9e0e69e4f8f0a09f2795f5cde14e738a8b1.tar.gz wintersurvival2-af7ee9e0e69e4f8f0a09f2795f5cde14e738a8b1.tar.bz2 wintersurvival2-af7ee9e0e69e4f8f0a09f2795f5cde14e738a8b1.zip | |
Removed shop
| -rw-r--r-- | entities/entities/ws_shop/cl_init.lua | 12 | ||||
| -rw-r--r-- | entities/entities/ws_shop/init.lua | 16 | ||||
| -rw-r--r-- | entities/entities/ws_shop/shared.lua | 5 | ||||
| -rw-r--r-- | gamemode/server/world.lua | 13 |
4 files changed, 0 insertions, 46 deletions
diff --git a/entities/entities/ws_shop/cl_init.lua b/entities/entities/ws_shop/cl_init.lua deleted file mode 100644 index 4185da9..0000000 --- a/entities/entities/ws_shop/cl_init.lua +++ /dev/null @@ -1,12 +0,0 @@ -include('shared.lua')
-
-local Col = Color(0,0,0,150)
-
-function ENT:Draw()
- self:DrawModel()
-
- cam.Start3D2D(self:GetPos()+self:GetUp()*50,Angle(0,CurTime()*40,90),0.3)
- DrawRect(-100,0,200,20,Col)
- DrawText("Shop (To be announced!)","Trebuchet18",0,10,MAIN_TEXTCOLOR,1)
- cam.End3D2D()
-end
diff --git a/entities/entities/ws_shop/init.lua b/entities/entities/ws_shop/init.lua deleted file mode 100644 index ea0e5e8..0000000 --- a/entities/entities/ws_shop/init.lua +++ /dev/null @@ -1,16 +0,0 @@ -AddCSLuaFile("cl_init.lua")
-AddCSLuaFile("shared.lua")
-
-include('shared.lua')
-
-function ENT:Initialize()
- self:SetModel("models/props_junk/wood_crate001a.mdl")
- self:PhysicsInit(SOLID_VPHYSICS)
- self:SetMoveType(MOVETYPE_NONE)
- self:SetSolid(SOLID_VPHYSICS)
-
- local phys = self:GetPhysicsObject()
- phys:EnableMotion(false)
- phys:Sleep()
-end
-
diff --git a/entities/entities/ws_shop/shared.lua b/entities/entities/ws_shop/shared.lua deleted file mode 100644 index e67f5f4..0000000 --- a/entities/entities/ws_shop/shared.lua +++ /dev/null @@ -1,5 +0,0 @@ -ENT.Type = "anim"
-ENT.Base = "base_anim"
-
-function ENT:OnRemove()
-end
diff --git a/gamemode/server/world.lua b/gamemode/server/world.lua index 9d23c7b..fb8f662 100644 --- a/gamemode/server/world.lua +++ b/gamemode/server/world.lua @@ -42,19 +42,6 @@ function GM:GeneratePropRain() drop:GetPhysicsObject():Sleep()
end
end
-
- --Shop spawn
- local V = Vector(random(pB.x,pA.x),random(pB.y,pA.y),random(pB.z,pA.z))
- local Tr = traceline({start=V,endpos=V-Up*40000})
- local Pos = Tr.HitPos+Up*20
- local C = contents(Pos)
-
- if (C != CONTENTS_WATER and C != CONTENTS_WATER+CONTENTS_TRANSLUCENT) then
- local drop = ents.Create("ws_shop")
- drop:SetPos(Pos)
- drop:Spawn()
- drop:Activate()
- end
end
--END... Newer versions of maps should use a brush entity instead.
end
|