Refactor message functions

This commit is contained in:
Akkadius
2019-08-11 00:14:02 -05:00
parent 57354579aa
commit 9f25c9070c
38 changed files with 814 additions and 579 deletions
+3 -3
View File
@@ -7284,7 +7284,7 @@ void bot_subcommand_inventory_remove(Client *c, const Seperator *sep)
int ab_mask = (ActionableBots::ABM_Target | ActionableBots::ABM_ByName);
if (c->GetTradeskillObject() || (c->trade->state == Trading)) {
c->Message_StringID(Chat::Tell, MERCHANT_BUSY);
c->MessageString(Chat::Tell, MERCHANT_BUSY);
return;
}
@@ -7310,7 +7310,7 @@ void bot_subcommand_inventory_remove(Client *c, const Seperator *sep)
itm = itminst->GetItem();
if (itminst && itm && c->CheckLoreConflict(itm)) {
c->Message_StringID(Chat::WhiteSmoke, PICK_LORE);
c->MessageString(Chat::WhiteSmoke, PICK_LORE);
return;
}
@@ -7324,7 +7324,7 @@ void bot_subcommand_inventory_remove(Client *c, const Seperator *sep)
if (!c->CheckLoreConflict(itma->GetItem()))
continue;
c->Message_StringID(Chat::WhiteSmoke, PICK_LORE);
c->MessageString(Chat::WhiteSmoke, PICK_LORE);
return;
}