diff options
| author | Mattes D <github@xoft.cz> | 2013-12-09 21:16:57 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2013-12-09 21:16:57 +0100 |
| commit | 567354b3caf1c7798ee12b48103421c022a0afe1 (patch) | |
| tree | ad9d9680ee78a0a9ba8d1fc5e63045c07528f286 /src/UI | |
| parent | Fixed angle normalization typo. (diff) | |
| parent | fixed warnings in src/Generating/BioGen.cpp (diff) | |
| download | cuberite-567354b3caf1c7798ee12b48103421c022a0afe1.tar cuberite-567354b3caf1c7798ee12b48103421c022a0afe1.tar.gz cuberite-567354b3caf1c7798ee12b48103421c022a0afe1.tar.bz2 cuberite-567354b3caf1c7798ee12b48103421c022a0afe1.tar.lz cuberite-567354b3caf1c7798ee12b48103421c022a0afe1.tar.xz cuberite-567354b3caf1c7798ee12b48103421c022a0afe1.tar.zst cuberite-567354b3caf1c7798ee12b48103421c022a0afe1.zip | |
Diffstat (limited to 'src/UI')
| -rw-r--r-- | src/UI/SlotArea.cpp | 6 | ||||
| -rw-r--r-- | src/UI/Window.cpp | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/UI/SlotArea.cpp b/src/UI/SlotArea.cpp index e743f4bb3..61e432665 100644 --- a/src/UI/SlotArea.cpp +++ b/src/UI/SlotArea.cpp @@ -1,4 +1,3 @@ - // SlotArea.cpp // Implements the cSlotArea class and its descendants @@ -65,6 +64,10 @@ void cSlotArea::Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickA DblClicked(a_Player, a_SlotNum); return; } + default: + { + break; + } } cItem Slot(*GetSlot(a_SlotNum, a_Player)); @@ -443,7 +446,6 @@ void cSlotAreaCrafting::OnPlayerRemoved(cPlayer & a_Player) void cSlotAreaCrafting::ClickedResult(cPlayer & a_Player) { - const cItem * ResultSlot = GetSlot(0, a_Player); cItem & DraggingItem = a_Player.GetDraggingItem(); // Get the current recipe: diff --git a/src/UI/Window.cpp b/src/UI/Window.cpp index 5ca31fa3e..ee75921d1 100644 --- a/src/UI/Window.cpp +++ b/src/UI/Window.cpp @@ -28,9 +28,9 @@ cWindow::cWindow(WindowType a_WindowType, const AString & a_WindowTitle) : m_WindowID((++m_WindowIDCounter) % 127), m_WindowType(a_WindowType), m_WindowTitle(a_WindowTitle), - m_Owner(NULL), m_IsDestroyed(false), - m_ShouldDistributeToHotbarFirst(true) + m_ShouldDistributeToHotbarFirst(true), + m_Owner(NULL) { if (a_WindowType == wtInventory) { @@ -201,6 +201,10 @@ void cWindow::Clicked( case caRightPaintProgress: OnPaintProgress(a_Player, a_SlotNum); return; case caLeftPaintEnd: OnLeftPaintEnd (a_Player); return; case caRightPaintEnd: OnRightPaintEnd(a_Player); return; + default: + { + break; + } } if (a_SlotNum < 0) |