diff --git a/includes/graphics.h b/includes/graphics.h
index 8cd2e55e5..c5a261dbb 100644
--- a/includes/graphics.h
+++ b/includes/graphics.h
@@ -164,7 +164,7 @@ void render_cursor(pixel *vid, int x, int y, int t, int rx, int ry);
 
 int sdl_open(void);
 
-int draw_debug_info(pixel* vid, int lm, int lx, int ly, int cx, int cy);
+int draw_debug_info(pixel* vid, int lm, int lx, int ly, int cx, int cy, int line_x, int line_y);
 
 #ifdef OpenGL
 void Enable2D ();
diff --git a/src/graphics.c b/src/graphics.c
index 696cab9eb..c5f1f55f2 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -4706,30 +4706,30 @@ int sdl_open(void)
 	return 1;
 }
 
-int draw_debug_info(pixel* vid, int lm, int lx, int ly, int cx, int cy)
+int draw_debug_info(pixel* vid, int lm, int lx, int ly, int cx, int cy, int line_x, int line_y)
 {
 	char infobuf[256];
 	if(debug_flags & DEBUG_DRAWTOOL)
 	{
 		if(lm == 1) //Line tool
 		{
-			blend_line(vid, 0, cy, XRES, cy, 255, 255, 255, 120);
-			blend_line(vid, cx, 0, cx, YRES, 255, 255, 255, 120);
+			blend_line(vid, 0, line_y, XRES, line_y, 255, 255, 255, 120);
+			blend_line(vid, line_x, 0, line_x, YRES, 255, 255, 255, 120);
 	
 			blend_line(vid, 0, ly, XRES, ly, 255, 255, 255, 120);
 			blend_line(vid, lx, 0, lx, YRES, 255, 255, 255, 120);
 			
 			sprintf(infobuf, "%d x %d", lx, ly);
-			drawtext_outline(vid, lx+(lx>cx?3:-textwidth(infobuf)-3), ly+(ly<cy?-10:3), infobuf, 255, 255, 255, 200, 0, 0, 0, 120);
+			drawtext_outline(vid, lx+(lx>line_x?3:-textwidth(infobuf)-3), ly+(ly<line_y?-10:3), infobuf, 255, 255, 255, 200, 0, 0, 0, 120);
 			
-			sprintf(infobuf, "%d x %d", cx, cy);
-			drawtext_outline(vid, cx+(lx<cx?3:-textwidth(infobuf)-2), cy+(ly>cy?-10:3), infobuf, 255, 255, 255, 200, 0, 0, 0, 120);
+			sprintf(infobuf, "%d x %d", line_x, line_y);
+			drawtext_outline(vid, line_x+(lx<line_x?3:-textwidth(infobuf)-2), line_y+(ly>line_y?-10:3), infobuf, 255, 255, 255, 200, 0, 0, 0, 120);
 			
-			sprintf(infobuf, "%d", abs(cx-lx));
-			drawtext_outline(vid, cx+(lx<cx?-(cx-lx)/2:(lx-cx)/2)-textwidth(infobuf)/2, cy+(ly>cy?-10:3), infobuf, 255, 255, 255, 200, 0, 0, 0, 120);
+			sprintf(infobuf, "%d", abs(line_x-lx));
+			drawtext_outline(vid, (line_x+lx)/2-textwidth(infobuf)/2, line_y+(ly>line_y?-10:3), infobuf, 255, 255, 255, 200, 0, 0, 0, 120);
 			
-			sprintf(infobuf, "%d", abs(cy-ly));
-			drawtext_outline(vid, cx+(lx<cx?3:-textwidth(infobuf)-2), cy+(ly>cy?-(cy-ly)/2:(ly-cy)/2)-3, infobuf, 255, 255, 255, 200, 0, 0, 0, 120);
+			sprintf(infobuf, "%d", abs(line_y-ly));
+			drawtext_outline(vid, line_x+(lx<line_x?3:-textwidth(infobuf)-2), (line_y+ly)/2-3, infobuf, 255, 255, 255, 200, 0, 0, 0, 120);
 		}
 	}
 	if(debug_flags & DEBUG_PARTS)
diff --git a/src/main.c b/src/main.c
index 95759ab2d..7f048954a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1870,7 +1870,7 @@ int main(int argc, char *argv[])
 		
 		if(debug_flags)
 		{
-			draw_debug_info(vid_buf, lm, lx, ly, x, y);
+			draw_debug_info(vid_buf, lm, lx, ly, x, y, line_x, line_y);
 		}
 
 		if (http_session_check)