Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix warnings on windows

This commit is contained in:
MysterD 2022-05-29 03:30:41 -07:00
parent 23d7c83267
commit 51fea7f6f2
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/engine/math_util.h
View File

@ -27,6 +27,14 @@ extern f32 gCosineTable[];
#define sins(x) gSineTable[(u16) (x) >> 4] #define sins(x) gSineTable[(u16) (x) >> 4]
#define coss(x) gCosineTable[(u16) (x) >> 4] #define coss(x) gCosineTable[(u16) (x) >> 4]
#if defined(min)
#undef min
#endif
#if defined(max)
#undef max
#endif
#define min(a, b) ((a) <= (b) ? (a) : (b)) #define min(a, b) ((a) <= (b) ? (a) : (b))
#define max(a, b) ((a) > (b) ? (a) : (b)) #define max(a, b) ((a) > (b) ? (a) : (b))

4
src/pc/network/network.c
View File

@ -4,7 +4,6 @@
#include "object_fields.h" #include "object_fields.h"
#include "object_constants.h" #include "object_constants.h"
#include "behavior_table.h" #include "behavior_table.h"
#include "game/save_file.h"
#include "src/game/hardcoded.h" #include "src/game/hardcoded.h"
#ifdef DISCORD_SDK #ifdef DISCORD_SDK
#include "discord/discord.h" #include "discord/discord.h"
@ -19,7 +18,6 @@
#include "pc/mods/mods.h" #include "pc/mods/mods.h"
#include "pc/crash_handler.h" #include "pc/crash_handler.h"
#include "pc/debuglog.h" #include "pc/debuglog.h"
#include "game/camera.h"
// Mario 64 specific externs // Mario 64 specific externs
extern s16 sCurrPlayMode; extern s16 sCurrPlayMode;
@ -492,6 +490,7 @@ void network_shutdown(bool sendLeaving, bool exiting) {
// reset other stuff // reset other stuff
extern u8* gOverrideEeprom; extern u8* gOverrideEeprom;
gOverrideEeprom = NULL; gOverrideEeprom = NULL;
extern u8 gOverrideFreezeCamera;
gOverrideFreezeCamera = false; gOverrideFreezeCamera = false;
gDjuiHudLockMouse = false; gDjuiHudLockMouse = false;
dynos_mod_shutdown(); dynos_mod_shutdown();
@ -514,6 +513,7 @@ void network_shutdown(bool sendLeaving, bool exiting) {
cnt->extStickX = 0; cnt->extStickX = 0;
cnt->extStickY = 0; cnt->extStickY = 0;
extern void save_file_load_all(UNUSED u8 reload);
save_file_load_all(TRUE); save_file_load_all(TRUE);
extern s16 gMenuMode; extern s16 gMenuMode;

1
src/pc/utils/misc.c
View File

@ -3,6 +3,7 @@
#include <PR/ultratypes.h> #include <PR/ultratypes.h>
#include <stdbool.h> #include <stdbool.h>
#include <time.h> #include <time.h>
#include <float.h>
#include "misc.h" #include "misc.h"