Changeset - r9943:38700f276db2
Parent rev.
Child rev.
[Not reviewed]
master
0 3 0
celestar - 16 years ago 2008-08-18 16:52:40
celestar@openttd.org
(svn r14098) -Fix: Make the 'Transfer Credit' display aware of the entire consist, not only the first vehicle
3 files changed with 10 insertions and 3 deletions:
src/aircraft_gui.cpp
3
1
src/roadveh_gui.cpp
4
1
src/train_gui.cpp
3
1
0 comments (0 inline, 0 general)
src/aircraft_gui.cpp
➞
Show inline comments
 
@@ -28,6 +28,7 @@
 
void DrawAircraftDetails(const Vehicle *v, int x, int y)
 
{
 
	int y_offset = (v->Next()->cargo_cap != 0) ? -11 : 0;
 
	Money feeder_share = 0;
 

			




	
	
	
		
 
	for (const Vehicle *u = v ; u != NULL ; u = u->Next()) {

			




	
	
	
		
 
		if (IsNormalAircraft(u)) {

			




	
	
		
 
@@ -53,11 +54,12 @@ void DrawAircraftDetails(const Vehicle *

			




	
	
	
		
 
				SetDParam(1, cargo_count);

			




	
	
	
		
 
				SetDParam(2, u->cargo.Source());

			




	
	
	
		
 
				DrawString(x, y + 21 + y_offset, STR_8813_FROM, TC_FROMSTRING);

			




	
	
	
		
 
				feeder_share += u->cargo.FeederShare();

			




	
	
	
		
 
			}

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	SetDParam(0, v->cargo.FeederShare());

			




	
	
	
		
 
	SetDParam(0, feeder_share);

			




	
	
	
		
 
	DrawString(x, y + 33 + y_offset, STR_FEEDER_CARGO_VALUE, TC_FROMSTRING);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    src/roadveh_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -25,6 +25,7 @@ void DrawRoadVehDetails(const Vehicle *v

			




	
	
	
		
 
{

			




	
	
	
		
 
	uint y_offset = RoadVehHasArticPart(v) ? 15 : 0;

			




	
	
	
		
 
	StringID str;

			




	
	
	
		
 
	Money feeder_share = 0;

			




	
	
	
		
 

			




	
	
	
		
 
	SetDParam(0, v->engine_type);

			




	
	
	
		
 
	SetDParam(1, v->build_year);

			




	
	
		
 
@@ -70,6 +71,7 @@ void DrawRoadVehDetails(const Vehicle *v

			




	
	
	
		
 
				SetDParam(1, u->cargo.Count());

			




	
	
	
		
 
				SetDParam(2, u->cargo.Source());

			




	
	
	
		
 
				str = STR_8813_FROM;

			




	
	
	
		
 
				feeder_share += u->cargo.FeederShare();

			




	
	
	
		
 
			}

			




	
	
	
		
 
			DrawString(x, y + 21 + y_offset, str, TC_FROMSTRING);

			




	
	
	
		
 

			




	
	
		
 
@@ -88,12 +90,13 @@ void DrawRoadVehDetails(const Vehicle *v

			




	
	
	
		
 
			SetDParam(1, v->cargo.Count());

			




	
	
	
		
 
			SetDParam(2, v->cargo.Source());

			




	
	
	
		
 
			str = STR_8813_FROM;

			




	
	
	
		
 
			feeder_share += v->cargo.FeederShare();

			




	
	
	
		
 
		}

			




	
	
	
		
 
		DrawString(x, y + 21 + y_offset, str, TC_FROMSTRING);

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	/* Draw Transfer credits text */

			




	
	
	
		
 
	SetDParam(0, v->cargo.FeederShare());

			




	
	
	
		
 
	SetDParam(0, feeder_share);

			




	
	
	
		
 
	DrawString(x, y + 33 + y_offset, STR_FEEDER_CARGO_VALUE, TC_FROMSTRING);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    src/train_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -231,6 +231,7 @@ void DrawTrainDetails(const Vehicle *v, 

			




	
	
	
		
 
	} else {

			




	
	
	
		
 
		AcceptedCargo act_cargo;

			




	
	
	
		
 
		AcceptedCargo max_cargo;

			




	
	
	
		
 
		Money         feeder_share = 0;

			




	
	
	
		
 

			




	
	
	
		
 
		memset(max_cargo, 0, sizeof(max_cargo));

			




	
	
	
		
 
		memset(act_cargo, 0, sizeof(act_cargo));

			




	
	
		
 
@@ -238,6 +239,7 @@ void DrawTrainDetails(const Vehicle *v, 

			




	
	
	
		
 
		for (const Vehicle *u = v; u != NULL ; u = u->Next()) {

			




	
	
	
		
 
			act_cargo[u->cargo_type] += u->cargo.Count();

			




	
	
	
		
 
			max_cargo[u->cargo_type] += u->cargo_cap;

			




	
	
	
		
 
			feeder_share             += u->cargo.FeederShare();

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		/* draw total cargo tab */

			




	
	
		
 
@@ -253,7 +255,7 @@ void DrawTrainDetails(const Vehicle *v, 

			




	
	
	
		
 
				DrawString(x, y + 2, FreightWagonMult(i) > 1 ? STR_TOTAL_CAPACITY_MULT : STR_TOTAL_CAPACITY, TC_FROMSTRING);

			




	
	
	
		
 
			}

			




	
	
	
		
 
		}

			




	
	
	
		
 
		SetDParam(0, v->cargo.FeederShare());

			




	
	
	
		
 
		SetDParam(0, feeder_share);

			




	
	
	
		
 
		DrawString(x, y + 15, STR_FEEDER_CARGO_VALUE, TC_FROMSTRING);

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




        

    



    


    



    



      

      





    
    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