s_env.{cpp, h} cleanups

[minetest.git] / src / object_properties.h

diff --git a/src/object_properties.h b/src/object_properties.h
index 3218387d36ed27fc25e52be6bebc544070aec415..082d9a5290ea945e0f7cb6b418acbd9a369fe4b5 100644 (file)
--- a/src/object_properties.h
+++ b/src/object_properties.h
@@ -1,6 +1,6 @@
 /*
-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 Lesser General Public License as published by
@@ -21,24 +21,37 @@ 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;
+       aabb3f 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;
+       bool backface_culling;
+       std::string nametag;
+       video::SColor nametag_color;
+       f32 automatic_face_movement_max_rotation_per_sec;
+       std::string infotext;
 
        ObjectProperties();
        std::string dump();
@@ -47,4 +60,3 @@ struct ObjectProperties
 };
 
 #endif
-