|
@@ -1,9 +1,9 @@
|
|
/******************************************************************************
|
|
/******************************************************************************
|
|
* Spine Runtimes Software License v2.5
|
|
* Spine Runtimes Software License v2.5
|
|
- *
|
|
|
|
|
|
+ *
|
|
* Copyright (c) 2013-2016, Esoteric Software
|
|
* Copyright (c) 2013-2016, Esoteric Software
|
|
* All rights reserved.
|
|
* All rights reserved.
|
|
- *
|
|
|
|
|
|
+ *
|
|
* You are granted a perpetual, non-exclusive, non-sublicensable, and
|
|
* You are granted a perpetual, non-exclusive, non-sublicensable, and
|
|
* non-transferable license to use, install, execute, and perform the Spine
|
|
* non-transferable license to use, install, execute, and perform the Spine
|
|
* Runtimes software and derivative works solely for personal or internal
|
|
* Runtimes software and derivative works solely for personal or internal
|
|
@@ -15,7 +15,7 @@
|
|
* or other intellectual property or proprietary rights notices on or in the
|
|
* or other intellectual property or proprietary rights notices on or in the
|
|
* Software, including any copy thereof. Redistributions in binary or source
|
|
* Software, including any copy thereof. Redistributions in binary or source
|
|
* form must include this license and terms.
|
|
* form must include this license and terms.
|
|
- *
|
|
|
|
|
|
+ *
|
|
* THIS SOFTWARE IS PROVIDED BY ESOTERIC SOFTWARE "AS IS" AND ANY EXPRESS OR
|
|
* THIS SOFTWARE IS PROVIDED BY ESOTERIC SOFTWARE "AS IS" AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
|
@@ -26,8 +26,8 @@
|
|
* IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
* IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
- *****************************************************************************/
|
|
|
|
-
|
|
|
|
|
|
+ *****************************************************************************/
|
|
|
|
+
|
|
#include <spine/AnimationState.h>
|
|
#include <spine/AnimationState.h>
|
|
#include <spine/extension.h>
|
|
#include <spine/extension.h>
|
|
#include <string.h>
|
|
#include <string.h>
|
|
@@ -319,4 +319,4 @@ spTrackEntry* spAnimationState_addAnimation (spAnimationState* self, int trackIn
|
|
spTrackEntry* spAnimationState_getCurrent (spAnimationState* self, int trackIndex) {
|
|
spTrackEntry* spAnimationState_getCurrent (spAnimationState* self, int trackIndex) {
|
|
if (trackIndex >= self->tracksCount) return 0;
|
|
if (trackIndex >= self->tracksCount) return 0;
|
|
return self->tracks[trackIndex];
|
|
return self->tracks[trackIndex];
|
|
-}
|
|
|
|
|
|
+}
|