Fixed build errors and warnings.
This commit is contained in:
parent
9f17e0dd0a
commit
339021a11b
|
@ -302,7 +302,7 @@ void gdrv::grtext_draw_ttext_in_box(TTextBox* textBox)
|
||||||
{
|
{
|
||||||
ImGui::SetWindowFontScale(fullscrn::GetScreenToPinballRatio());
|
ImGui::SetWindowFontScale(fullscrn::GetScreenToPinballRatio());
|
||||||
if(textBox->Message1)
|
if(textBox->Message1)
|
||||||
ImGui::TextWrapped(textBox->Message1->Text);
|
ImGui::TextWrapped("%s", textBox->Message1->Text);
|
||||||
}
|
}
|
||||||
ImGui::End();
|
ImGui::End();
|
||||||
}
|
}
|
||||||
|
|
|
@ -349,8 +349,8 @@ void options::RenderControlDialog()
|
||||||
ImGui::TextUnformatted(pinball::get_rc_string(Msg::KEYMAPPER_Groupbox2));
|
ImGui::TextUnformatted(pinball::get_rc_string(Msg::KEYMAPPER_Groupbox2));
|
||||||
ImGui::Separator();
|
ImGui::Separator();
|
||||||
|
|
||||||
ImGui::TextWrapped(pinball::get_rc_string(Msg::KEYMAPPER_Help1));
|
ImGui::TextWrapped("%s", 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_Help2));
|
||||||
ImGui::Spacing();
|
ImGui::Spacing();
|
||||||
|
|
||||||
ImGui::TextUnformatted(pinball::get_rc_string(Msg::KEYMAPPER_Groupbox1));
|
ImGui::TextUnformatted(pinball::get_rc_string(Msg::KEYMAPPER_Groupbox1));
|
||||||
|
|
|
@ -292,7 +292,7 @@ enum class lang : int
|
||||||
template <typename Key, typename Value, int N>
|
template <typename Key, typename Value, int N>
|
||||||
struct InitializedArray
|
struct InitializedArray
|
||||||
{
|
{
|
||||||
static_assert(std::is_enum_v<Key>, "Key is not an enum");
|
static_assert(std::is_enum<Key>::value, "Key is not an enum");
|
||||||
|
|
||||||
InitializedArray(const std::initializer_list<std::pair<Key, Value>>& iList)
|
InitializedArray(const std::initializer_list<std::pair<Key, Value>>& iList)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue