games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-17 00:07:41 +02:00
Code Issues Releases Activity

Remove largely unused defActions member from CIntObject

Browse Source
This commit is contained in:
Ivan Savenko
2024-08-09 14:26:53 +00:00
parent 3f9e57d3f3
commit 00605b5129
18 changed files with 18 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
client/gui/CIntObject.cpp
View File

@ -24,8 +24,7 @@ CIntObject::CIntObject(int used_, Point pos_):
redrawParent(false),
inputEnabled(true),
used(used_),
recActions(GH.defActionsDef),
defActions(GH.defActionsDef),
recActions(ALL_ACTIONS),
pos(pos_, Point())
{
if(GH.captureChildren)
@ -39,7 +38,7 @@ CIntObject::~CIntObject()
while(!children.empty())
{
if((defActions & DISPOSE) && (children.front()->recActions & DISPOSE))
if(children.front()->recActions & DISPOSE)
delete children.front();
else
removeChild(children.front());
@ -51,20 +50,16 @@ CIntObject::~CIntObject()
void CIntObject::show(Canvas & to)
{
if(defActions & UPDATE)
for(auto & elem : children)
if(elem->recActions & UPDATE)
elem->show(to);
for(auto & elem : children)
if(elem->recActions & UPDATE)
elem->show(to);
}
void CIntObject::showAll(Canvas & to)
{
if(defActions & SHOWALL)
{
for(auto & elem : children)
if(elem->recActions & SHOWALL)
elem->showAll(to);
}
for(auto & elem : children)
if(elem->recActions & SHOWALL)
elem->showAll(to);
}
void CIntObject::activate()
@ -79,10 +74,9 @@ void CIntObject::activate()
assert(isActive());
if(defActions & ACTIVATE)
for(auto & elem : children)
if(elem->recActions & ACTIVATE)
elem->activate();
for(auto & elem : children)
if(elem->recActions & ACTIVATE)
elem->activate();
}
void CIntObject::deactivate()
@ -94,10 +88,9 @@ void CIntObject::deactivate()
assert(!isActive());
if(defActions & DEACTIVATE)
for(auto & elem : children)
if(elem->recActions & DEACTIVATE)
elem->deactivate();
for(auto & elem : children)
if(elem->recActions & DEACTIVATE)
elem->deactivate();
}
void CIntObject::addUsedEvents(ui16 newActions)