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

(svn r11332) -Fix: vehicles getting a value of 0 on construction. 

-Fix: assertion when selling vehicles.
This commit is contained in:
rubidium 2007-10-21 16:45:00 +00:00
parent af9521ff14
commit 4bb210614b
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/aircraft_cmd.cpp
View File

@ -299,9 +299,9 @@ CommandCost CmdBuildAircraft(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
Vehicle *v = vl[0]; // aircraft Vehicle *v = vl[0]; // aircraft
Vehicle *u = vl[1]; // shadow Vehicle *u = vl[1]; // shadow
v->unitnumber = unit_num;
v = new (v) Aircraft(); v = new (v) Aircraft();
u = new (u) Aircraft(); u = new (u) Aircraft();
v->unitnumber = unit_num;
v->direction = DIR_SE; v->direction = DIR_SE;
v->owner = u->owner = _current_player; 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); SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES);
CommandCost ret(-v->value);
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
// Invalidate depot // Invalidate depot
InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); InvalidateWindow(WC_VEHICLE_DEPOT, v->tile);
DoDeleteAircraft(v); DoDeleteAircraft(v);
} }
return CommandCost(-v->value); return ret;
} }
/** Start/Stop an aircraft. /** Start/Stop an aircraft.

2
src/roadveh_cmd.cpp
View File

@ -202,6 +202,7 @@ CommandCost CmdBuildRoadVeh(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
const RoadVehicleInfo *rvi = RoadVehInfo(p1); const RoadVehicleInfo *rvi = RoadVehInfo(p1);
v = new (v) RoadVehicle();
v->unitnumber = unit_num; v->unitnumber = unit_num;
v->direction = DiagDirToDir(GetRoadDepotDirection(tile)); v->direction = DiagDirToDir(GetRoadDepotDirection(tile));
v->owner = _current_player; v->owner = _current_player;
@ -247,7 +248,6 @@ CommandCost CmdBuildRoadVeh(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
v->date_of_last_service = _date; v->date_of_last_service = _date;
v->build_year = _cur_year; v->build_year = _cur_year;
v = new (v) RoadVehicle();
v->cur_image = 0xC15; v->cur_image = 0xC15;
v->random_bits = VehicleRandomBits(); v->random_bits = VehicleRandomBits();
SetRoadVehFront(v); SetRoadVehFront(v);

6
src/ship_cmd.cpp
View File

@ -835,6 +835,7 @@ CommandCost CmdBuildShip(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
const ShipVehicleInfo *svi = ShipVehInfo(p1); const ShipVehicleInfo *svi = ShipVehInfo(p1);
v = new (v) Ship();
v->unitnumber = unit_num; v->unitnumber = unit_num;
v->owner = _current_player; v->owner = _current_player;
@ -871,7 +872,6 @@ CommandCost CmdBuildShip(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
v->date_of_last_service = _date; v->date_of_last_service = _date;
v->build_year = _cur_year; v->build_year = _cur_year;
v->cur_image = 0x0E5E; v->cur_image = 0x0E5E;
v = new (v) Ship();
v->random_bits = VehicleRandomBits(); v->random_bits = VehicleRandomBits();
v->vehicle_flags = 0; v->vehicle_flags = 0;
@ -919,6 +919,8 @@ CommandCost CmdSellShip(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
return_cmd_error(STR_980B_SHIP_MUST_BE_STOPPED_IN); return_cmd_error(STR_980B_SHIP_MUST_BE_STOPPED_IN);
} }
CommandCost ret(-v->value);
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); InvalidateWindow(WC_VEHICLE_DEPOT, v->tile);
RebuildVehicleLists(); RebuildVehicleLists();
@ -928,7 +930,7 @@ CommandCost CmdSellShip(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
delete v; delete v;
} }
return CommandCost(-v->value); return ret;
} }
/** Start/Stop a ship. /** Start/Stop a ship.

2
src/train_cmd.cpp
View File

@ -540,6 +540,7 @@ static CommandCost CmdBuildRailWagon(EngineID engine, TileIndex tile, uint32 fla
} }
} }
v = new (v) Train();
v->engine_type = engine; v->engine_type = engine;
DiagDirection dir = GetRailDepotDirection(tile); DiagDirection dir = GetRailDepotDirection(tile);
@ -557,7 +558,6 @@ static CommandCost CmdBuildRailWagon(EngineID engine, TileIndex tile, uint32 fla
v->u.rail.track = TRACK_BIT_DEPOT; v->u.rail.track = TRACK_BIT_DEPOT;
v->vehstatus = VS_HIDDEN | VS_DEFPAL; v->vehstatus = VS_HIDDEN | VS_DEFPAL;
v = new (v) Train();
v->subtype = 0; v->subtype = 0;
SetTrainWagon(v); SetTrainWagon(v);