Add cancel button to password change menu. (#5720)

[oweals/minetest.git] / src / content_sao.cpp

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 69f80d35619cfb9068430247a877ed417c944e72..f435fe938296eae06bf5bff6589bde81d28aa389 100644 (file)
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "nodedef.h"
 #include "remoteplayer.h"
 #include "server.h"
-#include "serverscripting.h"
+#include "scripting_server.h"
 #include "genericobject.h"
 
 std::map<u16, ServerActiveObject::Factory> ServerActiveObject::m_types;
@@ -764,9 +764,10 @@ bool LuaEntitySAO::collideWithObjects() const
 
 // No prototype, PlayerSAO does not need to be deserialized
 
-PlayerSAO::PlayerSAO(ServerEnvironment *env_, u16 peer_id_, bool is_singleplayer):
+PlayerSAO::PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, u16 peer_id_,
+               bool is_singleplayer):
        UnitSAO(env_, v3f(0,0,0)),
-       m_player(NULL),
+       m_player(player_),
        m_peer_id(peer_id_),
        m_inventory(NULL),
        m_damage(0),
@@ -788,7 +789,8 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, u16 peer_id_, bool is_singleplayer
        m_physics_override_jump(1),
        m_physics_override_gravity(1),
        m_physics_override_sneak(true),
-       m_physics_override_sneak_glitch(true),
+       m_physics_override_sneak_glitch(false),
+       m_physics_override_new_move(true),
        m_physics_override_sent(false)
 {
        assert(m_peer_id != 0); // pre-condition
@@ -796,7 +798,7 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, u16 peer_id_, bool is_singleplayer
        m_prop.hp_max = PLAYER_MAX_HP;
        m_prop.physical = false;
        m_prop.weight = 75;
-       m_prop.collisionbox = aabb3f(-1/3.,-1.0,-1/3., 1/3.,1.0,1/3.);
+       m_prop.collisionbox = aabb3f(-0.3f, -1.0f, -0.3f, 0.3f, 0.75f, 0.3f);
        // start of default appearance, this should be overwritten by LUA
        m_prop.visual = "upright_sprite";
        m_prop.visual_size = v2f(1, 2);
@@ -818,7 +820,7 @@ PlayerSAO::~PlayerSAO()
                delete m_inventory;
 }
 
-void PlayerSAO::initialize(RemotePlayer *player, const std::set<std::string> &privs)
+void PlayerSAO::finalize(RemotePlayer *player, const std::set<std::string> &privs)
 {
        assert(player);
        m_player = player;
@@ -886,7 +888,7 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version)
                m_attachment_bone, m_attachment_position, m_attachment_rotation)); // 4
        msg_os << serializeLongString(gob_cmd_update_physics_override(m_physics_override_speed,
                        m_physics_override_jump, m_physics_override_gravity, m_physics_override_sneak,
-                       m_physics_override_sneak_glitch)); // 5
+                       m_physics_override_sneak_glitch, m_physics_override_new_move)); // 5
        // (GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES) : Deprecated, for backwards compatibility only.
        msg_os << serializeLongString(gob_cmd_update_nametag_attributes(m_prop.nametag_color)); // 6
        int message_count = 6 + m_bone_position.size();
@@ -919,8 +921,8 @@ void PlayerSAO::step(float dtime, bool send_recommended)
                MapNode n = m_env->getMap().getNodeNoEx(p);
                const ContentFeatures &c = m_env->getGameDef()->ndef()->get(n);
                // If node generates drown
