flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'origin/master' into chestcarts

Browse Source 
Conflicts:
	src/Entities/Minecart.cpp
This commit is contained in:
Tiger Wang
2014-09-27 18:40:00 +01:00
parent bc37b895bc 28ebe11df2
commit d1814d2d67
235 changed files with 12924 additions and 6593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/UI/Window.cpp
View File

@@ -58,6 +58,34 @@ cWindow::~cWindow()
const AString cWindow::GetWindowTypeName(void) const
{
switch (m_WindowType)
{
case wtChest: return "minecraft:chest";
case wtWorkbench: return "minecraft:crafting_table";
case wtFurnace: return "minecraft:furnace";
case wtDropSpenser: return "minecraft:dispenser";
case wtEnchantment: return "minecraft:enchanting_table";
case wtBrewery: return "minecraft:brewing_stand";
case wtNPCTrade: return "minecraft:villager";
case wtBeacon: return "minecraft:beacon";
case wtAnvil: return "minecraft:anvil";
case wtHopper: return "minecraft:hopper";
case wtDropper: return "minecraft:dropper";
case wtAnimalChest: return "EntityHorse";
default:
{
ASSERT(!"Unknown inventory type!");
return "";
}
}
}
int cWindow::GetNumSlots(void) const
{
int res = 0;