diff --git a/autogen/lua_definitions/constants.lua b/autogen/lua_definitions/constants.lua index 68ae603b..391e7e5b 100644 --- a/autogen/lua_definitions/constants.lua +++ b/autogen/lua_definitions/constants.lua @@ -12361,7 +12361,7 @@ MINOR_VERSION_NUMBER = 0 PATCH_VERSION_NUMBER = 0 --- @type string -SM64COOPDX = "sm64coopdx" +SM64COOPDX_VERSION = "v0.1" --- @type integer VERSION_NUMBER = 36 diff --git a/docs/lua/constants.md b/docs/lua/constants.md index 706b10a4..c48a2829 100644 --- a/docs/lua/constants.md +++ b/docs/lua/constants.md @@ -4380,7 +4380,7 @@ - MAX_VERSION_LENGTH - MINOR_VERSION_NUMBER - PATCH_VERSION_NUMBER -- SM64COOPDX +- SM64COOPDX_VERSION - VERSION_NUMBER - VERSION_REGION - VERSION_REGION diff --git a/src/pc/djui/djui_panel_info.c b/src/pc/djui/djui_panel_info.c index 17d77918..5f04d9ee 100644 --- a/src/pc/djui/djui_panel_info.c +++ b/src/pc/djui/djui_panel_info.c @@ -2,55 +2,53 @@ #include "djui_panel.h" #include "djui_panel_menu.h" #include "pc/lua/utils/smlua_misc_utils.h" +#include "pc/pc_main.h" -static char sInfo[512]; - -static const char* get_renderer_name(void) { -#if defined(RAPI_GL) - return "OpenGL Renderer"; -#elif defined(RAPI_GL_LEGACY) - return "OpenGL ES Renderer"; -#elif defined(RAPI_D3D11) - return "DirectX 11 Renderer"; -#elif defined(RAPI_D3D12) - return "DirectX 12 Renderer" -#endif - return "No Renderer"; -} - -static const char* get_development_build(void) { -#ifdef DEVELOPMENT - return "TRUE"; -#else - return "FALSE"; -#endif -} +static char sInfo[1024]; void djui_panel_info_create(struct DjuiBase* caller) { struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(INFORMATION, INFORMATION_TITLE)); struct DjuiBase* body = djui_three_panel_get_body(panel); { - snprintf(sInfo, 512, "sm64coopdx is a project started by the Coop Deluxe team \ + snprintf(sInfo, 1024, "sm64coopdx is a project started by the Coop Deluxe team \ to actively maintain sm64ex-coop. The purpose of it is to \ add more features, customizability and power to the Lua \ API without having to jump through the many hoops of \ -issues sm64ex-coop has.\n\ +issues sm64ex-coop development has.\n\ +\n\ +Coop Deluxe Team:\n\ +Agent X: Creator\n\ +AngelicMiracles: Co-creator\n\ +eros71: Testing and fixing\n\ +FluffaMario: Model Designer\n\ +\n\ +Contributors:\n\ +ArcticJaguar725: Fixing a sound engine bug\n\ +Isaac: Loading screen initially on sm64coopdx\n\ +iZePlayzYT: Improving chat initially on sm64coopdx\n\ +\n\ +It is recommended you download the sm64coopdx repository if you want to make mods or DynOS Packs.\n\ \n\ OS: %s\n\ Renderer: %s\n\ -sm64coopdx: Initial Release\n\ -sm64ex-coop: %s\n\ -Development Build: %s", +sm64coopdx Version: %s\n\ +sm64ex-coop Version: %s\n\ +Build Type: %s", get_os_name(), - get_renderer_name(), + RAPI_NAME, + SM64COOPDX_VERSION, get_version_local(), - get_development_build() +#ifdef DEVELOPMENT + "Development" +#else + "Standard" +#endif ); struct DjuiText* text = djui_text_create(body, sInfo); const struct DjuiTheme* theme = gDjuiThemes[configDjuiTheme]; djui_base_set_location(&text->base, 0, 0); - djui_base_set_size(&text->base, (DJUI_DEFAULT_PANEL_WIDTH * theme->panels.widthMultiplier) - 64, 300); + djui_base_set_size(&text->base, (DJUI_DEFAULT_PANEL_WIDTH * theme->panels.widthMultiplier) - 64, 670); djui_base_set_color(&text->base, 220, 220, 220, 255); djui_text_set_drop_shadow(text, 64, 64, 64, 100); djui_text_set_alignment(text, DJUI_HALIGN_CENTER, DJUI_VALIGN_TOP); diff --git a/src/pc/lua/smlua_constants_autogen.c b/src/pc/lua/smlua_constants_autogen.c index cf80fac9..376adf65 100644 --- a/src/pc/lua/smlua_constants_autogen.c +++ b/src/pc/lua/smlua_constants_autogen.c @@ -4308,7 +4308,7 @@ 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 = 'sm64coopdx'\n" +"SM64COOPDX_VERSION = 'v0.1'\n" "VERSION_TEXT = 'v'\n" "VERSION_NUMBER = 36\n" "MINOR_VERSION_NUMBER = 0\n" diff --git a/src/pc/network/version.h b/src/pc/network/version.h index cff344b0..5d654d58 100644 --- a/src/pc/network/version.h +++ b/src/pc/network/version.h @@ -1,7 +1,7 @@ #ifndef VERSION_H #define VERSION_H -#define SM64COOPDX "sm64coopdx" +#define SM64COOPDX_VERSION "v0.1" #define VERSION_TEXT "v" #define VERSION_NUMBER 36 diff --git a/src/pc/pc_main.h b/src/pc/pc_main.h index 02bee1bc..94acdd89 100644 --- a/src/pc/pc_main.h +++ b/src/pc/pc_main.h @@ -42,6 +42,7 @@ extern bool gCoopCompatibility; # endif #elif defined(RAPI_DUMMY) # define RAPI gfx_dummy_renderer_api +# define RAPI_NAME "Dummy" #else # error No rendering API! #endif @@ -54,6 +55,10 @@ extern bool gCoopCompatibility; #define RAPI gfx_dummy_renderer_api #endif +#ifndef RAPI_NAME +#define RAPI_NAME "Dummy" +#endif + #ifdef GIT_HASH #define TITLE ({ char title[96] = ""; snprintf(title, 96, "sm64coopdx [%s]", GIT_HASH); title; }) #else