summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/Makefile.am4
-rw-r--r--src/gui/widgets/tabs/chat/partytab.cpp (renamed from src/net/ea/gui/partytab.cpp)7
-rw-r--r--src/gui/widgets/tabs/chat/partytab.h (renamed from src/net/ea/gui/partytab.h)11
-rw-r--r--src/net/ea/partyhandler.cpp13
-rw-r--r--src/net/ea/partyhandler.h6
-rw-r--r--src/net/eathena/generalhandler.cpp4
-rw-r--r--src/net/eathena/partyhandler.cpp20
-rw-r--r--src/net/tmwa/generalhandler.cpp4
-rw-r--r--src/net/tmwa/partyhandler.cpp14
10 files changed, 39 insertions, 48 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f8b42f8c7..89f365ff8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -176,8 +176,8 @@ SET(SRCS
gui/widgets/tabs/chat/gmtab.h
gui/widgets/tabs/chat/guildtab.cpp
gui/widgets/tabs/chat/guildtab.h
- net/ea/gui/partytab.cpp
- net/ea/gui/partytab.h
+ gui/widgets/tabs/chat/partytab.cpp
+ gui/widgets/tabs/chat/partytab.h
gui/widgets/horizontcontainer.cpp
gui/widgets/horizontcontainer.h
gui/widgets/icon.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index a85149b8e..6cd0d3873 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1184,8 +1184,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
winver.h \
gui/widgets/tabs/chat/guildtab.cpp \
gui/widgets/tabs/chat/guildtab.h \
- net/ea/gui/partytab.cpp \
- net/ea/gui/partytab.h \
+ gui/widgets/tabs/chat/partytab.cpp \
+ gui/widgets/tabs/chat/partytab.h \
net/ea/adminhandler.cpp \
net/ea/adminhandler.h \
net/ea/beinghandler.cpp \
diff --git a/src/net/ea/gui/partytab.cpp b/src/gui/widgets/tabs/chat/partytab.cpp
index 183863f25..88357aa6a 100644
--- a/src/net/ea/gui/partytab.cpp
+++ b/src/gui/widgets/tabs/chat/partytab.cpp
@@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "net/ea/gui/partytab.h"
+#include "gui/widgets/tabs/chat/partytab.h"
#include "chatlogger.h"
#include "configuration.h"
@@ -39,9 +39,6 @@
#include "debug.h"
-namespace Ea
-{
-
PartyTab::PartyTab(const Widget2 *const widget) :
// TRANSLATORS: party chat tab name
ChatTab(widget, _("Party"), "")
@@ -247,5 +244,3 @@ void PartyTab::optionChanged(const std::string &value)
if (value == "showPartyOnline")
mShowOnline = config.getBoolValue("showPartyOnline");
}
-
-} // namespace Ea
diff --git a/src/net/ea/gui/partytab.h b/src/gui/widgets/tabs/chat/partytab.h
index e627ab842..13f38cf0e 100644
--- a/src/net/ea/gui/partytab.h
+++ b/src/gui/widgets/tabs/chat/partytab.h
@@ -20,15 +20,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef NET_EA_GUI_PARTYTAB_H
-#define NET_EA_GUI_PARTYTAB_H
+#ifndef GUI_WIDGETS_TABS_CHAT_PARTYTAB_H
+#define GUI_WIDGETS_TABS_CHAT_PARTYTAB_H
#include "gui/widgets/tabs/chat/chattab.h"
#include "gui/widgets/tabs/chat/chattabtype.h"
-namespace Ea
-{
-
/**
* A tab for a party chat channel.
*/
@@ -64,6 +61,4 @@ class PartyTab notfinal : public ChatTab,
extern PartyTab *partyTab;
-} // namespace Ea
-
-#endif // NET_EA_GUI_PARTYTAB_H
+#endif // GUI_WIDGETS_TABS_CHAT_PARTYTAB_H
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index 0258bd2c6..bc72a0043 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -33,7 +33,7 @@
#include "net/messagein.h"
-#include "net/ea/gui/partytab.h"
+#include "gui/widgets/tabs/chat/partytab.h"
#include "utils/delete2.h"
@@ -41,10 +41,11 @@
#include "debug.h"
+PartyTab *partyTab = nullptr;
+
namespace Ea
{
-PartyTab *partyTab = nullptr;
Party *taParty = nullptr;
PartyHandler::PartyHandler() :
@@ -168,7 +169,7 @@ void PartyHandler::processPartyMove(Net::MessageIn &msg) const
m->setY(msg.readInt16()); // y
const bool online = msg.readUInt8() != 0;
if (m->getOnline() != online)
- Ea::partyTab->showOnline(m->getName(), online);
+ partyTab->showOnline(m->getName(), online);
m->setOnline(online); // online (if 0)
msg.readString(24); // party
msg.readString(24); // nick
@@ -225,7 +226,7 @@ void PartyHandler::processPartyLeave(Net::MessageIn &msg) const
Ea::taParty->clearMembers();
}
- delete2(Ea::partyTab)
+ delete2(partyTab)
if (socialWindow && Ea::taParty)
socialWindow->removeTab(Ea::taParty);
@@ -318,9 +319,9 @@ ChatTab *PartyHandler::getTab() const
void PartyHandler::createTab() const
{
- Ea::partyTab = new Ea::PartyTab(chatWindow);
+ partyTab = new PartyTab(chatWindow);
if (config.getBoolValue("showChatHistory"))
- Ea::partyTab->loadFromLogFile("#Party");
+ partyTab->loadFromLogFile("#Party");
}
} // namespace Ea
diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h
index 82db2179b..b595891c4 100644
--- a/src/net/ea/partyhandler.h
+++ b/src/net/ea/partyhandler.h
@@ -25,6 +25,7 @@
#include "net/partyhandler.h"
class Party;
+class PartyTab;
namespace Net
{
@@ -33,8 +34,6 @@ namespace Net
namespace Ea
{
-class PartyTab;
-
class PartyHandler notfinal : public Net::PartyHandler
{
public:
@@ -82,9 +81,10 @@ class PartyHandler notfinal : public Net::PartyHandler
Net::PartyShare::Type mShareItems;
};
-extern PartyTab *partyTab;
extern Party *taParty;
} // namespace Ea
+extern PartyTab *partyTab;
+
#endif // NET_EA_PARTYHANDLER_H
diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp
index 25a036bb4..80277701b 100644
--- a/src/net/eathena/generalhandler.cpp
+++ b/src/net/eathena/generalhandler.cpp
@@ -36,7 +36,7 @@
#include "net/ea/guildhandler.h"
#include "gui/widgets/tabs/chat/guildtab.h"
-#include "net/ea/gui/partytab.h"
+#include "gui/widgets/tabs/chat/partytab.h"
#include "net/eathena/adminhandler.h"
#include "net/eathena/auctionhandler.h"
@@ -380,7 +380,7 @@ void GeneralHandler::gameEnded() const
}
delete2(guildTab);
- delete2(Ea::partyTab);
+ delete2(partyTab);
}
} // namespace EAthena
diff --git a/src/net/eathena/partyhandler.cpp b/src/net/eathena/partyhandler.cpp
index d63aa69cc..030267aa8 100644
--- a/src/net/eathena/partyhandler.cpp
+++ b/src/net/eathena/partyhandler.cpp
@@ -30,7 +30,7 @@
#include "gui/windows/chatwindow.h"
#include "gui/windows/socialwindow.h"
-#include "net/ea/gui/partytab.h"
+#include "gui/widgets/tabs/chat/partytab.h"
#include "net/eathena/messageout.h"
#include "net/eathena/protocol.h"
@@ -243,8 +243,8 @@ void PartyHandler::processPartyMemberInfo(Net::MessageIn &msg)
PartyMember *const member = Ea::taParty->addMember(id, nick);
if (member)
{
- if (Ea::partyTab && member->getOnline() != online)
- Ea::partyTab->showOnline(nick, online);
+ if (partyTab && member->getOnline() != online)
+ partyTab->showOnline(nick, online);
member->setLeader(leader);
member->setOnline(online);
member->setMap(map);
@@ -255,7 +255,7 @@ void PartyHandler::processPartyMemberInfo(Net::MessageIn &msg)
void PartyHandler::processPartySettings(Net::MessageIn &msg)
{
- if (!Ea::partyTab)
+ if (!partyTab)
{
if (!chatWindow)
return;
@@ -279,7 +279,7 @@ void PartyHandler::processPartyInfo(Net::MessageIn &msg) const
logger->log1("error: party empty in SMSG_PARTY_INFO");
Ea::taParty = Party::getParty(1);
}
- if (!Ea::partyTab)
+ if (!partyTab)
createTab();
if (Ea::taParty)
@@ -340,14 +340,14 @@ void PartyHandler::processPartyInfo(Net::MessageIn &msg) const
PartyMember *const member = Ea::taParty->addMember(id, nick);
if (member)
{
- if (!joined && Ea::partyTab)
+ if (!joined && partyTab)
{
if (!names.empty() && ((onlineNames.find(nick)
== onlineNames.end() && online)
|| (onlineNames.find(nick) != onlineNames.end()
&& !online)))
{
- Ea::partyTab->showOnline(nick, online);
+ partyTab->showOnline(nick, online);
}
member->setLeader(leader);
@@ -389,12 +389,12 @@ void PartyHandler::processPartyMessage(Net::MessageIn &msg) const
if (pos != std::string::npos)
chatMsg.erase(0, pos + 3);
- if (Ea::taParty && Ea::partyTab)
+ if (Ea::taParty && partyTab)
{
const PartyMember *const member = Ea::taParty->getMember(id);
if (member)
{
- Ea::partyTab->chatLog(member->getName(), chatMsg);
+ partyTab->chatLog(member->getName(), chatMsg);
}
else
{
@@ -406,7 +406,7 @@ void PartyHandler::processPartyMessage(Net::MessageIn &msg) const
void PartyHandler::processPartyInviteResponse(Net::MessageIn &msg) const
{
- if (!Ea::partyTab)
+ if (!partyTab)
return;
const std::string nick = msg.readString(24, "nick");
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index fb64617a0..c37fc86a0 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -36,7 +36,7 @@
#include "net/ea/guildhandler.h"
#include "gui/widgets/tabs/chat/guildtab.h"
-#include "net/ea/gui/partytab.h"
+#include "gui/widgets/tabs/chat/partytab.h"
#include "net/tmwa/adminhandler.h"
#include "net/tmwa/auctionhandler.h"
@@ -352,7 +352,7 @@ void GeneralHandler::gameEnded() const
}
delete2(guildTab);
- delete2(Ea::partyTab);
+ delete2(partyTab);
}
} // namespace TmwAthena
diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp
index 6d59cd0ce..e2b0c1893 100644
--- a/src/net/tmwa/partyhandler.cpp
+++ b/src/net/tmwa/partyhandler.cpp
@@ -30,7 +30,7 @@
#include "gui/windows/chatwindow.h"
#include "gui/windows/socialwindow.h"
-#include "net/ea/gui/partytab.h"
+#include "gui/widgets/tabs/chat/partytab.h"
#include "net/tmwa/messageout.h"
#include "net/tmwa/protocol.h"
@@ -204,7 +204,7 @@ void PartyHandler::setShareItems(const Net::PartyShare::Type share) const
void PartyHandler::processPartySettings(Net::MessageIn &msg)
{
- if (!Ea::partyTab)
+ if (!partyTab)
{
if (!chatWindow)
return;
@@ -286,14 +286,14 @@ void PartyHandler::processPartyInfo(Net::MessageIn &msg) const
PartyMember *const member = Ea::taParty->addMember(id, nick);
if (member)
{
- if (!joined && Ea::partyTab)
+ if (!joined && partyTab)
{
if (!names.empty() && ((onlineNames.find(nick)
== onlineNames.end() && online)
|| (onlineNames.find(nick) != onlineNames.end()
&& !online)))
{
- Ea::partyTab->showOnline(nick, online);
+ partyTab->showOnline(nick, online);
}
member->setLeader(leader);
@@ -331,12 +331,12 @@ void PartyHandler::processPartyMessage(Net::MessageIn &msg) const
const int id = msg.readInt32();
const std::string chatMsg = msg.readString(msgLength);
- if (Ea::taParty && Ea::partyTab)
+ if (Ea::taParty && partyTab)
{
const PartyMember *const member = Ea::taParty->getMember(id);
if (member)
{
- Ea::partyTab->chatLog(member->getName(), chatMsg);
+ partyTab->chatLog(member->getName(), chatMsg);
}
else
{
@@ -348,7 +348,7 @@ void PartyHandler::processPartyMessage(Net::MessageIn &msg) const
void PartyHandler::processPartyInviteResponse(Net::MessageIn &msg) const
{
- if (!Ea::partyTab)
+ if (!partyTab)
return;
const std::string nick = msg.readString(24);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 05:44:36 +0000