oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

The huge item definition and item namespace unification patch (itemdef), see http://c55.me/minetest/wiki/doku.php?id=changes:itemdef

Browse source
This commit is contained in:
Kahrl 2012-01-12 06:10:39 +01:00
parent 569156b013
commit 6a76c226e1
65 changed files with 7232 additions and 7282 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/player.cpp
View file

@ -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