diff options
| author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-20 16:59:56 +0100 |
|---|---|---|
| committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-20 16:59:56 +0100 |
| commit | 551675cb8284b03a1e43be9d11eda0bab7b70139 (patch) | |
| tree | eed1121d421176f4044e5f38190c767f6b905388 /src/net/manaserv/guildhandler.cpp | |
| parent | ae14594cfa804a89a36312e142498eca7f147cc9 (diff) | |
| parent | d4a407254cfffbb79087c1248650fbaed5d568d8 (diff) | |
| download | mana-551675cb8284b03a1e43be9d11eda0bab7b70139.tar.gz mana-551675cb8284b03a1e43be9d11eda0bab7b70139.tar.bz2 mana-551675cb8284b03a1e43be9d11eda0bab7b70139.tar.xz mana-551675cb8284b03a1e43be9d11eda0bab7b70139.zip | |
Merge branch 'master' into lpc2012
Conflicts:
src/graphics.h
src/gui/setup_video.cpp
src/gui/specialswindow.cpp
src/gui/viewport.cpp
src/gui/widgets/container.cpp
src/gui/widgets/container.h
Diffstat (limited to 'src/net/manaserv/guildhandler.cpp')
| -rw-r--r-- | src/net/manaserv/guildhandler.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/net/manaserv/guildhandler.cpp b/src/net/manaserv/guildhandler.cpp index cd22fcec..19fa03ca 100644 --- a/src/net/manaserv/guildhandler.cpp +++ b/src/net/manaserv/guildhandler.cpp @@ -105,6 +105,10 @@ void GuildHandler::handleMessage(MessageIn &msg) { SERVER_NOTICE(_("Invited player can't join another guild.")); } + else // any other failure + { + SERVER_NOTICE(_("Invite failed.")); + } } break; case CPMSG_GUILD_ACCEPT_RESPONSE: |