From 578c9c4694344cb6e7c0e820f0687c98d3d5402d Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sun, 23 Sep 2012 16:25:32 +0000 Subject: Tweaked logging. Less output for UI. More output for player pos confirming (FS #245) and for player spawning git-svn-id: http://mc-server.googlecode.com/svn/trunk@875 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/UI/SlotArea.cpp | 10 +++++----- source/UI/cWindow.cpp | 5 ----- 2 files changed, 5 insertions(+), 10 deletions(-) (limited to 'source/UI') diff --git a/source/UI/SlotArea.cpp b/source/UI/SlotArea.cpp index d7a77bd6e..6da0a15b8 100644 --- a/source/UI/SlotArea.cpp +++ b/source/UI/SlotArea.cpp @@ -24,7 +24,6 @@ cSlotArea::cSlotArea(int a_NumSlots, cWindow & a_ParentWindow) : m_NumSlots(a_NumSlots), m_ParentWindow(a_ParentWindow) { - LOGD("Created a new cSlotArea with %d slots", a_NumSlots); } @@ -33,11 +32,13 @@ cSlotArea::cSlotArea(int a_NumSlots, cWindow & a_ParentWindow) : void cSlotArea::Clicked(cPlayer & a_Player, int a_SlotNum, bool a_IsRightClick, bool a_IsShiftPressed, const cItem & a_ClickedItem) { + /* LOGD("Slot area with %d slots clicked at slot number %d, clicked item %s, slot item %s", GetNumSlots(), a_SlotNum, ItemToFullString(a_ClickedItem).c_str(), ItemToFullString(*GetSlot(a_SlotNum, a_Player)).c_str() ); + */ ASSERT((a_SlotNum >= 0) && (a_SlotNum < GetNumSlots())); @@ -62,10 +63,9 @@ void cSlotArea::Clicked(cPlayer & a_Player, int a_SlotNum, bool a_IsRightClick, cItem Slot(*GetSlot(a_SlotNum, a_Player)); if (!Slot.IsEqual(a_ClickedItem)) { - LOGD("*** Window lost sync ***"); - LOGD("My Type: %i Their Type: %i", Slot.m_ItemID, a_ClickedItem.m_ItemID); - LOGD("My Count: %i Their Count: %i", Slot.m_ItemCount, a_ClickedItem.m_ItemCount); - LOGD("My Dmg: %i Their Dmg: %i", Slot.m_ItemHealth, a_ClickedItem.m_ItemHealth); + LOGD("*** Window lost sync at item %d in SlotArea with %d items ***", a_SlotNum, m_NumSlots); + LOGD("My item: %s", ItemToFullString(Slot).c_str()); + LOGD("Their item: %s", ItemToFullString(a_ClickedItem).c_str()); bAsync = true; } cItem & DraggingItem = a_Player.GetDraggingItem(); diff --git a/source/UI/cWindow.cpp b/source/UI/cWindow.cpp index 7efbfaa5e..bd6724751 100644 --- a/source/UI/cWindow.cpp +++ b/source/UI/cWindow.cpp @@ -33,9 +33,6 @@ cWindow::cWindow(cWindow::WindowType a_WindowType, const AString & a_WindowTitle { m_WindowID = 0; } - LOGD("Created a window at %p, type = %d, ID = %i, title = \"%s\".", - this, m_WindowType, m_WindowID, m_WindowTitle.c_str() - ); } @@ -44,7 +41,6 @@ cWindow::cWindow(cWindow::WindowType a_WindowType, const AString & a_WindowTitle cWindow::~cWindow() { - LOGD("Deleted a window at %p", this); } @@ -325,7 +321,6 @@ void cWindow::SendSlot(cPlayer & a_Player, cSlotArea * a_SlotArea, int a_Relativ void cWindow::Destroy(void) { - LOGD("Destroying window %p (type %d)", this, m_WindowType); if (m_Owner != NULL) { m_Owner->CloseWindow(); -- cgit v1.2.3