From e2162c08da67a1ec3a5d53b009f5a550c8c465bd Mon Sep 17 00:00:00 2001 From: JJ <3617814+joligario@users.noreply.github.com> Date: Sun, 18 May 2025 12:28:10 -0400 Subject: [PATCH] [CLI] Add custom database version output (#4901) * Add custom database version output to CLI from #4892 * Spacing alignment --- world/cli/database_version.cpp | 5 +++-- world/cli/version.cpp | 11 ++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/world/cli/database_version.cpp b/world/cli/database_version.cpp index e3130b9dc..2426d9d72 100644 --- a/world/cli/database_version.cpp +++ b/world/cli/database_version.cpp @@ -12,8 +12,9 @@ void WorldserverCLI::DatabaseVersion(int argc, char **argv, argh::parser &cmd, s Json::Value v; - v["database_version"] = CURRENT_BINARY_DATABASE_VERSION; - v["bots_database_version"] = RuleB(Bots, Enabled) ? CURRENT_BINARY_BOTS_DATABASE_VERSION : 0; + v["database_version"] = CURRENT_BINARY_DATABASE_VERSION; + v["bots_database_version"] = RuleB(Bots, Enabled) ? CURRENT_BINARY_BOTS_DATABASE_VERSION : 0; + v["custom_database_version"] = CUSTOM_BINARY_DATABASE_VERSION; std::stringstream payload; payload << v; diff --git a/world/cli/version.cpp b/world/cli/version.cpp index d03fd5e26..383b69ac7 100644 --- a/world/cli/version.cpp +++ b/world/cli/version.cpp @@ -11,11 +11,12 @@ void WorldserverCLI::Version(int argc, char **argv, argh::parser &cmd, std::stri Json::Value j; - j["bots_database_version"] = CURRENT_BINARY_BOTS_DATABASE_VERSION; - j["compile_date"] = COMPILE_DATE; - j["compile_time"] = COMPILE_TIME; - j["database_version"] = CURRENT_BINARY_DATABASE_VERSION; - j["server_version"] = CURRENT_VERSION; + j["bots_database_version"] = CURRENT_BINARY_BOTS_DATABASE_VERSION; + j["compile_date"] = COMPILE_DATE; + j["compile_time"] = COMPILE_TIME; + j["custom_database_version"] = CUSTOM_BINARY_DATABASE_VERSION; + j["database_version"] = CURRENT_BINARY_DATABASE_VERSION; + j["server_version"] = CURRENT_VERSION; std::stringstream payload; payload << j;