Add offset to automatic_face_movement_dir

[dragonfireclient.git] / src / object_properties.h

diff --git a/src/object_properties.h b/src/object_properties.h
index e1604b487bdf59de5b1e378e79af02563d69465b..4b7f9a5eb4f5c8501bf1d31f497dd73d08e8b24e 100644 (file)
--- a/src/object_properties.h
+++ b/src/object_properties.h
@@ -1,6 +1,6 @@
 /*
 Minetest
-Copyright (C) 2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+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
@@ -24,24 +24,29 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #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;
-       core::array<video::SColor> colors;
+       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();