(svn r10012) -Fix (r9999): crash when forcing road vehicles to turn
authorglx
Fri, 01 Jun 2007 16:06:23 +0000
changeset 7272 95879be6cb58
parent 7271 e99e02b7a495
child 7273 0565a3943a96
(svn r10012) -Fix (r9999): crash when forcing road vehicles to turn
src/roadveh_cmd.cpp
--- a/src/roadveh_cmd.cpp	Fri Jun 01 12:26:14 2007 +0000
+++ b/src/roadveh_cmd.cpp	Fri Jun 01 16:06:23 2007 +0000
@@ -485,7 +485,7 @@
 		return CMD_ERROR;
 	}
 
-	if (GetDisallowedRoadDirections(v->tile) != DRD_NONE) return CMD_ERROR;
+	if (IsTileType(v->tile, MP_STREET) && GetRoadTileType(v->tile) == ROAD_TILE_NORMAL && GetDisallowedRoadDirections(v->tile) != DRD_NONE) return CMD_ERROR;
 
 	if (IsTunnelTile(v->tile) && DirToDiagDir(v->direction) == GetTunnelDirection(v->tile)) return CMD_ERROR;
 	if (IsBridgeTile(v->tile) && DirToDiagDir(v->direction) == GetBridgeRampDirection(v->tile)) return CMD_ERROR;
@@ -1417,7 +1417,7 @@
 					v->cur_speed = 0;
 					return;
 				}
-			} else if (IsTileType(tile, MP_STREET) && GetRoadTileType(v->tile) == ROAD_TILE_NORMAL && GetDisallowedRoadDirections(v->tile) != DRD_NONE) {
+			} else if (IsTileType(v->tile, MP_STREET) && GetRoadTileType(v->tile) == ROAD_TILE_NORMAL && GetDisallowedRoadDirections(v->tile) != DRD_NONE) {
 				v->cur_speed = 0;
 				return;
 			} else {