summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2021-01-12 18:55:14 +0100
committeraap <aap@papnet.eu>2021-01-12 18:55:21 +0100
commit48ce6151f919d14731cfa79c1b814786b123a80b (patch)
tree9ff7701e9f7df8573889db4bd37687406782158f /src
parentMerge pull request #945 from withmorten/master (diff)
downloadre3-48ce6151f919d14731cfa79c1b814786b123a80b.tar
re3-48ce6151f919d14731cfa79c1b814786b123a80b.tar.gz
re3-48ce6151f919d14731cfa79c1b814786b123a80b.tar.bz2
re3-48ce6151f919d14731cfa79c1b814786b123a80b.tar.lz
re3-48ce6151f919d14731cfa79c1b814786b123a80b.tar.xz
re3-48ce6151f919d14731cfa79c1b814786b123a80b.tar.zst
re3-48ce6151f919d14731cfa79c1b814786b123a80b.zip
Diffstat (limited to 'src')
-rw-r--r--src/entities/Entity.cpp2
-rw-r--r--src/modelinfo/ClumpModelInfo.cpp2
-rw-r--r--src/rw/RwHelper.cpp1
3 files changed, 4 insertions, 1 deletions
diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp
index 7fcc3829..709f91c1 100644
--- a/src/entities/Entity.cpp
+++ b/src/entities/Entity.cpp
@@ -139,6 +139,7 @@ CEntity::DetachFromRwObject(void)
m_matrix.Detach();
}
+#ifdef PED_SKIN
RpAtomic*
AtomicRemoveAnimFromSkinCB(RpAtomic *atomic, void *data)
{
@@ -158,6 +159,7 @@ AtomicRemoveAnimFromSkinCB(RpAtomic *atomic, void *data)
}
return atomic;
}
+#endif
void
CEntity::DeleteRwObject(void)
diff --git a/src/modelinfo/ClumpModelInfo.cpp b/src/modelinfo/ClumpModelInfo.cpp
index ec64977b..44a62afb 100644
--- a/src/modelinfo/ClumpModelInfo.cpp
+++ b/src/modelinfo/ClumpModelInfo.cpp
@@ -120,7 +120,7 @@ CClumpModelInfo::SetClump(RpClump *clump)
RpClumpForAllAtomics(clump, SetAtomicRendererCB, (void*)CVisibilityPlugins::RenderPlayerCB);
}
#else
- if(strcmp(GetModelName(), "playerh") == 0){
+ if(strcmp(GetModelName(), "playerh") == 0)
RpClumpForAllAtomics(clump, SetAtomicRendererCB, (void*)CVisibilityPlugins::RenderPlayerCB);
#endif
}
diff --git a/src/rw/RwHelper.cpp b/src/rw/RwHelper.cpp
index 4ee3a0b3..dd356b96 100644
--- a/src/rw/RwHelper.cpp
+++ b/src/rw/RwHelper.cpp
@@ -2,6 +2,7 @@
#define WITHD3D
#endif
#include "common.h"
+#include <rpskin.h>
#include "RwHelper.h"
#include "Timecycle.h"