Compare commits

..

2 Commits

4 changed files with 7 additions and 4 deletions

View File

@ -120,7 +120,8 @@ namespace recomp {
std::vector<InputField> apply_menu; std::vector<InputField> apply_menu;
}; };
constexpr const std::vector<InputField>& get_default_mapping_for_input(const DefaultN64Mappings& defaults, const GameInput input) { inline const std::vector<InputField>& get_default_mapping_for_input(const DefaultN64Mappings& defaults, const GameInput input) {
static const std::vector<InputField> empty_input_field{};
switch (input) { switch (input) {
case GameInput::A: return defaults.a; case GameInput::A: return defaults.a;
case GameInput::B: return defaults.b; case GameInput::B: return defaults.b;
@ -143,7 +144,7 @@ namespace recomp {
case GameInput::TOGGLE_MENU: return defaults.toggle_menu; case GameInput::TOGGLE_MENU: return defaults.toggle_menu;
case GameInput::ACCEPT_MENU: return defaults.accept_menu; case GameInput::ACCEPT_MENU: return defaults.accept_menu;
case GameInput::APPLY_MENU: return defaults.apply_menu; case GameInput::APPLY_MENU: return defaults.apply_menu;
default: return std::vector<InputField>(); default: return empty_input_field;
} }
} }

@ -1 +1 @@
Subproject commit b9592c625d87ab45ddd12d9ad30c886ee77a5d68 Subproject commit 26a05439c2215ea9e1c0b0d572b46b3584a90a4f

View File

@ -650,6 +650,8 @@ int main(int argc, char** argv) {
} }
printf("\n"); printf("\n");
} }
// TODO load all mods as a temporary solution to not having a UI yet.
recomp::mods::enable_mod(mod.mod_id, true);
} }
printf("\n"); printf("\n");

View File

@ -8,5 +8,5 @@
void zelda64::register_patches() { void zelda64::register_patches() {
recomp::overlays::register_patches(mm_patches_bin, sizeof(mm_patches_bin), section_table, ARRLEN(section_table)); recomp::overlays::register_patches(mm_patches_bin, sizeof(mm_patches_bin), section_table, ARRLEN(section_table));
recomp::overlays::register_base_exports(export_table); recomp::overlays::register_base_exports(export_table);
recomp::overlays::register_base_events(event_name_table); recomp::overlays::register_base_events(event_names);
} }