diff options
| author | withmorten <morten.with@gmail.com> | 2021-07-11 03:26:21 +0200 |
|---|---|---|
| committer | withmorten <morten.with@gmail.com> | 2021-07-11 03:26:21 +0200 |
| commit | d7ceb4870c621dedc088cd4c8eccde63ad281230 (patch) | |
| tree | 1fd5987a3b765e31c238144ccc84ff1833e6f832 | |
| parent | Physical: division by zero fix (diff) | |
| download | re3-d7ceb4870c621dedc088cd4c8eccde63ad281230.tar re3-d7ceb4870c621dedc088cd4c8eccde63ad281230.tar.gz re3-d7ceb4870c621dedc088cd4c8eccde63ad281230.tar.bz2 re3-d7ceb4870c621dedc088cd4c8eccde63ad281230.tar.lz re3-d7ceb4870c621dedc088cd4c8eccde63ad281230.tar.xz re3-d7ceb4870c621dedc088cd4c8eccde63ad281230.tar.zst re3-d7ceb4870c621dedc088cd4c8eccde63ad281230.zip | |
| -rw-r--r-- | src/animation/AnimBlendAssociation.h | 2 | ||||
| -rw-r--r-- | src/animation/AnimBlendClumpData.cpp | 1 | ||||
| -rw-r--r-- | src/audio/oal/stream.cpp | 3 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/animation/AnimBlendAssociation.h b/src/animation/AnimBlendAssociation.h index 80927da2..45720b6f 100644 --- a/src/animation/AnimBlendAssociation.h +++ b/src/animation/AnimBlendAssociation.h @@ -35,7 +35,7 @@ public: CAnimBlendLink link; - int numNodes; // taken from CAnimBlendClumpData::numFrames + int32 numNodes; // taken from CAnimBlendClumpData::numFrames // NB: Order of these depends on order of nodes in Clump this was built from CAnimBlendNode *nodes; CAnimBlendHierarchy *hierarchy; diff --git a/src/animation/AnimBlendClumpData.cpp b/src/animation/AnimBlendClumpData.cpp index 702ee811..b333a449 100644 --- a/src/animation/AnimBlendClumpData.cpp +++ b/src/animation/AnimBlendClumpData.cpp @@ -3,7 +3,6 @@ #include "AnimBlendClumpData.h" #include "MemoryMgr.h" - CAnimBlendClumpData::CAnimBlendClumpData(void) { numFrames = 0; diff --git a/src/audio/oal/stream.cpp b/src/audio/oal/stream.cpp index 0209202a..6afe8e30 100644 --- a/src/audio/oal/stream.cpp +++ b/src/audio/oal/stream.cpp @@ -2,7 +2,7 @@ #ifdef AUDIO_OAL -#if defined _MSC_VER && !defined RE3_NO_AUTOLINK +#if defined _MSC_VER && !defined CMAKE_NO_AUTOLINK #ifdef AUDIO_OAL_USE_SNDFILE #pragma comment( lib, "libsndfile-1.lib" ) #endif @@ -504,6 +504,7 @@ public: class CMP3File : public IDecoder { +protected: mpg123_handle *m_pMH; bool m_bOpened; uint32 m_nRate; |