summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortruelight <truelight@openttd.org>2007-06-21 16:53:57 +0000
committertruelight <truelight@openttd.org>2007-06-21 16:53:57 +0000
commitaf8a234db03d075167a3bd50251905b40c6998c2 (patch)
treede64446fa3e39d4d97a3b476b363581bb8acf63d
parent56eb1738ee6de39367047a3cd0f20011560eb393 (diff)
downloadopenttd-af8a234db03d075167a3bd50251905b40c6998c2.tar.xz
(svn r10255) -Codechange: remove some old debug code nobody was using anymore
-rw-r--r--src/gfx.cpp25
-rw-r--r--src/gfx.h5
-rw-r--r--src/video/cocoa_v.mm7
-rw-r--r--src/video/sdl_v.cpp3
-rw-r--r--src/video/win32_v.cpp3
5 files changed, 1 insertions, 42 deletions
diff --git a/src/gfx.cpp b/src/gfx.cpp
index 7d2c9b273..3028f444a 100644
--- a/src/gfx.cpp
+++ b/src/gfx.cpp
@@ -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 @@ void DrawMouseCursor()
_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 @@ void RedrawScreenRect(int left, int top, int right, int bottom)
}
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);
}
diff --git a/src/gfx.h b/src/gfx.h
index edc19ab07..8c6408899 100644
--- a/src/gfx.h
+++ b/src/gfx.h
@@ -302,9 +302,4 @@ enum StringColorFlags {
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 */
diff --git a/src/video/cocoa_v.mm b/src/video/cocoa_v.mm
index 3083414b0..f4dfc5b77 100644
--- a/src/video/cocoa_v.mm
+++ b/src/video/cocoa_v.mm
@@ -77,10 +77,6 @@ extern "C" void HideMenuBar();
#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 @@ static void QZ_GameLoop()
_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();
diff --git a/src/video/sdl_v.cpp b/src/video/sdl_v.cpp
index e42226c3b..1e11b32c3 100644
--- a/src/video/sdl_v.cpp
+++ b/src/video/sdl_v.cpp
@@ -476,9 +476,6 @@ static void SdlVideoMainLoop()
_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 =
diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp
index 91aa28c88..1508e1ebd 100644
--- a/src/video/win32_v.cpp
+++ b/src/video/win32_v.cpp
@@ -826,9 +826,6 @@ static void Win32GdiMainLoop()
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) {