From 59e0296281272cc82811280842d4ff0357f4eb96 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Fri, 18 Jan 2019 16:36:25 +0300 Subject: [PATCH] cellMsgDialog: fix error spam on CELL_OK --- rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp | 2 +- rpcs3/Emu/RSX/Overlays/overlays.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp b/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp index 061d5e8a37..087eb41cd9 100644 --- a/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp +++ b/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp @@ -341,7 +341,7 @@ error_code cellMsgDialogOpenSimulViewWarning(vm::ptr call { cellSysutil.todo("cellMsgDialogOpenSimulViewWarning(callback=*0x%x, userData=*0x%x, extParam=*0x%x)", callback, userData, extParam); - s32 ret = cellMsgDialogOpen2(CELL_MSGDIALOG_TYPE_SE_TYPE_NORMAL | CELL_MSGDIALOG_TYPE_BUTTON_TYPE_OK, vm::make_str("SimulView Warning"), callback, userData, extParam); + error_code ret = cellMsgDialogOpen2(CELL_MSGDIALOG_TYPE_SE_TYPE_NORMAL | CELL_MSGDIALOG_TYPE_BUTTON_TYPE_OK, vm::make_str("SimulView Warning"), callback, userData, extParam); // The dialog should ideally only be closeable by pressing ok after 3 seconds until it closes itself automatically after 5 seconds if (ret == CELL_OK) diff --git a/rpcs3/Emu/RSX/Overlays/overlays.h b/rpcs3/Emu/RSX/Overlays/overlays.h index 96757d7c35..cbfd1d390e 100644 --- a/rpcs3/Emu/RSX/Overlays/overlays.h +++ b/rpcs3/Emu/RSX/Overlays/overlays.h @@ -872,7 +872,7 @@ namespace rsx taskbar_index = index; } - s32 progress_bar_set_message(u32 index, const std::string& msg) + error_code progress_bar_set_message(u32 index, const std::string& msg) { if (index >= num_progress_bars) return CELL_MSGDIALOG_ERROR_PARAM; @@ -885,7 +885,7 @@ namespace rsx return CELL_OK; } - s32 progress_bar_increment(u32 index, f32 value) + error_code progress_bar_increment(u32 index, f32 value) { if (index >= num_progress_bars) return CELL_MSGDIALOG_ERROR_PARAM; @@ -901,7 +901,7 @@ namespace rsx return CELL_OK; } - s32 progress_bar_reset(u32 index) + error_code progress_bar_reset(u32 index) { if (index >= num_progress_bars) return CELL_MSGDIALOG_ERROR_PARAM; @@ -916,7 +916,7 @@ namespace rsx return CELL_OK; } - s32 progress_bar_set_limit(u32 index, u32 limit) + error_code progress_bar_set_limit(u32 index, u32 limit) { if (index >= num_progress_bars) return CELL_MSGDIALOG_ERROR_PARAM;