Tweak handling of class models

This should be consistent with everything else now, but if this somehow breaks a third-party fuel tank class then it can be changed later
ACF-Team · Nov 28, 2023 · d5b5de8 · d5b5de8
1 parent 9b63447
commit d5b5de8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/lua/acf/core/classes/fuel_tanks/registration.lua b/lua/acf/core/classes/fuel_tanks/registration.lua
@@ -22,10 +22,6 @@ end
 function FuelTanks.RegisterItem(ID, ClassID, Data)
 	local Class = Classes.AddGroupItem(ID, ClassID, Entries, Data)
 
-	if Class.Model == nil then
-		Class.Model = "models/fueltank/fueltank_4x4x4.mdl"
-	end
-
 	if Class.Name == nil then
 		Class.Name = "Fuel Box"
 	end

diff --git a/lua/acf/menu/items_cl/engines.lua b/lua/acf/menu/items_cl/engines.lua
@@ -202,8 +202,8 @@ local function CreateMenu(Menu)
 
 		ACF.SetClientData("FuelTank", Data.ID)
 
-		FuelPreview:UpdateModel(ClassData.Model or Data.Model)
-		FuelPreview:UpdateSettings(ClassData.Preview or Data.Preview)
+		FuelPreview:UpdateModel(Data.Model or ClassData.Model)
+		FuelPreview:UpdateSettings(Data.Preview or ClassData.Preview)
 
 		FuelType:UpdateFuelText()
 	end

diff --git a/lua/entities/acf_fueltank/init.lua b/lua/entities/acf_fueltank/init.lua
@@ -109,7 +109,7 @@ do -- Spawn and Update functions
 		local Percentage = Entity.Capacity and Entity.Fuel / Entity.Capacity or 1
 
 		Entity.ACF = Entity.ACF or {}
-		Entity.ACF.Model = Class.Model or FuelTank and FuelTank.Model -- Must be set before changing model
+		Entity.ACF.Model = FuelTank and FuelTank.Model or Class.Model -- Must be set before changing model
 		Entity.ClassData = Class
 
 		if Class.IsScalable then