diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp index cd0e8e1c15..8d224e8b31 100644 --- a/apps/esmtool/esmtool.cpp +++ b/apps/esmtool/esmtool.cpp @@ -4,8 +4,8 @@ #include -#include -#include +#include +#include #include #define ESMTOOL_VERSION 1.1 diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp index d32a3b045c..8ca3c9aed7 100644 --- a/apps/launcher/datafilespage.cpp +++ b/apps/launcher/datafilespage.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include #include "datafilespage.hpp" diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index 5b547d00c9..c714693c3a 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -39,7 +39,7 @@ add_component_dir (esm_store ) add_component_dir (esm - attr defs esm_reader esm_writer loadacti loadalch loadappa loadarmo loadbody loadbook loadbsgn loadcell + attr defs esmcommon esmreader esmwriter loadacti loadalch loadappa loadarmo loadbody loadbook loadbsgn loadcell loadclas loadclot loadcont loadcrea loadcrec loaddial loaddoor loadench loadfact loadglob loadgmst loadinfo loadingr loadland loadlevlist loadligh loadlocks loadltex loadmgef loadmisc loadnpcc loadnpc loadpgrd loadrace loadregn loadscpt loadskil loadsndg loadsoun loadspel loadsscr loadstat diff --git a/components/esm/aipackage.cpp b/components/esm/aipackage.cpp index 7cc9cd2e54..1e6220c3a5 100644 --- a/components/esm/aipackage.cpp +++ b/components/esm/aipackage.cpp @@ -1,7 +1,7 @@ #include "aipackage.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/aipackage.hpp b/components/esm/aipackage.hpp index 0efc3b61ed..3046a6a98f 100644 --- a/components/esm/aipackage.hpp +++ b/components/esm/aipackage.hpp @@ -4,7 +4,7 @@ #include #include -#include "esm_common.hpp" +#include "esmcommon.hpp" namespace ESM { diff --git a/components/esm/effectlist.cpp b/components/esm/effectlist.cpp index 187dffc19a..88f87d6e29 100644 --- a/components/esm/effectlist.cpp +++ b/components/esm/effectlist.cpp @@ -1,7 +1,7 @@ #include "effectlist.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/esm_common.hpp b/components/esm/esmcommon.hpp similarity index 100% rename from components/esm/esm_common.hpp rename to components/esm/esmcommon.hpp diff --git a/components/esm/esm_reader.cpp b/components/esm/esmreader.cpp similarity index 99% rename from components/esm/esm_reader.cpp rename to components/esm/esmreader.cpp index 95ef46e81a..2915a1ce77 100644 --- a/components/esm/esm_reader.cpp +++ b/components/esm/esmreader.cpp @@ -1,4 +1,4 @@ -#include "esm_reader.hpp" +#include "esmreader.hpp" #include namespace ESM diff --git a/components/esm/esm_reader.hpp b/components/esm/esmreader.hpp similarity index 99% rename from components/esm/esm_reader.hpp rename to components/esm/esmreader.hpp index fe96f37ae2..6a74c53e89 100644 --- a/components/esm/esm_reader.hpp +++ b/components/esm/esmreader.hpp @@ -12,7 +12,7 @@ #include #include -#include "esm_common.hpp" +#include "esmcommon.hpp" namespace ESM { diff --git a/components/esm/esm_writer.cpp b/components/esm/esmwriter.cpp similarity index 99% rename from components/esm/esm_writer.cpp rename to components/esm/esmwriter.cpp index 113f31ae98..24658a40b5 100644 --- a/components/esm/esm_writer.cpp +++ b/components/esm/esmwriter.cpp @@ -1,4 +1,4 @@ -#include "esm_writer.hpp" +#include "esmwriter.hpp" #include #include diff --git a/components/esm/esm_writer.hpp b/components/esm/esmwriter.hpp similarity index 98% rename from components/esm/esm_writer.hpp rename to components/esm/esmwriter.hpp index 6a3382b8fc..d3777be813 100644 --- a/components/esm/esm_writer.hpp +++ b/components/esm/esmwriter.hpp @@ -5,7 +5,7 @@ #include #include -#include "esm_common.hpp" +#include "esmcommon.hpp" #include "../to_utf8/to_utf8.hpp" namespace ESM { diff --git a/components/esm/loadacti.cpp b/components/esm/loadacti.cpp index 1fd5819c81..0e214e2b62 100644 --- a/components/esm/loadacti.cpp +++ b/components/esm/loadacti.cpp @@ -1,7 +1,7 @@ #include "loadacti.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadalch.cpp b/components/esm/loadalch.cpp index be84642165..a4b1bb7182 100644 --- a/components/esm/loadalch.cpp +++ b/components/esm/loadalch.cpp @@ -1,7 +1,7 @@ #include "loadalch.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadappa.cpp b/components/esm/loadappa.cpp index b9e3f5c37a..f5e7e10e1a 100644 --- a/components/esm/loadappa.cpp +++ b/components/esm/loadappa.cpp @@ -1,7 +1,7 @@ #include "loadappa.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadarmo.cpp b/components/esm/loadarmo.cpp index 36b12e7d42..6133465330 100644 --- a/components/esm/loadarmo.cpp +++ b/components/esm/loadarmo.cpp @@ -1,7 +1,7 @@ #include "loadarmo.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadbody.cpp b/components/esm/loadbody.cpp index 421717049b..831ad8b641 100644 --- a/components/esm/loadbody.cpp +++ b/components/esm/loadbody.cpp @@ -1,7 +1,7 @@ #include "loadbody.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadbook.cpp b/components/esm/loadbook.cpp index 365868338f..8ed2f122a8 100644 --- a/components/esm/loadbook.cpp +++ b/components/esm/loadbook.cpp @@ -1,7 +1,7 @@ #include "loadbook.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadbsgn.cpp b/components/esm/loadbsgn.cpp index 9b1835fabe..b58071644c 100644 --- a/components/esm/loadbsgn.cpp +++ b/components/esm/loadbsgn.cpp @@ -1,7 +1,7 @@ #include "loadbsgn.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadcell.cpp b/components/esm/loadcell.cpp index c83c5f4003..b7e2063ef3 100644 --- a/components/esm/loadcell.cpp +++ b/components/esm/loadcell.cpp @@ -3,8 +3,8 @@ #include #include -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadcell.hpp b/components/esm/loadcell.hpp index 3d13696372..6936dc255b 100644 --- a/components/esm/loadcell.hpp +++ b/components/esm/loadcell.hpp @@ -3,7 +3,7 @@ #include -#include "esm_common.hpp" +#include "esmcommon.hpp" #include "record.hpp" #include "defs.hpp" diff --git a/components/esm/loadclas.cpp b/components/esm/loadclas.cpp index 6201441603..a626689504 100644 --- a/components/esm/loadclas.cpp +++ b/components/esm/loadclas.cpp @@ -1,7 +1,7 @@ #include "loadclas.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadclot.cpp b/components/esm/loadclot.cpp index 4279ae9f47..a37fbe8a4c 100644 --- a/components/esm/loadclot.cpp +++ b/components/esm/loadclot.cpp @@ -1,7 +1,7 @@ #include "loadclot.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadcont.cpp b/components/esm/loadcont.cpp index 6eef4124df..e6ba91e7c2 100644 --- a/components/esm/loadcont.cpp +++ b/components/esm/loadcont.cpp @@ -1,7 +1,7 @@ #include "loadcont.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadcont.hpp b/components/esm/loadcont.hpp index e8384a8d44..66e906050e 100644 --- a/components/esm/loadcont.hpp +++ b/components/esm/loadcont.hpp @@ -5,7 +5,7 @@ #include #include "record.hpp" -#include "esm_common.hpp" +#include "esmcommon.hpp" namespace ESM { diff --git a/components/esm/loadcrea.cpp b/components/esm/loadcrea.cpp index 2af6aeb050..b59835bd64 100644 --- a/components/esm/loadcrea.cpp +++ b/components/esm/loadcrea.cpp @@ -1,7 +1,7 @@ #include "loadcrea.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadcrec.hpp b/components/esm/loadcrec.hpp index b0e8dccd14..b40a9605f5 100644 --- a/components/esm/loadcrec.hpp +++ b/components/esm/loadcrec.hpp @@ -4,7 +4,7 @@ #include "record.hpp" // TODO create implementation files and remove this one -#include "esm_reader.hpp" +#include "esmreader.hpp" namespace ESM { diff --git a/components/esm/loaddial.cpp b/components/esm/loaddial.cpp index a3189b7a99..fb50d5e9f5 100644 --- a/components/esm/loaddial.cpp +++ b/components/esm/loaddial.cpp @@ -1,7 +1,7 @@ #include "loaddial.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loaddoor.cpp b/components/esm/loaddoor.cpp index ddcb0a5cbb..b8ef029c57 100644 --- a/components/esm/loaddoor.cpp +++ b/components/esm/loaddoor.cpp @@ -1,7 +1,7 @@ #include "loaddoor.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadench.cpp b/components/esm/loadench.cpp index 8e7bbd35ee..c4e278368e 100644 --- a/components/esm/loadench.cpp +++ b/components/esm/loadench.cpp @@ -1,7 +1,7 @@ #include "loadench.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadfact.cpp b/components/esm/loadfact.cpp index c09d9657ad..6ea66977d5 100644 --- a/components/esm/loadfact.cpp +++ b/components/esm/loadfact.cpp @@ -1,7 +1,7 @@ #include "loadfact.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadglob.cpp b/components/esm/loadglob.cpp index 1c3edef4c2..39c07fb310 100644 --- a/components/esm/loadglob.cpp +++ b/components/esm/loadglob.cpp @@ -1,7 +1,7 @@ #include "loadglob.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadgmst.cpp b/components/esm/loadgmst.cpp index b496170e7a..aca880b4dc 100644 --- a/components/esm/loadgmst.cpp +++ b/components/esm/loadgmst.cpp @@ -2,8 +2,8 @@ #include -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadinfo.cpp b/components/esm/loadinfo.cpp index b29c1dd945..5535d6abb7 100644 --- a/components/esm/loadinfo.cpp +++ b/components/esm/loadinfo.cpp @@ -1,7 +1,7 @@ #include "loadinfo.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadingr.cpp b/components/esm/loadingr.cpp index e39d12a4eb..4312dc05ba 100644 --- a/components/esm/loadingr.cpp +++ b/components/esm/loadingr.cpp @@ -1,7 +1,7 @@ #include "loadingr.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadland.cpp b/components/esm/loadland.cpp index 0107e80efa..ec5ea5052d 100644 --- a/components/esm/loadland.cpp +++ b/components/esm/loadland.cpp @@ -1,7 +1,7 @@ #include "loadland.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadland.hpp b/components/esm/loadland.hpp index 3149dfcb78..f82cd1da8e 100644 --- a/components/esm/loadland.hpp +++ b/components/esm/loadland.hpp @@ -4,7 +4,7 @@ #include #include "record.hpp" -#include "esm_common.hpp" +#include "esmcommon.hpp" namespace ESM { diff --git a/components/esm/loadlevlist.cpp b/components/esm/loadlevlist.cpp index 2431f139e2..4cba1119bf 100644 --- a/components/esm/loadlevlist.cpp +++ b/components/esm/loadlevlist.cpp @@ -1,7 +1,7 @@ #include "loadlevlist.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadligh.cpp b/components/esm/loadligh.cpp index 727c662cd0..48a56db3cf 100644 --- a/components/esm/loadligh.cpp +++ b/components/esm/loadligh.cpp @@ -1,7 +1,7 @@ #include "loadligh.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadlocks.cpp b/components/esm/loadlocks.cpp index 0399f75b9c..057da595e7 100644 --- a/components/esm/loadlocks.cpp +++ b/components/esm/loadlocks.cpp @@ -1,7 +1,7 @@ #include "loadlocks.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadltex.cpp b/components/esm/loadltex.cpp index 40fe37298b..e523e9fa7f 100644 --- a/components/esm/loadltex.cpp +++ b/components/esm/loadltex.cpp @@ -1,7 +1,7 @@ #include "loadltex.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadmgef.cpp b/components/esm/loadmgef.cpp index b36355d2a4..be588fbb01 100644 --- a/components/esm/loadmgef.cpp +++ b/components/esm/loadmgef.cpp @@ -1,7 +1,7 @@ #include "loadmgef.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace { diff --git a/components/esm/loadmisc.cpp b/components/esm/loadmisc.cpp index a6d53c7f12..3a5dded151 100644 --- a/components/esm/loadmisc.cpp +++ b/components/esm/loadmisc.cpp @@ -1,7 +1,7 @@ #include "loadmisc.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadnpc.cpp b/components/esm/loadnpc.cpp index ee2833ca12..72d0b37362 100644 --- a/components/esm/loadnpc.cpp +++ b/components/esm/loadnpc.cpp @@ -1,7 +1,7 @@ #include "loadnpc.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadnpcc.hpp b/components/esm/loadnpcc.hpp index 3641c0fa97..17ef8763b1 100644 --- a/components/esm/loadnpcc.hpp +++ b/components/esm/loadnpcc.hpp @@ -4,7 +4,7 @@ #include "record.hpp" // TODO: create implementation files to remove this -#include "esm_reader.hpp" +#include "esmreader.hpp" namespace ESM { diff --git a/components/esm/loadpgrd.cpp b/components/esm/loadpgrd.cpp index 7c238a30b7..56c2f8c74f 100644 --- a/components/esm/loadpgrd.cpp +++ b/components/esm/loadpgrd.cpp @@ -1,7 +1,7 @@ #include "loadpgrd.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadrace.cpp b/components/esm/loadrace.cpp index 6fb2644460..139ef081c0 100644 --- a/components/esm/loadrace.cpp +++ b/components/esm/loadrace.cpp @@ -1,7 +1,7 @@ #include "loadrace.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadregn.cpp b/components/esm/loadregn.cpp index 75a7bdc63e..d39a294547 100644 --- a/components/esm/loadregn.cpp +++ b/components/esm/loadregn.cpp @@ -1,7 +1,7 @@ #include "loadregn.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadregn.hpp b/components/esm/loadregn.hpp index ae78b20043..5c9086d142 100644 --- a/components/esm/loadregn.hpp +++ b/components/esm/loadregn.hpp @@ -5,7 +5,7 @@ #include #include "record.hpp" -#include "esm_common.hpp" +#include "esmcommon.hpp" namespace ESM { diff --git a/components/esm/loadscpt.cpp b/components/esm/loadscpt.cpp index 5bf7278a32..dc28166d44 100644 --- a/components/esm/loadscpt.cpp +++ b/components/esm/loadscpt.cpp @@ -1,7 +1,7 @@ #include "loadscpt.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadscpt.hpp b/components/esm/loadscpt.hpp index 4c273fbe23..2cc786cb9d 100644 --- a/components/esm/loadscpt.hpp +++ b/components/esm/loadscpt.hpp @@ -5,7 +5,7 @@ #include #include "record.hpp" -#include "esm_common.hpp" +#include "esmcommon.hpp" namespace ESM { diff --git a/components/esm/loadskil.cpp b/components/esm/loadskil.cpp index 8e4bc2c66f..a4d21c5912 100644 --- a/components/esm/loadskil.cpp +++ b/components/esm/loadskil.cpp @@ -1,7 +1,7 @@ #include "loadskil.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadsndg.cpp b/components/esm/loadsndg.cpp index 3ff77030e6..42d524226d 100644 --- a/components/esm/loadsndg.cpp +++ b/components/esm/loadsndg.cpp @@ -1,7 +1,7 @@ #include "loadsndg.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadsoun.cpp b/components/esm/loadsoun.cpp index 66ac0ad22d..87a08d2d3a 100644 --- a/components/esm/loadsoun.cpp +++ b/components/esm/loadsoun.cpp @@ -1,7 +1,7 @@ #include "loadsoun.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadspel.cpp b/components/esm/loadspel.cpp index dc2695dd26..b0f1ca64b9 100644 --- a/components/esm/loadspel.cpp +++ b/components/esm/loadspel.cpp @@ -1,7 +1,7 @@ #include "loadspel.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadsscr.cpp b/components/esm/loadsscr.cpp index f34ebbfa00..ae50de517c 100644 --- a/components/esm/loadsscr.cpp +++ b/components/esm/loadsscr.cpp @@ -1,7 +1,7 @@ #include "loadsscr.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadstat.cpp b/components/esm/loadstat.cpp index 6b39e61ed3..92c9ebc714 100644 --- a/components/esm/loadstat.cpp +++ b/components/esm/loadstat.cpp @@ -1,7 +1,7 @@ #include "loadstat.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/loadweap.cpp b/components/esm/loadweap.cpp index c20747e69e..18d37e56c5 100644 --- a/components/esm/loadweap.cpp +++ b/components/esm/loadweap.cpp @@ -1,7 +1,7 @@ #include "loadweap.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/esm/spelllist.cpp b/components/esm/spelllist.cpp index 364131242b..dd886cf7ff 100644 --- a/components/esm/spelllist.cpp +++ b/components/esm/spelllist.cpp @@ -1,7 +1,7 @@ #include "spelllist.hpp" -#include "esm_reader.hpp" -#include "esm_writer.hpp" +#include "esmreader.hpp" +#include "esmwriter.hpp" namespace ESM { diff --git a/components/terrain/esm_land_factory.cpp b/components/terrain/esm_land_factory.cpp index a6335c6dcf..5cab7ed5df 100644 --- a/components/terrain/esm_land_factory.cpp +++ b/components/terrain/esm_land_factory.cpp @@ -3,7 +3,7 @@ // The first one already includes the others implicitly, but it // doesn't hurt to be explicit. #include "../esm_store/store.hpp" -#include "../esm/esm_reader.hpp" +#include "../esm/esmreader.hpp" #include "../esm/loadland.hpp" using namespace Terrain;