From: Alexander Monakov <amonakov@gmail.com>
Date: Sat, 5 Jun 2010 22:08:31 +0000 (+0400)
Subject: Merge
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;ds=inline;h=6468ba0b10be934e097a7b841333e9f168ca34fb;hp=-c;p=lugaru.git

Merge
---

6468ba0b10be934e097a7b841333e9f168ca34fb
diff --combined Source/OpenGL_Windows.cpp
index ac4a13a,8a9b692..3f7b321
--- a/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)