diff options
| author | Weblate <42@minetest.ru> | 2013-04-07 13:39:28 +0200 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-04-07 13:39:28 +0200 |
| commit | feb7de91ec34ef1ca3152270a7bc62b2e308f1bd (patch) | |
| tree | 65c33378bae9b7ac565b979237b6d594b511171f /src/content_sao.h | |
| parent | 33052abf42886ef03c4f46196cab6f767259a672 (diff) | |
| parent | 4468ea84e6d0faede5a01e8d97d359c537aa7ec8 (diff) | |
| download | minetest-feb7de91ec34ef1ca3152270a7bc62b2e308f1bd.tar.gz minetest-feb7de91ec34ef1ca3152270a7bc62b2e308f1bd.tar.bz2 minetest-feb7de91ec34ef1ca3152270a7bc62b2e308f1bd.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/content_sao.h')
| -rw-r--r-- | src/content_sao.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/content_sao.h b/src/content_sao.h index 60ca8f319..dca02bb00 100644 --- a/src/content_sao.h +++ b/src/content_sao.h @@ -101,7 +101,7 @@ private: float m_last_sent_position_timer; float m_last_sent_move_precision; bool m_armor_groups_sent; - + v2f m_animation_range; float m_animation_speed; float m_animation_blend; @@ -257,8 +257,6 @@ private: ItemGroupList m_armor_groups; bool m_armor_groups_sent; - - bool m_properties_sent; struct ObjectProperties m_prop; // Cached privileges for enforcement @@ -285,6 +283,11 @@ public: bool m_inventory_not_sent; bool m_hp_not_sent; bool m_wielded_item_not_sent; + + float m_physics_override_speed; + float m_physics_override_jump; + float m_physics_override_gravity; + bool m_physics_override_sent; }; #endif |