From 9e2bca9c351cb0ebe7f581355d3749b0b5019c0f Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Thu, 25 Jun 2009 04:49:44 +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:=E4=B8=AD=E5=9B=BD=E7=89=88=E3=81=AE?= =?UTF-8?q?=E3=81=A8=E3=81=8D=E3=81=AB=E3=83=AC=E3=83=BC=E3=83=86=E3=82=A3?= =?UTF-8?q?=E3=83=B3=E3=82=B0=E8=A1=A8=E7=A4=BA=E4=B8=8D=E8=A6=81=E3=81=AE?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=82=92=E8=AA=AD=E3=81=BF=E8=BE=BC=E3=82=81?= =?UTF-8?q?=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E5=95=8F=E9=A1=8C=E7=82=B9?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=E3=80=82=E4=B8=AD=E5=9B=BD=E7=89=88?= =?UTF-8?q?=E3=81=AE=E3=81=A8=E3=81=8D=E3=81=AE=E6=8F=90=E5=87=BA=E7=A2=BA?= =?UTF-8?q?=E8=AA=8D=E6=9B=B8=E3=81=AE=E3=83=AC=E3=83=BC=E3=83=86=E3=82=A3?= =?UTF-8?q?=E3=83=B3=E3=82=B0=E8=A8=98=E8=BF=B0=E3=82=92=E5=A4=89=E6=9B=B4?= =?UTF-8?q?=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/TwlToolsRED@318 7061adef-622a-194b-ae81-725974e89856 --- .../MasterEditorTWL/MasterEditorTWL.ncb | Bin 13937664 -> 13937664 bytes .../MasterEditorTWL/MasterEditorTWL.suo | Bin 83968 -> 83968 bytes .../MasterEditorTWL/Debug/BuildLog.htm | Bin 14364 -> 13770 bytes .../MasterEditorTWL/MasterEditorTWL/Form1.h | 27 +++++------ .../MasterEditorTWL/Form_deliv.cpp | 44 ++++++++++++------ .../MasterEditorTWL/Form_pctl.cpp | 14 ++---- .../MasterEditorTWL/MasterEditorTWL/common.h | 14 ++++++ .../MasterEditorTWL/MasterEditorTWL/srl.cpp | 16 ++++--- 8 files changed, 69 insertions(+), 46 deletions(-) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 45e536690a4119d66af9ca9444f4d566426ce07c..75d139b676dd53d185a812368454bc0b97b70439 100644 GIT binary patch delta 20076 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 delta 35288 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 Jc;olS{{gA0bi)7u diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo index babe7fdba6491842867c773f4d0edd05e085d93d..4f19fab3a40a619190223d9fccf1b2c311082cd5 100644 GIT binary patch delta 4466 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 delta 4135 zcmZ{n3viUx702)S_K{6U!fqZALy){di3thFtAs2BK@utfLL9Y9aCj(63~{B1=mtwc z9Mq5td@V#tu~x@2mhK0vPYi}}5Q997t<_e+0!9o(gal|I>Hlm_>`rHTCuh(9``vTT zeSVMB);VhH9J>x0Hppp8qR6o67b*4rb_Vrggw*@j>Hgjtxozj(iT)OFZcGm-F zn0CV}d4ZuvW9c^Q*sZU|&{XU3;vO3v(vMGDr)y51F-9wEVrvrBmrT|PZEkCJ$;0H> zzxvZgg&yPS2J5e-OC1z#7Nt<0_RT6MBeWRaHmuJqmqA4ql`kgk+x?qBMR^puj?&fh z2Lx`3C35LWbsaiqLM+8vg}DxLL}EPGG^IbbV}YTMmoL{lOXFyuUbg$Pu3cOk=|wd! zl~ezzx+64+MdRF*sBc-{p^e79=HV$6=Tz$H_sT!kWi1K1ajnZbyX1KrI(odyPtp2n zRcUCyZVnC6_sE9$d1{HuRV&m|^)M0_z;3kYl#R4|eX0&rx9gl^N!Ix1qj>^v2YeNF z^Fk(Vr`f@-ArwXR8&a&4m92)04*?f_WmTs8c8qa4jL#OE&UrGGx;M_hGjR#%L$HTo zOJP+oR7?vz<%+atEIJciKQuw7t~+5C44@JR?~ccsR7YesIqAGv<-`=cb#@G;OLx`A z=?eXN{f2|)Y5p zHIuFC&9P*br&D|1p@`sa9ZFgLtwj2zmy+wpcROOhcw^4#sv>vjE^up_-Km#$y_ zaf9AbzD7U$Wv&&dxr5AV554*Fn~kK~^HTJQ0MB<=V8;Qsj4;VM6-Xk>w>z5Zb9}mb z_YeB1V5(KSr<+2jYx&wZ>kn^M*|ay~3fatA>C{6Jmgn6VK5%s7X@62&@7&868TPFB-ncr_r9<@!I~s49gD}q501&bnM9}ek}gWF$zt)@of4w z@Qv5u=b?Ot)SU2d(#1mPzYF_X*i5i*gq;;u33g7{HDSDQJ;IE{-lbw@hvq&agz?(D z5^MIJiyh^+_xz#&$@ojX83Dx$z`ix*4v=H@GlAD=DVP|d5f^&(A%N891+I) zC^XOIxG zlLlySS5|Cpa^r;DJe3= z%CYh@Od3SHf+KFCGGh~srNlksD8qKw>&V3CH2}{^d78fsWyiJ&15*2-`A9Sgg#YzTAKJA|vRHrq!f>yuD~|ETxm_b<>Z*^!{`s1q(d%iPJnegc4{@Ffk2??hcMh zXMb;SP6qpVW=$qNza@p%_$MK~PrBYDUEc(@Sy+QGAoU_N4`;iuG-wOj0sodTp58mc z_J^@%VIK+OJ^R?e+Z)&Fh`?;g@f82?76i xLxb2*)c=$yxN8jVG4o^^n$Dg;Z_t)3steY6soJLVe(AKF%gc;l#dvx>=0Bu#01^NI diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 9d6b0ea6fbf2310f8f043103f77005a25483cc42..2251c40ade7de5742600be22da79fbd7c511663e 100644 GIT binary patch delta 223 zcmbPJa4LI)85_S5gCT0KLMEU}6v4^*!m^vIwDmw{o1m!Psq-3B caI2mr)8rsSt;y>Qxi-%-Y-8MS%FtX zGzBOCGN24d7cnFRig<{UMMKL`H7|;$PSPsvJOS<*Vu%mbuF0!-9Ui@^gcYG81xvD y847@qmw}4`CBRT*Py!BFX7WLO;mINTTJWGN)St_!h&9+ywAIUsZe}q&#sUCR=wA&0 diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h index 871bd95..790d88f 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -4540,13 +4540,13 @@ private: System::Windows::Forms::ToolStripMenuItem^ stripItemRomInfoList; // リージョン設定は複雑なので別に切り出す // --------------------------------------------------------------------- - // フォーム入力をSRLに反映させる + // GUIのコンボボックスからROMヘッダのリージョンコードを決定する void setRegionSrlPropaties(void); - // SRL情報をフォームに反映させる + // ROMヘッダのリージョンコードからGUIのコンボボックスの値を決定する void setRegionForms(void); - // フォーム入力が正しいか書き込み前チェック + // リージョンのフォームに問題がないかをチェックする void checkRegionForms(void); private: @@ -4554,39 +4554,40 @@ private: System::Windows::Forms::ToolStripMenuItem^ stripItemRomInfoList; // レーティング設定は複雑なので別に切り出す // --------------------------------------------------------------------- - // フォーム入力をSRLに反映させる + // ROMヘッダのレーティング情報からGUIのコンボボックスを設定する void setRatingSrlProperties(void); - // SRL情報をフォームに反映させる + // GUIのコンボボックスの選択をROMヘッダに反映させる void setRatingForms(void); - // リージョン情報からペアレンタルコントロールの編集可能団体をマスクする + // GUIで表示するレーティング団体をリージョンによって変える void maskRatingForms(void); - // フォーム入力が正しいか書き込み前チェック + // GUIのレーティング設定に問題がないかチェックする void checkRatingForms( System::Boolean inRegion, System::Windows::Forms::ComboBox ^comb, System::String ^ogn ); - // クリアする + // レーティングのコンボボックスをクリアする void clearRating( System::Windows::Forms::ComboBox ^comb ); - // 編集できるようにする + // レーティングのコンボボックスを編集可能な状態にする void enableRating( System::Windows::Forms::ComboBox ^comb, System::Windows::Forms::Label ^lab1, System::Windows::Forms::Label ^lab2 ); - // 編集できなくする + // レーティングのコンボボックスを編集不可状態にする void disableRating( System::Windows::Forms::ComboBox ^comb, System::Windows::Forms::Label ^lab1, System::Windows::Forms::Label ^lab2 ); - // 全団体を「レーティング表示不要」の設定/解除をする + // 「レーティング表示不要」が選択されたかどうかでコンボボックスの内容を変える + // ROM読み込み時および「レーティング表示不要」チェックボックスに変化があったときに呼び出される void changeUnnecessaryRatingForms( System::Boolean bInitial ); - // 「レーティング表示不要」と表示して編集できなくする + // レーティングのコンボボックスに「レーティング表示不要」と表示し編集不可状態にする void unnecessaryRating( System::Windows::Forms::ComboBox ^comb ); - // 「レーティング表示不要」表示を消して通常の設定に戻す + // レーティングのコンボボックスの「レーティング表示不要」の表示をクリアし編集可能状態にする void necessaryRating( System::Windows::Forms::ComboBox ^comb, System::Boolean bInitial ); // ---------------------------------------------- diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp index 8c97dbc..bea535a 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp @@ -225,10 +225,7 @@ void Form1::setDeliverableProperties(void) // WorldWide のときはリストで選択可能な文字列を登録 if( this->combRegion->SelectedIndex < 0 ) { - if( this->isJapanese() == true ) - this->hDeliv->hRegion = gcnew System::String("不明"); - else - this->hDeliv->hRegion = gcnew System::String("Undefined"); + this->hDeliv->hRegion = this->isJapanese()?METWL_STRING_UNDEFINED_REGION_J:METWL_STRING_UNDEFINED_REGION_E; // 起こり得ない } else { @@ -256,32 +253,49 @@ void Form1::setDeliverableProperties(void) System::String^ Form1::setDeliverableRatingOgnProperties( System::Windows::Forms::ComboBox ^box ) { System::String ^str; + + // 中国リージョン特別対応 + if( (this->combRegion->DropDownStyle == System::Windows::Forms::ComboBoxStyle::DropDown) // コンボボックスが中韓リージョン用になっているとき + && this->hSrl->IsRegionChina ) // SRLが読み込まれていることは保証される + { + if( this->cboxIsUnnecessaryRating->Checked ) + { + // レーティング表示不要が選択されているときには団体が中国リージョンに含まれていなくても「レーティング表示不要」となる + str = this->isJapanese()?METWL_STRING_UNNECESSARY_RATING_J:METWL_STRING_UNNECESSARY_RATING_E; + } + else + { + // 中国リージョンに含まれていなくても「全年齢」 + str = this->isJapanese()?METWL_STRING_CHINA_RATING_FREE_J:METWL_STRING_CHINA_RATING_FREE_E; + } + return str; + } + + // リージョンに含まれる団体のみレーティングが設定される それ以外は「不可」となる if( this->cboxIsUnnecessaryRating->Checked ) // レーティング表示不要が選択されているとき { if( box->FlatStyle == System::Windows::Forms::FlatStyle::Standard ) // リージョンに含まれているときの判定 { - str = System::String::Copy( box->Text ); // テキスト入力可になっているので取得できるはず + // リージョンに含まれている団体のみ「レーティング表示不要」とする + str = this->isJapanese()?METWL_STRING_UNNECESSARY_RATING_J:METWL_STRING_UNNECESSARY_RATING_E; } - else // リージョンに含まれていない(コンボボックスが表示されていない)ときには不可とする + else { - if( this->isJapanese() == true ) - str = gcnew System::String("不可"); - else - str = gcnew System::String("Undefined"); + // リージョンに含まれていない(コンボボックスが表示されていない)ときには「不可」とする + str = this->isJapanese()?METWL_STRING_UNDEFINED_RATING_J:METWL_STRING_UNDEFINED_RATING_E; } } else { if( box->SelectedIndex < 0 ) { - if( this->isJapanese() == true ) - str = gcnew System::String("不可"); - else - str = gcnew System::String("Undefined"); + // リージョンに含まれていない(コンボボックスが表示されていない)ときには「不可」とする + str = this->isJapanese()?METWL_STRING_UNDEFINED_RATING_J:METWL_STRING_UNDEFINED_RATING_E; } else { - str = dynamic_cast(box->SelectedItem); // リストで選択されているテキストを代入 + // リージョンに含まれている団体にはリストで選択されているテキストを代入 + str = dynamic_cast(box->SelectedItem); } } return str; diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_pctl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_pctl.cpp index fa800d1..51e6f6b 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_pctl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_pctl.cpp @@ -115,14 +115,14 @@ void Form1::setRegionForms(void) { this->combRegion->DropDownStyle = System::Windows::Forms::ComboBoxStyle::DropDown; // 自由にテキストを入力できる this->combRegion->SelectedIndex = -1; // 設定の順序に注意: テキストの設定よりも前に入れておかないとテキスト入力が反映されないことがある - this->combRegion->Text = this->isJapanese()?"中国のみ":"China only"; + this->combRegion->Text = this->isJapanese()?METWL_STRING_CHINA_REGION_J:METWL_STRING_CHINA_REGION_E; this->combRegion->Enabled = false; // 編集不可 } else if( !isJapan && !isAmerica && !isEurope && !isAustralia && isKorea && !isChina ) // 韓国 { this->combRegion->DropDownStyle = System::Windows::Forms::ComboBoxStyle::DropDown; this->combRegion->SelectedIndex = -1; - this->combRegion->Text = this->isJapanese()?"韓国のみ":"Korea only"; + this->combRegion->Text = this->isJapanese()?METWL_STRING_KOREA_REGION_J:METWL_STRING_KOREA_REGION_E; this->combRegion->Enabled = false; } else // WorldWide @@ -469,15 +469,7 @@ void Form1::unnecessaryRating( System::Windows::Forms::ComboBox ^comb ) { comb->DropDownStyle = System::Windows::Forms::ComboBoxStyle::DropDown; // 自由なテキストを表示可能にする comb->SelectedIndex = -1; // 何も選択されていないとみなす - System::String ^msg; - if( this->isJapanese() ) - { - msg = gcnew System::String( "レーティング表示不要(全年齢)" ); - } - else - { - msg = gcnew System::String( "Rating Not Required (All ages)" ); - } + System::String ^msg = this->isJapanese()?METWL_STRING_UNNECESSARY_RATING_J:METWL_STRING_UNNECESSARY_RATING_E; comb->Text = msg; comb->Enabled = false; // 編集不可能にする } diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/common.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/common.h index d2435b4..291cfa0 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/common.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/common.h @@ -23,3 +23,17 @@ #define METWL_SEG3_CRC 0x0254 #define METWL_TAD_TMP_FILENAME "tmp.srl" // TAD読み込みの際に split_tad で一時的に作成するファイル名 #define METWL_SDK52_RELEASE ((5 << 24)|(2 << 16)|30000) // SDアクセス権の判定が必要なSDKバージョン (5.2 RELEASE) + +// 特別にGUI表示/提出確認書に記述する文字列 +#define METWL_STRING_UNNECESSARY_RATING_J ("レーティング表示不要(全年齢)") +#define METWL_STRING_UNNECESSARY_RATING_E ("Rating Not Required (All ages)") +#define METWL_STRING_UNDEFINED_RATING_J ("不可") +#define METWL_STRING_UNDEFINED_RATING_E ("Undefined") +#define METWL_STRING_UNDEFINED_REGION_J ("不明") // 起こり得ない +#define METWL_STRING_UNDEFINED_REGION_E ("Undefined") +#define METWL_STRING_CHINA_RATING_FREE_J ("全年齢(中国版対応)") +#define METWL_STRING_CHINA_RATING_FREE_E ("All ages (China version support)") +#define METWL_STRING_CHINA_REGION_J ("中国のみ") +#define METWL_STRING_CHINA_REGION_E ("China only") +#define METWL_STRING_KOREA_REGION_J ("韓国のみ") +#define METWL_STRING_KOREA_REGION_E ("Korea only") diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp index d2c871d..77fc58f 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp @@ -392,7 +392,7 @@ bool RCSrl::setRegionInfo( u32 region ) this->IsRegionChina = ((region & METWL_MASK_REGION_CHINA) != 0)?true:false; // リージョンに含まれる団体がなかったらリージョンは不正 - if( MasterEditorTWL::getOgnListInRegion( region ) == nullptr ) + if( (MasterEditorTWL::getOgnListInRegion( region ) == nullptr) && (region != METWL_MASK_REGION_CHINA) ) // 中国は例外 { this->hParentalErrorList->Add( this->makeMrcError("IllegalRegion") ); return false; @@ -409,12 +409,6 @@ bool RCSrl::setRegionInfo( u32 region ) // ---------------------------------------------------------------------- void RCSrl::setUnnecessaryRatingInfo( u32 region ) { - System::Collections::Generic::List ^ognlist = MasterEditorTWL::getOgnListInRegion( region ); - if( ognlist == nullptr ) // リストがnullptrなら不正 - { - return; - } - // ROMヘッダのフラグを調べる this->IsUnnecessaryRating = (this->pRomHeader->s.unnecessary_rating_display != 0)?true:false; if( !this->IsUnnecessaryRating ) @@ -422,6 +416,13 @@ void RCSrl::setUnnecessaryRatingInfo( u32 region ) return; // 不要でないならこれ以降のチェックは必要ない(レーティング情報の取得に移る) } + // リージョンに含まれるレーティング団体を取得 + System::Collections::Generic::List ^ognlist = MasterEditorTWL::getOgnListInRegion( region ); + if( ognlist == nullptr ) + { + return; + } + // リージョンに含まれる団体のレーティング情報に余計なデータが登録されていないかチェック bool noerror = false; for each( int ogn in ognlist ) @@ -577,6 +578,7 @@ void RCSrl::setRatingRomHeader( u32 region ) this->pRomHeader->s.unnecessary_rating_display = (this->IsUnnecessaryRating == true)?1:0; // 中国リージョンおよびオールリージョンのとき予約領域もすべて「全年齢」(0x80)で埋めておく + // 「レーティング表示不要」かどうかにかかわらず埋める if( this->IsRegionChina ) // オールリージョンのときも中国ビットは立つ { for( j=0; j < PARENTAL_CONTROL_INFO_SIZE; j++ )