Merge

diff --combined Source/OpenGL_Windows.cpp
index ac4a13ad6d3543a58de4707a0e3c0ba8164b549a,8a9b6923c2662945978da3161d66777ea4d3c4ce..3f7b321daa50846da2ae8865568aca30b8151973
--- 1/Source/OpenGL_Windows.cpp
--- 2/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@@ -286,6 -286,18 +286,6 @@@ void DrawGL (Game & game
        }
  }
  
 -static inline int clamp_sdl_mouse_button(Uint8 button)
 -{
 -    if (button == 2)   // right mouse button is button 3 in SDL.
 -        button = 3;
 -    else if (button == 3)
 -        button = 2;
 -
 -    if ((button >= 1) && (button <= 3))
 -        return button - 1;
 -    return -1;
 -}
 -
  static void sdlEventProc(const SDL_Event &e, Game &game)
  {
      int val;
@@@ -307,6 -319,9 +307,6 @@@
                                SDL_WM_ToggleFullScreen(SDL_GetVideoSurface());
              }
              return;
 -
 -        case SDL_KEYUP:
 -            return;
      }
  }
  
@@@ -875,7 -890,7 +875,7 @@@ int main(int argc, char **argv
                pgame = 0;
  
                CleanUp ();
-               
+ 
                return 0;
        }
        catch (const std::exception& error)