epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unstatic MakeButton and MakeModifiers. Fixes mouse clicks in vs `Release' builds.

Browse Source
This commit is contained in:
Paul Chote
2011-01-05 15:32:21 +13:00
parent 2e9a0b8162
commit 7b5b84b1b7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Renderer.Cg/GraphicsDevice.cs
View File

@@ -138,7 +138,7 @@ namespace OpenRA.Renderer.Cg
MouseButton lastButtonBits = (MouseButton)0; MouseButton lastButtonBits = (MouseButton)0;
static MouseButton MakeButton( byte b ) MouseButton MakeButton( byte b )
{ {
return b == Sdl.SDL_BUTTON_LEFT ? MouseButton.Left return b == Sdl.SDL_BUTTON_LEFT ? MouseButton.Left
: b == Sdl.SDL_BUTTON_RIGHT ? MouseButton.Right : b == Sdl.SDL_BUTTON_RIGHT ? MouseButton.Right
@@ -148,7 +148,7 @@ namespace OpenRA.Renderer.Cg
: 0; : 0;
} }
static Modifiers MakeModifiers( int raw ) Modifiers MakeModifiers( int raw )
{ {
return ( ( raw & Sdl.KMOD_ALT ) != 0 ? Modifiers.Alt : 0 ) return ( ( raw & Sdl.KMOD_ALT ) != 0 ? Modifiers.Alt : 0 )
| ( ( raw & Sdl.KMOD_CTRL ) != 0 ? Modifiers.Ctrl : 0 ) | ( ( raw & Sdl.KMOD_CTRL ) != 0 ? Modifiers.Ctrl : 0 )

4
OpenRA.Renderer.Gl/GraphicsDevice.cs
View File

@@ -134,7 +134,7 @@ namespace OpenRA.Renderer.Glsl
MouseButton lastButtonBits = (MouseButton)0; MouseButton lastButtonBits = (MouseButton)0;
static MouseButton MakeButton( byte b ) MouseButton MakeButton( byte b )
{ {
return b == Sdl.SDL_BUTTON_LEFT ? MouseButton.Left return b == Sdl.SDL_BUTTON_LEFT ? MouseButton.Left
: b == Sdl.SDL_BUTTON_RIGHT ? MouseButton.Right : b == Sdl.SDL_BUTTON_RIGHT ? MouseButton.Right
@@ -144,7 +144,7 @@ namespace OpenRA.Renderer.Glsl
: 0; : 0;
} }
static Modifiers MakeModifiers( int raw ) Modifiers MakeModifiers( int raw )
{ {
return ( ( raw & Sdl.KMOD_ALT ) != 0 ? Modifiers.Alt : 0 ) return ( ( raw & Sdl.KMOD_ALT ) != 0 ? Modifiers.Alt : 0 )
| ( ( raw & Sdl.KMOD_CTRL ) != 0 ? Modifiers.Ctrl : 0 ) | ( ( raw & Sdl.KMOD_CTRL ) != 0 ? Modifiers.Ctrl : 0 )