Refactor: Renamed "map" module as "world"

doomsday/client/client.pro

@@ -229,49 +229,6 @@ DENG_HEADERS += \
     include/m_misc.h \
     include/m_nodepile.h \
     include/m_profiler.h \
-    include/map/blockmap.h \
-    include/map/blockmapvisual.h \
-    include/map/bsp/bsptreenode.h \
-    include/map/bsp/convexsubspace.h \
-    include/map/bsp/edgetip.h \
-    include/map/bsp/hplane.h \
-    include/map/bsp/linesegment.h \
-    include/map/bsp/partitioncost.h \
-    include/map/bsp/partitioner.h \
-    include/map/bsp/superblockmap.h \
-    include/map/bspbuilder.h \
-    include/map/bspleaf.h \
-    include/map/bspnode.h \
-    include/map/dam_file.h \
-    include/map/entitydatabase.h \
-    include/map/face.h \
-    include/map/gamemap.h \
-    include/map/generators.h \
-    include/map/hedge.h \
-    include/map/line.h \
-    include/map/lineowner.h \
-    include/map/linesighttest.h \
-    include/map/mapelement.h \
-    include/map/mesh.h \
-    include/map/p_dmu.h \
-    include/map/p_intercept.h \
-    include/map/p_mapdata.h \
-    include/map/p_maptypes.h \
-    include/map/p_maputil.h \
-    include/map/p_object.h \
-    include/map/p_objlink.h \
-    include/map/p_particle.h \
-    include/map/p_players.h \
-    include/map/p_ticker.h \
-    include/map/plane.h \
-    include/map/polyobj.h \
-    include/map/propertyvalue.h \
-    include/map/r_world.h \
-    include/map/reject.h \
-    include/map/sector.h \
-    include/map/segment.h \
-    include/map/surface.h \
-    include/map/vertex.h \
     include/network/masterserver.h \
     include/network/monitor.h \
     include/network/net_buf.h \
@@ -392,6 +349,49 @@ DENG_HEADERS += \
     include/ui/zonedebug.h \
     include/updater.h \
     include/uri.hh \
+    include/world/blockmap.h \
+    include/world/blockmapvisual.h \
+    include/world/bsp/bsptreenode.h \
+    include/world/bsp/convexsubspace.h \
+    include/world/bsp/edgetip.h \
+    include/world/bsp/hplane.h \
+    include/world/bsp/linesegment.h \
+    include/world/bsp/partitioncost.h \
+    include/world/bsp/partitioner.h \
+    include/world/bsp/superblockmap.h \
+    include/world/bspbuilder.h \
+    include/world/bspleaf.h \
+    include/world/bspnode.h \
+    include/world/dam_file.h \
+    include/world/entitydatabase.h \
+    include/world/face.h \
+    include/world/gamemap.h \
+    include/world/generators.h \
+    include/world/hedge.h \
+    include/world/line.h \
+    include/world/lineowner.h \
+    include/world/linesighttest.h \
+    include/world/mapelement.h \
+    include/world/mesh.h \
+    include/world/p_dmu.h \
+    include/world/p_intercept.h \
+    include/world/p_mapdata.h \
+    include/world/p_maptypes.h \
+    include/world/p_maputil.h \
+    include/world/p_object.h \
+    include/world/p_objlink.h \
+    include/world/p_particle.h \
+    include/world/p_players.h \
+    include/world/p_ticker.h \
+    include/world/plane.h \
+    include/world/polyobj.h \
+    include/world/propertyvalue.h \
+    include/world/r_world.h \
+    include/world/reject.h \
+    include/world/sector.h \
+    include/world/segment.h \
+    include/world/surface.h \
+    include/world/vertex.h \
     src/updater/downloaddialog.h \
     src/updater/processcheckdialog.h \
     src/updater/updateavailabledialog.h \
