X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fobject_properties.h;h=e8188cb604dbd96ca0c2a915573f9729fd549417;hb=c8930850e37dab9820049152a3e668a315a97560;hp=d7d44625e273745dff63c38fed6ccd740674c2fb;hpb=e42eeec8f626acbaa54ae31c10ca06c868c7931c;p=dragonfireclient.git

diff --git a/src/object_properties.h b/src/object_properties.h
index d7d44625e..e8188cb60 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
@@ -24,24 +24,27 @@ 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;
 
 
 	ObjectProperties();