-               if (c.drowning > 0) {
-                       if (m_hp > 0 && m_breath > 0)
+               if (c.drowning > 0 && m_hp > 0) {
+                       if (m_breath > 0)
                                setBreath(m_breath - 1);
 
                        // No more breath, damage player
@@ -941,6 +943,30 @@ void PlayerSAO::step(float dtime, bool send_recommended)
                        setBreath(m_breath + 1);
        }
 
+       if (m_node_hurt_interval.step(dtime, 1.0)) {
+               // Feet, middle and head
+               v3s16 p1 = floatToInt(m_base_position + v3f(0, BS*0.1, 0), BS);
+               MapNode n1 = m_env->getMap().getNodeNoEx(p1);
+               v3s16 p2 = floatToInt(m_base_position + v3f(0, BS*0.8, 0), BS);
+               MapNode n2 = m_env->getMap().getNodeNoEx(p2);
+               v3s16 p3 = floatToInt(m_base_position + v3f(0, BS*1.6, 0), BS);
+               MapNode n3 = m_env->getMap().getNodeNoEx(p3);
+
+               u32 damage_per_second = 0;
+               damage_per_second = MYMAX(damage_per_second,
+                       m_env->getGameDef()->ndef()->get(n1).damage_per_second);
+               damage_per_second = MYMAX(damage_per_second,
+                       m_env->getGameDef()->ndef()->get(n2).damage_per_second);
+               damage_per_second = MYMAX(damage_per_second,
+                       m_env->getGameDef()->ndef()->get(n3).damage_per_second);
+
+               if (damage_per_second != 0 && m_hp > 0) {
+                       s16 newhp = ((s32) damage_per_second > m_hp ? 0 : m_hp - damage_per_second);
+                       setHP(newhp);
+                       m_env->getGameDef()->SendPlayerHPOrDie(this);
+               }
+       }
+
        if (!m_properties_sent) {
                m_properties_sent = true;
                std::string str = getPropertyPacket();
@@ -1025,7 +1051,8 @@ void PlayerSAO::step(float dtime, bool send_recommended)
                m_physics_override_sent = true;
                std::string str = gob_cmd_update_physics_override(m_physics_override_speed,
                                m_physics_override_jump, m_physics_override_gravity,
-                               m_physics_override_sneak, m_physics_override_sneak_glitch);
+                               m_physics_override_sneak, m_physics_override_sneak_glitch,
+                               m_physics_override_new_move);
                // create message and add to list
                ActiveObjectMessage aom(getId(), true, str);
                m_messages_out.push(aom);
@@ -1271,6 +1298,16 @@ std::string PlayerSAO::getWieldList() const
 }
 
 ItemStack PlayerSAO::getWieldedItem() const
+{
+       const Inventory *inv = getInventory();
+       ItemStack ret;
+       const InventoryList *mlist = inv->getList(getWieldList());
+       if (mlist && getWieldIndex() < (s32)mlist->getSize())
+               ret = mlist->getItem(getWieldIndex());
+       return ret;
+}
+
+ItemStack PlayerSAO::getWieldedItemOrHand() const
 {
        const Inventory *inv = getInventory();
        ItemStack ret;
@@ -1291,14 +1328,6 @@ bool PlayerSAO::setWieldedItem(const ItemStack &item)
        if (inv) {
                InventoryList *mlist = inv->getList(getWieldList());
                if (mlist) {
-                       ItemStack olditem = mlist->getItem(getWieldIndex());
-                       if (olditem.name.empty()) {
-                               InventoryList *hlist = inv->getList("hand");
-                               if (hlist) {
-                                       hlist->changeItem(0, item);
-                                       return true;
-                               }
-                       }
                        mlist->changeItem(getWieldIndex(), item);
                        return true;
                }
@@ -1399,7 +1428,8 @@ bool PlayerSAO::checkMovementCheat()
 
 bool PlayerSAO::getCollisionBox(aabb3f *toset) const
 {
-       *toset = aabb3f(-BS * 0.30, 0.0, -BS * 0.30, BS * 0.30, BS * 1.75, BS * 0.30);
+       *toset = aabb3f(-0.3f * BS, 0.0f, -0.3f * BS, 0.3f * BS, 1.75f * BS, 0.3f * BS);
+
        toset->MinEdge += m_base_position;
        toset->MaxEdge += m_base_position;
        return true;