Add taking max fuel level from handling

thers · Aug 9, 2017 · 51b02f2 · 51b02f2
1 parent 139a31f
commit 51b02f2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 403 deletions.
diff --git a/DevMenu.cs b/DevMenu.cs
@@ -19,7 +19,6 @@ public class DevMenu
         protected UIMenuItem vehicleModelId;
         protected UIMenuItem vehicleFuelTank;
         protected UIMenuItem drainFuelTank;
-        protected UIMenuItem knownVehicle;
 
         protected UIMenuItem netVehicleId;
         protected UIMenuItem netVehicleIdControl;
@@ -51,16 +50,12 @@ public DevMenu()
             vehicleModelId = new UIMenuItem("Vehicle model ID");
             vehicleModelId.Enabled = false;
 
-            knownVehicle = new UIMenuItem("Is known vehicle");
-            knownVehicle.Enabled = false;
-
             vehicleFuelTank = new UIMenuItem("Vehicle fuel tank");
             drainFuelTank = new UIMenuItem("Almost drain fuel tank");
 
             mainMenu.AddItem(position);
             mainMenu.AddItem(teleport);
             mainMenu.AddItem(deleteVehicle);
-            mainMenu.AddItem(knownVehicle);
             mainMenu.AddItem(vehicleModelId);
             mainMenu.AddItem(vehicleFuelTank);
             mainMenu.AddItem(drainFuelTank);
@@ -126,8 +121,7 @@ public void OnTick()
             if (Game.PlayerPed.IsInVehicle())
             {
                 Vehicle vehicle = Game.PlayerPed.CurrentVehicle;
-
-                knownVehicle.SetRightLabel(VehiclesPetrolTanks.dict.ContainsKey(vehicle.Model.Hash) ? "Yes" : "No");
+
                 vehicleModelId.SetRightLabel(vehicle.DisplayName.ToString());
                 vehicleFuelTank.SetRightLabel(vehicle.FuelLevel.ToString());
             }

diff --git a/FRFuel.cs b/FRFuel.cs
@@ -407,14 +407,7 @@ public void InitFuel(Vehicle vehicle)
         {
             currentVehicleFuelLevelInitialized = true;
 
-            if (VehiclesPetrolTanks.Has(vehicle))
-            {
-                fuelTankCapacity = VehiclesPetrolTanks.Get(vehicle);
-            }
-            else
-            {
-                fuelTankCapacity = 65f;
-            }
+            fuelTankCapacity = VehicleMaxFuelLevel(vehicle);
 
             if (!vehicle.HasDecor(fuelLevelPropertyName))
             {
@@ -482,14 +475,12 @@ public float VehicleFuelLevel(Vehicle vehicle)
         /// <returns></returns>
         public float VehicleMaxFuelLevel(Vehicle vehicle)
         {
-            if (VehiclesPetrolTanks.Has(vehicle))
-            {
-                return VehiclesPetrolTanks.Get(vehicle);
-            }
-            else
-            {
-                return 65f;
-            }
+            return Function.Call<float>(
+                (Hash)0x642FC12F,
+                vehicle,
+                "CHandlingData",
+                "fPetrolTankVolume"
+            );
         }
 
         /// <summary>

diff --git a/FRFuel.csproj b/FRFuel.csproj
@@ -58,7 +58,6 @@
     <Compile Include="HUD.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TinyTween.cs" />
-    <Compile Include="VehiclesPetrolTanks.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include=".gitignore" />