diff --git a/src/game/src/char.cpp b/src/game/src/char.cpp index 8bab896..ae92060 100644 --- a/src/game/src/char.cpp +++ b/src/game/src/char.cpp @@ -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)); }