diff options
Diffstat (limited to 'Source/Core/VideoCommon/Src/EmuWindow.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Src/EmuWindow.cpp | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/Source/Core/VideoCommon/Src/EmuWindow.cpp b/Source/Core/VideoCommon/Src/EmuWindow.cpp index bf9da4190b..e8fa26a38b 100644 --- a/Source/Core/VideoCommon/Src/EmuWindow.cpp +++ b/Source/Core/VideoCommon/Src/EmuWindow.cpp @@ -1,19 +1,6 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. #include <windows.h> @@ -81,6 +68,7 @@ void FreeLookInput( UINT iMsg, WPARAM wParam ) static bool mouseMoveEnabled = false; static float lastMouse[2]; POINT point; + switch(iMsg) { case WM_USER_KEYDOWN: @@ -112,14 +100,16 @@ void FreeLookInput( UINT iMsg, WPARAM wParam ) break; case WM_MOUSEMOVE: - if (mouseLookEnabled) { + if (mouseLookEnabled) + { GetCursorPos(&point); VertexShaderManager::RotateView((point.x - lastMouse[0]) / 200.0f, (point.y - lastMouse[1]) / 200.0f); lastMouse[0] = (float)point.x; lastMouse[1] = (float)point.y; } - if (mouseMoveEnabled) { + if (mouseMoveEnabled) + { GetCursorPos(&point); VertexShaderManager::TranslateView((point.x - lastMouse[0]) / 50.0f, (point.y - lastMouse[1]) / 50.0f); lastMouse[0] = (float)point.x; @@ -173,8 +163,8 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam ) s_sizing = false; break; - /* Post the mouse events to the main window, it's nessesary because in difference to the - keyboard inputs these events only appear here, not in the parent window or any other WndProc()*/ + /* Post the mouse events to the main window, it's necessary, because the difference between the + keyboard inputs is that these events only appear here, not in the parent window or any other WndProc()*/ case WM_LBUTTONDOWN: if(g_ActiveConfig.backend_info.bSupports3DVision && g_ActiveConfig.b3DVision) { @@ -247,7 +237,7 @@ void OSDMenu(WPARAM wParam) OSDChoice = 1; // Toggle native resolution g_Config.iEFBScale = g_Config.iEFBScale + 1; - if (g_Config.iEFBScale > 7) g_Config.iEFBScale = 0; + if (g_Config.iEFBScale > SCALE_4X) g_Config.iEFBScale = SCALE_AUTO; break; case '4': OSDChoice = 2; |