非表示版のランチャーでもエラー表示できるよう、エラー表示でBGやバナーなどを表示しないように修正

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1492 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
yoshida_teruhisa 2008-05-23 05:31:03 +00:00
parent 5024a4371f
commit 452bd35ce9
3 changed files with 22 additions and 9 deletions

View File

@ -1025,6 +1025,13 @@ static AuthResult SYSMi_AuthenticateTWLHeader( TitleProperty *pBootTitle, ROM_He
} }
} }
static s32 s_nam_error = NAM_OK;
s32 SYSMi_getCheckTitleLaunchRightsResult( void )
{
return s_nam_error;
}
// TWLアプリ、NTR拡張NANDアプリ 共通の認証 // TWLアプリ、NTR拡張NANDアプリ 共通の認証
static AuthResult SYSMi_AuthenticateTWLTitle( TitleProperty *pBootTitle ) static AuthResult SYSMi_AuthenticateTWLTitle( TitleProperty *pBootTitle )
{ {
@ -1040,6 +1047,7 @@ static AuthResult SYSMi_AuthenticateTWLTitle( TitleProperty *pBootTitle )
s32 result = NAM_CheckTitleLaunchRights( pBootTitle->titleID ); s32 result = NAM_CheckTitleLaunchRights( pBootTitle->titleID );
if( NAM_OK != result) if( NAM_OK != result)
{ {
s_nam_error = result;
OS_TPrintf("Authenticate failed: NAM_CheckTitleLaunchRights failed. %d \n",result); OS_TPrintf("Authenticate failed: NAM_CheckTitleLaunchRights failed. %d \n",result);
return AUTH_RESULT_CHECK_TITLE_LAUNCH_RIGHTS_FAILED; return AUTH_RESULT_CHECK_TITLE_LAUNCH_RIGHTS_FAILED;
}else }else

View File

@ -345,16 +345,19 @@ void TwlMain( void )
// [TODO:]クリアしたほうが良いデータ(鍵など)があれば消す // [TODO:]クリアしたほうが良いデータ(鍵など)があれば消す
// デバグ表示 // デバグ表示
if( !SYSM_IsLauncherHidden() ) LauncherInit( s_titleList );
{ GX_SetVisiblePlane( GX_PLANEMASK_BG0 );
LauncherInit( s_titleList ); NNS_G2dCharCanvasClear( &gCanvas, TXT_COLOR_NULL );
NNS_G2dCharCanvasClear( &gCanvas, TXT_COLOR_NULL ); G2_ChangeBlendAlpha( 0, 31 );
G2_ChangeBlendAlpha( 0, 31 ); PrintfSJIS( 1, 25, TXT_COLOR_RED,"LAUNCHER : ERROR OCCURRED! - %d\n",res );
PrintfSJIS( 1, 25, TXT_COLOR_RED,"LAUNCHER : ERROR OCCURRED! - %d\n",res ); PrintfSJIS( 1, 40, TXT_COLOR_RED,"%s",error_msg[res] );
PrintfSJIS( 1, 40, TXT_COLOR_RED,"%s",error_msg[res] ); // “ÁŽê•\ަ
GX_DispOn(); if(res == AUTH_RESULT_CHECK_TITLE_LAUNCH_RIGHTS_FAILED)
GXS_DispOn(); {
PrintfSJIS( 1, 55, TXT_COLOR_RED,"NAM result = %d", SYSMi_getCheckTitleLaunchRightsResult() );
} }
GX_DispOn();
GXS_DispOn();
break; break;
} }

View File

@ -137,6 +137,8 @@ extern BOOL SYSM_CheckNintendoLogo( u16 *pLogoData ); // Nintendo
extern void SYSM_LoadNintendoLogo2D( u16 *pLogoData, u16 *pDst, int paletteColorIndex ); // NintendoロゴデータをOBJ_2D形式でロードpTempBufferには0x700bytes必要) extern void SYSM_LoadNintendoLogo2D( u16 *pLogoData, u16 *pDst, int paletteColorIndex ); // NintendoロゴデータをOBJ_2D形式でロードpTempBufferには0x700bytes必要)
extern void SYSM_LoadNintendoLogo1D( u16 *pLogoData, u16 *pDst, int paletteColorIndex ); // NintendoロゴデータをOBJ_1D形式でロード同上 extern void SYSM_LoadNintendoLogo1D( u16 *pLogoData, u16 *pDst, int paletteColorIndex ); // NintendoロゴデータをOBJ_1D形式でロード同上
extern s32 SYSMi_getCheckTitleLaunchRightsResult( void ); // CheckTitleLaunchRightsの結果を返すデバグ用
#endif #endif
// 状態チェック // 状態チェック