diff options
| author | Stefan Dombrowski <stefan@uni-bonn.de> | 2010-08-27 19:03:18 +0200 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-08-27 11:17:35 -0600 |
| commit | ef9eec73b3cc96ebecdc061e9e956a462fdcc19f (patch) | |
| tree | 3e7d4cdc5db041d8a782266e85cc9e7d068b9863 | |
| parent | c538f6372d9068140231749b0225a6a355009074 (diff) | |
| download | Mana-ef9eec73b3cc96ebecdc061e9e956a462fdcc19f.tar.gz Mana-ef9eec73b3cc96ebecdc061e9e956a462fdcc19f.tar.bz2 Mana-ef9eec73b3cc96ebecdc061e9e956a462fdcc19f.tar.xz Mana-ef9eec73b3cc96ebecdc061e9e956a462fdcc19f.zip | |
Changing findBeingByName so that it searches case insensitive
Adding error message when trying to create a party with to long name.
Removing non-existing files from C::B project.
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
| -rw-r--r-- | mana.cbp | 2 | ||||
| -rw-r--r-- | src/beingmanager.cpp | 2 | ||||
| -rw-r--r-- | src/gui/socialwindow.cpp | 6 | ||||
| -rw-r--r-- | src/net/tmwa/partyhandler.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
@@ -137,7 +137,6 @@ <Unit filename="src\effectmanager.h" /> <Unit filename="src\emoteshortcut.cpp" /> <Unit filename="src\emoteshortcut.h" /> - <Unit filename="src\engine.h" /> <Unit filename="src\equipment.h" /> <Unit filename="src\flooritem.cpp" /> <Unit filename="src\flooritem.h" /> @@ -369,7 +368,6 @@ <Unit filename="src\keyboardconfig.h" /> <Unit filename="src\localplayer.cpp" /> <Unit filename="src\localplayer.h" /> - <Unit filename="src\lockedarray.h" /> <Unit filename="src\log.cpp" /> <Unit filename="src\log.h" /> <Unit filename="src\main.cpp" /> diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp index 656b297e..931e4579 100644 --- a/src/beingmanager.cpp +++ b/src/beingmanager.cpp @@ -165,7 +165,7 @@ Being *BeingManager::findBeingByName(const std::string &name, i != i_end; ++i) { Being *being = (*i); - if (being->getName() == name && + if (!compareStrI(being->getName(),name) && (type == Being::UNKNOWN || type == being->getType())) return being; } diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index 3d8afa44..290fd557 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -498,7 +498,8 @@ void SocialWindow::action(const gcn::ActionEvent &event) if (name.size() > 16) { - // TODO : State too many characters in input. + localChatTab->chatLog(_("Creating guild failed, please choose a " + "shorter name."), BY_SERVER); return; } @@ -518,7 +519,8 @@ void SocialWindow::action(const gcn::ActionEvent &event) if (name.size() > 16) { - // TODO : State too many characters in input. + localChatTab->chatLog(_("Creating party failed, please choose a " + "shorter name."), BY_SERVER); return; } diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp index 76108e9c..a88a27b6 100644 --- a/src/net/tmwa/partyhandler.cpp +++ b/src/net/tmwa/partyhandler.cpp @@ -333,7 +333,7 @@ void PartyHandler::invite(const std::string &name) { invite((Player *)invitee); partyTab->chatLog(strprintf(_("Invited user %s to party."), - name.c_str()), BY_SERVER); + invitee->getName().c_str()), BY_SERVER); } else if (partyTab) { |