Changeset - r11484:8a3d207ac9c2
Parent rev.
Child rev.
[Not reviewed]
master
0 2 0
rubidium - 15 years ago 2009-03-25 20:16:09
rubidium@openttd.org
(svn r15850) -Codechange: replace some magic constants with the less magic line height constant
2 files changed with 30 insertions and 30 deletions:
src/build_vehicle_gui.cpp
22
22
src/subsidy_gui.cpp
8
8
0 comments (0 inline, 0 general)
src/build_vehicle_gui.cpp
➞
Show inline comments
 
@@ -388,7 +388,7 @@ static int DrawCargoCapacityInfo(int lef
 
		SetDParam(1, cap[c]);
 
		SetDParam(2, refittable ? STR_9842_REFITTABLE : STR_EMPTY);
 
		DrawString(left, right, y, STR_PURCHASE_INFO_CAPACITY, TC_FROMSTRING);
 
		y += 10;
 
		y += FONT_HEIGHT_NORMAL;
 

			




	
	
	
		
 
		/* Only show as refittable once */

			




	
	
	
		
 
		refittable = false;

			




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

			




	
	
	
		
 
	/* Purchase cost */

			




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

			




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

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 
	y += FONT_HEIGHT_NORMAL;

			




	
	
	
		
 

			




	
	
	
		
 
	/* Wagon weight - (including cargo) */

			




	
	
	
		
 
	uint weight = e->GetDisplayWeight();

			




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

			




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

			




	
	
	
		
 
	SetDParam(1, cargo_weight + weight);

			




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

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 
	y += FONT_HEIGHT_NORMAL;

			




	
	
	
		
 

			




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

			




	
	
	
		
 
	if (_settings_game.vehicle.wagon_speed_limits) {

			




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

			




	
	
	
		
 
		if (max_speed > 0) {

			




	
	
	
		
 
			SetDParam(0, max_speed);

			




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

			




	
	
	
		
 
			y += 10;

			




	
	
	
		
 
			y += FONT_HEIGHT_NORMAL;

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




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

			




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

			




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

			




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

			




	
	
	
		
 
		y += 10;

			




	
	
	
		
 
		y += FONT_HEIGHT_NORMAL;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	return y;

			




	
	
		
 
@@ -444,26 +444,26 @@ static int DrawRailEnginePurchaseInfo(in

			




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

			




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

			




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

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 
	y += FONT_HEIGHT_NORMAL;

			




	
	
	
		
 

			




	
	
	
		
 
	/* Max speed - Engine power */

			




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

			




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

			




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

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 
	y += FONT_HEIGHT_NORMAL;

			




	
	
	
		
 

			




	
	
	
		
 
	/* 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(left, right, y, STR_PURCHASE_INFO_MAX_TE, TC_FROMSTRING);

			




	
	
	
		
 
		y += 10;

			




	
	
	
		
 
		y += FONT_HEIGHT_NORMAL;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	/* Running cost */

			




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

			




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

			




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

			




	
	
	
		
 
		y += 10;

			




	
	
	
		
 
		y += FONT_HEIGHT_NORMAL;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	/* Powered wagons power - Powered wagons extra weight */

			




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

			




	
	
	
		
 
		SetDParam(0, rvi->pow_wag_power);

			




	
	
	
		
 
		SetDParam(1, rvi->pow_wag_weight);

			




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

			




	
	
	
		
 
		y += 10;

			




	
	
	
		
 
		y += FONT_HEIGHT_NORMAL;

			




	
	
	
		
 
	};

			




	
	
	
		
 

			




	
	
	
		
 
	return y;

			




	
	
		
 
@@ -486,12 +486,12 @@ static int DrawRoadVehPurchaseInfo(int l

			




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

			




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

			




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

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 
	y += FONT_HEIGHT_NORMAL;

			




	
	
	
		
 

			




	
	
	
		
 
	/* Running cost */

			




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

			




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

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 
	y += FONT_HEIGHT_NORMAL;

			




	
	
	
		
 

			




	
	
	
		
 
	return y;

			




	
	
	
		
 
}

			




	
	
		
 
@@ -505,19 +505,19 @@ static int DrawShipPurchaseInfo(int left

			




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

			




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

			




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

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 
	y += FONT_HEIGHT_NORMAL;

			




	
	
	
		
 

			




	
	
	
		
 
	/* Cargo type + capacity */

			




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

			




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

			




	
	
	
		
 
	SetDParam(2, refittable ? STR_9842_REFITTABLE : STR_EMPTY);

			




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

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 
	y += FONT_HEIGHT_NORMAL;

			




	
	
	
		
 

			




	
	
	
		
 
	/* Running cost */

			




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

			




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

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 
	y += FONT_HEIGHT_NORMAL;

			




	
	
	
		
 

			




	
	
	
		
 
	return y;

			




	
	
	
		
 
}

			




	
	
		
 
@@ -532,7 +532,7 @@ static int DrawAircraftPurchaseInfo(int 

			




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

			




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

			




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

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 
	y += FONT_HEIGHT_NORMAL;

			




	
	
	
		
 

			




	
	
	
		
 
	/* Cargo capacity */

			




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

			




	
	
		
 
@@ -547,12 +547,12 @@ static int DrawAircraftPurchaseInfo(int 

			




	
	
	
		
 
		SetDParam(2, refittable ? STR_9842_REFITTABLE : STR_EMPTY);

			




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

			




	
	
	
		
 
	}

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 
	y += FONT_HEIGHT_NORMAL;

			




	
	
	
		
 

			




	
	
	
		
 
	/* Running cost */

			




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

			




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

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 
	y += FONT_HEIGHT_NORMAL;

			




	
	
	
		
 

			




	
	
	
		
 
	return y;

			




	
	
	
		
 
}

			




	
	
		
 
@@ -587,7 +587,7 @@ int DrawVehiclePurchaseInfo(int left, in

			




	
	
	
		
 
				SetDParam(0, CT_INVALID);

			




	
	
	
		
 
				SetDParam(2, STR_EMPTY);

			




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

			




	
	
	
		
 
				y += 10;

			




	
	
	
		
 
				y += FONT_HEIGHT_NORMAL;

			




	
	
	
		
 
			} else {

			




	
	
	
		
 
				y = new_y;

			




	
	
	
		
 
			}

			




	
	
		
 
@@ -603,7 +603,7 @@ int DrawVehiclePurchaseInfo(int left, in

			




	
	
	
		
 
				SetDParam(0, CT_INVALID);

			




	
	
	
		
 
				SetDParam(2, STR_EMPTY);

			




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

			




	
	
	
		
 
				y += 10;

			




	
	
	
		
 
				y += FONT_HEIGHT_NORMAL;

			




	
	
	
		
 
			} else {

			




	
	
	
		
 
				y = new_y;

			




	
	
	
		
 
			}

			




	
	
		
 
@@ -623,12 +623,12 @@ int DrawVehiclePurchaseInfo(int left, in

			




	
	
	
		
 
		SetDParam(0, ymd.year);

			




	
	
	
		
 
		SetDParam(1, e->lifelength);

			




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

			




	
	
	
		
 
		y += 10;

			




	
	
	
		
 
		y += FONT_HEIGHT_NORMAL;

			




	
	
	
		
 

			




	
	
	
		
 
		/* Reliability */

			




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

			




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

			




	
	
	
		
 
		y += 10;

			




	
	
	
		
 
		y += FONT_HEIGHT_NORMAL;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	/* Additional text from NewGRF */

			




        

    


    
    

    

        

                

                    src/subsidy_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -34,7 +34,7 @@ struct SubsidyListWindow : Window {

			




	
	
	
		
 
		uint num = 0;

			




	
	
	
		
 
		for (const Subsidy *s = _subsidies; s != endof(_subsidies); s++) {

			




	
	
	
		
 
			if (s->cargo_type != CT_INVALID && s->age < 12) {

			




	
	
	
		
 
				y -= 10;

			




	
	
	
		
 
				y -= FONT_HEIGHT_NORMAL;

			




	
	
	
		
 
				if (y < 0) {

			




	
	
	
		
 
					this->HandleClick(s);

			




	
	
	
		
 
					return;

			




	
	
		
 
@@ -44,7 +44,7 @@ struct SubsidyListWindow : Window {

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		if (num == 0) {

			




	
	
	
		
 
			y -= 10; // "None"

			




	
	
	
		
 
			y -= FONT_HEIGHT_NORMAL; // "None"

			




	
	
	
		
 
			if (y < 0) return;

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
		
 
@@ -53,7 +53,7 @@ struct SubsidyListWindow : Window {

			




	
	
	
		
 

			




	
	
	
		
 
		for (const Subsidy *s = _subsidies; s != endof(_subsidies); s++) {

			




	
	
	
		
 
			if (s->cargo_type != CT_INVALID && s->age >= 12) {

			




	
	
	
		
 
				y -= 10;

			




	
	
	
		
 
				y -= FONT_HEIGHT_NORMAL;

			




	
	
	
		
 
				if (y < 0) {

			




	
	
	
		
 
					this->HandleClick(s);

			




	
	
	
		
 
					return;

			




	
	
		
 
@@ -113,7 +113,7 @@ struct SubsidyListWindow : Window {

			




	
	
	
		
 

			




	
	
	
		
 
		/* Section for drawing the offered subisidies */

			




	
	
	
		
 
		DrawString(x, right, y, STR_2026_SUBSIDIES_ON_OFFER_FOR, TC_FROMSTRING);

			




	
	
	
		
 
		y += 10;

			




	
	
	
		
 
		y += FONT_HEIGHT_NORMAL;

			




	
	
	
		
 
		uint num = 0;

			




	
	
	
		
 

			




	
	
	
		
 
		for (s = _subsidies; s != endof(_subsidies); s++) {

			




	
	
		
 
@@ -123,19 +123,19 @@ struct SubsidyListWindow : Window {

			




	
	
	
		
 
				SetDParam(7, _date - ymd.day + 384 - s->age * 32);

			




	
	
	
		
 
				DrawString(x + 2, right - 2, y, STR_2027_FROM_TO, TC_FROMSTRING);

			




	
	
	
		
 

			




	
	
	
		
 
				y += 10;

			




	
	
	
		
 
				y += FONT_HEIGHT_NORMAL;

			




	
	
	
		
 
				num++;

			




	
	
	
		
 
			}

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		if (num == 0) {

			




	
	
	
		
 
			DrawString(x + 2, right - 2, y, STR_202A_NONE, TC_FROMSTRING);

			




	
	
	
		
 
			y += 10;

			




	
	
	
		
 
			y += FONT_HEIGHT_NORMAL;

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		/* Section for drawing the already granted subisidies */

			




	
	
	
		
 
		DrawString(x, right, y + 1, STR_202B_SERVICES_ALREADY_SUBSIDISED, TC_FROMSTRING);

			




	
	
	
		
 
		y += 10;

			




	
	
	
		
 
		y += FONT_HEIGHT_NORMAL;

			




	
	
	
		
 
		num = 0;

			




	
	
	
		
 

			




	
	
	
		
 
		for (s = _subsidies; s != endof(_subsidies); s++) {

			




	
	
		
 
@@ -147,7 +147,7 @@ struct SubsidyListWindow : Window {

			




	
	
	
		
 
				/* Displays the two connected stations */

			




	
	
	
		
 
				DrawString(x + 2, right - 2, y, STR_202C_FROM_TO, TC_FROMSTRING);

			




	
	
	
		
 

			




	
	
	
		
 
				y += 10;

			




	
	
	
		
 
				y += FONT_HEIGHT_NORMAL;

			




	
	
	
		
 
				num++;

			




	
	
	
		
 
			}

			




	
	
	
		
 
		}

			




        

    



    


    



    



      

      





    
    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