]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/player.cpp
projects / dragonfireclient.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Document zoom_fov in settingtypes.txt and minetest.conf.example
[dragonfireclient.git] / src / player.cpp
diff --git a/src/player.cpp b/src/player.cpp
index 4a5e5ad91ed21f7ee94b224ad8c748d25c118587..5949712a50c8673c01ad33dc666185e76bb30487 100644 (file)
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "player.h"
 
 #include <fstream>
-#include "jthread/jmutexautolock.h"
+#include "threading/mutex_auto_lock.h"
 #include "util/numeric.h"
 #include "hud.h"
 #include "constants.h"
@@ -33,6 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 
 Player::Player(IGameDef *gamedef, const char *name):
+       got_teleported(false),
        touching_ground(false),
        in_liquid(false),
        in_liquid_stable(false),
@@ -44,6 +45,7 @@ Player::Player(IGameDef *gamedef, const char *name):
        hp(PLAYER_MAX_HP),
        hurt_tilt_timer(0),
        hurt_tilt_strength(0),
+       protocol_version(0),
        peer_id(PEER_ID_INEXISTENT),
        keyPressed(0),
 // protected
@@ -71,9 +73,11 @@ Player::Player(IGameDef *gamedef, const char *name):
                //"image[1,0.6;1,2;player.png]"
                "list[current_player;main;0,3.5;8,4;]"
                "list[current_player;craft;3,0;3,3;]"
+               "listring[]"
                "list[current_player;craftpreview;7,1;1,1;]";
 
-       // Initialize movement settings at default values, so movement can work if the server fails to send them
+       // Initialize movement settings at default values, so movement can work
+       // if the server fails to send them
        movement_acceleration_default   = 3    * BS;
        movement_acceleration_air       = 2    * BS;
        movement_acceleration_fast      = 10   * BS;
@@ -95,9 +99,10 @@ Player::Player(IGameDef *gamedef, const char *name):
        physics_override_sneak        = true;
        physics_override_sneak_glitch = true;
 
-       hud_flags = HUD_FLAG_HOTBAR_VISIBLE | HUD_FLAG_HEALTHBAR_VISIBLE |
-                        HUD_FLAG_CROSSHAIR_VISIBLE | HUD_FLAG_WIELDITEM_VISIBLE |
-                        HUD_FLAG_BREATHBAR_VISIBLE;
+       hud_flags =
+               HUD_FLAG_HOTBAR_VISIBLE    | HUD_FLAG_HEALTHBAR_VISIBLE |
+               HUD_FLAG_CROSSHAIR_VISIBLE | HUD_FLAG_WIELDITEM_VISIBLE |
+               HUD_FLAG_BREATHBAR_VISIBLE | HUD_FLAG_MINIMAP_VISIBLE;
 
        hud_hotbar_itemcount = HUD_HOTBAR_ITEMCOUNT_DEFAULT;
 }
@@ -107,70 +112,6 @@ Player::~Player()
        clearHud();
 }
 
-// Horizontal acceleration (X and Z), Y direction is ignored
-void Player::accelerateHorizontal(v3f target_speed, f32 max_increase)
-{
-       if(max_increase == 0)
-               return;
-
-       v3f d_wanted = target_speed - m_speed;
-       d_wanted.Y = 0;
-       f32 dl = d_wanted.getLength();
-       if(dl > max_increase)
-               dl = max_increase;
-       
-       v3f d = d_wanted.normalize() * dl;
-
-       m_speed.X += d.X;
-       m_speed.Z += d.Z;
-
-#if 0 // old code
-       if(m_speed.X < target_speed.X - max_increase)
-               m_speed.X += max_increase;
-       else if(m_speed.X > target_speed.X + max_increase)
-               m_speed.X -= max_increase;
-       else if(m_speed.X < target_speed.X)
-               m_speed.X = target_speed.X;
-       else if(m_speed.X > target_speed.X)
-               m_speed.X = target_speed.X;
-
-       if(m_speed.Z < target_speed.Z - max_increase)
-               m_speed.Z += max_increase;
-       else if(m_speed.Z > target_speed.Z + max_increase)
-               m_speed.Z -= max_increase;
-       else if(m_speed.Z < target_speed.Z)
-               m_speed.Z = target_speed.Z;
-       else if(m_speed.Z > target_speed.Z)
-               m_speed.Z = target_speed.Z;
-#endif
-}
-
-// Vertical acceleration (Y), X and Z directions are ignored
-void Player::accelerateVertical(v3f target_speed, f32 max_increase)
-{
-       if(max_increase == 0)
-               return;
-
-       f32 d_wanted = target_speed.Y - m_speed.Y;
-       if(d_wanted > max_increase)
-               d_wanted = max_increase;
-       else if(d_wanted < -max_increase)
-               d_wanted = -max_increase;
-
-       m_speed.Y += d_wanted;
-
-#if 0 // old code
-       if(m_speed.Y < target_speed.Y - max_increase)
-               m_speed.Y += max_increase;
-       else if(m_speed.Y > target_speed.Y + max_increase)
-               m_speed.Y -= max_increase;
-       else if(m_speed.Y < target_speed.Y)
-               m_speed.Y = target_speed.Y;
-       else if(m_speed.Y > target_speed.Y)
-               m_speed.Y = target_speed.Y;
-#endif
-}
-
 v3s16 Player::getLightPosition() const
 {
        return floatToInt(m_position + v3f(0,BS+BS/2,0), BS);
@@ -242,7 +183,7 @@ void Player::deSerialize(std::istream &is, std::string playername)
 
 u32 Player::addHud(HudElement *toadd)
 {
-       JMutexAutoLock lock(m_mutex);
+       MutexAutoLock lock(m_mutex);
 
        u32 id = getFreeHudID();
 
@@ -256,7 +197,7 @@ u32 Player::addHud(HudElement *toadd)
 
 HudElement* Player::getHud(u32 id)
 {
-       JMutexAutoLock lock(m_mutex);
+       MutexAutoLock lock(m_mutex);
 
        if (id < hud.size())
                return hud[id];
@@ -266,7 +207,7 @@ HudElement* Player::getHud(u32 id)
 
 HudElement* Player::removeHud(u32 id)
 {
-       JMutexAutoLock lock(m_mutex);
+       MutexAutoLock lock(m_mutex);
 
        HudElement* retval = NULL;
        if (id < hud.size()) {
@@ -278,7 +219,7 @@ HudElement* Player::removeHud(u32 id)
 
 void Player::clearHud()
 {
-       JMutexAutoLock lock(m_mutex);
+       MutexAutoLock lock(m_mutex);
 
        while(!hud.empty()) {
                delete hud.back();
@@ -286,6 +227,23 @@ void Player::clearHud()
        }
 }
 
+RemotePlayer::RemotePlayer(IGameDef *gamedef, const char *name):
+       Player(gamedef, name),
+       m_sao(NULL)
+{
+       movement_acceleration_default   = g_settings->getFloat("movement_acceleration_default")   * BS;
+       movement_acceleration_air       = g_settings->getFloat("movement_acceleration_air")       * BS;
+       movement_acceleration_fast      = g_settings->getFloat("movement_acceleration_fast")      * BS;
+       movement_speed_walk             = g_settings->getFloat("movement_speed_walk")             * BS;
+       movement_speed_crouch           = g_settings->getFloat("movement_speed_crouch")           * BS;
+       movement_speed_fast             = g_settings->getFloat("movement_speed_fast")             * BS;
+       movement_speed_climb            = g_settings->getFloat("movement_speed_climb")            * BS;
+       movement_speed_jump             = g_settings->getFloat("movement_speed_jump")             * BS;
+       movement_liquid_fluidity        = g_settings->getFloat("movement_liquid_fluidity")        * BS;
+       movement_liquid_fluidity_smooth = g_settings->getFloat("movement_liquid_fluidity_smooth") * BS;
+       movement_liquid_sink            = g_settings->getFloat("movement_liquid_sink")            * BS;
+       movement_gravity                = g_settings->getFloat("movement_gravity")                * BS;
+}
 
 void RemotePlayer::save(std::string savedir)
 {
Dragonfireclient is an utility client for the Voxelengine minetest (http://minetest.net/). The client was created by Elias Fleckenstein and is inspired by the Minecraft clients Liquid Bounce and Impact. Discord: https://discord.gg/kab99uu for more information.