fix issues
- fix usage error of ckid getter in bmap wrapper. - fix CKObject flag init value error. - fix CKFileWriter writing empty object name error. - regulate some statement.
This commit is contained in:
@ -131,7 +131,7 @@ namespace LibCmo::CK2 {
|
||||
parser->Read(name_conv.data(), namelen);
|
||||
m_Ctx->GetUtf8String(name_conv, fileobj.Name);
|
||||
} else {
|
||||
fileobj.Name.clear();
|
||||
XContainer::NSXString::FromCKSTRING(fileobj.Name, nullptr);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -175,10 +175,15 @@ namespace LibCmo::CK2 {
|
||||
hdrparser->Write(&obj.FileIndex);
|
||||
|
||||
if (XContainer::NSXString::ToCKSTRING(obj.Name) != nullptr) {
|
||||
// if have name, write it
|
||||
m_Ctx->GetNativeString(obj.Name, name_conv);
|
||||
CKDWORD namelen = static_cast<CKDWORD>(name_conv.size());
|
||||
hdrparser->Write(&namelen);
|
||||
hdrparser->Write(name_conv.data(), namelen);
|
||||
} else {
|
||||
// otherwise, write 0 to indicate no name
|
||||
CKDWORD namelen = 0;
|
||||
hdrparser->Write(&namelen);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -7,7 +7,7 @@ namespace LibCmo::CK2::ObjImpls {
|
||||
m_ID(ckid),
|
||||
m_Name(),
|
||||
m_Context(ctx),
|
||||
m_ObjectFlags(CK_OBJECT_FLAGS::CK_PARAMETERIN_DISABLED) {
|
||||
m_ObjectFlags(CK_OBJECT_FLAGS::CK_OBJECT_VISIBLE) {
|
||||
// set name with possible nullptr.
|
||||
XContainer::NSXString::FromCKSTRING(m_Name, name);
|
||||
}
|
||||
|
Reference in New Issue
Block a user