Add /hasmap chat command and support for extensions in /vote map

docs/CHANGELOG.md

@@ -44,6 +44,8 @@ Version 1.9.0 (not released yet)
 - Add level filename to "Level Initializing" console message
 - Properly handle WM_PAINT in dedicated server, may improve performance (DF bug)
 - Fix crash when `verify_level` command is run without a level being loaded
+- Add `/hasmap` server chat command
+- Add handling of level filename extensions with `/vote level` server chat command
 
 Version 1.8.0 (released 2022-09-17)
 -----------------------------------

game_patch/multi/server.cpp

@@ -20,6 +20,7 @@
 #include "../main/main.h"
 #include <common/utils/list-utils.h>
 #include "../rf/player/player.h"
+#include "../rf/misc.h"
 #include "../rf/multi.h"
 #include "../rf/parse.h"
 #include "../rf/weapon.h"
@@ -227,6 +228,16 @@ void handle_next_map_command(rf::Player* player)
     send_chat_line_packet(msg.c_str(), player);
 }
 
+void handle_has_map_command(rf::Player* player, std::string_view level_name)
+{
+    auto [is_valid, checked_level_name] = is_level_name_valid(level_name);
+
+    auto availability = is_valid ? "available" : "NOT available";
+    auto msg = std::format("Level {} is {} on the server.", checked_level_name, availability);
+
+    send_chat_line_packet(msg.c_str(), player);
+}
+
 void handle_save_command(rf::Player* player, std::string_view save_name)
 {
     auto& pdata = get_player_additional_data(player);
@@ -328,6 +339,9 @@ bool handle_server_chat_command(std::string_view server_command, rf::Player* sen
     else if (cmd_name == "stats") {
         send_private_message_with_stats(sender);
     }
+    else if (cmd_name == "hasmap" || cmd_name == "haslevel") {
+        handle_has_map_command(sender, cmd_arg);
+    }
     else {
         return false;
     }
@@ -554,6 +568,19 @@ static bool check_player_ac_status([[maybe_unused]] rf::Player* player)
     return true;
 }
 
+std::pair<bool, std::string> is_level_name_valid(std::string_view level_name_input)
+{
+    std::string level_name{level_name_input};
+
+    if (level_name.size() < 4 || level_name.compare(level_name.size() - 4, 4, ".rfl") != 0) {
+        level_name += ".rfl";
+    }
+
+    bool is_valid = rf::get_file_checksum(level_name.c_str()) != 0;
+
+    return {is_valid, level_name};
+}
+
 FunHook<void(rf::Player*)> multi_spawn_player_server_side_hook{
     0x00480820,
     [](rf::Player* player) {

game_patch/multi/server_internal.h

@@ -63,6 +63,7 @@ extern std::string g_prev_level;
 
 void cleanup_win32_server_console();
 void handle_vote_command(std::string_view vote_name, std::string_view vote_arg, rf::Player* sender);
+std::pair<bool, std::string> is_level_name_valid(std::string_view level_name_input);
 void server_vote_do_frame();
 void init_server_commands();
 void extend_round_time(int minutes);

game_patch/multi/votes.cpp

@@ -245,11 +245,15 @@ struct VoteLevel : public Vote
 
     bool process_vote_arg([[maybe_unused]] std::string_view arg, rf::Player* source) override
     {
-        m_level_name = std::format("{}.rfl", arg);
-        if (!rf::get_file_checksum(m_level_name.c_str())) {
-            send_chat_line_packet("Cannot find specified level!", source);
+        auto [is_valid, level_name] = is_level_name_valid(arg);
+
+        if (!is_valid) {
+            auto msg = std::format("\xA6 Cannot start vote: level {} is not available on the server!", level_name);
+            send_chat_line_packet(msg.c_str(), source);
             return false;
         }
+
+        m_level_name = std::move(level_name);
         return true;
     }
 
@@ -260,7 +264,8 @@ struct VoteLevel : public Vote
 
     void on_accepted() override
     {
-        send_chat_line_packet("\xA6 Vote passed: changing level", nullptr);
+        auto msg = std::format("\xA6 Vote passed: changing level to {}", m_level_name);
+        send_chat_line_packet(msg.c_str(), nullptr);
         rf::multi_change_level(m_level_name.c_str());
     }