X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fserverobject.h;h=597eb63a8180be8bf76fd176a212eb16e6132606;hb=79e2647556773d46cc0299e73ca23c41a153ff2a;hp=8719267d7b1ff0e1ea1f089e8a55f606ba007439;hpb=f8c3743991a6897c7133bf35dc2699b8b5f9df7c;p=minetest.git diff --git a/src/serverobject.h b/src/serverobject.h index 8719267d7..597eb63a8 100644 --- a/src/serverobject.h +++ b/src/serverobject.h @@ -1,18 +1,18 @@ /* -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 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. */ @@ -20,10 +20,11 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef SERVEROBJECT_HEADER #define SERVEROBJECT_HEADER -#include "irrlichttypes.h" +#include "irrlichttypes_bloated.h" #include "activeobject.h" -#include "utility.h" #include "inventorymanager.h" +#include "itemgroup.h" +#include "util/container.h" /* @@ -45,6 +46,7 @@ class ServerEnvironment; struct ItemStack; class Player; struct ToolCapabilities; +struct ObjectProperties; class ServerActiveObject : public ActiveObject { @@ -56,20 +58,20 @@ class ServerActiveObject : public ActiveObject ServerActiveObject(ServerEnvironment *env, v3f pos); virtual ~ServerActiveObject(); + virtual ActiveObjectType getSendType() const + { return getType(); } + // Called after id has been set and has been inserted in environment - virtual void addedToEnvironment(){}; + virtual void addedToEnvironment(u32 dtime_s){}; // Called before removing from environment virtual void removingFromEnvironment(){}; // Returns true if object's deletion is the job of the // environment virtual bool environmentDeletes() const { return true; } - - virtual bool unlimitedTransferDistance() const - { return false; } // Create a certain type of ServerActiveObject - static ServerActiveObject* create(u8 type, + static ServerActiveObject* create(ActiveObjectType type, ServerEnvironment *env, u16 id, v3f pos, const std::string &data); @@ -91,10 +93,7 @@ class ServerActiveObject : public ActiveObject { setBasePosition(pos); } // If object has moved less than this and data has not changed, // saving to disk may be omitted - virtual float getMinimumSavedMovement() - { return 2.0*BS; } - - virtual bool isPeaceful(){return true;} + virtual float getMinimumSavedMovement(); virtual std::string getDescription(){return "SAO";} @@ -114,7 +113,7 @@ class ServerActiveObject : public ActiveObject The return value of this is passed to the client-side object when it is created */ - virtual std::string getClientInitializationData(){return "";} + virtual std::string getClientInitializationData(u16 protocol_version){return "";} /* The return value of this is passed to the server-side object @@ -146,6 +145,35 @@ class ServerActiveObject : public ActiveObject virtual s16 getHP() const { return 0; } + virtual void setArmorGroups(const ItemGroupList &armor_groups) + {} + virtual ItemGroupList getArmorGroups() + { return ItemGroupList(); } + virtual void setPhysicsOverride(float physics_override_speed, float physics_override_jump, float physics_override_gravity) + {} + virtual void setAnimation(v2f frames, float frame_speed, float frame_blend, bool frame_loop) + {} + virtual void getAnimation(v2f *frames, float *frame_speed, float *frame_blend, bool *frame_loop) + {} + virtual void setBonePosition(const std::string &bone, v3f position, v3f rotation) + {} + virtual void getBonePosition(const std::string &bone, v3f *position, v3f *lotation) + {} + virtual void setAttachment(int parent_id, const std::string &bone, v3f position, v3f rotation) + {} + virtual void getAttachment(int *parent_id, std::string *bone, v3f *position, v3f *rotation) + {} + virtual void addAttachmentChild(int child_id) + {} + virtual void removeAttachmentChild(int child_id) + {} + virtual std::set getAttachmentChildIds() + { return std::set(); } + virtual ObjectProperties* accessObjectProperties() + { return NULL; } + virtual void notifyObjectPropertiesModified() + {} + // Inventory and wielded item virtual Inventory* getInventory() { return NULL; } @@ -204,7 +232,7 @@ class ServerActiveObject : public ActiveObject /* Queue of messages to be sent to the client */ - Queue m_messages_out; + std::queue m_messages_out; protected: // Used for creating objects based on type @@ -218,7 +246,7 @@ class ServerActiveObject : public ActiveObject private: // Used for creating objects based on type - static core::map m_types; + static std::map m_types; }; #endif