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

change bmap interface. update bmfile safe guard

Browse Source
This commit is contained in:
yyc12345
2023-10-30 10:25:31 +08:00
parent 9475e2abc5
commit 1d9bd09224
5 changed files with 155 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
BMap/BMExports.cpp
View File

@ -105,7 +105,7 @@ bool BMFile_Load(
// 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));
if (file->IsFreezed()) return false;
if (file->IsInitError()) return false;
if (!file->Load(file_name)) return false;
// add into list and return
@ -124,7 +124,7 @@ bool BMFile_Create(
// create a now one
std::unique_ptr<BMap::BMFile> file(new BMap::BMFile(temp_folder, texture_folder, encoding_count, encodings, false));
if (file->IsFreezed()) return false;
if (file->IsInitError()) return false;
// add into list and return if success
g_AllBMFiles.emplace(file.get());
@ -307,9 +307,10 @@ bool BMMeshTrans_PrepareFaceMtlSlot(BMPARAM_MESHTRANS_DECL(trans), BMPARAM_OUT(L
BMPARAM_OUT_ASSIGN(out_mem, trans->PrepareFaceMtlSlot());
return BMPARAM_OUT_VAL(out_mem) != nullptr;
}
bool BMMeshTrans_Parse(BMPARAM_MESHTRANS_DECL(trans), BMPARAM_IN(LibCmo::CK2::ObjImpls::CKMesh*, write_into_mesh)) {
bool BMMeshTrans_Parse(BMPARAM_MESHTRANS_DECL(trans), BMPARAM_IN(BMap::BMFile*, bmfile), BMPARAM_IN(LibCmo::CK2::CK_ID, objid)) {
if (!CheckBMMeshTrans(trans)) return false;
return trans->Parse(write_into_mesh);
if (!CheckBMFile(bmfile)) return false;
return trans->Parse(bmfile, objid);
}
#pragma endregion