Prevent world creation if the world already exists

[dragonfireclient.git] / src / content_cao.cpp

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 83a2bcfd15ac1ba124812ad2235c3a41b7f992ab..aa5c2d674039ab054fbbe3f71dd5292c27de0c5e 100644 (file)
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -3,16 +3,16 @@ Minetest-c55
 Copyright (C) 2010-2011 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.
 */
@@ -30,13 +30,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "clientobject.h"
 #include "content_object.h"
 #include "mesh.h"
-#include "utility.h" // For IntervalLimiter
 #include "itemdef.h"
 #include "tool.h"
 #include "content_cso.h"
 #include "sound.h"
 #include "nodedef.h"
 #include "localplayer.h"
+#include "util/numeric.h" // For IntervalLimiter
+#include "util/serialize.h"
+#include "util/mathconstants.h"
+#include "map.h"
+
 class Settings;
 struct ToolCapabilities;
 
@@ -879,22 +883,24 @@ class GenericCAO : public ClientActiveObject
                        box.MinEdge *= BS;
                        box.MaxEdge *= BS;
                        collisionMoveResult moveresult;
-                       f32 pos_max_d = BS*0.25; // Distance per iteration
+                       f32 pos_max_d = BS*0.125; // Distance per iteration
+                       f32 stepheight = 0;
                        v3f p_pos = m_position;
                        v3f p_velocity = m_velocity;
+                       v3f p_acceleration = m_acceleration;
                        IGameDef *gamedef = env->getGameDef();
-                       moveresult = collisionMovePrecise(&env->getMap(), gamedef,
-                                       pos_max_d, box, dtime, p_pos, p_velocity);
+                       moveresult = collisionMoveSimple(&env->getMap(), gamedef,
+                                       pos_max_d, box, stepheight, dtime,
+                                       p_pos, p_velocity, p_acceleration);
                        // Apply results
                        m_position = p_pos;
                        m_velocity = p_velocity;
+                       m_acceleration = p_acceleration;
                        
                        bool is_end_position = moveresult.collides;
                        pos_translator.update(m_position, is_end_position, dtime);
                        pos_translator.translate(dtime);
                        updateNodePos();
-
-                       m_velocity += dtime * m_acceleration;
                } else {
                        m_position += dtime * m_velocity + 0.5 * dtime * dtime * m_acceleration;
                        m_velocity += dtime * m_acceleration;
@@ -934,8 +940,8 @@ class GenericCAO : public ClientActiveObject
                                updateTextures("");
                        }
                }
-               if(fabs(m_prop.automatic_rotate > 0.001)){
-                       m_yaw += dtime * m_prop.automatic_rotate * 180 / PI;
+               if(fabs(m_prop.automatic_rotate) > 0.001){
+                       m_yaw += dtime * m_prop.automatic_rotate * 180 / M_PI;
                        updateNodePos();
                }
        }
@@ -961,7 +967,7 @@ class GenericCAO : public ClientActiveObject
                                else if(cam_to_entity.Y < -0.75)
                                        col += 4;
                                else{
-                                       float mob_dir = atan2(cam_to_entity.Z, cam_to_entity.X) / PI * 180.;
+                                       float mob_dir = atan2(cam_to_entity.Z, cam_to_entity.X) / M_PI * 180.;
                                        float dir = mob_dir - m_yaw;
                                        dir = wrapDegrees_180(dir);
                                        //infostream<<"id="<<m_id<<" dir="<<dir<<std::endl;
@@ -1086,7 +1092,7 @@ class GenericCAO : public ClientActiveObject
                        m_position = readV3F1000(is);
                        m_velocity = readV3F1000(is);
                        m_acceleration = readV3F1000(is);
-                       if(fabs(m_prop.automatic_rotate < 0.001))
+                       if(fabs(m_prop.automatic_rotate) < 0.001)
                                m_yaw = readF1000(is);
                        bool do_interpolate = readU8(is);
                        bool is_end_position = readU8(is);