Changeset - r19149:5ee950f53f03
[Not reviewed]
master
0 3 0
yexo - 13 years ago 2012-03-14 20:49:54
yexo@openttd.org
(svn r24029) -Change: [NoAI] make AIEngine::IsArticulated return true if the articulated callback flag is set, don't try to run the callback.
3 files changed with 12 insertions and 1 deletions:
0 comments (0 inline, 0 general)
src/articulated_vehicles.cpp
Show inline comments
 
@@ -55,6 +55,16 @@ static EngineID GetNextArticulatedPart(u
 
}
 

	
 
/**
 
 * Does a NewGRF report that this should be an articulated vehicle?
 
 * @param engine_type The engine to check.
 
 * @return True iff the articulated engine callback flag is set.
 
 */
 
bool IsArticulatedEngine(EngineID engine_type)
 
{
 
	return HasBit(EngInfo(engine_type)->callback_mask, CBM_VEHICLE_ARTIC_ENGINE);
 
}
 

	
 
/**
 
 * Count the number of articulated parts of an engine.
 
 * @param engine_type The engine to get the number of parts of.
 
 * @param purchase_window Whether we are in the scope of the purchase window or not, i.e. whether we cannot allocate vehicles.
src/articulated_vehicles.h
Show inline comments
 
@@ -23,6 +23,7 @@ uint32 GetUnionOfArticulatedRefitMasks(E
 
uint32 GetIntersectionOfArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type);
 
bool IsArticulatedVehicleCarryingDifferentCargoes(const Vehicle *v, CargoID *cargo_type);
 
bool IsArticulatedVehicleRefittable(EngineID engine);
 
bool IsArticulatedEngine(EngineID engine_type);
 
void CheckConsistencyOfArticulatedVehicle(const Vehicle *v);
 

	
 

	
src/script/api/script_engine.cpp
Show inline comments
 
@@ -233,7 +233,7 @@
 
	if (!IsValidEngine(engine_id)) return false;
 
	if (GetVehicleType(engine_id) != ScriptVehicle::VT_ROAD && GetVehicleType(engine_id) != ScriptVehicle::VT_RAIL) return false;
 

	
 
	return CountArticulatedParts(engine_id, true) != 0;
 
	return IsArticulatedEngine(engine_id);
 
}
 

	
 
/* static */ ScriptAirport::PlaneType ScriptEngine::GetPlaneType(EngineID engine_id)
0 comments (0 inline, 0 general)