metin2/server
metin2/server
2
2
Fork 10
Code Issues 12 Pull Requests 3 Packages Projects Releases Wiki Activity

Merge updates from the nightly branch #34

Merged
Exynox merged 73 commits from nightly into master 2024-11-16 18:17:14 +02:00
Conversation 0 Commits 73 Files Changed 1311 +7 -27
1 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bb52a57ffc - Show all commits

34
src/game/src/char.cpp
View File

@ -862,39 +862,19 @@ void CHARACTER::EncodeInsertPacket(LPENTITY entity)
addPacket.dwLevel = GetLevel();
}
//TODO: what is this doing here?
if (false)
{
LPCHARACTER ch = (LPCHARACTER) entity;
strlcpy(addPacket.name, GetName(), sizeof(addPacket.name));
if (GetEmpire() == ch->GetEmpire() || ch->GetGMLevel() > GM_PLAYER || m_bCharType == CHAR_TYPE_NPC)
{
goto show_all_info;
}
else
{
memset(addPacket.name, 0, CHARACTER_NAME_MAX_LEN);
addPacket.dwGuildID = 0;
addPacket.sAlignment = 0;
}
if (GetGuild() != NULL)
{
addPacket.dwGuildID = GetGuild()->GetID();
}
else
{
show_all_info:
strlcpy(addPacket.name, GetName(), sizeof(addPacket.name));
if (GetGuild() != NULL)
{
addPacket.dwGuildID = GetGuild()->GetID();
}
else
{
addPacket.dwGuildID = 0;
}
addPacket.sAlignment = m_iAlignment / 10;
addPacket.dwGuildID = 0;
}
addPacket.sAlignment = m_iAlignment / 10;
d->Packet(&addPacket, sizeof(TPacketGCCharacterAdditionalInfo));
}