projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use pause_fps_max also on multiplayer
[oweals/minetest.git]
/
src
/
content_sao.h
diff --git
a/src/content_sao.h
b/src/content_sao.h
index 6b97cb1488ddd6ad92688af7d9cd3a672ea0c490..63e8ef4601f3234a3c0170d67acac704dfa74337 100644
(file)
--- a/
src/content_sao.h
+++ b/
src/content_sao.h
@@
-27,7
+27,7
@@
with this program; if not, write to the Free Software Foundation, Inc.,
#include "object_properties.h"
ServerActiveObject* createItemSAO(ServerEnvironment *env, v3f pos,
#include "object_properties.h"
ServerActiveObject* createItemSAO(ServerEnvironment *env, v3f pos,
-
const std::string
itemstring);
+
const std::string &
itemstring);
/*
LuaEntitySAO needs some internals exposed.
/*
LuaEntitySAO needs some internals exposed.
@@
-37,7
+37,7
@@
class LuaEntitySAO : public ServerActiveObject
{
public:
LuaEntitySAO(ServerEnvironment *env, v3f pos,
{
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
{ return ACTIVEOBJECT_TYPE_LUAENTITY; }
~LuaEntitySAO();
u8 getType() const
{ return ACTIVEOBJECT_TYPE_LUAENTITY; }
@@
-330,6
+330,8
@@
public:
float m_physics_override_speed;
float m_physics_override_jump;
float m_physics_override_gravity;
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;
};
bool m_physics_override_sent;
};