(svn r11449) -Fix [FS#1160]: trams could deadlock themselves. As of now trams will turn as roadvehicles do when the player cannot build a tram track piece on the next tile without destroying anything. It will not turn when the player can build the before mentioned track piece on the 'next' tile.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/table/roadveh.h b/src/table/roadveh.h
index 6f8c7a66d..2ec38760a 100644
--- a/src/table/roadveh.h
+++ b/src/table/roadveh.h
@@ -1099,6 +1099,7 @@ static const RoadDriveEntry _roadveh_tram_turn_ne_0[] = {
 	{ 0, 7},
 	{ 0, 8},
 	{ 0, 9},
+	{RDE_TURNED | DIAGDIR_SW, 0},
 	{ 1, 9},
 	{ 2, 9},
 	{ 3, 9},
@@ -1138,6 +1139,7 @@ static const RoadDriveEntry _roadveh_tram_turn_ne_1[] = {
 	{ 0, 7},
 	{ 0, 6},
 	{ 0, 5},
+	{RDE_TURNED | DIAGDIR_SW, 0},
 	{ 1, 5},
 	{ 2, 5},
 	{ 3, 5},
@@ -1177,6 +1179,7 @@ static const RoadDriveEntry _roadveh_tram_turn_se_0[] = {
 	{7, 15},
 	{8, 15},
 	{9, 15},
+	{RDE_TURNED | DIAGDIR_NW, 0},
 	{9, 14},
 	{9, 13},
 	{9, 12},
@@ -1216,6 +1219,7 @@ static const RoadDriveEntry _roadveh_tram_turn_se_1[] = {
 	{7, 15},
 	{6, 15},
 	{5, 15},
+	{RDE_TURNED | DIAGDIR_NW, 0},
 	{5, 14},
 	{5, 13},
 	{5, 12},
@@ -1255,6 +1259,7 @@ static const RoadDriveEntry _roadveh_tram_turn_sw_0[] = {
 	{15, 7},
 	{15, 6},
 	{15, 5},
+	{RDE_TURNED | DIAGDIR_SW, 0},
 	{14, 5},
 	{13, 5},
 	{12, 5},
@@ -1293,6 +1298,7 @@ static const RoadDriveEntry _roadveh_tram_turn_sw_1[] = {
 	{15, 7},
 	{15, 8},
 	{15, 9},
+	{RDE_TURNED | DIAGDIR_NE, 0},
 	{14, 9},
 	{13, 9},
 	{12, 9},
@@ -1332,6 +1338,7 @@ static const RoadDriveEntry _roadveh_tram_turn_nw_0[] = {
 	{7,  0},
 	{6,  0},
 	{5,  0},
+	{RDE_TURNED | DIAGDIR_SE, 0},
 	{5,  1},
 	{5,  2},
 	{5,  3},
@@ -1370,6 +1377,7 @@ static const RoadDriveEntry _roadveh_tram_turn_nw_1[] = {
 	{7,  0},
 	{8,  0},
 	{9,  0},
+	{RDE_TURNED | DIAGDIR_SE, 0},
 	{9,  1},
 	{9,  2},
 	{9,  3},