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 9640e5f0883d4a40bb708ebc86f7593acea62fcc..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; }
@@
-124,30
+124,30
@@
private:
class LagPool
{
class LagPool
{
- float pool;
- float max;
+ float
m_
pool;
+ float m
_m
ax;
public:
public:
- LagPool():
pool(15),
max(15)
+ LagPool():
m_pool(15), m_
max(15)
{}
void setMax(float new_max)
{
{}
void setMax(float new_max)
{
- max = new_max;
- if(pool > new_max)
- pool = new_max;
+ m
_m
ax = new_max;
+ if(
m_
pool > new_max)
+
m_
pool = new_max;
}
void add(float dtime)
{
}
void add(float dtime)
{
- pool -= dtime;
- if(pool < 0)
- pool = 0;
+
m_
pool -= dtime;
+ if(
m_
pool < 0)
+
m_
pool = 0;
}
bool grab(float dtime)
{
if(dtime <= 0)
return true;
}
bool grab(float dtime)
{
if(dtime <= 0)
return true;
- if(
pool + dtime >
max)
+ if(
m_pool + dtime > m_
max)
return false;
return false;
- pool += dtime;
+
m_
pool += dtime;
return true;
}
};
return true;
}
};
@@
-193,6
+193,7
@@
public:
void rightClick(ServerActiveObject *clicker);
s16 getHP() const;
void setHP(s16 hp);
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);
u16 getBreath() const;
void setBreath(u16 breath);
void setArmorGroups(const ItemGroupList &armor_groups);
@@
-262,7
+263,8
@@
public:
{
return m_dig_pool;
}
{
return m_dig_pool;
}
- void checkMovementCheat();
+ // Returns true if cheated
+ bool checkMovementCheat();
// Other
// Other
@@
-282,6
+284,7
@@
private:
Player *m_player;
u16 m_peer_id;
Inventory *m_inventory;
Player *m_player;
u16 m_peer_id;
Inventory *m_inventory;
+ s16 m_damage;
// Cheat prevention
LagPool m_dig_pool;
// Cheat prevention
LagPool m_dig_pool;
@@
-327,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;
};