From 339021a11b04d9c12caccd57429c22ebd1c35304 Mon Sep 17 00:00:00 2001 From: Muzychenko Andrey <33288308+k4zmu2a@users.noreply.github.com> Date: Mon, 29 Aug 2022 11:19:52 +0300 Subject: [PATCH] Fixed build errors and warnings. --- SpaceCadetPinball/gdrv.cpp | 2 +- SpaceCadetPinball/options.cpp | 4 ++-- SpaceCadetPinball/translations.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SpaceCadetPinball/gdrv.cpp b/SpaceCadetPinball/gdrv.cpp index faf593f..355c0cb 100644 --- a/SpaceCadetPinball/gdrv.cpp +++ b/SpaceCadetPinball/gdrv.cpp @@ -302,7 +302,7 @@ void gdrv::grtext_draw_ttext_in_box(TTextBox* textBox) { ImGui::SetWindowFontScale(fullscrn::GetScreenToPinballRatio()); if(textBox->Message1) - ImGui::TextWrapped(textBox->Message1->Text); + ImGui::TextWrapped("%s", textBox->Message1->Text); } ImGui::End(); } diff --git a/SpaceCadetPinball/options.cpp b/SpaceCadetPinball/options.cpp index e2ae744..edbcac1 100644 --- a/SpaceCadetPinball/options.cpp +++ b/SpaceCadetPinball/options.cpp @@ -349,8 +349,8 @@ void options::RenderControlDialog() ImGui::TextUnformatted(pinball::get_rc_string(Msg::KEYMAPPER_Groupbox2)); ImGui::Separator(); - ImGui::TextWrapped(pinball::get_rc_string(Msg::KEYMAPPER_Help1)); - ImGui::TextWrapped(pinball::get_rc_string(Msg::KEYMAPPER_Help2)); + ImGui::TextWrapped("%s", pinball::get_rc_string(Msg::KEYMAPPER_Help1)); + ImGui::TextWrapped("%s", pinball::get_rc_string(Msg::KEYMAPPER_Help2)); ImGui::Spacing(); ImGui::TextUnformatted(pinball::get_rc_string(Msg::KEYMAPPER_Groupbox1)); diff --git a/SpaceCadetPinball/translations.h b/SpaceCadetPinball/translations.h index 4fb17f4..5b42629 100644 --- a/SpaceCadetPinball/translations.h +++ b/SpaceCadetPinball/translations.h @@ -292,7 +292,7 @@ enum class lang : int template struct InitializedArray { - static_assert(std::is_enum_v, "Key is not an enum"); + static_assert(std::is_enum::value, "Key is not an enum"); InitializedArray(const std::initializer_list>& iList) {