shithub: choc

Download patch

ref: 2b733d6a90586187c7b7fe0bc184af182620c2d8
parent: 030b38de23f85b129e357ed97e2a58e21391fe92
author: Simon Howard <[email protected]>
date: Tue Dec 18 17:09:51 EST 2007 

Don't center the mouse on startup if the mouse is disabled (thanks
Siggi)
Reset the palette when the window is restored to clear any screen
corruption (thanks Catoptromancy)

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 994


--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,10 @@
        set properly (thanks Lemonzest)
      * Don't grab the mouse if the mouse is disabled via -nomouse
        or use_mouse in the configuration file (thanks MikeRS).
+     * Don't center the mouse on startup if the mouse is disabled
+       (thanks Siggi).
+     * Reset the palette when the window is restored to clear
+       any screen corruption (thanks Catoptromancy).
 
 1.0.0 (2007-12-10):
 
--- a/src/i_video.c
+++ b/src/i_video.c
@@ -505,6 +505,10 @@
                 UpdateFocus();
                 break;
 
+            case SDL_VIDEOEXPOSE:
+                palette_to_set = true;
+                break;
+
             default:
                 break;
         }
@@ -813,7 +817,7 @@
     if (palette_to_set)
     {
         SDL_SetColors(screen, palette, 0, 256);
-        palette_to_set = 0;
+        palette_to_set = false;
     }
     else
     {
@@ -845,7 +849,7 @@
         palette[i].b = gammatable[usegamma][*doompalette++];
     }
 
-    palette_to_set = 1;
+    palette_to_set = true;
 }
 
 // 
@@ -1387,7 +1391,11 @@
     // clear out any events waiting at the start and center the mouse
   
     while (SDL_PollEvent(&dummy));
-    CenterMouse();
+
+    if (usemouse && !nomouse && (fullscreen || grabmouse))
+    {
+        CenterMouse();
+    }
 
     initialised = true;
 }