Make sure that settings are written to config file when settings are removed.

[dragonfireclient.git] / src / object_properties.h

diff --git a/src/object_properties.h b/src/object_properties.h
index 75ba1f895bfb18ed1f9a5647d269e31ee793c2ef..d7d44625e273745dff63c38fed6ccd740674c2fb 100644 (file)
--- a/src/object_properties.h
+++ b/src/object_properties.h
@@ -3,16 +3,16 @@ Minetest-c55
 Copyright (C) 2012 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,8 +21,9 @@ 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>
 
 struct ObjectProperties
 {
@@ -32,14 +33,17 @@ struct ObjectProperties
        float weight;
        core::aabbox3d<f32> collisionbox;
        std::string visual;
+       std::string mesh;
        v2f visual_size;
        core::array<std::string> textures;
+       core::array<video::SColor> colors;
        v2s16 spritediv;
        v2s16 initial_sprite_basepos;
        bool is_visible;
        bool makes_footstep_sound;
        float automatic_rotate;
 
+
        ObjectProperties();
        std::string dump();
        void serialize(std::ostream &os) const;