Index: trunk/src_plugins/tool_std/tool_arc.c
===================================================================
--- trunk/src_plugins/tool_std/tool_arc.c	(revision 29326)
+++ trunk/src_plugins/tool_std/tool_arc.c	(revision 29327)
@@ -52,7 +52,7 @@
 void pcb_tool_arc_init(void)
 {
 	pcb_notify_crosshair_change(pcb_false);
-	if (pcb_tool_prev_id == PCB_MODE_LINE && pcb_crosshair.AttachedLine.State != PCB_CH_STATE_FIRST) {
+	if (pcb_tool_prev_id == pcb_crosshair.tool_line && pcb_crosshair.AttachedLine.State != PCB_CH_STATE_FIRST) {
 		pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST;
 		pcb_crosshair.AttachedBox.State = PCB_CH_STATE_SECOND;
 		pcb_crosshair.AttachedBox.Point1.X = pcb_crosshair.AttachedBox.Point2.X = pcb_crosshair.AttachedLine.Point1.X;
@@ -66,7 +66,7 @@
 {
 	pcb_notify_crosshair_change(pcb_false);
 	pcb_added_lines = 0;
-	if (pcb_tool_next_id != PCB_MODE_LINE) {
+	if (pcb_tool_next_id != pcb_crosshair.tool_line) {
 		pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST;
 		if (!pcb_marked.user_placed)
 			pcb_crosshair_set_local_ref(0, 0, pcb_false);
Index: trunk/src_plugins/tool_std/tool_line.c
===================================================================
--- trunk/src_plugins/tool_std/tool_line.c	(revision 29326)
+++ trunk/src_plugins/tool_std/tool_line.c	(revision 29327)
@@ -64,7 +64,7 @@
 void pcb_tool_line_init(void)
 {
 	pcb_notify_crosshair_change(pcb_false);
-	if (pcb_tool_prev_id == PCB_MODE_ARC && pcb_crosshair.AttachedBox.State != PCB_CH_STATE_FIRST) {
+	if (pcb_tool_prev_id == pcb_crosshair.tool_arc && pcb_crosshair.AttachedBox.State != PCB_CH_STATE_FIRST) {
 		pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST;
 		pcb_crosshair.AttachedLine.State = PCB_CH_STATE_SECOND;
 		pcb_crosshair.AttachedLine.Point1.X = pcb_crosshair.AttachedLine.Point2.X = pcb_crosshair.AttachedBox.Point1.X;
@@ -87,7 +87,7 @@
 	pcb_notify_crosshair_change(pcb_false);
 	pcb_added_lines = 0;
 	pcb_route_reset(&pcb_crosshair.Route);
-	if (pcb_tool_next_id != PCB_MODE_ARC) {
+	if (pcb_tool_next_id != pcb_crosshair.tool_arc) {
 		pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST;
 		if (!pcb_marked.user_placed)
 			pcb_crosshair_set_local_ref(0, 0, pcb_false);
Index: trunk/src_plugins/tool_std/tool_poly.c
===================================================================
--- trunk/src_plugins/tool_std/tool_poly.c	(revision 29326)
+++ trunk/src_plugins/tool_std/tool_poly.c	(revision 29327)
@@ -124,7 +124,7 @@
 									 pcb_crosshair.AttachedLine.Point1.X,
 									 pcb_crosshair.AttachedLine.Point1.Y, pcb_crosshair.AttachedLine.Point2.X, pcb_crosshair.AttachedLine.Point2.Y);
 
-	/* draw attached polygon only if in PCB_MODE_POLYGON or PCB_MODE_POLYGON_HOLE */
+	/* draw attached polygon only if in polygon or polygon_hole tool */
 	if (pcb_crosshair.AttachedPolygon.PointN > 1) {
 		pcb_xordraw_poly(&pcb_crosshair.AttachedPolygon, 0, 0, 1);
 	}
Index: trunk/src_plugins/tool_std/tool_polyhole.c
===================================================================
--- trunk/src_plugins/tool_std/tool_polyhole.c	(revision 29326)
+++ trunk/src_plugins/tool_std/tool_polyhole.c	(revision 29327)
@@ -154,7 +154,7 @@
 									 pcb_crosshair.AttachedLine.Point1.X,
 									 pcb_crosshair.AttachedLine.Point1.Y, pcb_crosshair.AttachedLine.Point2.X, pcb_crosshair.AttachedLine.Point2.Y);
 
-	/* draw attached polygon only if in PCB_MODE_POLYGON or PCB_MODE_POLYGON_HOLE */
+	/* draw attached polygon only if in polygon or polygon_hole tool */
 	if (pcb_crosshair.AttachedPolygon.PointN > 1) {
 		pcb_xordraw_poly(&pcb_crosshair.AttachedPolygon, 0, 0, 1);
 	}