LocalPlayer::accelerateHorizontal: cleanups

[oweals/minetest.git] / src / object_properties.h

diff --git a/src/object_properties.h b/src/object_properties.h
index 3218387d36ed27fc25e52be6bebc544070aec415..772807fd994dae7f7f3773a1a40e97e105edc20d 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,39 @@ 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;
-       float weight;
-       core::aabbox3d<f32> collisionbox;
-       std::string visual;
-       v2f visual_size;
-       core::array<std::string> textures;
-       v2s16 spritediv;
+       s16 hp_max = 1;
+       bool physical = false;
+       bool collideWithObjects = true;
+       float weight = 5.0f;
+       aabb3f collisionbox = aabb3f(-0.5f, -0.5f, -0.5f, 0.5f, 0.5f, 0.5f);
+       std::string visual = "sprite";
+       std::string mesh = "";
+       v2f visual_size = v2f(1, 1);
+       std::vector<std::string> textures;
+       std::vector<video::SColor> colors;
+       v2s16 spritediv = v2s16(1, 1);
        v2s16 initial_sprite_basepos;
-       bool is_visible;
-       bool makes_footstep_sound;
-       float automatic_rotate;
+       bool is_visible = true;
+       bool makes_footstep_sound = false;
+       float automatic_rotate = 0.0f;
+       f32 stepheight = 0.0f;
+       bool automatic_face_movement_dir = false;
+       f32 automatic_face_movement_dir_offset = 0.0f;
+       bool backface_culling = true;
+       std::string nametag = "";
+       video::SColor nametag_color = video::SColor(255, 255, 255, 255);
+       f32 automatic_face_movement_max_rotation_per_sec = -1.0f;
+       std::string infotext;
+       //! For dropped items, this contains item information.
+       std::string wield_item;
 
        ObjectProperties();
        std::string dump();
@@ -47,4 +62,3 @@ struct ObjectProperties
 };
 
 #endif
-