Merge

2026-05-16 18:52:22 +00:00 · 2017-08-09 10:42:07 -07:00
parent 575ba28b62 bb8c6da0b4
commit ffbee0ad1a
43 changed files with 1620 additions and 175 deletions
@@ -1211,6 +1211,7 @@ void Merc::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho) {
 		ns->spawn.flymode = 0;
 		ns->spawn.NPC = 1;                                      // 0=player,1=npc,2=pc corpse,3=npc corpse
 		ns->spawn.IsMercenary = 1;
+		ns->spawn.show_name = true;

 		UpdateActiveLight();
 		ns->spawn.light = m_Light.Type[EQEmu::lightsource::LightActive];