Move get_schematic and read_schematic to l_mapgen.cpp

[dragonfireclient.git] / src / object_properties.h

diff --git a/src/object_properties.h b/src/object_properties.h
index 75ba1f895bfb18ed1f9a5647d269e31ee793c2ef..4b7f9a5eb4f5c8501bf1d31f497dd73d08e8b24e 100644 (file)
--- a/src/object_properties.h
+++ b/src/object_properties.h
@@ -1,18 +1,18 @@
 /*
-Minetest-c55
-Copyright (C) 2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 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 General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -21,24 +21,33 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define OBJECT_PROPERTIES_HEADER
 
 #include <string>
-#include "irrlichttypes.h"
+#include "irrlichttypes_bloated.h"
 #include <iostream>
+#include <map>
+#include <vector>
 
 struct ObjectProperties
 {
        // Values are BS=1
        s16 hp_max;
        bool physical;
+       bool collideWithObjects;
        float weight;
        core::aabbox3d<f32> collisionbox;
        std::string visual;
+       std::string mesh;
        v2f visual_size;
-       core::array<std::string> textures;
+       std::vector<std::string> textures;
+       std::vector<video::SColor> colors;
        v2s16 spritediv;
        v2s16 initial_sprite_basepos;
        bool is_visible;
        bool makes_footstep_sound;
        float automatic_rotate;
+       f32 stepheight;
+       bool automatic_face_movement_dir;
+       f32 automatic_face_movement_dir_offset;
+
 
        ObjectProperties();
        std::string dump();