diff --git a/components/esm4/loadachr.cpp b/components/esm4/loadachr.cpp index db566a2881..7559a699da 100644 --- a/components/esm4/loadachr.cpp +++ b/components/esm4/loadachr.cpp @@ -25,7 +25,6 @@ */ #include "loadachr.hpp" -#include #include @@ -95,7 +94,6 @@ void ESM4::ActorCharacter::load(ESM4::Reader& reader) case ESM4::SUB_SCHR: // FO3 case ESM4::SUB_TNAM: // FO3 case ESM4::SUB_XATO: // FONV - Log(Debug::Verbose) << "ACHR " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadacre.cpp b/components/esm4/loadacre.cpp index 87a64b6fbf..9760d1c9aa 100644 --- a/components/esm4/loadacre.cpp +++ b/components/esm4/loadacre.cpp @@ -25,7 +25,6 @@ */ #include "loadacre.hpp" -#include #include @@ -80,7 +79,6 @@ void ESM4::ActorCreature::load(ESM4::Reader& reader) // seems to occur only for dead bodies, e.g. DeadMuffy, DeadDogVicious case ESM4::SUB_XRGD: // ragdoll case ESM4::SUB_XRGB: // ragdoll biped - Log(Debug::Verbose) << "ACRE " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadacti.cpp b/components/esm4/loadacti.cpp index c042986cc9..3be8dfbe7e 100644 --- a/components/esm4/loadacti.cpp +++ b/components/esm4/loadacti.cpp @@ -26,8 +26,6 @@ */ #include "loadacti.hpp" -#include - #include #include "reader.hpp" @@ -89,7 +87,6 @@ void ESM4::Activator::load(ESM4::Reader& reader) case ESM4::SUB_PNAM: case ESM4::SUB_VMAD: case ESM4::SUB_WNAM: - Log(Debug::Verbose) << "ACTI " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadalch.cpp b/components/esm4/loadalch.cpp index deebf60526..0103b85598 100644 --- a/components/esm4/loadalch.cpp +++ b/components/esm4/loadalch.cpp @@ -26,8 +26,6 @@ */ #include "loadalch.hpp" -#include - #include #include @@ -99,7 +97,6 @@ void ESM4::Potion::load(ESM4::Reader& reader) case ESM4::SUB_MODS: case ESM4::SUB_OBND: case ESM4::SUB_ETYP: // FO3 - Log(Debug::Verbose) << "ALCH " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadaloc.cpp b/components/esm4/loadaloc.cpp index 5af1aad2b1..171b557998 100644 --- a/components/esm4/loadaloc.cpp +++ b/components/esm4/loadaloc.cpp @@ -26,8 +26,6 @@ */ #include "loadaloc.hpp" -#include - #include #include @@ -147,7 +145,6 @@ void ESM4::MediaLocationController::load(ESM4::Reader& reader) } std::cout << ss.str(); #else - Log(Debug::Verbose) << "ALOC " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize; reader.skipSubRecordData(); #endif break; diff --git a/components/esm4/loadammo.cpp b/components/esm4/loadammo.cpp index 494cae7d02..6bc3deb0c4 100644 --- a/components/esm4/loadammo.cpp +++ b/components/esm4/loadammo.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -143,7 +141,6 @@ void ESM4::Ammunition::load(ESM4::Reader& reader) case ESM4::SUB_OBND: case ESM4::SUB_KSIZ: case ESM4::SUB_KWDA: - Log(Debug::Verbose) << "AMMO " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadanio.cpp b/components/esm4/loadanio.cpp index c9434a4cfd..23af184771 100644 --- a/components/esm4/loadanio.cpp +++ b/components/esm4/loadanio.cpp @@ -26,8 +26,6 @@ */ #include "loadanio.hpp" -#include - #include #include "reader.hpp" @@ -61,7 +59,6 @@ void ESM4::AnimObject::load(ESM4::Reader& reader) break; case ESM4::SUB_MODT: // TES5 only case ESM4::SUB_MODS: // TES5 only - Log(Debug::Verbose) << "ANIO " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadappa.cpp b/components/esm4/loadappa.cpp index 39274b431a..4327d20964 100644 --- a/components/esm4/loadappa.cpp +++ b/components/esm4/loadappa.cpp @@ -26,8 +26,6 @@ */ #include "loadappa.hpp" -#include - #include #include "reader.hpp" @@ -82,7 +80,6 @@ void ESM4::Apparatus::load(ESM4::Reader& reader) case ESM4::SUB_MODT: case ESM4::SUB_OBND: case ESM4::SUB_QUAL: - Log(Debug::Verbose) << "APPA " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadarma.cpp b/components/esm4/loadarma.cpp index 713942bc3f..1c7b1429bf 100644 --- a/components/esm4/loadarma.cpp +++ b/components/esm4/loadarma.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -121,7 +119,6 @@ void ESM4::ArmorAddon::load(ESM4::Reader& reader) case ESM4::SUB_MODS: // FO3 // FIXME: should group with MODL case ESM4::SUB_MODD: // FO3 // FIXME: should group with MODL case ESM4::SUB_OBND: // FO3 - Log(Debug::Verbose) << "ARMA " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadarmo.cpp b/components/esm4/loadarmo.cpp index 226c66242a..5ad299c9e2 100644 --- a/components/esm4/loadarmo.cpp +++ b/components/esm4/loadarmo.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -198,7 +196,6 @@ void ESM4::Armor::load(ESM4::Reader& reader) case ESM4::SUB_MO3S: // FO3 case ESM4::SUB_BNAM: // FONV case ESM4::SUB_SNAM: // FONV - Log(Debug::Verbose) << "ARMO " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadaspc.cpp b/components/esm4/loadaspc.cpp index fcbbf09b22..9c9303d883 100644 --- a/components/esm4/loadaspc.cpp +++ b/components/esm4/loadaspc.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -67,12 +65,10 @@ void ESM4::AcousticSpace::load(ESM4::Reader& reader) { std::uint32_t dummy; reader.get(dummy); - Log(Debug::Verbose) << "WNAM " << mEditorId << " " << dummy; break; } case ESM4::SUB_BNAM: // TES5 reverb formid case ESM4::SUB_OBND: - Log(Debug::Verbose) << "ASPC " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadbook.cpp b/components/esm4/loadbook.cpp index 903a9f661b..99c39ba998 100644 --- a/components/esm4/loadbook.cpp +++ b/components/esm4/loadbook.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -104,7 +102,6 @@ void ESM4::Book::load(ESM4::Reader& reader) case ESM4::SUB_CNAM: case ESM4::SUB_INAM: case ESM4::SUB_VMAD: - Log(Debug::Verbose) << "BOOK " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadbptd.cpp b/components/esm4/loadbptd.cpp index 7379172c95..bbccfb544c 100644 --- a/components/esm4/loadbptd.cpp +++ b/components/esm4/loadbptd.cpp @@ -29,8 +29,6 @@ #include #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -95,7 +93,6 @@ void ESM4::BodyPartData::load(ESM4::Reader& reader) case ESM4::SUB_RAGA: // ragdoll case ESM4::SUB_MODS: case ESM4::SUB_MODT: - Log(Debug::Verbose) << "BPTD " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadcell.cpp b/components/esm4/loadcell.cpp index 897f65d88e..373e1aa2e1 100644 --- a/components/esm4/loadcell.cpp +++ b/components/esm4/loadcell.cpp @@ -26,16 +26,10 @@ */ #include "loadcell.hpp" -#ifdef NDEBUG // FIXME: debuggigng only -#undef NDEBUG -#endif - #include // FLT_MAX for gcc #include #include -#include - #include "grouptype.hpp" #include "reader.hpp" // #include "writer.hpp" @@ -233,7 +227,6 @@ void ESM4::Cell::load(ESM4::Reader& reader) case ESM4::SUB_XRNK: // Oblivion only? case ESM4::SUB_XCET: // FO3 case ESM4::SUB_IMPF: // FO3 Zeta - Log(Debug::Verbose) << "CELL " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadclas.cpp b/components/esm4/loadclas.cpp index 83c00c2ea4..f5bb0c34ba 100644 --- a/components/esm4/loadclas.cpp +++ b/components/esm4/loadclas.cpp @@ -26,8 +26,6 @@ */ #include "loadclas.hpp" -#include - #include #include "reader.hpp" @@ -57,7 +55,6 @@ void ESM4::Class::load(ESM4::Reader& reader) reader.getZString(mIcon); break; case ESM4::SUB_DATA: - Log(Debug::Verbose) << "CLAS " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadclot.cpp b/components/esm4/loadclot.cpp index e50f72a8c9..f09811ce9e 100644 --- a/components/esm4/loadclot.cpp +++ b/components/esm4/loadclot.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -92,7 +90,6 @@ void ESM4::Clothing::load(ESM4::Reader& reader) case ESM4::SUB_MO2T: case ESM4::SUB_MO3T: case ESM4::SUB_MO4T: - Log(Debug::Verbose) << "CLOT " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadcont.cpp b/components/esm4/loadcont.cpp index 9ab0f958a2..b054c7dd52 100644 --- a/components/esm4/loadcont.cpp +++ b/components/esm4/loadcont.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -88,7 +86,6 @@ void ESM4::Container::load(ESM4::Reader& reader) case ESM4::SUB_DMDL: // FONV case ESM4::SUB_DMDT: // FONV case ESM4::SUB_RNAM: // FONV - Log(Debug::Verbose) << "CONT " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadcrea.cpp b/components/esm4/loadcrea.cpp index 0067e92e17..de1b362575 100644 --- a/components/esm4/loadcrea.cpp +++ b/components/esm4/loadcrea.cpp @@ -26,10 +26,6 @@ */ #include "loadcrea.hpp" -#ifdef NDEBUG // FIXME: debuggigng only -#undef NDEBUG -#endif - #include #include #include @@ -191,7 +187,6 @@ void ESM4::Creature::load(ESM4::Reader& reader) case ESM4::SUB_DMDL: // FO3 case ESM4::SUB_DMDT: // FO3 case ESM4::SUB_COED: // FO3 - Log(Debug::Verbose) << "CREA " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loaddial.cpp b/components/esm4/loaddial.cpp index 29b1b5f17e..071642cf5c 100644 --- a/components/esm4/loaddial.cpp +++ b/components/esm4/loaddial.cpp @@ -29,8 +29,6 @@ #include #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -98,11 +96,8 @@ void ESM4::Dialogue::load(ESM4::Reader& reader) case ESM4::SUB_BNAM: // TES5 case ESM4::SUB_SNAM: // TES5 case ESM4::SUB_TIFC: // TES5 - { - Log(Debug::Verbose) << "DIAL " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize; reader.skipSubRecordData(); break; - } default: throw std::runtime_error("ESM4::DIAL::load - Unknown subrecord " + ESM::printName(subHdr.typeId)); } diff --git a/components/esm4/loaddobj.cpp b/components/esm4/loaddobj.cpp index aaeaa5fc2b..b6a525e637 100644 --- a/components/esm4/loaddobj.cpp +++ b/components/esm4/loaddobj.cpp @@ -31,8 +31,6 @@ #include #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -91,7 +89,6 @@ void ESM4::DefaultObj::load(ESM4::Reader& reader) } break; case ESM4::SUB_DNAM: - Log(Debug::Verbose) << "DOBJ " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loaddoor.cpp b/components/esm4/loaddoor.cpp index 6e2818d600..d1a8d8e6ed 100644 --- a/components/esm4/loaddoor.cpp +++ b/components/esm4/loaddoor.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -82,7 +80,6 @@ void ESM4::Door::load(ESM4::Reader& reader) case ESM4::SUB_DSTF: // FO3 case ESM4::SUB_DMDL: // FO3 case ESM4::SUB_DMDT: // FO3 - Log(Debug::Verbose) << "DOOR " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadflor.cpp b/components/esm4/loadflor.cpp index 9bf8011b69..bdfe03a575 100644 --- a/components/esm4/loadflor.cpp +++ b/components/esm4/loadflor.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -75,7 +73,6 @@ void ESM4::Flora::load(ESM4::Reader& reader) case ESM4::SUB_PNAM: case ESM4::SUB_RNAM: case ESM4::SUB_VMAD: - Log(Debug::Verbose) << "FLOR " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadflst.cpp b/components/esm4/loadflst.cpp index 29893decb8..4650f2f13f 100644 --- a/components/esm4/loadflst.cpp +++ b/components/esm4/loadflst.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" diff --git a/components/esm4/loadfurn.cpp b/components/esm4/loadfurn.cpp index 7eac676ff6..226bb42eb8 100644 --- a/components/esm4/loadfurn.cpp +++ b/components/esm4/loadfurn.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -79,7 +77,6 @@ void ESM4::Furniture::load(ESM4::Reader& reader) case ESM4::SUB_VMAD: case ESM4::SUB_WBDT: case ESM4::SUB_XMRK: - Log(Debug::Verbose) << "FURN " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadglob.cpp b/components/esm4/loadglob.cpp index 16ce704280..5c56e799bf 100644 --- a/components/esm4/loadglob.cpp +++ b/components/esm4/loadglob.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -60,7 +58,6 @@ void ESM4::GlobalVariable::load(ESM4::Reader& reader) case ESM4::SUB_DATA: case ESM4::SUB_OBND: // TES5 case ESM4::SUB_VMAD: // TES5 - Log(Debug::Verbose) << "GLOB " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadgras.cpp b/components/esm4/loadgras.cpp index 9f2024c1ab..a18bfd7bb7 100644 --- a/components/esm4/loadgras.cpp +++ b/components/esm4/loadgras.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -58,7 +56,6 @@ void ESM4::Grass::load(ESM4::Reader& reader) break; case ESM4::SUB_MODT: case ESM4::SUB_OBND: - Log(Debug::Verbose) << "GRAS " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadhair.cpp b/components/esm4/loadhair.cpp index ad855f8d22..5b1f44afdf 100644 --- a/components/esm4/loadhair.cpp +++ b/components/esm4/loadhair.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -63,7 +61,6 @@ void ESM4::Hair::load(ESM4::Reader& reader) reader.get(mBoundRadius); break; case ESM4::SUB_MODT: - Log(Debug::Verbose) << "HAIR " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadhdpt.cpp b/components/esm4/loadhdpt.cpp index 092cda4768..679a52bb1f 100644 --- a/components/esm4/loadhdpt.cpp +++ b/components/esm4/loadhdpt.cpp @@ -30,8 +30,6 @@ #include #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -95,7 +93,6 @@ void ESM4::HeadPart::load(ESM4::Reader& reader) case ESM4::SUB_MODT: case ESM4::SUB_RNAM: case ESM4::SUB_CNAM: - Log(Debug::Verbose) << "HDPT " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadidle.cpp b/components/esm4/loadidle.cpp index 2853eb25b7..be1f7393f9 100644 --- a/components/esm4/loadidle.cpp +++ b/components/esm4/loadidle.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -65,7 +63,6 @@ void ESM4::IdleAnimation::load(ESM4::Reader& reader) break; case ESM4::SUB_CTDA: // formId case ESM4::SUB_DATA: // formId - Log(Debug::Verbose) << "IDLE " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadidlm.cpp b/components/esm4/loadidlm.cpp index efe2198dd7..b036edc7d6 100644 --- a/components/esm4/loadidlm.cpp +++ b/components/esm4/loadidlm.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -79,7 +77,6 @@ void ESM4::IdleMarker::load(ESM4::Reader& reader) break; } case ESM4::SUB_OBND: // object bounds - Log(Debug::Verbose) << "IDLM " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadimod.cpp b/components/esm4/loadimod.cpp index 5559b82113..278a4c9b35 100644 --- a/components/esm4/loadimod.cpp +++ b/components/esm4/loadimod.cpp @@ -30,8 +30,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -59,11 +57,8 @@ void ESM4::ItemMod::load(ESM4::Reader& reader) case ESM4::SUB_YNAM: case ESM4::SUB_ZNAM: case ESM4::SUB_DATA: - { - Log(Debug::Verbose) << "IMOD " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize; reader.skipSubRecordData(); break; - } default: throw std::runtime_error("ESM4::IMOD::load - Unknown subrecord " + ESM::printName(subHdr.typeId)); } diff --git a/components/esm4/loadinfo.cpp b/components/esm4/loadinfo.cpp index 7017794644..107fa244ef 100644 --- a/components/esm4/loadinfo.cpp +++ b/components/esm4/loadinfo.cpp @@ -29,8 +29,6 @@ #include #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -196,7 +194,6 @@ void ESM4::DialogInfo::load(ESM4::Reader& reader) case ESM4::SUB_ONAM: // TES5 case ESM4::SUB_QNAM: // TES5 for mScript case ESM4::SUB_RNAM: // TES5 - Log(Debug::Verbose) << "INFO " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadingr.cpp b/components/esm4/loadingr.cpp index 16c1d780e6..a0cf0d66d0 100644 --- a/components/esm4/loadingr.cpp +++ b/components/esm4/loadingr.cpp @@ -29,8 +29,6 @@ #include #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -109,7 +107,6 @@ void ESM4::Ingredient::load(ESM4::Reader& reader) case ESM4::SUB_ZNAM: case ESM4::SUB_ETYP: // FO3 { - Log(Debug::Verbose) << "INGR " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; } diff --git a/components/esm4/loadkeym.cpp b/components/esm4/loadkeym.cpp index 0074e9f8f3..14f3539659 100644 --- a/components/esm4/loadkeym.cpp +++ b/components/esm4/loadkeym.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -79,7 +77,6 @@ void ESM4::Key::load(ESM4::Reader& reader) case ESM4::SUB_KWDA: case ESM4::SUB_OBND: case ESM4::SUB_VMAD: - Log(Debug::Verbose) << "KEYM " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadland.cpp b/components/esm4/loadland.cpp index e3bbef96b7..1cd99a46c1 100644 --- a/components/esm4/loadland.cpp +++ b/components/esm4/loadland.cpp @@ -26,10 +26,6 @@ */ #include "loadland.hpp" -#ifdef NDEBUG // FIXME: debuggigng only -#undef NDEBUG -#endif - #include #include diff --git a/components/esm4/loadlgtm.cpp b/components/esm4/loadlgtm.cpp index d49b27457e..ff02c26956 100644 --- a/components/esm4/loadlgtm.cpp +++ b/components/esm4/loadlgtm.cpp @@ -31,8 +31,6 @@ #include // FLT_MAX for gcc #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -64,7 +62,6 @@ void ESM4::LightingTemplate::load(ESM4::Reader& reader) reader.skipSubRecordData(); // throw? break; case ESM4::SUB_DALC: // TES5 - Log(Debug::Verbose) << "LGTM " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadligh.cpp b/components/esm4/loadligh.cpp index c37aa7c7ca..bb12666219 100644 --- a/components/esm4/loadligh.cpp +++ b/components/esm4/loadligh.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -104,7 +102,6 @@ void ESM4::Light::load(ESM4::Reader& reader) case ESM4::SUB_MODT: case ESM4::SUB_OBND: case ESM4::SUB_VMAD: // Dragonborn only? - Log(Debug::Verbose) << "LIGH " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadltex.cpp b/components/esm4/loadltex.cpp index 5c67797a1a..c54e467d42 100644 --- a/components/esm4/loadltex.cpp +++ b/components/esm4/loadltex.cpp @@ -26,10 +26,6 @@ */ #include "loadltex.hpp" -#ifdef NDEBUG // FIXME: debuggigng only -#undef NDEBUG -#endif - #include #include "reader.hpp" diff --git a/components/esm4/loadlvlc.cpp b/components/esm4/loadlvlc.cpp index 57886f4261..760f5834f8 100644 --- a/components/esm4/loadlvlc.cpp +++ b/components/esm4/loadlvlc.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -87,11 +85,8 @@ void ESM4::LevelledCreature::load(ESM4::Reader& reader) break; } case ESM4::SUB_OBND: // FO3 - { - Log(Debug::Verbose) << "LVLC " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; - } default: throw std::runtime_error("ESM4::LVLC::load - Unknown subrecord " + ESM::printName(subHdr.typeId)); } diff --git a/components/esm4/loadlvli.cpp b/components/esm4/loadlvli.cpp index 9b650d863e..cdaee3bf6d 100644 --- a/components/esm4/loadlvli.cpp +++ b/components/esm4/loadlvli.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -83,7 +81,6 @@ void ESM4::LevelledItem::load(ESM4::Reader& reader) case ESM4::SUB_OBND: // FO3/FONV case ESM4::SUB_COED: // FO3/FONV case ESM4::SUB_LVLG: // FO3/FONV - Log(Debug::Verbose) << "LVLI " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadlvln.cpp b/components/esm4/loadlvln.cpp index 7e96e6e2a8..043dbcb34e 100644 --- a/components/esm4/loadlvln.cpp +++ b/components/esm4/loadlvln.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -95,7 +93,6 @@ void ESM4::LevelledNpc::load(ESM4::Reader& reader) case ESM4::SUB_COED: // owner case ESM4::SUB_OBND: // object bounds case ESM4::SUB_MODT: // model texture data - Log(Debug::Verbose) << "LVLN " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadmato.cpp b/components/esm4/loadmato.cpp index fb12bf62b3..5c3d74be3a 100644 --- a/components/esm4/loadmato.cpp +++ b/components/esm4/loadmato.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -52,7 +50,6 @@ void ESM4::Material::load(ESM4::Reader& reader) break; case ESM4::SUB_DNAM: case ESM4::SUB_DATA: - Log(Debug::Verbose) << "MATO " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadmisc.cpp b/components/esm4/loadmisc.cpp index 641bdac959..c0f803855f 100644 --- a/components/esm4/loadmisc.cpp +++ b/components/esm4/loadmisc.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -80,7 +78,6 @@ void ESM4::MiscItem::load(ESM4::Reader& reader) case ESM4::SUB_OBND: case ESM4::SUB_VMAD: case ESM4::SUB_RNAM: // FONV - Log(Debug::Verbose) << "MISC " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadmset.cpp b/components/esm4/loadmset.cpp index 207659c5c9..9081968f73 100644 --- a/components/esm4/loadmset.cpp +++ b/components/esm4/loadmset.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -129,7 +127,6 @@ void ESM4::MediaSet::load(ESM4::Reader& reader) reader.get(mTime4); break; case ESM4::SUB_DATA: - Log(Debug::Verbose) << "MSET " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadmstt.cpp b/components/esm4/loadmstt.cpp index bdbe055bb0..88497a7d28 100644 --- a/components/esm4/loadmstt.cpp +++ b/components/esm4/loadmstt.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -66,7 +64,6 @@ void ESM4::MovableStatic::load(ESM4::Reader& reader) case ESM4::SUB_MODS: case ESM4::SUB_FULL: case ESM4::SUB_MODB: - Log(Debug::Verbose) << "MSTT " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadmusc.cpp b/components/esm4/loadmusc.cpp index e526f110fa..5c790aaf23 100644 --- a/components/esm4/loadmusc.cpp +++ b/components/esm4/loadmusc.cpp @@ -30,8 +30,6 @@ #include -#include - //#include "formid.hpp" #include "reader.hpp" @@ -58,7 +56,6 @@ void ESM4::Music::load(ESM4::Reader& reader) case ESM4::SUB_WNAM: // TES5 case ESM4::SUB_PNAM: // TES5 case ESM4::SUB_TNAM: // TES5 - Log(Debug::Verbose) << "MUSC " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadnavi.cpp b/components/esm4/loadnavi.cpp index 167f1a5d30..dcae212fae 100644 --- a/components/esm4/loadnavi.cpp +++ b/components/esm4/loadnavi.cpp @@ -26,10 +26,6 @@ */ #include "loadnavi.hpp" -#ifdef NDEBUG // FIXME: debuggigng only -#undef NDEBUG -#endif - #include #include "reader.hpp" diff --git a/components/esm4/loadnavm.cpp b/components/esm4/loadnavm.cpp index d594ee7c5a..44708ef8e9 100644 --- a/components/esm4/loadnavm.cpp +++ b/components/esm4/loadnavm.cpp @@ -233,10 +233,8 @@ void ESM4::NavMesh::load(ESM4::Reader& reader) break; } case ESM4::SUB_XXXX: - { reader.get(subSize); break; - } case ESM4::SUB_NVER: // FO3 case ESM4::SUB_DATA: // FO3 case ESM4::SUB_NVVX: // FO3 @@ -246,7 +244,6 @@ void ESM4::NavMesh::load(ESM4::Reader& reader) case ESM4::SUB_NVGD: // FO3 case ESM4::SUB_NVEX: // FO3 case ESM4::SUB_EDID: // FO3 - Log(Debug::Verbose) << ESM::printName(reader.subRecordHeader().typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadnote.cpp b/components/esm4/loadnote.cpp index 8133d7f8f1..1b671ed537 100644 --- a/components/esm4/loadnote.cpp +++ b/components/esm4/loadnote.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -63,7 +61,6 @@ void ESM4::Note::load(ESM4::Reader& reader) case ESM4::SUB_TNAM: case ESM4::SUB_XNAM: case ESM4::SUB_OBND: - Log(Debug::Verbose) << "NOTE " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadnpc.cpp b/components/esm4/loadnpc.cpp index b944732213..ba5d262668 100644 --- a/components/esm4/loadnpc.cpp +++ b/components/esm4/loadnpc.cpp @@ -30,8 +30,6 @@ #include #include // getline -#include - #include "formid.hpp" #include "reader.hpp" //#include "writer.hpp" @@ -274,7 +272,6 @@ void ESM4::Npc::load(ESM4::Reader& reader) } std::cout << ss.str(); #else - Log(Debug::Verbose) << "NPC_ " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize; reader.skipSubRecordData(); #endif break; @@ -313,7 +310,6 @@ void ESM4::Npc::load(ESM4::Reader& reader) case ESM4::SUB_EAMT: // FO3 case ESM4::SUB_NAM4: // FO3 case ESM4::SUB_COED: // FO3 - Log(Debug::Verbose) << "NPC_ " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadpack.cpp b/components/esm4/loadpack.cpp index 13a84c3f8a..e4e27de663 100644 --- a/components/esm4/loadpack.cpp +++ b/components/esm4/loadpack.cpp @@ -29,8 +29,6 @@ #include #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -164,7 +162,6 @@ void ESM4::AIPackage::load(ESM4::Reader& reader) case ESM4::SUB_CIS2: // TES5 case ESM4::SUB_VMAD: // TES5 case ESM4::SUB_TPIC: // TES5 - Log(Debug::Verbose) << "PACK " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadpgrd.cpp b/components/esm4/loadpgrd.cpp index 94fc813ed8..a6007d85a3 100644 --- a/components/esm4/loadpgrd.cpp +++ b/components/esm4/loadpgrd.cpp @@ -28,8 +28,6 @@ #include -#include - #include "formid.hpp" // FIXME: for mEditorId workaround #include "reader.hpp" //#include "writer.hpp" @@ -142,7 +140,6 @@ void ESM4::Pathgrid::load(ESM4::Reader& reader) } std::cout << ss.str(); #else - Log(Debug::Verbose) << "PGRD " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize; reader.skipSubRecordData(); #endif break; diff --git a/components/esm4/loadpgre.cpp b/components/esm4/loadpgre.cpp index 5703428754..9e06b51d44 100644 --- a/components/esm4/loadpgre.cpp +++ b/components/esm4/loadpgre.cpp @@ -30,8 +30,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -75,11 +73,8 @@ void ESM4::PlacedGrenade::load(ESM4::Reader& reader) case ESM4::SUB_XIBS: case ESM4::SUB_XSCL: case ESM4::SUB_DATA: - { - Log(Debug::Verbose) << "PGRE " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize; reader.skipSubRecordData(); break; - } default: throw std::runtime_error("ESM4::PGRE::load - Unknown subrecord " + ESM::printName(subHdr.typeId)); } diff --git a/components/esm4/loadpwat.cpp b/components/esm4/loadpwat.cpp index 99e097b894..575da861cb 100644 --- a/components/esm4/loadpwat.cpp +++ b/components/esm4/loadpwat.cpp @@ -30,8 +30,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -52,11 +50,8 @@ void ESM4::PlaceableWater::load(ESM4::Reader& reader) case ESM4::SUB_OBND: case ESM4::SUB_MODL: case ESM4::SUB_DNAM: - { - Log(Debug::Verbose) << "PWAT " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize; reader.skipSubRecordData(); break; - } default: throw std::runtime_error("ESM4::PWAT::load - Unknown subrecord " + ESM::printName(subHdr.typeId)); } diff --git a/components/esm4/loadqust.cpp b/components/esm4/loadqust.cpp index e648729e26..46510fe3f9 100644 --- a/components/esm4/loadqust.cpp +++ b/components/esm4/loadqust.cpp @@ -29,8 +29,6 @@ #include #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -158,7 +156,6 @@ void ESM4::Quest::load(ESM4::Reader& reader) case ESM4::SUB_SPOR: // TES5 case ESM4::SUB_VMAD: // TES5 case ESM4::SUB_VTCK: // TES5 - Log(Debug::Verbose) << "QUST " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadrace.cpp b/components/esm4/loadrace.cpp index 9ad50e623a..527e07af67 100644 --- a/components/esm4/loadrace.cpp +++ b/components/esm4/loadrace.cpp @@ -29,8 +29,6 @@ #include #include -#include - #include "formid.hpp" #include "reader.hpp" //#include "writer.hpp" @@ -686,7 +684,6 @@ void ESM4::Race::load(ESM4::Reader& reader) case ESM4::SUB_MODT: // FO3 case ESM4::SUB_MODD: // FO3 case ESM4::SUB_ONAM: // FO3 - Log(Debug::Verbose) << "RACE " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadrefr.cpp b/components/esm4/loadrefr.cpp index b10af1f384..00a5dd0b88 100644 --- a/components/esm4/loadrefr.cpp +++ b/components/esm4/loadrefr.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" // #include "writer.hpp" @@ -323,13 +321,10 @@ void ESM4::Reference::load(ESM4::Reader& reader) case ESM4::SUB_XSRD: // FONV case ESM4::SUB_WMI1: // FONV case ESM4::SUB_XLRL: // Unofficial Skyrim Patch - { // if (mFormId == 0x0007e90f) // XPRM XPOD // if (mBaseObj == 0x17) //XPRM XOCP occlusion plane data XMBO bound half extents - Log(Debug::Verbose) << "REFR " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; - } default: throw std::runtime_error("ESM4::REFR::load - Unknown subrecord " + ESM::printName(subHdr.typeId)); } diff --git a/components/esm4/loadregn.cpp b/components/esm4/loadregn.cpp index 05470cf357..7ea344237e 100644 --- a/components/esm4/loadregn.cpp +++ b/components/esm4/loadregn.cpp @@ -26,14 +26,8 @@ */ #include "loadregn.hpp" -#ifdef NDEBUG // FIXME: debuggigng only -#undef NDEBUG -#endif - #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -143,7 +137,6 @@ void ESM4::Region::load(ESM4::Reader& reader) // RDAT skipping... following is grass // RDGS skipping... unknown, maybe grass - Log(Debug::Verbose) << "REGN " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadscol.cpp b/components/esm4/loadscol.cpp index 2cf5abb0a4..fec34301d4 100644 --- a/components/esm4/loadscol.cpp +++ b/components/esm4/loadscol.cpp @@ -30,8 +30,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -54,7 +52,6 @@ void ESM4::StaticCollection::load(ESM4::Reader& reader) case ESM4::SUB_MODT: case ESM4::SUB_ONAM: case ESM4::SUB_DATA: - Log(Debug::Verbose) << "SCOL " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadscrl.cpp b/components/esm4/loadscrl.cpp index 56268dfe4f..9dde36916e 100644 --- a/components/esm4/loadscrl.cpp +++ b/components/esm4/loadscrl.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -72,7 +70,6 @@ void ESM4::Scroll::load(ESM4::Reader& reader) case ESM4::SUB_MODT: case ESM4::SUB_SPIT: case ESM4::SUB_CIS2: - Log(Debug::Verbose) << "SCRL " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadslgm.cpp b/components/esm4/loadslgm.cpp index 3b059cb801..1c27b0c486 100644 --- a/components/esm4/loadslgm.cpp +++ b/components/esm4/loadslgm.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -76,7 +74,6 @@ void ESM4::SoulGem::load(ESM4::Reader& reader) case ESM4::SUB_KWDA: case ESM4::SUB_NAM0: case ESM4::SUB_OBND: - Log(Debug::Verbose) << "SLGM " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadsndr.cpp b/components/esm4/loadsndr.cpp index f660285eaf..5ae181e625 100644 --- a/components/esm4/loadsndr.cpp +++ b/components/esm4/loadsndr.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -75,7 +73,6 @@ void ESM4::SoundReference::load(ESM4::Reader& reader) break; case ESM4::SUB_CNAM: // CRC32 hash case ESM4::SUB_FNAM: // unknown - Log(Debug::Verbose) << "SNDR " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadsoun.cpp b/components/esm4/loadsoun.cpp index e24e55f146..85edd50b09 100644 --- a/components/esm4/loadsoun.cpp +++ b/components/esm4/loadsoun.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -68,7 +66,6 @@ void ESM4::Sound::load(ESM4::Reader& reader) case ESM4::SUB_GNAM: // FO3 case ESM4::SUB_HNAM: // FO3 case ESM4::SUB_RNAM: // FONV - Log(Debug::Verbose) << "SOUN " << ESM::printName(subHdr.typeId) << " skipping..." << subHdr.dataSize; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadstat.cpp b/components/esm4/loadstat.cpp index 3e9f956085..e8806379de 100644 --- a/components/esm4/loadstat.cpp +++ b/components/esm4/loadstat.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" // #include "writer.hpp" @@ -77,7 +75,6 @@ void ESM4::Static::load(ESM4::Reader& reader) case ESM4::SUB_MNAM: case ESM4::SUB_BRUS: // FONV case ESM4::SUB_RNAM: // FONV - Log(Debug::Verbose) << "STAT " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadtact.cpp b/components/esm4/loadtact.cpp index 1d77159e7c..5bf5c45cab 100644 --- a/components/esm4/loadtact.cpp +++ b/components/esm4/loadtact.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -72,7 +70,6 @@ void ESM4::TalkingActivator::load(ESM4::Reader& reader) case ESM4::SUB_PNAM: case ESM4::SUB_MODT: // texture file hash? case ESM4::SUB_OBND: - Log(Debug::Verbose) << "TACT " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadterm.cpp b/components/esm4/loadterm.cpp index e31cfc5245..b1fbdaedc2 100644 --- a/components/esm4/loadterm.cpp +++ b/components/esm4/loadterm.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -84,7 +82,6 @@ void ESM4::Terminal::load(ESM4::Reader& reader) case ESM4::SUB_TNAM: case ESM4::SUB_OBND: case ESM4::SUB_MODS: // FONV - Log(Debug::Verbose) << "TERM " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadtes4.cpp b/components/esm4/loadtes4.cpp index e81597e747..e915b5d38c 100644 --- a/components/esm4/loadtes4.cpp +++ b/components/esm4/loadtes4.cpp @@ -26,14 +26,8 @@ */ #include "loadtes4.hpp" -#ifdef NDEBUG // FIXME: debuggigng only -#undef NDEBUG -#endif - #include -#include - #include "common.hpp" #include "formid.hpp" #include "reader.hpp" @@ -106,7 +100,6 @@ void ESM4::Header::load(ESM4::Reader& reader) case ESM4::SUB_INCC: case ESM4::SUB_OFST: // Oblivion only? case ESM4::SUB_DELE: // Oblivion only? - Log(Debug::Verbose) << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadtree.cpp b/components/esm4/loadtree.cpp index 54507f75d2..5369767c7e 100644 --- a/components/esm4/loadtree.cpp +++ b/components/esm4/loadtree.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -63,7 +61,6 @@ void ESM4::Tree::load(ESM4::Reader& reader) case ESM4::SUB_OBND: case ESM4::SUB_PFIG: case ESM4::SUB_PFPC: - Log(Debug::Verbose) << "TREE " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadtxst.cpp b/components/esm4/loadtxst.cpp index 81f5453de1..5cac7fd116 100644 --- a/components/esm4/loadtxst.cpp +++ b/components/esm4/loadtxst.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -74,7 +72,6 @@ void ESM4::TextureSet::load(ESM4::Reader& reader) case ESM4::SUB_DNAM: case ESM4::SUB_DODT: case ESM4::SUB_OBND: // object bounds - Log(Debug::Verbose) << "TXST " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadweap.cpp b/components/esm4/loadweap.cpp index d53fbc34e8..443e5dc51c 100644 --- a/components/esm4/loadweap.cpp +++ b/components/esm4/loadweap.cpp @@ -28,8 +28,6 @@ #include -#include - #include "reader.hpp" //#include "writer.hpp" @@ -178,7 +176,6 @@ void ESM4::Weapon::load(ESM4::Reader& reader) case ESM4::SUB_WNM6: // FONV case ESM4::SUB_WNM7: // FONV case ESM4::SUB_EFSD: // FONV DeadMoney - Log(Debug::Verbose) << "WEAP " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/loadwrld.cpp b/components/esm4/loadwrld.cpp index 5bdc215a35..0ab7faab9c 100644 --- a/components/esm4/loadwrld.cpp +++ b/components/esm4/loadwrld.cpp @@ -26,7 +26,6 @@ */ #include "loadwrld.hpp" -#include #include #include "reader.hpp" @@ -179,7 +178,6 @@ void ESM4::World::load(ESM4::Reader& reader) case ESM4::SUB_XNAM: // FO3 case ESM4::SUB_IMPS: // FO3 Anchorage case ESM4::SUB_IMPF: // FO3 Anchorage - Log(Debug::Verbose) << "WRLD " << ESM::printName(subHdr.typeId) << " skipping..."; reader.skipSubRecordData(); break; default: diff --git a/components/esm4/reader.cpp b/components/esm4/reader.cpp index ad6afd216b..ddd3efd866 100644 --- a/components/esm4/reader.cpp +++ b/components/esm4/reader.cpp @@ -22,10 +22,6 @@ */ #include "reader.hpp" -#ifdef NDEBUG // FIXME: debugging only -#undef NDEBUG -#endif - #undef DEBUG_GROUPSTACK #include