diff --git a/src/g_game.cpp b/src/g_game.cpp index 1885b1c77..03aa40d93 100644 --- a/src/g_game.cpp +++ b/src/g_game.cpp @@ -245,6 +245,12 @@ EXTERN_CVAR (Int, team) CVAR (Bool, teamplay, false, CVAR_SERVERINFO) +// Workaround for x64 code generation bug in MSVC 2015 +// Optimized targets contain illegal instructions in the function below +#if defined _M_X64 && _MSC_VER < 1910 +#pragma optimize("", off) +#endif // _M_X64 && _MSC_VER < 1910 + // [RH] Allow turbo setting anytime during game CUSTOM_CVAR (Float, turbo, 100.f, CVAR_NOINITCALL) { @@ -267,6 +273,10 @@ CUSTOM_CVAR (Float, turbo, 100.f, CVAR_NOINITCALL) } } +#if defined _M_X64 && _MSC_VER < 1910 +#pragma optimize("", on) +#endif // _M_X64 && _MSC_VER < 1910 + CCMD (turnspeeds) { if (argv.argc() == 1)