From 0fdbf1d62c1add8800ffc7171a1911e1e243ac2a Mon Sep 17 00:00:00 2001 From: Roderic Morris Date: Tue, 3 Jun 2008 16:29:11 +0000 Subject: channel announcements and leave / enter messages, chat code refactoring --- src/gui/chat.h | 71 ++-------------------------------------------------------- 1 file changed, 2 insertions(+), 69 deletions(-) (limited to 'src/gui/chat.h') diff --git a/src/gui/chat.h b/src/gui/chat.h index 26e30374..148feb7e 100644 --- a/src/gui/chat.h +++ b/src/gui/chat.h @@ -49,57 +49,6 @@ enum BY_LOGGER }; -#if 0 -/** - * gets in between usernick and message text depending on - * message type - */ -#define CAT_NORMAL ": " -#define CAT_IS "" -#define CAT_WHISPER " says: " - -/** job dependend identifiers (?) */ -#define SKILL_BASIC 0x0001 -#define SKILL_WARP 0x001b -#define SKILL_STEAL 0x0032 -#define SKILL_ENVENOM 0x0034 - -/** basic skills identifiers */ -#define BSKILL_TRADE 0x0000 -#define BSKILL_EMOTE 0x0001 -#define BSKILL_SIT 0x0002 -#define BSKILL_CREATECHAT 0x0003 -#define BSKILL_JOINPARTY 0x0004 -#define BSKILL_SHOUT 0x0005 -#define BSKILL_PK 0x0006 // ?? -#define BSKILL_SETALLIGN 0x0007 // ?? - -/** reasons why action failed */ -#define RFAIL_SKILLDEP 0x00 -#define RFAIL_INSUFHP 0x01 -#define RFAIL_INSUFSP 0x02 -#define RFAIL_NOMEMO 0x03 -#define RFAIL_SKILLDELAY 0x04 -#define RFAIL_ZENY 0x05 -#define RFAIL_WEAPON 0x06 -#define RFAIL_REDGEM 0x07 -#define RFAIL_BLUEGEM 0x08 -#define RFAIL_OVERWEIGHT 0x09 -#define RFAIL_GENERIC 0x0a - -/** should always be zero if failed */ -#define SKILL_FAILED 0x00 - -struct CHATSKILL -{ - short skill; - short bskill; - short unused; - char success; - char reason; -}; -#endif - /** * The chat window. * @@ -126,7 +75,7 @@ class ChatWindow : public Window, */ void widgetResized(const gcn::Event &event); - /* + /** * Adds a line of text to our message list. Parameters: * * @param line Text message. @@ -134,13 +83,6 @@ class ChatWindow : public Window, */ void chatLog(std::string line, int own, const std::string &channelName = "General"); -#if 0 - /* - * Calls original chat_log() after processing the packet. - */ - void chatLog(CHATSKILL); -#endif - /** * Performs action. */ @@ -156,7 +98,7 @@ class ChatWindow : public Window, */ bool isFocused(); - /* + /** * Determines whether to send a command or an ordinary message, then * contructs packets & sends them. * @@ -183,10 +125,6 @@ class ChatWindow : public Window, void chatSend(std::string const &nick, std::string const &msg, std::string const &channelName); - /** Called to add the channel to the channel manager */ - void - addChannel(short channel, const std::string &channelName); - /** Called to remove the channel from the channel manager */ void removeChannel(short channelId); @@ -251,11 +189,6 @@ class ChatWindow : public Window, ScrollArea *scroll; }; -#if 0 - /** Constructs failed messages for actions */ - std::string const_msg(CHATSKILL);*/ -#endif - /** Tabbed area for holding each channel. */ TabbedArea *mChatTabs; -- cgit v1.2.3-70-g09d2