Changeset - r11444:8fe61cd1c07a
Parent rev.
Child rev.
[Not reviewed]
master
0 4 0
rubidium - 16 years ago 2009-03-22 11:06:25
rubidium@openttd.org
(svn r15807) -Codechange: let the build vehicle gui helper function pass around left and right instead of only left and assuming infinite width.
4 files changed with 52 insertions and 53 deletions:
src/autoreplace_gui.cpp
1
1
src/build_vehicle_gui.cpp
41
42
src/vehicle_gui.cpp
7
7
src/vehicle_gui.h
3
3
0 comments (0 inline, 0 general)
src/autoreplace_gui.cpp
➞
Show inline comments
 
@@ -327,7 +327,7 @@ public:
 
			/* Also draw the details if an engine is selected */
 
			if (this->sel_engine[i] != INVALID_ENGINE) {
 
				const Widget *wi = &this->widget[i == 0 ? RVW_WIDGET_LEFT_DETAILS : RVW_WIDGET_RIGHT_DETAILS];
 
				int text_end = DrawVehiclePurchaseInfo(wi->left + 2, wi->top + 1, wi->right - wi->left - 2, this->sel_engine[i]);
 
				int text_end = DrawVehiclePurchaseInfo(wi->left + 2, wi->right - 2, wi->top + 1, this->sel_engine[i]);
 

			




	
	
	
		
 
				if (text_end > wi->bottom) {

			




	
	
	
		
 
					this->SetDirty();

			




        

    


    
    

    

        

                

                    src/build_vehicle_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -353,7 +353,7 @@ static const StringID _sort_listing[][11

			




	
	
	
		
 
	INVALID_STRING_ID

			




	
	
	
		
 
}};

			




	
	
	
		
 

			




	
	
	
		
 
static int DrawCargoCapacityInfo(int x, int y, EngineID engine, VehicleType type, bool refittable)

			




	
	
	
		
 
static int DrawCargoCapacityInfo(int left, int right, int y, EngineID engine, VehicleType type, bool refittable)

			




	
	
	
		
 
{

			




	
	
	
		
 
	uint16 *cap = GetCapacityOfArticulatedParts(engine, type);

			




	
	
	
		
 

			




	
	
		
 
@@ -363,7 +363,7 @@ static int DrawCargoCapacityInfo(int x, 

			




	
	
	
		
 
		SetDParam(0, c);

			




	
	
	
		
 
		SetDParam(1, cap[c]);

			




	
	
	
		
 
		SetDParam(2, refittable ? STR_9842_REFITTABLE : STR_EMPTY);

			




	
	
	
		
 
		DrawString(x, y, STR_PURCHASE_INFO_CAPACITY, TC_FROMSTRING);

			




	
	
	
		
 
		DrawString(left, right, y, STR_PURCHASE_INFO_CAPACITY, TC_FROMSTRING);

			




	
	
	
		
 
		y += 10;

			




	
	
	
		
 

			




	
	
	
		
 
		/* Only show as refittable once */

			




	
	
		
 
@@ -374,13 +374,13 @@ static int DrawCargoCapacityInfo(int x, 

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/* Draw rail wagon specific details */

			




	
	
	
		
 
static int DrawRailWagonPurchaseInfo(int x, int y, EngineID engine_number, const RailVehicleInfo *rvi)

			




	
	
	
		
 
static int DrawRailWagonPurchaseInfo(int left, int right, int y, EngineID engine_number, const RailVehicleInfo *rvi)

			




	
	
	
		
 
{

			




	
	
	
		
 
	const Engine *e = GetEngine(engine_number);

			




	
	
	
		
 

			




	
	
	
		
 
	/* Purchase cost */

			




	
	
	
		
 
	SetDParam(0, e->GetCost());

			




	
	
	
		
 
	DrawString(x, y, STR_PURCHASE_INFO_COST, TC_FROMSTRING);

			




	
	
	
		
 
	DrawString(left, right, y, STR_PURCHASE_INFO_COST, TC_FROMSTRING);

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 

			




	
	
	
		
 
	/* Wagon weight - (including cargo) */

			




	
	
		
 
@@ -388,7 +388,7 @@ static int DrawRailWagonPurchaseInfo(int

			




	
	
	
		
 
	SetDParam(0, weight);

			




	
	
	
		
 
	uint cargo_weight = (e->CanCarryCargo() ? GetCargo(e->GetDefaultCargoType())->weight * e->GetDisplayDefaultCapacity() >> 4 : 0);

			




	
	
	
		
 
	SetDParam(1, cargo_weight + weight);

			




	
	
	
		
 
	DrawString(x, y, STR_PURCHASE_INFO_WEIGHT_CWEIGHT, TC_FROMSTRING);

			




	
	
	
		
 
	DrawString(left, right, y, STR_PURCHASE_INFO_WEIGHT_CWEIGHT, TC_FROMSTRING);

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 

			




	
	
	
		
 
	/* Wagon speed limit, displayed if above zero */

			




	
	
		
 
@@ -396,7 +396,7 @@ static int DrawRailWagonPurchaseInfo(int

			




	
	
	
		
 
		uint max_speed = e->GetDisplayMaxSpeed();

			




	
	
	
		
 
		if (max_speed > 0) {

			




	
	
	
		
 
			SetDParam(0, max_speed);

			




	
	
	
		
 
			DrawString(x, y, STR_PURCHASE_INFO_SPEED, TC_FROMSTRING);

			




	
	
	
		
 
			DrawString(left, right, y, STR_PURCHASE_INFO_SPEED, TC_FROMSTRING);

			




	
	
	
		
 
			y += 10;

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




	
	
		
 
@@ -404,7 +404,7 @@ static int DrawRailWagonPurchaseInfo(int

			




	
	
	
		
 
	/* Running cost */

			




	
	
	
		
 
	if (rvi->running_cost_class != 0xFF) {

			




	
	
	
		
 
		SetDParam(0, e->GetRunningCost());

			




	
	
	
		
 
		DrawString(x, y, STR_PURCHASE_INFO_RUNNINGCOST, TC_FROMSTRING);

			




	
	
	
		
 
		DrawString(left, right, y, STR_PURCHASE_INFO_RUNNINGCOST, TC_FROMSTRING);

			




	
	
	
		
 
		y += 10;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
		
 
@@ -412,33 +412,33 @@ static int DrawRailWagonPurchaseInfo(int

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/* Draw locomotive specific details */

			




	
	
	
		
 
static int DrawRailEnginePurchaseInfo(int x, int y, EngineID engine_number, const RailVehicleInfo *rvi)

			




	
	
	
		
 
static int DrawRailEnginePurchaseInfo(int left, int right, int y, EngineID engine_number, const RailVehicleInfo *rvi)

			




	
	
	
		
 
{

			




	
	
	
		
 
	const Engine *e = GetEngine(engine_number);

			




	
	
	
		
 

			




	
	
	
		
 
	/* Purchase Cost - Engine weight */

			




	
	
	
		
 
	SetDParam(0, e->GetCost());

			




	
	
	
		
 
	SetDParam(1, e->GetDisplayWeight());

			




	
	
	
		
 
	DrawString(x, y, STR_PURCHASE_INFO_COST_WEIGHT, TC_FROMSTRING);

			




	
	
	
		
 
	DrawString(left, right, y, STR_PURCHASE_INFO_COST_WEIGHT, TC_FROMSTRING);

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 

			




	
	
	
		
 
	/* Max speed - Engine power */

			




	
	
	
		
 
	SetDParam(0, e->GetDisplayMaxSpeed());

			




	
	
	
		
 
	SetDParam(1, e->GetPower());

			




	
	
	
		
 
	DrawString(x, y, STR_PURCHASE_INFO_SPEED_POWER, TC_FROMSTRING);

			




	
	
	
		
 
	DrawString(left, right, y, STR_PURCHASE_INFO_SPEED_POWER, TC_FROMSTRING);

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 

			




	
	
	
		
 
	/* Max tractive effort - not applicable if old acceleration or maglev */

			




	
	
	
		
 
	if (_settings_game.vehicle.train_acceleration_model != TAM_ORIGINAL && rvi->railtype != RAILTYPE_MAGLEV) {

			




	
	
	
		
 
		SetDParam(0, e->GetDisplayMaxTractiveEffort());

			




	
	
	
		
 
		DrawString(x, y, STR_PURCHASE_INFO_MAX_TE, TC_FROMSTRING);

			




	
	
	
		
 
		DrawString(left, right, y, STR_PURCHASE_INFO_MAX_TE, TC_FROMSTRING);

			




	
	
	
		
 
		y += 10;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	/* Running cost */

			




	
	
	
		
 
	if (rvi->running_cost_class != 0xFF) {

			




	
	
	
		
 
		SetDParam(0, e->GetRunningCost());

			




	
	
	
		
 
		DrawString(x, y, STR_PURCHASE_INFO_RUNNINGCOST, TC_FROMSTRING);

			




	
	
	
		
 
		DrawString(left, right, y, STR_PURCHASE_INFO_RUNNINGCOST, TC_FROMSTRING);

			




	
	
	
		
 
		y += 10;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
		
 
@@ -446,7 +446,7 @@ static int DrawRailEnginePurchaseInfo(in

			




	
	
	
		
 
	if (rvi->pow_wag_power != 0) {

			




	
	
	
		
 
		SetDParam(0, rvi->pow_wag_power);

			




	
	
	
		
 
		SetDParam(1, rvi->pow_wag_weight);

			




	
	
	
		
 
		DrawString(x, y, STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT, TC_FROMSTRING);

			




	
	
	
		
 
		DrawString(left, right, y, STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT, TC_FROMSTRING);

			




	
	
	
		
 
		y += 10;

			




	
	
	
		
 
	};

			




	
	
	
		
 

			




	
	
		
 
@@ -454,52 +454,52 @@ static int DrawRailEnginePurchaseInfo(in

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/* Draw road vehicle specific details */

			




	
	
	
		
 
static int DrawRoadVehPurchaseInfo(int x, int y, EngineID engine_number)

			




	
	
	
		
 
static int DrawRoadVehPurchaseInfo(int left, int right, int y, EngineID engine_number)

			




	
	
	
		
 
{

			




	
	
	
		
 
	const Engine *e = GetEngine(engine_number);

			




	
	
	
		
 

			




	
	
	
		
 
	/* Purchase cost - Max speed */

			




	
	
	
		
 
	SetDParam(0, e->GetCost());

			




	
	
	
		
 
	SetDParam(1, e->GetDisplayMaxSpeed());

			




	
	
	
		
 
	DrawString(x, y, STR_PURCHASE_INFO_COST_SPEED, TC_FROMSTRING);

			




	
	
	
		
 
	DrawString(left, right, y, STR_PURCHASE_INFO_COST_SPEED, TC_FROMSTRING);

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 

			




	
	
	
		
 
	/* Running cost */

			




	
	
	
		
 
	SetDParam(0, e->GetRunningCost());

			




	
	
	
		
 
	DrawString(x, y, STR_PURCHASE_INFO_RUNNINGCOST, TC_FROMSTRING);

			




	
	
	
		
 
	DrawString(left, right, y, STR_PURCHASE_INFO_RUNNINGCOST, TC_FROMSTRING);

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 

			




	
	
	
		
 
	return y;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/* Draw ship specific details */

			




	
	
	
		
 
static int DrawShipPurchaseInfo(int x, int y, EngineID engine_number, const ShipVehicleInfo *svi, bool refittable)

			




	
	
	
		
 
static int DrawShipPurchaseInfo(int left, int right, int y, EngineID engine_number, const ShipVehicleInfo *svi, bool refittable)

			




	
	
	
		
 
{

			




	
	
	
		
 
	const Engine *e = GetEngine(engine_number);

			




	
	
	
		
 

			




	
	
	
		
 
	/* Purchase cost - Max speed */

			




	
	
	
		
 
	SetDParam(0, e->GetCost());

			




	
	
	
		
 
	SetDParam(1, e->GetDisplayMaxSpeed());

			




	
	
	
		
 
	DrawString(x, y, STR_PURCHASE_INFO_COST_SPEED, TC_FROMSTRING);

			




	
	
	
		
 
	DrawString(left, right, y, STR_PURCHASE_INFO_COST_SPEED, TC_FROMSTRING);

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 

			




	
	
	
		
 
	/* Cargo type + capacity */

			




	
	
	
		
 
	SetDParam(0, e->GetDefaultCargoType());

			




	
	
	
		
 
	SetDParam(1, e->GetDisplayDefaultCapacity());

			




	
	
	
		
 
	SetDParam(2, refittable ? STR_9842_REFITTABLE : STR_EMPTY);

			




	
	
	
		
 
	DrawString(x, y, STR_PURCHASE_INFO_CAPACITY, TC_FROMSTRING);

			




	
	
	
		
 
	DrawString(left, right, y, STR_PURCHASE_INFO_CAPACITY, TC_FROMSTRING);

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 

			




	
	
	
		
 
	/* Running cost */

			




	
	
	
		
 
	SetDParam(0, e->GetRunningCost());

			




	
	
	
		
 
	DrawString(x, y, STR_PURCHASE_INFO_RUNNINGCOST, TC_FROMSTRING);

			




	
	
	
		
 
	DrawString(left, right, y, STR_PURCHASE_INFO_RUNNINGCOST, TC_FROMSTRING);

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 

			




	
	
	
		
 
	return y;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/* Draw aircraft specific details */

			




	
	
	
		
 
static int DrawAircraftPurchaseInfo(int x, int y, EngineID engine_number, const AircraftVehicleInfo *avi, bool refittable)

			




	
	
	
		
 
static int DrawAircraftPurchaseInfo(int left, int right, int y, EngineID engine_number, const AircraftVehicleInfo *avi, bool refittable)

			




	
	
	
		
 
{

			




	
	
	
		
 
	const Engine *e = GetEngine(engine_number);

			




	
	
	
		
 
	CargoID cargo = e->GetDefaultCargoType();

			




	
	
		
 
@@ -507,27 +507,27 @@ static int DrawAircraftPurchaseInfo(int 

			




	
	
	
		
 
	/* Purchase cost - Max speed */

			




	
	
	
		
 
	SetDParam(0, e->GetCost());

			




	
	
	
		
 
	SetDParam(1, e->GetDisplayMaxSpeed());

			




	
	
	
		
 
	DrawString(x, y, STR_PURCHASE_INFO_COST_SPEED, TC_FROMSTRING);

			




	
	
	
		
 
	DrawString(left, right, y, STR_PURCHASE_INFO_COST_SPEED, TC_FROMSTRING);

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 

			




	
	
	
		
 
	/* Cargo capacity */

			




	
	
	
		
 
	if (cargo == CT_INVALID || cargo == CT_PASSENGERS) {

			




	
	
	
		
 
		SetDParam(0, e->GetDisplayDefaultCapacity());

			




	
	
	
		
 
		SetDParam(1, avi->mail_capacity);

			




	
	
	
		
 
		DrawString(x, y, STR_PURCHASE_INFO_AIRCRAFT_CAPACITY, TC_FROMSTRING);

			




	
	
	
		
 
		DrawString(left, right, y, STR_PURCHASE_INFO_AIRCRAFT_CAPACITY, TC_FROMSTRING);

			




	
	
	
		
 
	} else {

			




	
	
	
		
 
		/* Note, if the default capacity is selected by the refit capacity

			




	
	
	
		
 
		 * callback, then the capacity shown is likely to be incorrect. */

			




	
	
	
		
 
		SetDParam(0, cargo);

			




	
	
	
		
 
		SetDParam(1, e->GetDisplayDefaultCapacity());

			




	
	
	
		
 
		SetDParam(2, refittable ? STR_9842_REFITTABLE : STR_EMPTY);

			




	
	
	
		
 
		DrawString(x, y, STR_PURCHASE_INFO_CAPACITY, TC_FROMSTRING);

			




	
	
	
		
 
		DrawString(left, right, y, STR_PURCHASE_INFO_CAPACITY, TC_FROMSTRING);

			




	
	
	
		
 
	}

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 

			




	
	
	
		
 
	/* Running cost */

			




	
	
	
		
 
	SetDParam(0, e->GetRunningCost());

			




	
	
	
		
 
	DrawString(x, y, STR_PURCHASE_INFO_RUNNINGCOST, TC_FROMSTRING);

			




	
	
	
		
 
	DrawString(left, right, y, STR_PURCHASE_INFO_RUNNINGCOST, TC_FROMSTRING);

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 

			




	
	
	
		
 
	return y;

			




	
	
		
 
@@ -535,12 +535,11 @@ static int DrawAircraftPurchaseInfo(int 

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
 * Draw the purchase info details of a vehicle at a given location.

			




	
	
	
		
 
 * @param x,y location where to draw the info

			




	
	
	
		
 
 * @param w how wide are the text allowed to be (size of widget/window to Draw in)

			




	
	
	
		
 
 * @param left,right,y location where to draw the info

			




	
	
	
		
 
 * @param engine_number the engine of which to draw the info of

			




	
	
	
		
 
 * @return y after drawing all the text

			




	
	
	
		
 
 */

			




	
	
	
		
 
int DrawVehiclePurchaseInfo(int x, int y, uint w, EngineID engine_number)

			




	
	
	
		
 
int DrawVehiclePurchaseInfo(int left, int right, int y, EngineID engine_number)

			




	
	
	
		
 
{

			




	
	
	
		
 
	const Engine *e = GetEngine(engine_number);

			




	
	
	
		
 
	YearMonthDay ymd;

			




	
	
		
 
@@ -552,18 +551,18 @@ int DrawVehiclePurchaseInfo(int x, int y

			




	
	
	
		
 
		case VEH_TRAIN: {

			




	
	
	
		
 
			const RailVehicleInfo *rvi = RailVehInfo(engine_number);

			




	
	
	
		
 
			if (rvi->railveh_type == RAILVEH_WAGON) {

			




	
	
	
		
 
				y = DrawRailWagonPurchaseInfo(x, y, engine_number, rvi);

			




	
	
	
		
 
				y = DrawRailWagonPurchaseInfo(left, right, y, engine_number, rvi);

			




	
	
	
		
 
			} else {

			




	
	
	
		
 
				y = DrawRailEnginePurchaseInfo(x, y, engine_number, rvi);

			




	
	
	
		
 
				y = DrawRailEnginePurchaseInfo(left, right, y, engine_number, rvi);

			




	
	
	
		
 
			}

			




	
	
	
		
 

			




	
	
	
		
 
			/* Cargo type + capacity, or N/A */

			




	
	
	
		
 
			int new_y = DrawCargoCapacityInfo(x, y, engine_number, VEH_TRAIN, refittable);

			




	
	
	
		
 
			int new_y = DrawCargoCapacityInfo(left, right, y, engine_number, VEH_TRAIN, refittable);

			




	
	
	
		
 

			




	
	
	
		
 
			if (new_y == y) {

			




	
	
	
		
 
				SetDParam(0, CT_INVALID);

			




	
	
	
		
 
				SetDParam(2, STR_EMPTY);

			




	
	
	
		
 
				DrawString(x, y, STR_PURCHASE_INFO_CAPACITY, TC_FROMSTRING);

			




	
	
	
		
 
				DrawString(left, right, y, STR_PURCHASE_INFO_CAPACITY, TC_FROMSTRING);

			




	
	
	
		
 
				y += 10;

			




	
	
	
		
 
			} else {

			




	
	
	
		
 
				y = new_y;

			




	
	
		
 
@@ -571,15 +570,15 @@ int DrawVehiclePurchaseInfo(int x, int y

			




	
	
	
		
 
			break;

			




	
	
	
		
 
		}

			




	
	
	
		
 
		case VEH_ROAD: {

			




	
	
	
		
 
			y = DrawRoadVehPurchaseInfo(x, y, engine_number);

			




	
	
	
		
 
			y = DrawRoadVehPurchaseInfo(left, right, y, engine_number);

			




	
	
	
		
 

			




	
	
	
		
 
			/* Cargo type + capacity, or N/A */

			




	
	
	
		
 
			int new_y = DrawCargoCapacityInfo(x, y, engine_number, VEH_ROAD, refittable);

			




	
	
	
		
 
			int new_y = DrawCargoCapacityInfo(left, right, y, engine_number, VEH_ROAD, refittable);

			




	
	
	
		
 

			




	
	
	
		
 
			if (new_y == y) {

			




	
	
	
		
 
				SetDParam(0, CT_INVALID);

			




	
	
	
		
 
				SetDParam(2, STR_EMPTY);

			




	
	
	
		
 
				DrawString(x, y, STR_PURCHASE_INFO_CAPACITY, TC_FROMSTRING);

			




	
	
	
		
 
				DrawString(left, right, y, STR_PURCHASE_INFO_CAPACITY, TC_FROMSTRING);

			




	
	
	
		
 
				y += 10;

			




	
	
	
		
 
			} else {

			




	
	
	
		
 
				y = new_y;

			




	
	
		
 
@@ -587,10 +586,10 @@ int DrawVehiclePurchaseInfo(int x, int y

			




	
	
	
		
 
			break;

			




	
	
	
		
 
		}

			




	
	
	
		
 
		case VEH_SHIP:

			




	
	
	
		
 
			y = DrawShipPurchaseInfo(x, y, engine_number, ShipVehInfo(engine_number), refittable);

			




	
	
	
		
 
			y = DrawShipPurchaseInfo(left, right, y, engine_number, ShipVehInfo(engine_number), refittable);

			




	
	
	
		
 
			break;

			




	
	
	
		
 
		case VEH_AIRCRAFT:

			




	
	
	
		
 
			y = DrawAircraftPurchaseInfo(x, y, engine_number, AircraftVehInfo(engine_number), refittable);

			




	
	
	
		
 
			y = DrawAircraftPurchaseInfo(left, right, y, engine_number, AircraftVehInfo(engine_number), refittable);

			




	
	
	
		
 
			break;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
		
 
@@ -599,18 +598,18 @@ int DrawVehiclePurchaseInfo(int x, int y

			




	
	
	
		
 
		/* Design date - Life length */

			




	
	
	
		
 
		SetDParam(0, ymd.year);

			




	
	
	
		
 
		SetDParam(1, e->lifelength);

			




	
	
	
		
 
		DrawString(x, y, STR_PURCHASE_INFO_DESIGNED_LIFE, TC_FROMSTRING);

			




	
	
	
		
 
		DrawString(left, right, y, STR_PURCHASE_INFO_DESIGNED_LIFE, TC_FROMSTRING);

			




	
	
	
		
 
		y += 10;

			




	
	
	
		
 

			




	
	
	
		
 
		/* Reliability */

			




	
	
	
		
 
		SetDParam(0, e->reliability * 100 >> 16);

			




	
	
	
		
 
		DrawString(x, y, STR_PURCHASE_INFO_RELIABILITY, TC_FROMSTRING);

			




	
	
	
		
 
		DrawString(left, right, y, STR_PURCHASE_INFO_RELIABILITY, TC_FROMSTRING);

			




	
	
	
		
 
		y += 10;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	/* Additional text from NewGRF */

			




	
	
	
		
 
	y += ShowAdditionalText(x, y, w, engine_number);

			




	
	
	
		
 
	if (refittable) y += ShowRefitOptionsList(x, y, w, engine_number);

			




	
	
	
		
 
	y = ShowAdditionalText(left, right, y, engine_number);

			




	
	
	
		
 
	if (refittable) y = ShowRefitOptionsList(left, right, y, engine_number);

			




	
	
	
		
 

			




	
	
	
		
 
	return y;

			




	
	
	
		
 
}

			




	
	
		
 
@@ -1031,7 +1030,7 @@ struct BuildVehicleWindow : Window {

			




	
	
	
		
 

			




	
	
	
		
 
		if (this->sel_engine != INVALID_ENGINE) {

			




	
	
	
		
 
			const Widget *wi = &this->widget[BUILD_VEHICLE_WIDGET_PANEL];

			




	
	
	
		
 
			int text_end = DrawVehiclePurchaseInfo(2, wi->top + 1, wi->right - wi->left - 2, this->sel_engine);

			




	
	
	
		
 
			int text_end = DrawVehiclePurchaseInfo(wi->left + 2, wi->right - 2, wi->top + 1, this->sel_engine);

			




	
	
	
		
 

			




	
	
	
		
 
			if (text_end > wi->bottom) {

			




	
	
	
		
 
				this->SetDirty();

			




        

    


    
    

    

        

                

                    src/vehicle_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -431,21 +431,21 @@ void ShowVehicleRefitWindow(const Vehicl

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/** Display additional text from NewGRF in the purchase information window */

			




	
	
	
		
 
uint ShowAdditionalText(int x, int y, uint w, EngineID engine)

			




	
	
	
		
 
uint ShowAdditionalText(int left, int right, int y, EngineID engine)

			




	
	
	
		
 
{

			




	
	
	
		
 
	uint16 callback = GetVehicleCallback(CBID_VEHICLE_ADDITIONAL_TEXT, 0, 0, engine, NULL);

			




	
	
	
		
 
	if (callback == CALLBACK_FAILED) return 0;

			




	
	
	
		
 
	if (callback == CALLBACK_FAILED) return y;

			




	
	
	
		
 

			




	
	
	
		
 
	/* STR_02BD is used to start the string with {BLACK} */

			




	
	
	
		
 
	SetDParam(0, GetGRFStringID(GetEngineGRFID(engine), 0xD000 + callback));

			




	
	
	
		
 
	PrepareTextRefStackUsage(0);

			




	
	
	
		
 
	uint result = DrawStringMultiLine(x, x + w, y, INT32_MAX, STR_02BD);

			




	
	
	
		
 
	uint result = DrawStringMultiLine(left, right, y, INT32_MAX, STR_02BD);

			




	
	
	
		
 
	StopTextRefStackUsage();

			




	
	
	
		
 
	return result - y;

			




	
	
	
		
 
	return result;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/** Display list of cargo types of the engine, for the purchase information window */

			




	
	
	
		
 
uint ShowRefitOptionsList(int x, int y, uint w, EngineID engine)

			




	
	
	
		
 
uint ShowRefitOptionsList(int left, int right, int y, EngineID engine)

			




	
	
	
		
 
{

			




	
	
	
		
 
	/* List of cargo types of this engine */

			




	
	
	
		
 
	uint32 cmask = GetUnionOfArticulatedRefitMasks(engine, GetEngine(engine)->type, false);

			




	
	
		
 
@@ -455,7 +455,7 @@ uint ShowRefitOptionsList(int x, int y, 

			




	
	
	
		
 
	char *b = string;

			




	
	
	
		
 

			




	
	
	
		
 
	/* Draw nothing if the engine is not refittable */

			




	
	
	
		
 
	if (CountBits(cmask) <= 1) return 0;

			




	
	
	
		
 
	if (CountBits(cmask) <= 1) return y;

			




	
	
	
		
 

			




	
	
	
		
 
	b = InlineString(b, STR_PURCHASE_INFO_REFITTABLE_TO);

			




	
	
	
		
 

			




	
	
		
 
@@ -492,7 +492,7 @@ uint ShowRefitOptionsList(int x, int y, 

			




	
	
	
		
 
	assert(b < endof(string));

			




	
	
	
		
 

			




	
	
	
		
 
	SetDParamStr(0, string);

			




	
	
	
		
 
	return DrawStringMultiLine(x, x + w, y, INT32_MAX, STR_JUST_RAW_STRING);

			




	
	
	
		
 
	return DrawStringMultiLine(left, right, y, INT32_MAX, STR_JUST_RAW_STRING);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/** Get the cargo subtype text from NewGRF for the vehicle details window. */

			




        

    


    
    

    

        

                

                    src/vehicle_gui.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -51,7 +51,7 @@ static inline bool ValidVLWFlags(uint16 

			




	
	
	
		
 
	return (flags == VLW_STANDARD || flags == VLW_SHARED_ORDERS || flags == VLW_STATION_LIST || flags == VLW_DEPOT_LIST || flags == VLW_GROUP_LIST);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
int DrawVehiclePurchaseInfo(int x, int y, uint w, EngineID engine_number);

			




	
	
	
		
 
int DrawVehiclePurchaseInfo(int left, int right, int y, EngineID engine_number);

			




	
	
	
		
 

			




	
	
	
		
 
void DrawTrainImage(const Vehicle *v, int x, int y, VehicleID selection, int count, int skip);

			




	
	
	
		
 
void DrawRoadVehImage(const Vehicle *v, int x, int y, VehicleID selection, int count);

			




	
	
		
 
@@ -60,8 +60,8 @@ void DrawAircraftImage(const Vehicle *v,

			




	
	
	
		
 

			




	
	
	
		
 
void ShowBuildVehicleWindow(TileIndex tile, VehicleType type);

			




	
	
	
		
 

			




	
	
	
		
 
uint ShowAdditionalText(int x, int y, uint w, EngineID engine);

			




	
	
	
		
 
uint ShowRefitOptionsList(int x, int y, uint w, EngineID engine);

			




	
	
	
		
 
uint ShowAdditionalText(int left, int right, int y, EngineID engine);

			




	
	
	
		
 
uint ShowRefitOptionsList(int left, int right, int y, EngineID engine);

			




	
	
	
		
 
StringID GetCargoSubtypeText(const Vehicle *v);

			




	
	
	
		
 

			




	
	
	
		
 
void ShowVehicleListWindow(const Vehicle *v);

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: code.theleruby.com-48
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2022 by various authors & licensed under GPLv3.
            – Support