From c28bf2b34d557d32202d6094e0fee5a197b00bde Mon Sep 17 00:00:00 2001 From: Josh Bodner Date: Wed, 6 Apr 2022 21:26:12 -0700 Subject: [PATCH] Fix merge conflict for real --- libultraship/libultraship/GameSettings.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libultraship/libultraship/GameSettings.cpp b/libultraship/libultraship/GameSettings.cpp index 22bf72540..7c4433fff 100644 --- a/libultraship/libultraship/GameSettings.cpp +++ b/libultraship/libultraship/GameSettings.cpp @@ -88,12 +88,10 @@ namespace Game { CVar_SetFloat("gInputScale", Settings.controller.input_scale); Settings.controller.input_enabled = stob(Conf[ControllerSection]["input_enabled"]); - - CVar_SetS32(const_cast("gInputEnabled"), Settings.controller.input_enabled); CVar_SetS32("gInputEnabled", Settings.controller.input_enabled); Settings.controller.dpad_pause_name = stob(Conf[ControllerSection]["dpad_pause_name"]); - CVar_SetS32(const_cast("gDpadPauseName"), Settings.controller.dpad_pause_name); + CVar_SetS32("gDpadPauseName", Settings.controller.dpad_pause_name); // Cheats Settings.cheats.debug_mode = stob(Conf[CheatSection]["debug_mode"]);