X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fcontent_sao.h;h=065c6a0397da31d040afc1c139ac5926dd7cf07d;hb=8e5b33d3590719ff2cf1138f563e928d05754d7a;hp=48a5078b14df522643c4b60dd0eecd8001f6953e;hpb=92ae11bd3b5e95ff837f98463931e7772c455ad3;p=oweals%2Fminetest.git diff --git a/src/content_sao.h b/src/content_sao.h index 48a5078b1..065c6a039 100644 --- a/src/content_sao.h +++ b/src/content_sao.h @@ -3,16 +3,16 @@ Minetest-c55 Copyright (C) 2010-2011 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +GNU Lesser General Public License for more details. -You should have received a copy of the GNU General Public License along +You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "content_object.h" #include "itemgroup.h" #include "player.h" +#include "object_properties.h" ServerActiveObject* createItemSAO(ServerEnvironment *env, v3f pos, const std::string itemstring); @@ -32,8 +33,6 @@ ServerActiveObject* createItemSAO(ServerEnvironment *env, v3f pos, LuaEntitySAO needs some internals exposed. */ -struct LuaEntityProperties; - class LuaEntitySAO : public ServerActiveObject { public: @@ -44,11 +43,12 @@ public: { return ACTIVEOBJECT_TYPE_LUAENTITY; } u8 getSendType() const { return ACTIVEOBJECT_TYPE_GENERIC; } - virtual void addedToEnvironment(); + 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, @@ -62,6 +62,11 @@ public: void setHP(s16 hp); s16 getHP() const; void setArmorGroups(const ItemGroupList &armor_groups); + 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 */ void setVelocity(v3f velocity); v3f getVelocity(); @@ -80,7 +85,7 @@ private: std::string m_init_name; std::string m_init_state; bool m_registered; - struct LuaEntityProperties *m_prop; + struct ObjectProperties m_prop; s16 m_hp; v3f m_velocity; @@ -95,6 +100,20 @@ private: float m_last_sent_position_timer; float m_last_sent_move_precision; bool m_armor_groups_sent; + + 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; }; /* @@ -104,7 +123,8 @@ private: class PlayerSAO : public ServerActiveObject { public: - PlayerSAO(ServerEnvironment *env_, Player *player_, u16 peer_id_); + PlayerSAO(ServerEnvironment *env_, Player *player_, u16 peer_id_, + const std::set &privs, bool is_singleplayer); ~PlayerSAO(); u8 getType() const { return ACTIVEOBJECT_TYPE_PLAYER; } @@ -116,12 +136,13 @@ public: Active object <-> environment interface */ - void addedToEnvironment(); + 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); @@ -138,7 +159,13 @@ public: void rightClick(ServerActiveObject *clicker); s16 getHP() const; void setHP(s16 hp); + void setArmorGroups(const ItemGroupList &armor_groups); + 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(); /* Inventory interface @@ -158,8 +185,6 @@ public: void disconnected(); - void createCreativeInventory(); - Player* getPlayer() { return m_player; @@ -168,6 +193,9 @@ public: { return m_peer_id; } + + // Cheat prevention + v3f getLastGoodPosition() const { return m_last_good_position; @@ -178,6 +206,32 @@ public: m_time_from_last_punch = 0.0; return r; } + void noCheatDigStart(v3s16 p) + { + m_nocheat_dig_pos = p; + m_nocheat_dig_time = 0; + } + v3s16 getNoCheatDigPos() + { + return m_nocheat_dig_pos; + } + float getNoCheatDigTime() + { + return m_nocheat_dig_time; + } + void noCheatDigEnd() + { + m_nocheat_dig_pos = v3s16(32767, 32767, 32767); + } + + // Other + + void updatePrivileges(const std::set &privs, + bool is_singleplayer) + { + m_privs = privs; + m_is_singleplayer = is_singleplayer; + } private: std::string getPropertyPacket(); @@ -185,18 +239,44 @@ private: Player *m_player; u16 m_peer_id; Inventory *m_inventory; + + // Cheat prevention 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; + int m_wield_index; bool m_position_not_sent; ItemGroupList m_armor_groups; bool m_armor_groups_sent; + + + 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_moved; bool m_inventory_not_sent; bool m_hp_not_sent; bool m_wielded_item_not_sent;