diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-12-25 10:56:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-25 10:56:31 +0100 |
| commit | 3b85457020a7334f1b96e3ee9618c9377d5edbd7 (patch) | |
| tree | 380178eb341e070ad953ac2be17786a5ff722c94 /src/rw | |
| parent | Merge remote-tracking branch 'upstream/miami' into miami (diff) | |
| parent | signed/unsigned fixes, and some other fixes (diff) | |
| download | re3-3b85457020a7334f1b96e3ee9618c9377d5edbd7.tar re3-3b85457020a7334f1b96e3ee9618c9377d5edbd7.tar.gz re3-3b85457020a7334f1b96e3ee9618c9377d5edbd7.tar.bz2 re3-3b85457020a7334f1b96e3ee9618c9377d5edbd7.tar.lz re3-3b85457020a7334f1b96e3ee9618c9377d5edbd7.tar.xz re3-3b85457020a7334f1b96e3ee9618c9377d5edbd7.tar.zst re3-3b85457020a7334f1b96e3ee9618c9377d5edbd7.zip | |
Diffstat (limited to 'src/rw')
| -rw-r--r-- | src/rw/VisibilityPlugins.cpp | 6 | ||||
| -rw-r--r-- | src/rw/VisibilityPlugins.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/rw/VisibilityPlugins.cpp b/src/rw/VisibilityPlugins.cpp index aa4bdcc0..83c3c5bc 100644 --- a/src/rw/VisibilityPlugins.cpp +++ b/src/rw/VisibilityPlugins.cpp @@ -872,12 +872,12 @@ CVisibilityPlugins::FrameCopyConstructor(void *dst, const void *src, int32, int3 } void -CVisibilityPlugins::SetFrameHierarchyId(RwFrame *frame, uintptr id) +CVisibilityPlugins::SetFrameHierarchyId(RwFrame *frame, intptr id) { FRAMEEXT(frame)->id = id; } -uintptr +intptr CVisibilityPlugins::GetFrameHierarchyId(RwFrame *frame) { return FRAMEEXT(frame)->id; @@ -914,7 +914,7 @@ void CVisibilityPlugins::SetClumpModelInfo(RpClump *clump, CClumpModelInfo *modelInfo) { CVehicleModelInfo *vmi; - SetFrameHierarchyId(RpClumpGetFrame(clump), (uintptr)modelInfo); + SetFrameHierarchyId(RpClumpGetFrame(clump), (intptr)modelInfo); // Unused switch (modelInfo->GetModelType()) { diff --git a/src/rw/VisibilityPlugins.h b/src/rw/VisibilityPlugins.h index 03833c9c..13365c7a 100644 --- a/src/rw/VisibilityPlugins.h +++ b/src/rw/VisibilityPlugins.h @@ -115,10 +115,10 @@ public: struct FrameExt { // BUG: this is abused to hold a pointer by SetClumpModelInfo - uintptr id; + intptr id; }; - static void SetFrameHierarchyId(RwFrame *frame, uintptr id); - static uintptr GetFrameHierarchyId(RwFrame *frame); + static void SetFrameHierarchyId(RwFrame *frame, intptr id); + static intptr GetFrameHierarchyId(RwFrame *frame); static void *FrameConstructor(void *object, int32 offset, int32 len); static void *FrameDestructor(void *object, int32 offset, int32 len); |