projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix build with redis
[oweals/minetest.git]
/
src
/
serverobject.h
diff --git
a/src/serverobject.h
b/src/serverobject.h
index a0886ed1e4221d4f5da0e6deca967153786b2511..13a075a2575b52dd59ce3f99ca9caace8d8c6de8 100644
(file)
--- a/
src/serverobject.h
+++ b/
src/serverobject.h
@@
-1,6
+1,6
@@
/*
/*
-Minetest
-c55
-Copyright (C) 2010-201
1
celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-201
3
celeron55, Perttu Ahola <celeron55@gmail.com>
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
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
@@
-118,7
+118,7
@@
public:
The return value of this is passed to the client-side object
when it is created
*/
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
/*
The return value of this is passed to the server-side object
@@
-152,9
+152,11
@@
public:
virtual void setArmorGroups(const ItemGroupList &armor_groups)
{}
virtual void setArmorGroups(const ItemGroupList &armor_groups)
{}
- virtual void set
Animations(v2f frames, float frame_speed, float frame_blend
)
+ virtual void set
PhysicsOverride(float physics_override_speed, float physics_override_jump, float physics_override_gravity
)
{}
{}
- virtual void setBonePosRot(std::string bone, v3f position, v3f rotation)
+ virtual void setAnimation(v2f frames, float frame_speed, float frame_blend)
+ {}
+ virtual void setBonePosition(std::string bone, v3f position, v3f rotation)
{}
virtual void setAttachment(int parent_id, std::string bone, v3f position, v3f rotation)
{}
{}
virtual void setAttachment(int parent_id, std::string bone, v3f position, v3f rotation)
{}
@@
-235,7
+237,7
@@
protected:
private:
// Used for creating objects based on type
private:
// Used for creating objects based on type
- static
core
::map<u16, Factory> m_types;
+ static
std
::map<u16, Factory> m_types;
};
#endif
};
#endif