diff --git a/neo/idlib/containers/List.h b/neo/idlib/containers/List.h index 16925eb3..9817d7f2 100644 --- a/neo/idlib/containers/List.h +++ b/neo/idlib/containers/List.h @@ -132,7 +132,7 @@ public: void Swap( idList &other ); // swap the contents of the lists void DeleteContents( bool clear ); // delete the contents of the list -#if __cplusplus >= 201103L +#if __cplusplus >= 201103L || defined(_MSVC_LANG) && _MSVC_LANG >= 201103L // begin and end allow using C++11 for(ElemType& e : myIdlist) { ... } type* begin() { return list; diff --git a/neo/sys/sys_imgui.cpp b/neo/sys/sys_imgui.cpp index 55de241f..fd3da526 100644 --- a/neo/sys/sys_imgui.cpp +++ b/neo/sys/sys_imgui.cpp @@ -253,6 +253,16 @@ bool Init(void* _sdlWindow, void* sdlGlContext) //ImFont* font = io.Fonts->AddFontFromFileTTF("c:\\Windows\\Fonts\\ArialUni.ttf", 18.0f, nullptr, io.Fonts->GetGlyphRangesJapanese()); //IM_ASSERT(font != nullptr); + const char* f10bind = idKeyInput::GetBinding( K_F10 ); + if ( f10bind && f10bind[0] != '\0' ) { + if ( idStr::Icmp( f10bind, "dhewm3Settings" ) != 0 ) { + // if F10 is already bound, but not to dhewm3Settings, show a message + common->Printf( "... the F10 key is already bound to '%s', otherwise it could be used to open the dhewm3 Settings Menu\n" , f10bind ); + } + } else { + idKeyInput::SetBinding( K_F10, "dhewm3Settings" ); + } + imgui_initialized = true; return true; }