summaryrefslogtreecommitdiffstats
path: root/src/animation
diff options
context:
space:
mode:
authorerorcun <erayorcunus@gmail.com>2020-05-11 23:33:13 +0200
committerGitHub <noreply@github.com>2020-05-11 23:33:13 +0200
commit5f40f06bf024e3806e0fe5a92ca14ee6b22a9933 (patch)
tree3008c5a5977736453221f00daa1f34f9d292906b /src/animation
parentRenderPedCB from VC (diff)
parentFix appveyor (hopefully) (diff)
downloadre3-5f40f06bf024e3806e0fe5a92ca14ee6b22a9933.tar
re3-5f40f06bf024e3806e0fe5a92ca14ee6b22a9933.tar.gz
re3-5f40f06bf024e3806e0fe5a92ca14ee6b22a9933.tar.bz2
re3-5f40f06bf024e3806e0fe5a92ca14ee6b22a9933.tar.lz
re3-5f40f06bf024e3806e0fe5a92ca14ee6b22a9933.tar.xz
re3-5f40f06bf024e3806e0fe5a92ca14ee6b22a9933.tar.zst
re3-5f40f06bf024e3806e0fe5a92ca14ee6b22a9933.zip
Diffstat (limited to 'src/animation')
-rw-r--r--src/animation/AnimBlendAssocGroup.cpp4
-rw-r--r--src/animation/CutsceneMgr.cpp2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/animation/AnimBlendAssocGroup.cpp b/src/animation/AnimBlendAssocGroup.cpp
index 5a6d10b4..fe419f2a 100644
--- a/src/animation/AnimBlendAssocGroup.cpp
+++ b/src/animation/AnimBlendAssocGroup.cpp
@@ -1,6 +1,10 @@
#include "common.h"
+#if defined _WIN32 && !defined __MINGW32__
#include "ctype.h"
+#else
+#include <cwctype>
+#endif
#include "General.h"
#include "RwHelper.h"
diff --git a/src/animation/CutsceneMgr.cpp b/src/animation/CutsceneMgr.cpp
index 0db54c4b..230e22fb 100644
--- a/src/animation/CutsceneMgr.cpp
+++ b/src/animation/CutsceneMgr.cpp
@@ -103,7 +103,7 @@ const struct {
{ "MT_PH2", STREAMED_SOUND_CUTSCENE_MARTY_PH2 },
{ "MT_PH3", STREAMED_SOUND_CUTSCENE_MARTY_PH3 },
{ "MT_PH4", STREAMED_SOUND_CUTSCENE_MARTY_PH4 },
- { NULL, NULL }
+ { NULL, 0 }
};
int