Limit speed in collisionMoveResult for avoiding hangs

[dragonfireclient.git] / src / object_properties.h

diff --git a/src/object_properties.h b/src/object_properties.h
index 3ab488f92bade29b843425926888dcd5bc225753..eeb397efa40d3112ee14777dad0b8a3febe8a414 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
@@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irrlichttypes_bloated.h"
 #include <iostream>
 #include <map>
+#include <vector>
 
 struct ObjectProperties
 {
@@ -34,13 +35,9 @@ struct ObjectProperties
        core::aabbox3d<f32> collisionbox;
        std::string visual;
        std::string mesh;
-       core::vector2d<int> animation_frames;
-       float animation_speed;
-       float animation_blend;
-       std::map<std::string, v3f> animation_bone_position;
-       std::map<std::string, v3f> animation_bone_rotation;
        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;