diff options
| author | rubidium <rubidium@openttd.org> | 2007-10-21 16:45:00 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2007-10-21 16:45:00 +0000 |
| commit | 4bb210614bd00b7a422fa4faec7974da6375a82c (patch) | |
| tree | cd686f6450772b50dedda10abfb06673a2a35a26 /src/aircraft_cmd.cpp | |
| parent | af9521ff141848685c80e6d535b25965cb7bfb0f (diff) | |
| download | openttd-4bb210614bd00b7a422fa4faec7974da6375a82c.tar.xz | |
(svn r11332) -Fix: vehicles getting a value of 0 on construction.
-Fix: assertion when selling vehicles.
Diffstat (limited to 'src/aircraft_cmd.cpp')
| -rw-r--r-- | src/aircraft_cmd.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index a879554ed..fa33bb2c0 100644 --- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -299,9 +299,9 @@ CommandCost CmdBuildAircraft(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) Vehicle *v = vl[0]; // aircraft Vehicle *u = vl[1]; // shadow - v->unitnumber = unit_num; v = new (v) Aircraft(); u = new (u) Aircraft(); + v->unitnumber = unit_num; v->direction = DIR_SE; v->owner = u->owner = _current_player; @@ -491,13 +491,15 @@ CommandCost CmdSellAircraft(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES); + CommandCost ret(-v->value); + if (flags & DC_EXEC) { // Invalidate depot InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); DoDeleteAircraft(v); } - return CommandCost(-v->value); + return ret; } /** Start/Stop an aircraft. |