projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mapgens: Rename m_emerge to prevent name collisions
[oweals/minetest.git]
/
src
/
object_properties.h
diff --git
a/src/object_properties.h
b/src/object_properties.h
index bde38bd66554dbb607900ca2c85db9a3ccbd383e..4b7f9a5eb4f5c8501bf1d31f497dd73d08e8b24e 100644
(file)
--- a/
src/object_properties.h
+++ b/
src/object_properties.h
@@
-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 "irrlichttypes_bloated.h"
#include <iostream>
#include <map>
+#include <vector>
struct ObjectProperties
{
// Values are BS=1
s16 hp_max;
bool physical;
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;
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;
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();
ObjectProperties();