diff --git a/ultramodern/include/ultramodern/error_handling.hpp b/ultramodern/include/ultramodern/error_handling.hpp index 288482a..303e6b7 100644 --- a/ultramodern/include/ultramodern/error_handling.hpp +++ b/ultramodern/include/ultramodern/error_handling.hpp @@ -3,6 +3,8 @@ #include +#define ULTRAMODERN_QUICK_EXIT() ultramodern::error_handling::quick_exit(__FILE__, __LINE__, __func__) + namespace ultramodern { namespace error_handling { struct callbacks_t { diff --git a/ultramodern/src/events.cpp b/ultramodern/src/events.cpp index 7d5bf68..3131610 100644 --- a/ultramodern/src/events.cpp +++ b/ultramodern/src/events.cpp @@ -215,7 +215,7 @@ void task_thread_func(uint8_t* rdram, moodycamel::LightweightSemaphore* thread_r if (!ultramodern::rsp::run_task(PASS_RDRAM task)) { fprintf(stderr, "Failed to execute task type: %" PRIu32 "\n", task->t.type); - ultramodern::error_handling::quick_exit(__FILE__, __LINE__, __func__); + ULTRAMODERN_QUICK_EXIT(); } // Tell the game that the RSP has completed diff --git a/ultramodern/src/renderer_context.cpp b/ultramodern/src/renderer_context.cpp index bd796c5..7fc5d26 100644 --- a/ultramodern/src/renderer_context.cpp +++ b/ultramodern/src/renderer_context.cpp @@ -14,8 +14,7 @@ void ultramodern::renderer::set_callbacks(const callbacks_t& callbacks) { std::unique_ptr ultramodern::renderer::create_render_context(uint8_t* rdram, WindowHandle window_handle, bool developer_mode) { if (render_callbacks.create_render_context == nullptr) { error_handling::message_box("[Error] The mandatory render callback `create_render_context` was not registered"); - // TODO: should we make a macro for this? - error_handling::quick_exit(__FILE__, __LINE__, __func__); + ULTRAMODERN_QUICK_EXIT(); } return render_callbacks.create_render_context(rdram, window_handle, developer_mode);