petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r10409) -Codechange: replace (Aircraft|RoadVeh|Ship|Train)_Tick with a Tick method in the Vehicle class.

Browse Source
This commit is contained in:
rubidium
2007-07-01 19:24:54 +00:00
parent 83a880c882
commit 90f85c957a
11 changed files with 40 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/aircraft_cmd.cpp
View File

@@ -2110,17 +2110,17 @@ static void AircraftEventHandler(Vehicle *v, int loop)
AirportGoToNextPosition(v);
}
void Aircraft_Tick(Vehicle *v)
void Aircraft::Tick()
{
if (!IsNormalAircraft(v)) return;
if (!IsNormalAircraft(this)) return;
if (v->subtype == AIR_HELICOPTER) HelicopterTickHandler(v);
if (this->subtype == AIR_HELICOPTER) HelicopterTickHandler(this);
AgeAircraftCargo(v);
AgeAircraftCargo(this);
for (uint i = 0; i != 2; i++) {
AircraftEventHandler(v, i);
if (v->type != VEH_AIRCRAFT) // In case it was deleted
AircraftEventHandler(this, i);
if (this->type != VEH_AIRCRAFT) // In case it was deleted
break;
}
}