X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcontent_sao.h;h=cc372ff5572a67b910f583a286248a41e5696d3a;hb=b246812455737b2d0337dec905ba0256adefd105;hp=e4d81cd2d970d92805d1e2d7737aec59c7c88c2d;hpb=948b5a8be7b13a346c873c157567a72b4e7e320a;p=dragonfireclient.git diff --git a/src/content_sao.h b/src/content_sao.h index e4d81cd2d..cc372ff55 100644 --- a/src/content_sao.h +++ b/src/content_sao.h @@ -1,6 +1,6 @@ /* -Minetest-c55 -Copyright (C) 2010-2011 celeron55, Perttu Ahola +Minetest +Copyright (C) 2010-2013 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -21,14 +21,10 @@ with this program; if not, write to the Free Software Foundation, Inc., #define CONTENT_SAO_HEADER #include "serverobject.h" -#include "content_object.h" #include "itemgroup.h" #include "player.h" #include "object_properties.h" -ServerActiveObject* createItemSAO(ServerEnvironment *env, v3f pos, - const std::string itemstring); - /* LuaEntitySAO needs some internals exposed. */ @@ -37,17 +33,18 @@ class LuaEntitySAO : public ServerActiveObject { public: LuaEntitySAO(ServerEnvironment *env, v3f pos, - const std::string &name, const std::string &state); + const std::string &name, const std::string &state); ~LuaEntitySAO(); - u8 getType() const + ActiveObjectType getType() const { return ACTIVEOBJECT_TYPE_LUAENTITY; } - u8 getSendType() const + ActiveObjectType getSendType() const { return ACTIVEOBJECT_TYPE_GENERIC; } virtual void addedToEnvironment(u32 dtime_s); static ServerActiveObject* create(ServerEnvironment *env, v3f pos, const std::string &data); + bool isAttached(); void step(float dtime, bool send_recommended); - std::string getClientInitializationData(); + std::string getClientInitializationData(u16 protocol_version); std::string getStaticData(); int punch(v3f dir, const ToolCapabilities *toolcap=NULL, @@ -61,9 +58,9 @@ class LuaEntitySAO : public ServerActiveObject void setHP(s16 hp); s16 getHP() const; void setArmorGroups(const ItemGroupList &armor_groups); - void setAnimations(v2f frames, float frame_speed, float frame_blend); - void setBonePosRot(std::string bone, v3f position, v3f rotation); - void setAttachment(ServerActiveObject *parent, std::string bone, v3f position, v3f rotation); + void setAnimation(v2f frame_range, float frame_speed, float frame_blend); + void setBonePosition(std::string bone, v3f position, v3f rotation); + void setAttachment(int parent_id, std::string bone, v3f position, v3f rotation); ObjectProperties* accessObjectProperties(); void notifyObjectPropertiesModified(); /* LuaEntitySAO-specific */ @@ -77,6 +74,8 @@ class LuaEntitySAO : public ServerActiveObject void setSprite(v2s16 p, int num_frames, float framelength, bool select_horiz_by_yawpitch); std::string getName(); + bool getCollisionBox(aabb3f *toset); + bool collideWithObjects(); private: std::string getPropertyPacket(); void sendPosition(bool do_interpolate, bool is_movement_end); @@ -99,22 +98,65 @@ class LuaEntitySAO : public ServerActiveObject float m_last_sent_position_timer; float m_last_sent_move_precision; bool m_armor_groups_sent; - ServerActiveObject *m_parent; + + v2f m_animation_range; + float m_animation_speed; + float m_animation_blend; + bool m_animation_sent; + + std::map > m_bone_position; + bool m_bone_position_sent; + + int m_attachment_parent_id; + std::string m_attachment_bone; + v3f m_attachment_position; + v3f m_attachment_rotation; + bool m_attachment_sent; }; /* PlayerSAO needs some internals exposed. */ +class LagPool +{ + float m_pool; + float m_max; +public: + LagPool(): m_pool(15), m_max(15) + {} + void setMax(float new_max) + { + m_max = new_max; + if(m_pool > new_max) + m_pool = new_max; + } + void add(float dtime) + { + m_pool -= dtime; + if(m_pool < 0) + m_pool = 0; + } + bool grab(float dtime) + { + if(dtime <= 0) + return true; + if(m_pool + dtime > m_max) + return false; + m_pool += dtime; + return true; + } +}; + class PlayerSAO : public ServerActiveObject { public: PlayerSAO(ServerEnvironment *env_, Player *player_, u16 peer_id_, const std::set &privs, bool is_singleplayer); ~PlayerSAO(); - u8 getType() const + ActiveObjectType getType() const { return ACTIVEOBJECT_TYPE_PLAYER; } - u8 getSendType() const + ActiveObjectType getSendType() const { return ACTIVEOBJECT_TYPE_GENERIC; } std::string getDescription(); @@ -125,13 +167,15 @@ class PlayerSAO : public ServerActiveObject void addedToEnvironment(u32 dtime_s); void removingFromEnvironment(); bool isStaticAllowed() const; - bool unlimitedTransferDistance() const; - std::string getClientInitializationData(); + std::string getClientInitializationData(u16 protocol_version); std::string getStaticData(); + bool isAttached(); void step(float dtime, bool send_recommended); void setBasePosition(const v3f &position); void setPos(v3f pos); void moveTo(v3f pos, bool continuous); + void setYaw(float); + void setPitch(float); /* Interaction interface @@ -144,11 +188,13 @@ class PlayerSAO : public ServerActiveObject void rightClick(ServerActiveObject *clicker); s16 getHP() const; void setHP(s16 hp); - + s16 readDamage(); + u16 getBreath() const; + void setBreath(u16 breath); void setArmorGroups(const ItemGroupList &armor_groups); - void setAnimations(v2f frames, float frame_speed, float frame_blend); - void setBonePosRot(std::string bone, v3f position, v3f rotation); - void setAttachment(ServerActiveObject *parent, std::string bone, v3f position, v3f rotation); + void setAnimation(v2f frame_range, float frame_speed, float frame_blend); + void setBonePosition(std::string bone, v3f position, v3f rotation); + void setAttachment(int parent_id, std::string bone, v3f position, v3f rotation); ObjectProperties* accessObjectProperties(); void notifyObjectPropertiesModified(); @@ -159,7 +205,6 @@ class PlayerSAO : public ServerActiveObject Inventory* getInventory(); const Inventory* getInventory() const; InventoryLocation getInventoryLocation() const; - void setInventoryModified(); std::string getWieldList() const; int getWieldIndex() const; void setWieldIndex(int i); @@ -208,6 +253,12 @@ class PlayerSAO : public ServerActiveObject { m_nocheat_dig_pos = v3s16(32767, 32767, 32767); } + LagPool& getDigPool() + { + return m_dig_pool; + } + // Returns true if cheated + bool checkMovementCheat(); // Other @@ -218,16 +269,21 @@ class PlayerSAO : public ServerActiveObject m_is_singleplayer = is_singleplayer; } + bool getCollisionBox(aabb3f *toset); + bool collideWithObjects(); + private: std::string getPropertyPacket(); Player *m_player; u16 m_peer_id; Inventory *m_inventory; + s16 m_damage; // Cheat prevention + LagPool m_dig_pool; + LagPool m_move_pool; v3f m_last_good_position; - float m_last_good_position_age; float m_time_from_last_punch; v3s16 m_nocheat_dig_pos; float m_nocheat_dig_time; @@ -236,19 +292,34 @@ class PlayerSAO : public ServerActiveObject bool m_position_not_sent; ItemGroupList m_armor_groups; bool m_armor_groups_sent; - ServerActiveObject *m_parent; + bool m_properties_sent; struct ObjectProperties m_prop; // Cached privileges for enforcement std::set m_privs; bool m_is_singleplayer; + v2f m_animation_range; + float m_animation_speed; + float m_animation_blend; + bool m_animation_sent; + + std::map > m_bone_position; // Stores position and rotation for each bone name + bool m_bone_position_sent; + + int m_attachment_parent_id; + std::string m_attachment_bone; + v3f m_attachment_position; + v3f m_attachment_rotation; + bool m_attachment_sent; + public: - // Some flags used by Server - bool m_teleported; - bool m_inventory_not_sent; - bool m_hp_not_sent; - bool m_wielded_item_not_sent; + float m_physics_override_speed; + float m_physics_override_jump; + float m_physics_override_gravity; + bool m_physics_override_sneak; + bool m_physics_override_sneak_glitch; + bool m_physics_override_sent; }; #endif