From d0fc2202ccbdb6918ae3b8b5200c01516a9033d5 Mon Sep 17 00:00:00 2001 From: angie Date: Thu, 30 May 2024 18:05:15 -0400 Subject: [PATCH] Remove `recomp::message_box` --- librecomp/include/recomp_game.h | 1 - librecomp/src/recomp.cpp | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/librecomp/include/recomp_game.h b/librecomp/include/recomp_game.h index af4abea..788a7fd 100644 --- a/librecomp/include/recomp_game.h +++ b/librecomp/include/recomp_game.h @@ -41,7 +41,6 @@ namespace recomp { void do_rom_pio(uint8_t* rdram, gpr ram_address, uint32_t physical_addr); void start(ultramodern::WindowHandle window_handle, const recomp::rsp::callbacks_t& rsp_callbacks, const ultramodern::audio_callbacks_t& audio_callbacks, const ultramodern::input_callbacks_t& input_callbacks, const ultramodern::gfx_callbacks_t& gfx_callbacks, const ultramodern::events::callbacks_t& thread_callbacks, const ultramodern::error_handling::callbacks_t& error_handling_callbacks_); void start_game(const std::u8string& game_id); - void message_box(const char* message); std::filesystem::path get_app_folder_path(); std::u8string current_game_id(); diff --git a/librecomp/src/recomp.cpp b/librecomp/src/recomp.cpp index b322bce..374859e 100644 --- a/librecomp/src/recomp.cpp +++ b/librecomp/src/recomp.cpp @@ -21,7 +21,8 @@ #include "recomp_overlays.h" #include "recomp_game.h" #include "xxHash/xxh3.h" -#include +#include "ultramodern/ultramodern.hpp" +#include "ultramodern/error_handling.hpp" #ifdef _MSC_VER inline uint32_t byteswap(uint32_t val) { @@ -475,7 +476,7 @@ void recomp::start(ultramodern::WindowHandle window_handle, const recomp::rsp::c case GameStatus::Running: { if (!recomp::load_stored_rom(current_game.value())) { - recomp::message_box("Error opening stored ROM! Please restart this program."); + ultramodern::error_handling::message_box("Error opening stored ROM! Please restart this program."); } auto find_it = game_roms.find(current_game.value());