diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2016-10-08 16:31:22 +0200 |
|---|---|---|
| committer | Ner'zhul <nerzhul@users.noreply.github.com> | 2016-10-08 22:27:44 +0200 |
| commit | fd5a130b86c08f0b3190c3d81affd4869c139fb7 (patch) | |
| tree | 8300ec1e77cfd8c38292f5b81e8e0fb82de0d53d /src/content_cao.cpp | |
| parent | 067766eec213918b6cb5b2533d0c78eceb3949ec (diff) | |
| download | minetest-fd5a130b86c08f0b3190c3d81affd4869c139fb7.tar.gz minetest-fd5a130b86c08f0b3190c3d81affd4869c139fb7.tar.bz2 minetest-fd5a130b86c08f0b3190c3d81affd4869c139fb7.zip | |
More code cleanup (UNORDERED + RemotePlayer/LocalPlayer)
* ClientEnvironment now uses UNORDERED MAP for active objects
* Use RemotePlayer and LocalPlayer everywhere it's possible
* Minor code style fixes
* Drop Client::getBreath() unused function
Diffstat (limited to 'src/content_cao.cpp')
| -rw-r--r-- | src/content_cao.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/content_cao.cpp b/src/content_cao.cpp index 207a630d7..a53768149 100644 --- a/src/content_cao.cpp +++ b/src/content_cao.cpp @@ -655,12 +655,11 @@ void GenericCAO::initialize(const std::string &data) if(m_is_player) { - Player *player = m_env->getPlayer(m_name.c_str()); - if(player && player->isLocal()) - { + LocalPlayer *player = m_env->getPlayer(m_name.c_str()); + if (player && player->isLocal()) { m_is_local_player = true; m_is_visible = false; - LocalPlayer* localplayer = dynamic_cast<LocalPlayer*>(player); + LocalPlayer* localplayer = player; assert( localplayer != NULL ); localplayer->setCAO(this); |