yyc12345/libcmo21
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix fatal error about bmap. continue writing py bmap binding

Browse Source
This commit is contained in:
yyc12345
2023-11-05 17:38:08 +08:00
parent fcd1fa81db
commit d6411fd907
3 changed files with 128 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BMap/BMExports.cpp
View File

@ -35,7 +35,7 @@ _Ty CheckGeneralObject(BMap::BMFile* possible_bmfile, LibCmo::CK2::CK_ID possibl
// check id
LibCmo::CK2::ObjImpls::CKObject* obj = possible_bmfile->GetObjectPtr(possible_id);
// check id validation and class id
if (obj == nullptr || LibCmo::CK2::CKIsChildClassOf(obj->GetClassID(), expected_cid)) return nullptr;
if (obj == nullptr || !LibCmo::CK2::CKIsChildClassOf(obj->GetClassID(), expected_cid)) return nullptr;
return static_cast<_Ty>(obj);
}
@ -104,7 +104,7 @@ bool BMFile_Load(
if (!CheckInited()) return false;
// create a now one and try to load data.
std::unique_ptr<BMap::BMFile> file(new BMap::BMFile(temp_folder, texture_folder, encoding_count, encodings, false));
std::unique_ptr<BMap::BMFile> file(new BMap::BMFile(temp_folder, texture_folder, encoding_count, encodings, true));
if (file->IsInitError()) return false;
if (!file->Load(file_name)) return false;