Cleanup|libcommon: Added a source subdirectory for "world"

skyjake · Jul 25, 2016 · e9a3525 · e9a3525
1 parent 6b49242
commit e9a3525
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 11 deletions.
diff --git a/...pps/plugins/common/src/mapstatereader.cpp → ...ugins/common/src/world/mapstatereader.cpp b/...pps/plugins/common/src/mapstatereader.cpp → ...ugins/common/src/world/mapstatereader.cpp
@@ -61,7 +61,6 @@ namespace internal
     }
 }
 
-using namespace internal;
 using namespace de;
 
 DENG2_PIMPL(MapStateReader)
@@ -166,7 +165,7 @@ DENG2_PIMPL(MapStateReader)
 
     void readMaterialArchive()
     {
-        materialArchive = new world::MaterialArchive(useMaterialArchiveSegments(), false /*empty*/);
+        materialArchive = new world::MaterialArchive(::internal::useMaterialArchiveSegments(), false /*empty*/);
 #if !__JHEXEN__
         if(mapVersion >= 4)
 #endif
@@ -761,7 +760,7 @@ void MapStateReader::read(String const &mapUriStr)
         d->readMapHeader();
         d->readMaterialArchive();
 
-        d->thingArchive = new ThingArchive(thingArchiveVersionFor(d->mapVersion));
+        d->thingArchive = new ThingArchive(::internal::thingArchiveVersionFor(d->mapVersion));
 #if !__JHEXEN__
         d->thingArchive->initForLoad(d->thingArchiveSize);
 #endif

diff --git a/...pps/plugins/common/src/mapstatewriter.cpp → ...ugins/common/src/world/mapstatewriter.cpp b/...pps/plugins/common/src/mapstatewriter.cpp → ...ugins/common/src/world/mapstatewriter.cpp
@@ -33,7 +33,7 @@
 
 namespace internal
 {
-    static bool useMaterialArchiveSegments() {
+    static bool MapStateWriter_useMaterialArchiveSegments() {
 #if __JHEXEN__
         return true;
 #else
@@ -42,8 +42,6 @@ namespace internal
     }
 }
 
-using namespace internal;
-
 DENG2_PIMPL(MapStateWriter)
 {
     ThingArchive *thingArchive;
@@ -307,7 +305,7 @@ void MapStateWriter::write(Writer1 *writer, bool excludePlayers)
     d->writer = writer;
 
     // Prepare and populate the material archive.
-    d->materialArchive = new world::MaterialArchive(useMaterialArchiveSegments());
+    d->materialArchive = new world::MaterialArchive(::internal::MapStateWriter_useMaterialArchiveSegments());
     d->materialArchive->addWorldMaterials();
 
     Writer_WriteInt32(writer, MY_SAVE_MAGIC);

diff --git a/doomsday/apps/plugins/common/src/mobj.cpp → ...ay/apps/plugins/common/src/world/mobj.cpp b/doomsday/apps/plugins/common/src/mobj.cpp → ...ay/apps/plugins/common/src/world/mobj.cpp
@@ -21,10 +21,6 @@
  * 02110-1301 USA</small>
  */
 
-#ifdef MSVC
-#  pragma optimize("g", off)
-#endif
-
 #include "common.h"
 #include "mobj.h"
 
@@ -39,6 +35,10 @@
 #include "p_saveg.h"
 #include "player.h"
 
+#ifdef MSVC
+#  pragma optimize("g", off)
+#endif
+
 #define DROPOFFMOMENTUM_THRESHOLD (1.0 / 4)
 
 /// Threshold for stopping walk animation.

diff --git a/doomsday/apps/plugins/common/src/pause.cpp → ...y/apps/plugins/common/src/world/pause.cpp b/doomsday/apps/plugins/common/src/pause.cpp → ...y/apps/plugins/common/src/world/pause.cpp
diff --git a/doomsday/apps/plugins/common/src/player.cpp → .../apps/plugins/common/src/world/player.cpp b/doomsday/apps/plugins/common/src/player.cpp → .../apps/plugins/common/src/world/player.cpp
diff --git a/...sday/apps/plugins/common/src/polyobjs.cpp → ...pps/plugins/common/src/world/polyobjs.cpp b/...sday/apps/plugins/common/src/polyobjs.cpp → ...pps/plugins/common/src/world/polyobjs.cpp
diff --git a/.../apps/plugins/common/src/thingarchive.cpp → ...plugins/common/src/world/thingarchive.cpp b/.../apps/plugins/common/src/thingarchive.cpp → ...plugins/common/src/world/thingarchive.cpp
diff --git a/...y/apps/plugins/common/src/thinkerinfo.cpp → .../plugins/common/src/world/thinkerinfo.cpp b/...y/apps/plugins/common/src/thinkerinfo.cpp → .../plugins/common/src/world/thinkerinfo.cpp