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/environment.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/environment.h')
| -rw-r--r-- | src/environment.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/environment.h b/src/environment.h index 02301e5d3..a3e43dbb4 100644 --- a/src/environment.h +++ b/src/environment.h @@ -298,6 +298,9 @@ public: // This makes stuff happen void step(f32 dtime); + //check if there's a line of sight between two positions + bool line_of_sight(v3f pos1, v3f pos2, float stepsize=1.0); + private: /* @@ -470,6 +473,13 @@ public: ClientEnvEvent getClientEvent(); std::vector<core::vector2d<int> > attachment_list; // X is child ID, Y is parent ID + + std::list<std::string> getPlayerNames() + { return m_player_names; } + void addPlayerName(std::string name) + { m_player_names.push_back(name); } + void removePlayerName(std::string name) + { m_player_names.remove(name); } private: ClientMap *m_map; @@ -482,6 +492,7 @@ private: Queue<ClientEnvEvent> m_client_event_queue; IntervalLimiter m_active_object_light_update_interval; IntervalLimiter m_lava_hurt_interval; + std::list<std::string> m_player_names; }; #endif |