@@ -521,45 +521,6 @@ SOURCES += \
     src/m_misc.cpp \
     src/m_nodepile.cpp \
     src/main_client.cpp \
-    src/map/blockmap.cpp \
-    src/map/blockmapvisual.cpp \
-    src/map/bsp/convexsubspace.cpp \
-    src/map/bsp/hplane.cpp \
-    src/map/bsp/linesegment.cpp \
-    src/map/bsp/partitioner.cpp \
-    src/map/bsp/superblockmap.cpp \
-    src/map/bspbuilder.cpp \
-    src/map/bspleaf.cpp \
-    src/map/bspnode.cpp \
-    src/map/dam_file.cpp \
-    src/map/entitydatabase.cpp \
-    src/map/face.cpp \
-    src/map/gamemap.cpp \
-    src/map/generators.cpp \
-    src/map/hedge.cpp \
-    src/map/line.cpp \
-    src/map/linesighttest.cpp \
-    src/map/mapelement.cpp \
-    src/map/mesh.cpp \
-    src/map/p_data.cpp \
-    src/map/p_dmu.cpp \
-    src/map/p_intercept.cpp \
-    src/map/p_maputil.cpp \
-    src/map/p_mobj.cpp \
-    src/map/p_objlink.cpp \
-    src/map/p_particle.cpp \
-    src/map/p_players.cpp \
-    src/map/p_think.cpp \
-    src/map/p_ticker.cpp \
-    src/map/plane.cpp \
-    src/map/polyobj.cpp \
-    src/map/propertyvalue.cpp \
-    src/map/r_world.cpp \
-    src/map/reject.cpp \
-    src/map/sector.cpp \
-    src/map/segment.cpp \
-    src/map/surface.cpp \
-    src/map/vertex.cpp \
     src/network/masterserver.cpp \
     src/network/monitor.cpp \
     src/network/net_buf.cpp \
@@ -682,7 +643,46 @@ SOURCES += \
     src/updater/updatersettings.cpp \
     src/updater/updatersettingsdialog.cpp \
     src/uri.cpp \
