flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Cleanup some workarounds and warnings (#4735)

Browse Source 
* Cleanup thread_local usage in FastRandom

* Use constexpr to avoid clang warning

* Fix more Wglobal-constructor warnings

* Make MSVC happy?
This commit is contained in:
peterbell10
2020-05-10 17:16:49 +01:00
committed by GitHub
parent 154df6b09d
commit 84289a2ba9
9 changed files with 63 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/BlockType.cpp
View File

@@ -25,18 +25,9 @@ class cBlockIDMap
typedef std::map<AString, std::pair<short, short>, Comparator> ItemMap;
public:
static bool m_bHasRunInit;
cBlockIDMap(void)
{
// Dont load items.ini on construct, this will search the wrong path when running as a service.
}
void init()
{
m_bHasRunInit = true;
cIniFile Ini;
if (!Ini.ReadFile("items.ini"))
{
@@ -189,8 +180,11 @@ protected:
bool cBlockIDMap::m_bHasRunInit = false;
static cBlockIDMap gsBlockIDMap;
static cBlockIDMap & GetBlockIDMap()
{
static cBlockIDMap IDMap;
return IDMap;
}
@@ -224,11 +218,7 @@ int BlockStringToType(const AString & a_BlockTypeString)
return res;
}
if (!gsBlockIDMap.m_bHasRunInit)
{
gsBlockIDMap.init();
}
return gsBlockIDMap.Resolve(TrimString(a_BlockTypeString));
return GetBlockIDMap().Resolve(TrimString(a_BlockTypeString));
}
@@ -243,11 +233,7 @@ bool StringToItem(const AString & a_ItemTypeString, cItem & a_Item)
ItemName = ItemName.substr(10);
}
if (!gsBlockIDMap.m_bHasRunInit)
{
gsBlockIDMap.init();
}
return gsBlockIDMap.ResolveItem(ItemName, a_Item);
return GetBlockIDMap().ResolveItem(ItemName, a_Item);
}
@@ -256,11 +242,7 @@ bool StringToItem(const AString & a_ItemTypeString, cItem & a_Item)
AString ItemToString(const cItem & a_Item)
{
if (!gsBlockIDMap.m_bHasRunInit)
{
gsBlockIDMap.init();
}
return gsBlockIDMap.Desolve(a_Item.m_ItemType, a_Item.m_ItemDamage);
return GetBlockIDMap().Desolve(a_Item.m_ItemType, a_Item.m_ItemDamage);
}
@@ -269,11 +251,7 @@ AString ItemToString(const cItem & a_Item)
AString ItemTypeToString(short a_ItemType)
{
if (!gsBlockIDMap.m_bHasRunInit)
{
gsBlockIDMap.init();
}
return gsBlockIDMap.Desolve(a_ItemType, -1);
return GetBlockIDMap().Desolve(a_ItemType, -1);
}