From 29556a1802a0edec0c47db1b881b48dd9002d678 Mon Sep 17 00:00:00 2001 From: scrawl Date: Thu, 2 Mar 2017 22:07:43 +0100 Subject: [PATCH] More consistent wording of errors/warnings A Warning indicates a potential problem in the content file(s) that the user told OpenMW to load. E.g. this might cause an object to not display at all or as intended, however the rest of the game will run fine. An Error, however, is more likely to be a bug with the engine itself - it means that basic assumptions have been violated and the engine might not run correctly anymore. The above mostly applies to errors/warnings during game-play; startup issues are handled differently: when a file is completely invalid/corrupted to the point that the engine can not start, that might cause messages that are worded as Error due to the severity of the issue but are not necessarily the engine's fault. Hopefully, being a little more consistent here will alleviate confusion among users as to when a log message should be reported and to whom. --- apps/essimporter/converter.cpp | 4 ++-- apps/essimporter/importer.cpp | 8 ++++---- apps/openmw/engine.cpp | 10 +++++----- apps/openmw/main.cpp | 2 +- apps/openmw/mwdialogue/dialoguemanagerimp.cpp | 2 +- apps/openmw/mwgui/charactercreation.cpp | 4 ++-- apps/openmw/mwgui/savegamedialog.cpp | 4 ++-- apps/openmw/mwgui/settingswindow.cpp | 2 +- apps/openmw/mwgui/sortfilteritemmodel.cpp | 2 +- apps/openmw/mwgui/spellmodel.cpp | 2 +- apps/openmw/mwgui/windowmanagerimp.cpp | 2 +- apps/openmw/mwmechanics/actors.cpp | 2 +- apps/openmw/mwmechanics/aiwander.cpp | 2 +- apps/openmw/mwmechanics/objects.cpp | 2 +- apps/openmw/mwphysics/physicssystem.cpp | 2 +- apps/openmw/mwrender/animation.cpp | 6 +++--- apps/openmw/mwrender/creatureanimation.cpp | 2 +- apps/openmw/mwrender/globalmap.cpp | 10 +++++----- apps/openmw/mwrender/localmap.cpp | 12 ++++++------ apps/openmw/mwrender/npcanimation.cpp | 8 ++++---- apps/openmw/mwrender/water.cpp | 6 +++--- apps/openmw/mwscript/scriptmanagerimp.cpp | 4 ++-- apps/openmw/mwscript/statsextensions.cpp | 2 +- apps/openmw/mwscript/transformationextensions.cpp | 2 +- apps/openmw/mwstate/statemanagerimp.cpp | 8 ++++---- apps/openmw/mwworld/cellpreloader.cpp | 4 ++-- apps/openmw/mwworld/cells.cpp | 2 +- apps/openmw/mwworld/cellstore.cpp | 10 +++++----- apps/openmw/mwworld/containerstore.cpp | 6 +++--- apps/openmw/mwworld/inventorystore.cpp | 2 +- apps/openmw/mwworld/livecellref.cpp | 2 +- apps/openmw/mwworld/localscripts.cpp | 2 +- apps/openmw/mwworld/player.cpp | 4 ++-- apps/openmw/mwworld/scene.cpp | 4 ++-- apps/openmw/mwworld/store.cpp | 2 +- components/esm/loaddial.cpp | 2 +- components/esmterrain/storage.cpp | 2 +- components/interpreter/defines.cpp | 2 +- components/nifosg/nifloader.cpp | 6 +++--- components/nifosg/particle.cpp | 2 +- components/resource/scenemanager.cpp | 6 +++--- components/sceneutil/attach.cpp | 2 +- components/sceneutil/riggeometry.cpp | 8 ++++---- components/sceneutil/skeleton.cpp | 4 ++-- components/sceneutil/workqueue.cpp | 2 +- 45 files changed, 92 insertions(+), 92 deletions(-) diff --git a/apps/essimporter/converter.cpp b/apps/essimporter/converter.cpp index a428a8c718..68ee93c89e 100644 --- a/apps/essimporter/converter.cpp +++ b/apps/essimporter/converter.cpp @@ -137,7 +137,7 @@ namespace ESSImport osgDB::ReaderWriter* readerwriter = osgDB::Registry::instance()->getReaderWriterForExtension("png"); if (!readerwriter) { - std::cerr << "can't write global map image, no png readerwriter found" << std::endl; + std::cerr << "Error: can't write global map image, no png readerwriter found" << std::endl; return; } @@ -146,7 +146,7 @@ namespace ESSImport osgDB::ReaderWriter::WriteResult result = readerwriter->writeImage(*image2, ostream); if (!result.success()) { - std::cerr << "can't write global map image: " << result.message() << " code " << result.status() << std::endl; + std::cerr << "Error: can't write global map image: " << result.message() << " code " << result.status() << std::endl; return; } diff --git a/apps/essimporter/importer.cpp b/apps/essimporter/importer.cpp index a420d08da3..c27e15a3e5 100644 --- a/apps/essimporter/importer.cpp +++ b/apps/essimporter/importer.cpp @@ -38,7 +38,7 @@ namespace { if (fileHeader.mSCRS.size() != 128*128*4) { - std::cerr << "unexpected screenshot size " << std::endl; + std::cerr << "Error: unexpected screenshot size " << std::endl; return; } @@ -66,14 +66,14 @@ namespace osgDB::ReaderWriter* readerwriter = osgDB::Registry::instance()->getReaderWriterForExtension("jpg"); if (!readerwriter) { - std::cerr << "can't write screenshot: no jpg readerwriter found" << std::endl; + std::cerr << "Error: can't write screenshot: no jpg readerwriter found" << std::endl; return; } osgDB::ReaderWriter::WriteResult result = readerwriter->writeImage(*image, ostream); if (!result.success()) { - std::cerr << "can't write screenshot: " << result.message() << " code " << result.status() << std::endl; + std::cerr << "Error: can't write screenshot: " << result.message() << " code " << result.status() << std::endl; return; } @@ -333,7 +333,7 @@ namespace ESSImport if (unknownRecords.insert(n.intval).second) { std::ios::fmtflags f(std::cerr.flags()); - std::cerr << "unknown record " << n.toString() << " (0x" << std::hex << esm.getFileOffset() << ")" << std::endl; + std::cerr << "Error: unknown record " << n.toString() << " (0x" << std::hex << esm.getFileOffset() << ")" << std::endl; std::cerr.flags(f); } diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index 371e86545c..2a0bcb1084 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -421,16 +421,16 @@ void OMW::Engine::setWindowIcon() std::string windowIcon = (mResDir / "mygui" / "openmw.png").string(); windowIconStream.open(windowIcon, std::ios_base::in | std::ios_base::binary); if (windowIconStream.fail()) - std::cerr << "Failed to open " << windowIcon << std::endl; + std::cerr << "Error: Failed to open " << windowIcon << std::endl; osgDB::ReaderWriter* reader = osgDB::Registry::instance()->getReaderWriterForExtension("png"); if (!reader) { - std::cerr << "Failed to read window icon, no png readerwriter found" << std::endl; + std::cerr << "Error: Failed to read window icon, no png readerwriter found" << std::endl; return; } osgDB::ReaderWriter::ReadResult result = reader->readImage(windowIconStream); if (!result.success()) - std::cerr << "Failed to read " << windowIcon << ": " << result.message() << " code " << result.status() << std::endl; + std::cerr << "Error: Failed to read " << windowIcon << ": " << result.message() << " code " << result.status() << std::endl; else { osg::ref_ptr image = result.getImage(); @@ -605,14 +605,14 @@ public: osgDB::ReaderWriter* readerwriter = osgDB::Registry::instance()->getReaderWriterForExtension(mScreenshotFormat); if (!readerwriter) { - std::cerr << "Can't write screenshot, no '" << mScreenshotFormat << "' readerwriter found" << std::endl; + std::cerr << "Error: Can't write screenshot, no '" << mScreenshotFormat << "' readerwriter found" << std::endl; return; } osgDB::ReaderWriter::WriteResult result = readerwriter->writeImage(image, outStream); if (!result.success()) { - std::cerr << "Can't write screenshot: " << result.message() << " code " << result.status() << std::endl; + std::cerr << "Error: Can't write screenshot: " << result.message() << " code " << result.status() << std::endl; } } diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp index adc12bdfcb..4ab90afa42 100644 --- a/apps/openmw/main.cpp +++ b/apps/openmw/main.cpp @@ -230,7 +230,7 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat engine.setCell(variables["start"].as().toStdString()); engine.setSkipMenu (variables["skip-menu"].as(), variables["new-game"].as()); if (!variables["skip-menu"].as() && variables["new-game"].as()) - std::cerr << "new-game used without skip-menu -> ignoring it" << std::endl; + std::cerr << "Warning: new-game used without skip-menu -> ignoring it" << std::endl; // scripts engine.setCompileAll(variables["script-all"].as()); diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp index 29bbc80f80..254bc7d473 100644 --- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp +++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp @@ -238,7 +238,7 @@ namespace MWDialogue if (!success) { std::cerr - << "compiling failed (dialogue script)" << std::endl + << "Warning: compiling failed (dialogue script)" << std::endl << cmd << std::endl << std::endl; } diff --git a/apps/openmw/mwgui/charactercreation.cpp b/apps/openmw/mwgui/charactercreation.cpp index d72e6627fe..9464daaf63 100644 --- a/apps/openmw/mwgui/charactercreation.cpp +++ b/apps/openmw/mwgui/charactercreation.cpp @@ -274,7 +274,7 @@ namespace MWGui } catch (std::exception& e) { - std::cerr << "Failed to create chargen window: " << e.what() << std::endl; + std::cerr << "Error: Failed to create chargen window: " << e.what() << std::endl; } } @@ -592,7 +592,7 @@ namespace MWGui mGenerateClass = "Mage"; else { - std::cerr << "Failed to deduce class from chosen answers in generate class dialog" << std::endl; + std::cout << "Failed to deduce class from chosen answers in generate class dialog" << std::endl; mGenerateClass = "Thief"; } } diff --git a/apps/openmw/mwgui/savegamedialog.cpp b/apps/openmw/mwgui/savegamedialog.cpp index 5187c30432..f93d1cc0a7 100644 --- a/apps/openmw/mwgui/savegamedialog.cpp +++ b/apps/openmw/mwgui/savegamedialog.cpp @@ -405,14 +405,14 @@ namespace MWGui osgDB::ReaderWriter* readerwriter = osgDB::Registry::instance()->getReaderWriterForExtension("jpg"); if (!readerwriter) { - std::cerr << "Can't open savegame screenshot, no jpg readerwriter found" << std::endl; + std::cerr << "Error: Can't open savegame screenshot, no jpg readerwriter found" << std::endl; return; } osgDB::ReaderWriter::ReadResult result = readerwriter->readImage(instream); if (!result.success()) { - std::cerr << "Failed to read savegame screenshot: " << result.message() << " code " << result.status() << std::endl; + std::cerr << "Error: Failed to read savegame screenshot: " << result.message() << " code " << result.status() << std::endl; return; } diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp index 3211473e2d..c167164d95 100644 --- a/apps/openmw/mwgui/settingswindow.cpp +++ b/apps/openmw/mwgui/settingswindow.cpp @@ -33,7 +33,7 @@ namespace if (val == "linear") return "Trilinear"; if (val == "nearest") return "Bilinear"; if (val != "none") - std::cerr<< "Invalid texture mipmap option: "<getStore().get().search(enchId); if (!ench) { - std::cerr << "Can't find enchantment '" << enchId << "' on item " << base.getCellRef().getRefId() << std::endl; + std::cerr << "Warning: Can't find enchantment '" << enchId << "' on item " << base.getCellRef().getRefId() << std::endl; return false; } diff --git a/apps/openmw/mwgui/spellmodel.cpp b/apps/openmw/mwgui/spellmodel.cpp index c775330084..d4ab552ff2 100644 --- a/apps/openmw/mwgui/spellmodel.cpp +++ b/apps/openmw/mwgui/spellmodel.cpp @@ -84,7 +84,7 @@ namespace MWGui const ESM::Enchantment* enchant = esmStore.get().search(enchantId); if (!enchant) { - std::cerr << "Can't find enchantment '" << enchantId << "' on item " << item.getCellRef().getRefId() << std::endl; + std::cerr << "Warning: Can't find enchantment '" << enchantId << "' on item " << item.getCellRef().getRefId() << std::endl; continue; } diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp index 55c9355a13..b01070c5f2 100644 --- a/apps/openmw/mwgui/windowmanagerimp.cpp +++ b/apps/openmw/mwgui/windowmanagerimp.cpp @@ -1158,7 +1158,7 @@ namespace MWGui { if (!mStore) { - std::cerr << "WindowManager::onRetrieveTag: no Store set up yet, can not replace '" << tag << "'" << std::endl; + std::cerr << "Error: WindowManager::onRetrieveTag: no Store set up yet, can not replace '" << tag << "'" << std::endl; return; } const ESM::GameSetting *setting = mStore->get().find(tag); diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp index 653f47d566..0b398a046c 100644 --- a/apps/openmw/mwmechanics/actors.cpp +++ b/apps/openmw/mwmechanics/actors.cpp @@ -1478,7 +1478,7 @@ namespace MWMechanics } else { - std::cerr<< "Error in Actors::playAnimationGroup: Unable to find " << ptr.getCellRef().getRefId() << std::endl; + std::cerr<< "Warning: Actors::playAnimationGroup: Unable to find " << ptr.getCellRef().getRefId() << std::endl; return false; } } diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp index 73ddce4b48..5396b5b394 100644 --- a/apps/openmw/mwmechanics/aiwander.cpp +++ b/apps/openmw/mwmechanics/aiwander.cpp @@ -725,7 +725,7 @@ namespace MWMechanics } else { - std::cerr<< "Attempted to play out of range idle animation \""<accept(visitor); if (!visitor.mFound) { - std::cerr << "animateCollisionShapes: Can't find node " << recIndex << " for " << mPtr.getCellRef().getRefId() << std::endl; + std::cerr << "Error: animateCollisionShapes can't find node " << recIndex << " for " << mPtr.getCellRef().getRefId() << std::endl; return; } osg::NodePath nodePath = visitor.mFoundPath; diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp index 5300d6ab41..ba4307c895 100644 --- a/apps/openmw/mwrender/animation.cpp +++ b/apps/openmw/mwrender/animation.cpp @@ -562,7 +562,7 @@ namespace MWRender NodeMap::const_iterator found = nodeMap.find(bonename); if (found == nodeMap.end()) { - std::cerr << "addAnimSource: can't find bone '" + bonename << "' in " << model << " (referenced by " << kfname << ")" << std::endl; + std::cerr << "Warning: addAnimSource: can't find bone '" + bonename << "' in " << model << " (referenced by " << kfname << ")" << std::endl; continue; } @@ -1697,12 +1697,12 @@ namespace MWRender PartHolder::~PartHolder() { if (mNode.get() && !mNode->getNumParents()) - std::cerr << "Warning: part has no parents " << std::endl; + std::cerr << "Error: part has no parents " << std::endl; if (mNode.get() && mNode->getNumParents()) { if (mNode->getNumParents() > 1) - std::cerr << "Warning: part has multiple parents " << mNode->getNumParents() << " " << mNode.get() << std::endl; + std::cerr << "Error: part has multiple parents " << mNode->getNumParents() << " " << mNode.get() << std::endl; mNode->getParent(0)->removeChild(mNode); } } diff --git a/apps/openmw/mwrender/creatureanimation.cpp b/apps/openmw/mwrender/creatureanimation.cpp index b105746c64..cb6489ef40 100644 --- a/apps/openmw/mwrender/creatureanimation.cpp +++ b/apps/openmw/mwrender/creatureanimation.cpp @@ -155,7 +155,7 @@ void CreatureWeaponAnimation::updatePart(PartHolderPtr& scene, int slot) } catch (std::exception& e) { - std::cerr << "Error adding creature part: " << e.what() << std::endl; + std::cerr << "Can not add creature part: " << e.what() << std::endl; } } diff --git a/apps/openmw/mwrender/globalmap.cpp b/apps/openmw/mwrender/globalmap.cpp index 0d8a7a0391..2536818ef1 100644 --- a/apps/openmw/mwrender/globalmap.cpp +++ b/apps/openmw/mwrender/globalmap.cpp @@ -408,14 +408,14 @@ namespace MWRender osgDB::ReaderWriter* readerwriter = osgDB::Registry::instance()->getReaderWriterForExtension("png"); if (!readerwriter) { - std::cerr << "Can't write map overlay: no png readerwriter found" << std::endl; + std::cerr << "Error: Can't write map overlay: no png readerwriter found" << std::endl; return; } osgDB::ReaderWriter::WriteResult result = readerwriter->writeImage(*mOverlayImage, ostream); if (!result.success()) { - std::cerr << "Can't write map overlay: " << result.message() << " code " << result.status() << std::endl; + std::cerr << "Error: Can't write map overlay: " << result.message() << " code " << result.status() << std::endl; return; } @@ -460,14 +460,14 @@ namespace MWRender osgDB::ReaderWriter* readerwriter = osgDB::Registry::instance()->getReaderWriterForExtension("png"); if (!readerwriter) { - std::cerr << "Can't read map overlay: no png readerwriter found" << std::endl; + std::cerr << "Error: Can't read map overlay: no png readerwriter found" << std::endl; return; } osgDB::ReaderWriter::ReadResult result = readerwriter->readImage(istream); if (!result.success()) { - std::cerr << "Can't read map overlay: " << result.message() << " code " << result.status() << std::endl; + std::cerr << "Error: Can't read map overlay: " << result.message() << " code " << result.status() << std::endl; return; } @@ -569,7 +569,7 @@ namespace MWRender CameraVector::iterator found = std::find(mActiveCameras.begin(), mActiveCameras.end(), camera); if (found == mActiveCameras.end()) { - std::cerr << "GlobalMap trying to remove an inactive camera" << std::endl; + std::cerr << "Error: GlobalMap trying to remove an inactive camera" << std::endl; return; } mActiveCameras.erase(found); diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp index 240ddc2e59..0e854d5dce 100644 --- a/apps/openmw/mwrender/localmap.cpp +++ b/apps/openmw/mwrender/localmap.cpp @@ -320,7 +320,7 @@ void LocalMap::markForRemoval(osg::Camera *cam) CameraVector::iterator found = std::find(mActiveCameras.begin(), mActiveCameras.end(), cam); if (found == mActiveCameras.end()) { - std::cerr << "trying to remove an inactive camera" << std::endl; + std::cerr << "Error: trying to remove an inactive camera" << std::endl; return; } mActiveCameras.erase(found); @@ -487,7 +487,7 @@ void LocalMap::requestInteriorMap(const MWWorld::CellStore* cell) // We are using the same bounds and angle as we were using when the textures were originally made. Segments should come out the same. if (i >= int(fog->mFogTextures.size())) { - std::cout << "Warning: fog texture count mismatch" << std::endl; + std::cout << "Error: fog texture count mismatch" << std::endl; break; } @@ -679,7 +679,7 @@ void LocalMap::MapSegment::loadFogOfWar(const ESM::FogTexture &esm) osgDB::ReaderWriter* readerwriter = osgDB::Registry::instance()->getReaderWriterForExtension("tga"); if (!readerwriter) { - std::cerr << "Unable to load fog, can't find a tga ReaderWriter" << std::endl; + std::cerr << "Error: Unable to load fog, can't find a tga ReaderWriter" << std::endl; return; } @@ -688,7 +688,7 @@ void LocalMap::MapSegment::loadFogOfWar(const ESM::FogTexture &esm) osgDB::ReaderWriter::ReadResult result = readerwriter->readImage(in); if (!result.success()) { - std::cerr << "Failed to read fog: " << result.message() << " code " << result.status() << std::endl; + std::cerr << "Error: Failed to read fog: " << result.message() << " code " << result.status() << std::endl; return; } @@ -711,7 +711,7 @@ void LocalMap::MapSegment::saveFogOfWar(ESM::FogTexture &fog) const osgDB::ReaderWriter* readerwriter = osgDB::Registry::instance()->getReaderWriterForExtension("tga"); if (!readerwriter) { - std::cerr << "Unable to write fog, can't find a tga ReaderWriter" << std::endl; + std::cerr << "Error: Unable to write fog, can't find a tga ReaderWriter" << std::endl; return; } @@ -720,7 +720,7 @@ void LocalMap::MapSegment::saveFogOfWar(ESM::FogTexture &fog) const osgDB::ReaderWriter::WriteResult result = readerwriter->writeImage(*mFogOfWarImage, ostream); if (!result.success()) { - std::cerr << "Unable to write fog: " << result.message() << " code " << result.status() << std::endl; + std::cerr << "Error: Unable to write fog: " << result.message() << " code " << result.status() << std::endl; return; } mFogOfWarImage->flipVertical(); diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp index 1219f8920b..9a3cd5611a 100644 --- a/apps/openmw/mwrender/npcanimation.cpp +++ b/apps/openmw/mwrender/npcanimation.cpp @@ -435,7 +435,7 @@ void NpcAnimation::updateNpcBase() if (bp) mHeadModel = "meshes\\" + bp->mModel; else - std::cerr << "Failed to load body part '" << mNpc->mHead << "'" << std::endl; + std::cerr << "Warning: Failed to load body part '" << mNpc->mHead << "'" << std::endl; } mHairModel = ""; @@ -445,7 +445,7 @@ void NpcAnimation::updateNpcBase() if (bp) mHairModel = "meshes\\" + bp->mModel; else - std::cerr << "Failed to load body part '" << mNpc->mHair << "'" << std::endl; + std::cerr << "Warning: Failed to load body part '" << mNpc->mHair << "'" << std::endl; } } @@ -828,7 +828,7 @@ void NpcAnimation::addPartGroup(int group, int priority, const std::vectormFemale << "'" << std::endl; + std::cerr << "Warning: Failed to find body part '" << part->mFemale << "'" << std::endl; } if(!bodypart && !part->mMale.empty()) { @@ -843,7 +843,7 @@ void NpcAnimation::addPartGroup(int group, int priority, const std::vectormMale << "'" << std::endl; + std::cerr << "Warning: Failed to find body part '" << part->mMale << "'" << std::endl; } if(bodypart) diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp index 2e10d42e5a..d2ad1f9b51 100644 --- a/apps/openmw/mwrender/water.cpp +++ b/apps/openmw/mwrender/water.cpp @@ -197,16 +197,16 @@ osg::ref_ptr readPngImage (const std::string& file) boost::filesystem::ifstream inStream; inStream.open(file, std::ios_base::in | std::ios_base::binary); if (inStream.fail()) - std::cerr << "Failed to open " << file << std::endl; + std::cerr << "Error: Failed to open " << file << std::endl; osgDB::ReaderWriter* reader = osgDB::Registry::instance()->getReaderWriterForExtension("png"); if (!reader) { - std::cerr << "Failed to read " << file << ", no png readerwriter found" << std::endl; + std::cerr << "Error: Failed to read " << file << ", no png readerwriter found" << std::endl; return osg::ref_ptr(); } osgDB::ReaderWriter::ReadResult result = reader->readImage(inStream); if (!result.success()) - std::cerr << "Failed to read " << file << ": " << result.message() << " code " << result.status() << std::endl; + std::cerr << "Error: Failed to read " << file << ": " << result.message() << " code " << result.status() << std::endl; return result.getImage(); } diff --git a/apps/openmw/mwscript/scriptmanagerimp.cpp b/apps/openmw/mwscript/scriptmanagerimp.cpp index 97ea19a631..7c1f9bf4df 100644 --- a/apps/openmw/mwscript/scriptmanagerimp.cpp +++ b/apps/openmw/mwscript/scriptmanagerimp.cpp @@ -65,14 +65,14 @@ namespace MWScript } catch (const std::exception& error) { - std::cerr << "An exception has been thrown: " << error.what() << std::endl; + std::cerr << "Error: An exception has been thrown: " << error.what() << std::endl; Success = false; } if (!Success) { std::cerr - << "compiling failed: " << name << std::endl; + << "Warning: compiling failed: " << name << std::endl; } if (Success) diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp index d5b64b7d73..19f2a035e4 100644 --- a/apps/openmw/mwscript/statsextensions.cpp +++ b/apps/openmw/mwscript/statsextensions.cpp @@ -235,7 +235,7 @@ namespace MWScript if (R()(runtime, false, true).isEmpty()) { std::cerr - << "Compensating for broken script in Morrowind.esm by " + << "Warning: Compensating for broken script in Morrowind.esm by " << "ignoring remote access to dagoth_ur_1" << std::endl; return; } diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp index abde8c973b..c876d4cf7d 100644 --- a/apps/openmw/mwscript/transformationextensions.cpp +++ b/apps/openmw/mwscript/transformationextensions.cpp @@ -307,7 +307,7 @@ namespace MWScript store = MWBase::Environment::get().getWorld()->getExterior(cx,cy); if(!cell) { - std::string error = "PositionCell: unknown interior cell (" + cellID + "), moving to exterior instead"; + std::string error = "Warning: PositionCell: unknown interior cell (" + cellID + "), moving to exterior instead"; runtime.getContext().report (error); std::cerr << error << std::endl; } diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp index 58d85fe5bb..64c543fb1d 100644 --- a/apps/openmw/mwstate/statemanagerimp.cpp +++ b/apps/openmw/mwstate/statemanagerimp.cpp @@ -471,7 +471,7 @@ void MWState::StateManager::loadGame (const Character *character, const std::str default: // ignore invalid records - std::cerr << "Ignoring unknown record: " << n.toString() << std::endl; + std::cerr << "Warning: Ignoring unknown record: " << n.toString() << std::endl; reader.skipRecord(); } int progressPercent = static_cast(float(reader.getFileOffset())/total*100); @@ -613,7 +613,7 @@ bool MWState::StateManager::verifyProfile(const ESM::SavedGame& profile) const if (std::find(selectedContentFiles.begin(), selectedContentFiles.end(), *it) == selectedContentFiles.end()) { - std::cerr << "Savegame dependency " << *it << " is missing." << std::endl; + std::cerr << "Warning: Savegame dependency " << *it << " is missing." << std::endl; notFound = true; } } @@ -641,7 +641,7 @@ void MWState::StateManager::writeScreenshot(std::vector &imageData) const osgDB::ReaderWriter* readerwriter = osgDB::Registry::instance()->getReaderWriterForExtension("jpg"); if (!readerwriter) { - std::cerr << "Unable to write screenshot, can't find a jpg ReaderWriter" << std::endl; + std::cerr << "Error: Unable to write screenshot, can't find a jpg ReaderWriter" << std::endl; return; } @@ -649,7 +649,7 @@ void MWState::StateManager::writeScreenshot(std::vector &imageData) const osgDB::ReaderWriter::WriteResult result = readerwriter->writeImage(*screenshot, ostream); if (!result.success()) { - std::cerr << "Unable to write screenshot: " << result.message() << " code " << result.status() << std::endl; + std::cerr << "Error: Unable to write screenshot: " << result.message() << " code " << result.status() << std::endl; return; } diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp index 7b90da43b6..278efa53d6 100644 --- a/apps/openmw/mwworld/cellpreloader.cpp +++ b/apps/openmw/mwworld/cellpreloader.cpp @@ -209,12 +209,12 @@ namespace MWWorld { if (!mWorkQueue) { - std::cerr << "can't preload, no work queue set " << std::endl; + std::cerr << "Error: can't preload, no work queue set " << std::endl; return; } if (cell->getState() == CellStore::State_Unloaded) { - std::cerr << "can't preload objects for unloaded cell" << std::endl; + std::cerr << "Error: can't preload objects for unloaded cell" << std::endl; return; } diff --git a/apps/openmw/mwworld/cells.cpp b/apps/openmw/mwworld/cells.cpp index 384d7e1242..6cd495ee65 100644 --- a/apps/openmw/mwworld/cells.cpp +++ b/apps/openmw/mwworld/cells.cpp @@ -349,7 +349,7 @@ bool MWWorld::Cells::readRecord (ESM::ESMReader& reader, uint32_t type, catch (...) { // silently drop cells that don't exist anymore - std::cerr << "Dropping state for cell " << state.mId.mWorldspace << " (cell no longer exists)" << std::endl; + std::cerr << "Warning: Dropping state for cell " << state.mId.mWorldspace << " (cell no longer exists)" << std::endl; reader.skipRecord(); return true; } diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp index ff3427e12d..b4f260a25d 100644 --- a/apps/openmw/mwworld/cellstore.cpp +++ b/apps/openmw/mwworld/cellstore.cpp @@ -138,7 +138,7 @@ namespace return; } - std::cerr << "Dropping reference to " << state.mRef.mRefID << " (invalid content file link)" << std::endl; + std::cerr << "Warning: Dropping reference to " << state.mRef.mRefID << " (invalid content file link)" << std::endl; return; } @@ -197,7 +197,7 @@ namespace MWWorld else { std::cerr - << "Error: could not resolve cell reference '" << ref.mRefID << "'" + << "Warning: could not resolve cell reference '" << ref.mRefID << "'" << " (dropping reference)" << std::endl; } } @@ -667,7 +667,7 @@ namespace MWWorld default: std::cerr - << "WARNING: Ignoring reference '" << ref.mRefID << "' of unhandled type\n"; + << "Error: Ignoring reference '" << ref.mRefID << "' of unhandled type\n"; return; } @@ -898,7 +898,7 @@ namespace MWWorld if (!visitor.mFound) { - std::cerr << "Dropping moved ref tag for " << refnum.mIndex << " (moved object no longer exists)" << std::endl; + std::cerr << "Warning: Dropping moved ref tag for " << refnum.mIndex << " (moved object no longer exists)" << std::endl; continue; } @@ -908,7 +908,7 @@ namespace MWWorld if (otherCell == NULL) { - std::cerr << "Dropping moved ref tag for " << movedRef->mRef.getRefId() + std::cerr << "Warning: Dropping moved ref tag for " << movedRef->mRef.getRefId() << " (target cell " << movedTo.mWorldspace << " no longer exists). Reference moved back to its original location." << std::endl; // Note by dropping tag the object will automatically re-appear in its original cell, though potentially at inapproriate coordinates. // Restore original coordinates: diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp index a5090a66ad..d9fddf7a97 100644 --- a/apps/openmw/mwworld/containerstore.cpp +++ b/apps/openmw/mwworld/containerstore.cpp @@ -496,7 +496,7 @@ void MWWorld::ContainerStore::addInitialItem (const std::string& id, const std:: } catch (const std::exception& e) { - std::cerr << "Error in MWWorld::ContainerStore::addInitialItem: " << e.what() << std::endl; + std::cerr << "Warning: MWWorld::ContainerStore::addInitialItem: " << e.what() << std::endl; } } @@ -796,10 +796,10 @@ void MWWorld::ContainerStore::readState (const ESM::InventoryState& inventory) case ESM::REC_WEAP: readEquipmentState (getState (weapons, state), thisIndex, inventory); break; case ESM::REC_LIGH: readEquipmentState (getState (lights, state), thisIndex, inventory); break; case 0: - std::cerr << "Dropping reference to '" << state.mRef.mRefID << "' (object no longer exists)" << std::endl; + std::cerr << "Warning: Dropping reference to '" << state.mRef.mRefID << "' (object no longer exists)" << std::endl; break; default: - std::cerr << "Invalid item type in inventory state, refid " << state.mRef.mRefID << std::endl; + std::cerr << "Warning: Invalid item type in inventory state, refid " << state.mRef.mRefID << std::endl; break; } } diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp index 05d874ecd2..b04720a580 100644 --- a/apps/openmw/mwworld/inventorystore.cpp +++ b/apps/openmw/mwworld/inventorystore.cpp @@ -851,7 +851,7 @@ void MWWorld::InventoryStore::updateRechargingItems() enchantmentId); if (!enchantment) { - std::cerr << "Can't find enchantment '" << enchantmentId << "' on item " << it->getCellRef().getRefId() << std::endl; + std::cerr << "Warning: Can't find enchantment '" << enchantmentId << "' on item " << it->getCellRef().getRefId() << std::endl; continue; } diff --git a/apps/openmw/mwworld/livecellref.cpp b/apps/openmw/mwworld/livecellref.cpp index 32830b5fb9..294734f461 100644 --- a/apps/openmw/mwworld/livecellref.cpp +++ b/apps/openmw/mwworld/livecellref.cpp @@ -39,7 +39,7 @@ void MWWorld::LiveCellRefBase::loadImp (const ESM::ObjectState& state) catch (const std::exception& exception) { std::cerr - << "failed to load state for local script " << scriptId + << "Error: failed to load state for local script " << scriptId << " because an exception has been thrown: " << exception.what() << std::endl; } diff --git a/apps/openmw/mwworld/localscripts.cpp b/apps/openmw/mwworld/localscripts.cpp index 5f6d10b314..4ed83bf11d 100644 --- a/apps/openmw/mwworld/localscripts.cpp +++ b/apps/openmw/mwworld/localscripts.cpp @@ -93,7 +93,7 @@ void MWWorld::LocalScripts::add (const std::string& scriptName, const Ptr& ptr) for (std::list >::iterator iter = mScripts.begin(); iter!=mScripts.end(); ++iter) if (iter->second==ptr) { - std::cerr << "warning, tried to add local script twice for " << ptr.getCellRef().getRefId() << std::endl; + std::cerr << "Error: tried to add local script twice for " << ptr.getCellRef().getRefId() << std::endl; remove(ptr); break; } diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp index a44d79157f..fe13a4d609 100644 --- a/apps/openmw/mwworld/player.cpp +++ b/apps/openmw/mwworld/player.cpp @@ -330,7 +330,7 @@ namespace MWWorld if (!player.mObject.mEnabled) { - std::cerr << "Savegame attempted to disable the player." << std::endl; + std::cerr << "Warning: Savegame attempted to disable the player." << std::endl; player.mObject.mEnabled = true; } @@ -357,7 +357,7 @@ namespace MWWorld } catch (...) { - std::cerr << "Player cell '" << player.mCellId.mWorldspace << "' no longer exists" << std::endl; + std::cerr << "Warning: Player cell '" << player.mCellId.mWorldspace << "' no longer exists" << std::endl; // Cell no longer exists. The loader will have to choose a default cell. mCellStore = NULL; } diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp index ea8b7c5391..dadada7b23 100644 --- a/apps/openmw/mwworld/scene.cpp +++ b/apps/openmw/mwworld/scene.cpp @@ -149,7 +149,7 @@ namespace } catch (const std::exception& e) { - std::string error ("error during rendering '" + ptr.getCellRef().getRefId() + "': "); + std::string error ("failed to render '" + ptr.getCellRef().getRefId() + "': "); std::cerr << error + e.what() << std::endl; } } @@ -625,7 +625,7 @@ namespace MWWorld } catch (std::exception& e) { - std::cerr << "error during rendering '" << ptr.getCellRef().getRefId() << "': " << e.what() << std::endl; + std::cerr << "failed to render '" << ptr.getCellRef().getRefId() << "': " << e.what() << std::endl; } } diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp index cdf66f5708..704dbf970e 100644 --- a/apps/openmw/mwworld/store.cpp +++ b/apps/openmw/mwworld/store.cpp @@ -687,7 +687,7 @@ namespace MWWorld if (it_lease != wipecell->mLeasedRefs.end()) wipecell->mLeasedRefs.erase(it_lease); else - std::cerr << "can't find " << it->mRefNum.mIndex << " " << it->mRefNum.mContentFile << " in leasedRefs " << std::endl; + std::cerr << "Error: can't find " << it->mRefNum.mIndex << " " << it->mRefNum.mContentFile << " in leasedRefs " << std::endl; } *itold = *it; } diff --git a/components/esm/loaddial.cpp b/components/esm/loaddial.cpp index f06b42250f..9ef3d3964a 100644 --- a/components/esm/loaddial.cpp +++ b/components/esm/loaddial.cpp @@ -128,7 +128,7 @@ namespace ESM return; } - std::cerr << "Failed to insert info " << info.mId << std::endl; + std::cerr << "Warning: Failed to insert info " << info.mId << std::endl; } void Dialogue::clearDeletedInfos() diff --git a/components/esmterrain/storage.cpp b/components/esmterrain/storage.cpp index 70ad0a50bf..d1ccbeab50 100644 --- a/components/esmterrain/storage.cpp +++ b/components/esmterrain/storage.cpp @@ -319,7 +319,7 @@ namespace ESMTerrain const ESM::LandTexture* ltex = getLandTexture(id.first-1, id.second); if (!ltex) { - std::cerr << "Unable to find land texture index " << id.first-1 << " in plugin " << id.second << ", using default texture instead" << std::endl; + std::cerr << "Warning: Unable to find land texture index " << id.first-1 << " in plugin " << id.second << ", using default texture instead" << std::endl; return defaultTexture; } diff --git a/components/interpreter/defines.cpp b/components/interpreter/defines.cpp index 912a5e1d92..515c6c7d58 100644 --- a/components/interpreter/defines.cpp +++ b/components/interpreter/defines.cpp @@ -191,7 +191,7 @@ namespace Interpreter{ } catch (std::exception& e) { - std::cerr << "Failed to replace escape character, with the following error: " << e.what() << std::endl; + std::cerr << "Error: Failed to replace escape character, with the following error: " << e.what() << std::endl; std::cerr << "Full text below: " << std::endl << text << std::endl; } diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp index cade74147b..ff986c1f84 100644 --- a/components/nifosg/nifloader.cpp +++ b/components/nifosg/nifloader.cpp @@ -1364,7 +1364,7 @@ namespace NifOsg size_t mipSize = mip.height * mip.width * pixelData->bpp / 8; if (mipSize + mip.dataOffset > pixelData->data.size()) { - std::cerr << "Internal texture's mipmap data out of bounds" << std::endl; + std::cerr << "Warning: Internal texture's mipmap data out of bounds, ignoring texture" << std::endl; return NULL; } @@ -1379,7 +1379,7 @@ namespace NifOsg if (width <= 0 || height <= 0) { - std::cerr << "Width and height must be non zero " << std::endl; + std::cerr << "Warning: Internal Texture Width and height must be non zero, ignoring texture" << std::endl; return NULL; } @@ -1421,7 +1421,7 @@ namespace NifOsg { // Not used by the vanilla engine. MCP (Morrowind Code Patch) adds an option to use Gloss maps: // "- Gloss map fix. Morrowind removed gloss map entries from model files after loading them. This stops Morrowind from removing them." - std::cerr << "NiTexturingProperty::GlossTexture in " << mFilename << " not currently used." << std::endl; + //std::cerr << "NiTexturingProperty::GlossTexture in " << mFilename << " not currently used." << std::endl; continue; } default: diff --git a/components/nifosg/particle.cpp b/components/nifosg/particle.cpp index fa0fe0be3a..62360b9d64 100644 --- a/components/nifosg/particle.cpp +++ b/components/nifosg/particle.cpp @@ -284,7 +284,7 @@ void Emitter::emitParticles(double dt) if (!visitor.mFound) { - std::cerr << "Emitter: Can't find emitter node" << randomRecIndex << std::endl; + std::cerr << "Error: Can't find emitter node" << randomRecIndex << std::endl; return; } diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp index d050d54485..1763a3c1e3 100644 --- a/components/resource/scenemanager.cpp +++ b/components/resource/scenemanager.cpp @@ -613,12 +613,12 @@ namespace Resource if(magfilter == "nearest") mag = osg::Texture::NEAREST; else if(magfilter != "linear") - std::cerr<< "Invalid texture mag filter: "< node = *it; if (node->getNumParents() > 1) - std::cerr << "CopyRigVisitor warning: node has multiple parents" << std::endl; + std::cerr << "Error CopyRigVisitor: node has multiple parents" << std::endl; while (node->getNumParents()) node->getParent(0)->removeChild(node); diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp index ba779df3e7..9adfdcddb0 100644 --- a/components/sceneutil/riggeometry.cpp +++ b/components/sceneutil/riggeometry.cpp @@ -162,13 +162,13 @@ bool RigGeometry::initFromParentSkeleton(osg::NodeVisitor* nv) if (!mSkeleton) { - std::cerr << "A RigGeometry did not find its parent skeleton" << std::endl; + std::cerr << "Error: A RigGeometry did not find its parent skeleton" << std::endl; return false; } if (!mInfluenceMap) { - std::cerr << "No InfluenceMap set on RigGeometry" << std::endl; + std::cerr << "Error: No InfluenceMap set on RigGeometry" << std::endl; return false; } @@ -179,7 +179,7 @@ bool RigGeometry::initFromParentSkeleton(osg::NodeVisitor* nv) Bone* bone = mSkeleton->getBone(it->first); if (!bone) { - std::cerr << "RigGeometry did not find bone " << it->first << std::endl; + std::cerr << "Error: RigGeometry did not find bone " << it->first << std::endl; continue; } @@ -232,7 +232,7 @@ void RigGeometry::update(osg::NodeVisitor* nv) { if (!mSkeleton) { - std::cerr << "RigGeometry rendering with no skeleton, should have been initialized by UpdateVisitor" << std::endl; + std::cerr << "Error: RigGeometry rendering with no skeleton, should have been initialized by UpdateVisitor" << std::endl; // try to recover anyway, though rendering is likely to be incorrect. if (!initFromParentSkeleton(nv)) return; diff --git a/components/sceneutil/skeleton.cpp b/components/sceneutil/skeleton.cpp index f3c2aef77e..f7c141e20a 100644 --- a/components/sceneutil/skeleton.cpp +++ b/components/sceneutil/skeleton.cpp @@ -128,7 +128,7 @@ void Skeleton::updateBoneMatrices(unsigned int traversalNumber) mRootBone->mChildren[i]->update(NULL); } else - std::cerr << "no root bone" << std::endl; + std::cerr << "Error: no root bone" << std::endl; mNeedToUpdateBoneMatrices = false; } @@ -188,7 +188,7 @@ void Bone::update(const osg::Matrixf* parentMatrixInSkeletonSpace) { if (!mNode) { - std::cerr << "Bone without node " << std::endl; + std::cerr << "Error: Bone without node " << std::endl; return; } if (parentMatrixInSkeletonSpace) diff --git a/components/sceneutil/workqueue.cpp b/components/sceneutil/workqueue.cpp index 831c70a3f6..cc40506f00 100644 --- a/components/sceneutil/workqueue.cpp +++ b/components/sceneutil/workqueue.cpp @@ -71,7 +71,7 @@ void WorkQueue::addWorkItem(osg::ref_ptr item, bool front) { if (item->isDone()) { - std::cerr << "warning, trying to add a work item that is already completed" << std::endl; + std::cerr << "Error: trying to add a work item that is already completed" << std::endl; return; }