mirror of
https://github.com/mangosfour/server.git
synced 2025-12-15 10:37:02 +00:00
[11814] Use the same variable to store the message for AFK and DND
Also make code in this area easier to read Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
This commit is contained in:
parent
e89d5db5e3
commit
5b0c0c9fa4
4 changed files with 42 additions and 40 deletions
|
|
@ -454,41 +454,48 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
|
|||
|
||||
if (!_player->isInCombat())
|
||||
{
|
||||
if (!msg.empty() || !_player->isAFK())
|
||||
if (_player->isAFK()) // Already AFK
|
||||
{
|
||||
if (msg.empty())
|
||||
_player->afkMsg = GetMangosString(LANG_PLAYER_AFK_DEFAULT);
|
||||
_player->ToggleAFK(); // Remove AFK
|
||||
else
|
||||
_player->afkMsg = msg;
|
||||
_player->autoReplyMsg = msg; // Update message
|
||||
}
|
||||
if (msg.empty() || !_player->isAFK())
|
||||
else // New AFK mode
|
||||
{
|
||||
_player->ToggleAFK();
|
||||
if (_player->isAFK() && _player->isDND())
|
||||
_player->autoReplyMsg = msg.empty() ? GetMangosString(LANG_PLAYER_AFK_DEFAULT) : msg;
|
||||
|
||||
if (_player->isDND())
|
||||
_player->ToggleDND();
|
||||
|
||||
_player->ToggleAFK();
|
||||
}
|
||||
}
|
||||
} break;
|
||||
|
||||
break;
|
||||
}
|
||||
case CHAT_MSG_DND:
|
||||
{
|
||||
std::string msg;
|
||||
recv_data >> msg;
|
||||
|
||||
if (!msg.empty() || !_player->isDND())
|
||||
if (_player->isDND()) // Already DND
|
||||
{
|
||||
if (msg.empty())
|
||||
_player->dndMsg = GetMangosString(LANG_PLAYER_DND_DEFAULT);
|
||||
_player->ToggleDND(); // Remove DND
|
||||
else
|
||||
_player->dndMsg = msg;
|
||||
_player->autoReplyMsg = msg; // Update message
|
||||
}
|
||||
if (msg.empty() || !_player->isDND())
|
||||
else // New DND mode
|
||||
{
|
||||
_player->ToggleDND();
|
||||
if (_player->isDND() && _player->isAFK())
|
||||
_player->autoReplyMsg = msg.empty() ? GetMangosString(LANG_PLAYER_DND_DEFAULT) : msg;
|
||||
|
||||
if (_player->isAFK())
|
||||
_player->ToggleAFK();
|
||||
|
||||
_player->ToggleDND();
|
||||
}
|
||||
} break;
|
||||
break;
|
||||
}
|
||||
|
||||
default:
|
||||
sLog.outError("CHAT: unknown message type %u, lang: %u", type, lang);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue