]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/player.cpp
Areastore: fix "attempt to index a number value"
[dragonfireclient.git] / src / player.cpp
index c0dad697daa2bb35a6ee011fc8fd8f9505e05d83..3ee34d41f0b594124df8e2dc337878f0a2f17c57 100644 (file)
 /*
-Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 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 General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-/*
-(c) 2010 Perttu Ahola <celeron55@gmail.com>
-*/
-
 #include "player.h"
-#include "map.h"
-#include "connection.h"
+
+#include <fstream>
+#include "threading/mutex_auto_lock.h"
+#include "util/numeric.h"
+#include "hud.h"
 #include "constants.h"
+#include "gamedef.h"
+#include "settings.h"
+#include "content_sao.h"
+#include "filesys.h"
+#include "log.h"
+#include "porting.h"  // strlcpy
+
 
-Player::Player():
+Player::Player(IGameDef *gamedef, const char *name):
        touching_ground(false),
-       in_water(false),
-       peer_id(PEER_ID_NEW),
+       in_liquid(false),
+       in_liquid_stable(false),
+       liquid_viscosity(0),
+       is_climbing(false),
+       swimming_vertical(false),
+       camera_barely_in_ceiling(false),
+       inventory(gamedef->idef()),
+       hp(PLAYER_MAX_HP),
+       hurt_tilt_timer(0),
+       hurt_tilt_strength(0),
+       protocol_version(0),
+       peer_id(PEER_ID_INEXISTENT),
+       keyPressed(0),
+// protected
+       m_gamedef(gamedef),
+       m_breath(PLAYER_MAX_BREATH),
+       m_pitch(0),
+       m_yaw(0),
        m_speed(0,0,0),
-       m_position(0,0,0)
+       m_position(0,0,0),
+       m_collisionbox(-BS*0.30,0.0,-BS*0.30,BS*0.30,BS*1.75,BS*0.30),
+       m_dirty(false)
 {
-       updateName("<not set>");
+       strlcpy(m_name, name, PLAYERNAME_SIZE);
+
+       inventory.clear();
        inventory.addList("main", PLAYER_INVENTORY_SIZE);
-       inventory.addList("craft", 9);
+       InventoryList *craft = inventory.addList("craft", 9);
+       craft->setWidth(3);
+       inventory.addList("craftpreview", 1);
        inventory.addList("craftresult", 1);
+       inventory.setModified(false);
+
+       // Can be redefined via Lua
+       inventory_formspec = "size[8,7.5]"
+               //"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
+       movement_acceleration_default   = 3    * BS;
+       movement_acceleration_air       = 2    * BS;
+       movement_acceleration_fast      = 10   * BS;
+       movement_speed_walk             = 4    * BS;
+       movement_speed_crouch           = 1.35 * BS;
+       movement_speed_fast             = 20   * BS;
+       movement_speed_climb            = 2    * BS;
+       movement_speed_jump             = 6.5  * BS;
+       movement_liquid_fluidity        = 1    * BS;
+       movement_liquid_fluidity_smooth = 0.5  * BS;
+       movement_liquid_sink            = 10   * BS;
+       movement_gravity                = 9.81 * BS;
+       local_animation_speed           = 0.0;
+
+       // Movement overrides are multipliers and must be 1 by default
+       physics_override_speed        = 1;
+       physics_override_jump         = 1;
+       physics_override_gravity      = 1;
+       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_FLAG_MINIMAP_VISIBLE;
+
+       hud_hotbar_itemcount = HUD_HOTBAR_ITEMCOUNT_DEFAULT;
 }
 
 Player::~Player()
 {
+       clearHud();
 }
 
-// Y direction is ignored
-void Player::accelerate(v3f target_speed, f32 max_increase)
+// Horizontal acceleration (X and Z), Y direction is ignored
+void Player::accelerateHorizontal(v3f target_speed, f32 max_increase)
 {
-       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;
+       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;
+
 }
 
-/*
-       RemotePlayer
-*/
+// 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;
 
-#ifndef SERVER
+       m_speed.Y += d_wanted;
 
-RemotePlayer::RemotePlayer(
-               scene::ISceneNode* parent,
-               IrrlichtDevice *device,
-               s32 id):
-       scene::ISceneNode(parent, (device==NULL)?NULL:device->getSceneManager(), id),
-       m_text(NULL)
+}
+
+v3s16 Player::getLightPosition() const
 {
-       m_box = core::aabbox3d<f32>(-BS/2,0,-BS/2,BS/2,BS*2,BS/2);
-
-       if(parent != NULL && device != NULL)
-       {
-               // ISceneNode stores a member called SceneManager
-               scene::ISceneManager* mgr = SceneManager;
-               video::IVideoDriver* driver = mgr->getVideoDriver();
-               gui::IGUIEnvironment* gui = device->getGUIEnvironment();
-
-               // Add a text node for showing the name
-               wchar_t wname[1] = {0};
-               m_text = mgr->addTextSceneNode(gui->getBuiltInFont(),
-                               wname, video::SColor(255,255,255,255), this);
-               m_text->setPosition(v3f(0, (f32)BS*2.1, 0));
-
-               // Attach a simple mesh to the player for showing an image
-               scene::SMesh *mesh = new scene::SMesh();
-               { // Front
-               scene::IMeshBuffer *buf = new scene::SMeshBuffer();
-               video::SColor c(255,255,255,255);
-               video::S3DVertex vertices[4] =
-               {
-                       video::S3DVertex(-BS/2,0,0, 0,0,0, c, 0,1),
-                       video::S3DVertex(BS/2,0,0, 0,0,0, c, 1,1),
-                       video::S3DVertex(BS/2,BS*2,0, 0,0,0, c, 1,0),
-                       video::S3DVertex(-BS/2,BS*2,0, 0,0,0, c, 0,0),
-               };
-               u16 indices[] = {0,1,2,2,3,0};
-               buf->append(vertices, 4, indices, 6);
-               // Set material
-               buf->getMaterial().setFlag(video::EMF_LIGHTING, false);
-               //buf->getMaterial().setFlag(video::EMF_BACK_FACE_CULLING, false);
-               buf->getMaterial().setTexture(0, driver->getTexture(porting::getDataPath("player.png").c_str()));
-               buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false);
-               buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true);
-               //buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
-               buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
-               // Add to mesh
-               mesh->addMeshBuffer(buf);
-               buf->drop();
-               }
-               { // Back
-               scene::IMeshBuffer *buf = new scene::SMeshBuffer();
-               video::SColor c(255,255,255,255);
-               video::S3DVertex vertices[4] =
-               {
-                       video::S3DVertex(BS/2,0,0, 0,0,0, c, 1,1),
-                       video::S3DVertex(-BS/2,0,0, 0,0,0, c, 0,1),
-                       video::S3DVertex(-BS/2,BS*2,0, 0,0,0, c, 0,0),
-                       video::S3DVertex(BS/2,BS*2,0, 0,0,0, c, 1,0),
-               };
-               u16 indices[] = {0,1,2,2,3,0};
-               buf->append(vertices, 4, indices, 6);
-               // Set material
-               buf->getMaterial().setFlag(video::EMF_LIGHTING, false);
-               //buf->getMaterial().setFlag(video::EMF_BACK_FACE_CULLING, false);
-               buf->getMaterial().setTexture(0, driver->getTexture(porting::getDataPath("player_back.png").c_str()));
-               buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false);
-               buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true);
-               buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
-               // Add to mesh
-               mesh->addMeshBuffer(buf);
-               buf->drop();
-               }
-               m_node = mgr->addMeshSceneNode(mesh, this);
-               mesh->drop();
-               m_node->setPosition(v3f(0,0,0));
-       }
+       return floatToInt(m_position + v3f(0,BS+BS/2,0), BS);
 }
 
-RemotePlayer::~RemotePlayer()
+void Player::serialize(std::ostream &os)
 {
-       if(SceneManager != NULL)
-               ISceneNode::remove();
+       // Utilize a Settings object for storing values
+       Settings args;
+       args.setS32("version", 1);
+       args.set("name", m_name);
+       //args.set("password", m_password);
+       args.setFloat("pitch", m_pitch);
+       args.setFloat("yaw", m_yaw);
+       args.setV3F("position", m_position);
+       args.setS32("hp", hp);
+       args.setS32("breath", m_breath);
+
+       args.writeLines(os);
+
+       os<<"PlayerArgsEnd\n";
+
+       inventory.serialize(os);
 }
 
-void RemotePlayer::updateName(const char *name)
+void Player::deSerialize(std::istream &is, std::string playername)
 {
-       Player::updateName(name);
-       if(m_text != NULL)
-       {
-               wchar_t wname[PLAYERNAME_SIZE];
-               mbstowcs(wname, m_name, strlen(m_name)+1);
-               m_text->setText(wname);
+       Settings args;
+
+       if (!args.parseConfigLines(is, "PlayerArgsEnd")) {
+               throw SerializationError("PlayerArgsEnd of player " +
+                               playername + " not found!");
+       }
+
+       m_dirty = true;
+       //args.getS32("version"); // Version field value not used
+       std::string name = args.get("name");
+       strlcpy(m_name, name.c_str(), PLAYERNAME_SIZE);
+       setPitch(args.getFloat("pitch"));
+       setYaw(args.getFloat("yaw"));
+       setPosition(args.getV3F("position"));
+       try{
+               hp = args.getS32("hp");
+       }catch(SettingNotFoundException &e) {
+               hp = PLAYER_MAX_HP;
+       }
+       try{
+               m_breath = args.getS32("breath");
+       }catch(SettingNotFoundException &e) {
+               m_breath = PLAYER_MAX_BREATH;
+       }
+
+       inventory.deSerialize(is);
+
+       if(inventory.getList("craftpreview") == NULL) {
+               // Convert players without craftpreview
+               inventory.addList("craftpreview", 1);
+
+               bool craftresult_is_preview = true;
+               if(args.exists("craftresult_is_preview"))
+                       craftresult_is_preview = args.getBool("craftresult_is_preview");
+               if(craftresult_is_preview)
+               {
+                       // Clear craftresult
+                       inventory.getList("craftresult")->changeItem(0, ItemStack());
+               }
        }
 }
 
-void RemotePlayer::move(f32 dtime, Map &map)
+u32 Player::addHud(HudElement *toadd)
 {
-       m_pos_animation_time_counter += dtime;
-       m_pos_animation_counter += dtime;
-       v3f movevector = m_position - m_oldpos;
-       f32 moveratio;
-       if(m_pos_animation_time < 0.001)
-               moveratio = 1.0;
-       else
-               moveratio = m_pos_animation_counter / m_pos_animation_time;
-       if(moveratio > 1.5)
-               moveratio = 1.5;
-       m_showpos = m_oldpos + movevector * moveratio;
-       
-       ISceneNode::setPosition(m_showpos);
-}
+       MutexAutoLock lock(m_mutex);
 
-#endif
+       u32 id = getFreeHudID();
 
-#ifndef SERVER
-/*
-       LocalPlayer
-*/
+       if (id < hud.size())
+               hud[id] = toadd;
+       else
+               hud.push_back(toadd);
 
-LocalPlayer::LocalPlayer()
-{
+       return id;
 }
 
-LocalPlayer::~LocalPlayer()
+HudElement* Player::getHud(u32 id)
 {
+       MutexAutoLock lock(m_mutex);
+
+       if (id < hud.size())
+               return hud[id];
+
+       return NULL;
 }
 
-void LocalPlayer::move(f32 dtime, Map &map)
+HudElement* Player::removeHud(u32 id)
 {
-       v3f position = getPosition();
-       v3f oldpos = position;
-       v3s16 oldpos_i = floatToInt(oldpos);
+       MutexAutoLock lock(m_mutex);
 
-       /*std::cout<<"oldpos_i=("<<oldpos_i.X<<","<<oldpos_i.Y<<","
-                       <<oldpos_i.Z<<")"<<std::endl;*/
+       HudElement* retval = NULL;
+       if (id < hud.size()) {
+               retval = hud[id];
+               hud[id] = NULL;
+       }
+       return retval;
+}
 
-       position += m_speed * dtime;
+void Player::clearHud()
+{
+       MutexAutoLock lock(m_mutex);
 
-       // Skip collision detection if player is non-local
-       if(isLocal() == false)
-       {
-               setPosition(position);
-               return;
+       while(!hud.empty()) {
+               delete hud.back();
+               hud.pop_back();
        }
+}
 
-       /*
-               Collision detection
-       */
 
-       v3s16 pos_i = floatToInt(position);
-       
+void RemotePlayer::save(std::string savedir)
+{
        /*
-               Check if player is in water
-       */
-       try{
-               if(in_water)
-               {
-                       v3s16 pp = floatToInt(position + v3f(0,0,0));
-                       in_water = content_liquid(map.getNode(pp).d);
+        * We have to open all possible player files in the players directory
+        * and check their player names because some file systems are not
+        * case-sensitive and player names are case-sensitive.
+        */
+
+       // A player to deserialize files into to check their names
+       RemotePlayer testplayer(m_gamedef, "");
+
+       savedir += DIR_DELIM;
+       std::string path = savedir + m_name;
+       for (u32 i = 0; i < PLAYER_FILE_ALTERNATE_TRIES; i++) {
+               if (!fs::PathExists(path)) {
+                       // Open file and serialize
+                       std::ostringstream ss(std::ios_base::binary);
+                       serialize(ss);
+                       if (!fs::safeWriteToFile(path, ss.str())) {
+                               infostream << "Failed to write " << path << std::endl;
+                       }
+                       setModified(false);
+                       return;
                }
-               else
-               {
-                       v3s16 pp = floatToInt(position + v3f(0,BS/2,0));
-                       in_water = content_liquid(map.getNode(pp).d);
+               // Open file and deserialize
+               std::ifstream is(path.c_str(), std::ios_base::binary);
+               if (!is.good()) {
+                       infostream << "Failed to open " << path << std::endl;
+                       return;
                }
-       }
-       catch(InvalidPositionException &e)
-       {
-               in_water = false;
-       }
-
-       // The frame length is limited to the player going 0.1*BS per call
-       f32 d = (float)BS * 0.15;
-
-#define PLAYER_RADIUS (BS*0.3)
-#define PLAYER_HEIGHT (BS*1.7)
-
-       core::aabbox3d<f32> playerbox(
-               position.X - PLAYER_RADIUS,
-               position.Y - 0.0,
-               position.Z - PLAYER_RADIUS,
-               position.X + PLAYER_RADIUS,
-               position.Y + PLAYER_HEIGHT,
-               position.Z + PLAYER_RADIUS
-       );
-       core::aabbox3d<f32> playerbox_old(
-               oldpos.X - PLAYER_RADIUS,
-               oldpos.Y - 0.0,
-               oldpos.Z - PLAYER_RADIUS,
-               oldpos.X + PLAYER_RADIUS,
-               oldpos.Y + PLAYER_HEIGHT,
-               oldpos.Z + PLAYER_RADIUS
-       );
-
-       //hilightboxes.push_back(playerbox);
-
-       touching_ground = false;
-       
-       /*std::cout<<"Checking collisions for ("
-                       <<oldpos_i.X<<","<<oldpos_i.Y<<","<<oldpos_i.Z
-                       <<") -> ("
-                       <<pos_i.X<<","<<pos_i.Y<<","<<pos_i.Z
-                       <<"):"<<std::endl;*/
-
-       for(s16 y = oldpos_i.Y - 1; y <= oldpos_i.Y + 2; y++){
-               for(s16 z = oldpos_i.Z - 1; z <= oldpos_i.Z + 1; z++){
-                       for(s16 x = oldpos_i.X - 1; x <= oldpos_i.X + 1; x++){
-                               try{
-                                       if(content_walkable(map.getNode(v3s16(x,y,z)).d) == false){
-                                               continue;
-                                       }
-                               }
-                               catch(InvalidPositionException &e)
-                               {
-                                       // Doing nothing here will block the player from
-                                       // walking over map borders
-                               }
-
-                               core::aabbox3d<f32> nodebox = Map::getNodeBox(
-                                               v3s16(x,y,z));
-                               
-                               // See if the player is touching ground
-                               if(
-                                               fabs(nodebox.MaxEdge.Y-playerbox.MinEdge.Y) < d
-                                               && nodebox.MaxEdge.X-d > playerbox.MinEdge.X
-                                               && nodebox.MinEdge.X+d < playerbox.MaxEdge.X
-                                               && nodebox.MaxEdge.Z-d > playerbox.MinEdge.Z
-                                               && nodebox.MinEdge.Z+d < playerbox.MaxEdge.Z
-                               ){
-                                       touching_ground = true;
-                               }
-                               
-                               if(playerbox.intersectsWithBox(nodebox))
-                               {
-                               
-       v3f dirs[3] = {
-               v3f(0,0,1), // back
-               v3f(0,1,0), // top
-               v3f(1,0,0), // right
-       };
-       for(u16 i=0; i<3; i++)
-       {
-               f32 nodemax = nodebox.MaxEdge.dotProduct(dirs[i]);
-               f32 nodemin = nodebox.MinEdge.dotProduct(dirs[i]);
-               f32 playermax = playerbox.MaxEdge.dotProduct(dirs[i]);
-               f32 playermin = playerbox.MinEdge.dotProduct(dirs[i]);
-               f32 playermax_old = playerbox_old.MaxEdge.dotProduct(dirs[i]);
-               f32 playermin_old = playerbox_old.MinEdge.dotProduct(dirs[i]);
-
-               bool main_edge_collides = 
-                       ((nodemax > playermin && nodemax <= playermin_old + d
-                               && m_speed.dotProduct(dirs[i]) < 0)
-                       ||
-                       (nodemin < playermax && nodemin >= playermax_old - d
-                               && m_speed.dotProduct(dirs[i]) > 0));
-
-               bool other_edges_collide = true;
-               for(u16 j=0; j<3; j++)
-               {
-                       if(j == i)
-                               continue;
-                       f32 nodemax = nodebox.MaxEdge.dotProduct(dirs[j]);
-                       f32 nodemin = nodebox.MinEdge.dotProduct(dirs[j]);
-                       f32 playermax = playerbox.MaxEdge.dotProduct(dirs[j]);
-                       f32 playermin = playerbox.MinEdge.dotProduct(dirs[j]);
-                       if(!(nodemax - d > playermin && nodemin + d < playermax))
-                       {
-                               other_edges_collide = false;
-                               break;
+               testplayer.deSerialize(is, path);
+               is.close();
+               if (strcmp(testplayer.getName(), m_name) == 0) {
+                       // Open file and serialize
+                       std::ostringstream ss(std::ios_base::binary);
+                       serialize(ss);
+                       if (!fs::safeWriteToFile(path, ss.str())) {
+                               infostream << "Failed to write " << path << std::endl;
                        }
+                       setModified(false);
+                       return;
                }
-               
-               if(main_edge_collides && other_edges_collide)
-               {
-                       m_speed -= m_speed.dotProduct(dirs[i]) * dirs[i];
-                       position -= position.dotProduct(dirs[i]) * dirs[i];
-                       position += oldpos.dotProduct(dirs[i]) * dirs[i];
-               }
-       
+               path = savedir + m_name + itos(i);
        }
-                               } // if(playerbox.intersectsWithBox(nodebox))
-                       } // for x
-               } // for z
-       } // for y
 
-       setPosition(position);
+       infostream << "Didn't find free file for player " << m_name << std::endl;
+       return;
 }
 
-void LocalPlayer::applyControl(float dtime)
+/*
+       RemotePlayer
+*/
+void RemotePlayer::setPosition(const v3f &position)
 {
-       // Random constants
-#define WALK_ACCELERATION (4.0 * BS)
-#define WALKSPEED_MAX (4.0 * BS)
-       f32 walk_acceleration = WALK_ACCELERATION;
-       f32 walkspeed_max = WALKSPEED_MAX;
-       
-       setPitch(control.pitch);
-       setYaw(control.yaw);
-       
-       v3f move_direction = v3f(0,0,1);
-       move_direction.rotateXZBy(getYaw());
-       
-       v3f speed = v3f(0,0,0);
-
-       // Superspeed mode
-       bool superspeed = false;
-       if(control.superspeed)
-       {
-               speed += move_direction;
-               superspeed = true;
-       }
-
-       if(control.up)
-       {
-               speed += move_direction;
-       }
-       if(control.down)
-       {
-               speed -= move_direction;
-       }
-       if(control.left)
-       {
-               speed += move_direction.crossProduct(v3f(0,1,0));
-       }
-       if(control.right)
-       {
-               speed += move_direction.crossProduct(v3f(0,-1,0));
-       }
-       if(control.jump)
-       {
-               if(touching_ground)
-               {
-                       v3f speed = getSpeed();
-                       speed.Y = 6.5*BS;
-                       setSpeed(speed);
-               }
-               else if(in_water)
-               {
-                       v3f speed = getSpeed();
-                       speed.Y = 2.0*BS;
-                       setSpeed(speed);
-               }
-       }
-
-       // The speed of the player (Y is ignored)
-       if(superspeed)
-               speed = speed.normalize() * walkspeed_max * 5;
-       else
-               speed = speed.normalize() * walkspeed_max;
-       
-       f32 inc = walk_acceleration * BS * dtime;
-       
-       // Accelerate to target speed with maximum increment
-       accelerate(speed, inc);
+       Player::setPosition(position);
+       if(m_sao)
+               m_sao->setBasePosition(position);
 }
-#endif