mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-02 08:41:32 +00:00
Code Issues Releases Wiki Activity

Merge branch 'quotes' into 'master'

Browse source 
Remove redundant quotes

See merge request OpenMW/openmw!3091
This commit is contained in:
psi29a 2023-06-04 11:28:14 +00:00
commit d8463a34d3
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwworld/cellstore.cpp
View file

@ -995,7 +995,7 @@ namespace MWWorld
int type = mStore.find(cref.mRefID); int type = mStore.find(cref.mRefID);
if (type == 0) 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 // Skip until the next OBJE or MVRF
while (reader.hasMoreSubs() && !reader.peekNextSub("OBJE") && !reader.peekNextSub("MVRF")) while (reader.hasMoreSubs() && !reader.peekNextSub("OBJE") && !reader.peekNextSub("MVRF"))
{ {
@ -1241,7 +1241,7 @@ namespace MWWorld
const ESM::Enchantment* enchantment = mStore.get<ESM::Enchantment>().search(enchantmentId); const ESM::Enchantment* enchantment = mStore.get<ESM::Enchantment>().search(enchantmentId);
if (!enchantment) 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(); << ptr.getCellRef().getRefId();
return; return;
} }

16
apps/openmw/mwworld/esmstore.cpp
View file

@ -106,8 +106,8 @@ namespace
const ESM::Faction* fact = factions.search(npcFaction); const ESM::Faction* fact = factions.search(npcFaction);
if (!fact) if (!fact)
{ {
Log(Debug::Verbose) << "NPC '" << npc.mId << "' (" << npc.mName << ") has nonexistent faction '" Log(Debug::Verbose) << "NPC " << npc.mId << " (" << npc.mName << ") has nonexistent faction "
<< npc.mFaction << "', ignoring it."; << npc.mFaction << ", ignoring it.";
npc.mFaction = ESM::RefId(); npc.mFaction = ESM::RefId();
npc.mNpdt.mRank = 0; npc.mNpdt.mRank = 0;
changed = true; changed = true;
@ -118,8 +118,8 @@ namespace
const ESM::Class* cls = classes.search(npcClass); const ESM::Class* cls = classes.search(npcClass);
if (!cls) if (!cls)
{ {
Log(Debug::Verbose) << "NPC '" << npc.mId << "' (" << npc.mName << ") has nonexistent class '" Log(Debug::Verbose) << "NPC " << npc.mId << " (" << npc.mName << ") has nonexistent class "
<< npc.mClass << "', using '" << defaultCls << "' class as replacement."; << npc.mClass << ", using " << defaultCls << " class as replacement.";
npc.mClass = defaultCls; npc.mClass = defaultCls;
changed = true; changed = true;
} }
@ -141,8 +141,8 @@ namespace
if (!item.mScript.empty() && !scripts.search(item.mScript)) if (!item.mScript.empty() && !scripts.search(item.mScript))
{ {
item.mScript = ESM::RefId(); item.mScript = ESM::RefId();
Log(Debug::Verbose) << "Item '" << id << "' (" << item.mName << ") has nonexistent script '" Log(Debug::Verbose) << "Item " << id << " (" << item.mName << ") has nonexistent script "
<< item.mScript << "', ignoring it."; << item.mScript << ", ignoring it.";
} }
} }
} }
@ -623,8 +623,8 @@ namespace MWWorld
auto first = std::remove_if(entry.second.mList.begin(), entry.second.mList.end(), [&](const auto& item) { auto first = std::remove_if(entry.second.mList.begin(), entry.second.mList.end(), [&](const auto& item) {
if (!find(item.mId)) if (!find(item.mId))
{ {
Log(Debug::Verbose) << "Leveled list '" << entry.first << "' has nonexistent object '" << item.mId Log(Debug::Verbose) << "Leveled list " << entry.first << " has nonexistent object " << item.mId
<< "', ignoring it."; << ", ignoring it.";
return true; return true;
} }
return false; return false;