summaryrefslogtreecommitdiffstats
path: root/src/animation
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2019-06-30 15:21:58 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2019-06-30 15:21:58 +0200
commit7c6b291860fd415f79067fc7058f11ffa58fdf10 (patch)
tree15ccabed4c8c5d7c5c2f7a636035876cbd183e4d /src/animation
parentReactivated Store(Restore)StuffIn(From)Mem, fixed bugs (diff)
parentMerge pull request #78 from ShFil119/cleanup (diff)
downloadre3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar
re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.gz
re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.bz2
re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.lz
re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.xz
re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.zst
re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.zip
Diffstat (limited to 'src/animation')
-rw-r--r--src/animation/AnimBlendHierarchy.cpp2
-rw-r--r--src/animation/RpAnimBlend.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/animation/AnimBlendHierarchy.cpp b/src/animation/AnimBlendHierarchy.cpp
index c7d7f198..e4bcdc69 100644
--- a/src/animation/AnimBlendHierarchy.cpp
+++ b/src/animation/AnimBlendHierarchy.cpp
@@ -9,7 +9,7 @@ CAnimBlendHierarchy::CAnimBlendHierarchy(void)
numSequences = 0;
compressed = 0;
totalLength = 0.0f;
- linkPtr = 0;
+ linkPtr = nil;
}
void
diff --git a/src/animation/RpAnimBlend.cpp b/src/animation/RpAnimBlend.cpp
index 3d1439c6..17394743 100644
--- a/src/animation/RpAnimBlend.cpp
+++ b/src/animation/RpAnimBlend.cpp
@@ -366,7 +366,7 @@ RpAnimBlendClumpUpdateAnimations(RpClump *clump, float timeDelta)
updateData.foobar = 1;
}
}
- updateData.nodes[i] = 0;
+ updateData.nodes[i] = nil;
clumpData->ForAllFrames(FrameUpdateCallBack, &updateData);