diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-04-17 10:17:38 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-04-17 10:17:38 +0300 |
| commit | b9c8ce0d37b2f094e2d8fe1a71db009718a0a006 (patch) | |
| tree | 4861c474aa232d2914f5b6b3bc11a8e62a9ceccb /src/animation | |
| parent | Merge remote-tracking branch 'samler/world' into Standalone (diff) | |
| parent | rem refs (diff) | |
| download | re3-b9c8ce0d37b2f094e2d8fe1a71db009718a0a006.tar.gz | |
Merge remote-tracking branch 'Fire-Head/master' into Standalone
# Conflicts:
# src/render/Coronas.cpp
Diffstat (limited to 'src/animation')
| -rw-r--r-- | src/animation/RpAnimBlend.cpp | 2 | ||||
| -rw-r--r-- | src/animation/RpAnimBlend.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/animation/RpAnimBlend.cpp b/src/animation/RpAnimBlend.cpp index 9c847139..07b8e7d8 100644 --- a/src/animation/RpAnimBlend.cpp +++ b/src/animation/RpAnimBlend.cpp @@ -8,7 +8,7 @@ #include "AnimBlendAssociation.h" #include "RpAnimBlend.h" -RwInt32 &ClumpOffset = *(RwInt32*)0x8F1B84; +RwInt32 ClumpOffset; enum { diff --git a/src/animation/RpAnimBlend.h b/src/animation/RpAnimBlend.h index f9e14c42..ccfa5872 100644 --- a/src/animation/RpAnimBlend.h +++ b/src/animation/RpAnimBlend.h @@ -11,7 +11,7 @@ struct AnimBlendFrameUpdateData CAnimBlendNode *nodes[16]; }; -extern RwInt32 &ClumpOffset; +extern RwInt32 ClumpOffset; #define RPANIMBLENDCLUMPDATA(o) (RWPLUGINOFFSET(CAnimBlendClumpData*, o, ClumpOffset)) bool RpAnimBlendPluginAttach(void); |