diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index f50431f..47744ad 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo index 67c76d0..d83daf0 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 311d558..13e9c9c 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp index d56ec02..b01cfd7 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp @@ -88,6 +88,7 @@ System::Void Form1::saveTmp( System::String ^filename ) MasterEditorTWL::appendXmlTag( doc, form, "NTSC2", this->tboxNTSC2->Text ); MasterEditorTWL::appendXmlTag( doc, form, "Region", this->combRegion->SelectedIndex.ToString() ); + MasterEditorTWL::appendXmlTag( doc, form, "IsUnnecessaryRating", (this->cboxIsUnnecessaryRating->Checked)?"Y":"N" ); MasterEditorTWL::appendXmlTag( doc, form, "RatingCERO", this->combCERO->SelectedIndex.ToString() ); MasterEditorTWL::appendXmlTag( doc, form, "RatingESRB", this->combESRB->SelectedIndex.ToString() ); MasterEditorTWL::appendXmlTag( doc, form, "RatingUSK", this->combUSK->SelectedIndex.ToString() ); @@ -132,8 +133,8 @@ void Form1::loadTmp( System::String ^filename ) text = MasterEditorTWL::getXPathText( root, "/MasterEditorTWL/Srl" ); if( !System::String::IsNullOrEmpty(text) ) // SRLファイル名がないときはスルー { - this->loadSrl(text); - this->tboxFile->Text = filename; + this->loadRom(text); // tad/srl両対応 + this->tboxFile->Text = text; } // 言語 @@ -233,6 +234,7 @@ void Form1::loadTmp( System::String ^filename ) this->parseTmp( root, "/MasterEditorTWL/Form/NTSC2", this->tboxNTSC2 ); this->parseTmp( root, "/MasterEditorTWL/Form/Region", this->combRegion ); + this->parseTmp( root, "/MasterEditorTWL/Form/IsUnnecessaryRating", this->cboxIsUnnecessaryRating ); this->parseTmp( root, "/MasterEditorTWL/Form/RatingCERO", this->combCERO ); this->parseTmp( root, "/MasterEditorTWL/Form/RatingESRB", this->combESRB ); this->parseTmp( root, "/MasterEditorTWL/Form/RatingUSK", this->combUSK ); @@ -245,6 +247,7 @@ void Form1::loadTmp( System::String ^filename ) this->parseTmp( root, "/MasterEditorTWL/Form/IsPhotoEx", this->cboxIsPhotoEx ); this->maskRatingForms(); // ペアレンタルコントロール情報をリージョンに合わせる + this->changeUnnecessaryRatingForms(false); // 一度コンボボックスがenableになるので再設定 } //loadTmp()