Index: src/client/cl_campaign.h =================================================================== --- src/client/cl_campaign.h (revision 19129) +++ src/client/cl_campaign.h (working copy) @@ -323,21 +323,6 @@ MA_UFORADAR /**< ufos are in our radar */ } mapAction_t; -/** possible aircraft states */ -typedef enum aircraftStatus_s { - AIR_NONE = 0, - AIR_REFUEL, /**< refill fuel */ - AIR_HOME, /**< in homebase */ - AIR_IDLE, /**< just sit there on geoscape */ - AIR_TRANSIT, /**< moving */ - AIR_MISSION, /**< moving to a mission */ - AIR_UFO, /**< pursuing a UFO - also used for ufos that are pursuing an aircraft */ - AIR_DROP, /**< ready to drop down */ - AIR_INTERCEPT, /**< ready to intercept */ - AIR_TRANSFER, /**< being transfered */ - AIR_RETURNING /**< returning to homebase */ -} aircraftStatus_t; - extern mission_t *selectedMission; extern campaign_t *curCampaign; extern ccs_t ccs; Index: src/client/cl_aircraft.c =================================================================== --- src/client/cl_aircraft.c (revision 19129) +++ src/client/cl_aircraft.c (working copy) @@ -1199,10 +1199,11 @@ radarOverlayReset = qtrue; } else if (aircraft->status == AIR_REFUEL) { /* Aircraft is refueling at base */ - aircraft->fuel += dt; + aircraft->fuel += dt * AIRCRAFT_REFUEL_FACTOR; if (aircraft->fuel >= aircraft->stats[AIR_STATS_FUELSIZE]) { aircraft->fuel = aircraft->stats[AIR_STATS_FUELSIZE]; aircraft->status = AIR_HOME; + MN_AddNewMessage(_("Notice"), va(_("Your %s is refueled at base %s."), aircraft->name, aircraft->homebase->name), qfalse, MSG_STANDARD, NULL); } } Index: src/client/cl_aircraft.h =================================================================== --- src/client/cl_aircraft.h (revision 19129) +++ src/client/cl_aircraft.h (working copy) @@ -35,6 +35,9 @@ /** Invalid aircraft index in base-list of aircraft. */ #define AIRCRAFT_INBASE_INVALID -1 +/** factor to speed up refueling */ +#define AIRCRAFT_REFUEL_FACTOR 16 + /** @brief A path on the map described by 2D points */ typedef struct mapline_s { int numPoints; /**< number of points that make up this path */ @@ -145,6 +148,21 @@ UFO_MAX } ufoType_t; +/** possible aircraft states */ +typedef enum aircraftStatus_s { + AIR_NONE = 0, + AIR_REFUEL, /**< refill fuel */ + AIR_HOME, /**< in homebase */ + AIR_IDLE, /**< just sit there on geoscape */ + AIR_TRANSIT, /**< moving */ + AIR_MISSION, /**< moving to a mission */ + AIR_UFO, /**< pursuing a UFO - also used for ufos that are pursuing an aircraft */ + AIR_DROP, /**< ready to drop down */ + AIR_INTERCEPT, /**< ready to intercept */ + AIR_TRANSFER, /**< being transfered */ + AIR_RETURNING /**< returning to homebase */ +} aircraftStatus_t; + /** @brief An aircraft with all it's data */ typedef struct aircraft_s { int idx; /**< Global index of this aircraft. See also gd.numAircraft and AIRCRAFT_INVALID