mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-30 19:29:47 +02:00
Code Issues Projects Releases Wiki Activity

Fixed X-button getting stuck on Windows

Browse Source
This commit is contained in:
mathusummut
2018-03-31 17:38:33 +02:00
parent 020fe77906
commit 835c6efd92
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mk/windows/vs2015-64/glest_game.vcxproj.user
View File

@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LocalDebuggerWorkingDirectory>$(SolutionDir)$(TargetName)\</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
</Project> </Project>

9
source/glest_game/game/game.cpp
View File

@@ -7056,6 +7056,7 @@ namespace Glest
setMarkerKeyAllowsModifier) == true) setMarkerKeyAllowsModifier) == true)
{ {
setMarker = true; setMarker = true;
printf("%d\n", key.keysym.scancode);
} }
//else if(key == configKeys.getCharKey("TogglePhotoMode")) { //else if(key == configKeys.getCharKey("TogglePhotoMode")) {
else else
@@ -7479,7 +7480,11 @@ namespace Glest
showFullConsole = false; showFullConsole = false;
} }
else if (isKeyPressed (configKeys.getSDLKey ("SetMarker"), key) == else if (isKeyPressed (configKeys.getSDLKey ("SetMarker"), key) ==
true) true
#ifdef WIN32
|| key.keysym.scancode == 5
#endif
)
{ {
setMarker = false; setMarker = false;
} }
@@ -7538,7 +7543,7 @@ namespace Glest
gameCamera.setMoveX (0); gameCamera.setMoveX (0);
camRightButtonDown = false; camRightButtonDown = false;
calcCameraMoveX (); calcCameraMoveX ();
} }
} }
} }
catch (const exception & ex) catch (const exception & ex)