File diff r23496:661d21df67d7 → r23497:a0ab44ebd2fa
src/newgrf_engine.h
Show inline comments
 
@@ -37,15 +37,15 @@ struct VehicleScopeResolver : public Sco
 
		: ScopeResolver(ro), v(v), self_type(engine_type), info_view(info_view)
 
	{
 
	}
 

	
 
	void SetVehicle(const Vehicle *v) { this->v = v; }
 

	
 
	/* virtual */ uint32 GetRandomBits() const;
 
	/* virtual */ uint32 GetVariable(byte variable, uint32 parameter, bool *available) const;
 
	/* virtual */ uint32 GetTriggers() const;
 
	uint32 GetRandomBits() const override;
 
	uint32 GetVariable(byte variable, uint32 parameter, bool *available) const override;
 
	uint32 GetTriggers() const override;
 
};
 

	
 
/** Resolver for a vehicle (chain) */
 
struct VehicleResolverObject : public ResolverObject {
 
	/** Application of 'wagon overrides'. */
 
	enum WagonOverride {
 
@@ -61,15 +61,15 @@ struct VehicleResolverObject : public Re
 
	VehicleScopeResolver relative_scope; ///< Scope resolver for an other vehicle in the chain.
 
	byte cached_relative_count;          ///< Relative position of the other vehicle.
 

	
 
	VehicleResolverObject(EngineID engine_type, const Vehicle *v, WagonOverride wagon_override, bool info_view = false,
 
			CallbackID callback = CBID_NO_CALLBACK, uint32 callback_param1 = 0, uint32 callback_param2 = 0);
 

	
 
	/* virtual */ ScopeResolver *GetScope(VarSpriteGroupScope scope = VSG_SCOPE_SELF, byte relative = 0);
 
	ScopeResolver *GetScope(VarSpriteGroupScope scope = VSG_SCOPE_SELF, byte relative = 0) override;
 

	
 
	/* virtual */ const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const;
 
	const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const override;
 
};
 

	
 
static const uint TRAININFO_DEFAULT_VEHICLE_WIDTH   = 29;
 
static const uint ROADVEHINFO_DEFAULT_VEHICLE_WIDTH = 32;
 
static const uint VEHICLEINFO_FULL_VEHICLE_WIDTH    = 32;