dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r6524) -Code cleanup r6515: cleaned up the command to start/stop all vehicles in a depot.

Browse Source 
IsWholeTrainInDepot() is removed as CheckTrainInDepot() could be used instead
  Cleaned up the check to see if a vehicle is valid for start/stop
This commit is contained in:
bjarni
2006-09-27 12:17:33 +00:00
parent cbf2310bb5
commit 97210faa75
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
train.h
View File

@@ -218,12 +218,6 @@ static inline Vehicle *GetNextVehicle(const Vehicle *v)
void ConvertOldMultiheadToNew(void);
void ConnectMultiheadedTrains(void);
static inline bool IsWholeTrainInDepot(const Vehicle *v)
{
for (; v != NULL; v = v->next) {
if (!(v->vehstatus & VS_HIDDEN)) return false;
}
return true;
}
int CheckTrainInDepot(const Vehicle *v, bool needs_to_be_stopped);
#endif /* TRAIN_H */

2
train_cmd.c
View File

@@ -832,7 +832,7 @@ int32 CmdBuildRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
/* Check if all the wagons of the given train are in a depot, returns the
* number of cars (including loco) then. If not it returns -1 */
static int CheckTrainInDepot(const Vehicle *v, bool needs_to_be_stopped)
int CheckTrainInDepot(const Vehicle *v, bool needs_to_be_stopped)
{
int count;
TileIndex tile = v->tile;

14
vehicle.c
View File

@@ -1570,8 +1570,8 @@ int32 CmdMassStartStopVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2
int32 return_value = CMD_ERROR;
uint i;
uint stop_command;
byte vehicle_type = p1;
byte start_stop = p2;
byte vehicle_type = GB(p1, 0, 8);
bool start_stop = HASBIT(p2, 0);
switch (vehicle_type) {
case VEH_Train: stop_command = CMD_START_STOP_TRAIN; break;
@@ -1589,8 +1589,12 @@ int32 CmdMassStartStopVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2
int32 ret;
if (!!(v->vehstatus & VS_STOPPED) != start_stop) continue;
if (!(v->vehstatus & VS_HIDDEN)) continue;
if (p1 == VEH_Train && !IsWholeTrainInDepot(v)) continue;
if (vehicle_type == VEH_Train) {
if (CheckTrainInDepot(v, false) == -1) continue;
} else {
if (!(v->vehstatus & VS_HIDDEN)) continue;
}
ret = DoCommand(tile, v->index, 0, flags, stop_command);
if (!CmdFailed(ret)) {
@@ -1601,7 +1605,7 @@ int32 CmdMassStartStopVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2
}
}
free((void*)vl);
free(vl);
return return_value;
}