yyc12345/libcmo21
1
0
Fork 0
Code Activity

refactor: fix BMap build issue.

Browse Source 
- fix BMap build issue with new YYCC.
- rename most "General" into "Generic".
- remove useless code.
This commit is contained in:
yyc12345
2026-01-30 14:38:03 +08:00
parent 333ff0ab17
commit 2b9c0296d1
7 changed files with 42 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
LibCmo/LibCmo/CK2/CKContext.cpp
View File

@@ -169,30 +169,30 @@ namespace LibCmo::CK2 {
}
void CKContext::ExecuteManagersOnPreClearAll() {
ExecuteManagersGeneral([](MgrImpls::CKBaseManager* mgr) -> void {
ExecuteGenericManagers([](MgrImpls::CKBaseManager* mgr) -> void {
mgr->PreClearAll();
});
}
void CKContext::ExecuteManagersOnPostClearAll() {
ExecuteManagersGeneral([](MgrImpls::CKBaseManager* mgr) -> void {
ExecuteGenericManagers([](MgrImpls::CKBaseManager* mgr) -> void {
mgr->PostClearAll();
});
}
void CKContext::ExecuteManagersOnSequenceToBeDeleted(const CK_ID* objids, CKDWORD count) {
ExecuteManagersGeneral([objids, count](MgrImpls::CKBaseManager* mgr) -> void {
ExecuteGenericManagers([objids, count](MgrImpls::CKBaseManager* mgr) -> void {
mgr->SequenceToBeDeleted(objids, count);
});
}
void CKContext::ExecuteManagersOnSequenceDeleted(const CK_ID* objids, CKDWORD count) {
ExecuteManagersGeneral([objids, count](MgrImpls::CKBaseManager* mgr) -> void {
ExecuteGenericManagers([objids, count](MgrImpls::CKBaseManager* mgr) -> void {
mgr->SequenceDeleted(objids, count);
});
}
void CKContext::ExecuteManagersGeneral(std::function<void(MgrImpls::CKBaseManager*)> fct) {
void CKContext::ExecuteGenericManagers(std::function<void(MgrImpls::CKBaseManager*)> fct) {
for (auto& mgrptr : m_ManagerList) {
fct(mgrptr);
}

2
LibCmo/LibCmo/CK2/CKContext.hpp
View File

@@ -69,7 +69,7 @@ namespace LibCmo::CK2 {
void ExecuteManagersOnSequenceDeleted(const CK_ID* objids, CKDWORD count);
protected:
void ExecuteManagersGeneral(std::function<void(MgrImpls::CKBaseManager*)> fct);
void ExecuteGenericManagers(std::function<void(MgrImpls::CKBaseManager*)> fct);
XContainer::XArray<MgrImpls::CKBaseManager*> m_ManagerList;
MgrImpls::CKObjectManager* m_ObjectManager;

9
LibCmo/LibCmo/CK2/CKStateChunk.hpp
View File

@@ -274,11 +274,13 @@ namespace LibCmo::CK2 {
public:
bool SeekIdentifierDword(CKDWORD identifier);
bool SeekIdentifierDwordAndReturnSize(CKDWORD identifier, CKDWORD* out_size);
template<typename TEnum, std::enable_if_t<std::is_enum_v<TEnum>, int> = 0>
template<typename TEnum>
requires std::is_enum_v<TEnum>
inline bool SeekIdentifier(TEnum enum_v) {
return SeekIdentifierDword(static_cast<CKDWORD>(enum_v));
}
template<typename TEnum, std::enable_if_t<std::is_enum_v<TEnum>, int> = 0>
template<typename TEnum>
requires std::is_enum_v<TEnum>
inline bool SeekIdentifierAndReturnSize(TEnum enum_v, CKDWORD* out_size) {
return SeekIdentifierDwordAndReturnSize(static_cast<CKDWORD>(enum_v), out_size);
}
@@ -564,7 +566,8 @@ namespace LibCmo::CK2 {
public:
bool WriteIdentifierDword(CKDWORD identifier);
template<typename TEnum, std::enable_if_t<std::is_enum_v<TEnum>, int> = 0>
template<typename TEnum>
requires std::is_enum_v<TEnum>
inline bool WriteIdentifier(TEnum enum_v) {
return WriteIdentifierDword(static_cast<CKDWORD>(enum_v));
}

24
LibCmo/LibCmo/XContainer/XTypes.cpp
View File

@@ -41,7 +41,7 @@ namespace LibCmo::XContainer {
}
template<bool BCondition>
static bool GeneralGetBitPosition(const XBitArray& ba, CKDWORD n, CKDWORD& got) {
static bool GenericGetBitPosition(const XBitArray& ba, CKDWORD n, CKDWORD& got) {
CKDWORD counter = 0;
for (size_t i = 0; i < ba.size(); ++i) {
if (ba[i] == BCondition) {
@@ -58,11 +58,11 @@ namespace LibCmo::XContainer {
}
bool GetSetBitPosition(const XBitArray& ba, CKDWORD n, CKDWORD& got) {
return GeneralGetBitPosition<true>(ba, n, got);
return GenericGetBitPosition<true>(ba, n, got);
}
bool GetUnsetBitPosition(const XBitArray& ba, CKDWORD n, CKDWORD& got) {
return GeneralGetBitPosition<false>(ba, n, got);
return GenericGetBitPosition<false>(ba, n, got);
}
}
@@ -83,7 +83,7 @@ namespace LibCmo::XContainer {
template<class T, bool BIsPre>
requires (std::is_same_v<T, CK2::CK_ID> || std::is_same_v<T, CK2::ObjImpls::CKObject*>)
static bool GeneralXArrayCheck_ItemCheck(const T& item, CK2::CKContext* ctx) {
static bool GenericXArrayCheck_ItemCheck(const T& item, CK2::CKContext* ctx) {
if (ctx == nullptr) return false;
if constexpr (BIsPre) {
@@ -111,14 +111,14 @@ namespace LibCmo::XContainer {
void PreDeletedCheck(XObjectArray& objarray, CK2::CKContext* ctx) {
if (ctx == nullptr) return;
std::erase_if(objarray, [ctx](const CK2::CK_ID& item) -> bool {
return GeneralXArrayCheck_ItemCheck<CK2::CK_ID, true>(item, ctx);
return GenericXArrayCheck_ItemCheck<CK2::CK_ID, true>(item, ctx);
});
}
void PostDeletedCheck(XObjectArray& objarray, CK2::CKContext* ctx) {
if (ctx == nullptr) return;
std::erase_if(objarray, [ctx](const CK2::CK_ID& item) -> bool {
return GeneralXArrayCheck_ItemCheck<CK2::CK_ID, false>(item, ctx);
return GenericXArrayCheck_ItemCheck<CK2::CK_ID, false>(item, ctx);
});
}
@@ -126,14 +126,14 @@ namespace LibCmo::XContainer {
void PreDeletedCheck(XList<CK2::CK_ID>& objarray, CK2::CKContext* ctx) {
if (ctx == nullptr) return;
std::erase_if(objarray, [ctx](const CK2::CK_ID& item) -> bool {
return GeneralXArrayCheck_ItemCheck<CK2::CK_ID, true>(item, ctx);
return GenericXArrayCheck_ItemCheck<CK2::CK_ID, true>(item, ctx);
});
}
void PostDeletedCheck(XList<CK2::CK_ID>& objarray, CK2::CKContext* ctx) {
if (ctx == nullptr) return;
std::erase_if(objarray, [ctx](const CK2::CK_ID& item) -> bool {
return GeneralXArrayCheck_ItemCheck<CK2::CK_ID, false>(item, ctx);
return GenericXArrayCheck_ItemCheck<CK2::CK_ID, false>(item, ctx);
});
}
@@ -153,14 +153,14 @@ namespace LibCmo::XContainer {
void PreDeletedCheck(XObjectPointerArray& objarray, CK2::CKContext* ctx) {
if (ctx == nullptr) return;
std::erase_if(objarray, [ctx](CK2::ObjImpls::CKObject* const& item) -> bool {
return GeneralXArrayCheck_ItemCheck<CK2::ObjImpls::CKObject*, true>(item, ctx);
return GenericXArrayCheck_ItemCheck<CK2::ObjImpls::CKObject*, true>(item, ctx);
});
}
void PostDeletedCheck(XObjectPointerArray& objarray, CK2::CKContext* ctx) {
if (ctx == nullptr) return;
std::erase_if(objarray, [ctx](CK2::ObjImpls::CKObject* const& item) -> bool {
return GeneralXArrayCheck_ItemCheck<CK2::ObjImpls::CKObject*, false>(item, ctx);
return GenericXArrayCheck_ItemCheck<CK2::ObjImpls::CKObject*, false>(item, ctx);
});
}
@@ -168,14 +168,14 @@ namespace LibCmo::XContainer {
void PreDeletedCheck(XList<CK2::ObjImpls::CKObject*>& objarray, CK2::CKContext* ctx) {
if (ctx == nullptr) return;
std::erase_if(objarray, [ctx](CK2::ObjImpls::CKObject* const& item) -> bool {
return GeneralXArrayCheck_ItemCheck<CK2::ObjImpls::CKObject*, true>(item, ctx);
return GenericXArrayCheck_ItemCheck<CK2::ObjImpls::CKObject*, true>(item, ctx);
});
}
void PostDeletedCheck(XList<CK2::ObjImpls::CKObject*>& objarray, CK2::CKContext* ctx) {
if (ctx == nullptr) return;
std::erase_if(objarray, [ctx](CK2::ObjImpls::CKObject* const& item) -> bool {
return GeneralXArrayCheck_ItemCheck<CK2::ObjImpls::CKObject*, false>(item, ctx);
return GenericXArrayCheck_ItemCheck<CK2::ObjImpls::CKObject*, false>(item, ctx);
});
}