diff options
| author | saml1er <danishroar@gmail.com> | 2020-04-17 00:01:53 +0500 |
|---|---|---|
| committer | saml1er <danishroar@gmail.com> | 2020-04-17 00:01:53 +0500 |
| commit | e52a02fb9e1dd5602e80d88691f2ee2291d1fa52 (patch) | |
| tree | 333caa1599e2f0c6b91bdae2092cf085eaf8238a /src/animation | |
| parent | 52d0d811b79f810aae9d10beb671f9889b8e4330 (diff) | |
| parent | 83cbe4e39ede4853e0d352e55aeddbd481b39948 (diff) | |
Merge branch 'master' into world
# Conflicts:
# src/core/World.cpp
# src/core/World.h
Diffstat (limited to 'src/animation')
| -rw-r--r-- | src/animation/FrameUpdate.cpp | 2 | ||||
| -rw-r--r-- | src/animation/RpAnimBlend.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/animation/FrameUpdate.cpp b/src/animation/FrameUpdate.cpp index dcb71944..393d22a8 100644 --- a/src/animation/FrameUpdate.cpp +++ b/src/animation/FrameUpdate.cpp @@ -6,7 +6,7 @@ #include "AnimBlendAssociation.h" #include "RpAnimBlend.h" -CAnimBlendClumpData *&gpAnimBlendClump = *(CAnimBlendClumpData**)0x621000; +CAnimBlendClumpData *gpAnimBlendClump; void FrameUpdateCallBack(AnimBlendFrameData *frame, void *arg); void FrameUpdateCallBackWithVelocityExtraction(AnimBlendFrameData *frame, void *arg); diff --git a/src/animation/RpAnimBlend.h b/src/animation/RpAnimBlend.h index 55a4456b..f9e14c42 100644 --- a/src/animation/RpAnimBlend.h +++ b/src/animation/RpAnimBlend.h @@ -37,5 +37,5 @@ CAnimBlendAssociation *RpAnimBlendClumpGetFirstAssociation(RpClump *clump); void RpAnimBlendClumpUpdateAnimations(RpClump* clump, float timeDelta); -extern CAnimBlendClumpData *&gpAnimBlendClump; +extern CAnimBlendClumpData *gpAnimBlendClump; void FrameUpdateCallBack(AnimBlendFrameData *frame, void *arg); |