From 923b263d4505c1b6eec00a71fab1aa97505e70e2 Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Sat, 13 Sep 2008 10:33:00 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=9E=E3=82=B9=E3=82=BF=E3=82=A8=E3=83=87?= =?UTF-8?q?=E3=82=A3=E3=82=BF:=E6=8F=90=E5=87=BA=E6=9B=B8=E3=81=AE?= =?UTF-8?q?=E3=83=9A=E3=82=A2=E3=83=AC=E3=83=B3=E3=82=BF=E3=83=AB=E3=82=B3?= =?UTF-8?q?=E3=83=B3=E3=83=88=E3=83=AD=E3=83=BC=E3=83=AB=E3=81=AE=E8=A8=98?= =?UTF-8?q?=E8=BF=B0=E3=82=92=E4=BF=AE=E6=AD=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2517 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../tools/MasterEditorTWL/MasterEditorTWL.ncb | Bin 11226112 -> 11226112 bytes .../tools/MasterEditorTWL/MasterEditorTWL.suo | Bin 59392 -> 56320 bytes .../MasterEditorTWL/Debug/BuildLog.htm | Bin 17504 -> 17504 bytes .../MasterEditorTWL/Form_deliv.cpp | 79 + .../MasterEditorTWL/deliverable.cpp | 216 +- .../MasterEditorTWL/deliverable.h | 9 + .../MasterEditorTWL/MasterEditorTWL/srl.cpp | 2 +- .../resource/sheet_templete.xml | 2103 +++++++---------- 8 files changed, 992 insertions(+), 1417 deletions(-) diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditorTWL/MasterEditorTWL.ncb index b82c247294ae84f2fb367359290783a4a05fbfca..1eb84c0f4aced615480ed9e6f62f4161db9cffd8 100644 GIT binary patch delta 10310 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 delta 28400 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 B8bkm9 diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditorTWL/MasterEditorTWL.suo index b853652e3d8eb73200426ae7529fcc3f22ffd70f..acbc892157cb970b2f55ba768d47c1b0656b981b 100644 GIT binary patch delta 2649 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 TbMTpYfIl~kBaPElQ>*pAn+9|Q diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 7bb5bc6b22b011e2fac61bb07ef8c5e68445634d..ab45d19d21e47ece2858b78fca45cb488395e518 100644 GIT binary patch delta 365 zcmaFR!T6wqaf1b$urY%ng9(EHgC&Czm}Smjw%MEQE8AurJ_W|fM=S*<$MEY+-o;xq z*^9qwaviVDpFuWHukt zlVQX(Wb=FdVn#s|EM^;TUS?>=ghgtRM15ICJ6ZSPPWtyBN%QM-@ asty=pa+9pgChxPdoBYU9Zu1|j6ixtHzF1uV delta 372 zcmaFR!T6wqaf1b$un~hBgE4~%gBcK;Fc^T~W^cByY?I^o>?ZqYb4^~tXEb>ZU(sd< zUIoU<0{j(||5yo4?&4M2{Dc1vBR1`m_e;la_AwA+6g0pvIa}D71B>u}X-`%`Lv+=X zz1d7R`zik8ob1ETHF=(P&E|JHI~XTB=x9w=(dhv?&SUZh9l6OHjAS++(vxAtG+^_4 z{bEKzBP`|`Z(e3-$Am>{zqIsb0TTm8L1T1Xn*&W>V-xl@FJ+qSWu-9ro|POhp!giu`=5H$0~&r09No=M*si- diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp index eb9976fb..9a4469b2 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp @@ -177,6 +177,85 @@ void Form1::setDeliverableProperties(void) { this->hDeliv->hBackupMemory = this->tboxBackupOther->Text; } + + // SRL情報を文字列で登録 + if( this->combCERO->SelectedIndex < 0 ) + { + if( this->stripItemJapanese->Checked == true ) + this->hDeliv->hCERO = gcnew System::String("未定義"); + else + this->hDeliv->hCERO = gcnew System::String("Undefined"); + } + else + { + this->hDeliv->hCERO = dynamic_cast(this->combCERO->SelectedItem); + } + if( this->combESRB->SelectedIndex < 0 ) + { + if( this->stripItemJapanese->Checked == true ) + this->hDeliv->hESRB = gcnew System::String("未定義"); + else + this->hDeliv->hESRB = gcnew System::String("Undefined"); + } + else + { + this->hDeliv->hESRB = dynamic_cast(this->combESRB->SelectedItem); + } + if( this->combUSK->SelectedIndex < 0 ) + { + if( this->stripItemJapanese->Checked == true ) + this->hDeliv->hUSK = gcnew System::String("未定義"); + else + this->hDeliv->hUSK = gcnew System::String("Undefined"); + } + else + { + this->hDeliv->hUSK = dynamic_cast(this->combUSK->SelectedItem); + } + if( this->combPEGI->SelectedIndex < 0 ) + { + if( this->stripItemJapanese->Checked == true ) + this->hDeliv->hPEGI = gcnew System::String("未定義"); + else + this->hDeliv->hPEGI = gcnew System::String("Undefined"); + } + else + { + this->hDeliv->hPEGI = dynamic_cast(this->combPEGI->SelectedItem); + } + if( this->combPEGI_PRT->SelectedIndex < 0 ) + { + if( this->stripItemJapanese->Checked == true ) + this->hDeliv->hPEGI_PRT = gcnew System::String("未定義"); + else + this->hDeliv->hPEGI_PRT = gcnew System::String("Undefined"); + } + else + { + this->hDeliv->hPEGI_PRT = dynamic_cast(this->combPEGI_PRT->SelectedItem); + } + if( this->combPEGI_BBFC->SelectedIndex < 0 ) + { + if( this->stripItemJapanese->Checked == true ) + this->hDeliv->hPEGI_BBFC = gcnew System::String("未定義"); + else + this->hDeliv->hPEGI_BBFC = gcnew System::String("Undefined"); + } + else + { + this->hDeliv->hPEGI_BBFC = dynamic_cast(this->combPEGI_BBFC->SelectedItem); + } + if( this->combOFLC->SelectedIndex < 0 ) + { + if( this->stripItemJapanese->Checked == true ) + this->hDeliv->hOFLC = gcnew System::String("未定義"); + else + this->hDeliv->hOFLC = gcnew System::String("Undefined"); + } + else + { + this->hDeliv->hOFLC = dynamic_cast(this->combOFLC->SelectedItem); + } } // ---------------------------------------------- diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp index 5483eb1b..25306753 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp @@ -491,194 +491,34 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( } // ペアレンタルコントロール - //if( node->FirstChild->Value->Equals( "TagRatingCERO" ) ) - //{ - // node->FirstChild->Value = hSrl->hArrayParentalRating[ OS_TWL_PCTL_OGN_CERO ]->ToString(); - //} - //if( node->FirstChild->Value->Equals( "TagRatingCEROStr" ) ) - //{ - // node->FirstChild->Value = MasterEditorTWL::transRatingToString( - // OS_TWL_PCTL_OGN_CERO, - // *(hSrl->hArrayParentalEnable[ OS_TWL_PCTL_OGN_CERO ]), - // *(hSrl->hArrayParentalRating[ OS_TWL_PCTL_OGN_CERO ]), - // english ); - //} - //if( node->FirstChild->Value->Equals( "TagEnableCERO" ) ) - //{ - // if( *(hSrl->hArrayParentalEnable[ OS_TWL_PCTL_OGN_CERO ]) ) - // node->FirstChild->Value = gcnew System::String( "○" ); - // else - // node->FirstChild->Value = nullptr; - //} - //if( node->FirstChild->Value->Equals( "TagAlwaysCERO" ) ) - //{ - // if( *(hSrl->hArrayParentalAlways[ OS_TWL_PCTL_OGN_CERO ]) ) - // node->FirstChild->Value = gcnew System::String( "○" ); - // else - // node->FirstChild->Value = nullptr; - //} - - //if( node->FirstChild->Value->Equals( "TagRatingESRB" ) ) - //{ - // node->FirstChild->Value = hSrl->hArrayParentalRating[ OS_TWL_PCTL_OGN_ESRB ]->ToString(); - //} - //if( node->FirstChild->Value->Equals( "TagRatingESRBStr" ) ) - //{ - // node->FirstChild->Value = MasterEditorTWL::transRatingToString( - // OS_TWL_PCTL_OGN_ESRB, - // *(hSrl->hArrayParentalEnable[ OS_TWL_PCTL_OGN_ESRB ]), - // *(hSrl->hArrayParentalRating[ OS_TWL_PCTL_OGN_ESRB ]), - // english ); - //} - //if( node->FirstChild->Value->Equals( "TagEnableESRB" ) ) - //{ - // if( *(hSrl->hArrayParentalEnable[ OS_TWL_PCTL_OGN_ESRB ]) ) - // node->FirstChild->Value = gcnew System::String( "○" ); - // else - // node->FirstChild->Value = nullptr; - //} - //if( node->FirstChild->Value->Equals( "TagAlwaysESRB" ) ) - //{ - // if( *(hSrl->hArrayParentalAlways[ OS_TWL_PCTL_OGN_ESRB ]) ) - // node->FirstChild->Value = gcnew System::String( "○" ); - // else - // node->FirstChild->Value = nullptr; - //} - - //if( node->FirstChild->Value->Equals( "TagRatingUSK" ) ) - //{ - // node->FirstChild->Value = hSrl->hArrayParentalRating[ OS_TWL_PCTL_OGN_USK ]->ToString(); - //} - //if( node->FirstChild->Value->Equals( "TagRatingUSKStr" ) ) - //{ - // node->FirstChild->Value = MasterEditorTWL::transRatingToString( - // OS_TWL_PCTL_OGN_USK, - // *(hSrl->hArrayParentalEnable[ OS_TWL_PCTL_OGN_USK ]), - // *(hSrl->hArrayParentalRating[ OS_TWL_PCTL_OGN_USK ]), - // english ); - //} - //if( node->FirstChild->Value->Equals( "TagEnableUSK" ) ) - //{ - // if( *(hSrl->hArrayParentalEnable[ OS_TWL_PCTL_OGN_USK ]) ) - // node->FirstChild->Value = gcnew System::String( "○" ); - // else - // node->FirstChild->Value = nullptr; - //} - //if( node->FirstChild->Value->Equals( "TagAlwaysUSK" ) ) - //{ - // if( *(hSrl->hArrayParentalAlways[ OS_TWL_PCTL_OGN_USK ]) ) - // node->FirstChild->Value = gcnew System::String( "○" ); - // else - // node->FirstChild->Value = nullptr; - //} - - //if( node->FirstChild->Value->Equals( "TagRatingPEGI" ) ) - //{ - // node->FirstChild->Value = hSrl->hArrayParentalRating[ OS_TWL_PCTL_OGN_PEGI_GEN ]->ToString(); - //} - //if( node->FirstChild->Value->Equals( "TagRatingPEGIStr" ) ) - //{ - // node->FirstChild->Value = MasterEditorTWL::transRatingToString( - // OS_TWL_PCTL_OGN_PEGI_GEN, - // *(hSrl->hArrayParentalEnable[ OS_TWL_PCTL_OGN_PEGI_GEN ]), - // *(hSrl->hArrayParentalRating[ OS_TWL_PCTL_OGN_PEGI_GEN ]), - // english ); - //} - //if( node->FirstChild->Value->Equals( "TagEnablePEGI" ) ) - //{ - // if( *(hSrl->hArrayParentalEnable[ OS_TWL_PCTL_OGN_PEGI_GEN ]) ) - // node->FirstChild->Value = gcnew System::String( "○" ); - // else - // node->FirstChild->Value = nullptr; - //} - //if( node->FirstChild->Value->Equals( "TagAlwaysPEGI" ) ) - //{ - // if( *(hSrl->hArrayParentalAlways[ OS_TWL_PCTL_OGN_PEGI_GEN ]) ) - // node->FirstChild->Value = gcnew System::String( "○" ); - // else - // node->FirstChild->Value = nullptr; - //} - - //if( node->FirstChild->Value->Equals( "TagRatingPEGI_PRT" ) ) - //{ - // node->FirstChild->Value = hSrl->hArrayParentalRating[ OS_TWL_PCTL_OGN_PEGI_PRT ]->ToString(); - //} - //if( node->FirstChild->Value->Equals( "TagRatingPEGI_PRTStr" ) ) - //{ - // node->FirstChild->Value = MasterEditorTWL::transRatingToString( - // OS_TWL_PCTL_OGN_PEGI_PRT, - // *(hSrl->hArrayParentalEnable[ OS_TWL_PCTL_OGN_PEGI_PRT ]), - // *(hSrl->hArrayParentalRating[ OS_TWL_PCTL_OGN_PEGI_PRT ]), - // english ); - //} - //if( node->FirstChild->Value->Equals( "TagEnablePEGI_PRT" ) ) - //{ - // if( *(hSrl->hArrayParentalEnable[ OS_TWL_PCTL_OGN_PEGI_PRT ]) ) - // node->FirstChild->Value = gcnew System::String( "○" ); - // else - // node->FirstChild->Value = nullptr; - //} - //if( node->FirstChild->Value->Equals( "TagAlwaysPEGI_PRT" ) ) - //{ - // if( *(hSrl->hArrayParentalAlways[ OS_TWL_PCTL_OGN_PEGI_PRT ]) ) - // node->FirstChild->Value = gcnew System::String( "○" ); - // else - // node->FirstChild->Value = nullptr; - //} - - //if( node->FirstChild->Value->Equals( "TagRatingPEGI_BBFC" ) ) - //{ - // node->FirstChild->Value = hSrl->hArrayParentalRating[ OS_TWL_PCTL_OGN_PEGI_BBFC ]->ToString(); - //} - //if( node->FirstChild->Value->Equals( "TagRatingPEGI_BBFCStr" ) ) - //{ - // node->FirstChild->Value = MasterEditorTWL::transRatingToString( - // OS_TWL_PCTL_OGN_PEGI_BBFC, - // *(hSrl->hArrayParentalEnable[ OS_TWL_PCTL_OGN_PEGI_BBFC ]), - // *(hSrl->hArrayParentalRating[ OS_TWL_PCTL_OGN_PEGI_BBFC ]), - // english ); - //} - //if( node->FirstChild->Value->Equals( "TagEnablePEGI_BBFC" ) ) - //{ - // if( *(hSrl->hArrayParentalEnable[ OS_TWL_PCTL_OGN_PEGI_BBFC ]) ) - // node->FirstChild->Value = gcnew System::String( "○" ); - // else - // node->FirstChild->Value = nullptr; - //} - //if( node->FirstChild->Value->Equals( "TagAlwaysPEGI_BBFC" ) ) - //{ - // if( *(hSrl->hArrayParentalAlways[ OS_TWL_PCTL_OGN_PEGI_BBFC ]) ) - // node->FirstChild->Value = gcnew System::String( "○" ); - // else - // node->FirstChild->Value = nullptr; - //} - - //if( node->FirstChild->Value->Equals( "TagRatingOFLC" ) ) - //{ - // node->FirstChild->Value = hSrl->hArrayParentalRating[ OS_TWL_PCTL_OGN_OFLC ]->ToString(); - //} - //if( node->FirstChild->Value->Equals( "TagRatingOFLCStr" ) ) - //{ - // node->FirstChild->Value = MasterEditorTWL::transRatingToString( - // OS_TWL_PCTL_OGN_OFLC, - // *(hSrl->hArrayParentalEnable[ OS_TWL_PCTL_OGN_OFLC ]), - // *(hSrl->hArrayParentalRating[ OS_TWL_PCTL_OGN_OFLC ]), - // english ); - //} - //if( node->FirstChild->Value->Equals( "TagEnableOFLC" ) ) - //{ - // if( *(hSrl->hArrayParentalEnable[ OS_TWL_PCTL_OGN_OFLC ]) ) - // node->FirstChild->Value = gcnew System::String( "○" ); - // else - // node->FirstChild->Value = nullptr; - //} - //if( node->FirstChild->Value->Equals( "TagAlwaysOFLC" ) ) - //{ - // if( *(hSrl->hArrayParentalAlways[ OS_TWL_PCTL_OGN_OFLC ]) ) - // node->FirstChild->Value = gcnew System::String( "○" ); - // else - // node->FirstChild->Value = nullptr; - //} + if( node->FirstChild->Value->Equals( "TagRatingCERO" ) ) + { + node->FirstChild->Value = this->hCERO; + } + if( node->FirstChild->Value->Equals( "TagRatingESRB" ) ) + { + node->FirstChild->Value = this->hESRB; + } + if( node->FirstChild->Value->Equals( "TagRatingUSK" ) ) + { + node->FirstChild->Value = this->hUSK; + } + if( node->FirstChild->Value->Equals( "TagRatingPEGI" ) ) + { + node->FirstChild->Value = this->hPEGI; + } + if( node->FirstChild->Value->Equals( "TagRatingPEGI_PRT" ) ) + { + node->FirstChild->Value = this->hPEGI_PRT; + } + if( node->FirstChild->Value->Equals( "TagRatingPEGI_BBFC" ) ) + { + node->FirstChild->Value = this->hPEGI_BBFC; + } + if( node->FirstChild->Value->Equals( "TagRatingOFLC" ) ) + { + node->FirstChild->Value = this->hOFLC; + } // ROM内登録データを1バイトずつ表に書き込む if( node->FirstChild->Value->Equals( "TagRomVersionHex" ) ) diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.h b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.h index 980c2b23..d2f7a94a 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.h @@ -86,6 +86,15 @@ namespace MasterEditorTWL // ROMヘッダ不記載のROMバイナリ(SRL)固有情報 property System::String ^hBackupMemory; // バックアップメモリの種別 + // SRL情報の一部を文字列で持っておく + property System::String ^hCERO; + property System::String ^hESRB; + property System::String ^hUSK; + property System::String ^hPEGI; + property System::String ^hPEGI_PRT; + property System::String ^hPEGI_BBFC; + property System::String ^hOFLC; + // constructor and destructor public: diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp index 7961e912..b7d3f5e8 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp @@ -518,7 +518,7 @@ void RCSrl::setParentalControlHeader(void) } else // レーティング年齢を設定 { - rating = OS_TWL_PCTL_OGNINFO_ALWAYS_MASK | ages[ index ]; + rating = OS_TWL_PCTL_OGNINFO_ENABLE_MASK | ages[ index ]; } } this->pRomHeader->s.parental_control_rating_info[i] = rating; diff --git a/build/tools/MasterEditorTWL/resource/sheet_templete.xml b/build/tools/MasterEditorTWL/resource/sheet_templete.xml index 50075c0a..3acb6a0d 100644 --- a/build/tools/MasterEditorTWL/resource/sheet_templete.xml +++ b/build/tools/MasterEditorTWL/resource/sheet_templete.xml @@ -33,39 +33,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + - + - - + - - - - - - - - - - - - - - - - - - -