diff --git a/src/game/camdraw.c b/src/game/camdraw.c index 97498ec6e..ee9b25834 100644 --- a/src/game/camdraw.c +++ b/src/game/camdraw.c @@ -1333,7 +1333,7 @@ void func0f14bdbc(s32 index) s32 value; for (i = 0; i < 30; i++) { - thing->unk0dc[i] = NULL; + thing->unk0dc[i] = 0; } thing->unk094 = 0; diff --git a/src/game/modeldata/player.c b/src/game/modeldata/player.c index ad49e1c88..76e334f95 100644 --- a/src/game/modeldata/player.c +++ b/src/game/modeldata/player.c @@ -18,7 +18,7 @@ struct modeldef g_PlayerModeldef = { 3, 41.161228179932, 0, - NULL, + 0, }; // rodata parent next prev child diff --git a/src/game/mplayer/scenarios.c b/src/game/mplayer/scenarios.c index e2c144d21..aa502ed21 100644 --- a/src/game/mplayer/scenarios.c +++ b/src/game/mplayer/scenarios.c @@ -25,6 +25,7 @@ #include "game/mplayer/mplayer.h" #include "game/pad.h" #include "game/propobj.h" +#include "game/options.h" #include "bss.h" #include "lib/vi.h" #include "lib/snd.h" diff --git a/src/include/lib/str.h b/src/include/lib/str.h index c80ba0dae..1a8da3de0 100644 --- a/src/include/lib/str.h +++ b/src/include/lib/str.h @@ -16,6 +16,7 @@ s32 isalpha(char c); s32 isspace(char c); s32 strtol(const char *src, const char **endptr, s32 base); #else +#include #include #include #endif