From c1632ee64a053b04e87b703d9ce679e7ba530025 Mon Sep 17 00:00:00 2001 From: Alvaro Estrada <34721024+AlvaroEstradaDev@users.noreply.github.com> Date: Wed, 13 Mar 2019 12:37:30 -0600 Subject: [PATCH] Update AnimationState.cpp Fixed an issue of what pointer it was supposed to check for --- spine-cpp/spine-cpp/src/spine/AnimationState.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spine-cpp/spine-cpp/src/spine/AnimationState.cpp b/spine-cpp/spine-cpp/src/spine/AnimationState.cpp index b0176da7c..4f60d57bb 100644 --- a/spine-cpp/spine-cpp/src/spine/AnimationState.cpp +++ b/spine-cpp/spine-cpp/src/spine/AnimationState.cpp @@ -252,7 +252,7 @@ void EventQueue::drain() { case EventType_Start: case EventType_Interrupt: case EventType_Complete: - if (NULL == trackEntry->_listener) + if (NULL == trackEntry->_listenerObj) trackEntry->_listener(&state, queueEntry->_type, trackEntry, NULL); else trackEntry->_listenerObj->callback(&state, queueEntry->_type, trackEntry, NULL); @@ -262,7 +262,7 @@ void EventQueue::drain() { state._listenerObj->callback(&state, queueEntry->_type, trackEntry, NULL); break; case EventType_End: - if (NULL == trackEntry->_listener) + if (NULL == trackEntry->_listenerObj) trackEntry->_listener(&state, queueEntry->_type, trackEntry, NULL); else trackEntry->_listenerObj->callback(&state, queueEntry->_type, trackEntry, NULL); @@ -273,7 +273,7 @@ void EventQueue::drain() { /* Yes, we want to fall through here */ case EventType_Dispose: - if (NULL == trackEntry->_listener) + if (NULL == trackEntry->_listenerObj) trackEntry->_listener(&state, EventType_Dispose, trackEntry, NULL); else trackEntry->_listenerObj->callback(&state, EventType_Dispose, trackEntry, NULL); @@ -286,7 +286,7 @@ void EventQueue::drain() { _trackEntryPool.free(trackEntry); break; case EventType_Event: - if (NULL == trackEntry->_listener) + if (NULL == trackEntry->_listenerObj) trackEntry->_listener(&state, queueEntry->_type, trackEntry, queueEntry->_event); else trackEntry->_listenerObj->callback(&state, queueEntry->_type, trackEntry, queueEntry->_event);