Remove spurious assignment

[dragonfireclient.git] / src / content_cao.h

diff --git a/src/content_cao.h b/src/content_cao.h
index 146e23b0c985f0db3bd7f5fa0071866bbd88e543..319f90380f6d4a3afa4fe741386507a189215b10 100644 (file)
--- a/src/content_cao.h
+++ b/src/content_cao.h
@@ -187,7 +187,8 @@ class RatCAO : public ClientActiveObject
        core::aabbox3d<f32>* getSelectionBox()
                {return &m_selection_box;}
        v3f getPosition()
-               {return m_position;}
+               {return pos_translator.vect_show;}
+               //{return m_position;}
 
 private:
        core::aabbox3d<f32> m_selection_box;
@@ -243,6 +244,48 @@ class Oerkki1CAO : public ClientActiveObject
        bool m_damage_texture_enabled;
 };
 
+/*
+       FireflyCAO
+*/
+
+class FireflyCAO : public ClientActiveObject
+{
+public:
+       FireflyCAO();
+       virtual ~FireflyCAO();
+       
+       u8 getType() const
+       {
+               return ACTIVEOBJECT_TYPE_FIREFLY;
+       }
+       
+       static ClientActiveObject* create();
+
+       void addToScene(scene::ISceneManager *smgr);
+       void removeFromScene();
+       void updateLight(u8 light_at_pos);
+       v3s16 getLightPosition();
+       void updateNodePos();
+
+       void step(float dtime, ClientEnvironment *env);
+
+       void processMessage(const std::string &data);
+
+       void initialize(const std::string &data);
+       
+       core::aabbox3d<f32>* getSelectionBox()
+               {return &m_selection_box;}
+       v3f getPosition()
+               {return m_position;}
+
+private:
+       core::aabbox3d<f32> m_selection_box;
+       scene::IMeshSceneNode *m_node;
+       v3f m_position;
+       float m_yaw;
+       SmoothTranslator pos_translator;
+};
+
 
 #endif