From 2db61f8b8e97241f8776bd1a984ea85b679a1a43 Mon Sep 17 00:00:00 2001 From: N2614 Date: Mon, 23 Jan 2012 07:05:33 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=97=E3=83=AA=E3=82=A4=E3=83=B3=E3=82=B9?= =?UTF-8?q?=E3=83=88=E3=83=BC=E3=83=AB=E3=82=A2=E3=83=97=E3=83=AA=E3=83=80?= =?UTF-8?q?=E3=82=A6=E3=83=B3=E3=83=AD=E3=83=BC=E3=83=89=E6=99=82=E3=81=AE?= =?UTF-8?q?=E7=94=BB=E9=9D=A2=E8=A1=A8=E7=A4=BA=E3=82=92=E8=BF=BD=E5=8A=A0?= 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@593 385bec56-5757-e545-9c3a-d8741f4650f1 --- .../sources/ConsoleRestore/ConsoleRestore.cpp | 10 ++++++++++ .../sources/ConsoleRestore/Controller.cpp | 5 +++++ .../sources/ConsoleRestore/Controller.h | 3 ++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp index fe95818..2447c7a 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp @@ -266,6 +266,12 @@ extern "C" void nnMain(void) titleColor.g = 0.2f; titleColor.b = 1.2f; } + else if(GetRestoreMode() == RESTORE_MODE_DOWNLOAD_PREINSTALL) + { + titleColor.r = 1.0f; + titleColor.g = 0.55f; + titleColor.b = 1.0f; + } // 上画面表示 common::DrawSystemState("CTR Console Restore", @@ -311,6 +317,10 @@ extern "C" void nnMain(void) { s_RenderSystem.DrawText(0, lineBottom * spaceSize, "CHECK-SD Mode"); } + else if (GetRestoreMode() == RESTORE_MODE_DOWNLOAD_PREINSTALL) + { + s_RenderSystem.DrawText(0, lineBottom * spaceSize, "DL_PREINATALL Mode"); + } s_RenderSystem.SetColor(titleColor.r, titleColor.g, titleColor.b); s_RenderSystem.FillRectangle(0, lineBottom * spaceSize, screenWidth, spaceSize); diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp index 6409fca..856e2f4 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp @@ -718,6 +718,11 @@ bool CheckAndReadAPSetting(::std::vector& operationMessage) { s_RestoreMode = RESTORE_MODE_CHECK_SD; } + + if(s_DownloadPreinstallMode) + { + s_RestoreMode = RESTORE_MODE_DOWNLOAD_PREINSTALL; + } } if (!s_ReadSettingIsSuccess) diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.h index bc8400b..e62537a 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.h +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.h @@ -29,7 +29,8 @@ typedef enum RestoreMode RESTORE_MODE_RESTORE, RESTORE_MODE_NUP_ONLY, RESTORE_MODE_GET_IVS, - RESTORE_MODE_CHECK_SD + RESTORE_MODE_CHECK_SD, + RESTORE_MODE_DOWNLOAD_PREINSTALL } RestoreMode;