thirdpartymirrors/N64ModernRuntime
1
0
Fork 0
mirror of https://github.com/N64Recomp/N64ModernRuntime.git synced 2026-05-10 19:01:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix compiler errors caused by x11 defines and implicit casts

Browse source
This commit is contained in:
Mr-Wiseguy 2024-12-31 16:37:39 -05:00
parent fa1edf9eaa
commit 3966846e39
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
librecomp/src/mods.cpp
View file

@ -998,7 +998,7 @@ recomp::mods::CodeModLoadError recomp::mods::ModContext::load_mod_code(uint8_t*
std::string cur_error_param; std::string cur_error_param;
CodeModLoadError cur_error; CodeModLoadError cur_error;
ModCodeHandleInputs handle_inputs{ ModCodeHandleInputs handle_inputs{
.base_event_index = num_events, .base_event_index = static_cast<uint32_t>(num_events),
.recomp_trigger_event = recomp_trigger_event, .recomp_trigger_event = recomp_trigger_event,
.get_function = get_function, .get_function = get_function,
.cop0_status_write = cop0_status_write, .cop0_status_write = cop0_status_write,
@ -1007,7 +1007,7 @@ recomp::mods::CodeModLoadError recomp::mods::ModContext::load_mod_code(uint8_t*
.do_break = do_break, .do_break = do_break,
.reference_section_addresses = section_addresses, .reference_section_addresses = section_addresses,
}; };
// Allocate the event indices used by the mod. // Allocate the event indices used by the mod.
num_events += mod.num_events(); num_events += mod.num_events();

2
ultramodern/include/ultramodern/renderer_context.hpp
View file

@ -18,6 +18,8 @@
# undef LockMask # undef LockMask
# undef Always # undef Always
# undef Success # undef Success
# undef False
# undef True
#endif #endif
#include "ultra64.h" #include "ultra64.h"