diff --git a/developer/discord.sh b/developer/discord.sh new file mode 100644 index 00000000..fadf1ca3 --- /dev/null +++ b/developer/discord.sh @@ -0,0 +1,18 @@ +#!/bin/bash +set -e +if [ $# -eq 0 ]; then + make BETTERCAMERA=1 NODRAWINGDISTANCE=1 DEBUG=1 IMMEDIATELOAD=1 DEVELOPMENT=1 STRICT=1 -j +else + make BETTERCAMERA=1 NODRAWINGDISTANCE=1 DEBUG=1 IMMEDIATELOAD=1 DEVELOPMENT=1 -j +fi + +# find file +FILE=./build/us_pc/sm64.us.f3dex2e.exe +if [ ! -f "$FILE" ]; then + FILE=./build/us_pc/sm64.us.f3dex2e +fi + +# no debug, discord +$FILE --discord 2 --configfile sm64config_server.txt & +$FILE --discord 1 --configfile sm64config_client.txt & +exit diff --git a/src/game/game_init.c b/src/game/game_init.c index 8a5c1018..c08f3547 100644 --- a/src/game/game_init.c +++ b/src/game/game_init.c @@ -28,7 +28,12 @@ // FIXME: I'm not sure all of these variables belong in this file, but I don't // know of a good way to split them + +#ifdef UNSTABLE_BRANCH struct Controller gControllers[MAX_PLAYERS]; +#else +struct Controller gControllers[3]; +#endif struct SPTask *gGfxSPTask; Gfx *gDisplayListHead; u8 *gGfxPoolEnd; diff --git a/src/game/game_init.h b/src/game/game_init.h index b452577a..68856207 100644 --- a/src/game/game_init.h +++ b/src/game/game_init.h @@ -22,7 +22,11 @@ struct DemoInput u8 buttonMask; }; +#ifdef UNSTABLE_BRANCH extern struct Controller gControllers[MAX_PLAYERS]; +#else +extern struct Controller gControllers[3]; +#endif extern OSContStatus gControllerStatuses[4]; extern OSContPad gControllerPads[4]; extern OSMesgQueue gGameVblankQueue;