[Bug Fix] Merchant Open Flag set only for regular Merchants (#3454)

* [Bug Fix] Merchant Open Flag set only for regular Merchants

* Update npc.cpp
This commit is contained in:
Alex King 2023-06-27 16:23:48 -04:00 committed by GitHub
parent a004924112
commit b05f1d3218
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -243,7 +243,14 @@ NPC::NPC(const NPCType *npc_type_data, Spawn2 *in_respawn, const glm::vec4 &posi
SetMana(GetMaxMana()); SetMana(GetMaxMana());
MerchantType = npc_type_data->merchanttype; MerchantType = npc_type_data->merchanttype;
merchant_open = GetClass() == MERCHANT; merchant_open = (
GetClass() == MERCHANT ||
GetClass() == DISCORD_MERCHANT ||
GetClass() == ADVENTURE_MERCHANT ||
GetClass() == NORRATHS_KEEPERS_MERCHANT ||
GetClass() == DARK_REIGN_MERCHANT ||
GetClass() == ALT_CURRENCY_MERCHANT
);
adventure_template_id = npc_type_data->adventure_template; adventure_template_id = npc_type_data->adventure_template;
flymode = iflymode; flymode = iflymode;