openttd-ottdgrfs: comparison src/vehicle.h

equal deleted inserted replaced

-:70d78ac95d6c
+:7bd07f43b0e3
 	RVSB_TRACKDIR_MASK           = 0x0F,                      ///< The mask used to extract track dirs
 	RVSB_ROAD_STOP_TRACKDIR_MASK = 0x09                       ///< Only bits 0 and 3 are used to encode the trackdir for road stops
 };
 enum {
-	VEH_Train,
+	VEH_TRAIN,
-	VEH_Road,
+	VEH_ROAD,
-	VEH_Ship,
+	VEH_SHIP,
-	VEH_Aircraft,
+	VEH_AIRCRAFT,
-	VEH_Special,
+	VEH_SPECIAL,
-	VEH_Disaster,
+	VEH_DISASTER,
-	VEH_Invalid = 0xFF,
+	VEH_INVALID = 0xFF,
 } ;
 enum VehStatus {
 	VS_HIDDEN          = 0x01,
 	VS_STOPPED         = 0x02,
 	VF_CARGO_UNLOADING,
 	VF_BUILT_AS_PROTOTYPE,
 };
 /* Effect vehicle types */
-typedef enum EffectVehicle {
+enum EffectVehicle {
 	EV_CHIMNEY_SMOKE   = 0,
 	EV_STEAM_SMOKE     = 1,
 	EV_DIESEL_SMOKE    = 2,
 	EV_ELECTRIC_SPARK  = 3,
 	EV_SMOKE           = 4,
 	EV_EXPLOSION_LARGE = 5,
 	EV_BREAKDOWN_SMOKE = 6,
 	EV_EXPLOSION_SMALL = 7,
 	EV_BULLDOZER       = 8,
 	EV_BUBBLE          = 9
-} EffectVehicle;
+};
-typedef struct VehicleRail {
+struct VehicleRail {
 	uint16 last_speed; // NOSAVE: only used in UI
 	uint16 crash_anim_pos;
 	uint16 days_since_order_progr;
 	// cached values, recalculated on load and each time a vehicle is added to/removed from the consist.
 	byte flags;
 	// Link between the two ends of a multiheaded engine
 	Vehicle *other_multiheaded_part;
-} VehicleRail;
+};
 enum {
 	VRF_REVERSING         = 0,
 	// used to calculate if train is going up or down
 	// used to mark that electric train engine is allowed to run on normal rail
 	VRF_EL_ENGINE_ALLOWED_NORMAL_RAIL = 6,
 };
