TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 07:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tsignal::order to ::mOrder. yet another potential conflict with a class member vs a method input

Browse source
This commit is contained in:
Azaezel 2018-03-13 14:22:51 -05:00
parent 57af794ee3
commit 10937d0a4d
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/core/util/tSignal.cpp
View file

@ -28,9 +28,9 @@ void SignalBase::DelegateLink::insert(DelegateLink* node, F32 order)
{ {
// Note: can only legitimately be called on list head // Note: can only legitimately be called on list head
DelegateLink * walk = next; DelegateLink * walk = next;
while (order >= walk->order && walk->next != this) while (order >= walk->mOrder && walk->next != this)
walk = walk->next; walk = walk->next;
if (order >= walk->order) if (order >= walk->mOrder)
{ {
// insert after walk // insert after walk
node->prev = walk; node->prev = walk;
@ -46,7 +46,7 @@ void SignalBase::DelegateLink::insert(DelegateLink* node, F32 order)
walk->prev->next = node; walk->prev->next = node;
walk->prev = node; walk->prev = node;
} }
node->order = order; node->mOrder = order;
} }
void SignalBase::DelegateLink::unlink() void SignalBase::DelegateLink::unlink()

6
Engine/source/core/util/tSignal.h
View file

@ -53,7 +53,7 @@ public:
SignalBase() SignalBase()
{ {
mList.next = mList.prev = &mList; mList.next = mList.prev = &mList;
mList.order = 0.5f; mList.mOrder = 0.5f;
} }
~SignalBase(); ~SignalBase();
@ -72,7 +72,7 @@ protected:
struct DelegateLink struct DelegateLink
{ {
DelegateLink *next,*prev; DelegateLink *next,*prev;
F32 order; F32 mOrder;
void insert(DelegateLink* node, F32 order); void insert(DelegateLink* node, F32 order);
void unlink(); void unlink();
@ -191,7 +191,7 @@ public:
for ( DelegateLink *ptr = base.mList.next; ptr != &base.mList; ptr = ptr->next ) for ( DelegateLink *ptr = base.mList.next; ptr != &base.mList; ptr = ptr->next )
{ {
DelegateLinkImpl *del = static_cast<DelegateLinkImpl*>( ptr ); DelegateLinkImpl *del = static_cast<DelegateLinkImpl*>( ptr );
notify( del->mDelegate, del->order ); notify( del->mDelegate, del->mOrder );
} }
} }