From 9001dc8f88a4e40f80c17a86338e7743a59200e1 Mon Sep 17 00:00:00 2001 From: Andrei Kortunov Date: Wed, 31 May 2023 08:16:21 +0400 Subject: [PATCH] Remove redundant single quotes --- apps/openmw/mwworld/cellstore.cpp | 4 ++-- apps/openmw/mwworld/esmstore.cpp | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp index 1cbf862190..82dded1bf0 100644 --- a/apps/openmw/mwworld/cellstore.cpp +++ b/apps/openmw/mwworld/cellstore.cpp @@ -997,7 +997,7 @@ namespace MWWorld int type = mStore.find(cref.mRefID); if (type == 0) { - Log(Debug::Warning) << "Dropping reference to '" << cref.mRefID << "' (object no longer exists)"; + Log(Debug::Warning) << "Dropping reference to " << cref.mRefID << " (object no longer exists)"; // Skip until the next OBJE or MVRF while (reader.hasMoreSubs() && !reader.peekNextSub("OBJE") && !reader.peekNextSub("MVRF")) { @@ -1248,7 +1248,7 @@ namespace MWWorld const ESM::Enchantment* enchantment = mStore.get().search(enchantmentId); if (!enchantment) { - Log(Debug::Warning) << "Warning: Can't find enchantment '" << enchantmentId << "' on item " + Log(Debug::Warning) << "Warning: Can't find enchantment " << enchantmentId << " on item " << ptr.getCellRef().getRefId(); return; } diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp index 29576709cc..63e1740fff 100644 --- a/apps/openmw/mwworld/esmstore.cpp +++ b/apps/openmw/mwworld/esmstore.cpp @@ -106,8 +106,8 @@ namespace const ESM::Faction* fact = factions.search(npcFaction); if (!fact) { - Log(Debug::Verbose) << "NPC '" << npc.mId << "' (" << npc.mName << ") has nonexistent faction '" - << npc.mFaction << "', ignoring it."; + Log(Debug::Verbose) << "NPC " << npc.mId << " (" << npc.mName << ") has nonexistent faction " + << npc.mFaction << ", ignoring it."; npc.mFaction = ESM::RefId(); npc.mNpdt.mRank = 0; changed = true; @@ -118,8 +118,8 @@ namespace const ESM::Class* cls = classes.search(npcClass); if (!cls) { - Log(Debug::Verbose) << "NPC '" << npc.mId << "' (" << npc.mName << ") has nonexistent class '" - << npc.mClass << "', using '" << defaultCls << "' class as replacement."; + Log(Debug::Verbose) << "NPC " << npc.mId << " (" << npc.mName << ") has nonexistent class " + << npc.mClass << ", using " << defaultCls << " class as replacement."; npc.mClass = defaultCls; changed = true; } @@ -141,8 +141,8 @@ namespace if (!item.mScript.empty() && !scripts.search(item.mScript)) { item.mScript = ESM::RefId(); - Log(Debug::Verbose) << "Item '" << id << "' (" << item.mName << ") has nonexistent script '" - << item.mScript << "', ignoring it."; + Log(Debug::Verbose) << "Item " << id << " (" << item.mName << ") has nonexistent script " + << item.mScript << ", ignoring it."; } } } @@ -616,8 +616,8 @@ namespace MWWorld auto first = std::remove_if(entry.second.mList.begin(), entry.second.mList.end(), [&](const auto& item) { if (!find(item.mId)) { - Log(Debug::Verbose) << "Leveled list '" << entry.first << "' has nonexistent object '" << item.mId - << "', ignoring it."; + Log(Debug::Verbose) << "Leveled list " << entry.first << " has nonexistent object " << item.mId + << ", ignoring it."; return true; } return false;