diff options
| author | frosch <frosch@openttd.org> | 2010-06-05 12:16:12 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2010-06-05 12:16:12 +0000 |
| commit | 1d3adb2b66989630b2a3c201ac1210a886d41a51 (patch) | |
| tree | c7c2c22646cfdeb1312455bfd9d59674b7ff96be /src/aircraft_cmd.cpp | |
| parent | 406c2a986571ce594f491c0fde225b89f14ac8c3 (diff) | |
| download | openttd-1d3adb2b66989630b2a3c201ac1210a886d41a51.tar.xz | |
(svn r19931) -Fix (r19914): Convert assertion in Backup<> destructor into DEBUG() output. It was triggered on exceptions, especially when aborting world generation.
Diffstat (limited to 'src/aircraft_cmd.cpp')
| -rw-r--r-- | src/aircraft_cmd.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index 450eb8b9b..c4383b886 100644 --- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -1204,7 +1204,7 @@ void HandleMissingAircraftOrders(Aircraft *v) */ const Station *st = GetTargetAirportIfValid(v); if (st == NULL) { - Backup<CompanyByte> cur_company(_current_company, v->owner); + Backup<CompanyByte> cur_company(_current_company, v->owner, FILE_LINE); CommandCost ret = DoCommand(v->tile, v->index, 0, DC_EXEC, CMD_SEND_AIRCRAFT_TO_HANGAR); cur_company.Restore(); @@ -1510,7 +1510,7 @@ static void AircraftEventHandler_HeliTakeOff(Aircraft *v, const AirportFTAClass /* Send the helicopter to a hangar if needed for replacement */ if (v->NeedsAutomaticServicing()) { - Backup<CompanyByte> cur_company(_current_company, v->owner); + Backup<CompanyByte> cur_company(_current_company, v->owner, FILE_LINE); DoCommand(v->tile, v->index, DEPOT_SERVICE | DEPOT_LOCATE_HANGAR, DC_EXEC, CMD_SEND_AIRCRAFT_TO_HANGAR); cur_company.Restore(); } @@ -1562,7 +1562,7 @@ static void AircraftEventHandler_Landing(Aircraft *v, const AirportFTAClass *apc /* check if the aircraft needs to be replaced or renewed and send it to a hangar if needed */ if (v->NeedsAutomaticServicing()) { - Backup<CompanyByte> cur_company(_current_company, v->owner); + Backup<CompanyByte> cur_company(_current_company, v->owner, FILE_LINE); DoCommand(v->tile, v->index, DEPOT_SERVICE, DC_EXEC, CMD_SEND_AIRCRAFT_TO_HANGAR); cur_company.Restore(); } |