From 308302f858d24d2cc1b1601b100324e2baa50765 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Mon, 8 Feb 2010 16:20:39 -0700 Subject: Move party creation command from eA's PartyTab to CommandHandler Also fix party invite by name when you aren't in a party. --- src/net/ea/gui/partytab.cpp | 10 +--------- src/net/ea/partyhandler.cpp | 12 +++++++++++- 2 files changed, 12 insertions(+), 10 deletions(-) (limited to 'src/net') diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp index e6526a3a..bcb449ab 100644 --- a/src/net/ea/gui/partytab.cpp +++ b/src/net/ea/gui/partytab.cpp @@ -55,8 +55,6 @@ void PartyTab::handleInput(const std::string &msg) void PartyTab::showHelp() { chatLog(_("/help > Display this help.")); - chatLog(_("/create > Create a new party")); - chatLog(_("/new > Alias of create")); chatLog(_("/invite > Invite a player to your party")); chatLog(_("/leave > Leave the party you are in")); chatLog(_("/kick > Kick some one from the party you are in")); @@ -68,13 +66,7 @@ bool PartyTab::handleCommand(const std::string &type, const std::string &args) { if (type == "help") { - if (args == "create" || args == "new") - { - chatLog(_("Command: /new ")); - chatLog(_("Command: /create ")); - chatLog(_("These commands create a new party called .")); - } - else if (args == "invite") + if (args == "invite") { chatLog(_("Command: /invite ")); chatLog(_("This command invites to party with you.")); diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp index 030914b4..ddbe567f 100644 --- a/src/net/ea/partyhandler.cpp +++ b/src/net/ea/partyhandler.cpp @@ -320,7 +320,17 @@ void PartyHandler::invite(Player *player) void PartyHandler::invite(const std::string &name) { - partyTab->chatLog(_("Inviting like this isn't supported at the moment."), BY_SERVER); + if (partyTab) + { + partyTab->chatLog(_("Inviting like this isn't supported at the moment."), + BY_SERVER); + } + else + { + localChatTab->chatLog(_("You can only inivte when you are in a party!"), + BY_SERVER); + } + // TODO? } -- cgit v1.2.3-60-g2f50