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:
@@ -72,7 +72,7 @@ void UIControl_Base::setLabel(UIString label, bool instant, bool force)
|
||||
const wchar_t* UIControl_Base::getLabel()
|
||||
{
|
||||
IggyDataValue result;
|
||||
IggyResult out = IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, getIggyValuePath(), m_funcGetLabel, 0, nullptr);
|
||||
IggyResult out = IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, getIggyValuePath(), m_funcGetLabel, 0, NULL);
|
||||
|
||||
if(result.type == IGGY_DATATYPE_string_UTF16)
|
||||
{
|
||||
@@ -90,7 +90,7 @@ void UIControl_Base::setAllPossibleLabels(int labelCount, wchar_t labels[][256])
|
||||
|
||||
for(unsigned int i = 0; i < labelCount; ++i)
|
||||
{
|
||||
stringVal[i].string = static_cast<IggyUTF16 *>(labels[i]);
|
||||
stringVal[i].string = (IggyUTF16 *)labels[i];
|
||||
stringVal[i].length = wcslen(labels[i]);
|
||||
value[i].type = IGGY_DATATYPE_string_UTF16;
|
||||
value[i].string16 = stringVal[i];
|
||||
|
||||
Reference in New Issue
Block a user