when pause menu is activated, move mouse cursor on top of the disconnect button,...

[dragonfireclient.git] / src / serverobject.cpp

diff --git a/src/serverobject.cpp b/src/serverobject.cpp
index 30234f7e98920caa5e047556ae3afe6852a102e2..d31e9a31cdc7fd7cd6e9f6a66b85e1ea2c3275f1 100644 (file)
--- a/src/serverobject.cpp
+++ b/src/serverobject.cpp
@@ -29,6 +29,7 @@ ServerActiveObject::ServerActiveObject(ServerEnvironment *env, u16 id, v3f pos):
        ActiveObject(id),
        m_known_by_count(0),
        m_removed(false),
+       m_pending_deactivation(false),
        m_static_exists(false),
        m_static_block(1337,1337,1337),
        m_env(env),
@@ -507,7 +508,7 @@ void Oerkki1SAO::step(float dtime, Queue<ActiveObjectMessage> &messages,
        */
 
        m_age += dtime;
-       if(m_age > 60)
+       if(m_age > 120)
        {
                // Die
                m_removed = true;