Clean up some ifdefs and start cleanup of parties

6 files changed, 395 insertions, 4 deletions

diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp
new file mode 100644
index 00000000..a55d2492
--- /dev/null
+++ b/src/net/ea/gui/partytab.cpp
@@ -0,0 +1,53 @@
+/*
+ *  The Mana World
+ *  Copyright (C) 2008  The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <guichan/widgets/label.hpp>
+
+#include "partytab.h"
+
+#include "net/messageout.h"
+
+#include "net/ea/party.h"
+#include "net/ea/protocol.h"
+
+#include "resources/iteminfo.h"
+#include "resources/itemdb.h"
+
+#include "utils/dtor.h"
+#include "utils/gettext.h"
+#include "utils/strprintf.h"
+#include "utils/stringutils.h"
+
+PartyTab::PartyTab() : ChatTab(_("Party"))
+{
+}
+
+PartyTab::~PartyTab()
+{
+}
+
+void PartyTab::handleInput(std::string &msg) {
+    // TODO
+}
+
+void PartyTab::handleCommand(std::string &msg) {
+    // TODO
+}
diff --git a/src/net/ea/gui/partytab.h b/src/net/ea/gui/partytab.h
new file mode 100644
index 00000000..b2aaca68
--- /dev/null
+++ b/src/net/ea/gui/partytab.h
@@ -0,0 +1,49 @@
+/*
+ *  The Mana World
+ *  Copyright (C) 2009  The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef CHANNELTAB_H
+#define CHANNELTAB_H
+
+#include "gui/widgets/chattab.h"
+
+/**
+ * A tab for a chat channel.
+ */
+class PartyTab : public ChatTab
+{
+    public:
+        /**
+         * Constructor.
+         */
+        PartyTab();
+
+        /**
+         * Destructor.
+         */
+        ~PartyTab();
+
+    protected:
+        void handleInput(const std::string &msg);
+
+        void handleCommand(std::string msg);
+};
+
+#endif // CHANNELTAB_H
diff --git a/src/net/ea/party.cpp b/src/net/ea/party.cpp
new file mode 100644
index 00000000..2295cb81
--- /dev/null
+++ b/src/net/ea/party.cpp
@@ -0,0 +1,215 @@
+/*
+ *  The Mana World
+ *  Copyright (C) 2008  Lloyd Bryant <lloyd_bryant@netzero.net>
+ *
+ *  This file is part of The Mana World.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "being.h"
+#include "localplayer.h"
+#include "party.h"
+
+#include "gui/widgets/chattab.h"
+#include "gui/chat.h"
+#include "gui/confirm_dialog.h"
+
+#include "net/messageout.h"
+#include "net/ea/protocol.h"
+
+#include "utils/gettext.h"
+#include "utils/strprintf.h"
+
+Party::Party() :
+    mInviteListener(&mInParty)
+{
+}
+
+void Party::respond(const std::string &command, const std::string &args)
+{
+    if (command == "new" || command == "create")
+    {
+        create(args);
+        return;
+    }
+    if (command == "leave")
+    {
+        leave(args);
+        return;
+    }
+    if (command == "settings")
+    {
+        localChatTab->chatLog(_("Not yet implemented!"), BY_SERVER);
+        return;
+        /*
+        MessageOut outMsg(CMSG_PARTY_SETTINGS);
+        outMsg.writeInt16(0); // Experience
+        outMsg.writeInt16(0); // Item
+        */
+    }
+    localChatTab->chatLog(_("Party command not known."), BY_SERVER);
+}
+
+void Party::create(const std::string &party)
+{
+    if (party.empty())
+    {
+        localChatTab->chatLog(_("Party name is missing."), BY_SERVER);
+        return;
+    }
+    MessageOut outMsg(CMSG_PARTY_CREATE);
+    outMsg.writeString(party.substr(0, 23), 24);
+    mCreating = true;
+}
+
+void Party::leave(const std::string &args)
+{
+    MessageOut outMsg(CMSG_PARTY_LEAVE);
+    localChatTab->chatLog(_("Left party."), BY_SERVER);
+    mInParty = false;
+}
+
+void Party::createResponse(bool ok)
+{
+    if (ok)
+    {
+        localChatTab->chatLog(_("Party successfully created."), BY_SERVER);
+        mInParty = true;
+    }
+    else
+    {
+        localChatTab->chatLog(_("Could not create party."), BY_SERVER);
+    }
+}
+
+void Party::inviteResponse(const std::string &nick, int status)
+{
+    switch (status)
+    {
+        case 0:
+            localChatTab->chatLog(strprintf(_("%s is already a member of a party."),
+                        nick.c_str()), BY_SERVER);
+            break;
+        case 1:
+            localChatTab->chatLog(strprintf(_("%s refused your invitation."),
+                        nick.c_str()), BY_SERVER);
+            break;
+        case 2:
+            localChatTab->chatLog(strprintf(_("%s is now a member of your party."),
+                        nick.c_str()), BY_SERVER);
+            break;
+    }
+}
+
+void Party::invitedAsk(const std::string &nick, int gender,
+                       const std::string &partyName)
+{
+    mPartyName = partyName; /* Quick and nasty - needs redoing */
+    if (nick.empty())
+    {
+        localChatTab->chatLog(_("You can\'t have a blank party name!"), BY_SERVER);
+        return;
+    }
+    mCreating = false;
+    ConfirmDialog *dlg = new ConfirmDialog(_("Invite to party"),
+            strprintf(_("%s invites you to join"
+                        " the %s party, do you accept?"),
+                nick.c_str(), partyName.c_str()));
+    dlg->addActionListener(&mInviteListener);
+}
+
+void Party::InviteListener::action(const gcn::ActionEvent &event)
+{
+    MessageOut outMsg(CMSG_PARTY_INVITED);
+    outMsg.writeInt32(player_node->getId());
+    bool accept = event.getId() == "yes";
+    outMsg.writeInt32(accept ? 1 : 0);
+    *mInParty = *mInParty || accept;
+}
+
+void Party::leftResponse(const std::string &nick)
+{
+    localChatTab->chatLog(strprintf(_("%s has left your party."), nick.c_str()),
+                               BY_SERVER);
+}
+
+void Party::receiveChat(Being *being, const std::string &msg)
+{
+    if (!being)
+    {
+        return;
+    }
+    if (being->getType() != Being::PLAYER)
+    {
+        localChatTab->chatLog(_("Party chat received, but being is not a player"),
+                       BY_SERVER);
+        return;
+    }
+    being->setSpeech(msg, SPEECH_TIME);
+    localChatTab->chatLog(being->getName() + " : " + msg, BY_PARTY);
+}
+
+void Party::help(const std::string &args)
+{
+    // Strip "party " from the front
+    std::string msg = args.substr(6, args.length());
+
+    if (msg.empty())
+    {
+        localChatTab->chatLog(_("Command: /party <command> <args>"), BY_SERVER);
+        localChatTab->chatLog(_("where <command> can be one of:"), BY_SERVER);
+        localChatTab->chatLog(_("   /new"), BY_SERVER);
+        localChatTab->chatLog(_("   /create"), BY_SERVER);
+        localChatTab->chatLog(_("   /prefix"), BY_SERVER);
+        localChatTab->chatLog(_("   /leave"), BY_SERVER);
+        localChatTab->chatLog(_("This command implements the partying function."),
+                       BY_SERVER);
+        localChatTab->chatLog(_("Type /help party <command> for further help."),
+                       BY_SERVER);
+        return;
+    }
+    if (msg == "new" || msg == "create")
+    {
+        localChatTab->chatLog(_("Command: /party new <party-name>"), BY_SERVER);
+        localChatTab->chatLog(_("Command: /party create <party-name>"), BY_SERVER);
+        localChatTab->chatLog(_("These commands create a new party <party-name."),
+                BY_SERVER);
+        return;
+    }
+    if (msg == "prefix")
+    {
+        localChatTab->chatLog(_("Command: /party prefix <prefix-char>"), BY_SERVER);
+        localChatTab->chatLog(_("This command sets the party prefix character."),
+                       BY_SERVER);
+        localChatTab->chatLog(_("Any message preceded by <prefix-char> is sent to "
+                         "the party instead of everyone."), BY_SERVER);
+        localChatTab->chatLog(_("Command: /party prefix"), BY_SERVER);
+        localChatTab->chatLog(_("This command reports the current party prefix "
+                         "character."), BY_SERVER);
+        return;
+    }
+    //if (msg == "settings")
+    //if (msg == "info")
+    if (msg == "leave")
+    {
+        localChatTab->chatLog(_("Command: /party leave"), BY_SERVER);
+        localChatTab->chatLog(_("This command causes the player to leave the party."),
+                BY_SERVER);
+        return;
+    }
+    localChatTab->chatLog(_("Unknown /party command."), BY_SERVER);
+    localChatTab->chatLog(_("Type /help party for a list of options."), BY_SERVER);
+}
diff --git a/src/net/ea/party.h b/src/net/ea/party.h
new file mode 100644
index 00000000..25af80b3
--- /dev/null
+++ b/src/net/ea/party.h
@@ -0,0 +1,74 @@
+/*
+ *  The Mana World
+ *  Copyright (C) 2008  Lloyd Bryant <lloyd_bryant@netzero.net>
+ *
+ *  This file is part of The Mana World.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef PARTY_H
+#define PARTY_H
+
+#include <string>
+
+#include <guichan/actionlistener.hpp>
+
+class PartyHandler;
+class Being;
+class ChatWindow;
+
+class Party
+{
+    public:
+        Party();
+        void respond(const std::string &command, const std::string &args);
+
+        void create(const std::string &party);
+        void leave(const std::string &args);
+
+        void createResponse(bool ok);
+        void inviteResponse(const std::string &nick, int status);
+        void invitedAsk(const std::string &nick, int gender,
+                        const std::string &partyName);
+        void leftResponse(const std::string &nick);
+        void receiveChat(Being *being, const std::string &msg);
+
+        void help(const std::string &args);
+
+    private:
+        std::string mPartyName;
+        bool mInParty;
+        bool mCreating; /**< Used to give an appropriate response to
+                          failure */
+        PartyHandler *handler;
+
+        class InviteListener : public gcn::ActionListener
+        {
+            public:
+                InviteListener(bool *inParty) :
+                    mInParty(inParty)
+                {}
+                void action(const gcn::ActionEvent &event);
+
+            private:
+                bool *mInParty;
+        };
+        InviteListener mInviteListener;
+};
+
+extern Party *playerParty;
+
+#endif
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index bf775f51..05f74630 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -24,6 +24,7 @@
 #include "net/ea/protocol.h"
 
 #include "net/messagein.h"
+#include "net/messageout.h"
 
 #include "engine.h"
 #include "localplayer.h"
@@ -193,7 +194,9 @@ void PlayerHandler::handleMessage(MessageIn &msg)
                 nearby = (engine->getCurrentMapName() == mapPath);
 
                 // Switch the actual map, deleting the previous one if necessary
-                engine->changeMap(mapPath);
+                mapPath = mapPath.substr(0, mapPath.rfind("."));
+                if (engine->changeMap(mapPath))
+                    MessageOut outMsg(CMSG_MAP_LOADED);
 
                 float scrollOffsetX = 0.0f;
                 float scrollOffsetY = 0.0f;
diff --git a/src/net/tmwserv/playerhandler.cpp b/src/net/tmwserv/playerhandler.cpp
index f02ed4c1..106894a1 100644
--- a/src/net/tmwserv/playerhandler.cpp
+++ b/src/net/tmwserv/playerhandler.cpp
@@ -85,9 +85,6 @@ namespace {
             npcTextDialog->setVisible(false);
             buyDialog->setVisible(false);
             sellDialog->setVisible(false);
-#ifdef EATHENA_SUPPORT
-            buySellDialog->setVisible(false);
-#endif
             current_npc = 0;
         }
     } deathListener;