From 6a418ab3e8ce4dfbac0378e57087e84a862b875f Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Thu, 20 Aug 2009 08:29:36 -0600 Subject: Simplify applying GM status --- src/net/ea/beinghandler.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index 29c10900..80e9b350 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -543,8 +543,7 @@ void BeingHandler::handleMessage(MessageIn &msg) gmstatus = msg.readInt16(); if (gmstatus & 0x80) - if (Player *player = dynamic_cast(dstBeing)) - player->setGM(true); + player->setGM(true); if (msg.getId() == SMSG_PLAYER_UPDATE_1) { -- cgit v1.2.3-70-g09d2 From b20931ca66c1c760bfe21a5a6c070c54ae3eb2a0 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Sun, 23 Aug 2009 12:13:25 -0600 Subject: Fix some layout issues with TabbedAreas --- src/gui/widgets/tabbedarea.cpp | 14 +++++++++++--- src/gui/widgets/tabbedarea.h | 3 +-- 2 files changed, 12 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp index 13bb884b..dd2e62dd 100644 --- a/src/gui/widgets/tabbedarea.cpp +++ b/src/gui/widgets/tabbedarea.cpp @@ -28,6 +28,8 @@ TabbedArea::TabbedArea() : gcn::TabbedArea() { mWidgetContainer->setOpaque(false); addWidgetListener(this); + + widgetResized(NULL); } int TabbedArea::getNumberOfTabs() const @@ -161,14 +163,20 @@ void TabbedArea::setSelectedTab(gcn::Tab *tab) if (newTab) newTab->setCurrent(); + + widgetResized(NULL); } void TabbedArea::widgetResized(const gcn::Event &event) { - int width = getWidth() - 2 * getFrameSize(); - int height = getHeight() - 2 * getFrameSize() - mTabContainer->getHeight(); + int width = getWidth() - 2 * getFrameSize() + - 2 * mWidgetContainer->getFrameSize(); + int height = getHeight() - 2 * getFrameSize() - mWidgetContainer->getY() + - 2 * mWidgetContainer->getFrameSize(); mWidgetContainer->setSize(width, height); + gcn::Widget *w = getCurrentWidget(); if (w) - w->setSize(width, height); + w->setSize(width, + height); } diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h index a64d855f..7944b5d5 100644 --- a/src/gui/widgets/tabbedarea.h +++ b/src/gui/widgets/tabbedarea.h @@ -101,8 +101,7 @@ class TabbedArea : public gcn::TabbedArea, public gcn::WidgetListener int getContainerHeight() const { return mWidgetContainer->getHeight(); } - void setSelectedTab(unsigned int index) - { gcn::TabbedArea::setSelectedTab(index); } + using gcn::TabbedArea::setSelectedTab; void setSelectedTab(gcn::Tab *tab); -- cgit v1.2.3-70-g09d2 From 57e9df052dc9668b7aee69afe74cf01530ed3b76 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Mon, 24 Aug 2009 15:52:44 -0600 Subject: Change default for whispers in tabs It will now default to showing whispers in tabs. --- src/gui/chat.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp index f1814d93..c0597a64 100644 --- a/src/gui/chat.cpp +++ b/src/gui/chat.cpp @@ -453,7 +453,7 @@ void ChatWindow::whisper(const std::string &nick, if (i != mWhispers.end()) tab = i->second; - else if (config.getValue("whispertab", false)) + else if (config.getValue("whispertab", true)) tab = addWhisperTab(nick); if (tab) -- cgit v1.2.3-70-g09d2 From 3d673326aedd568848e897590cb5cbb2a2a00b1b Mon Sep 17 00:00:00 2001 From: Kess Vargavind Date: Sun, 30 Aug 2009 09:09:47 +0200 Subject: Fix exit hang of eA client on AmigaOS4 As reported and fixed by afxgroup on the forums. Note that the tmwserv client still hangs on exit. --- src/main.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/main.cpp b/src/main.cpp index 10145dfc..55eb9581 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1575,6 +1575,9 @@ int main(int argc, char *argv[]) } delete guiPalette; +#ifndef TMWSERV_SUPPORT + delete network; +#endif logger->log("Quitting"); exitEngine(); -- cgit v1.2.3-70-g09d2 From 03e5eaec783ed1519a7552cc69a0a2d3cf5ccf0c Mon Sep 17 00:00:00 2001 From: Kess Vargavind Date: Sun, 30 Aug 2009 12:33:12 +0200 Subject: Tweak to previous commit Now when I've wakened up I realize I could have used a more sane check. --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/main.cpp b/src/main.cpp index 55eb9581..63ba2241 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1575,7 +1575,7 @@ int main(int argc, char *argv[]) } delete guiPalette; -#ifndef TMWSERV_SUPPORT +#ifdef EATHENA_SUPPORT delete network; #endif -- cgit v1.2.3-70-g09d2