thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allocate the correct number of controllers on stable branch

Browse source
This commit is contained in:
MysterD 2020-10-18 22:15:52 -07:00
parent 281e45051b
commit c0652f8a48
3 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
developer/discord.sh Normal file
View file

@ -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

5
src/game/game_init.c
View file

@ -28,7 +28,12 @@
// FIXME: I'm not sure all of these variables belong in this file, but I don't // 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 // know of a good way to split them
#ifdef UNSTABLE_BRANCH
struct Controller gControllers[MAX_PLAYERS]; struct Controller gControllers[MAX_PLAYERS];
#else
struct Controller gControllers[3];
#endif
struct SPTask *gGfxSPTask; struct SPTask *gGfxSPTask;
Gfx *gDisplayListHead; Gfx *gDisplayListHead;
u8 *gGfxPoolEnd; u8 *gGfxPoolEnd;

4
src/game/game_init.h
View file

@ -22,7 +22,11 @@ struct DemoInput
u8 buttonMask; u8 buttonMask;
}; };
#ifdef UNSTABLE_BRANCH
extern struct Controller gControllers[MAX_PLAYERS]; extern struct Controller gControllers[MAX_PLAYERS];
#else
extern struct Controller gControllers[3];
#endif
extern OSContStatus gControllerStatuses[4]; extern OSContStatus gControllerStatuses[4];
extern OSContPad gControllerPads[4]; extern OSContPad gControllerPads[4];
extern OSMesgQueue gGameVblankQueue; extern OSMesgQueue gGameVblankQueue;