Skip to content

Commit

Permalink
Code format - (Clang-format)
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Oct 21, 2023
1 parent 435a8c7 commit a6b3cdd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
3 changes: 2 additions & 1 deletion src/items/decay/decay.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,8 @@ void Decay::internalDecayItem(std::shared_ptr<Item> item) {
auto player = item->getHoldingPlayer();
if (player) {
g_logger().error("[{}] - internalDecayItem failed to player {}, item id is same from transform equip/deequip, "
" item id: {}, equip to id: '{}', deequip to id '{}'", __FUNCTION__, player->getName(), it.id, it.transformEquipTo, it.transformDeEquipTo);
" item id: {}, equip to id: '{}', deequip to id '{}'",
__FUNCTION__, player->getName(), it.id, it.transformEquipTo, it.transformDeEquipTo);
}
return;
}
Expand Down
6 changes: 2 additions & 4 deletions src/items/functions/item/item_parse.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -385,8 +385,7 @@ void ItemParse::parseTransform(const std::string &tmpStrValue, pugi::xml_attribu
if (stringValue == "transformequipto") {
itemType.transformEquipTo = pugi::cast<uint16_t>(valueAttribute.value());
if (itemType.transformEquipTo == itemType.decayTo) {
g_logger().warn("[{}] item with id {} is transforming on equip to the same id of decay to '{}'",
__FUNCTION__, itemType.id, itemType.decayTo);
g_logger().warn("[{}] item with id {} is transforming on equip to the same id of decay to '{}'", __FUNCTION__, itemType.id, itemType.decayTo);
itemType.decayTo = 0;
}
if (ItemType &transform = Item::items.getItemType(itemType.transformEquipTo);
Expand All @@ -395,8 +394,7 @@ void ItemParse::parseTransform(const std::string &tmpStrValue, pugi::xml_attribu
}
} else if (stringValue == "transformdeequipto") {
if (itemType.transformDeEquipTo == itemType.decayTo) {
g_logger().warn("[{}] item with id {} is transforming on de-equip to the same id of decay to '{}'",
__FUNCTION__, itemType.id, itemType.decayTo);
g_logger().warn("[{}] item with id {} is transforming on de-equip to the same id of decay to '{}'", __FUNCTION__, itemType.id, itemType.decayTo);
itemType.decayTo = 0;
}

Expand Down

0 comments on commit a6b3cdd

Please sign in to comment.