Move hex.h to util/

[dragonfireclient.git] / src / content_cao.cpp

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 6d41b27490879ba7cb7f5284d736ff4a51f9675f..ddfa3b0320daf25525520543baff2cc001191718 100644 (file)
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -34,7 +34,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "serialization.h" // For decompressZlib
 #include "gamedef.h"
 #include "clientobject.h"
-#include "content_object.h"
 #include "mesh.h"
 #include "itemdef.h"
 #include "tool.h"
@@ -145,7 +144,7 @@ class TestCAO : public ClientActiveObject
        TestCAO(IGameDef *gamedef, ClientEnvironment *env);
        virtual ~TestCAO();
        
-       u8 getType() const
+       ActiveObjectType getType() const
        {
                return ACTIVEOBJECT_TYPE_TEST;
        }
@@ -289,7 +288,7 @@ class ItemCAO : public ClientActiveObject
        ItemCAO(IGameDef *gamedef, ClientEnvironment *env);
        virtual ~ItemCAO();
        
-       u8 getType() const
+       ActiveObjectType getType() const
        {
                return ACTIVEOBJECT_TYPE_ITEM;
        }
@@ -963,7 +962,7 @@ void GenericCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
                // Add a text node for showing the name
                gui::IGUIEnvironment* gui = irr->getGUIEnvironment();
                std::wstring wname = narrow_to_wide(m_name);
-               m_textnode = smgr->addTextSceneNode(gui->getBuiltInFont(),
+               m_textnode = smgr->addTextSceneNode(gui->getSkin()->getFont(),
                                wname.c_str(), video::SColor(255,255,255,255), node);
                m_textnode->grab();
                m_textnode->setPosition(v3f(0, BS*1.1, 0));