Remove no virtual dtor warnings, make MapgenParams contain actual NoiseParams

[minetest.git] / src / content_cao.cpp

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 5e5cb38ae7bbb3578e9f15ad55a9777d6708d707..f79d0d6f62c78d63467b4b75180d6687aae33809 100644 (file)
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -50,7 +50,7 @@ struct ToolCapabilities;
 
 #define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
 
-core::map<u16, ClientActiveObject::Factory> ClientActiveObject::m_types;
+std::map<u16, ClientActiveObject::Factory> ClientActiveObject::m_types;
 
 /*
        SmoothTranslator
@@ -174,6 +174,7 @@ class TestCAO : public ClientActiveObject
 
        void processMessage(const std::string &data);
 
+       bool getCollisionBox(aabb3f *toset) { return false; }
 private:
        scene::IMeshSceneNode *m_node;
        v3f m_position;
@@ -329,6 +330,7 @@ class ItemCAO : public ClientActiveObject
        std::string infoText()
                {return m_infotext;}
 
+       bool getCollisionBox(aabb3f *toset) { return false; }
 private:
        core::aabbox3d<f32> m_selection_box;
        scene::IMeshSceneNode *m_node;
@@ -643,6 +645,22 @@ class GenericCAO : public ClientActiveObject
                        ClientActiveObject::registerType(getType(), create);
        }
 
+       bool getCollisionBox(aabb3f *toset) {
+               if (m_prop.physical) {
+                       aabb3f retval;
+                       //update collision box
+                       toset->MinEdge = m_prop.collisionbox.MinEdge * BS;
+                       toset->MaxEdge = m_prop.collisionbox.MaxEdge * BS;
+
+                       toset->MinEdge += m_position;
+                       toset->MaxEdge += m_position;
+
+                       return true;
+               }
+
+               return false;
+       }
+
        void initialize(const std::string &data)
        {
                infostream<<"GenericCAO: Got init data"<<std::endl;
@@ -690,11 +708,15 @@ class GenericCAO : public ClientActiveObject
                        if(player && player->isLocal()){
                                m_is_local_player = true;
                        }
+                       m_env->addPlayerName(m_name.c_str());
                }
        }
 
        ~GenericCAO()
        {
+               if(m_is_player){
+                       m_env->removePlayerName(m_name.c_str());
+               }
        }
 
        static ClientActiveObject* create(IGameDef *gamedef, ClientEnvironment *env)
@@ -842,7 +864,7 @@ class GenericCAO : public ClientActiveObject
                        m_spritenode = smgr->addBillboardSceneNode(
                                        NULL, v2f(1, 1), v3f(0,0,0), -1);
                        m_spritenode->setMaterialTexture(0,
-                                       tsrc->getTextureRaw("unknown_block.png"));
+                                       tsrc->getTextureRaw("unknown_node.png"));
                        m_spritenode->setMaterialFlag(video::EMF_LIGHTING, false);
                        m_spritenode->setMaterialFlag(video::EMF_BILINEAR_FILTER, false);
                        m_spritenode->setMaterialType(video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF);
@@ -1111,6 +1133,7 @@ class GenericCAO : public ClientActiveObject
                        {
                                LocalPlayer *player = m_env->getLocalPlayer();
                                player->overridePosition = getParent()->getPosition();
+                               m_env->getLocalPlayer()->parent = getParent();
                        }
                }
                else
@@ -1127,10 +1150,9 @@ class GenericCAO : public ClientActiveObject
                                v3f p_pos = m_position;
                                v3f p_velocity = m_velocity;
                                v3f p_acceleration = m_acceleration;
-                               IGameDef *gamedef = env->getGameDef();
-                               moveresult = collisionMoveSimple(&env->getMap(), gamedef,
+                               moveresult = collisionMoveSimple(env,env->getGameDef(),
                                                pos_max_d, box, stepheight, dtime,
-                                               p_pos, p_velocity, p_acceleration);
+                                               p_pos, p_velocity, p_acceleration,this);
                                // Apply results
                                m_position = p_pos;
                                m_velocity = p_velocity;
@@ -1246,7 +1268,7 @@ class GenericCAO : public ClientActiveObject
                {
                        if(m_prop.visual == "sprite")
                        {
-                               std::string texturestring = "unknown_block.png";
+                               std::string texturestring = "unknown_node.png";
                                if(m_prop.textures.size() >= 1)
                                        texturestring = m_prop.textures[0];
                                texturestring += mod;
@@ -1312,7 +1334,7 @@ class GenericCAO : public ClientActiveObject
                        {
                                for (u32 i = 0; i < 6; ++i)
                                {
-                                       std::string texturestring = "unknown_block.png";
+                                       std::string texturestring = "unknown_node.png";
                                        if(m_prop.textures.size() > i)
                                                texturestring = m_prop.textures[i];
                                        texturestring += mod;
@@ -1661,6 +1683,19 @@ class GenericCAO : public ClientActiveObject
 
                        updateTexturePos();
                }
+               else if(cmd == GENERIC_CMD_SET_PHYSICS_OVERRIDE)
+               {
+                       float override_speed = readF1000(is);
+                       float override_jump = readF1000(is);
+                       float override_gravity = readF1000(is);
+                       if(m_is_local_player)
+                       {
+                               LocalPlayer *player = m_env->getLocalPlayer();
+                               player->physics_override_speed = override_speed;
+                               player->physics_override_jump = override_jump;
+                               player->physics_override_gravity = override_gravity;
+                       }
+               }
                else if(cmd == GENERIC_CMD_SET_ANIMATION)
                {
                        m_animation_range = readV2F1000(is);