diff options
| author | Kahrl <kahrl@gmx.net> | 2012-03-19 03:04:16 +0100 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-03-29 14:05:45 +0300 |
| commit | f8c3743991a6897c7133bf35dc2699b8b5f9df7c (patch) | |
| tree | e856506d9c96d572d1a3b0a58edf00f0d70cba43 /src/player.cpp | |
| parent | 072c265c301d3336203b77b8b1651fdacf3a7682 (diff) | |
| download | minetest-f8c3743991a6897c7133bf35dc2699b8b5f9df7c.tar.gz minetest-f8c3743991a6897c7133bf35dc2699b8b5f9df7c.tar.bz2 minetest-f8c3743991a6897c7133bf35dc2699b8b5f9df7c.zip | |
added PlayerSAO and RemotePlayer, removed ServerRemotePlayer
Diffstat (limited to 'src/player.cpp')
| -rw-r--r-- | src/player.cpp | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/src/player.cpp b/src/player.cpp index 0d4a1cb69..ff272322f 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -32,6 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "environment.h" #include "gamedef.h" #include "event.h" +#include "content_sao.h" Player::Player(IGameDef *gamedef): touching_ground(false), @@ -40,8 +41,7 @@ Player::Player(IGameDef *gamedef): is_climbing(false), swimming_up(false), inventory(gamedef->idef()), - inventory_backup(NULL), - hp(20), + hp(PLAYER_MAX_HP), peer_id(PEER_ID_INEXISTENT), // protected m_gamedef(gamedef), @@ -51,16 +51,6 @@ Player::Player(IGameDef *gamedef): m_position(0,0,0) { updateName("<not set>"); - resetInventory(); -} - -Player::~Player() -{ - delete inventory_backup; -} - -void Player::resetInventory() -{ inventory.clear(); inventory.addList("main", PLAYER_INVENTORY_SIZE); inventory.addList("craft", 9); @@ -68,6 +58,10 @@ void Player::resetInventory() inventory.addList("craftresult", 1); } +Player::~Player() +{ +} + // Y direction is ignored void Player::accelerate(v3f target_speed, f32 max_increase) { @@ -126,12 +120,7 @@ void Player::serialize(std::ostream &os) os<<"PlayerArgsEnd\n"; - // If actual inventory is backed up due to creative mode, save it - // instead of the dummy creative mode inventory - if(inventory_backup) - inventory_backup->serialize(os); - else - inventory.serialize(os); + inventory.serialize(os); } void Player::deSerialize(std::istream &is) @@ -779,3 +768,13 @@ v3s16 LocalPlayer::getStandingNodePos() #endif +/* + RemotePlayer +*/ + +void RemotePlayer::setPosition(const v3f &position) +{ + Player::setPosition(position); + if(m_sao) + m_sao->setBasePosition(position); +} |