Mgv7 mountains: Remove divide by zero code that creates vast walls

[dragonfireclient.git] / src / server.cpp

diff --git a/src/server.cpp b/src/server.cpp
index fba512049d6b145fc9c64996676accf82e6dbfc1..399c41b70afe5ac10321e9237ff2c8b6cf462e0a 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;
@@ -1365,7 +1366,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
                // Use the highest version supported by both
                int deployed = std::min(client_max, our_max);
                // If it's lower than the lowest supported, give up.
-               if(deployed < SER_FMT_VER_LOWEST)
+               if(deployed < SER_FMT_CLIENT_VER_LOWEST)
                        deployed = SER_FMT_VER_INVALID;
 
                if(deployed == SER_FMT_VER_INVALID)
@@ -4293,6 +4294,7 @@ void Server::RespawnPlayer(u16 peer_id)
                        <<" respawns"<<std::endl;
 
        playersao->setHP(PLAYER_MAX_HP);
+       playersao->setBreath(PLAYER_MAX_BREATH);
 
        bool repositioned = m_script->on_respawnplayer(playersao);
        if(!repositioned){