From 07f7d52f661a74e6d0c780ca53e724651e3dcc48 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Mon, 9 Feb 2009 22:30:00 +0100 Subject: Mostly whitespace fixes Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(". --- src/party.cpp | 132 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 67 insertions(+), 65 deletions(-) (limited to 'src/party.cpp') diff --git a/src/party.cpp b/src/party.cpp index ecb0ab2d..bf9d3a06 100644 --- a/src/party.cpp +++ b/src/party.cpp @@ -34,7 +34,9 @@ #include "utils/strprintf.h" Party::Party(ChatWindow *chat, Network *network) : - mChat(chat), mNetwork(network), mInviteListener(network, &mInParty) + mChat(chat), + mNetwork(network), + mInviteListener(network, &mInParty) { } @@ -42,24 +44,24 @@ void Party::respond(const std::string &command, const std::string &args) { if (command == "new" || command == "create") { - create(args); - return; + create(args); + return; } if (command == "leave") { - leave(args); - return; + leave(args); + return; } if (command == "settings") { - mChat->chatLog(_("Not yet implemented!"), BY_SERVER); - return; - /* - MessageOut outMsg(mNetwork); - outMsg.writeInt16(CMSG_PARTY_SETTINGS); - outMsg.writeInt16(0); // Experience - outMsg.writeInt16(0); // Item - */ + mChat->chatLog(_("Not yet implemented!"), BY_SERVER); + return; + /* + MessageOut outMsg(mNetwork); + outMsg.writeInt16(CMSG_PARTY_SETTINGS); + outMsg.writeInt16(0); // Experience + outMsg.writeInt16(0); // Item + */ } mChat->chatLog(_("Party command not known."), BY_SERVER); } @@ -68,8 +70,8 @@ void Party::create(const std::string &party) { if (party == "") { - mChat->chatLog(_("Party name is missing."), BY_SERVER); - return; + mChat->chatLog(_("Party name is missing."), BY_SERVER); + return; } MessageOut outMsg(mNetwork); outMsg.writeInt16(CMSG_PARTY_CREATE); @@ -89,12 +91,12 @@ void Party::createResponse(bool ok) { if (ok) { - mChat->chatLog(_("Party successfully created."), BY_SERVER); - mInParty = true; + mChat->chatLog(_("Party successfully created."), BY_SERVER); + mInParty = true; } else { - mChat->chatLog(_("Could not create party."), BY_SERVER); + mChat->chatLog(_("Could not create party."), BY_SERVER); } } @@ -103,34 +105,34 @@ void Party::inviteResponse(const std::string &nick, int status) switch (status) { case 0: - mChat->chatLog(strprintf(_("%s is already a member of a party."), - nick.c_str()), BY_SERVER); - break; + mChat->chatLog(strprintf(_("%s is already a member of a party."), + nick.c_str()), BY_SERVER); + break; case 1: - mChat->chatLog(strprintf(_("%s refused your invitation."), - nick.c_str()), BY_SERVER); - break; + mChat->chatLog(strprintf(_("%s refused your invitation."), + nick.c_str()), BY_SERVER); + break; case 2: - mChat->chatLog(strprintf(_("%s is now a member of your party."), - nick.c_str()), BY_SERVER); - break; + mChat->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) + const std::string &partyName) { mPartyName = partyName; /* Quick and nasty - needs redoing */ if (nick == "") { mChat->chatLog(_("You can\'t have a blank party name!"), BY_SERVER); - return; + 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())); + strprintf(_("%s invites you to join" + " the %s party, do you accept?"), + nick.c_str(), partyName.c_str())); dlg->addActionListener(&mInviteListener); } @@ -146,7 +148,7 @@ void Party::InviteListener::action(const gcn::ActionEvent &event) void Party::leftResponse(const std::string &nick) { - mChat->chatLog(strprintf(_("%s has left your party."), nick.c_str()), + mChat->chatLog(strprintf(_("%s has left your party."), nick.c_str()), BY_SERVER); } @@ -154,13 +156,13 @@ void Party::receiveChat(Being *being, const std::string &msg) { if (being == NULL) { - return; + return; } if (being->getType() != Being::PLAYER) { - mChat->chatLog(_("Party chat received, but being is not a player"), + mChat->chatLog(_("Party chat received, but being is not a player"), BY_SERVER); - return; + return; } being->setSpeech(msg, SPEECH_TIME); mChat->chatLog(being->getName() + " : " + msg, BY_PARTY); @@ -175,46 +177,46 @@ void Party::help(const std::string &msg) { if (msg == "") { - mChat->chatLog(_("Command: /party "), BY_SERVER); - mChat->chatLog(_("where can be one of:"), BY_SERVER); - mChat->chatLog(_(" /new"), BY_SERVER); - mChat->chatLog(_(" /create"), BY_SERVER); - mChat->chatLog(_(" /prefix"), BY_SERVER); - mChat->chatLog(_(" /leave"), BY_SERVER); - mChat->chatLog(_("This command implements the partying function."), - BY_SERVER); - mChat->chatLog(_("Type /help party for further help."), - BY_SERVER); - return; + mChat->chatLog(_("Command: /party "), BY_SERVER); + mChat->chatLog(_("where can be one of:"), BY_SERVER); + mChat->chatLog(_(" /new"), BY_SERVER); + mChat->chatLog(_(" /create"), BY_SERVER); + mChat->chatLog(_(" /prefix"), BY_SERVER); + mChat->chatLog(_(" /leave"), BY_SERVER); + mChat->chatLog(_("This command implements the partying function."), + BY_SERVER); + mChat->chatLog(_("Type /help party for further help."), + BY_SERVER); + return; } if (msg == "new" || msg == "create") { - mChat->chatLog(_("Command: /party new "), BY_SERVER); - mChat->chatLog(_("Command: /party create "), BY_SERVER); - mChat->chatLog(_("These commands create a new party chatLog(_("Command: /party new "), BY_SERVER); + mChat->chatLog(_("Command: /party create "), BY_SERVER); + mChat->chatLog(_("These commands create a new party chatLog(_("Command: /party prefix "), BY_SERVER); - mChat->chatLog(_("This command sets the party prefix character."), - BY_SERVER); - mChat->chatLog(_("Any message preceded by is sent to " - "the party instead of everyone."), BY_SERVER); - mChat->chatLog(_("Command: /party prefix"), BY_SERVER); - mChat->chatLog(_("This command reports the current party prefix " - "character."), BY_SERVER); - return; + mChat->chatLog(_("Command: /party prefix "), BY_SERVER); + mChat->chatLog(_("This command sets the party prefix character."), + BY_SERVER); + mChat->chatLog(_("Any message preceded by is sent to " + "the party instead of everyone."), BY_SERVER); + mChat->chatLog(_("Command: /party prefix"), BY_SERVER); + mChat->chatLog(_("This command reports the current party prefix " + "character."), BY_SERVER); + return; } //if (msg == "settings") //if (msg == "info") if (msg == "leave") { - mChat->chatLog(_("Command: /party leave"), BY_SERVER); - mChat->chatLog(_("This command causes the player to leave the party."), - BY_SERVER); - return; + mChat->chatLog(_("Command: /party leave"), BY_SERVER); + mChat->chatLog(_("This command causes the player to leave the party."), + BY_SERVER); + return; } mChat->chatLog(_("Unknown /party command."), BY_SERVER); mChat->chatLog(_("Type /help party for a list of options."), BY_SERVER); -- cgit v1.2.3-70-g09d2