diff --git a/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL.ncb b/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL.ncb index 582ce26..9194ae7 100644 Binary files a/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL.ncb and b/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL.ncb differ diff --git a/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL.suo b/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL.suo index 535e8f1..98b8cf2 100644 Binary files a/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL.suo and b/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL.suo differ diff --git a/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/Debug/BuildLog.htm index 6358380..9acb6c9 100644 Binary files a/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/Debug/BuildLog.htm and b/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/Debug/BuildLog.htm differ diff --git a/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/Release/BuildLog.htm b/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/Release/BuildLog.htm index 36b3cbe..07e0e67 100644 Binary files a/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/Release/BuildLog.htm and b/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/Release/BuildLog.htm differ diff --git a/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/SheetCheckerTWL.cpp b/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/SheetCheckerTWL.cpp index 70c3bc1..d8e8e6f 100644 --- a/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/SheetCheckerTWL.cpp +++ b/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/SheetCheckerTWL.cpp @@ -91,7 +91,7 @@ int main(array ^args) printf( "RemasterVersion: %02X %02X\n", rh.s.rom_version, hItem->RomVersion ); printf( "File CRC: %04X %04X\n", crc, hItem->FileCRC ); printf( "------------------------------------\n" ); - printf( "SubmitVersion: - %d\n", hItem->SubmitVersion ); + printf( "SubmitVersion: - %d (%02X)\n", hItem->SubmitVersion, hItem->SubmitVersion ); printf( "------------------------------------\n" ); printf( "Result: " ); if( hContext->ErrorCode == SheetCheckerError::NOERROR ) @@ -160,9 +160,12 @@ System::Boolean readSheet( System::String ^sheetfile, SheetItem ^item ) // XSLによってXML変換 System::String ^tmpfile = ".\\temp" + System::DateTime::Now.ToString("yyyyMMddHHmmss") + ".xml"; System::Xml::Xsl::XslCompiledTransform ^xslt = gcnew System::Xml::Xsl::XslCompiledTransform; + System::String ^xslpath = System::IO::Path::GetDirectoryName( System::Reflection::Assembly::GetEntryAssembly()->Location ) + + "\\extract_sheet.xsl"; try { - xslt->Load( ".\\extract_sheet.xsl" ); + //Console::WriteLine( "xslpath: " + xslpath ); + xslt->Load( xslpath ); xslt->Transform( sheetfile, tmpfile ); } catch( System::Exception ^ex ) @@ -180,12 +183,14 @@ System::Boolean readSheet( System::String ^sheetfile, SheetItem ^item ) catch( System::Exception ^ex ) { (void)ex; + //Console::WriteLine( "Load error" ); return false; } // XMLからデータを抽出 System::Xml::XmlElement ^root = doc->DocumentElement; System::String ^text; + try { text = getXPathText( root, "/Sheet/GameCode" ); char code[4]; @@ -201,6 +206,7 @@ System::Boolean readSheet( System::String ^sheetfile, SheetItem ^item ) { text = text->Remove( text->IndexOf("(") ); } + text = text->Trim(); item->RomVersion = System::Byte::Parse( text, System::Globalization::NumberStyles::AllowHexSpecifier ); text = getXPathText( root, "/Sheet/CRC" ); @@ -212,19 +218,24 @@ System::Boolean readSheet( System::String ^sheetfile, SheetItem ^item ) text = getXPathText( root, "/Sheet/SubmitVersion" ); char c = (char)text[0]; - if( ('G' <= c) && (c <= 'Z') ) // Fより上はG..Zで表現されていく + if( ('G' <= c) && (c <= 'Z') ) // Fより上はG..Zで表現されていく(可能性あり) { - item->SubmitVersion = c - 'F' + 16; + item->SubmitVersion = c - 'G' + 16; } else if( ('g' <= c) && (c <= 'z') ) { - item->SubmitVersion = c - 'f' + 16; + item->SubmitVersion = c - 'g' + 16; } else { item->SubmitVersion = System::Byte::Parse( text, System::Globalization::NumberStyles::AllowHexSpecifier ); } } + catch( System::Exception ^ex ) + { + (void)ex; + return false; + } // 中間ファイルを削除 if( System::IO::File::Exists( tmpfile ) )