Don't use msvc libs for mingw build

[minetest.git] / src / clientobject.h

diff --git a/src/clientobject.h b/src/clientobject.h
index 852d2c76bdbbb96908c755e5ab0003b9faf1f2a0..fb5cb29f463bd86253a023ed40707e120a92b3ac 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>
 
 /*
 
@@ -55,6 +56,7 @@ class ClientActiveObject : public ActiveObject
        virtual v3s16 getLightPosition(){return v3s16(0,0,0);}
        virtual core::aabbox3d<f32>* getSelectionBox(){return NULL;}
        virtual core::aabbox3d<f32>* getCollisionBox(){return NULL;}
+       virtual bool collideWithObjects(){return false;}
        virtual v3f getPosition(){return v3f(0,0,0);}
        virtual scene::IMeshSceneNode *getMeshSceneNode(){return NULL;}
        virtual scene::IAnimatedMeshSceneNode *getAnimatedMeshSceneNode(){return NULL;}
@@ -96,7 +98,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
@@ -110,7 +112,7 @@ struct DistanceSortedActiveObject
                d = a_d;
        }
 
-       bool operator < (DistanceSortedActiveObject &other)
+       bool operator < (const DistanceSortedActiveObject &other) const
        {
                return d < other.d;
        }