summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@openttd.org>2005-07-27 19:22:38 +0000
committertron <tron@openttd.org>2005-07-27 19:22:38 +0000
commit286f8726d5453ecb05c16a29e0e652210e04bda9 (patch)
treea870ac7c944b92964c616675d5f385365c5d568a
parent6f74bbaeec503b01a317d9e6f52cb545f6835c3a (diff)
downloadopenttd-286f8726d5453ecb05c16a29e0e652210e04bda9.tar.xz
(svn r2725) Move MyShowCursor() back into win32.c, it fits better there
-rw-r--r--video/win32_v.c12
-rw-r--r--video/win32_v.h2
-rw-r--r--win32.c11
-rw-r--r--win32.h2
4 files changed, 14 insertions, 13 deletions
diff --git a/video/win32_v.c b/video/win32_v.c
index 6710459ef..d4e1ff1fa 100644
--- a/video/win32_v.c
+++ b/video/win32_v.c
@@ -7,6 +7,7 @@
#include "../macros.h"
#include "../network.h"
#include "../variables.h"
+#include "../win32.h"
#include "../window.h"
#include "win32_v.h"
#include <windows.h>
@@ -65,17 +66,6 @@ static void UpdatePalette(HDC dc, uint start, uint count)
SetDIBColorTable(dc, start, count, rgb);
}
-bool MyShowCursor(bool show)
-{
- if (_wnd.cursor_visible == show)
- return show;
-
- _wnd.cursor_visible = show;
- ShowCursor(show);
-
- return !show;
-}
-
typedef struct {
byte vk_from;
byte vk_count;
diff --git a/video/win32_v.h b/video/win32_v.h
index ccc9aed94..c3b23a61a 100644
--- a/video/win32_v.h
+++ b/video/win32_v.h
@@ -5,8 +5,6 @@
#include "../hal.h"
-bool MyShowCursor(bool show);
-
extern const HalVideoDriver _win32_video_driver;
#endif
diff --git a/win32.c b/win32.c
index d93b800e2..e99490e9d 100644
--- a/win32.c
+++ b/win32.c
@@ -40,6 +40,17 @@ static bool _has_console;
#endif
+bool MyShowCursor(bool show)
+{
+ if (_wnd.cursor_visible == show) return show;
+
+ _wnd.cursor_visible = show;
+ ShowCursor(show);
+
+ return !show;
+}
+
+
// Helper function needed by dynamically loading SDL
bool LoadLibraryList(Function proc[], const char* dll)
{
diff --git a/win32.h b/win32.h
index fb33a93ab..f28481ff4 100644
--- a/win32.h
+++ b/win32.h
@@ -3,6 +3,8 @@
#ifndef WIN32_H
#define WIN32_H
+bool MyShowCursor(bool show);
+
typedef void (*Function)(int);
bool LoadLibraryList(Function proc[], const char* dll);