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

The death of the unstable branch

This commit is contained in:
MysterD 2022-05-08 16:43:09 -07:00
parent c7cfa1be54
commit ac8b03aaf2
4 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/game_init.c
View File

@ -30,11 +30,7 @@
// 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,11 +22,7 @@ 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;

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

@ -3,11 +3,7 @@
#include "types.h" #include "types.h"
static char sVersionString[MAX_VERSION_LENGTH] = { 0 }; static char sVersionString[MAX_VERSION_LENGTH] = { 0 };
#ifdef UNSTABLE_BRANCH
#define VERSION_TEXT "unst "
#else
#define VERSION_TEXT "beta " #define VERSION_TEXT "beta "
#endif
char* get_version(void) { char* get_version(void) {
snprintf(sVersionString, MAX_VERSION_LENGTH, "%s%d.%d", VERSION_TEXT, VERSION_NUMBER, MINOR_VERSION_NUMBER); snprintf(sVersionString, MAX_VERSION_LENGTH, "%s%d.%d", VERSION_TEXT, VERSION_NUMBER, MINOR_VERSION_NUMBER);

1
src/pc/network/version.h
View File

@ -1,7 +1,6 @@
#ifndef VERSION_H #ifndef VERSION_H
#define VERSION_H #define VERSION_H
#define UNSTABLE_BRANCH
#define VERSION_NUMBER 27 #define VERSION_NUMBER 27
#define MINOR_VERSION_NUMBER 0 #define MINOR_VERSION_NUMBER 0