From 34803db3cdc8b54c9e1ad9044b6b3d71a1ebd305 Mon Sep 17 00:00:00 2001 From: silversurfer Date: Thu, 26 Feb 2015 17:14:52 +0000 Subject: [PATCH] fix: - alternative heli fuel system read the wrong parameters from Helicopter_Settings.INI - when alternative heli fuel system was turned off the heli wouldn't refuel at all despite being at a refuel site git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7754 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameSettings.cpp | 4 ++-- Strategic/Map Screen Helicopter.cpp | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/GameSettings.cpp b/GameSettings.cpp index 84ab6019..625c1776 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -3456,8 +3456,8 @@ void LoadHelicopterRepairRefuelSettings() gHelicopterSettings.usHelicopterSeriousRepairCostMax = iniReader.ReadInteger("Helicopter Repair Settings","HELICOPTER_SERIOUS_REPAIR_COST_MAX", 25000, 0, 100000); gHelicopterSettings.ubHelicopterDistanceWithoutRefuel = iniReader.ReadInteger("Helicopter Refuel Settings","HELICOPTER_DISTANCE_WITHOUT_REFUEL", 25, 0, 255); - gHelicopterSettings.ubHelicopterHoverTimePerFuelUnit = iniReader.ReadInteger("Helicopter Refuel Settings","HELICOPTER_DISTANCE_WITHOUT_REFUEL", 10, 0, 255); - gHelicopterSettings.ubHelicopterRefuelTime = iniReader.ReadInteger("Helicopter Refuel Settings","HELICOPTER_DISTANCE_WITHOUT_REFUEL", 30, 0, 255); + gHelicopterSettings.ubHelicopterHoverTimePerFuelUnit = iniReader.ReadInteger("Helicopter Refuel Settings","HELICOPTER_HOVER_TIME_PER_FUEL_UNIT", 10, 0, 255); + gHelicopterSettings.ubHelicopterRefuelTime = iniReader.ReadInteger("Helicopter Refuel Settings","HELICOPTER_REFUEL_TIME", 30, 0, 255); gHelicopterSettings.ubHelicopterTimeDelayForHoverWait = iniReader.ReadInteger("Helicopter Refuel Settings","HELICOPTER_TIME_DELAY_FOR_HOVER_WAIT", 10, 0, 255); gHelicopterSettings.ubHelicopterTimeDelayForHoverWaitTooLong = iniReader.ReadInteger("Helicopter Refuel Settings","HELICOPTER_TIME_DELAY_FOR_HOVER_WAIT_TOO_LONG", 20, 0, 255); diff --git a/Strategic/Map Screen Helicopter.cpp b/Strategic/Map Screen Helicopter.cpp index 2f34b566..a7b1ba28 100644 --- a/Strategic/Map Screen Helicopter.cpp +++ b/Strategic/Map Screen Helicopter.cpp @@ -937,6 +937,12 @@ void ReFuelHelicopter( void ) // reset hover time gubHelicopterHoverTime = 0; } + else + { + // refuel instantly + iTotalHeliDistanceSinceRefuel = 0; + AddStrategicEvent( EVENT_HELICOPTER_REFUEL_FOR_A_MINUTE, GetWorldTotalMin(), 0 ); + } return; }