--- a/src/gfx.cpp	Thu Jun 21 16:17:47 2007 +0000
+++ b/src/gfx.cpp	Thu Jun 21 16:53:57 2007 +0000
@@ -22,10 +22,6 @@
 #include "texteff.hpp"
 #include "blitter/factory.hpp"
 
-#ifdef _DEBUG
-bool _dbg_screen_rect;
-#endif
-
 byte _dirkeys;        ///< 1 = left, 2 = up, 4 = right, 8 = down
 bool _fullscreen;
 CursorVars _cursor;
@@ -896,20 +892,6 @@
 	_cursor.dirty = false;
 }
 
-#if defined(_DEBUG)
-static void DbgScreenRect(int left, int top, int right, int bottom)
-{
-	DrawPixelInfo dp;
-	DrawPixelInfo *old;
-
-	old = _cur_dpi;
-	_cur_dpi = &dp;
-	dp = _screen;
-	GfxFillRect(left, top, right - 1, bottom - 1, rand() & 255);
-	_cur_dpi = old;
-}
-#endif
-
 void RedrawScreenRect(int left, int top, int right, int bottom)
 {
 	assert(right <= _screen.width && bottom <= _screen.height);
@@ -923,12 +905,7 @@
 	}
 	UndrawTextMessage();
 
-#if defined(_DEBUG)
-	if (_dbg_screen_rect)
-		DbgScreenRect(left, top, right, bottom);
-	else
-#endif
-		DrawOverlappedWindowForAll(left, top, right, bottom);
+	DrawOverlappedWindowForAll(left, top, right, bottom);
 
 	_video_driver->make_dirty(left, top, right - left, bottom - top);
 }

--- a/src/gfx.h	Thu Jun 21 16:17:47 2007 +0000
+++ b/src/gfx.h	Thu Jun 21 16:53:57 2007 +0000
@@ -302,9 +302,4 @@
 	IS_PALETTE_COLOR = 0x100, ///< color value is already a real palette color index, not an index of a StringColor
 };
 
-
-#ifdef _DEBUG
-extern bool _dbg_screen_rect;
-#endif
-
 #endif /* GFX_H */

--- a/src/video/cocoa_v.mm	Thu Jun 21 16:17:47 2007 +0000
+++ b/src/video/cocoa_v.mm	Thu Jun 21 16:53:57 2007 +0000
@@ -77,10 +77,6 @@
 #undef Point
 #undef Rect
 
-/* Taken from ../gfx.h */
-extern bool _dbg_screen_rect;
-
-
 /* Subclass of NSWindow to fix genie effect and support resize events  */
 @interface OTTD_QuartzWindow : NSWindow
 - (void)miniaturize:(id)sender;
@@ -740,9 +736,6 @@
 
 			_ctrl_pressed = !!(_cocoa_video_data.current_mods & NSControlKeyMask);
 			_shift_pressed = !!(_cocoa_video_data.current_mods & NSShiftKeyMask);
-#ifdef _DEBUG
-			_dbg_screen_rect = !!(_cocoa_video_data.current_mods & NSAlphaShiftKeyMask);
-#endif
 
 			GameLoop();
 

--- a/src/video/sdl_v.cpp	Thu Jun 21 16:17:47 2007 +0000
+++ b/src/video/sdl_v.cpp	Thu Jun 21 16:53:57 2007 +0000
@@ -476,9 +476,6 @@
 
 			_ctrl_pressed  = !!(mod & KMOD_CTRL);
 			_shift_pressed = !!(mod & KMOD_SHIFT);
-#ifdef _DEBUG
-			_dbg_screen_rect = !!(mod & KMOD_CAPS);
-#endif
 
 			// determine which directional keys are down
 			_dirkeys =

--- a/src/video/win32_v.cpp	Thu Jun 21 16:17:47 2007 +0000
+++ b/src/video/win32_v.cpp	Thu Jun 21 16:53:57 2007 +0000
@@ -826,9 +826,6 @@
 			next_tick = cur_ticks + 30;
 			_ctrl_pressed = _wnd.has_focus && GetAsyncKeyState(VK_CONTROL)<0;
 			_shift_pressed = _wnd.has_focus && GetAsyncKeyState(VK_SHIFT)<0;
-#ifdef _DEBUG
-			_dbg_screen_rect = _wnd.has_focus && GetAsyncKeyState(VK_CAPITAL)<0;
-#endif
 
 			// determine which directional keys are down
 			if (_wnd.has_focus) {