-typedef struct VehicleAir {
+struct VehicleAir {
 	uint16 crashed_counter;
 	byte pos;
 	byte previous_pos;
 	StationID targetairport;
 	byte state;
-} VehicleAir;
+};
-typedef struct VehicleRoad {
+struct VehicleRoad {
 	byte state;             /// @see RoadVehicleStates
 	byte frame;
 	uint16 blocked_ctr;
 	byte overtaking;
 	byte overtaking_ctr;
 	uint16 crashed_ctr;
 	byte reverse_ctr;
 	struct RoadStop *slot;
 	byte slot_age;
-} VehicleRoad;
+};
-typedef struct VehicleSpecial {
+struct VehicleSpecial {
 	uint16 unk0;
 	byte unk2;
-} VehicleSpecial;
+};
-typedef struct VehicleDisaster {
+struct VehicleDisaster {
 	uint16 image_override;
 	uint16 unk2;
-} VehicleDisaster;
+};
-typedef struct VehicleShip {
+struct VehicleShip {
 	TrackBitsByte state;
-} VehicleShip;
+};
 struct Vehicle {
 	byte type;               // type, ie roadven,train,ship,aircraft,special
 	byte subtype;            // subtype (Filled with values from EffectVehicles/TrainSubTypes/AircraftSubTypes)
 #define IS_CUSTOM_SECONDHEAD_SPRITE(x) (x == 0xFE)
 typedef void *VehicleFromPosProc(Vehicle *v, void *data);
 void VehicleServiceInDepot(Vehicle *v);
-Vehicle *AllocateVehicle(void);
+Vehicle *AllocateVehicle();
 bool AllocateVehicles(Vehicle **vl, int num);
-Vehicle *ForceAllocateVehicle(void);
+Vehicle *ForceAllocateVehicle();
-Vehicle *ForceAllocateSpecialVehicle(void);
+Vehicle *ForceAllocateSpecialVehicle();
 void VehiclePositionChanged(Vehicle *v);
-void AfterLoadVehicles(void);
+void AfterLoadVehicles();
 Vehicle *GetLastVehicleInChain(Vehicle *v);
 Vehicle *GetPrevVehicleInChain(const Vehicle *v);
 Vehicle *GetFirstVehicleInChain(const Vehicle *v);
 uint CountVehiclesInChain(const Vehicle* v);
 bool IsEngineCountable(const Vehicle *v);
 void DeleteVehicleChain(Vehicle *v);
 void *VehicleFromPos(TileIndex tile, void *data, VehicleFromPosProc *proc);
-void CallVehicleTicks(void);
+void CallVehicleTicks();
 Vehicle *FindVehicleOnTileZ(TileIndex tile, byte z);
-void InitializeTrains(void);
+void InitializeTrains();
-byte VehicleRandomBits(void);
+byte VehicleRandomBits();
-void ResetVehiclePosHash(void);
+void ResetVehiclePosHash();
 bool CanFillVehicle(Vehicle *v);
 bool CanRefitTo(EngineID engine_type, CargoID cid_to);
 CargoID FindFirstRefittableCargo(EngineID engine_type);
 int32 GetRefitCost(EngineID engine_type);
 int32 SendAllVehiclesToDepot(byte type, uint32 flags, bool service, PlayerID owner, uint16 vlw_flag, uint32 id);
 bool IsVehicleInDepot(const Vehicle *v);
 void VehicleEnterDepot(Vehicle *v);
 void InvalidateAutoreplaceWindow(EngineID e);
+int32 MaybeReplaceVehicle(Vehicle *v, bool check, bool display_costs);
 /* Flags to add to p2 for goto depot commands */
 /* Note: bits 8-10 are used for VLW flags */
 enum {
 	DEPOT_SERVICE       = (1 << 0),	// The vehicle will leave the depot right after arrival (serivce only)
 	DEPOT_MASS_SEND     = (1 << 1), // Tells that it's a mass send to depot command (type in VLW flag)
 	DEPOT_DONT_CANCEL   = (1 << 2), // Don't cancel current goto depot command if any
 	DEPOT_LOCATE_HANGAR = (1 << 3), // Find another airport if the target one lacks a hangar
 };
-typedef struct GetNewVehiclePosResult {
+struct GetNewVehiclePosResult {
 	int x,y;
 	TileIndex old_tile;
 	TileIndex new_tile;
-} GetNewVehiclePosResult;
+};
 /**
 * Returns the Trackdir on which the vehicle is currently located.
 * Works for trains and ships.
 * Currently works only sortof for road vehicles, since they have a fuzzy
 #define BEGIN_ENUM_WAGONS(v) do {
 #define END_ENUM_WAGONS(v) } while ( (v=v->next) != NULL);
 DECLARE_OLD_POOL(Vehicle, Vehicle, 9, 125)
-static inline VehicleID GetMaxVehicleIndex(void)
+static inline VehicleID GetMaxVehicleIndex()
 {
 	/* TODO - This isn't the real content of the function, but
 	 *  with the new pool-system this will be replaced with one that
 	 *  _really_ returns the highest index. Now it just returns
 	 *  the next safe value we are sure about everything is below.
 	 */
 	return GetVehiclePoolSize() - 1;
 }
-static inline uint GetNumVehicles(void)
+static inline uint GetNumVehicles()
 {
 	return GetVehiclePoolSize();
 }
 /**
 * Check if a Vehicle really exists.
 */
 static inline bool IsValidVehicle(const Vehicle *v)
 {
-	return v->type != VEH_Invalid;
+	return v->type != VEH_INVALID;
 }
 void DestroyVehicle(Vehicle *v);
 static inline void DeleteVehicle(Vehicle *v)
 {
 	DestroyVehicle(v);
-	v->type = VEH_Invalid;
+	v->type = VEH_INVALID;
 }
 static inline bool IsPlayerBuildableVehicleType(byte type)
 {
 	switch (type) {
-		case VEH_Train:
+		case VEH_TRAIN:
-		case VEH_Road:
+		case VEH_ROAD:
-		case VEH_Ship:
+		case VEH_SHIP:
-		case VEH_Aircraft:
+		case VEH_AIRCRAFT:
 			return true;
 	}
 	return false;
 }

branch	gamebalance
changeset 9895	7bd07f43b0e3
parent 6524	44e22a9b2c97
child 9908	0fa543611bbe