github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 06:13:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

This has to be the last time I fix this rebase conflict

Browse source
This commit is contained in:
Josh Bodner 2022-04-03 16:41:46 -07:00
commit 9e49c9c8df
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libultraship/libultraship/GameSettings.cpp
View file

@ -159,10 +159,7 @@ namespace Game {
Conf[ControllerSection]["input_scale"] = std::to_string(Settings.controller.input_scale); Conf[ControllerSection]["input_scale"] = std::to_string(Settings.controller.input_scale);
Conf[ControllerSection]["input_enabled"] = std::to_string(Settings.controller.input_enabled); Conf[ControllerSection]["input_enabled"] = std::to_string(Settings.controller.input_enabled);
Conf[ControllerSection]["dpad_pause_name"] = std::to_string(Settings.controller.dpad_pause_name); Conf[ControllerSection]["dpad_pause_name"] = std::to_string(Settings.controller.dpad_pause_name);
<<<<<<< HEAD
Conf[ControllerSection]["dpad_ocarina_text"] = std::to_string(Settings.controller.dpad_ocarina_text); Conf[ControllerSection]["dpad_ocarina_text"] = std::to_string(Settings.controller.dpad_ocarina_text);
=======
>>>>>>> c9753a0 (Fixing rebase conflict again)
Conf[ControllerSection]["dpad_shop"] = std::to_string(Settings.controller.dpad_shop); Conf[ControllerSection]["dpad_shop"] = std::to_string(Settings.controller.dpad_shop);
// Cheats // Cheats