summaryrefslogtreecommitdiffstats
path: root/src/UI
diff options
context:
space:
mode:
authorAlexander Harkness <bearbin@gmail.com>2015-05-19 19:43:19 +0200
committerAlexander Harkness <bearbin@gmail.com>2015-05-19 19:43:19 +0200
commitcbb425f027a7b51c4aed5d3399b26cf325c4c8ce (patch)
tree6a35f2c9c44b7d3d5142635178bf1ec9ca5e428c /src/UI
parentUpdated Core. (diff)
parentMerge pull request #2057 from Seadragon91/master (diff)
downloadcuberite-cbb425f027a7b51c4aed5d3399b26cf325c4c8ce.tar
cuberite-cbb425f027a7b51c4aed5d3399b26cf325c4c8ce.tar.gz
cuberite-cbb425f027a7b51c4aed5d3399b26cf325c4c8ce.tar.bz2
cuberite-cbb425f027a7b51c4aed5d3399b26cf325c4c8ce.tar.lz
cuberite-cbb425f027a7b51c4aed5d3399b26cf325c4c8ce.tar.xz
cuberite-cbb425f027a7b51c4aed5d3399b26cf325c4c8ce.tar.zst
cuberite-cbb425f027a7b51c4aed5d3399b26cf325c4c8ce.zip
Diffstat (limited to 'src/UI')
-rw-r--r--src/UI/DropSpenserWindow.cpp2
-rw-r--r--src/UI/DropSpenserWindow.h2
-rw-r--r--src/UI/FurnaceWindow.cpp2
-rw-r--r--src/UI/MinecartWithChestWindow.h2
-rw-r--r--src/UI/SlotArea.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/UI/DropSpenserWindow.cpp b/src/UI/DropSpenserWindow.cpp
index aeb7c64b7..121836e40 100644
--- a/src/UI/DropSpenserWindow.cpp
+++ b/src/UI/DropSpenserWindow.cpp
@@ -1,7 +1,7 @@
// DropSpenserWindow.cpp
-// Representing the UI window for the dropper/dispenser block
+// Representing the UI window for the dropper / dispenser block
#include "Globals.h"
#include "DropSpenserWindow.h"
diff --git a/src/UI/DropSpenserWindow.h b/src/UI/DropSpenserWindow.h
index edff936e5..cfc040493 100644
--- a/src/UI/DropSpenserWindow.h
+++ b/src/UI/DropSpenserWindow.h
@@ -1,7 +1,7 @@
// DropSpenserWindow.h
-// Representing the UI window for the dropper/dispenser block
+// Representing the UI window for the dropper / dispenser block
diff --git a/src/UI/FurnaceWindow.cpp b/src/UI/FurnaceWindow.cpp
index 132439ff3..a4e852fd8 100644
--- a/src/UI/FurnaceWindow.cpp
+++ b/src/UI/FurnaceWindow.cpp
@@ -41,7 +41,7 @@ void cFurnaceWindow::DistributeStack(cItem & a_ItemStack, int a_Slot, cPlayer &
}
else
{
- // Furnace Input/Fuel Slot
+ // Furnace Input / Fuel Slot
AreasInOrder.push_back(m_SlotAreas[1]); /* Inventory */
AreasInOrder.push_back(m_SlotAreas[2]); /* Hotbar */
super::DistributeStackToAreas(a_ItemStack, a_Player, AreasInOrder, a_ShouldApply, false);
diff --git a/src/UI/MinecartWithChestWindow.h b/src/UI/MinecartWithChestWindow.h
index a2b5283a6..87e8f6137 100644
--- a/src/UI/MinecartWithChestWindow.h
+++ b/src/UI/MinecartWithChestWindow.h
@@ -33,7 +33,7 @@ public:
a_ChestCart->GetWorld()->BroadcastSoundEffect("random.chestopen", a_ChestCart->GetPosX(), a_ChestCart->GetPosY(), a_ChestCart->GetPosZ(), 1, 1);
}
- virtual void DistributeStack(cItem & a_ItemStack, int a_Slot, cPlayer & a_Player, cSlotArea* a_ClickedArea, bool a_ShouldApply) override
+ virtual void DistributeStack(cItem & a_ItemStack, int a_Slot, cPlayer & a_Player, cSlotArea * a_ClickedArea, bool a_ShouldApply) override
{
cSlotAreas AreasInOrder;
diff --git a/src/UI/SlotArea.h b/src/UI/SlotArea.h
index 0e7ba2a50..f6a9972d6 100644
--- a/src/UI/SlotArea.h
+++ b/src/UI/SlotArea.h
@@ -306,7 +306,7 @@ public:
void UpdateResult(cPlayer & a_Player);
protected:
- /** The maximum cost of repairing/renaming in the anvil. */
+ /** The maximum cost of repairing / renaming in the anvil. */
int m_MaximumCost;
/** The stack size of the second item where was used for repair */