diff --git a/core/config/engine.cpp b/core/config/engine.cpp index af8c3729be..ecdf728aa7 100644 --- a/core/config/engine.cpp +++ b/core/config/engine.cpp @@ -125,8 +125,7 @@ Dictionary Engine::get_version_info() const { dict["hex"] = VERSION_HEX; dict["status"] = VERSION_STATUS; dict["build"] = VERSION_BUILD; - - dict["status_version"] = dict["status"] != "stable" ? VERSION_STATUS_VERSION : 0; + dict["status_version"] = VERSION_STATUS_VERSION; String hash = String(VERSION_HASH); dict["hash"] = hash.is_empty() ? String("unknown") : hash; diff --git a/core/version.h b/core/version.h index 09d7ec24fd..19365ac8f0 100644 --- a/core/version.h +++ b/core/version.h @@ -67,7 +67,11 @@ // Describes the full configuration of that Redot version, including the version number, // the status (beta, stable, etc.) and potential module-specific features (e.g. mono). // Example: "3.1.4.stable.mono" -#define VERSION_FULL_CONFIG VERSION_NUMBER "." VERSION_STATUS VERSION_MODULE_CONFIG +#if VERSION_STATUS_VERSION == 0 +#define VERSION_FULL_CONFIG VERSION_NUMBER "." VERSION_STATUS "." VERSION_MODULE_CONFIG +#else +#define VERSION_FULL_CONFIG VERSION_NUMBER "." VERSION_STATUS "." _MKSTR(VERSION_STATUS_VERSION) VERSION_MODULE_CONFIG +#endif // Similar to VERSION_FULL_CONFIG, but also includes the (potentially custom) VERSION_BUILD // description (e.g. official, custom_build, etc.). diff --git a/methods.py b/methods.py index 45e8549886..091a5cb5ca 100644 --- a/methods.py +++ b/methods.py @@ -210,7 +210,7 @@ def get_version_info(module_version_string="", silent=False): "minor": int(version.minor), "patch": int(version.patch), "status": str(version.status), - "status_version": int(version.status_version), + "status_version": int(version.status_version if version.status != "stable" else 0), "build": str(build_name), "module_config": str(version.module_config) + module_version_string, "website": str(version.website),