mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r17085) -Codechange: unify the place where vehicle's cargo ages

This commit is contained in:
smatz 2009-08-06 12:44:10 +00:00
parent 9c25f1bdb7
commit adcc5338f3
5 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/aircraft_cmd.cpp
View File

@ -636,16 +636,6 @@ void Aircraft::OnNewDay()
InvalidateWindowClasses(WC_AIRCRAFT_LIST);
}
static void AgeAircraftCargo(Aircraft *v)
{
if (_age_cargo_skip_counter != 0) return;
do {
v->cargo.AgeCargo();
v = v->Next();
} while (v != NULL);
}
static void HelicopterTickHandler(Aircraft *v)
{
Aircraft *u = v->Next()->Next();
@ -2034,8 +2024,6 @@ bool Aircraft::Tick()
if (this->subtype == AIR_HELICOPTER) HelicopterTickHandler(this);
AgeAircraftCargo(this);
this->current_order_time++;
for (uint i = 0; i != 2; i++) {

8
src/roadveh_cmd.cpp
View File

@ -1826,16 +1826,8 @@ static bool RoadVehController(RoadVehicle *v)
return true;
}
static void AgeRoadVehCargo(RoadVehicle *v)
{
if (_age_cargo_skip_counter != 0) return;
v->cargo.AgeCargo();
}
bool RoadVehicle::Tick()
{
AgeRoadVehCargo(this);
if (this->IsRoadVehFront()) {
if (!(this->vehstatus & VS_STOPPED)) this->running_ticks++;
return RoadVehController(this);

7
src/ship_cmd.cpp
View File

@ -719,17 +719,10 @@ reverse_direction:
goto getout;
}
static void AgeShipCargo(Vehicle *v)
{
if (_age_cargo_skip_counter != 0) return;
v->cargo.AgeCargo();
}
bool Ship::Tick()
{
if (!(this->vehstatus & VS_STOPPED)) this->running_ticks++;
AgeShipCargo(this);
ShipController(this);
return true;

2
src/train_cmd.cpp
View File

@ -4485,8 +4485,6 @@ Money Train::GetRunningCost() const
bool Train::Tick()
{
if (_age_cargo_skip_counter == 0) this->cargo.AgeCargo();
this->tick_counter++;
if (this->IsFrontEngine()) {

2
src/vehicle.cpp
View File

@ -585,6 +585,8 @@ void CallVehicleTicks()
case VEH_ROAD:
case VEH_AIRCRAFT:
case VEH_SHIP:
if (_age_cargo_skip_counter == 0) v->cargo.AgeCargo();
if (v->type == VEH_TRAIN && Train::From(v)->IsWagon()) continue;
if (v->type == VEH_AIRCRAFT && v->subtype != AIR_HELICOPTER) continue;
if (v->type == VEH_ROAD && !RoadVehicle::From(v)->IsRoadVehFront()) continue;