From: Keith F. <ven...@us...> - 2006-08-27 21:00:30
|
Update of /cvsroot/planeshift/planeshift/src/client/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7864/src/client/gui Modified Files: chatwindow.cpp chatwindow.h Log Message: - Converted tabs from "All" to "Main" and made "Chat" into a special tab just for talking to npc's. - Took out npc naming system for talking with them. Now it is back to the old targeting way, plus you must use the NPC chat tab on the chat window. Index: chatwindow.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/gui/chatwindow.cpp,v retrieving revision 1.123 retrieving revision 1.124 diff -C2 -d -r1.123 -r1.124 *** chatwindow.cpp 5 Aug 2006 18:44:43 -0000 1.123 --- chatwindow.cpp 27 Aug 2006 21:00:26 -0000 1.124 *************** *** 123,129 **** systemText = (pawsMessageTextBox*)FindWidget("SystemText"); ! chatText = (pawsMessageTextBox*)FindWidget("ChatText"); ! inputText = (pawsEditTextBox*)FindWidget("InputText"); ! allText = (pawsMessageTextBox*)FindWidget("AllText"); tellText = (pawsMessageTextBox*)FindWidget("TellText"); guildText = (pawsMessageTextBox*)FindWidget("GuildText"); --- 123,128 ---- systemText = (pawsMessageTextBox*)FindWidget("SystemText"); [...1020 lines suppressed...] ! } } *************** *** 1779,1785 **** void pawsChatWindow::NpcChat() { ! const char * allowedTabs[] = {"ChatText", NULL}; ! AutoselectChatTabIfNeeded(allowedTabs, "Chat Button"); } --- 1722,1728 ---- void pawsChatWindow::NpcChat() { ! const char * allowedTabs[] = {"NPCText", NULL}; ! AutoselectChatTabIfNeeded(allowedTabs, "NPC Button"); } Index: chatwindow.h =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/gui/chatwindow.h,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** chatwindow.h 8 Jul 2006 09:48:28 -0000 1.34 --- chatwindow.h 27 Aug 2006 21:00:26 -0000 1.35 *************** *** 162,165 **** --- 162,167 ---- protected: + void HandleSystemMessage( MsgEntry* message ); + /// Sends the contents of the input text to the server. void SendChatLine(); *************** *** 200,222 **** /// Chat text for easy access ! pawsMessageTextBox* chatText; ! /// All text for easy access ! pawsMessageTextBox* allText; ! /// All tells for easy access ! pawsMessageTextBox* tellText; ! /// All the guild talk ! pawsMessageTextBox* guildText; ! /// All the group talk ! pawsMessageTextBox* groupText; ! /// All the auction talk ! pawsMessageTextBox* auctionText; ! /// All the advice talk ! pawsMessageTextBox* helpText; /// Input box for quick access --- 202,224 ---- /// Chat text for easy access ! pawsMessageTextBox* npcText; ! /// All text for easy access ! pawsMessageTextBox* mainText; ! /// All tells for easy access ! pawsMessageTextBox* tellText; ! /// All the guild talk ! pawsMessageTextBox* guildText; ! /// All the group talk ! pawsMessageTextBox* groupText; ! /// All the auction talk ! pawsMessageTextBox* auctionText; ! /// All the advice talk ! pawsMessageTextBox* helpText; /// Input box for quick access |