Changeset - r6606:113b1820d4cb
Parent rev.
Child rev.
[Not reviewed]
master
0 4 0
peter1138 - 17 years ago 2007-05-10 23:10:23
peter1138@openttd.org
(svn r9825) -Codechange: [NewGRF] Add support for early vehicle retirement.
4 files changed with 31 insertions and 13 deletions:
src/engine.cpp
10
src/engine.h
1
src/newgrf.cpp
16
9
src/table/engines.h
4
4
0 comments (0 inline, 0 general)
src/engine.cpp
➞
Show inline comments
 
@@ -70,6 +70,16 @@ static void CalcEngineReliability(Engine
 
{
 
	uint age = e->age;
 

			




	
	
	
		
 
	/* Check for early retirement */

			




	
	
	
		
 
	if (e->player_avail != 0 && !_patches.never_expire_vehicles) {

			




	
	
	
		
 
		uint retire_early = EngInfo(e - _engines)->retire_early;

			




	
	
	
		
 
		if (retire_early > 0 && age >= e->duration_phase_1 + e->duration_phase_2 - retire_early * 12) {

			




	
	
	
		
 
			/* Early retirement is enabled and we're past the date... */

			




	
	
	
		
 
			e->player_avail = 0;

			




	
	
	
		
 
			AddRemoveEngineFromAutoreplaceAndBuildWindows(e->type);

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	if (age < e->duration_phase_1) {

			




	
	
	
		
 
		uint start = e->reliability_start;

			




	
	
	
		
 
		e->reliability = age * (e->reliability_max - start) / e->duration_phase_1 + start;

			




        

    


    
    

    

        

                

                    src/engine.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -105,6 +105,7 @@ struct EngineInfo {

			




	
	
	
		
 
	byte refit_cost;

			




	
	
	
		
 
	byte misc_flags;

			




	
	
	
		
 
	byte callbackmask;

			




	
	
	
		
 
	byte retire_early; ///< Number of years early to retire vehicle

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
struct Engine {

			




        

    


    
    

    

        

                

                    src/newgrf.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -531,6 +531,10 @@ static bool RailVehicleChangeInfo(uint e

			




	
	
	
		
 
			FOR_EACH_OBJECT rvi[i].user_def_data = grf_load_byte(&buf);

			




	
	
	
		
 
			break;

			




	
	
	
		
 

			




	
	
	
		
 
		case 0x26: // Retire vehicle early

			




	
	
	
		
 
			FOR_EACH_OBJECT ei[i].retire_early = grf_load_byte(&buf);

			




	
	
	
		
 
			break;

			




	
	
	
		
 

			




	
	
	
		
 
		case 0x27: // Miscellaneous flags

			




	
	
	
		
 
			FOR_EACH_OBJECT {

			




	
	
	
		
 
				ei[i].misc_flags = grf_load_byte(&buf);

			




	
	
		
 
@@ -553,7 +557,6 @@ static bool RailVehicleChangeInfo(uint e

			




	
	
	
		
 
		/* @todo air drag and retire vehicle early

			




	
	
	
		
 
		 * Fall-through for unimplemented one byte long properties. */

			




	
	
	
		
 
		case 0x20: // Air drag

			




	
	
	
		
 
		case 0x26: // Retire vehicle early

			




	
	
	
		
 
			FOR_EACH_OBJECT grf_load_byte(&buf);

			




	
	
	
		
 
			ret = true;

			




	
	
	
		
 
			break;

			




	
	
		
 
@@ -650,6 +653,10 @@ static bool RoadVehicleChangeInfo(uint e

			




	
	
	
		
 
			FOR_EACH_OBJECT ei[i].refit_cost = grf_load_byte(&buf);

			




	
	
	
		
 
			break;

			




	
	
	
		
 

			




	
	
	
		
 
		case 0x1B: // Retire vehicle early

			




	
	
	
		
 
			FOR_EACH_OBJECT ei[i].retire_early = grf_load_byte(&buf);

			




	
	
	
		
 
			break;

			




	
	
	
		
 

			




	
	
	
		
 
		case 0x1C: // Miscellaneous flags

			




	
	
	
		
 
			FOR_EACH_OBJECT {

			




	
	
	
		
 
				ei[i].misc_flags = grf_load_byte(&buf);

			




	
	
		
 
@@ -671,7 +678,6 @@ static bool RoadVehicleChangeInfo(uint e

			




	
	
	
		
 

			




	
	
	
		
 
		case 0x18: // Tractive effort

			




	
	
	
		
 
		case 0x19: // Air drag

			




	
	
	
		
 
		case 0x1B: // Retire vehicle early

			




	
	
	
		
 
			/* @todo */

			




	
	
	
		
 
			FOR_EACH_OBJECT grf_load_byte(&buf);

			




	
	
	
		
 
			ret = true;

			




	
	
		
 
@@ -758,6 +764,10 @@ static bool ShipVehicleChangeInfo(uint e

			




	
	
	
		
 
			FOR_EACH_OBJECT ei[i].refit_cost = grf_load_byte(&buf);

			




	
	
	
		
 
			break;

			




	
	
	
		
 

			




	
	
	
		
 
		case 0x16: // Retire vehicle early

			




	
	
	
		
 
			FOR_EACH_OBJECT ei[i].retire_early = grf_load_byte(&buf);

			




	
	
	
		
 
			break;

			




	
	
	
		
 

			




	
	
	
		
 
		case 0x17: // Miscellaneous flags

			




	
	
	
		
 
			FOR_EACH_OBJECT {

			




	
	
	
		
 
				ei[i].misc_flags = grf_load_byte(&buf);

			




	
	
		
 
@@ -779,7 +789,6 @@ static bool ShipVehicleChangeInfo(uint e

			




	
	
	
		
 

			




	
	
	
		
 
		case 0x14: // Ocean speed fraction

			




	
	
	
		
 
		case 0x15: // Canal speed fraction

			




	
	
	
		
 
		case 0x16: // Retire vehicle early

			




	
	
	
		
 
			/* @todo */

			




	
	
	
		
 
			FOR_EACH_OBJECT grf_load_byte(&buf);

			




	
	
	
		
 
			ret = true;

			




	
	
		
 
@@ -871,6 +880,10 @@ static bool AircraftVehicleChangeInfo(ui

			




	
	
	
		
 
			FOR_EACH_OBJECT ei[i].refit_cost = grf_load_byte(&buf);

			




	
	
	
		
 
			break;

			




	
	
	
		
 

			




	
	
	
		
 
		case 0x16: // Retire vehicle early

			




	
	
	
		
 
			FOR_EACH_OBJECT ei[i].retire_early = grf_load_byte(&buf);

			




	
	
	
		
 
			break;

			




	
	
	
		
 

			




	
	
	
		
 
		case 0x17: // Miscellaneous flags

			




	
	
	
		
 
			FOR_EACH_OBJECT {

			




	
	
	
		
 
				ei[i].misc_flags = grf_load_byte(&buf);

			




	
	
		
 
@@ -890,12 +903,6 @@ static bool AircraftVehicleChangeInfo(ui

			




	
	
	
		
 
			FOR_EACH_OBJECT ei[i].base_intro = grf_load_dword(&buf);

			




	
	
	
		
 
			break;

			




	
	
	
		
 

			




	
	
	
		
 
		case 0x16: // Retire vehicle early

			




	
	
	
		
 
			/* @todo */

			




	
	
	
		
 
			FOR_EACH_OBJECT grf_load_byte(&buf);

			




	
	
	
		
 
			ret = true;

			




	
	
	
		
 
			break;

			




	
	
	
		
 

			




	
	
	
		
 
		default:

			




	
	
	
		
 
			ret = true;

			




	
	
	
		
 
			break;

			




        

    


    
    

    

        

                

                    src/table/engines.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -19,7 +19,7 @@

			




	
	
	
		
 
 * @note the 0x80 in parameter b sets the "is carriage bit"

			




	
	
	
		
 
 * @note the 5 between d and e is the load amount

			




	
	
	
		
 
 */

			




	
	
	
		
 
#define MK(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b, 5, e, 0, 8, 0, 0 }

			




	
	
	
		
 
#define MK(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b, 5, e, 0, 8, 0, 0, 0 }

			




	
	
	
		
 

			




	
	
	
		
 
/** Writes the properties of a train carriage into the EngineInfo struct.

			




	
	
	
		
 
 * @param a Introduction date

			




	
	
		
 
@@ -30,7 +30,7 @@

			




	
	
	
		
 
 * @see MK

			




	
	
	
		
 
 * @note the 5 between d and e is the load amount

			




	
	
	
		
 
 */

			




	
	
	
		
 
#define MW(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b | 0x80, 5, e, 0, 8, 0, 0 }

			




	
	
	
		
 
#define MW(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b | 0x80, 5, e, 0, 8, 0, 0, 0 }

			




	
	
	
		
 

			




	
	
	
		
 
/** Writes the properties of a ship into the EngineInfo struct.

			




	
	
	
		
 
 * @param a Introduction date

			




	
	
		
 
@@ -41,7 +41,7 @@

			




	
	
	
		
 
 * @see MK

			




	
	
	
		
 
 * @note the 10 between d and e is the load amount

			




	
	
	
		
 
 */

			




	
	
	
		
 
#define MS(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b, 10, e, 0, 8, 0, 0 }

			




	
	
	
		
 
#define MS(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b, 10, e, 0, 8, 0, 0, 0 }

			




	
	
	
		
 

			




	
	
	
		
 
/** Writes the properties of an aeroplane into the EngineInfo struct.

			




	
	
	
		
 
 * @param a Introduction date

			




	
	
		
 
@@ -52,7 +52,7 @@

			




	
	
	
		
 
 * @see MK

			




	
	
	
		
 
 * @note the 20 between d and e is the load amount

			




	
	
	
		
 
 */

			




	
	
	
		
 
#define MA(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b, 20, e, 0, 8, 0, 0 }

			




	
	
	
		
 
#define MA(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b, 20, e, 0, 8, 0, 0, 0 }

			




	
	
	
		
 

			




	
	
	
		
 
// Climates

			




	
	
	
		
 
// T = Temperate

			




        

    



    


    



    



      

      





    
    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