diff options
| author | Weblate <42@minetest.ru> | 2013-03-30 19:49:52 +0100 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-03-30 19:49:52 +0100 |
| commit | a0566270d9fa075afa36a7e3e68c690b1b23ba90 (patch) | |
| tree | 6bc88127ee67b7bf4d6a2d6f9d0a9e5f997d1dd1 /src/content_sao.h | |
| parent | 0d83bdc3aa9f1077836aacb833ac4ad9bbb9a4f4 (diff) | |
| parent | 1aa50b13622c1e264044839ecdf0152670dae6ce (diff) | |
| download | minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.tar.gz minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.tar.bz2 minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/content_sao.h')
| -rw-r--r-- | src/content_sao.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/content_sao.h b/src/content_sao.h index 2fd1034eb..60ca8f319 100644 --- a/src/content_sao.h +++ b/src/content_sao.h @@ -78,6 +78,7 @@ public: void setSprite(v2s16 p, int num_frames, float framelength, bool select_horiz_by_yawpitch); std::string getName(); + bool getCollisionBox(aabb3f *toset); private: std::string getPropertyPacket(); void sendPosition(bool do_interpolate, bool is_movement_end); @@ -147,6 +148,8 @@ public: void setBasePosition(const v3f &position); void setPos(v3f pos); void moveTo(v3f pos, bool continuous); + void setYaw(float); + void setPitch(float); /* Interaction interface @@ -233,6 +236,8 @@ public: m_is_singleplayer = is_singleplayer; } + bool getCollisionBox(aabb3f *toset); + private: std::string getPropertyPacket(); |