diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-05-12 23:19:21 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-12 23:27:15 +0200 |
| commit | 33dfaf7da11675fdad2909e39b6d15e49fc6cc68 (patch) | |
| tree | ff2b3fe079b51b521cb26ceb2da0a5717b0601ff /src/animation | |
| parent | Merge remote-tracking branch 'upstream/miami' into miami (diff) | |
| parent | fix shotgun (diff) | |
| download | re3-33dfaf7da11675fdad2909e39b6d15e49fc6cc68.tar re3-33dfaf7da11675fdad2909e39b6d15e49fc6cc68.tar.gz re3-33dfaf7da11675fdad2909e39b6d15e49fc6cc68.tar.bz2 re3-33dfaf7da11675fdad2909e39b6d15e49fc6cc68.tar.lz re3-33dfaf7da11675fdad2909e39b6d15e49fc6cc68.tar.xz re3-33dfaf7da11675fdad2909e39b6d15e49fc6cc68.tar.zst re3-33dfaf7da11675fdad2909e39b6d15e49fc6cc68.zip | |
Diffstat (limited to 'src/animation')
| -rw-r--r-- | src/animation/AnimBlendAssocGroup.cpp | 4 | ||||
| -rw-r--r-- | src/animation/CutsceneMgr.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/animation/AnimBlendAssocGroup.cpp b/src/animation/AnimBlendAssocGroup.cpp index c6a166c2..c3d6b2c1 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 035c2b49..8da34dda 100644 --- a/src/animation/CutsceneMgr.cpp +++ b/src/animation/CutsceneMgr.cpp @@ -102,7 +102,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 |