diff options
| -rw-r--r-- | .gitignore | 8 | ||||
| -rw-r--r-- | MCServer/.gitignore | 20 | ||||
| -rw-r--r-- | Tools/AnvilStats/.gitignore | 5 | ||||
| -rw-r--r-- | VC2008/.gitignore | 5 | ||||
| -rw-r--r-- | source/UI/Window.cpp | 15 |
5 files changed, 45 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore index 567609b12..bde685901 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,9 @@ build/ +MCServer/MCServer +ChunkWorxSave.ini +doxy/ +Profiling +SymSrv +cloc-ignored.txt +cloc.xml +cloc.xsl diff --git a/MCServer/.gitignore b/MCServer/.gitignore new file mode 100644 index 000000000..e455b8cdc --- /dev/null +++ b/MCServer/.gitignore @@ -0,0 +1,20 @@ +*.exe +ChunkWorx.ini +ChunkWorxSave.ini +MCServer +banned.ini +logs +players +whitelist.ini +world +API.txt +*.dat +schematics +*.schematic +*.ilk +*.pdb +memdump.xml +*.grab +ProtectionAreas.ini +ProtectionAreas.sqlite +helgrind.log diff --git a/Tools/AnvilStats/.gitignore b/Tools/AnvilStats/.gitignore new file mode 100644 index 000000000..4ed720fed --- /dev/null +++ b/Tools/AnvilStats/.gitignore @@ -0,0 +1,5 @@ +.xls +Statistics.txt +*.bmp +Profiling +*.png diff --git a/VC2008/.gitignore b/VC2008/.gitignore new file mode 100644 index 000000000..3b3be3257 --- /dev/null +++ b/VC2008/.gitignore @@ -0,0 +1,5 @@ +Debug/ +Release/ +*.user +*.ncb +*.suo diff --git a/source/UI/Window.cpp b/source/UI/Window.cpp index d09c57337..415ce08ff 100644 --- a/source/UI/Window.cpp +++ b/source/UI/Window.cpp @@ -1,4 +1,3 @@ - #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Window.h" @@ -682,7 +681,7 @@ void cWindow::BroadcastInventoryProgress(short a_Progressbar, short a_Value) // cInventoryWindow: cInventoryWindow::cInventoryWindow(cPlayer & a_Player) : - cWindow(cWindow::Inventory, "MCS-Inventory"), + cWindow(cWindow::Inventory, "Inventory"), 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 @@ -699,7 +698,7 @@ cInventoryWindow::cInventoryWindow(cPlayer & a_Player) : // cCraftingWindow: 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 cSlotAreaInventory(*this)); @@ -714,7 +713,7 @@ cCraftingWindow::cCraftingWindow(int a_BlockX, int a_BlockY, int a_BlockZ) : // cChestWindow: cChestWindow::cChestWindow(cChestEntity * a_Chest) : - cWindow(cWindow::Chest, "MCS-SingleChest"), + cWindow(cWindow::Chest, "Chest"), m_World(a_Chest->GetWorld()), m_BlockX(a_Chest->GetPosX()), m_BlockY(a_Chest->GetPosY()), @@ -736,7 +735,7 @@ cChestWindow::cChestWindow(cChestEntity * a_Chest) : cChestWindow::cChestWindow(cChestEntity * a_PrimaryChest, cChestEntity * a_SecondaryChest) : - cWindow(cWindow::Chest, "MCS-DoubleChest"), + cWindow(cWindow::Chest, "Double Chest"), m_World(a_PrimaryChest->GetWorld()), m_BlockX(a_PrimaryChest->GetPosX()), m_BlockY(a_PrimaryChest->GetPosY()), @@ -775,7 +774,7 @@ cChestWindow::~cChestWindow() // cDropSpenserWindow: 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_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(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_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(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_SlotAreas.push_back(new cSlotAreaFurnace(a_Furnace, *this)); |