Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a.
This commit is contained in:
@@ -139,7 +139,7 @@ UIString::~UIString()
|
||||
|
||||
bool UIString::empty()
|
||||
{
|
||||
return m_core.get() == nullptr;
|
||||
return m_core.get() == NULL;
|
||||
}
|
||||
|
||||
bool UIString::compare(const UIString &uiString)
|
||||
@@ -149,19 +149,19 @@ bool UIString::compare(const UIString &uiString)
|
||||
|
||||
bool UIString::needsUpdating()
|
||||
{
|
||||
if (m_core != nullptr) return m_core->needsUpdating();
|
||||
if (m_core != NULL) return m_core->needsUpdating();
|
||||
else return false;
|
||||
}
|
||||
|
||||
void UIString::setUpdated()
|
||||
{
|
||||
if (m_core != nullptr) m_core->setUpdated();
|
||||
if (m_core != NULL) m_core->setUpdated();
|
||||
}
|
||||
|
||||
wstring &UIString::getString()
|
||||
{
|
||||
static wstring blank(L"");
|
||||
if (m_core != nullptr) return m_core->getString();
|
||||
if (m_core != NULL) return m_core->getString();
|
||||
else return blank;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user