Fix uninitialized variable Server::m_next_sound_id

[minetest.git] / src / server.cpp

diff --git a/src/server.cpp b/src/server.cpp
index d268276bbf0e478588cac23d100a21f859704e4b..2b5fe9b08297b8fba61b005599276042e496561a 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -194,7 +194,8 @@ Server::Server(
        m_clients(&m_con),
        m_shutdown_requested(false),
        m_ignore_map_edit_events(false),
-       m_ignore_map_edit_events_peer_id(0)
+       m_ignore_map_edit_events_peer_id(0),
+       m_next_sound_id(0)
 
 {
        m_liquid_transform_timer = 0.0;
@@ -340,6 +341,8 @@ Server::Server(
        // Apply item aliases in the node definition manager
        m_nodedef->updateAliases(m_itemdef);
 
+       m_nodedef->setNodeRegistrationStatus(true);
+
        // Perform pending node name resolutions
        m_nodedef->runNodeResolverCallbacks();
 
@@ -426,6 +429,9 @@ Server::~Server()
 void Server::start(Address bind_addr)
 {
        DSTACK(__FUNCTION_NAME);
+
+       m_bind_addr = bind_addr;
+
        infostream<<"Starting server on "
                        << bind_addr.serializeString() <<"..."<<std::endl;
 
@@ -676,6 +682,7 @@ void Server::AsyncRunStep(bool initial_step)
                                g_settings->getBool("server_announce"))
                {
                        ServerList::sendAnnounce(counter ? "update" : "start",
+                                       m_bind_addr.getPort(),
                                        m_clients.getPlayerNames(),
                                        m_uptime.get(),
                                        m_env->getGameTime(),
@@ -1506,7 +1513,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
                                                <<"tried to connect from "<<addr_s<<" "
                                                <<"but it was disallowed for the following reason: "
                                                <<reason<<std::endl;
-                               DenyAccess(peer_id, narrow_to_wide(reason.c_str()));
+                               DenyAccess(peer_id, narrow_to_wide(reason));
                                return;
                        }
                }
@@ -5091,8 +5098,8 @@ void dedicated_server_loop(Server &server, bool &kill)
                {
                        infostream<<"Dedicated server quitting"<<std::endl;
 #if USE_CURL
-                       if(g_settings->getBool("server_announce") == true)
-                               ServerList::sendAnnounce("delete");
+                       if(g_settings->getBool("server_announce"))
+                               ServerList::sendAnnounce("delete", server.m_bind_addr.getPort());
 #endif
                        break;
                }