summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/chat.cpp3
-rw-r--r--src/gui/chat.h3
-rw-r--r--src/gui/itemshortcutcontainer.cpp1
-rw-r--r--src/gui/itemshortcutcontainer.h4
-rw-r--r--src/gui/itemshortcutwindow.cpp1
-rw-r--r--src/gui/itemshortcutwindow.h1
6 files changed, 9 insertions, 4 deletions
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index f750df99..e9bed822 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -165,6 +165,9 @@ ChatWindow::chatLog(std::string line, int own, std::string channelName)
tmp.nick += "Server: ";
lineColor = "##7"; // Equiv. to BrowserBox::PINK
break;
+ case BY_LOGGER:
+ lineColor = "##8"; // Equiv. to BrowserBox::GREY
+ break;
}
// Get the current system time
diff --git a/src/gui/chat.h b/src/gui/chat.h
index 304d5500..19795dd3 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -45,7 +45,8 @@ enum
BY_GM = 0,
BY_PLAYER = 1,
BY_OTHER = 2,
- BY_SERVER = 3
+ BY_SERVER = 3,
+ BY_LOGGER
};
#if 0
diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp
index 6a5d94fc..d86a99ef 100644
--- a/src/gui/itemshortcutcontainer.cpp
+++ b/src/gui/itemshortcutcontainer.cpp
@@ -18,6 +18,7 @@
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
+ * $Id$
*/
#include "itemshortcutcontainer.h"
diff --git a/src/gui/itemshortcutcontainer.h b/src/gui/itemshortcutcontainer.h
index 4b154cbb..c69525e0 100644
--- a/src/gui/itemshortcutcontainer.h
+++ b/src/gui/itemshortcutcontainer.h
@@ -18,6 +18,7 @@
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
+ * $Id$
*/
#ifndef _TMW_ITEMSHORTCUTCONTAINER_H__
@@ -26,8 +27,6 @@
#include <guichan/mouselistener.hpp>
#include <guichan/widget.hpp>
-#include <list>
-
class Image;
class Item;
@@ -109,7 +108,6 @@ class ItemShortcutContainer : public gcn::Widget, public gcn::MouseListener
int mGridWidth, mGridHeight;
bool mItemClicked;
Item *mItemMoved;
-
};
#endif
diff --git a/src/gui/itemshortcutwindow.cpp b/src/gui/itemshortcutwindow.cpp
index dd97a7db..cf266290 100644
--- a/src/gui/itemshortcutwindow.cpp
+++ b/src/gui/itemshortcutwindow.cpp
@@ -18,6 +18,7 @@
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
+ * $Id$
*/
#include "itemshortcutwindow.h"
diff --git a/src/gui/itemshortcutwindow.h b/src/gui/itemshortcutwindow.h
index 83bc348d..1dde8686 100644
--- a/src/gui/itemshortcutwindow.h
+++ b/src/gui/itemshortcutwindow.h
@@ -18,6 +18,7 @@
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
+ * $Id$
*/
#ifndef _TMW_ITEMSHORTCUTWINDOW_H