X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fobject_properties.h;h=4b7f9a5eb4f5c8501bf1d31f497dd73d08e8b24e;hb=63867b1a372a4d1a4a4ffdec9d0862b094211a89;hp=f60ecefa471f61f30a8b8ecb73ed81dc58b45659;hpb=ac97a7f70eefd4b8065e006c634a0a5baf236b62;p=minetest.git

diff --git a/src/object_properties.h b/src/object_properties.h
index f60ecefa4..4b7f9a5eb 100644
--- 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
@@ -23,24 +23,31 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <string>
 #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;
-	std::string texture;
 	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;
+
 
 	ObjectProperties();
 	std::string dump();