Changeset - r6608:f2d13a751f0b
Parent rev.
Child rev.
[Not reviewed]
master
0 4 0
peter1138 - 17 years ago 2007-05-12 07:05:34
peter1138@openttd.org
(svn r9828) -Codechange: [NewGRF] Add support for changing cargo capacity with callback 36. This is set on construction for ships and roadvehicles, and whenever carriages are attached for trains.
4 files changed with 14 insertions and 7 deletions:
src/build_vehicle_gui.cpp
6
5
src/roadveh_cmd.cpp
3
1
src/ship_cmd.cpp
3
1
src/train_cmd.cpp
2
0 comments (0 inline, 0 general)
src/build_vehicle_gui.cpp
➞
Show inline comments
 
@@ -383,13 +383,13 @@ static int DrawRailWagonPurchaseInfo(int
 
	DrawString(x, y, STR_PURCHASE_INFO_COST, 0);
 
	y += 10;
 

			




	
	
	
		
 
	/* Wagon weight - (including cargo) */

			




	
	
	
		
 
	uint weight = GetEngineProperty(engine_number, 0x16, rvi->weight);

			




	
	
	
		
 
	SetDParam(0, weight);

			




	
	
	
		
 
	SetDParam(1, (GetCargo(rvi->cargo_type)->weight * rvi->capacity >> 4) + weight);

			




	
	
	
		
 
	SetDParam(1, (GetCargo(rvi->cargo_type)->weight * GetEngineProperty(engine_number, 0x14, rvi->capacity) >> 4) + weight);

			




	
	
	
		
 
	DrawString(x, y, STR_PURCHASE_INFO_WEIGHT_CWEIGHT, 0);

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 

			




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

			




	
	
	
		
 
	if (_patches.wagon_speed_limits) {

			




	
	
	
		
 
		uint max_speed = GetEngineProperty(engine_number, 0x09, rvi->max_speed);

			




	
	
		
 
@@ -458,13 +458,13 @@ static int DrawRoadVehPurchaseInfo(int x

			




	
	
	
		
 
	SetDParam(0, rvi->running_cost * _price.roadveh_running >> 8);

			




	
	
	
		
 
	DrawString(x, y, STR_PURCHASE_INFO_RUNNINGCOST, 0);

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 

			




	
	
	
		
 
	/* Cargo type + capacity */

			




	
	
	
		
 
	SetDParam(0, rvi->cargo_type);

			




	
	
	
		
 
	SetDParam(1, rvi->capacity);

			




	
	
	
		
 
	SetDParam(1, GetEngineProperty(engine_number, 0x0F, rvi->capacity));

			




	
	
	
		
 
	SetDParam(2, refittable ? STR_9842_REFITTABLE : STR_EMPTY);

			




	
	
	
		
 
	DrawString(x, y, STR_PURCHASE_INFO_CAPACITY, 0);

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 

			




	
	
	
		
 
	return y;

			




	
	
	
		
 
}

			




	
	
		
 
@@ -477,13 +477,13 @@ static int DrawShipPurchaseInfo(int x, i

			




	
	
	
		
 
	SetDParam(1, GetEngineProperty(engine_number, 0x0B, svi->max_speed) * 10 / 32);

			




	
	
	
		
 
	DrawString(x, y, STR_PURCHASE_INFO_COST_SPEED, 0);

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 

			




	
	
	
		
 
	/* Cargo type + capacity */

			




	
	
	
		
 
	SetDParam(0, svi->cargo_type);

			




	
	
	
		
 
	SetDParam(1, svi->capacity);

			




	
	
	
		
 
	SetDParam(1, GetEngineProperty(engine_number, 0x0D, svi->capacity));

			




	
	
	
		
 
	SetDParam(2, svi->refittable ? STR_9842_REFITTABLE : STR_EMPTY);

			




	
	
	
		
 
	DrawString(x, y, STR_PURCHASE_INFO_CAPACITY, 0);

			




	
	
	
		
 
	y += 10;

			




	
	
	
		
 

			




	
	
	
		
 
	/* Running cost */

			




	
	
	
		
 
	SetDParam(0, GetEngineProperty(engine_number, 0x0F, svi->running_cost) * _price.ship_running >> 8);

			




	
	
		
 
@@ -542,14 +542,15 @@ int DrawVehiclePurchaseInfo(int x, int y

			




	
	
	
		
 
	ConvertDateToYMD(e->intro_date, &ymd);

			




	
	
	
		
 
	bool refitable = false;

			




	
	
	
		
 

			




	
	
	
		
 
	switch (e->type) {

			




	
	
	
		
 
		case VEH_TRAIN: {

			




	
	
	
		
 
			const RailVehicleInfo *rvi = RailVehInfo(engine_number);

			




	
	
	
		
 
			uint capacity = GetEngineProperty(engine_number, 0x14, rvi->capacity);

			




	
	
	
		
 

			




	
	
	
		
 
			refitable = (EngInfo(engine_number)->refit_mask != 0) && (rvi->capacity > 0);

			




	
	
	
		
 
			refitable = (EngInfo(engine_number)->refit_mask != 0) && (capacity > 0);

			




	
	
	
		
 

			




	
	
	
		
 
			if (rvi->railveh_type == RAILVEH_WAGON) {

			




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

			




	
	
	
		
 
			} else {

			




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

			




	
	
	
		
 
			}

			




	
	
		
 
@@ -559,13 +560,13 @@ int DrawVehiclePurchaseInfo(int x, int y

			




	
	
	
		
 
				SetDParam(0, CT_INVALID);

			




	
	
	
		
 
				SetDParam(2, STR_EMPTY);

			




	
	
	
		
 
			} else {

			




	
	
	
		
 
				int multihead = (rvi->railveh_type == RAILVEH_MULTIHEAD ? 1 : 0);

			




	
	
	
		
 

			




	
	
	
		
 
				SetDParam(0, rvi->cargo_type);

			




	
	
	
		
 
				SetDParam(1, (rvi->capacity * (CountArticulatedParts(engine_number) + 1)) << multihead);

			




	
	
	
		
 
				SetDParam(1, (capacity * (CountArticulatedParts(engine_number) + 1)) << multihead);

			




	
	
	
		
 
				SetDParam(2, refitable ? STR_9842_REFITTABLE : STR_EMPTY);

			




	
	
	
		
 
			}

			




	
	
	
		
 
			DrawString(x, y, STR_PURCHASE_INFO_CAPACITY, 0);

			




	
	
	
		
 
			y += 10;

			




	
	
	
		
 
		}

			




	
	
	
		
 
			break;

			




        

    


    
    

    

        

                

                    src/roadveh_cmd.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -208,12 +208,14 @@ int32 CmdBuildRoadVeh(TileIndex tile, ui

			




	
	
	
		
 
		v->cur_image = 0xC15;

			




	
	
	
		
 
		v->random_bits = VehicleRandomBits();

			




	
	
	
		
 

			




	
	
	
		
 
		v->vehicle_flags = 0;

			




	
	
	
		
 
		if (e->flags & ENGINE_EXCLUSIVE_PREVIEW) SETBIT(v->vehicle_flags, VF_BUILT_AS_PROTOTYPE);

			




	
	
	
		
 

			




	
	
	
		
 
		v->cargo_cap = GetVehicleProperty(v, 0x0F, rvi->capacity);

			




	
	
	
		
 

			




	
	
	
		
 
		VehiclePositionChanged(v);

			




	
	
	
		
 

			




	
	
	
		
 
		InvalidateWindowData(WC_VEHICLE_DEPOT, v->tile);

			




	
	
	
		
 
		RebuildVehicleLists();

			




	
	
	
		
 
		InvalidateWindow(WC_COMPANY, v->owner);

			




	
	
	
		
 
		if (IsLocalPlayer())

			




	
	
		
 
@@ -1846,13 +1848,13 @@ int32 CmdRefitRoadVeh(TileIndex tile, ui

			




	
	
	
		
 

			




	
	
	
		
 
		CargoID old_cid = rvi->cargo_type;

			




	
	
	
		
 
		/* normally, the capacity depends on the cargo type, a vehicle can

			




	
	
	
		
 
		 * carry twice as much mail/goods as normal cargo, and four times as

			




	
	
	
		
 
		 * many passengers

			




	
	
	
		
 
		 */

			




	
	
	
		
 
		capacity = rvi->capacity;

			




	
	
	
		
 
		capacity = GetVehicleProperty(v, 0x0F, rvi->capacity);

			




	
	
	
		
 
		switch (old_cid) {

			




	
	
	
		
 
			case CT_PASSENGERS: break;

			




	
	
	
		
 
			case CT_MAIL:

			




	
	
	
		
 
			case CT_GOODS: capacity *= 2; break;

			




	
	
	
		
 
			default:       capacity *= 4; break;

			




	
	
	
		
 
		}

			




        

    


    
    

    

        

                

                    src/ship_cmd.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -875,12 +875,14 @@ int32 CmdBuildShip(TileIndex tile, uint3

			




	
	
	
		
 
		v = new (v) Ship();

			




	
	
	
		
 
		v->random_bits = VehicleRandomBits();

			




	
	
	
		
 

			




	
	
	
		
 
		v->vehicle_flags = 0;

			




	
	
	
		
 
		if (e->flags & ENGINE_EXCLUSIVE_PREVIEW) SETBIT(v->vehicle_flags, VF_BUILT_AS_PROTOTYPE);

			




	
	
	
		
 

			




	
	
	
		
 
		v->cargo_cap = GetVehicleProperty(v, 0x0D, svi->capacity);

			




	
	
	
		
 

			




	
	
	
		
 
		VehiclePositionChanged(v);

			




	
	
	
		
 

			




	
	
	
		
 
		InvalidateWindowData(WC_VEHICLE_DEPOT, v->tile);

			




	
	
	
		
 
		RebuildVehicleLists();

			




	
	
	
		
 
		InvalidateWindow(WC_COMPANY, v->owner);

			




	
	
	
		
 
		if (IsLocalPlayer())

			




	
	
		
 
@@ -1087,13 +1089,13 @@ int32 CmdRefitShip(TileIndex tile, uint3

			




	
	
	
		
 
		/* Restore the cargo type */

			




	
	
	
		
 
		v->cargo_type = temp_cid;

			




	
	
	
		
 
		v->cargo_subtype = temp_subtype;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	if (capacity == CALLBACK_FAILED) {

			




	
	
	
		
 
		capacity = ShipVehInfo(v->engine_type)->capacity;

			




	
	
	
		
 
		capacity = GetVehicleProperty(v, 0x0D, ShipVehInfo(v->engine_type)->capacity);

			




	
	
	
		
 
	}

			




	
	
	
		
 
	_returned_refit_capacity = capacity;

			




	
	
	
		
 

			




	
	
	
		
 
	cost = 0;

			




	
	
	
		
 
	if (IsHumanPlayer(v->owner) && new_cid != v->cargo_type) {

			




	
	
	
		
 
		cost = GetRefitCost(v->engine_type);

			




        

    


    
    

    

        

                

                    src/train_cmd.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -217,12 +217,14 @@ void TrainConsistChanged(Vehicle* v)

			




	
	
	
		
 
			if ((rvi_u->railveh_type != RAILVEH_WAGON || _patches.wagon_speed_limits) && !UsesWagonOverride(u)) {

			




	
	
	
		
 
				uint16 speed = GetVehicleProperty(u, 0x09, rvi_u->max_speed);

			




	
	
	
		
 
				if (speed != 0) max_speed = min(speed, max_speed);

			




	
	
	
		
 
			}

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		u->cargo_cap = GetVehicleProperty(u, 0x14, rvi_u->capacity);

			




	
	
	
		
 

			




	
	
	
		
 
		/* check the vehicle length (callback) */

			




	
	
	
		
 
		uint16 veh_len = CALLBACK_FAILED;

			




	
	
	
		
 
		if (HASBIT(EngInfo(u->engine_type)->callbackmask, CBM_VEHICLE_LENGTH)) {

			




	
	
	
		
 
			veh_len = GetVehicleCallback(CBID_TRAIN_VEHICLE_LENGTH, 0, 0, u->engine_type, u);

			




	
	
	
		
 
		}

			




	
	
	
		
 
		if (veh_len == CALLBACK_FAILED) veh_len = rvi_u->shorten_factor;

			




        

    



    


    



    



      

      





    
    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