diff options
author | Perttu Ahola <celeron55@gmail.com> | 2010-12-25 02:33:41 +0200 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2010-12-25 02:33:41 +0200 |
commit | 3fe377be4e860f4ec9664688489e4e22090fc29d (patch) | |
tree | dd05ac1a18f42db79f811f67ec06fb4dcb5b02a3 /src/server.cpp | |
parent | 699d0e9a5efa555f4b4c7652a0ca571acf0afdb2 (diff) | |
download | minetest-3fe377be4e860f4ec9664688489e4e22090fc29d.tar.gz minetest-3fe377be4e860f4ec9664688489e4e22090fc29d.tar.bz2 minetest-3fe377be4e860f4ec9664688489e4e22090fc29d.zip |
builds on both platforms
Diffstat (limited to 'src/server.cpp')
-rw-r--r-- | src/server.cpp | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/src/server.cpp b/src/server.cpp index e1f7ba739..3bdabdfa6 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -2780,6 +2780,22 @@ void Server::SendInventory(u16 peer_id) } } + // Mese pick + if(!found) + { + ItemSpec specs[9]; + specs[0] = ItemSpec(ITEM_MATERIAL, CONTENT_MESE); + specs[1] = ItemSpec(ITEM_MATERIAL, CONTENT_MESE); + specs[2] = ItemSpec(ITEM_MATERIAL, CONTENT_MESE); + specs[4] = ItemSpec(ITEM_CRAFT, "Stick"); + specs[7] = ItemSpec(ITEM_CRAFT, "Stick"); + if(checkItemCombination(items, specs)) + { + rlist->addItem(new ToolItem("MesePick", 0)); + found = true; + } + } + } /* @@ -3043,6 +3059,11 @@ void Server::handlePeerChange(PeerChange &c) } else { + /*{ + InventoryItem *item = new MaterialItem(CONTENT_MESE, 6); + void* r = player->inventory.addItem("main", item); + assert(r == NULL); + } { InventoryItem *item = new MaterialItem(CONTENT_COALSTONE, 6); void* r = player->inventory.addItem("main", item); @@ -3067,7 +3088,7 @@ void Server::handlePeerChange(PeerChange &c) InventoryItem *item = new ToolItem("STPick", 32000); void* r = player->inventory.addItem("main", item); assert(r == NULL); - } + }*/ /*// Give some lights { InventoryItem *item = new MaterialItem(CONTENT_TORCH, 999); |