From f77d3c2b96d69b2b6457a1ee7aed2f8ba27961a1 Mon Sep 17 00:00:00 2001 From: N2614 Date: Wed, 30 Mar 2011 01:09:31 +0000 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E7=94=BB=E9=9D=A2=E3=82=82=E7=8A=B6?= =?UTF-8?q?=E6=85=8B=E3=81=AB=E5=BF=9C=E3=81=98=E3=81=A6=E5=A1=97=E3=82=8A?= =?UTF-8?q?=E3=81=A4=E3=81=B6=E3=81=99=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@171 385bec56-5757-e545-9c3a-d8741f4650f1 --- .../ConsoleBackup/ConsoleBackup.cpp | 2 ++ .../ConsoleRestore/ConsoleRestore.cpp | 2 ++ .../common/DrawSystemState.cpp | 15 ++++++++++++++- .../ConsoleDataMigration/common/DrawSystemState.h | 2 ++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp b/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp index e4bb786..374b0e8 100644 --- a/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp +++ b/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp @@ -393,6 +393,8 @@ extern "C" void nnMain(void) infraDeviceId, friendCode, GetProgress(), + IsBackupFailed(), + IsBackupSucceeded(), macAddress, operationMessage, region, diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.cpp index 1648120..36ba997 100644 --- a/trunk/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.cpp +++ b/trunk/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.cpp @@ -412,6 +412,8 @@ extern "C" void nnMain(void) infraDeviceId, friendCode, GetProgress(), + IsRestoreFailed(), + IsRestoreSucceeded(), macAddress, operationMessage, region, diff --git a/trunk/ConsoleDataMigration/common/DrawSystemState.cpp b/trunk/ConsoleDataMigration/common/DrawSystemState.cpp index cf0d418..3de5f9e 100644 --- a/trunk/ConsoleDataMigration/common/DrawSystemState.cpp +++ b/trunk/ConsoleDataMigration/common/DrawSystemState.cpp @@ -100,6 +100,8 @@ void DrawSystemState u64 deviceId, u64 friendCode, u32 progress, + bool isBackupFailed, + bool isBackupSucceeded, char8* macAddress, ::std::vector& operationMessage, nn::cfg::CTR::CfgRegionCode region, @@ -125,7 +127,18 @@ void DrawSystemState // デフォルトで上画面に描画するもの renderSystem.SetRenderTarget(GetRenderTarget(NN_GX_DISPLAY0, flip)); - renderSystem.SetClearColor(GetRenderTarget(NN_GX_DISPLAY0, flip), NORMAL_COLOR); + if (isBackupSucceeded) + { + renderSystem.SetClearColor(GetRenderTarget(NN_GX_DISPLAY0, flip), SUCCESS_COLOR); + } + else if (isBackupFailed) + { + renderSystem.SetClearColor(GetRenderTarget(NN_GX_DISPLAY0, flip), FAIL_COLOR); + } + else + { + renderSystem.SetClearColor(GetRenderTarget(NN_GX_DISPLAY0, flip), NORMAL_COLOR); + } renderSystem.Clear(); diff --git a/trunk/ConsoleDataMigration/common/DrawSystemState.h b/trunk/ConsoleDataMigration/common/DrawSystemState.h index b1240a2..5199975 100644 --- a/trunk/ConsoleDataMigration/common/DrawSystemState.h +++ b/trunk/ConsoleDataMigration/common/DrawSystemState.h @@ -58,6 +58,8 @@ void DrawSystemState u64 deviceId, u64 friendCode, u32 progress, + bool isBackupFailed, + bool isBackupSucceeded, char8* macAddress, ::std::vector& operationMessage, nn::cfg::CTR::CfgRegionCode region,