foxygit / doom Log in
commit f5e5190c421c5a880ff3e6638e793b64195f4f02
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Fri Dec 14 01:05:16 2012 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Fri Dec 14 01:05:16 2012 +0000

    Rename function, as ShowCursor is a Windows function and this conflicts
    with it (thanks exp(x)).

    Subversion-branch: /trunk/chocolate-doom
    Subversion-revision: 2545
---
 src/i_video.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/i_video.c b/src/i_video.c
index 895043da..5c5d50aa 100644
--- a/src/i_video.c
+++ b/src/i_video.c
@@ -279,7 +279,7 @@ static void UpdateFocus(void)
 // Show or hide the mouse cursor. We have to use different techniques
 // depending on the OS.

-static void ShowCursor(boolean show)
+static void SetShowCursor(boolean show)
 {
     // On Windows, using SDL_ShowCursor() adds lag to the mouse input,
     // so work around this by setting an invisible cursor instead. On
@@ -454,7 +454,7 @@ void I_ShutdownGraphics(void)
 {
     if (initialized)
     {
-        ShowCursor(true);
+        SetShowCursor(true);

         SDL_QuitSubSystem(SDL_INIT_VIDEO);

@@ -754,15 +754,15 @@ static void UpdateGrab(void)
     {
         // Hide the cursor in screensaver mode

-        ShowCursor(false);
+        SetShowCursor(false);
     }
     else if (grab && !currently_grabbed)
     {
-        ShowCursor(false);
+        SetShowCursor(false);
     }
     else if (!grab && currently_grabbed)
     {
-        ShowCursor(true);
+        SetShowCursor(true);
     }

     currently_grabbed = grab;