From 3b72a20dbd3c451655776e3b163a3c63e681f9d4 Mon Sep 17 00:00:00 2001 From: dP Date: Sat, 30 Jan 2021 01:50:46 +0300 Subject: [PATCH] Fix win32 and cocoa build errors --- src/video/cocoa/event.mm | 2 +- src/video/win32_v.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/video/cocoa/event.mm b/src/video/cocoa/event.mm index 5c4f76c9bf..347c995842 100644 --- a/src/video/cocoa/event.mm +++ b/src/video/cocoa/event.mm @@ -403,7 +403,7 @@ QZ_MouseButtonEvent(int button, BOOL down) if (!down && button >= CM_WKC_MOUSE_OTHER_START && button < CM_WKC_MOUSE_OTHER_END) { HandleKeypress(button, 0); } - break + break; } } } diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp index 4d175b4923..8a7703da09 100644 --- a/src/video/win32_v.cpp +++ b/src/video/win32_v.cpp @@ -718,12 +718,12 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP /* CityMania code start */ case WM_MBUTTONUP: ReleaseCapture(); - HandleKeypress(CM_WKC_MOUSE_MIDDLE); + HandleKeypress(CM_WKC_MOUSE_MIDDLE, 0); return 0; case WM_XBUTTONUP: { ReleaseCapture(); - int button = CM_WKC_MOUSE_OTHER_START + ev.button.button - 1; + int button = CM_WKC_MOUSE_OTHER_START + GET_XBUTTON_WPARAM(wParam) - 1; if (button >= CM_WKC_MOUSE_OTHER_START && button < CM_WKC_MOUSE_OTHER_END) { HandleKeypress(button, 0); }