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

Fixed Window Titles being MCS-*

Browse Source 
For example, MCS-Chest, MCS-DoubleChest, etc.
This commit is contained in:
Tiger Wang 2013-07-27 22:32:07 +01:00
parent 20cb8221f9
commit 265fa6d750
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/UI/Window.cpp
View File

@ -1,4 +1,3 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "Window.h" #include "Window.h"
@ -682,7 +681,7 @@ void cWindow::BroadcastInventoryProgress(short a_Progressbar, short a_Value)
// cInventoryWindow: // cInventoryWindow:
cInventoryWindow::cInventoryWindow(cPlayer & a_Player) : cInventoryWindow::cInventoryWindow(cPlayer & a_Player) :
cWindow(cWindow::Inventory, "MCS-Inventory"), cWindow(cWindow::Inventory, "Inventory"),
m_Player(a_Player) m_Player(a_Player)
{ {
m_SlotAreas.push_back(new cSlotAreaCrafting(2, *this)); // The creative inventory doesn't display it, but it's still counted into slot numbers m_SlotAreas.push_back(new cSlotAreaCrafting(2, *this)); // The creative inventory doesn't display it, but it's still counted into slot numbers
@ -699,7 +698,7 @@ cInventoryWindow::cInventoryWindow(cPlayer & a_Player) :
// cCraftingWindow: // cCraftingWindow:
cCraftingWindow::cCraftingWindow(int a_BlockX, int a_BlockY, int a_BlockZ) : cCraftingWindow::cCraftingWindow(int a_BlockX, int a_BlockY, int a_BlockZ) :
cWindow(cWindow::Workbench, "MCS-Workbench") cWindow(cWindow::Workbench, "Crafting Table")
{ {
m_SlotAreas.push_back(new cSlotAreaCrafting(3, *this)); m_SlotAreas.push_back(new cSlotAreaCrafting(3, *this));
m_SlotAreas.push_back(new cSlotAreaInventory(*this)); m_SlotAreas.push_back(new cSlotAreaInventory(*this));
@ -714,7 +713,7 @@ cCraftingWindow::cCraftingWindow(int a_BlockX, int a_BlockY, int a_BlockZ) :
// cChestWindow: // cChestWindow:
cChestWindow::cChestWindow(cChestEntity * a_Chest) : cChestWindow::cChestWindow(cChestEntity * a_Chest) :
cWindow(cWindow::Chest, "MCS-SingleChest"), cWindow(cWindow::Chest, "Chest"),
m_World(a_Chest->GetWorld()), m_World(a_Chest->GetWorld()),
m_BlockX(a_Chest->GetPosX()), m_BlockX(a_Chest->GetPosX()),
m_BlockY(a_Chest->GetPosY()), m_BlockY(a_Chest->GetPosY()),
@ -736,7 +735,7 @@ cChestWindow::cChestWindow(cChestEntity * a_Chest) :
cChestWindow::cChestWindow(cChestEntity * a_PrimaryChest, cChestEntity * a_SecondaryChest) : cChestWindow::cChestWindow(cChestEntity * a_PrimaryChest, cChestEntity * a_SecondaryChest) :
cWindow(cWindow::Chest, "MCS-DoubleChest"), cWindow(cWindow::Chest, "Double Chest"),
m_World(a_PrimaryChest->GetWorld()), m_World(a_PrimaryChest->GetWorld()),
m_BlockX(a_PrimaryChest->GetPosX()), m_BlockX(a_PrimaryChest->GetPosX()),
m_BlockY(a_PrimaryChest->GetPosY()), m_BlockY(a_PrimaryChest->GetPosY()),
@ -775,7 +774,7 @@ cChestWindow::~cChestWindow()
// cDropSpenserWindow: // cDropSpenserWindow:
cDropSpenserWindow::cDropSpenserWindow(int a_BlockX, int a_BlockY, int a_BlockZ, cDropSpenserEntity * a_DropSpenser) : cDropSpenserWindow::cDropSpenserWindow(int a_BlockX, int a_BlockY, int a_BlockZ, cDropSpenserEntity * a_DropSpenser) :
cWindow(cWindow::DropSpenser, "MCS-DropSpenser") cWindow(cWindow::DropSpenser, "Dropspenser")
{ {
m_ShouldDistributeToHotbarFirst = false; m_ShouldDistributeToHotbarFirst = false;
m_SlotAreas.push_back(new cSlotAreaItemGrid(a_DropSpenser->GetContents(), *this)); m_SlotAreas.push_back(new cSlotAreaItemGrid(a_DropSpenser->GetContents(), *this));
@ -791,7 +790,7 @@ cDropSpenserWindow::cDropSpenserWindow(int a_BlockX, int a_BlockY, int a_BlockZ,
// cHopperWindow: // cHopperWindow:
cHopperWindow::cHopperWindow(int a_BlockX, int a_BlockY, int a_BlockZ, cHopperEntity * a_Hopper) : cHopperWindow::cHopperWindow(int a_BlockX, int a_BlockY, int a_BlockZ, cHopperEntity * a_Hopper) :
super(cWindow::Hopper, "MCS-Hopper") super(cWindow::Hopper, "Hopper")
{ {
m_ShouldDistributeToHotbarFirst = false; m_ShouldDistributeToHotbarFirst = false;
m_SlotAreas.push_back(new cSlotAreaItemGrid(a_Hopper->GetContents(), *this)); m_SlotAreas.push_back(new cSlotAreaItemGrid(a_Hopper->GetContents(), *this));
@ -807,7 +806,7 @@ cHopperWindow::cHopperWindow(int a_BlockX, int a_BlockY, int a_BlockZ, cHopperEn
// cFurnaceWindow: // cFurnaceWindow:
cFurnaceWindow::cFurnaceWindow(int a_BlockX, int a_BlockY, int a_BlockZ, cFurnaceEntity * a_Furnace) : cFurnaceWindow::cFurnaceWindow(int a_BlockX, int a_BlockY, int a_BlockZ, cFurnaceEntity * a_Furnace) :
cWindow(cWindow::Furnace, "MCS-Furnace") cWindow(cWindow::Furnace, "Furnace")
{ {
m_ShouldDistributeToHotbarFirst = false; m_ShouldDistributeToHotbarFirst = false;
m_SlotAreas.push_back(new cSlotAreaFurnace(a_Furnace, *this)); m_SlotAreas.push_back(new cSlotAreaFurnace(a_Furnace, *this));