Pre-select current game in world creation dialog

[dragonfireclient.git] / src / clientobject.h

diff --git a/src/clientobject.h b/src/clientobject.h
index e08b78c579dc05b9e852566bb0b730348440d8bd..8cbf3d60ba7880c9d79723cd3d1741d8c35002d1 100644 (file)
--- a/src/clientobject.h
+++ b/src/clientobject.h
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2011 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 Lesser General Public License as published by
@@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "irrlichttypes_extrabloated.h"
 #include "activeobject.h"
+#include <map>
 
 /*
 
@@ -49,7 +50,7 @@ class ClientActiveObject : public ActiveObject
 
        virtual void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
                        IrrlichtDevice *irr){}
-       virtual void removeFromScene(){}
+       virtual void removeFromScene(bool permanent){}
        // 0 <= light_at_pos <= LIGHT_SUN
        virtual void updateLight(u8 light_at_pos){}
        virtual v3s16 getLightPosition(){return v3s16(0,0,0);}
@@ -61,6 +62,7 @@ class ClientActiveObject : public ActiveObject
        virtual scene::IBillboardSceneNode *getSpriteSceneNode(){return NULL;}
        virtual bool isPlayer(){return false;}
        virtual bool isLocalPlayer(){return false;}
+       virtual void setAttachments(){}
        virtual bool doShowSelectionBox(){return true;}
        
        // Step object in time
@@ -95,7 +97,7 @@ class ClientActiveObject : public ActiveObject
        ClientEnvironment *m_env;
 private:
        // Used for creating objects based on type
-       static core::map<u16, Factory> m_types;
+       static std::map<u16, Factory> m_types;
 };
 
 struct DistanceSortedActiveObject
@@ -109,7 +111,7 @@ struct DistanceSortedActiveObject
                d = a_d;
        }
 
-       bool operator < (DistanceSortedActiveObject &other)
+       bool operator < (const DistanceSortedActiveObject &other) const
        {
                return d < other.d;
        }