diff options
| author | Kahrl <kahrl@gmx.net> | 2012-01-12 06:10:39 +0100 |
|---|---|---|
| committer | Kahrl <kahrl@gmx.net> | 2012-01-12 06:10:39 +0100 |
| commit | 6a76c226e10e92c3e3339096f07f8ab065e2098b (patch) | |
| tree | 396d9083f5f76ebb5ba96df113ba68046c2487df /src/player.cpp | |
| parent | 569156b01302ea4ba45d11ff5524b62dbc6a9aa0 (diff) | |
| download | minetest-6a76c226e10e92c3e3339096f07f8ab065e2098b.tar.gz minetest-6a76c226e10e92c3e3339096f07f8ab065e2098b.tar.bz2 minetest-6a76c226e10e92c3e3339096f07f8ab065e2098b.zip | |
The huge item definition and item namespace unification patch (itemdef), see http://c55.me/minetest/wiki/doku.php?id=changes:itemdef
Diffstat (limited to 'src/player.cpp')
| -rw-r--r-- | src/player.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/player.cpp b/src/player.cpp index 963f67c28..b072746c6 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -28,6 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "main.h" // For g_settings #include "settings.h" #include "nodedef.h" +#include "collision.h" #include "environment.h" #include "gamedef.h" @@ -37,13 +38,13 @@ Player::Player(IGameDef *gamedef): in_water_stable(false), is_climbing(false), swimming_up(false), + inventory(gamedef->idef()), inventory_backup(NULL), craftresult_is_preview(true), hp(20), peer_id(PEER_ID_INEXISTENT), // protected m_gamedef(gamedef), - m_selected_item(0), m_pitch(0), m_yaw(0), m_speed(0,0,0), @@ -58,11 +59,6 @@ Player::~Player() delete inventory_backup; } -void Player::wieldItem(u16 item) -{ - m_selected_item = item; -} - void Player::resetInventory() { inventory.clear(); @@ -172,7 +168,7 @@ void Player::deSerialize(std::istream &is) hp = 20; } - inventory.deSerialize(is, m_gamedef); + inventory.deSerialize(is); } #ifndef SERVER |