remove_detached_inventory: Fix segfault during mod load

[oweals/minetest.git] / src / environment.h

diff --git a/src/environment.h b/src/environment.h
index 1b1cfc50a7091ab0ca1243897b71b7da22efdc48..f568ba2287e42370e988eda05317ef25619bdebc 100644 (file)
--- a/src/environment.h
+++ b/src/environment.h
@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef ENVIRONMENT_HEADER
-#define ENVIRONMENT_HEADER
+#pragma once
 
 /*
        This class is the game's environment.
@@ -36,9 +35,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <atomic>
 #include <mutex>
 #include "irr_v3d.h"
-#include "activeobject.h"
-#include "util/numeric.h"
 #include "network/networkprotocol.h" // for AccessDeniedCode
+#include "util/basic_macros.h"
 
 class IGameDef;
 class Map;
@@ -50,7 +48,7 @@ class Environment
 public:
        // Environment will delete the map passed to the constructor
        Environment(IGameDef *gamedef);
-       virtual ~Environment();
+       virtual ~Environment() = default;
        DISABLE_CLASS_COPY(Environment);
 
        /*
@@ -108,11 +106,11 @@ protected:
 
        /*
         * Below: values managed by m_time_lock
-       */
-       // Time of day in milli-hours (0-23999); determines day and night
-       u32 m_time_of_day = 5250;
-       // Time of day in 0...1; start 5:15am unless overridden by game
-       float m_time_of_day_f = 5250.0f / 24000.0f;
+        */
+       // Time of day in milli-hours (0-23999), determines day and night
+       u32 m_time_of_day;
+       // Time of day in 0...1
+       float m_time_of_day_f;
        // Stores the skew created by the float -> u32 conversion
        // to be applied at next conversion, so that there is no real skew.
        float m_time_conversion_skew = 0.0f;
@@ -124,7 +122,7 @@ protected:
        std::atomic<u32> m_day_count;
        /*
         * Above: values managed by m_time_lock
-       */
+        */
 
        /* TODO: Add a callback function so these can be updated when a setting
         *       changes.  At this point in time it doesn't matter (e.g. /set
@@ -145,5 +143,3 @@ protected:
 private:
        std::mutex m_time_lock;
 };
-
-#endif