MultiCraft/MultiCraft2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix spacing

Browse Source
This commit is contained in:
Ekdohibs 2017-03-24 15:56:10 +01:00 committed by Auke Kok
parent 08b680d588
commit a5c9174bad
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/game.cpp
View File

@ -3406,7 +3406,7 @@ void Game::processPlayerInteraction(f32 dtime, bool show_hud, bool show_debug)
playeritem.getDefinition(itemdef_manager); playeritem.getDefinition(itemdef_manager);
InventoryList *hlist = local_inventory->getList("hand"); InventoryList *hlist = local_inventory->getList("hand");
const ItemDefinition &hand_def = const ItemDefinition &hand_def =
hlist?hlist->getItem(0).getDefinition(itemdef_manager):itemdef_manager->get(""); hlist ? hlist->getItem(0).getDefinition(itemdef_manager) : itemdef_manager->get("");
v3f player_position = player->getPosition(); v3f player_position = player->getPosition();
v3f camera_position = camera->getPosition(); v3f camera_position = camera->getPosition();
@ -3817,7 +3817,7 @@ void Game::handleDigging(const PointedThing &pointed, const v3s16 &nodepos,
if (!params.diggable) { if (!params.diggable) {
InventoryList *hlist = local_inventory->getList("hand"); InventoryList *hlist = local_inventory->getList("hand");
const ItemDefinition &hand = const ItemDefinition &hand =
hlist?hlist->getItem(0).getDefinition(itemdef_manager):itemdef_manager->get(""); hlist ? hlist->getItem(0).getDefinition(itemdef_manager) : itemdef_manager->get("");
const ToolCapabilities *tp = hand.tool_capabilities; const ToolCapabilities *tp = hand.tool_capabilities;
if (tp) if (tp)

4
src/network/serverpackethandler.cpp
View File

@ -1384,7 +1384,7 @@ void Server::handleCommand_Interact(NetworkPacket* pkt)
float max_d = BS * playeritem_def.range; float max_d = BS * playeritem_def.range;
InventoryList *hlist = playersao->getInventory()->getList("hand"); InventoryList *hlist = playersao->getInventory()->getList("hand");
const ItemDefinition &hand_def = const ItemDefinition &hand_def =
hlist?(hlist->getItem(0).getDefinition(m_itemdef)):(m_itemdef->get("")); hlist ? (hlist->getItem(0).getDefinition(m_itemdef)) : (m_itemdef->get(""));
float max_d_hand = BS * hand_def.range; float max_d_hand = BS * hand_def.range;
if (max_d < 0 && max_d_hand >= 0) if (max_d < 0 && max_d_hand >= 0)
max_d = max_d_hand; max_d = max_d_hand;
@ -1523,7 +1523,7 @@ void Server::handleCommand_Interact(NetworkPacket* pkt)
if (!params.diggable) { if (!params.diggable) {
InventoryList *hlist = playersao->getInventory()->getList("hand"); InventoryList *hlist = playersao->getInventory()->getList("hand");
const ItemDefinition &hand = const ItemDefinition &hand =
hlist?hlist->getItem(0).getDefinition(m_itemdef):m_itemdef->get(""); hlist ? hlist->getItem(0).getDefinition(m_itemdef) : m_itemdef->get("");
const ToolCapabilities *tp = hand.tool_capabilities; const ToolCapabilities *tp = hand.tool_capabilities;
if (tp) if (tp)
params = getDigParams(m_nodedef->get(n).groups, tp); params = getDigParams(m_nodedef->get(n).groups, tp);