diff --git a/autogen/lua_definitions/constants.lua b/autogen/lua_definitions/constants.lua index 820d9ff0..c004df8a 100644 --- a/autogen/lua_definitions/constants.lua +++ b/autogen/lua_definitions/constants.lua @@ -433,13 +433,6 @@ end FONT_TINY = -1 - ----------------------- --- legacy functions -- ----------------------- - -function get_coop_compatibility_enabled() return false end - --- @type integer INSTANT_WARP_INDEX_START = 0x00 @@ -12564,13 +12557,13 @@ SPTASK_STATE_FINISHED_DP = 4 MAX_VERSION_LENGTH = 32 --- @type integer -MINOR_VERSION_NUMBER = 0 +MINOR_VERSION_NUMBER = 1 --- @type integer PATCH_VERSION_NUMBER = 0 --- @type string -SM64COOPDX_VERSION = "v1.0" +SM64COOPDX_VERSION = "v1.0.1" --- @type integer VERSION_NUMBER = 37 diff --git a/src/pc/lua/smlua_constants_autogen.c b/src/pc/lua/smlua_constants_autogen.c index 6cd533ef..4b7b7391 100644 --- a/src/pc/lua/smlua_constants_autogen.c +++ b/src/pc/lua/smlua_constants_autogen.c @@ -381,10 +381,6 @@ char gSmluaConstants[] = "" "-- legacy font --\n" "-----------------\n" "FONT_TINY = -1\n" -"----------------------\n" -"-- legacy functions --\n" -"----------------------\n" -"function get_coop_compatibility_enabled() return false end\n" "INSTANT_WARP_INDEX_START = 0x00\n" "INSTANT_WARP_INDEX_STOP = 0x04\n" "MAX_AREAS = 16\n" @@ -4401,10 +4397,10 @@ char gSmluaConstants[] = "" "COOP_OBJ_FLAG_LUA = (1 << 1)\n" "COOP_OBJ_FLAG_NON_SYNC = (1 << 2)\n" "COOP_OBJ_FLAG_INITIALIZED = (1 << 3)\n" -"SM64COOPDX_VERSION = 'v1.0'\n" +"SM64COOPDX_VERSION = 'v1.0.1'\n" "VERSION_TEXT = 'v'\n" "VERSION_NUMBER = 37\n" -"MINOR_VERSION_NUMBER = 0\n" +"MINOR_VERSION_NUMBER = 1\n" "PATCH_VERSION_NUMBER = 0\n" "VERSION_REGION = 'JP'\n" "VERSION_REGION = 'EU'\n" diff --git a/src/pc/network/coopnet/coopnet.c b/src/pc/network/coopnet/coopnet.c index 0835f728..a752ceaf 100644 --- a/src/pc/network/coopnet/coopnet.c +++ b/src/pc/network/coopnet/coopnet.c @@ -13,12 +13,14 @@ #include "pc/discord/discord.h" #endif +#ifdef COOPNET + // ! Temporary, show this build of coop as sm64ex-coop // to let other players know the update is out #undef GAME_NAME #define GAME_NAME "sm64ex-coop" -#ifdef COOPNET +#define MAX_COOPNET_DESCRIPTION_LENGTH 1024 uint64_t gCoopNetDesiredLobby = 0; char gCoopNetPassword[64] = ""; diff --git a/src/pc/network/coopnet/coopnet.h b/src/pc/network/coopnet/coopnet.h index 3a00dddd..ec094c7d 100644 --- a/src/pc/network/coopnet/coopnet.h +++ b/src/pc/network/coopnet/coopnet.h @@ -2,8 +2,6 @@ #define COOPNET_H #ifdef COOPNET -#define MAX_COOPNET_DESCRIPTION_LENGTH 1024 - typedef void (*QueryCallbackPtr)(uint64_t aLobbyId, uint64_t aOwnerId, uint16_t aConnections, uint16_t aMaxConnections, const char* aGame, const char* aVersion, const char* aHostName, const char* aMode, const char* aDescription); typedef void (*QueryFinishCallbackPtr)(void); diff --git a/src/pc/network/version.h b/src/pc/network/version.h index 2b3b7ee1..dec17d07 100644 --- a/src/pc/network/version.h +++ b/src/pc/network/version.h @@ -1,12 +1,12 @@ #ifndef VERSION_H #define VERSION_H -#define SM64COOPDX_VERSION "v1.0" +#define SM64COOPDX_VERSION "v1.0.1" // internal version #define VERSION_TEXT "v" #define VERSION_NUMBER 37 -#define MINOR_VERSION_NUMBER 0 +#define MINOR_VERSION_NUMBER 1 #define PATCH_VERSION_NUMBER 0 #if defined(VERSION_JP)