X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fenvironment.h;h=e8ae044e30ce0d32bab7ffbeebcb03acddf2cded;hb=8852333eb3042580592ade478e5def20f8ed5d4c;hp=07a4d7635673dd40dcee52f1420f2c2f236c1065;hpb=979ca23f1eae1adeb8b0083dffe7203c54d87395;p=oweals%2Fminetest.git diff --git a/src/environment.h b/src/environment.h index 07a4d7635..e8ae044e3 100644 --- a/src/environment.h +++ b/src/environment.h @@ -31,24 +31,25 @@ with this program; if not, write to the Free Software Foundation, Inc., */ #include -#include "irrlichttypes_extrabloated.h" -#include "player.h" -#include +#include +#include +#include "irr_v3d.h" #include "activeobject.h" -#include "util/container.h" #include "util/numeric.h" #include "mapnode.h" #include "mapblock.h" +#include "jthread/jmutex.h" class ServerEnvironment; class ActiveBlockModifier; class ServerActiveObject; -typedef struct lua_State lua_State; class ITextureSource; class IGameDef; class Map; class ServerMap; class ClientMap; +class GameScripting; +class Player; class Environment { @@ -69,16 +70,16 @@ public: virtual void addPlayer(Player *player); void removePlayer(u16 peer_id); + void removePlayer(const char *name); Player * getPlayer(u16 peer_id); Player * getPlayer(const char *name); Player * getRandomConnectedPlayer(); Player * getNearestConnectedPlayer(v3f pos); - core::list getPlayers(); - core::list getPlayers(bool ignore_disconnected); - void printPlayers(std::ostream &o); + std::list getPlayers(); + std::list getPlayers(bool ignore_disconnected); u32 getDayNightRatio(); - + // 0-23999 virtual void setTimeOfDay(u32 time) { @@ -94,15 +95,22 @@ public: void stepTimeOfDay(float dtime); - void setTimeOfDaySpeed(float speed) - { m_time_of_day_speed = speed; } + void setTimeOfDaySpeed(float speed); - float getTimeOfDaySpeed() - { return m_time_of_day_speed; } + float getTimeOfDaySpeed(); + + void setDayNightRatioOverride(bool enable, u32 value) + { + m_enable_day_night_ratio_override = enable; + m_day_night_ratio_override = value; + } + + // counter used internally when triggering ABMs + u32 m_added_objects; protected: // peer_ids in here should be unique, except that there may be many 0s - core::list m_players; + std::list m_players; // Time of day in milli-hours (0-23999); determines day and night u32 m_time_of_day; // Time of day in 0...1 @@ -110,6 +118,13 @@ protected: float m_time_of_day_speed; // Used to buffer dtime for adding to m_time_of_day float m_time_counter; + // Overriding the day-night ratio is useful for custom sky visuals + bool m_enable_day_night_ratio_override; + u32 m_day_night_ratio_override; + +private: + JMutex m_lock; + }; /* @@ -156,30 +171,25 @@ struct ABMWithState class ActiveBlockList { public: - void update(core::list &active_positions, + void update(std::list &active_positions, s16 radius, - core::map &blocks_removed, - core::map &blocks_added); + std::set &blocks_removed, + std::set &blocks_added); bool contains(v3s16 p){ - return (m_list.find(p) != NULL); + return (m_list.find(p) != m_list.end()); } void clear(){ m_list.clear(); } - core::map m_list; + std::set m_list; + std::set m_forceloaded_list; private: }; -class IBackgroundBlockEmerger -{ -public: - virtual void queueBlockEmerge(v3s16 blockpos, bool allow_generate)=0; -}; - /* The server-side environment. @@ -189,16 +199,17 @@ public: class ServerEnvironment : public Environment { public: - ServerEnvironment(ServerMap *map, lua_State *L, IGameDef *gamedef, - IBackgroundBlockEmerger *emerger); + ServerEnvironment(ServerMap *map, GameScripting *scriptIface, + IGameDef *gamedef, const std::string &path_world); ~ServerEnvironment(); Map & getMap(); ServerMap & getServerMap(); - lua_State* getLua() - { return m_lua; } + //TODO find way to remove this fct! + GameScripting* getScriptIface() + { return m_script; } IGameDef *getGameDef() { return m_gamedef; } @@ -206,17 +217,16 @@ public: float getSendRecommendedInterval() { return m_recommended_send_interval; } - /* - Save players - */ - void serializePlayers(const std::string &savedir); - void deSerializePlayers(const std::string &savedir); + // Save players + void saveLoadedPlayers(); + void savePlayer(const std::string &playername); + Player *loadPlayer(const std::string &playername); /* Save and load time of day and game timer */ - void saveMeta(const std::string &savedir); - void loadMeta(const std::string &savedir); + void saveMeta(); + void loadMeta(); /* External ActiveObject interface @@ -249,16 +259,16 @@ public: inside a radius around a position */ void getAddedActiveObjects(v3s16 pos, s16 radius, - core::map ¤t_objects, - core::map &added_objects); + std::set ¤t_objects, + std::set &added_objects); /* Find out what new objects have been removed from inside a radius around a position */ void getRemovedActiveObjects(v3s16 pos, s16 radius, - core::map ¤t_objects, - core::map &removed_objects); + std::set ¤t_objects, + std::set &removed_objects); /* Get the next message emitted by some active object. @@ -287,6 +297,7 @@ public: // Script-aware node setters 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 getObjectsInsideRadius(v3f pos, float radius); @@ -297,6 +308,16 @@ public: // 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); + + u32 getGameTime() { return m_game_time; } + + void reportMaxLagEstimate(float f) { m_max_lag_estimate = f; } + float getMaxLagEstimate() { return m_max_lag_estimate; } + + std::set* getForceloadedBlocks() { return &m_active_blocks.m_forceloaded_list; }; + private: /* @@ -344,17 +365,16 @@ private: // The map ServerMap *m_map; // Lua state - lua_State *m_lua; + GameScripting* m_script; // Game definition IGameDef *m_gamedef; - // Background block emerger (the server, in practice) - IBackgroundBlockEmerger *m_emerger; + // World path + const std::string m_path_world; // Active object list - core::map m_active_objects; + std::map m_active_objects; // Outgoing network message buffer for active objects - Queue m_active_object_messages; + std::list m_active_object_messages; // Some timers - float m_random_spawn_timer; // used for experimental code float m_send_recommended_timer; IntervalLimiter m_object_management_interval; // List of active blocks @@ -368,9 +388,12 @@ private: u32 m_game_time; // A helper variable for incrementing the latter float m_game_time_fraction_counter; - core::list m_abms; + std::list m_abms; // An interval for generally sending object positions and stuff float m_recommended_send_interval; + // Estimate for general maximum lag as determined by server. + // Can raise to high values like 15s with eg. map generation mods. + float m_max_lag_estimate; }; #ifndef SERVER @@ -389,7 +412,8 @@ class ClientSimpleObject; enum ClientEnvEventType { CEE_NONE, - CEE_PLAYER_DAMAGE + CEE_PLAYER_DAMAGE, + CEE_PLAYER_BREATH }; struct ClientEnvEvent @@ -402,6 +426,9 @@ struct ClientEnvEvent u8 amount; bool send_to_server; } player_damage; + struct{ + u16 amount; + } player_breath; }; }; @@ -456,6 +483,7 @@ public: */ void damageLocalPlayer(u8 damage, bool handle_hp=true); + void updateLocalPlayerBreath(u16 breath); /* Client likes to call these @@ -463,12 +491,23 @@ public: // Get all nearby objects void getActiveObjects(v3f origin, f32 max_d, - core::array &dest); + std::vector &dest); // Get event from queue. CEE_NONE is returned if queue is empty. ClientEnvEvent getClientEvent(); - std::vector > attachment_list; // X is child ID, Y is parent ID + u16 m_attachements[USHRT_MAX]; + + std::list getPlayerNames() + { return m_player_names; } + void addPlayerName(std::string name) + { m_player_names.push_back(name); } + void removePlayerName(std::string name) + { m_player_names.remove(name); } + void updateCameraOffset(v3s16 camera_offset) + { m_camera_offset = camera_offset; } + v3s16 getCameraOffset() + { return m_camera_offset; } private: ClientMap *m_map; @@ -476,11 +515,15 @@ private: ITextureSource *m_texturesource; IGameDef *m_gamedef; IrrlichtDevice *m_irr; - core::map m_active_objects; - core::list m_simple_objects; - Queue m_client_event_queue; + std::map m_active_objects; + std::list m_simple_objects; + std::list m_client_event_queue; IntervalLimiter m_active_object_light_update_interval; IntervalLimiter m_lava_hurt_interval; + IntervalLimiter m_drowning_interval; + IntervalLimiter m_breathing_interval; + std::list m_player_names; + v3s16 m_camera_offset; }; #endif