diff options
Diffstat (limited to 'src/environment.h')
| -rw-r--r-- | src/environment.h | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/environment.h b/src/environment.h index 03c21b08c..13c0c0efe 100644 --- a/src/environment.h +++ b/src/environment.h @@ -77,7 +77,7 @@ public: Player * getNearestConnectedPlayer(v3f pos); std::list<Player*> getPlayers(); std::list<Player*> getPlayers(bool ignore_disconnected); - + u32 getDayNightRatio(); // 0-23999 @@ -96,7 +96,7 @@ public: void stepTimeOfDay(float dtime); void setTimeOfDaySpeed(float speed); - + float getTimeOfDaySpeed(); void setDayNightRatioOverride(bool enable, u32 value) @@ -132,7 +132,7 @@ protected: * a later release. */ bool m_cache_enable_shaders; - + private: JMutex m_lock; @@ -150,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) @@ -255,7 +255,7 @@ public: Returns 0 if not added and thus deleted. */ u16 addActiveObject(ServerActiveObject *object); - + /* Add an active object as a static object to the corresponding MapBlock. @@ -264,7 +264,7 @@ public: (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 @@ -282,7 +282,7 @@ public: s16 player_radius, std::set<u16> ¤t_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. @@ -311,16 +311,16 @@ public: 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); @@ -328,9 +328,9 @@ public: 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: /* @@ -349,17 +349,17 @@ private: 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. @@ -374,7 +374,7 @@ private: /* Member variables */ - + // The map ServerMap *m_map; // Lua state @@ -433,8 +433,8 @@ struct ClientEnvEvent { ClientEnvEventType type; union { - struct{ - } none; + //struct{ + //} none; struct{ u8 amount; bool send_to_server; @@ -463,7 +463,7 @@ public: virtual void addPlayer(Player *player); LocalPlayer * getLocalPlayer(); - + /* ClientSimpleObjects */ @@ -473,7 +473,7 @@ public: /* ActiveObjects */ - + ClientActiveObject* getActiveObject(u16 id); /* @@ -501,11 +501,11 @@ public: /* 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(); @@ -521,7 +521,7 @@ public: { m_camera_offset = camera_offset; } v3s16 getCameraOffset() { return m_camera_offset; } - + private: ClientMap *m_map; scene::ISceneManager *m_smgr; |