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

[dragonfireclient.git] / src / environment.h

diff --git a/src/environment.h b/src/environment.h
index e8ae044e30ce0d32bab7ffbeebcb03acddf2cded..13c0c0efe329a8d234ca5abb33300a5ab3d0e804 100644 (file)
--- a/src/environment.h
+++ b/src/environment.h
@@ -77,7 +77,7 @@ class Environment
        Player * getNearestConnectedPlayer(v3f pos);
        std::list<Player*> getPlayers();
        std::list<Player*> getPlayers(bool ignore_disconnected);
-       
+
        u32 getDayNightRatio();
 
        // 0-23999
@@ -96,7 +96,7 @@ class Environment
        void stepTimeOfDay(float dtime);
 
        void setTimeOfDaySpeed(float speed);
-       
+
        float getTimeOfDaySpeed();
 
        void setDayNightRatioOverride(bool enable, u32 value)
@@ -121,7 +121,18 @@ class Environment
        // Overriding the day-night ratio is useful for custom sky visuals
        bool m_enable_day_night_ratio_override;
        u32 m_day_night_ratio_override;
-       
+
+       /* 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
+        *       is documented to change server settings only)
+        *
+        * TODO: Local caching of settings is not optimal and should at some stage
+        *       be updated to use a global settings object for getting thse values
+        *       (as opposed to the this local caching). This can be addressed in
+        *       a later release.
+        */
+       bool m_cache_enable_shaders;
+
 private:
        JMutex m_lock;
 
@@ -139,7 +150,7 @@ class ActiveBlockModifier
 public:
        ActiveBlockModifier(){};
        virtual ~ActiveBlockModifier(){};
-       
+
        // Set of contents to trigger on
        virtual std::set<std::string> getTriggerContents()=0;
        // Set of required neighbors (trigger doesn't happen if none are found)
@@ -244,7 +255,7 @@ class ServerEnvironment : public Environment
                Returns 0 if not added and thus deleted.
        */
        u16 addActiveObject(ServerActiveObject *object);
-       
+
        /*
                Add an active object as a static object to the corresponding
                MapBlock.
@@ -253,12 +264,13 @@ class ServerEnvironment : public Environment
                (note:  not used, pending removal from engine)
        */
        //bool addActiveObjectAsStatic(ServerActiveObject *object);
-       
+
        /*
                Find out what new objects have been added to
                inside a radius around a position
        */
        void getAddedActiveObjects(v3s16 pos, s16 radius,
+                       s16 player_radius,
                        std::set<u16> &current_objects,
                        std::set<u16> &added_objects);
 
@@ -267,9 +279,10 @@ class ServerEnvironment : public Environment
                inside a radius around a position
        */
        void getRemovedActiveObjects(v3s16 pos, s16 radius,
+                       s16 player_radius,
                        std::set<u16> &current_objects,
                        std::set<u16> &removed_objects);
-       
+
        /*
                Get the next message emitted by some active object.
                Returns a message with id=0 if no messages are available.
@@ -298,16 +311,16 @@ class ServerEnvironment : public Environment
        bool setNode(v3s16 p, const MapNode &n);
        bool removeNode(v3s16 p);
        bool swapNode(v3s16 p, const MapNode &n);
-       
+
        // Find all active objects inside a radius around a point
        std::set<u16> getObjectsInsideRadius(v3f pos, float radius);
-       
+
        // Clear all objects, loading and going through every MapBlock
        void clearAllObjects();
-       
+
        // This makes stuff happen
        void step(f32 dtime);
-       
+
        //check if there's a line of sight between two positions
        bool line_of_sight(v3f pos1, v3f pos2, float stepsize=1.0, v3s16 *p=NULL);
 
@@ -315,9 +328,9 @@ class ServerEnvironment : public Environment
 
        void reportMaxLagEstimate(float f) { m_max_lag_estimate = f; }
        float getMaxLagEstimate() { return m_max_lag_estimate; }
-       
+
        std::set<v3s16>* getForceloadedBlocks() { return &m_active_blocks.m_forceloaded_list; };
-       
+
 private:
 
        /*
@@ -336,17 +349,17 @@ class ServerEnvironment : public Environment
                Returns 0 if not added and thus deleted.
        */
        u16 addActiveObjectRaw(ServerActiveObject *object, bool set_changed, u32 dtime_s);
-       
+
        /*
                Remove all objects that satisfy (m_removed && m_known_by_count==0)
        */
        void removeRemovedObjects();
-       
+
        /*
                Convert stored objects from block to active
        */
        void activateObjects(MapBlock *block, u32 dtime_s);
-       
+
        /*
                Convert objects that are not in active blocks to static.
 
@@ -361,7 +374,7 @@ class ServerEnvironment : public Environment
        /*
                Member variables
        */
-       
+
        // The map
        ServerMap *m_map;
        // Lua state
@@ -420,8 +433,8 @@ struct ClientEnvEvent
 {
        ClientEnvEventType type;
        union {
-               struct{
-               } none;
+               //struct{
+               //} none;
                struct{
                        u8 amount;
                        bool send_to_server;
@@ -450,7 +463,7 @@ class ClientEnvironment : public Environment
 
        virtual void addPlayer(Player *player);
        LocalPlayer * getLocalPlayer();
-       
+
        /*
                ClientSimpleObjects
        */
@@ -460,7 +473,7 @@ class ClientEnvironment : public Environment
        /*
                ActiveObjects
        */
-       
+
        ClientActiveObject* getActiveObject(u16 id);
 
        /*
@@ -488,11 +501,11 @@ class ClientEnvironment : public Environment
        /*
                Client likes to call these
        */
-       
+
        // Get all nearby objects
        void getActiveObjects(v3f origin, f32 max_d,
                        std::vector<DistanceSortedActiveObject> &dest);
-       
+
        // Get event from queue. CEE_NONE is returned if queue is empty.
        ClientEnvEvent getClientEvent();
 
@@ -508,7 +521,7 @@ class ClientEnvironment : public Environment
        { m_camera_offset = camera_offset; }
        v3s16 getCameraOffset()
        { return m_camera_offset; }
-       
+
 private:
        ClientMap *m_map;
        scene::ISceneManager *m_smgr;