-    src/ui/signalaction.cpp
+    src/ui/signalaction.cpp \
+    src/world/blockmap.cpp \
+    src/world/blockmapvisual.cpp \
+    src/world/bsp/convexsubspace.cpp \
+    src/world/bsp/hplane.cpp \
+    src/world/bsp/linesegment.cpp \
+    src/world/bsp/partitioner.cpp \
+    src/world/bsp/superblockmap.cpp \
+    src/world/bspbuilder.cpp \
+    src/world/bspleaf.cpp \
+    src/world/bspnode.cpp \
+    src/world/dam_file.cpp \
+    src/world/entitydatabase.cpp \
+    src/world/face.cpp \
+    src/world/gamemap.cpp \
+    src/world/generators.cpp \
+    src/world/hedge.cpp \
+    src/world/line.cpp \
+    src/world/linesighttest.cpp \
+    src/world/mapelement.cpp \
+    src/world/mesh.cpp \
+    src/world/p_data.cpp \
+    src/world/p_dmu.cpp \
+    src/world/p_intercept.cpp \
+    src/world/p_maputil.cpp \
+    src/world/p_mobj.cpp \
+    src/world/p_objlink.cpp \
+    src/world/p_particle.cpp \
+    src/world/p_players.cpp \
+    src/world/p_think.cpp \
+    src/world/p_ticker.cpp \
+    src/world/plane.cpp \
+    src/world/polyobj.cpp \
+    src/world/propertyvalue.cpp \
+    src/world/r_world.cpp \
+    src/world/reject.cpp \
+    src/world/sector.cpp \
+    src/world/segment.cpp \
+    src/world/surface.cpp \
+    src/world/vertex.cpp
 
 !deng_nosdlmixer:!deng_nosdl {
     HEADERS += include/audio/sys_audiod_sdlmixer.h

doomsday/client/include/BspBuilder

@@ -1,2 +1,2 @@
-#include "map/bspbuilder.h"
-#include "map/bsp/bsptreenode.h"
+#include "world/bspbuilder.h"
+#include "world/bsp/bsptreenode.h"

doomsday/client/include/BspLeaf

@@ -1 +1 @@
-#include "map/bspleaf.h"
+#include "world/bspleaf.h"

doomsday/client/include/BspNode

@@ -1 +1 @@
-#include "map/bspnode.h"
+#include "world/bspnode.h"

doomsday/client/include/EntityDatabase

@@ -1 +1 @@
-#include "map/entitydatabase.h"
+#include "world/entitydatabase.h"

doomsday/client/include/Face

@@ -1 +1 @@
-#include "map/face.h"
+#include "world/face.h"

doomsday/client/include/HEdge

@@ -1 +1 @@
-#include "map/hedge.h"
+#include "world/hedge.h"

doomsday/client/include/Line

@@ -1 +1 @@
-#include "map/line.h"
+#include "world/line.h"

doomsday/client/include/MapElement

@@ -1 +1 @@
-#include "map/mapelement.h"
+#include "world/mapelement.h"

doomsday/client/include/Mesh

@@ -1 +1 @@
-#include "map/mesh.h"
+#include "world/mesh.h"

doomsday/client/include/Plane

@@ -1 +1 @@
-#include "map/plane.h"
+#include "world/plane.h"

doomsday/client/include/Polyobj

@@ -1 +1 @@
-#include "map/polyobj.h"
+#include "world/polyobj.h"

doomsday/client/include/Sector

@@ -1 +1 @@
-#include "map/sector.h"
+#include "world/sector.h"

doomsday/client/include/Segment

@@ -1 +1 @@
-#include "map/segment.h"
+#include "world/segment.h"

doomsday/client/include/Surface

@@ -1 +1 @@
-#include "map/surface.h"
+#include "world/surface.h"

doomsday/client/include/Vertex

@@ -1 +1 @@
-#include "map/vertex.h"
+#include "world/vertex.h"

doomsday/client/include/audio/s_main.h

@@ -20,7 +20,7 @@
 #ifndef LIBDENG_SOUND_MAIN_H
 #define LIBDENG_SOUND_MAIN_H
 
-#include "map/p_object.h"
+#include "world/p_object.h"
 #include "def_main.h"
 #include "api_sound.h"
 #include "api_audiod.h"

doomsday/client/include/audio/s_sfx.h

@@ -31,8 +31,8 @@
 
 #include "api_audiod.h"
 #include "api_audiod_sfx.h"
-#include "map/gamemap.h"
-#include "map/p_maptypes.h"
+#include "world/gamemap.h"
+#include "world/p_maptypes.h"
 
 #ifdef __cplusplus
 extern "C" {

doomsday/client/include/client/cl_def.h

@@ -24,7 +24,7 @@
 #ifndef __DOOMSDAY_CLIENT_H__
 #define __DOOMSDAY_CLIENT_H__
 
-#include "map/p_object.h"
+#include "world/p_object.h"
 
 #ifdef __cplusplus
 extern "C" {

doomsday/client/include/client/cl_mobj.h

@@ -21,7 +21,7 @@
 #ifndef __DOOMSDAY_CLIENT_MOBJ_H__
 #define __DOOMSDAY_CLIENT_MOBJ_H__
 
-#include "map/p_object.h"
+#include "world/p_object.h"
 
 /**
  * @defgroup clMobjFlags Client Mobj Flags

doomsday/client/include/de_dam.h

@@ -25,6 +25,6 @@
 #define __DOOMSDAY_DAM__
 
 #include "resource/maparchive.h"
-#include "map/dam_file.h"
+#include "world/dam_file.h"
 
 #endif

doomsday/client/include/de_play.h

@@ -28,23 +28,23 @@
 #include "Vertex"
 #include "Surface"
 #include "Line"
-#include "map/linesighttest.h"
+#include "world/linesighttest.h"
 #include "Plane"
 #include "Segment"
 #include "BspNode"
 #include "Sector"
 #include "Polyobj"
-#include "map/p_dmu.h"
-#include "map/p_object.h"
-#include "map/p_intercept.h"
-#include "map/p_maputil.h"
-#include "map/p_particle.h"
-#include "map/p_ticker.h"
-#include "map/p_players.h"
-#include "map/p_objlink.h"
-#include "map/p_mapdata.h"
-#include "map/p_maptypes.h"
-#include "map/r_world.h"
+#include "world/p_dmu.h"
+#include "world/p_object.h"
+#include "world/p_intercept.h"
+#include "world/p_maputil.h"
+#include "world/p_particle.h"
+#include "world/p_ticker.h"
+#include "world/p_players.h"
+#include "world/p_objlink.h"
+#include "world/p_mapdata.h"
+#include "world/p_maptypes.h"
+#include "world/r_world.h"
 #include "Material"
 #include "ui/p_control.h"
 #include "r_util.h"

doomsday/client/include/de_render.h

@@ -49,7 +49,7 @@
 #include "render/vlight.h"
 #endif
 
-//#include "map/r_world.h"
+//#include "world/r_world.h"
 #include "r_util.h"
 
 #endif /* DOOMSDAY_CLIENT_RENDERER */

doomsday/client/include/network/net_main.h

@@ -28,7 +28,7 @@
 #include "lzss.h"
 #include "dd_share.h"
 #include "net_msg.h"
-#include "map/p_mapdata.h"
+#include "world/p_mapdata.h"
 #include <de/Record>
 #include <de/smoother.h>
 

doomsday/client/include/render/r_things.h

@@ -23,7 +23,7 @@
 #ifndef LIBDENG_RENDER_THINGS_H
 #define LIBDENG_RENDER_THINGS_H
 
-#include "map/p_maptypes.h"
+#include "world/p_maptypes.h"
 #include "resource/r_data.h"
 #include "Materials"
 #include "rend_model.h"

doomsday/client/include/render/rend_particle.h

@@ -21,7 +21,7 @@
 #ifndef LIBDENG_RENDER_PARTICLE_H
 #define LIBDENG_RENDER_PARTICLE_H
 
-#include "map/p_particle.h"
+#include "world/p_particle.h"
 
 #ifdef __cplusplus
 extern "C" {

doomsday/client/include/resource/material.h

@@ -24,7 +24,7 @@
 #include "MapElement"
 #include "def_data.h"
 #include "audio/s_environ.h"
-#include "map/p_dmu.h" // setargs_t
+#include "world/p_dmu.h" // setargs_t
 #ifdef __CLIENT__
 #  include "MaterialContext"
 #endif

doomsday/client/include/map/bsp/bsptreenode.h → doomsday/client/include/world/bsp/bsptreenode.h

@@ -1,4 +1,4 @@
-/** @file bsptreenode.h BSP Builder BspTreeNode.
+/** @file world/bsp/bsptreenode.h World BSP Tree Node.
  *
  * @authors Copyright © 2013 Daniel Swanson <danij@dengine.net>
  *
@@ -17,8 +17,8 @@
  * 02110-1301 USA</small>
  */
 
-#ifndef LIBDENG_BSPBUILDER_BSPTREENODE
-#define LIBDENG_BSPBUILDER_BSPTREENODE
+#ifndef DENG_WORLD_BSP_BSPTREENODE_H
+#define DENG_WORLD_BSP_BSPTREENODE_H
 
 #include <de/BinaryTree>
 #include "MapElement"
@@ -30,4 +30,4 @@
  */
 typedef de::BinaryTree<de::MapElement *> BspTreeNode;
 
-#endif // LIBDENG_BSPBUILDER_BSPTREENODE
+#endif // DENG_WORLD_BSP_BSPTREENODE_H