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:
parent
a9be52c41a
commit
087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
|
|
@ -24,7 +24,7 @@ AttributeInstance *BaseAttributeMap::getInstance(eATTRIBUTE_ID id)
|
|||
}
|
||||
else
|
||||
{
|
||||
return nullptr;
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -50,7 +50,7 @@ void BaseAttributeMap::removeItemModifiers(shared_ptr<ItemInstance> item)
|
|||
AttributeInstance* attribute = getInstance(it.first);
|
||||
AttributeModifier* modifier = it.second;
|
||||
|
||||
if (attribute != nullptr)
|
||||
if (attribute != NULL)
|
||||
{
|
||||
attribute->removeModifier(modifier);
|
||||
}
|
||||
|
|
@ -72,7 +72,7 @@ void BaseAttributeMap::addItemModifiers(shared_ptr<ItemInstance> item)
|
|||
AttributeInstance* attribute = getInstance(it.first);
|
||||
AttributeModifier* modifier = it.second;
|
||||
|
||||
if (attribute != nullptr)
|
||||
if (attribute != NULL)
|
||||
{
|
||||
attribute->removeModifier(modifier);
|
||||
attribute->addModifier(new AttributeModifier(*modifier));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue