--- a/rail_gui.c	Wed Jan 19 20:22:10 2005 +0000
+++ b/rail_gui.c	Wed Jan 19 20:55:23 2005 +0000
@@ -232,7 +232,7 @@
 
 static void BuildRailClick_AutoRail(Window *w)
 {
-	HandlePlacePushButton(w, 8, _cur_railtype + SPR_OPENTTD_BASE + 4, 1, PlaceRail_AutoRail);
+	HandlePlacePushButton(w, 8, _cur_railtype + SPR_CURSOR_AUTORAIL, VHM_RAIL, PlaceRail_AutoRail);
 }
 
 static void BuildRailClick_Demolish(Window *w)
@@ -266,7 +266,7 @@
 
 static void BuildRailClick_AutoSignals(Window *w)
 {
-	HandlePlacePushButton(w, 13, ANIMCURSOR_BUILDSIGNALS , 1, PlaceRail_AutoSignals);
+	HandlePlacePushButton(w, 13, ANIMCURSOR_BUILDSIGNALS, VHM_RECT, PlaceRail_AutoSignals);
 }
 
 static void BuildRailClick_Bridge(Window *w)
@@ -320,6 +320,10 @@
 	);
 }
 
+/* This code was used for ludde's special autorail autocomplete.
+ * It analyzes the adjecent tiles and bases it's decision which
+ * rail piece to place on this.
+
 typedef struct {
 	byte bit, a,b, mouse;
 } BestFitStruct;
@@ -432,7 +436,9 @@
 
 	return best;
 }
+*/
 
+// This function is more or less a hack because DoRailroadTrack() would otherwise screw up
 static void SwapSelection()
 {
 	TileHighlightData *thd = &_thd;
@@ -442,6 +448,8 @@
 	thd->selend = pt;
 }
 
+/* see above, residue from ludde's special autorail autocomplete
+
 static bool Check2x1AutoRail(int mode)
 {
 	TileHighlightData *thd = &_thd;
@@ -474,46 +482,61 @@
 
 	return false;
 }
-
+*/
 
 static void HandleAutodirPlacement()
 {
 	TileHighlightData *thd = &_thd;
 	int bit;
-
-	if (thd->drawstyle == HT_RECT) {
-		int dx = thd->selstart.x - (thd->selend.x&~0xF);
-		int dy = thd->selstart.y - (thd->selend.y&~0xF);
+	int dx = thd->selstart.x - (thd->selend.x&~0xF);
+	int dy = thd->selstart.y - (thd->selend.y&~0xF);
 
-		if (dx == 0 && dy == 0 ) {
-			// 1x1 tile
-			bit = GetBestFit1x1(thd->selend.x, thd->selend.y);
-			if (bit == -1) return;
-			GenericPlaceRail(TILE_FROM_XY(thd->selend.x, thd->selend.y), bit);
-		} else if (dx == 0) {
-			if (dy == -16) {
-				if (Check2x1AutoRail(0)) return;
-			} else if (dy == 16) {
-				if (Check2x1AutoRail(1)) return;
+	if (thd->drawstyle & HT_RAIL) { // one tile case
+		bit = thd->drawstyle & 0xF;
+		GenericPlaceRail(TILE_FROM_XY(thd->selend.x, thd->selend.y), bit);
+	} else if ( !(thd->drawstyle & 0xE) ) { // x/y dir
+		if (dx == 0) { // Y dir
+			DoRailroadTrack(1);
+		} else {
+			DoRailroadTrack(2);
+		}
+	} else if (myabs(dx)+myabs(dy) >= 32) { // long line (more than 2 tiles)
+		if(thd->drawstyle == (HT_LINE | HT_DIR_HU))
+			DoRailroadTrack(0);
+		if(thd->drawstyle == (HT_LINE | HT_DIR_HL))
+			DoRailroadTrack(3);
+		if(thd->drawstyle == (HT_LINE | HT_DIR_VL))
+			DoRailroadTrack(3);
+		if(thd->drawstyle == (HT_LINE | HT_DIR_VR))
+			DoRailroadTrack(0);
+	} else { // 2x1 pieces line
+		if(thd->drawstyle == (HT_LINE | HT_DIR_HU)) {
+			DoRailroadTrack(0);
+		} else if (thd->drawstyle == (HT_LINE | HT_DIR_HL)) {
+			SwapSelection();
+			DoRailroadTrack(0);
+			SwapSelection();
+		} else if (thd->drawstyle == (HT_LINE | HT_DIR_VL)) {
+			if(dx == 0) {
+				SwapSelection();
+				DoRailroadTrack(0);
+				SwapSelection();
+			} else {
+				DoRailroadTrack(3);
 			}
-			// same x coordinate
-			DoRailroadTrack(VPM_FIX_X);
-		} else {
-			// same y coordinate
-			// check it's it -16 or 16, then we must check if it should be normal tiles or special tiles.
-			if (dx == -16) {
-				if (Check2x1AutoRail(2)) return;
-			} else if (dx == 16) {
-				if (Check2x1AutoRail(3)) return;
+		} else if (thd->drawstyle == (HT_LINE | HT_DIR_VR)) {
+			if(dx == 0) {
+				DoRailroadTrack(0);
+			} else {
+				SwapSelection();
+				DoRailroadTrack(3);
+				SwapSelection();
 			}
-			DoRailroadTrack(VPM_FIX_Y);
 		}
-	} else {
-		DoRailroadTrack(thd->drawstyle & 1 ? 0 : 3);
 	}
 }
 
-static void HandleAutoSignalPlacement()
+static void HandleAutoSignalPlacement(void)
 {
 	TileHighlightData *thd = &_thd;
 	int mode = 0;
@@ -525,7 +548,7 @@
 	if (dx == 0 && dy == 0 ) // 1x1 tile signals
 		GenericPlaceSignals(TILE_FROM_XY(thd->selend.x, thd->selend.y));
 	else { // signals have been dragged
-		if (thd->drawstyle == HT_RECT) { // X,Y direction
+		if (!(thd->drawstyle & 0xE)) { // X,Y direction
 			if (dx == 0)
 				mode = VPM_FIX_X;
 			else if (dy == 0)
@@ -533,16 +556,18 @@
 
 			trackstat = 0xC0;
 		}	else { // W-E or N-S direction
-			mode = thd->drawstyle & 1 ? 0 : 3;
+			if ((thd->drawstyle & 0xF) == 2 || (thd->drawstyle & 0xF) == 5)
+				mode = 0;
+			else
+				mode = 3;
 
 			if (dx == dy || abs(dx - dy) == 16) // North<->South track |
 				trackstat = (thd->drawstyle & 1) ? 0x20 : 0x10;
 			else if (dx == -dy || abs(dx + dy) == 16) // East<->West track --
-				trackstat = (thd->drawstyle & 1) ? 4 : 8;
+				trackstat = (thd->drawstyle & 1) ? 8 : 4;
 		}
-
-		/* _patches.drag_signals_density is given as a parameter such that each user in a network
-		 * game can specify his/her own signal density */
+		// _patches.drag_signals_density is given as a parameter such that each user in a network
+		// game can specify his/her own signal density
 		DoCommandP(TILE_FROM_XY(thd->selstart.x, thd->selstart.y), TILE_FROM_XY(thd->selend.x, thd->selend.y),
 		(mode << 4) | (_remove_button_clicked + (_ctrl_pressed ? 8 : 0)) | (trackstat << 8) | (_patches.drag_signals_density << 24),
 		CcPlaySound1E,