archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-13 23:38:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into world

Browse Source 
# Conflicts:
#	src/core/World.cpp
#	src/core/World.h
This commit is contained in:
saml1er
2020-04-17 00:01:53 +05:00
parent 52d0d811b7 83cbe4e39e
commit e52a02fb9e
113 changed files with 6774 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/animation/FrameUpdate.cpp
View File

@ -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);

2
src/animation/RpAnimBlend.h
View File

@ -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);