Entities: Replaced self.BaseClass with BaseClass (#1373)

To prevent future issues with inheritance (stack overflow) entities now
use DEFINE_BASECLASS as well

gamemodes/terrortown/entities/entities/base_ammo_ttt.lua

@@ -17,7 +17,7 @@ ENT.AmmoType = "Pistol"
 ENT.AmmoAmount = 1
 ENT.AmmoMax = 10
 ENT.AmmoEntMax = 1
-ENT.Model = Model("models/items/boxsrounds.mdl")
+ENT.Model = "models/items/boxsrounds.mdl"
 
 ---
 -- bw compat

gamemodes/terrortown/entities/entities/item_ammo_revolver_ttt.lua

@@ -2,12 +2,14 @@ if SERVER then
     AddCSLuaFile()
 end
 
+DEFINE_BASECLASS("base_ammo_ttt")
+
 ENT.Type = "anim"
 ENT.Base = "base_ammo_ttt"
 ENT.AmmoType = "AlyxGun"
 ENT.AmmoAmount = 12
 ENT.AmmoMax = 36
-ENT.Model = Model("models/items/357ammo.mdl")
+ENT.Model = "models/items/357ammo.mdl"
 ENT.AutoSpawnable = true
 ENT.spawnType = AMMO_TYPE_DEAGLE
 
@@ -17,5 +19,5 @@ function ENT:Initialize()
     -- Differentiate from rifle ammo
     self:SetColor(Color(255, 100, 100, 255))
 
-    return self.BaseClass.Initialize(self)
+    return BaseClass.Initialize(self)
 end

gamemodes/terrortown/entities/entities/ttt_beacon.lua

@@ -6,6 +6,8 @@ if SERVER then
     AddCSLuaFile()
 end
 
+DEFINE_BASECLASS("ttt_base_placeable")
+
 if CLIENT then
     ENT.Icon = "vgui/ttt/icon_beacon"
     ENT.PrintName = "Beacon"
@@ -28,7 +30,7 @@ local beaconDetectionRange = 135
 function ENT:Initialize()
     self:SetModel(self.Model)
 
-    self.BaseClass.Initialize(self)
+    BaseClass.Initialize(self)
 
     if SERVER then
         self:SetMaxHealth(100)

gamemodes/terrortown/entities/entities/ttt_c4/cl_init.lua

@@ -1,5 +1,7 @@
 -- bomb menus
 
+DEFINE_BASECLASS("ttt_base_placeable")
+
 include("shared.lua")
 
 local starttime = C4_MINIMUM_TIME
@@ -186,7 +188,7 @@ local wire_colors = {
 ---
 -- @realm client
 function WIREPANEL:Init()
-    self.BaseClass.Init(self)
+    BaseClass.Init(self)
 
     self:NoClipping(true)
     self:SetMouseInputEnabled(true)
@@ -234,7 +236,7 @@ end
 ---
 -- @realm client
 function WIREPANEL:OnCursorExited()
-    self.PaintOver = self.BaseClass.PaintOver
+    self.PaintOver = BaseClass.PaintOver
 end
 
 ---
@@ -246,7 +248,7 @@ function WIREPANEL:DoClick()
 
     self.IsCut = true
 
-    self.PaintOver = self.BaseClass.PaintOver
+    self.PaintOver = BaseClass.PaintOver
 
     self.m_Image:SetMaterial(c4_wirecut_mat)
 

gamemodes/terrortown/entities/entities/ttt_c4/shared.lua

@@ -16,6 +16,8 @@ if SERVER then
     AddCSLuaFile("shared.lua")
 end
 
+DEFINE_BASECLASS("ttt_base_placeable")
+
 if CLIENT then
     -- this entity can be DNA-sampled so we need some display info
     ENT.Icon = "vgui/ttt/icon_c4"
@@ -72,7 +74,7 @@ ENT.safeWires = nil
 -- Initializes the data
 -- @realm shared
 function ENT:SetupDataTables()
-    self.BaseClass.SetupDataTables(self)
+    BaseClass.SetupDataTables(self)
 
     self:NetworkVar("Int", 0, "ExplodeTime")
     self:NetworkVar("Bool", 0, "Armed")
@@ -84,7 +86,7 @@ end
 function ENT:Initialize()
     self:SetModel(self.Model)
 
-    self.BaseClass.Initialize(self)
+    BaseClass.Initialize(self)
 
     if SERVER then
         self:SetUseType(SIMPLE_USE)

gamemodes/terrortown/entities/entities/ttt_cse_proj.lua

@@ -7,6 +7,8 @@ if SERVER then
     AddCSLuaFile()
 end
 
+DEFINE_BASECLASS("ttt_base_placeable")
+
 ENT.Base = "ttt_base_placeable"
 ENT.Model = "models/Items/battery.mdl"
 
@@ -24,7 +26,7 @@ ENT.CanUseKey = true
 function ENT:Initialize()
     self:SetModel(self.Model)
 
-    self.BaseClass.Initialize(self)
+    BaseClass.Initialize(self)
 
     self:SetSolid(SOLID_VPHYSICS)
 

gamemodes/terrortown/entities/entities/ttt_decoy.lua

@@ -8,6 +8,8 @@ if SERVER then
     AddCSLuaFile()
 end
 
+DEFINE_BASECLASS("ttt_base_placeable")
+
 ENT.Base = "ttt_base_placeable"
 ENT.Model = "models/props_lab/reciever01b.mdl"
 ENT.CanHavePrints = false
@@ -18,7 +20,7 @@ ENT.CanUseKey = true
 function ENT:Initialize()
     self:SetModel(self.Model)
 
-    self.BaseClass.Initialize(self)
+    BaseClass.Initialize(self)
 
     if SERVER then
         self:SetMaxHealth(100)

gamemodes/terrortown/entities/entities/ttt_firegrenade_proj.lua

@@ -3,7 +3,11 @@
 -- @class ENT
 -- @section ttt_firegrenade_proj
 
-AddCSLuaFile()
+if SERVER then
+    AddCSLuaFile()
+end
+
+DEFINE_BASECLASS("ttt_basegrenade_proj")
 
 ENT.Type = "anim"
 ENT.Base = "ttt_basegrenade_proj"
@@ -22,7 +26,7 @@ function ENT:Initialize()
         self:SetDmg(25)
     end
 
-    return self.BaseClass.Initialize(self)
+    return BaseClass.Initialize(self)
 end
 
 ---

gamemodes/terrortown/entities/entities/ttt_health_station.lua

@@ -5,7 +5,11 @@
 
 if SERVER then
     AddCSLuaFile()
-else
+end
+
+DEFINE_BASECLASS("ttt_base_placeable")
+
+if CLIENT then
     ENT.Icon = "vgui/ttt/icon_health"
     ENT.PrintName = "hstation_name"
 end
@@ -27,7 +31,7 @@ ENT.HealFreq = 0.2
 ---
 -- @realm shared
 function ENT:SetupDataTables()
-    self.BaseClass.SetupDataTables(self)
+    BaseClass.SetupDataTables(self)
 
     self:NetworkVar("Int", 0, "StoredHealth")
 end
@@ -37,7 +41,7 @@ end
 function ENT:Initialize()
     self:SetModel(self.Model)
 
-    self.BaseClass.Initialize(self)
+    BaseClass.Initialize(self)
 
     local b = 32
 

gamemodes/terrortown/entities/entities/ttt_radio.lua

@@ -5,7 +5,11 @@
 
 if SERVER then
     AddCSLuaFile()
-else
+end
+
+DEFINE_BASECLASS("ttt_base_placeable")
+
+if CLIENT then
     -- this entity can be DNA-sampled so we need some display info
     ENT.Icon = "vgui/ttt/icon_radio"
     ENT.PrintName = "radio_name"
@@ -25,7 +29,7 @@ ENT.SoundDelay = 0.5
 function ENT:Initialize()
     self:SetModel(self.Model)
 
-    self.BaseClass.Initialize(self)
+    BaseClass.Initialize(self)
 
     if SERVER then
         self:SetMaxHealth(40)

gamemodes/terrortown/entities/entities/ttt_smokegrenade_proj.lua

@@ -2,7 +2,11 @@
 -- @class ENT
 -- @section ttt_smokegrenade_proj
 
-AddCSLuaFile()
+if SERVER then
+    AddCSLuaFile()
+end
+
+DEFINE_BASECLASS("ttt_basegrenade_proj")
 
 ENT.Type = "anim"
 ENT.Base = "ttt_basegrenade_proj"
@@ -17,7 +21,7 @@ function ENT:Initialize()
         self:SetRadius(20)
     end
 
-    return self.BaseClass.Initialize(self)
+    return BaseClass.Initialize(self)
 end
 
 if CLIENT then