diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 61a2f89..c15357a 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 3fdd0d4..026761f 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 29ef48f..d659504 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_deliv.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp index 86aa8fd..6b8ac78 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp @@ -96,22 +96,18 @@ void Form1::setDeliverableProperties(void) if( this->rUsageSale->Checked == true ) { this->hDeliv->hUsage = this->rUsageSale->Text; - this->hDeliv->hUsageOther = nullptr; } else if( this->rUsageSample->Checked == true ) { this->hDeliv->hUsage = this->rUsageSample->Text; - this->hDeliv->hUsageOther = nullptr; } else if( this->rUsageDst->Checked == true ) { this->hDeliv->hUsage = this->rUsageDst->Text; - this->hDeliv->hUsageOther = nullptr; } else if( this->rUsageOther->Checked == true ) { - this->hDeliv->hUsage = this->rUsageOther->Text; - this->hDeliv->hUsageOther = this->tboxUsageOther->Text; + this->hDeliv->hUsage = this->tboxUsageOther->Text; } // 会社情報 diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp index 6b7922c..df38e19 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp @@ -208,10 +208,6 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( { node->FirstChild->Value = this->hUsage; } - if( node->FirstChild->Value->Equals( "TagUsageOther" ) ) - { - node->FirstChild->Value = this->hUsageOther; // nullptr のときはセルが空になるので好都合 - } if( node->FirstChild->Value->Equals( "TagRomVersion" ) ) { node->FirstChild->Value = hSrl->RomVersion.ToString("X2"); diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.h index 823906d..e406fb3 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.h @@ -53,7 +53,6 @@ namespace MasterEditorTWL property System::Int32 SubmitDay; property System::String ^hSubmitWay; // 提出方法 property System::String ^hUsage; // 用途 - property System::String ^hUsageOther; // その他の用途 property System::Int32 SubmitVersion; // 提出バージョン property System::String ^hSDK; // SDKバージョン property System::Boolean IsReleaseForeign; // 海外版の予定