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 eeb397efa40d3112ee14777dad0b8a3febe8a414..4b7f9a5eb4f5c8501bf1d31f497dd73d08e8b24e 100644
(file)
--- a/
src/object_properties.h
+++ b/
src/object_properties.h
@@
-31,6
+31,7
@@
struct ObjectProperties
// Values are BS=1
s16 hp_max;
bool physical;
// Values are BS=1
s16 hp_max;
bool physical;
+ bool collideWithObjects;
float weight;
core::aabbox3d<f32> collisionbox;
std::string visual;
float weight;
core::aabbox3d<f32> collisionbox;
std::string visual;
@@
-43,6
+44,9
@@
struct ObjectProperties
bool is_visible;
bool makes_footstep_sound;
float automatic_rotate;
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();