diff --git a/doomsday/client/client.pro b/doomsday/client/client.pro index 312c0727be..f9c554d815 100644 --- a/doomsday/client/client.pro +++ b/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 diff --git a/doomsday/client/include/BspBuilder b/doomsday/client/include/BspBuilder index f8e7c0203c..652ddc4744 100644 --- a/doomsday/client/include/BspBuilder +++ b/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" diff --git a/doomsday/client/include/BspLeaf b/doomsday/client/include/BspLeaf index 46ba54b799..a6aaa020b3 100644 --- a/doomsday/client/include/BspLeaf +++ b/doomsday/client/include/BspLeaf @@ -1 +1 @@ -#include "map/bspleaf.h" +#include "world/bspleaf.h" diff --git a/doomsday/client/include/BspNode b/doomsday/client/include/BspNode index a22b152297..ddd460d4af 100644 --- a/doomsday/client/include/BspNode +++ b/doomsday/client/include/BspNode @@ -1 +1 @@ -#include "map/bspnode.h" +#include "world/bspnode.h" diff --git a/doomsday/client/include/EntityDatabase b/doomsday/client/include/EntityDatabase index 1f55a9873b..666227bf98 100644 --- a/doomsday/client/include/EntityDatabase +++ b/doomsday/client/include/EntityDatabase @@ -1 +1 @@ -#include "map/entitydatabase.h" +#include "world/entitydatabase.h" diff --git a/doomsday/client/include/Face b/doomsday/client/include/Face index b63d8109eb..89cc259f00 100644 --- a/doomsday/client/include/Face +++ b/doomsday/client/include/Face @@ -1 +1 @@ -#include "map/face.h" +#include "world/face.h" diff --git a/doomsday/client/include/HEdge b/doomsday/client/include/HEdge index 82f3e56048..a2c38a98c4 100644 --- a/doomsday/client/include/HEdge +++ b/doomsday/client/include/HEdge @@ -1 +1 @@ -#include "map/hedge.h" +#include "world/hedge.h" diff --git a/doomsday/client/include/Line b/doomsday/client/include/Line index 3a8b44dfe6..bc09e7f17f 100644 --- a/doomsday/client/include/Line +++ b/doomsday/client/include/Line @@ -1 +1 @@ -#include "map/line.h" +#include "world/line.h" diff --git a/doomsday/client/include/MapElement b/doomsday/client/include/MapElement index 430d5d6bcc..0d8829ae4d 100644 --- a/doomsday/client/include/MapElement +++ b/doomsday/client/include/MapElement @@ -1 +1 @@ -#include "map/mapelement.h" +#include "world/mapelement.h" diff --git a/doomsday/client/include/Mesh b/doomsday/client/include/Mesh index 4cad5dd985..168c27dafc 100644 --- a/doomsday/client/include/Mesh +++ b/doomsday/client/include/Mesh @@ -1 +1 @@ -#include "map/mesh.h" +#include "world/mesh.h" diff --git a/doomsday/client/include/Plane b/doomsday/client/include/Plane index 9d23aca7a3..a40f00741d 100644 --- a/doomsday/client/include/Plane +++ b/doomsday/client/include/Plane @@ -1 +1 @@ -#include "map/plane.h" +#include "world/plane.h" diff --git a/doomsday/client/include/Polyobj b/doomsday/client/include/Polyobj index 596055e89c..13ffbc644f 100644 --- a/doomsday/client/include/Polyobj +++ b/doomsday/client/include/Polyobj @@ -1 +1 @@ -#include "map/polyobj.h" +#include "world/polyobj.h" diff --git a/doomsday/client/include/Sector b/doomsday/client/include/Sector index c7735fdda4..568c76c291 100644 --- a/doomsday/client/include/Sector +++ b/doomsday/client/include/Sector @@ -1 +1 @@ -#include "map/sector.h" +#include "world/sector.h" diff --git a/doomsday/client/include/Segment b/doomsday/client/include/Segment index 0c8fbdd0b1..d1f8de126e 100644 --- a/doomsday/client/include/Segment +++ b/doomsday/client/include/Segment @@ -1 +1 @@ -#include "map/segment.h" +#include "world/segment.h" diff --git a/doomsday/client/include/Surface b/doomsday/client/include/Surface index 76920e14b5..c909f36e09 100644 --- a/doomsday/client/include/Surface +++ b/doomsday/client/include/Surface @@ -1 +1 @@ -#include "map/surface.h" +#include "world/surface.h" diff --git a/doomsday/client/include/Vertex b/doomsday/client/include/Vertex index 8bfbf4a687..4f1860e207 100644 --- a/doomsday/client/include/Vertex +++ b/doomsday/client/include/Vertex @@ -1 +1 @@ -#include "map/vertex.h" +#include "world/vertex.h" diff --git a/doomsday/client/include/audio/s_main.h b/doomsday/client/include/audio/s_main.h index eb469fa753..fec34f6b29 100644 --- a/doomsday/client/include/audio/s_main.h +++ b/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" diff --git a/doomsday/client/include/audio/s_sfx.h b/doomsday/client/include/audio/s_sfx.h index a6b8c9c507..df28ea67df 100644 --- a/doomsday/client/include/audio/s_sfx.h +++ b/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" { diff --git a/doomsday/client/include/client/cl_def.h b/doomsday/client/include/client/cl_def.h index 48c4587965..26ba9cbabe 100644 --- a/doomsday/client/include/client/cl_def.h +++ b/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" { diff --git a/doomsday/client/include/client/cl_mobj.h b/doomsday/client/include/client/cl_mobj.h index b9db493a67..f00001a419 100644 --- a/doomsday/client/include/client/cl_mobj.h +++ b/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 diff --git a/doomsday/client/include/de_dam.h b/doomsday/client/include/de_dam.h index b19ec63168..3d353792cf 100644 --- a/doomsday/client/include/de_dam.h +++ b/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 diff --git a/doomsday/client/include/de_play.h b/doomsday/client/include/de_play.h index 3968abcc94..a9f4594f69 100644 --- a/doomsday/client/include/de_play.h +++ b/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" diff --git a/doomsday/client/include/de_render.h b/doomsday/client/include/de_render.h index c12ebb799d..7c0c1d61bf 100644 --- a/doomsday/client/include/de_render.h +++ b/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 */ diff --git a/doomsday/client/include/network/net_main.h b/doomsday/client/include/network/net_main.h index a5cd984c97..65b79a86c1 100644 --- a/doomsday/client/include/network/net_main.h +++ b/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 #include diff --git a/doomsday/client/include/render/r_things.h b/doomsday/client/include/render/r_things.h index 79037f1871..a790550a32 100644 --- a/doomsday/client/include/render/r_things.h +++ b/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" diff --git a/doomsday/client/include/render/rend_particle.h b/doomsday/client/include/render/rend_particle.h index f7496af2e8..1394031be0 100644 --- a/doomsday/client/include/render/rend_particle.h +++ b/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" { diff --git a/doomsday/client/include/resource/material.h b/doomsday/client/include/resource/material.h index 088d7dcad3..365ed11136 100644 --- a/doomsday/client/include/resource/material.h +++ b/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 diff --git a/doomsday/client/include/map/blockmap.h b/doomsday/client/include/world/blockmap.h similarity index 100% rename from doomsday/client/include/map/blockmap.h rename to doomsday/client/include/world/blockmap.h diff --git a/doomsday/client/include/map/blockmapvisual.h b/doomsday/client/include/world/blockmapvisual.h similarity index 100% rename from doomsday/client/include/map/blockmapvisual.h rename to doomsday/client/include/world/blockmapvisual.h diff --git a/doomsday/client/include/map/bsp/bsptreenode.h b/doomsday/client/include/world/bsp/bsptreenode.h similarity index 86% rename from doomsday/client/include/map/bsp/bsptreenode.h rename to doomsday/client/include/world/bsp/bsptreenode.h index 479fcfc541..f49578f175 100644 --- a/doomsday/client/include/map/bsp/bsptreenode.h +++ b/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 * @@ -17,8 +17,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_BSPBUILDER_BSPTREENODE -#define LIBDENG_BSPBUILDER_BSPTREENODE +#ifndef DENG_WORLD_BSP_BSPTREENODE_H +#define DENG_WORLD_BSP_BSPTREENODE_H #include #include "MapElement" @@ -30,4 +30,4 @@ */ typedef de::BinaryTree BspTreeNode; -#endif // LIBDENG_BSPBUILDER_BSPTREENODE +#endif // DENG_WORLD_BSP_BSPTREENODE_H diff --git a/doomsday/client/include/map/bsp/convexsubspace.h b/doomsday/client/include/world/bsp/convexsubspace.h similarity index 96% rename from doomsday/client/include/map/bsp/convexsubspace.h rename to doomsday/client/include/world/bsp/convexsubspace.h index 0e603efba5..fc261b82d9 100644 --- a/doomsday/client/include/map/bsp/convexsubspace.h +++ b/doomsday/client/include/world/bsp/convexsubspace.h @@ -1,4 +1,4 @@ -/** @file map/bsp/convexsubspace.h BSP Builder Convex Subspace. +/** @file world/bsp/convexsubspace.h World BSP Convex Subspace. * * @authors Copyright © 2013 Daniel Swanson * @@ -17,14 +17,14 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_MAP_BSP_CONVEXSUBSPACE -#define DENG_WORLD_MAP_BSP_CONVEXSUBSPACE +#ifndef DENG_WORLD_BSP_CONVEXSUBSPACE_H +#define DENG_WORLD_BSP_CONVEXSUBSPACE_H #include #include -#include "map/bsp/linesegment.h" +#include "world/bsp/linesegment.h" class BspLeaf; class Sector; @@ -35,6 +35,9 @@ class Mesh; namespace bsp { +/** + * @ingroup bsp + */ struct OrderedSegment { LineSegment::Side *segment; @@ -196,4 +199,4 @@ class ConvexSubspace } // namespace bsp } // namespace de -#endif // DENG_WORLD_MAP_BSP_CONVEXSUBSPACE +#endif // DENG_WORLD_BSP_CONVEXSUBSPACE_H diff --git a/doomsday/client/include/map/bsp/edgetip.h b/doomsday/client/include/world/bsp/edgetip.h similarity index 95% rename from doomsday/client/include/map/bsp/edgetip.h rename to doomsday/client/include/world/bsp/edgetip.h index 102514466a..828643c4f5 100644 --- a/doomsday/client/include/map/bsp/edgetip.h +++ b/doomsday/client/include/world/bsp/edgetip.h @@ -1,4 +1,4 @@ -/** @file map/bsp/edgetip.h BSP Builder Edge Tip. +/** @file world/bsp/edgetip.h World BSP Edge Tip. * * Originally based on glBSP 2.24 (in turn, based on BSP 2.3) * @see http://sourceforge.net/projects/glbsp/ @@ -23,12 +23,12 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_MAP_BSP_EDGETIP -#define DENG_WORLD_MAP_BSP_EDGETIP +#ifndef DENG_WORLD_BSP_EDGETIP_H +#define DENG_WORLD_BSP_EDGETIP_H #include -#include "map/bsp/linesegment.h" +#include "world/bsp/linesegment.h" namespace de { namespace bsp { @@ -113,6 +113,9 @@ class EdgeTip LineSegment::Side *_front, *_back; }; +/** + * @ingroup bsp + */ class EdgeTips { public: @@ -171,4 +174,4 @@ class EdgeTips } // namespace bsp } // namespace de -#endif // DENG_WORLD_MAP_BSP_EDGETIP +#endif // DENG_WORLD_BSP_EDGETIP_H diff --git a/doomsday/client/include/map/bsp/hplane.h b/doomsday/client/include/world/bsp/hplane.h similarity index 97% rename from doomsday/client/include/map/bsp/hplane.h rename to doomsday/client/include/world/bsp/hplane.h index f2b19fb615..85da745920 100644 --- a/doomsday/client/include/map/bsp/hplane.h +++ b/doomsday/client/include/world/bsp/hplane.h @@ -1,4 +1,4 @@ -/** @file map/bsp/hplane.h BSP Builder Half-plane. +/** @file world/bsp/hplane.h World BSP Half-plane. * * Originally based on glBSP 2.24 (in turn, based on BSP 2.3) * @see http://sourceforge.net/projects/glbsp/ @@ -23,8 +23,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_MAP_BSP_HPLANE -#define DENG_WORLD_MAP_BSP_HPLANE +#ifndef DENG_WORLD_BSP_HPLANE_H +#define DENG_WORLD_BSP_HPLANE_H #include @@ -32,7 +32,7 @@ #include -#include "map/bsp/linesegment.h" +#include "world/bsp/linesegment.h" #include "partition.h" /// Two intercepts whose distance is inclusive of this bound will be merged. @@ -48,6 +48,8 @@ class EdgeTips; /** * Models the partitioning binary space half-plane. + * + * @ingroup bsp */ class HPlane { @@ -290,4 +292,4 @@ class HPlane } // namespace bsp } // namespace de -#endif // DENG_WORLD_MAP_BSP_HPLANE +#endif // DENG_WORLD_BSP_HPLANE_H diff --git a/doomsday/client/include/map/bsp/linesegment.h b/doomsday/client/include/world/bsp/linesegment.h similarity index 98% rename from doomsday/client/include/map/bsp/linesegment.h rename to doomsday/client/include/world/bsp/linesegment.h index ba0160a678..e2a8498f78 100644 --- a/doomsday/client/include/map/bsp/linesegment.h +++ b/doomsday/client/include/world/bsp/linesegment.h @@ -1,4 +1,4 @@ -/** @file map/bsp/linesegment.h BSP Builder Line Segment. +/** @file world/bsp/linesegment.h World BSP Line Segment. * * Originally based on glBSP 2.24 (in turn, based on BSP 2.3) * @see http://sourceforge.net/projects/glbsp/ @@ -23,8 +23,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_MAP_BSP_LINESEGMENT -#define DENG_WORLD_MAP_BSP_LINESEGMENT +#ifndef DENG_WORLD_BSP_LINESEGMENT_H +#define DENG_WORLD_BSP_LINESEGMENT_H #include #include @@ -44,6 +44,8 @@ class SuperBlock; /** * LineRelationship delineates the possible logical relationships between two * line (segments) in the plane. + * + * @ingroup bsp */ enum LineRelationship { @@ -553,4 +555,4 @@ class LineSegment } // namespace bsp } // namespace de -#endif // DENG_WORLD_MAP_BSP_LINESEGMENT +#endif // DENG_WORLD_BSP_LINESEGMENT_H diff --git a/doomsday/client/include/map/bsp/partitioncost.h b/doomsday/client/include/world/bsp/partitioncost.h similarity index 92% rename from doomsday/client/include/map/bsp/partitioncost.h rename to doomsday/client/include/world/bsp/partitioncost.h index 83dd31f5ab..3a9f14cdc4 100644 --- a/doomsday/client/include/map/bsp/partitioncost.h +++ b/doomsday/client/include/world/bsp/partitioncost.h @@ -1,4 +1,4 @@ -/** @file map/bsp/partitioncost.h BSP Builder Partition Cost. +/** @file world/bsp/partitioncost.h World BSP Partition Cost. * * Originally based on glBSP 2.24 (in turn, based on BSP 2.3) * @see http://sourceforge.net/projects/glbsp/ @@ -23,10 +23,10 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_MAP_BSP_PARTITIONCOST -#define DENG_WORLD_MAP_BSP_PARTITIONCOST +#ifndef DENG_WORLD_BSP_PARTITIONCOST_H +#define DENG_WORLD_BSP_PARTITIONCOST_H -#include "map/bsp/linesegment.h" +#include "world/bsp/linesegment.h" namespace de { namespace bsp { @@ -105,4 +105,4 @@ struct PartitionCost } // namespace bsp } // namespace de -#endif // DENG_WORLD_MAP_BSP_PARTITIONCOST +#endif // DENG_WORLD_BSP_PARTITIONCOST_H diff --git a/doomsday/client/include/map/bsp/partitioner.h b/doomsday/client/include/world/bsp/partitioner.h similarity index 95% rename from doomsday/client/include/map/bsp/partitioner.h rename to doomsday/client/include/world/bsp/partitioner.h index da5ec8aa93..d35813e46f 100644 --- a/doomsday/client/include/map/bsp/partitioner.h +++ b/doomsday/client/include/world/bsp/partitioner.h @@ -1,4 +1,4 @@ -/** @file map/bsp/partitioner.h Binary Space partitioner. +/** @file world/bsp/partitioner.h World Binary Space Partitioner. * * @authors Copyright © 2007-2013 Daniel Swanson * @authors Copyright © 2000-2007 Andrew Apted @@ -20,13 +20,13 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_MAP_BSP_PARTITIONER -#define DENG_WORLD_MAP_BSP_PARTITIONER +#ifndef DENG_WORLD_BSP_PARTITIONER_H +#define DENG_WORLD_BSP_PARTITIONER_H #include #include -#include "map/bsp/bsptreenode.h" /// @todo remove me +#include "world/bsp/bsptreenode.h" /// @todo remove me class BspLeaf; class Segment; @@ -154,4 +154,4 @@ class Partitioner } // namespace bsp } // namespace de -#endif // DENG_WORLD_MAP_BSP_PARTITIONER +#endif // DENG_WORLD_BSP_PARTITIONER_H diff --git a/doomsday/client/include/map/bsp/superblockmap.h b/doomsday/client/include/world/bsp/superblockmap.h similarity index 97% rename from doomsday/client/include/map/bsp/superblockmap.h rename to doomsday/client/include/world/bsp/superblockmap.h index 90a92ded5f..a262560d2a 100644 --- a/doomsday/client/include/map/bsp/superblockmap.h +++ b/doomsday/client/include/world/bsp/superblockmap.h @@ -1,4 +1,4 @@ -/** @file map/bsp/superblockmap.h BSP Builder SuperBlockmap. +/** @file world/bsp/superblockmap.h World BSP SuperBlockmap. * * Originally based on glBSP 2.24 (in turn, based on BSP 2.3) * @see http://sourceforge.net/projects/glbsp/ @@ -23,8 +23,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_MAP_BSP_SUPERBLOCKMAP -#define DENG_WORLD_MAP_BSP_SUPERBLOCKMAP +#ifndef DENG_WORLD_BSP_SUPERBLOCKMAP_H +#define DENG_WORLD_BSP_SUPERBLOCKMAP_H #include @@ -33,7 +33,7 @@ #include #include -#include "map/bsp/linesegment.h" +#include "world/bsp/linesegment.h" namespace de { namespace bsp { @@ -88,6 +88,8 @@ class SuperBlockmap * LEFT - has the higher coordinates. * Division of a block always occurs horizontally: * e.g. 512x512 -> 256x512 -> 256x256. + * + * @ingroup bsp */ class SuperBlock { @@ -261,4 +263,4 @@ class SuperBlock } // namespace bsp } // namespace de -#endif // DENG_WORLD_MAP_BSP_SUPERBLOCKMAP +#endif // DENG_WORLD_BSP_SUPERBLOCKMAP_H diff --git a/doomsday/client/include/map/bspbuilder.h b/doomsday/client/include/world/bspbuilder.h similarity index 98% rename from doomsday/client/include/map/bspbuilder.h rename to doomsday/client/include/world/bspbuilder.h index 0aeea8e84d..0c30a8fe76 100644 --- a/doomsday/client/include/map/bspbuilder.h +++ b/doomsday/client/include/world/bspbuilder.h @@ -23,8 +23,8 @@ #ifndef DENG_WORLD_MAP_BSPBUILDER #define DENG_WORLD_MAP_BSPBUILDER -#include "map/gamemap.h" -#include "map/bsp/bsptreenode.h" +#include "world/gamemap.h" +#include "world/bsp/bsptreenode.h" namespace de { diff --git a/doomsday/client/include/map/bspleaf.h b/doomsday/client/include/world/bspleaf.h similarity index 100% rename from doomsday/client/include/map/bspleaf.h rename to doomsday/client/include/world/bspleaf.h diff --git a/doomsday/client/include/map/bspnode.h b/doomsday/client/include/world/bspnode.h similarity index 100% rename from doomsday/client/include/map/bspnode.h rename to doomsday/client/include/world/bspnode.h diff --git a/doomsday/client/include/map/dam_file.h b/doomsday/client/include/world/dam_file.h similarity index 100% rename from doomsday/client/include/map/dam_file.h rename to doomsday/client/include/world/dam_file.h diff --git a/doomsday/client/include/map/entitydatabase.h b/doomsday/client/include/world/entitydatabase.h similarity index 100% rename from doomsday/client/include/map/entitydatabase.h rename to doomsday/client/include/world/entitydatabase.h diff --git a/doomsday/client/include/map/face.h b/doomsday/client/include/world/face.h similarity index 100% rename from doomsday/client/include/map/face.h rename to doomsday/client/include/world/face.h diff --git a/doomsday/client/include/map/gamemap.h b/doomsday/client/include/world/gamemap.h similarity index 99% rename from doomsday/client/include/map/gamemap.h rename to doomsday/client/include/world/gamemap.h index f6c37b4c9b..9a85ae417c 100644 --- a/doomsday/client/include/map/gamemap.h +++ b/doomsday/client/include/world/gamemap.h @@ -1,4 +1,4 @@ -/** @file map/gamemap.h World Map. +/** @file world/gamemap.h World Map. * * @authors Copyright © 2003-2013 Jaakko Keränen * @authors Copyright © 2006-2013 Daniel Swanson @@ -48,7 +48,7 @@ struct blockmap_s; #define CLIENT_MOBJ_HASH_SIZE (256) /** - * @ingroup map + * @ingroup world */ typedef struct cmhash_s { struct clmoinfo_s *first, *last; @@ -57,7 +57,7 @@ typedef struct cmhash_s { #define CLIENT_MAX_MOVERS 1024 // Definitely enough! /** - * @ingroup map + * @ingroup world */ typedef enum { CPT_FLOOR, @@ -77,7 +77,7 @@ class Mesh; /** * World map. * - * @ingroup map + * @ingroup world */ class GameMap { diff --git a/doomsday/client/include/map/generators.h b/doomsday/client/include/world/generators.h similarity index 94% rename from doomsday/client/include/map/generators.h rename to doomsday/client/include/world/generators.h index 82c6d1f1e2..132eef600b 100644 --- a/doomsday/client/include/map/generators.h +++ b/doomsday/client/include/world/generators.h @@ -1,12 +1,10 @@ -/** - * @file generators.h - * Generator collection. @ingroup map +/** @file world/generators.h Generator collection. * * A collection of ptcgen_t instances and implements all bookkeeping logic * pertinent to the management of said instances. * - * @authors Copyright © 2003-2013 Jaakko Keränen - * @authors Copyright © 2006-2013 Daniel Swanson + * @authors Copyright © 2003-2013 Jaakko Keränen + * @authors Copyright © 2006-2013 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html @@ -23,8 +21,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_MAP_GENERATORS -#define LIBDENG_MAP_GENERATORS +#ifndef DENG_WORLD_GENERATORS_H +#define DENG_WORLD_GENERATORS_H #include "p_particle.h" @@ -162,4 +160,4 @@ int Generators_IterateList(Generators* generators, uint listIndex, } // extern "C" #endif -#endif // LIBDENG_MAP_GENERATORS +#endif // DENG_WORLD_GENERATORS_H diff --git a/doomsday/client/include/map/hedge.h b/doomsday/client/include/world/hedge.h similarity index 100% rename from doomsday/client/include/map/hedge.h rename to doomsday/client/include/world/hedge.h diff --git a/doomsday/client/include/map/line.h b/doomsday/client/include/world/line.h similarity index 99% rename from doomsday/client/include/map/line.h rename to doomsday/client/include/world/line.h index 51bdb46a96..21b009c1d1 100644 --- a/doomsday/client/include/map/line.h +++ b/doomsday/client/include/world/line.h @@ -1,4 +1,4 @@ -/** @file line.h World Map Line. +/** @file world/line.h World Line. * * @authors Copyright © 2003-2013 Jaakko Keränen * @authors Copyright © 2006-2013 Daniel Swanson @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_MAP_LINE -#define DENG_WORLD_MAP_LINE +#ifndef DENG_WORLD_LINE_H +#define DENG_WORLD_LINE_H #include #include /// @todo remove me @@ -40,7 +40,7 @@ class LineOwner; class Sector; /** - * World map line. + * World line. * * @attention This component has a notably different design and slightly different * purpose when compared to a Linedef in the id Tech 1 map format. The definitions @@ -56,7 +56,7 @@ class Sector; * * @see http://en.wikipedia.org/wiki/Arrangement_of_lines * - * @ingroup map + * @ingroup world */ class Line : public de::MapElement { @@ -817,4 +817,4 @@ class Line : public de::MapElement Q_DECLARE_OPERATORS_FOR_FLAGS(Line::Side::SectionFlags) -#endif // DENG_WORLD_MAP_LINE +#endif // DENG_WORLD_LINE_H diff --git a/doomsday/client/include/map/lineowner.h b/doomsday/client/include/world/lineowner.h similarity index 95% rename from doomsday/client/include/map/lineowner.h rename to doomsday/client/include/world/lineowner.h index d500997360..06516d231b 100644 --- a/doomsday/client/include/map/lineowner.h +++ b/doomsday/client/include/world/lineowner.h @@ -1,4 +1,4 @@ -/** @file lineowner.h World Map Line Owner. +/** @file world/lineowner.h World Line Owner. * * @authors Copyright © 2003-2013 Jaakko Keränen * @authors Copyright © 2006-2013 Daniel Swanson @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_MAP_LINEOWNER -#define DENG_WORLD_MAP_LINEOWNER +#ifndef DENG_WORLD_LINEOWNER_H +#define DENG_WORLD_LINEOWNER_H #include @@ -28,7 +28,7 @@ class Line; /** - * @ingroup map + * @ingroup world * * @deprecated Will be replaced with half-edge ring iterator/rover. -ds */ @@ -123,4 +123,4 @@ class LineOwner de::Vector2d const &extendedShadowOffset() const { return _shadowOffsets.extended; } }; -#endif // DENG_WORLD_MAP_LINEOWNER +#endif // DENG_WORLD_LINEOWNER_H diff --git a/doomsday/client/include/map/linesighttest.h b/doomsday/client/include/world/linesighttest.h similarity index 92% rename from doomsday/client/include/map/linesighttest.h rename to doomsday/client/include/world/linesighttest.h index f677ecdc34..706ab90d87 100644 --- a/doomsday/client/include/map/linesighttest.h +++ b/doomsday/client/include/world/linesighttest.h @@ -1,4 +1,4 @@ -/** @file linesighttest.h World Map Line of Sight Testing. +/** @file world/linesighttest.h World Line of Sight Testing. * * @authors Copyright © 2003-2013 Jaakko Keränen * @authors Copyright © 2006-2013 Daniel Swanson @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_MAP_LINE_SIGHT_TEST -#define DENG_MAP_LINE_SIGHT_TEST +#ifndef DENG_WORLD_LINE_SIGHT_TEST_H +#define DENG_WORLD_LINE_SIGHT_TEST_H #include #include @@ -39,7 +39,7 @@ namespace de { * @todo optimize: Make use of the blockmap to take advantage of the inherent * spatial locality in this data structure. * - * @ingroup map + * @ingroup world */ class LineSightTest { @@ -74,4 +74,4 @@ class LineSightTest } // namespace de -#endif // DENG_MAP_LINE_SIGHT_TEST +#endif // DENG_WORLD_LINE_SIGHT_TEST_H diff --git a/doomsday/client/include/map/mapelement.h b/doomsday/client/include/world/mapelement.h similarity index 95% rename from doomsday/client/include/map/mapelement.h rename to doomsday/client/include/world/mapelement.h index 1b44bd0f1f..8d4e35676a 100644 --- a/doomsday/client/include/map/mapelement.h +++ b/doomsday/client/include/world/mapelement.h @@ -1,4 +1,4 @@ -/** @file mapelement.h Base class for all map elements. +/** @file world/mapelement.h Base class for all world map elements. * * @authors Copyright © 2013 Jaakko Keränen * @authors Copyright © 2013 Daniel Swanson @@ -17,13 +17,13 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_WORLD_MAPELEMENT -#define DENG_WORLD_MAPELEMENT +#ifndef DENG_WORLD_MAPELEMENT_H +#define DENG_WORLD_MAPELEMENT_H #include #include "dd_share.h" -#include "map/p_dmu.h" +#include "world/p_dmu.h" namespace de { @@ -37,7 +37,7 @@ namespace de { * Update (DMU) API, where objects can be referenced either by type and index * or by an opaque pointer. * - * @ingroup map + * @ingroup world */ class MapElement { @@ -145,4 +145,4 @@ class MapElement } // namespace de -#endif // DENG_WORLD_MAPELEMENT +#endif // DENG_WORLD_MAPELEMENT_H diff --git a/doomsday/client/include/map/mesh.h b/doomsday/client/include/world/mesh.h similarity index 100% rename from doomsday/client/include/map/mesh.h rename to doomsday/client/include/world/mesh.h diff --git a/doomsday/client/include/map/p_dmu.h b/doomsday/client/include/world/p_dmu.h similarity index 94% rename from doomsday/client/include/map/p_dmu.h rename to doomsday/client/include/world/p_dmu.h index 1d5f4a4932..7ff1c3a64a 100644 --- a/doomsday/client/include/map/p_dmu.h +++ b/doomsday/client/include/world/p_dmu.h @@ -1,4 +1,4 @@ -/** @file map/p_dmu.h Doomsday Map Update API. +/** @file world/p_dmu.h Doomsday (World) Map Update API. * * The Map Update API is used for accessing and making changes to map data * during gameplay. From here, the relevant engine's subsystems will be @@ -23,8 +23,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_MAP_UPDATE -#define DENG_WORLD_MAP_UPDATE +#ifndef DENG_WORLD_MAP_UPDATE_H +#define DENG_WORLD_MAP_UPDATE_H #include "api_mapedit.h" // valuetype_t @@ -74,4 +74,4 @@ void DMU_SetValue(valuetype_t valueType, void *dst, setargs_t const *args, uint */ void DMU_GetValue(valuetype_t valueType, void const *src, setargs_t *args, uint index); -#endif // DENG_WORLD_MAP_UPDATE +#endif // DENG_WORLD_MAP_UPDATE_H diff --git a/doomsday/client/include/map/p_intercept.h b/doomsday/client/include/world/p_intercept.h similarity index 77% rename from doomsday/client/include/map/p_intercept.h rename to doomsday/client/include/world/p_intercept.h index cd3aaee56f..4b8ecf9f81 100644 --- a/doomsday/client/include/map/p_intercept.h +++ b/doomsday/client/include/world/p_intercept.h @@ -1,4 +1,4 @@ -/** @file p_intercept.h +/** @file world/p_intercept.h World Line / Object Interception. * * @authors Copyright © 2003-2013 Jaakko Keränen * @authors Copyright © 2006-2013 Daniel Swanson @@ -17,12 +17,8 @@ * http://www.gnu.org/licenses */ -/** - * Line/Object Interception. - */ - -#ifndef LIBDENG_PLAY_INTERCEPT_H -#define LIBDENG_PLAY_INTERCEPT_H +#ifndef DENG_WORLD_P_INTERCEPT_H +#define DENG_WORLD_P_INTERCEPT_H struct InterceptNode; // The interceptnode instance (opaque). typedef struct InterceptNode InterceptNode; @@ -30,22 +26,23 @@ typedef struct InterceptNode InterceptNode; /** * Empties the intercepts array and makes sure it has been allocated. */ -void P_ClearIntercepts(void); +void P_ClearIntercepts(); /** * You must clear intercepts before the first time this is called. * The intercepts array grows if necessary. * - * @param type Type of interception. + * @param type Type of interception. * @param distance Distance along the trace vector that the interception occured [0...1]. - * @param object Object being intercepted. + * @param object Object being intercepted. + * * @return Newly added intercept or @c NULL if outside the trace range. */ -InterceptNode* P_AddIntercept(intercepttype_t type, float distance, void* object); +InterceptNode *P_AddIntercept(intercepttype_t type, float distance, void *object); /** * @return Zero if the traverser callback returns zero for all processed intercepts. */ -int P_TraverseIntercepts(traverser_t callback, void* parameters); +int P_TraverseIntercepts(traverser_t callback, void *parameters); -#endif /* LIBDENG_PLAY_INTERCEPT_H */ +#endif // DENG_WORLD_P_INTERCEPT_H diff --git a/doomsday/client/include/map/p_mapdata.h b/doomsday/client/include/world/p_mapdata.h similarity index 95% rename from doomsday/client/include/map/p_mapdata.h rename to doomsday/client/include/world/p_mapdata.h index d15c03c2a4..8a0c49c825 100644 --- a/doomsday/client/include/map/p_mapdata.h +++ b/doomsday/client/include/world/p_mapdata.h @@ -1,4 +1,4 @@ -/** @file p_mapdata.h Map entity definitions. +/** @file world/p_mapdata.h World Map Entity Definitions. * * @authors Copyright © 2003-2013 Jaakko Keränen * @authors Copyright © 2006-2013 Daniel Swanson @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_PLAY_MAPENTIYDEF_H -#define LIBDENG_PLAY_MAPENTIYDEF_H +#ifndef DENG_WORLD_P_MAPDATA_H +#define DENG_WORLD_P_MAPDATA_H #include "dd_share.h" #include "api_mapedit.h" @@ -44,7 +44,7 @@ typedef struct mapentitypropertydef_s { } MapEntityPropertyDef; /** - * @ingroup play + * @ingroup world */ typedef struct mapentitydef_s { /// Unique identifier associated with this entity. @@ -143,4 +143,4 @@ void P_ShutdownMapEntityDefs(); } // extern "C" #endif -#endif // LIBDENG_PLAY_MAPENTIYDEF_H +#endif // DENG_WORLD_P_MAPDATA_H diff --git a/doomsday/client/include/map/p_maptypes.h b/doomsday/client/include/world/p_maptypes.h similarity index 82% rename from doomsday/client/include/map/p_maptypes.h rename to doomsday/client/include/world/p_maptypes.h index 7c3c4fd594..e3838fc414 100644 --- a/doomsday/client/include/map/p_maptypes.h +++ b/doomsday/client/include/world/p_maptypes.h @@ -1,4 +1,4 @@ -/** @file p_maptypes.h Convenience header for including all map data types. +/** @file world/p_maptypes.h Convenience header for including all map data types. * @ingroup map * * @authors Copyright © 2013 Jaakko Keränen @@ -18,13 +18,11 @@ * http://www.gnu.org/licenses */ -#ifndef LIBDENG_MAP_DATA_TYPES_H -#define LIBDENG_MAP_DATA_TYPES_H +#ifndef DENG_WORLD_P_MAPTYPES_H +#define DENG_WORLD_P_MAPTYPES_H #include "p_mapdata.h" -#ifdef __cplusplus -# include "vertex.h" -#endif +#include "vertex.h" #include "segment.h" #include "line.h" #include "surface.h" @@ -35,4 +33,4 @@ #include "p_object.h" #include "polyobj.h" -#endif // LIBDENG_MAP_DATA_TYPES_H +#endif // DENG_WORLD_P_MAPTYPES_H diff --git a/doomsday/client/include/map/p_maputil.h b/doomsday/client/include/world/p_maputil.h similarity index 82% rename from doomsday/client/include/map/p_maputil.h rename to doomsday/client/include/world/p_maputil.h index 66d7d10699..7848b41749 100644 --- a/doomsday/client/include/map/p_maputil.h +++ b/doomsday/client/include/world/p_maputil.h @@ -1,4 +1,4 @@ -/** @file p_maputil.h Map Utility Routines. +/** @file world/p_maputil.h World Map Utility Routines. * * @ingroup map * @@ -20,8 +20,8 @@ * 02110-1301 USA */ -#ifndef DENG_MAP_UTILITIES_H -#define DENG_MAP_UTILITIES_H +#ifndef DENG_WORLD_P_MAPUTIL_H +#define DENG_WORLD_P_MAPUTIL_H #include @@ -52,23 +52,23 @@ bool P_IsPointInBspLeaf(de::Vector2d const &point, BspLeaf const &bspLeaf); /** * @note Caller must ensure that the mobj is currently unlinked. */ -void P_LinkMobjToLines(mobj_t* mo); +void P_LinkMobjToLines(mobj_t *mo); /** * Unlinks the mobj from all the lines it's been linked to. Can be called * without checking that the list does indeed contain lines. */ -boolean P_UnlinkMobjFromLines(mobj_t* mo); +boolean P_UnlinkMobjFromLines(mobj_t *mo); /** * @note The mobj must be currently unlinked. */ -void P_LinkMobjInBlockmap(mobj_t* mo); +void P_LinkMobjInBlockmap(mobj_t *mo); -boolean P_UnlinkMobjFromBlockmap(mobj_t* mo); +boolean P_UnlinkMobjFromBlockmap(mobj_t *mo); -int PIT_AddLineIntercepts(Line* ld, void* parameters); +int PIT_AddLineIntercepts(Line *ld, void *parameters); -int PIT_AddMobjIntercepts(mobj_t* mobj, void* parameters); +int PIT_AddMobjIntercepts(mobj_t *mobj, void *parameters); -#endif // DENG_MAP_UTILITIES_H +#endif // DENG_WORLD_P_MAPUTIL_H diff --git a/doomsday/client/include/map/p_object.h b/doomsday/client/include/world/p_object.h similarity index 84% rename from doomsday/client/include/map/p_object.h rename to doomsday/client/include/world/p_object.h index f8bde93748..6cf7937b15 100644 --- a/doomsday/client/include/map/p_object.h +++ b/doomsday/client/include/world/p_object.h @@ -1,4 +1,4 @@ -/** @file p_object.h +/** @file world/p_object.h World Map Objects. * * @authors Copyright © 2003-2013 Jaakko Keränen * @authors Copyright © 2005-2013 Daniel Swanson @@ -18,12 +18,8 @@ * http://www.gnu.org/licenses */ -/** - * Map Objects. - */ - -#ifndef LIBDENG_MAP_MOBJ -#define LIBDENG_MAP_MOBJ +#ifndef DENG_WORLD_P_OBJECT_H +#define DENG_WORLD_P_OBJECT_H #include "p_mapdata.h" @@ -55,10 +51,10 @@ mobj_t; void P_InitUnusedMobjList(void); -mobj_t* P_MobjCreate(thinkfunc_t function, coord_t const post[3], angle_t angle, +mobj_t *P_MobjCreate(thinkfunc_t function, coord_t const post[3], angle_t angle, coord_t radius, coord_t height, int ddflags); -void P_MobjRecycle(mobj_t* mobj); +void P_MobjRecycle(mobj_t *mobj); /** * Sets a mobj's position. @@ -68,12 +64,12 @@ void P_MobjRecycle(mobj_t* mobj); * * @note Internal to the engine. */ -boolean Mobj_SetOrigin(mobj_t* mobj, coord_t x, coord_t y, coord_t z); +boolean Mobj_SetOrigin(mobj_t *mobj, coord_t x, coord_t y, coord_t z); -coord_t Mobj_ApproxPointDistance(mobj_t* start, coord_t const* point); +coord_t Mobj_ApproxPointDistance(mobj_t *start, coord_t const *point); #ifdef __cplusplus } // extern "C" #endif -#endif // LIBDENG_MAP_MOBJ +#endif // DENG_WORLD_P_OBJECT_H diff --git a/doomsday/client/include/map/p_objlink.h b/doomsday/client/include/world/p_objlink.h similarity index 94% rename from doomsday/client/include/map/p_objlink.h rename to doomsday/client/include/world/p_objlink.h index 68d39f794a..73bf84f4ac 100644 --- a/doomsday/client/include/map/p_objlink.h +++ b/doomsday/client/include/world/p_objlink.h @@ -1,4 +1,4 @@ -/** @file map/p_objlink.h Object => BspLeaf contact blockmap. +/** @file world/p_objlink.h World Object => BspLeaf contact blockmap. * * @authors Copyright © 2003-2013 Jaakko Keränen * @authors Copyright © 2006-2013 Daniel Swanson @@ -17,8 +17,8 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_OBJLINK_BLOCKMAP_H -#define DENG_OBJLINK_BLOCKMAP_H +#ifndef DENG_WORLD_P_OBJLINK_H +#define DENG_WORLD_P_OBJLINK_H class BspLeaf; @@ -97,4 +97,4 @@ void R_LinkObjToBspLeaf(BspLeaf &bspLeaf, struct lumobj_s &lumobj); int R_IterateBspLeafContacts(BspLeaf &bspLeaf, objtype_t type, int (*func) (void *object, void *parameters), void *parameters = 0); -#endif // DENG_OBJLINK_BLOCKMAP_H +#endif // DENG_WORLD_P_OBJLINK_H diff --git a/doomsday/client/include/map/p_particle.h b/doomsday/client/include/world/p_particle.h similarity index 97% rename from doomsday/client/include/map/p_particle.h rename to doomsday/client/include/world/p_particle.h index 681c7ba691..372baecdce 100644 --- a/doomsday/client/include/map/p_particle.h +++ b/doomsday/client/include/world/p_particle.h @@ -1,4 +1,4 @@ -/** @file p_particle.h Generator Management (Particles). +/** @file world/p_particle.h World Generator Management (Particles). * @ingroup map * * @author Copyright © 2003-2013 Jaakko Keränen @@ -19,8 +19,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_MAP_GENERATORS_H -#define LIBDENG_MAP_GENERATORS_H +#ifndef DENG_WORLD_P_PARTICLE_H +#define DENG_WORLD_P_PARTICLE_H #include "def_data.h" #include "sector.h" @@ -197,4 +197,4 @@ float P_GetParticleZ(particle_t const *pt); } // extern "C" #endif -#endif // LIBDENG_MAP_GENERATORS_H +#endif // DENG_WORLD_P_PARTICLE_H diff --git a/doomsday/client/include/map/p_players.h b/doomsday/client/include/world/p_players.h similarity index 83% rename from doomsday/client/include/map/p_players.h rename to doomsday/client/include/world/p_players.h index 3461a8f8e7..f63614f738 100644 --- a/doomsday/client/include/map/p_players.h +++ b/doomsday/client/include/world/p_players.h @@ -1,4 +1,4 @@ -/** @file +/** @file world/p_players.h: World Player Entities. * * @authors Copyright © 2003-2013 Jaakko Keränen * @authors Copyright © 2005-2013 Daniel Swanson @@ -17,12 +17,8 @@ * http://www.gnu.org/licenses */ -/** - * p_players.h: Players - */ - -#ifndef __DOOMSDAY_PLAYERS_H__ -#define __DOOMSDAY_PLAYERS_H__ +#ifndef DENG_WORLD_P_PLAYERS_H +#define DENG_WORLD_P_PLAYERS_H #include "api_player.h" @@ -41,9 +37,9 @@ extern player_t ddPlayers[DDMAXPLAYERS]; extern int consolePlayer; extern int displayPlayer; -int P_LocalToConsole(int localPlayer); -int P_ConsoleToLocal(int playerNum); -int P_GetDDPlayerIdx(ddplayer_t *ddpl); +int P_LocalToConsole(int localPlayer); +int P_ConsoleToLocal(int playerNum); +int P_GetDDPlayerIdx(ddplayer_t *ddpl); /** * Do we THINK the given (camera) player is currently in the void. @@ -58,11 +54,11 @@ int P_GetDDPlayerIdx(ddplayer_t *ddpl); */ boolean P_IsInVoid(player_t *p); -short P_LookDirToShort(float lookDir); -float P_ShortToLookDir(short s); +short P_LookDirToShort(float lookDir); +float P_ShortToLookDir(short s); #ifdef __cplusplus } // extern "C" #endif -#endif +#endif // DENG_WORLD_P_PLAYERS_H diff --git a/doomsday/client/include/map/p_ticker.h b/doomsday/client/include/world/p_ticker.h similarity index 86% rename from doomsday/client/include/map/p_ticker.h rename to doomsday/client/include/world/p_ticker.h index 9594b5f95d..ddd5cc9a22 100644 --- a/doomsday/client/include/map/p_ticker.h +++ b/doomsday/client/include/world/p_ticker.h @@ -1,4 +1,4 @@ -/** @file map/p_ticker.h Timed Playsim Events. +/** @file world/p_ticker.h Timed World Events. * * @authors Copyright © 2003-2013 Jaakko Keränen * @authors Copyright © 2006-2013 Daniel Swanson @@ -17,12 +17,12 @@ * http://www.gnu.org/licenses */ -#ifndef DENG_MAP_PLAY_TICKER_H -#define DENG_MAP_PLAY_TICKER_H +#ifndef DENG_WORLD_P_TICKER_H +#define DENG_WORLD_P_TICKER_H /** * Doomsday's own play-ticker. */ void P_Ticker(timespan_t time); -#endif // DENG_MAP_PLAY_TICKER_H +#endif // DENG_WORLD_P_TICKER_H diff --git a/doomsday/client/include/map/plane.h b/doomsday/client/include/world/plane.h similarity index 97% rename from doomsday/client/include/map/plane.h rename to doomsday/client/include/world/plane.h index 2dfe0ee048..94993bb625 100644 --- a/doomsday/client/include/map/plane.h +++ b/doomsday/client/include/world/plane.h @@ -1,4 +1,4 @@ -/** @file plane.h World Map Plane. +/** @file world/plane.h World Plane. * * @author Copyright © 2003-2013 Jaakko Keränen * @author Copyright © 2006-2013 Daniel Swanson @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_MAP_PLANE -#define DENG_WORLD_MAP_PLANE +#ifndef DENG_WORLD_PLANE_H +#define DENG_WORLD_PLANE_H #include @@ -33,9 +33,9 @@ class Sector; class Surface; /** - * World map sector plane. + * World sector plane. * - * @ingroup map + * @ingroup world */ class Plane : public de::MapElement { @@ -205,4 +205,4 @@ class Plane : public de::MapElement DENG2_PRIVATE(d) }; -#endif // DENG_WORLD_MAP_PLANE +#endif // DENG_WORLD_PLANE_H diff --git a/doomsday/client/include/map/polyobj.h b/doomsday/client/include/world/polyobj.h similarity index 96% rename from doomsday/client/include/map/polyobj.h rename to doomsday/client/include/world/polyobj.h index 96d2f17029..40084c68ce 100644 --- a/doomsday/client/include/map/polyobj.h +++ b/doomsday/client/include/world/polyobj.h @@ -1,4 +1,4 @@ -/** @file map/polyobj.h World Map Polyobj. +/** @file world/polyobj.h World Polyobj. * * @authors Copyright © 2003-2013 Jaakko Keränen * @authors Copyright © 2006-2013 Daniel Swanson @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_MAP_POLYOBJ -#define DENG_WORLD_MAP_POLYOBJ +#ifndef DENG_WORLD_POLYOBJ_H +#define DENG_WORLD_POLYOBJ_H #include @@ -37,9 +37,9 @@ class Vertex; #define POLYOBJ_SIZE gx.polyobjSize /** - * World map polyobj. Moveable Polygonal Map-Object (Polyobj). + * World polyobj. Moveable Polygonal Map-Object (Polyobj). * - * @ingroup map + * @ingroup world */ typedef struct polyobj_s { @@ -238,4 +238,4 @@ typedef struct polyobj_s } Polyobj; -#endif // DENG_WORLD_MAP_POLYOBJ +#endif // DENG_WORLD_POLYOBJ_H diff --git a/doomsday/client/include/map/propertyvalue.h b/doomsday/client/include/world/propertyvalue.h similarity index 98% rename from doomsday/client/include/map/propertyvalue.h rename to doomsday/client/include/world/propertyvalue.h index 5658d18fcf..fcfcc7df5d 100644 --- a/doomsday/client/include/map/propertyvalue.h +++ b/doomsday/client/include/world/propertyvalue.h @@ -22,8 +22,8 @@ * 02110-1301 USA */ -#ifndef LIBDENG_DATA_PROPERTYVALUE_H -#define LIBDENG_DATA_PROPERTYVALUE_H +#ifndef DENG_DATA_PROPERTYVALUE_H +#define DENG_DATA_PROPERTYVALUE_H #include "de_base.h" @@ -179,4 +179,4 @@ class PropertyFloatValue : public PropertyValue */ PropertyValue* BuildPropertyValue(valuetype_t type, void* valueAdr); -#endif // LIBDENG_DATA_PROPERTYVALUE_H +#endif // DENG_DATA_PROPERTYVALUE_H diff --git a/doomsday/client/include/map/r_world.h b/doomsday/client/include/world/r_world.h similarity index 99% rename from doomsday/client/include/map/r_world.h rename to doomsday/client/include/world/r_world.h index 0283508baf..5d787e2c59 100644 --- a/doomsday/client/include/map/r_world.h +++ b/doomsday/client/include/world/r_world.h @@ -1,4 +1,4 @@ -/** @file map/r_world.h World Setup. +/** @file world/r_world.h World Setup. * * @authors Copyright © 2003-2013 Jaakko Keränen * @authors Copyright © 2006-2013 Daniel Swanson diff --git a/doomsday/client/include/map/reject.h b/doomsday/client/include/world/reject.h similarity index 95% rename from doomsday/client/include/map/reject.h rename to doomsday/client/include/world/reject.h index 5eca0b4093..e263866358 100644 --- a/doomsday/client/include/map/reject.h +++ b/doomsday/client/include/world/reject.h @@ -1,4 +1,4 @@ -/** @file map/reject.h World Map, Reject LUT building. +/** @file world/reject.h World Reject LUT building. * * @authors Copyright © 2007-2013 Daniel Swanson * @authors Copyright © 2000-2007 Andrew Apted @@ -20,8 +20,8 @@ * 02110-1301 USA */ -#ifndef DENG_MAP_REJECT_H -#define DENG_MAP_REJECT_H +#ifndef DENG_WORLD_REJECT_H +#define DENG_WORLD_REJECT_H #if 0 // Needs updating class GameMap; @@ -74,4 +74,4 @@ class GameMap; byte *BuildRejectForMap(GameMap const &map); #endif -#endif // DENG_MAP_REJECT_H +#endif // DENG_WORLD_REJECT_H diff --git a/doomsday/client/include/map/sector.h b/doomsday/client/include/world/sector.h similarity index 98% rename from doomsday/client/include/map/sector.h rename to doomsday/client/include/world/sector.h index 66508b85ad..dec247445a 100644 --- a/doomsday/client/include/map/sector.h +++ b/doomsday/client/include/world/sector.h @@ -1,4 +1,4 @@ -/** @file map/sector.h World Map Sector. +/** @file world/sector.h World Sector. * * @authors Copyright © 2003-2013 Jaakko Keränen * @authors Copyright © 2006-2013 Daniel Swanson @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_MAP_SECTOR -#define DENG_WORLD_MAP_SECTOR +#ifndef DENG_WORLD_SECTOR_H +#define DENG_WORLD_SECTOR_H #include @@ -46,7 +46,7 @@ class GameMap; /** * @defgroup sectorFrameFlags Sector frame flags - * @ingroup map + * @ingroup world */ ///@{ #define SIF_VISIBLE 0x1 ///< Sector is visible on this frame. @@ -56,9 +56,9 @@ class GameMap; ///@} /** - * World map sector. + * World sector. * - * @ingroup map + * @ingroup world */ class Sector : public de::MapElement, DENG2_OBSERVES(Plane, HeightChange) @@ -476,4 +476,4 @@ class Sector : public de::MapElement, DENG2_PRIVATE(d) }; -#endif // DENG_WORLD_MAP_SECTOR +#endif // DENG_WORLD_SECTOR_H diff --git a/doomsday/client/include/map/segment.h b/doomsday/client/include/world/segment.h similarity index 97% rename from doomsday/client/include/map/segment.h rename to doomsday/client/include/world/segment.h index eab5a34607..335d1d2f45 100644 --- a/doomsday/client/include/map/segment.h +++ b/doomsday/client/include/world/segment.h @@ -1,4 +1,4 @@ -/** @file map/segment.h World Map Line Segment. +/** @file world/segment.h World Line Segment. * * @authors Copyright © 2003-2013 Jaakko Keränen * @authors Copyright © 2006-2013 Daniel Swanson @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_MAP_LINESEGMENT -#define DENG_WORLD_MAP_LINESEGMENT +#ifndef DENG_WORLD_SEGMENT_H +#define DENG_WORLD_SEGMENT_H #include @@ -38,6 +38,8 @@ class Sector; /** * @todo Consolidate/merge with bsp::LineSegment + * + * @ingroup world */ class Segment : public de::MapElement { @@ -263,4 +265,4 @@ class Segment : public de::MapElement Q_DECLARE_OPERATORS_FOR_FLAGS(Segment::Flags) -#endif // DENG_WORLD_MAP_LINESEGMENT +#endif // DENG_WORLD_SEGMENT_H diff --git a/doomsday/client/include/map/surface.h b/doomsday/client/include/world/surface.h similarity index 98% rename from doomsday/client/include/map/surface.h rename to doomsday/client/include/world/surface.h index 5d2a44ea70..69aabbd6cd 100644 --- a/doomsday/client/include/map/surface.h +++ b/doomsday/client/include/world/surface.h @@ -1,4 +1,4 @@ -/** @file surface.h World Map surface. +/** @file world/surface.h World Surface. * * @authors Copyright © 2003-2013 Jaakko Keränen * @authors Copyright © 2006-2013 Daniel Swanson @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_MAP_SURFACE -#define DENG_WORLD_MAP_SURFACE +#ifndef DENG_WORLD_SURFACE_H +#define DENG_WORLD_SURFACE_H #include @@ -32,14 +32,14 @@ #ifdef __CLIENT__ # include "MaterialSnapshot" #endif -#include "map/p_dmu.h" +#include "world/p_dmu.h" class BspLeaf; /** - * World map surface. + * World surface. * - * @ingroup map + * @ingroup world */ class Surface : public de::MapElement { @@ -446,4 +446,4 @@ class Surface : public de::MapElement struct surfacedecorsource_s; -#endif // DENG_WORLD_MAP_SURFACE +#endif // DENG_WORLD_SURFACE_H diff --git a/doomsday/client/include/map/vertex.h b/doomsday/client/include/world/vertex.h similarity index 96% rename from doomsday/client/include/map/vertex.h rename to doomsday/client/include/world/vertex.h index 79d91c0e6c..32fb68ce28 100644 --- a/doomsday/client/include/map/vertex.h +++ b/doomsday/client/include/world/vertex.h @@ -1,4 +1,4 @@ -/** @file vertex.h World Map Vertex. +/** @file world/vertex.h World Vertex. * * @authors Copyright © 2003-2013 Jaakko Keränen * @authors Copyright © 2006-2013 Daniel Swanson @@ -18,8 +18,8 @@ * 02110-1301 USA */ -#ifndef DENG_WORLD_MAP_VERTEX -#define DENG_WORLD_MAP_VERTEX +#ifndef DENG_WORLD_VERTEX_H +#define DENG_WORLD_VERTEX_H #include #include @@ -31,12 +31,12 @@ class Line; class LineOwner; /** - * World map geometry vertex. + * World geometry vertex. * * An @em owner in this context is any line whose start or end points are * defined as the vertex. * - * @ingroup map + * @ingroup world */ class Vertex : public de::MapElement { @@ -164,4 +164,4 @@ class Vertex : public de::MapElement DENG2_PRIVATE(d) }; -#endif // DENG_WORLD_MAP_VERTEX +#endif // DENG_WORLD_VERTEX_H diff --git a/doomsday/client/src/audio/s_main.cpp b/doomsday/client/src/audio/s_main.cpp index 9c5402ef0f..344ba662ee 100644 --- a/doomsday/client/src/audio/s_main.cpp +++ b/doomsday/client/src/audio/s_main.cpp @@ -39,7 +39,7 @@ #include "de_defs.h" #include "audio/sys_audio.h" -#include "map/p_players.h" +#include "world/p_players.h" #include "BspLeaf" // MACROS ------------------------------------------------------------------ diff --git a/doomsday/client/src/client/cl_main.cpp b/doomsday/client/src/client/cl_main.cpp index 20abe06af2..210de7dac2 100644 --- a/doomsday/client/src/client/cl_main.cpp +++ b/doomsday/client/src/client/cl_main.cpp @@ -29,7 +29,7 @@ #include "de_misc.h" #include "de_play.h" -#include "map/gamemap.h" +#include "world/gamemap.h" #include "render/r_main.h" using namespace de; diff --git a/doomsday/client/src/client/cl_world.cpp b/doomsday/client/src/client/cl_world.cpp index 04f9817aee..98e001dcc1 100644 --- a/doomsday/client/src/client/cl_world.cpp +++ b/doomsday/client/src/client/cl_world.cpp @@ -31,7 +31,7 @@ #include "api_map.h" #include "api_materialarchive.h" -#include "map/gamemap.h" +#include "world/gamemap.h" #include "client/cl_world.h" #include "r_util.h" diff --git a/doomsday/client/src/dd_main.cpp b/doomsday/client/src/dd_main.cpp index 8fc86e1adc..ff93cb67c2 100644 --- a/doomsday/client/src/dd_main.cpp +++ b/doomsday/client/src/dd_main.cpp @@ -60,9 +60,9 @@ #include "de_resource.h" #include "gl/svg.h" -#include "map/p_players.h" -#include "map/p_maputil.h" -#include "map/p_objlink.h" +#include "world/p_players.h" +#include "world/p_maputil.h" +#include "world/p_objlink.h" #include "ui/p_control.h" #include "updater.h" #include "m_misc.h" diff --git a/doomsday/client/src/def_main.cpp b/doomsday/client/src/def_main.cpp index 20ad92c6aa..06dd800646 100644 --- a/doomsday/client/src/def_main.cpp +++ b/doomsday/client/src/def_main.cpp @@ -40,7 +40,7 @@ #define DENG_NO_API_MACROS_DEFINITIONS #include "api_def.h" -#include "map/r_world.h" +#include "world/r_world.h" // XGClass.h is actually a part of the engine. #include "../../../plugins/common/include/xgclass.h" diff --git a/doomsday/client/src/edit_bias.cpp b/doomsday/client/src/edit_bias.cpp index 4562a0f4bc..a608194c11 100644 --- a/doomsday/client/src/edit_bias.cpp +++ b/doomsday/client/src/edit_bias.cpp @@ -34,7 +34,7 @@ #include "de_play.h" #include "de_filesys.h" -#include "map/gamemap.h" +#include "world/gamemap.h" using namespace de; diff --git a/doomsday/client/src/edit_map.cpp b/doomsday/client/src/edit_map.cpp index 0205a2a9ea..480d7f8aa0 100644 --- a/doomsday/client/src/edit_map.cpp +++ b/doomsday/client/src/edit_map.cpp @@ -39,8 +39,8 @@ #include "de_filesys.h" #include "audio/s_environ.h" -#include "map/lineowner.h" -#include "map/gamemap.h" +#include "world/lineowner.h" +#include "world/gamemap.h" #ifdef __CLIENT__ # include "render/rend_main.h" #endif diff --git a/doomsday/client/src/gl/gl_main.cpp b/doomsday/client/src/gl/gl_main.cpp index 72c547fd6d..3a7242c997 100644 --- a/doomsday/client/src/gl/gl_main.cpp +++ b/doomsday/client/src/gl/gl_main.cpp @@ -35,7 +35,7 @@ #include "de_ui.h" #include "de_defs.h" -#include "map/gamemap.h" +#include "world/gamemap.h" #include "gl/texturecontent.h" #include "ui/windowsystem.h" #include "resource/colorpalettes.h" diff --git a/doomsday/client/src/network/net_demo.cpp b/doomsday/client/src/network/net_demo.cpp index 17d8a6ffd1..601f7ae903 100644 --- a/doomsday/client/src/network/net_demo.cpp +++ b/doomsday/client/src/network/net_demo.cpp @@ -33,7 +33,7 @@ #include "render/r_main.h" #include "render/rend_main.h" -#include "map/p_players.h" +#include "world/p_players.h" // MACROS ------------------------------------------------------------------ diff --git a/doomsday/client/src/network/net_event.cpp b/doomsday/client/src/network/net_event.cpp index 78d3c903e5..fb9774c5f0 100644 --- a/doomsday/client/src/network/net_event.cpp +++ b/doomsday/client/src/network/net_event.cpp @@ -32,7 +32,7 @@ #ifdef __SERVER__ # include "serversystem.h" -# include "map/gamemap.h" +# include "world/gamemap.h" #endif using namespace de; diff --git a/doomsday/client/src/network/net_main.cpp b/doomsday/client/src/network/net_main.cpp index 51f4aeeff4..ce553c5d09 100644 --- a/doomsday/client/src/network/net_main.cpp +++ b/doomsday/client/src/network/net_main.cpp @@ -45,7 +45,7 @@ //# include "render/rend_console.h" # include "render/rend_main.h" # include "render/lightgrid.h" -# include "map/blockmapvisual.h" +# include "world/blockmapvisual.h" # include "edit_bias.h" #endif @@ -56,7 +56,7 @@ #include "dd_def.h" #include "dd_main.h" #include "dd_loop.h" -#include "map/p_players.h" +#include "world/p_players.h" #include diff --git a/doomsday/client/src/network/net_ping.cpp b/doomsday/client/src/network/net_ping.cpp index 1f1ae70e2f..204b496068 100644 --- a/doomsday/client/src/network/net_ping.cpp +++ b/doomsday/client/src/network/net_ping.cpp @@ -30,7 +30,7 @@ #include "de_system.h" #include "de_network.h" -#include "map/p_players.h" +#include "world/p_players.h" // MACROS ------------------------------------------------------------------ diff --git a/doomsday/client/src/render/lightgrid.cpp b/doomsday/client/src/render/lightgrid.cpp index 370c56722b..56522760dd 100644 --- a/doomsday/client/src/render/lightgrid.cpp +++ b/doomsday/client/src/render/lightgrid.cpp @@ -31,9 +31,9 @@ #include "BspLeaf" #include "Sector" -#include "map/gamemap.h" -#include "map/p_maputil.h" // P_IsPointInBspLeaf -#include "map/p_players.h" // viewPlayer +#include "world/gamemap.h" +#include "world/p_maputil.h" // P_IsPointInBspLeaf +#include "world/p_players.h" // viewPlayer #include "render/rend_main.h" diff --git a/doomsday/client/src/render/lumobj.cpp b/doomsday/client/src/render/lumobj.cpp index b51d32297a..efe3fb4ed8 100644 --- a/doomsday/client/src/render/lumobj.cpp +++ b/doomsday/client/src/render/lumobj.cpp @@ -33,8 +33,8 @@ #include "de_play.h" #include "de_defs.h" -#include "map/gamemap.h" -#include "map/linesighttest.h" +#include "world/gamemap.h" +#include "world/linesighttest.h" #include "MaterialSnapshot" #include "MaterialVariantSpec" #include "Texture" diff --git a/doomsday/client/src/render/r_fakeradio.cpp b/doomsday/client/src/render/r_fakeradio.cpp index 6f3483618f..40c2f96b1a 100644 --- a/doomsday/client/src/render/r_fakeradio.cpp +++ b/doomsday/client/src/render/r_fakeradio.cpp @@ -28,8 +28,8 @@ #include "de_base.h" #include "de_render.h" -#include "map/lineowner.h" -#include "map/gamemap.h" +#include "world/lineowner.h" +#include "world/gamemap.h" #include "Vertex" #include "render/rend_fakeradio.h" diff --git a/doomsday/client/src/render/r_main.cpp b/doomsday/client/src/render/r_main.cpp index 2c002c8626..08b313644c 100644 --- a/doomsday/client/src/render/r_main.cpp +++ b/doomsday/client/src/render/r_main.cpp @@ -34,9 +34,9 @@ #include "de_ui.h" #include "gl/svg.h" -#include "map/p_players.h" -#include "map/p_objlink.h" -#include "map/r_world.h" +#include "world/p_players.h" +#include "world/p_objlink.h" +#include "world/r_world.h" #include "render/vignette.h" #include "api_render.h" diff --git a/doomsday/client/src/render/r_sky.c b/doomsday/client/src/render/r_sky.c index 0ef224cfa6..945cbeac24 100644 --- a/doomsday/client/src/render/r_sky.c +++ b/doomsday/client/src/render/r_sky.c @@ -26,7 +26,7 @@ #include "de_console.h" #include "de_graphics.h" -#include "map/r_world.h" +#include "world/r_world.h" #include "render/r_sky.h" #include "def_data.h" #include "client/cl_def.h" diff --git a/doomsday/client/src/render/r_things.cpp b/doomsday/client/src/render/r_things.cpp index b2c14a61c5..c660709a6c 100644 --- a/doomsday/client/src/render/r_things.cpp +++ b/doomsday/client/src/render/r_things.cpp @@ -35,7 +35,7 @@ #include "de_resource.h" #include "gl/sys_opengl.h" // TODO: get rid of this -#include "map/gamemap.h" +#include "world/gamemap.h" #include "def_main.h" #ifdef __CLIENT__ diff --git a/doomsday/client/src/render/rend_bias.cpp b/doomsday/client/src/render/rend_bias.cpp index dce7df730a..36e7c37462 100644 --- a/doomsday/client/src/render/rend_bias.cpp +++ b/doomsday/client/src/render/rend_bias.cpp @@ -28,7 +28,7 @@ #include "de_defs.h" #include "de_misc.h" #include "de_play.h" -#include "map/gamemap.h" +#include "world/gamemap.h" #include "render/rend_bias.h" diff --git a/doomsday/client/src/render/rend_decor.cpp b/doomsday/client/src/render/rend_decor.cpp index caff3d979a..7f0c830276 100644 --- a/doomsday/client/src/render/rend_decor.cpp +++ b/doomsday/client/src/render/rend_decor.cpp @@ -27,7 +27,7 @@ #include "def_main.h" #include "m_profiler.h" #include "MaterialVariantSpec" -#include "map/gamemap.h" +#include "world/gamemap.h" #include #include diff --git a/doomsday/client/src/render/rend_fakeradio.cpp b/doomsday/client/src/render/rend_fakeradio.cpp index e02622e3ef..8cc2f6ecc1 100644 --- a/doomsday/client/src/render/rend_fakeradio.cpp +++ b/doomsday/client/src/render/rend_fakeradio.cpp @@ -32,8 +32,8 @@ #include "gl/sys_opengl.h" #include "MaterialSnapshot" #include "MaterialVariantSpec" -#include "map/gamemap.h" -#include "map/lineowner.h" +#include "world/gamemap.h" +#include "world/lineowner.h" #include "WallEdge" #include "render/rendpoly.h" diff --git a/doomsday/client/src/render/rend_halo.cpp b/doomsday/client/src/render/rend_halo.cpp index 64c674092a..e91f0daef7 100644 --- a/doomsday/client/src/render/rend_halo.cpp +++ b/doomsday/client/src/render/rend_halo.cpp @@ -24,7 +24,7 @@ #include "de_graphics.h" #include "de_misc.h" -#include "map/p_players.h" +#include "world/p_players.h" #include "render/rend_main.h" #include "render/rend_list.h" diff --git a/doomsday/client/src/render/rend_main.cpp b/doomsday/client/src/render/rend_main.cpp index 90e8e35b30..9fd136d116 100644 --- a/doomsday/client/src/render/rend_main.cpp +++ b/doomsday/client/src/render/rend_main.cpp @@ -43,12 +43,12 @@ #include "SkyFixEdge" #include "TriangleStripBuilder" -#include "map/blockmapvisual.h" -#include "map/gamemap.h" -#include "map/lineowner.h" -#include "map/p_objlink.h" -#include "map/p_players.h" -#include "map/r_world.h" +#include "world/blockmapvisual.h" +#include "world/gamemap.h" +#include "world/lineowner.h" +#include "world/p_objlink.h" +#include "world/p_players.h" +#include "world/r_world.h" #include "render/sprite.h" diff --git a/doomsday/client/src/render/rend_particle.cpp b/doomsday/client/src/render/rend_particle.cpp index 2958a59020..2f005f1030 100644 --- a/doomsday/client/src/render/rend_particle.cpp +++ b/doomsday/client/src/render/rend_particle.cpp @@ -1,4 +1,4 @@ -/** @file rend_particle.cpp Particle Effect Rendering. +/** @file rend_particle.cpp Particle Effect Rendering. * @ingroup render * * @authors Copyright © 2003-2013 Jaakko Keränen @@ -32,8 +32,8 @@ #include "resource/image.h" #include "gl/texturecontent.h" -#include "map/generators.h" -#include "map/gamemap.h" +#include "world/generators.h" +#include "world/gamemap.h" using namespace de; diff --git a/doomsday/client/src/render/rend_shadow.cpp b/doomsday/client/src/render/rend_shadow.cpp index b5b2c725e7..e92c9428ad 100644 --- a/doomsday/client/src/render/rend_shadow.cpp +++ b/doomsday/client/src/render/rend_shadow.cpp @@ -23,7 +23,7 @@ #include "de_render.h" #include "de_system.h" -#include "map/gamemap.h" +#include "world/gamemap.h" #include "MaterialSnapshot" #include "WallEdge" diff --git a/doomsday/client/src/render/shadowedge.cpp b/doomsday/client/src/render/shadowedge.cpp index e5ef1c4781..419d2591f6 100644 --- a/doomsday/client/src/render/shadowedge.cpp +++ b/doomsday/client/src/render/shadowedge.cpp @@ -23,8 +23,8 @@ #include "Sector" #include "Segment" -#include "map/r_world.h" -#include "map/lineowner.h" +#include "world/r_world.h" +#include "world/lineowner.h" #include "render/rend_main.h" diff --git a/doomsday/client/src/render/sky.cpp b/doomsday/client/src/render/sky.cpp index 973ab99df5..473908ac07 100644 --- a/doomsday/client/src/render/sky.cpp +++ b/doomsday/client/src/render/sky.cpp @@ -29,7 +29,7 @@ #include "def_data.h" #include "client/cl_def.h" -#include "map/r_world.h" +#include "world/r_world.h" #include "MaterialSnapshot" #include "MaterialVariantSpec" diff --git a/doomsday/client/src/render/skyfixedge.cpp b/doomsday/client/src/render/skyfixedge.cpp index 7421ef27cf..6ac6d0ff27 100644 --- a/doomsday/client/src/render/skyfixedge.cpp +++ b/doomsday/client/src/render/skyfixedge.cpp @@ -22,9 +22,9 @@ #include "Sector" #include "Segment" -#include "map/gamemap.h" -#include "map/p_players.h" -#include "map/r_world.h" +#include "world/gamemap.h" +#include "world/p_players.h" +#include "world/r_world.h" #include "render/rend_main.h" diff --git a/doomsday/client/src/render/sprite.cpp b/doomsday/client/src/render/sprite.cpp index 0187205a1e..be4b8a2ff6 100644 --- a/doomsday/client/src/render/sprite.cpp +++ b/doomsday/client/src/render/sprite.cpp @@ -30,7 +30,7 @@ #include "MaterialSnapshot" #include "MaterialVariantSpec" -#include "map/gamemap.h" +#include "world/gamemap.h" #include "Texture" using namespace de; diff --git a/doomsday/client/src/render/walledge.cpp b/doomsday/client/src/render/walledge.cpp index 074b5a7542..12e117b3ad 100644 --- a/doomsday/client/src/render/walledge.cpp +++ b/doomsday/client/src/render/walledge.cpp @@ -22,8 +22,8 @@ #include "Sector" #include "Segment" -#include "map/r_world.h" // R_SideSectionCoords -#include "map/lineowner.h" +#include "world/r_world.h" // R_SideSectionCoords +#include "world/lineowner.h" #include "render/walledge.h" diff --git a/doomsday/client/src/render/wallspec.cpp b/doomsday/client/src/render/wallspec.cpp index d54aa1685a..1b49785b3f 100644 --- a/doomsday/client/src/render/wallspec.cpp +++ b/doomsday/client/src/render/wallspec.cpp @@ -19,7 +19,7 @@ #include "de_base.h" -#include "map/p_players.h" // viewPlayer +#include "world/p_players.h" // viewPlayer #include "render/rend_main.h" #include "render/walledge.h" diff --git a/doomsday/client/src/resource/maparchive.cpp b/doomsday/client/src/resource/maparchive.cpp index d5a719f8f3..89b09b6947 100644 --- a/doomsday/client/src/resource/maparchive.cpp +++ b/doomsday/client/src/resource/maparchive.cpp @@ -31,7 +31,7 @@ #include "de_base.h" #include "de_edit.h" #include "de_filesys.h" -#include "map/gamemap.h" +#include "world/gamemap.h" #include "resource/maparchive.h" diff --git a/doomsday/client/src/resource/material.cpp b/doomsday/client/src/resource/material.cpp index 588ff348ea..40837fadea 100644 --- a/doomsday/client/src/resource/material.cpp +++ b/doomsday/client/src/resource/material.cpp @@ -22,8 +22,8 @@ #include "api_map.h" #include "audio/s_environ.h" -#include "map/r_world.h" -#include "map/gamemap.h" // theMap - Remove me +#include "world/r_world.h" +#include "world/gamemap.h" // theMap - Remove me #include "r_util.h" // R_NameForBlendMode #include #include diff --git a/doomsday/client/src/resource/materialanimation.cpp b/doomsday/client/src/resource/materialanimation.cpp index 358cb756aa..8f0833d06e 100644 --- a/doomsday/client/src/resource/materialanimation.cpp +++ b/doomsday/client/src/resource/materialanimation.cpp @@ -19,7 +19,7 @@ #include "de_base.h" #include "de_network.h" // playback / clientPaused -#include "map/gamemap.h" // theMap - remove me +#include "world/gamemap.h" // theMap - remove me #include "render/r_main.h" // frameCount, frameTimePos #include #include diff --git a/doomsday/client/src/ui/b_command.cpp b/doomsday/client/src/ui/b_command.cpp index b6ae88e21b..3aacd50541 100644 --- a/doomsday/client/src/ui/b_command.cpp +++ b/doomsday/client/src/ui/b_command.cpp @@ -22,7 +22,7 @@ #include "de_console.h" #include "de_misc.h" -#include "map/p_players.h" +#include "world/p_players.h" #include "ui/b_main.h" #include "ui/b_command.h" #include "ui/commandaction.h" diff --git a/doomsday/client/src/ui/p_control.cpp b/doomsday/client/src/ui/p_control.cpp index ecc543ef12..6182129d6f 100644 --- a/doomsday/client/src/ui/p_control.cpp +++ b/doomsday/client/src/ui/p_control.cpp @@ -34,7 +34,7 @@ #include "de_graphics.h" #include "dd_main.h" -#include "map/p_players.h" +#include "world/p_players.h" #ifdef __CLIENT__ # include "ui/b_main.h" # include "ui/b_device.h" diff --git a/doomsday/client/src/ui/widgets/legacywidget.cpp b/doomsday/client/src/ui/widgets/legacywidget.cpp index d00925cf21..893dd4f6f5 100644 --- a/doomsday/client/src/ui/widgets/legacywidget.cpp +++ b/doomsday/client/src/ui/widgets/legacywidget.cpp @@ -13,7 +13,7 @@ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General * Public License for more details. You should have received a copy of the GNU * General Public License along with this program; if not, see: - * http://www.gnu.org/licenses + * http://www.gnu.org/licenses */ #include "de_platform.h" @@ -30,7 +30,7 @@ #include "dd_loop.h" #include "sys_system.h" #include "edit_bias.h" -#include "map/gamemap.h" +#include "world/gamemap.h" #include "network/net_main.h" #include "render/r_main.h" #include "render/rend_list.h" @@ -83,7 +83,7 @@ void LegacyWidget::viewResized() } void LegacyWidget::update() -{ +{ GuiWidget::update(); if(isDisabled()) return; diff --git a/doomsday/client/src/map/blockmap.cpp b/doomsday/client/src/world/blockmap.cpp similarity index 99% rename from doomsday/client/src/map/blockmap.cpp rename to doomsday/client/src/world/blockmap.cpp index c75420b088..85c4f5e445 100644 --- a/doomsday/client/src/map/blockmap.cpp +++ b/doomsday/client/src/world/blockmap.cpp @@ -1,4 +1,4 @@ -/** @file blockmap.cpp Blockmap. +/** @file blockmap.cpp Blockmap. * @ingroup map * * @authors Copyright © 2003-2013 Jaakko Keränen @@ -27,7 +27,7 @@ #include "de_console.h" #include "dd_main.h" #include "gridmap.h" -#include "map/blockmap.h" +#include "world/blockmap.h" typedef struct blockmap_ringnode_s { void* object; diff --git a/doomsday/client/src/map/blockmapvisual.cpp b/doomsday/client/src/world/blockmapvisual.cpp similarity index 99% rename from doomsday/client/src/map/blockmapvisual.cpp rename to doomsday/client/src/world/blockmapvisual.cpp index 9e1c763457..bf288055db 100644 --- a/doomsday/client/src/map/blockmapvisual.cpp +++ b/doomsday/client/src/world/blockmapvisual.cpp @@ -1,4 +1,4 @@ -/** @file blockmapvisual.cpp Graphical Blockmap Visual. +/** @file blockmapvisual.cpp Graphical Blockmap Visual. * @ingroup map * * @authors Copyright © 2003-2013 Jaakko Keränen @@ -32,10 +32,10 @@ #include "HEdge" -#include "map/blockmap.h" -#include "map/gamemap.h" +#include "world/blockmap.h" +#include "world/gamemap.h" -#include "map/blockmapvisual.h" +#include "world/blockmapvisual.h" using namespace de; diff --git a/doomsday/client/src/map/bsp/convexsubspace.cpp b/doomsday/client/src/world/bsp/convexsubspace.cpp similarity index 99% rename from doomsday/client/src/map/bsp/convexsubspace.cpp rename to doomsday/client/src/world/bsp/convexsubspace.cpp index a006249236..e4fe28e80a 100644 --- a/doomsday/client/src/map/bsp/convexsubspace.cpp +++ b/doomsday/client/src/world/bsp/convexsubspace.cpp @@ -1,4 +1,4 @@ -/** @file map/bsp/convexsubspace.cpp BSP Builder Convex Subspace. +/** @file world/bsp/convexsubspace.cpp BSP Builder Convex Subspace. * * @authors Copyright © 2013 Daniel Swanson * @@ -30,11 +30,11 @@ #include "Mesh" #include "Sector" #include "Segment" -#include "map/bsp/linesegment.h" +#include "world/bsp/linesegment.h" #include "render/r_main.h" /// validCount @todo Remove me -#include "map/bsp/convexsubspace.h" +#include "world/bsp/convexsubspace.h" /// Smallest difference between two angles before being considered equal (in degrees). static coord_t const ANG_EPSILON = 1.0 / 1024.0; diff --git a/doomsday/client/src/map/bsp/hplane.cpp b/doomsday/client/src/world/bsp/hplane.cpp similarity index 98% rename from doomsday/client/src/map/bsp/hplane.cpp rename to doomsday/client/src/world/bsp/hplane.cpp index bbb4a5c36a..6ba66a1354 100644 --- a/doomsday/client/src/map/bsp/hplane.cpp +++ b/doomsday/client/src/world/bsp/hplane.cpp @@ -1,4 +1,4 @@ -/** @file map/bsp/hplane.cpp BSP Builder Half-plane. +/** @file world/bsp/hplane.cpp BSP Builder Half-plane. * * Originally based on glBSP 2.24 (in turn, based on BSP 2.3) * @see http://sourceforge.net/projects/glbsp/ @@ -34,11 +34,11 @@ #include "Sector" #include "Vertex" -#include "map/bsp/edgetip.h" -#include "map/bsp/linesegment.h" -#include "map/bsp/partitioner.h" +#include "world/bsp/edgetip.h" +#include "world/bsp/linesegment.h" +#include "world/bsp/partitioner.h" -#include "map/bsp/hplane.h" +#include "world/bsp/hplane.h" namespace de { namespace bsp { diff --git a/doomsday/client/src/map/bsp/linesegment.cpp b/doomsday/client/src/world/bsp/linesegment.cpp similarity index 98% rename from doomsday/client/src/map/bsp/linesegment.cpp rename to doomsday/client/src/world/bsp/linesegment.cpp index 697a61ac15..d9f5bc574d 100644 --- a/doomsday/client/src/map/bsp/linesegment.cpp +++ b/doomsday/client/src/world/bsp/linesegment.cpp @@ -1,4 +1,4 @@ -/** @file map/bsp/linesegment.cpp BSP Builder Line Segment. +/** @file world/bsp/linesegment.cpp BSP Builder Line Segment. * * Originally based on glBSP 2.24 (in turn, based on BSP 2.3) * @see http://sourceforge.net/projects/glbsp/ @@ -31,10 +31,10 @@ #include #include "Segment" -#include "map/bsp/convexsubspace.h" -#include "map/bsp/superblockmap.h" +#include "world/bsp/convexsubspace.h" +#include "world/bsp/superblockmap.h" -#include "map/bsp/linesegment.h" +#include "world/bsp/linesegment.h" namespace de { namespace bsp { diff --git a/doomsday/client/src/map/bsp/partitioner.cpp b/doomsday/client/src/world/bsp/partitioner.cpp similarity index 99% rename from doomsday/client/src/map/bsp/partitioner.cpp rename to doomsday/client/src/world/bsp/partitioner.cpp index c1cc9e75f8..712e0ff9fb 100644 --- a/doomsday/client/src/map/bsp/partitioner.cpp +++ b/doomsday/client/src/world/bsp/partitioner.cpp @@ -1,4 +1,4 @@ -/** @file map/bsp/partitioner.cpp Binary Space Partitioner. +/** @file world/bsp/partitioner.cpp Binary Space Partitioner. * * @authors Copyright © 2006-2013 Daniel Swanson * @authors Copyright © 2006-2007 Jamie Jones @@ -33,7 +33,7 @@ #include #include -#include "map/gamemap.h" +#include "world/gamemap.h" #include "BspLeaf" #include "BspNode" #include "Segment" @@ -43,14 +43,14 @@ #include "render/r_main.h" /// validCount @todo Remove me -#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/superblockmap.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/superblockmap.h" -#include "map/bsp/partitioner.h" +#include "world/bsp/partitioner.h" using namespace de; using namespace de::bsp; diff --git a/doomsday/client/src/map/bsp/superblockmap.cpp b/doomsday/client/src/world/bsp/superblockmap.cpp similarity index 98% rename from doomsday/client/src/map/bsp/superblockmap.cpp rename to doomsday/client/src/world/bsp/superblockmap.cpp index 5f9eed2fb0..73e3bf7dc4 100644 --- a/doomsday/client/src/map/bsp/superblockmap.cpp +++ b/doomsday/client/src/world/bsp/superblockmap.cpp @@ -1,4 +1,4 @@ -/** @file map/bsp/superblockmap.cpp BSP Builder Super Blockmap. +/** @file world/bsp/superblockmap.cpp BSP Builder Super Blockmap. * * @authors Copyright © 2006-2013 Daniel Swanson * @authors Copyright © 2006-2007 Jamie Jones @@ -23,9 +23,9 @@ #include -#include "map/bsp/linesegment.h" +#include "world/bsp/linesegment.h" -#include "map/bsp/superblockmap.h" +#include "world/bsp/superblockmap.h" using namespace de; using namespace de::bsp; diff --git a/doomsday/client/src/map/bspbuilder.cpp b/doomsday/client/src/world/bspbuilder.cpp similarity index 98% rename from doomsday/client/src/map/bspbuilder.cpp rename to doomsday/client/src/world/bspbuilder.cpp index 570ff2e962..d3d48b86fd 100644 --- a/doomsday/client/src/map/bspbuilder.cpp +++ b/doomsday/client/src/world/bspbuilder.cpp @@ -28,9 +28,9 @@ #include "BspLeaf" #include "Segment" #include "Sector" -#include "map/bsp/partitioner.h" +#include "world/bsp/partitioner.h" -#include "map/bspbuilder.h" +#include "world/bspbuilder.h" using namespace de; using namespace bsp; diff --git a/doomsday/client/src/map/bspleaf.cpp b/doomsday/client/src/world/bspleaf.cpp similarity index 99% rename from doomsday/client/src/map/bspleaf.cpp rename to doomsday/client/src/world/bspleaf.cpp index a50031edba..2213ad7c19 100644 --- a/doomsday/client/src/map/bspleaf.cpp +++ b/doomsday/client/src/world/bspleaf.cpp @@ -35,7 +35,7 @@ # include "render/rend_bias.h" #endif -#include "map/bspleaf.h" +#include "world/bspleaf.h" using namespace de; diff --git a/doomsday/client/src/map/bspnode.cpp b/doomsday/client/src/world/bspnode.cpp similarity index 99% rename from doomsday/client/src/map/bspnode.cpp rename to doomsday/client/src/world/bspnode.cpp index 315d32c0ed..c22da22bda 100644 --- a/doomsday/client/src/map/bspnode.cpp +++ b/doomsday/client/src/world/bspnode.cpp @@ -22,7 +22,7 @@ #include -#include "map/bspnode.h" +#include "world/bspnode.h" using namespace de; diff --git a/doomsday/client/src/map/dam_file.cpp b/doomsday/client/src/world/dam_file.cpp similarity index 99% rename from doomsday/client/src/map/dam_file.cpp rename to doomsday/client/src/world/dam_file.cpp index b2de846e93..bf07b1bc1b 100644 --- a/doomsday/client/src/map/dam_file.cpp +++ b/doomsday/client/src/world/dam_file.cpp @@ -32,8 +32,8 @@ #include "de_misc.h" #include "de_filesys.h" -#include "map/gamemap.h" -#include "map/p_mapdata.h" +#include "world/gamemap.h" +#include "world/p_mapdata.h" // Global archived map format version identifier. Increment when making // changes to the structure of the format. diff --git a/doomsday/client/src/map/entitydatabase.cpp b/doomsday/client/src/world/entitydatabase.cpp similarity index 98% rename from doomsday/client/src/map/entitydatabase.cpp rename to doomsday/client/src/world/entitydatabase.cpp index 4c03440d1d..c1ed9e99c1 100644 --- a/doomsday/client/src/map/entitydatabase.cpp +++ b/doomsday/client/src/world/entitydatabase.cpp @@ -1,4 +1,4 @@ -/** @file entitydatabase.cpp Database of map entity property values. +/** @file entitydatabase.cpp Database of map entity property values. * @ingroup map * * @authors Copyright © 2007-2013 Daniel Swanson @@ -19,8 +19,8 @@ */ #include "de_base.h" -#include "map/p_mapdata.h" -#include "map/propertyvalue.h" +#include "world/p_mapdata.h" +#include "world/propertyvalue.h" #include #include diff --git a/doomsday/client/src/map/face.cpp b/doomsday/client/src/world/face.cpp similarity index 99% rename from doomsday/client/src/map/face.cpp rename to doomsday/client/src/world/face.cpp index 6f5a71a530..adab6d7191 100644 --- a/doomsday/client/src/map/face.cpp +++ b/doomsday/client/src/world/face.cpp @@ -23,7 +23,7 @@ #include "HEdge" -#include "map/face.h" +#include "world/face.h" namespace de { diff --git a/doomsday/client/src/map/gamemap.cpp b/doomsday/client/src/world/gamemap.cpp similarity index 99% rename from doomsday/client/src/map/gamemap.cpp rename to doomsday/client/src/world/gamemap.cpp index adeda11a28..2d0eb7c05c 100644 --- a/doomsday/client/src/map/gamemap.cpp +++ b/doomsday/client/src/world/gamemap.cpp @@ -1,4 +1,4 @@ -/** @file map/gamemap.cpp World Map. +/** @file world/gamemap.cpp World Map. * * @authors Copyright © 2003-2013 Jaakko Keränen * @authors Copyright © 2006-2013 Daniel Swanson @@ -37,17 +37,17 @@ #include "BspBuilder" -#include "map/blockmap.h" -#include "map/generators.h" -#include "map/p_intercept.h" -#include "map/p_maputil.h" -#include "map/p_object.h" -#include "map/r_world.h" +#include "world/blockmap.h" +#include "world/generators.h" +#include "world/p_intercept.h" +#include "world/p_maputil.h" +#include "world/p_object.h" +#include "world/r_world.h" #include "edit_map.h" // bspFactor #include "render/r_main.h" // validCount -#include "map/gamemap.h" +#include "world/gamemap.h" /// Size of Blockmap blocks in map units. Must be an integer power of two. #define MAPBLOCKUNITS (128) diff --git a/doomsday/client/src/map/generators.cpp b/doomsday/client/src/world/generators.cpp similarity index 99% rename from doomsday/client/src/map/generators.cpp rename to doomsday/client/src/world/generators.cpp index d4cd07eb56..5e3345c057 100644 --- a/doomsday/client/src/map/generators.cpp +++ b/doomsday/client/src/world/generators.cpp @@ -24,7 +24,7 @@ #include "de_platform.h" #include "de_console.h" #include "dd_main.h" -#include "map/generators.h" +#include "world/generators.h" typedef struct listnode_s { struct listnode_s* next; diff --git a/doomsday/client/src/map/hedge.cpp b/doomsday/client/src/world/hedge.cpp similarity index 99% rename from doomsday/client/src/map/hedge.cpp rename to doomsday/client/src/world/hedge.cpp index 78a2ffe121..ef687e0314 100644 --- a/doomsday/client/src/map/hedge.cpp +++ b/doomsday/client/src/world/hedge.cpp @@ -21,7 +21,7 @@ #include "Face" -#include "map/hedge.h" +#include "world/hedge.h" namespace de { diff --git a/doomsday/client/src/map/line.cpp b/doomsday/client/src/world/line.cpp similarity index 99% rename from doomsday/client/src/map/line.cpp rename to doomsday/client/src/world/line.cpp index 4a774fdb54..6aead02afd 100644 --- a/doomsday/client/src/map/line.cpp +++ b/doomsday/client/src/world/line.cpp @@ -1,4 +1,4 @@ -/** @file map/line.cpp World Map Line. +/** @file world/line.cpp World Map Line. * * @authors Copyright © 2003-2013 Jaakko Keränen * @authors Copyright © 2006-2013 Daniel Swanson @@ -30,7 +30,7 @@ #include "Segment" #include "Vertex" -#include "map/line.h" +#include "world/line.h" #ifdef WIN32 # undef max diff --git a/doomsday/client/src/map/linesighttest.cpp b/doomsday/client/src/world/linesighttest.cpp similarity index 99% rename from doomsday/client/src/map/linesighttest.cpp rename to doomsday/client/src/world/linesighttest.cpp index f78fb6d48b..11ca2018b4 100644 --- a/doomsday/client/src/map/linesighttest.cpp +++ b/doomsday/client/src/world/linesighttest.cpp @@ -32,7 +32,7 @@ #include "render/r_main.h" /// For validCount, @todo Remove me. -#include "map/linesighttest.h" +#include "world/linesighttest.h" using namespace de; diff --git a/doomsday/client/src/map/mapelement.cpp b/doomsday/client/src/world/mapelement.cpp similarity index 96% rename from doomsday/client/src/map/mapelement.cpp rename to doomsday/client/src/world/mapelement.cpp index 3063920b91..c695767472 100644 --- a/doomsday/client/src/map/mapelement.cpp +++ b/doomsday/client/src/world/mapelement.cpp @@ -1,4 +1,4 @@ -/** @file map/mapelement.cpp Base class for all map elements. +/** @file world/mapelement.cpp Base class for all map elements. * * @authors Copyright © 2013 Jaakko Keränen * @authors Copyright © 2013 Daniel Swanson @@ -18,7 +18,7 @@ * 02110-1301 USA */ -#include "map/mapelement.h" +#include "world/mapelement.h" using namespace de; diff --git a/doomsday/client/src/map/mesh.cpp b/doomsday/client/src/world/mesh.cpp similarity index 99% rename from doomsday/client/src/map/mesh.cpp rename to doomsday/client/src/world/mesh.cpp index 3240192e7d..9e9d5cdbd2 100644 --- a/doomsday/client/src/map/mesh.cpp +++ b/doomsday/client/src/world/mesh.cpp @@ -23,7 +23,7 @@ #include "Face" #include "Vertex" -#include "map/mesh.h" +#include "world/mesh.h" namespace de { diff --git a/doomsday/client/src/map/p_data.cpp b/doomsday/client/src/world/p_data.cpp similarity index 99% rename from doomsday/client/src/map/p_data.cpp rename to doomsday/client/src/world/p_data.cpp index 7ff8e9fcfe..7f5fe949a7 100644 --- a/doomsday/client/src/map/p_data.cpp +++ b/doomsday/client/src/world/p_data.cpp @@ -31,8 +31,8 @@ #include "de_filesys.h" #include "Game" -#include "map/gamemap.h" -#include "map/propertyvalue.h" +#include "world/gamemap.h" +#include "world/propertyvalue.h" #include "render/rend_bias.h" #include "render/vlight.h" diff --git a/doomsday/client/src/map/p_dmu.cpp b/doomsday/client/src/world/p_dmu.cpp similarity index 99% rename from doomsday/client/src/map/p_dmu.cpp rename to doomsday/client/src/world/p_dmu.cpp index 39478cea26..cbbb40af63 100644 --- a/doomsday/client/src/map/p_dmu.cpp +++ b/doomsday/client/src/world/p_dmu.cpp @@ -1,4 +1,4 @@ -/** @file map/p_dmu.cpp Doomsday Map Update API. +/** @file world/p_dmu.cpp Doomsday Map Update API. * * @todo Throw a game-terminating exception if an illegal value is given * to a public API function. @@ -38,7 +38,7 @@ # include "render/lightgrid.h" #endif -#include "map/p_dmu.h" +#include "world/p_dmu.h" using namespace de; diff --git a/doomsday/client/src/map/p_intercept.cpp b/doomsday/client/src/world/p_intercept.cpp similarity index 100% rename from doomsday/client/src/map/p_intercept.cpp rename to doomsday/client/src/world/p_intercept.cpp diff --git a/doomsday/client/src/map/p_maputil.cpp b/doomsday/client/src/world/p_maputil.cpp similarity index 99% rename from doomsday/client/src/map/p_maputil.cpp rename to doomsday/client/src/world/p_maputil.cpp index 3944e0b010..03783118b8 100644 --- a/doomsday/client/src/map/p_maputil.cpp +++ b/doomsday/client/src/world/p_maputil.cpp @@ -24,7 +24,7 @@ #include "de_play.h" #include "de_misc.h" -#include "map/gamemap.h" +#include "world/gamemap.h" #include "render/r_main.h" // validCount using namespace de; diff --git a/doomsday/client/src/map/p_mobj.cpp b/doomsday/client/src/world/p_mobj.cpp similarity index 99% rename from doomsday/client/src/map/p_mobj.cpp rename to doomsday/client/src/world/p_mobj.cpp index 50875015c8..f9a059fa78 100644 --- a/doomsday/client/src/map/p_mobj.cpp +++ b/doomsday/client/src/world/p_mobj.cpp @@ -1,4 +1,4 @@ -/** @file map/p_mobj.cpp Map Objects. +/** @file world/p_mobj.cpp Map Objects. * * Various routines for moving mobjs, collision and Z checking. * diff --git a/doomsday/client/src/map/p_objlink.cpp b/doomsday/client/src/world/p_objlink.cpp similarity index 99% rename from doomsday/client/src/map/p_objlink.cpp rename to doomsday/client/src/world/p_objlink.cpp index 59766e2ed9..f7efd08d7e 100644 --- a/doomsday/client/src/map/p_objlink.cpp +++ b/doomsday/client/src/world/p_objlink.cpp @@ -28,10 +28,10 @@ #include "de_defs.h" #include "gridmap.h" -#include "map/gamemap.h" +#include "world/gamemap.h" #include "MaterialSnapshot" -#include "map/p_objlink.h" +#include "world/p_objlink.h" using namespace de; diff --git a/doomsday/client/src/map/p_particle.cpp b/doomsday/client/src/world/p_particle.cpp similarity index 99% rename from doomsday/client/src/map/p_particle.cpp rename to doomsday/client/src/world/p_particle.cpp index 65bc1b84b6..840bdbc46c 100644 --- a/doomsday/client/src/map/p_particle.cpp +++ b/doomsday/client/src/world/p_particle.cpp @@ -31,14 +31,14 @@ #include #include -#include "map/generators.h" +#include "world/generators.h" #include "render/r_main.h" // validCount #include "resource/models.h" #include "api_map.h" #include "m_misc.h" #include "m_profiler.h" -#include "map/p_particle.h" +#include "world/p_particle.h" using namespace de; diff --git a/doomsday/client/src/map/p_players.cpp b/doomsday/client/src/world/p_players.cpp similarity index 99% rename from doomsday/client/src/map/p_players.cpp rename to doomsday/client/src/world/p_players.cpp index eeb03195a9..3bbfb896b8 100644 --- a/doomsday/client/src/map/p_players.cpp +++ b/doomsday/client/src/world/p_players.cpp @@ -23,7 +23,7 @@ #include "de_play.h" #include "de_network.h" -#include "map/gamemap.h" +#include "world/gamemap.h" using namespace de; diff --git a/doomsday/client/src/map/p_think.cpp b/doomsday/client/src/world/p_think.cpp similarity index 99% rename from doomsday/client/src/map/p_think.cpp rename to doomsday/client/src/world/p_think.cpp index b14e788cc6..08e2570d43 100644 --- a/doomsday/client/src/map/p_think.cpp +++ b/doomsday/client/src/world/p_think.cpp @@ -1,4 +1,4 @@ -/** @file map/p_think.cpp +/** @file world/p_think.cpp * * @authors Copyright © 2003-2013 Jaakko Keränen * @authors Copyright © 2006-2013 Daniel Swanson @@ -24,7 +24,7 @@ #include "de_console.h" #include "de_network.h" -#include "map/gamemap.h" +#include "world/gamemap.h" typedef struct thinkerlist_s { boolean isPublic; ///< All thinkers in this list are visible publically. diff --git a/doomsday/client/src/map/p_ticker.cpp b/doomsday/client/src/world/p_ticker.cpp similarity index 99% rename from doomsday/client/src/map/p_ticker.cpp rename to doomsday/client/src/world/p_ticker.cpp index 1722db4999..c8a0759e90 100644 --- a/doomsday/client/src/map/p_ticker.cpp +++ b/doomsday/client/src/world/p_ticker.cpp @@ -23,7 +23,7 @@ #include "de_play.h" #include "de_misc.h" -#include "map/gamemap.h" +#include "world/gamemap.h" #include "render/sky.h" using namespace de; diff --git a/doomsday/client/src/map/plane.cpp b/doomsday/client/src/world/plane.cpp similarity index 98% rename from doomsday/client/src/map/plane.cpp rename to doomsday/client/src/world/plane.cpp index 6531bd653f..1fd7e4f46e 100644 --- a/doomsday/client/src/map/plane.cpp +++ b/doomsday/client/src/world/plane.cpp @@ -24,11 +24,11 @@ #include "audio/s_environ.h" #include "Line" -#include "map/gamemap.h" /// @todo remove me. -#include "map/r_world.h" // ddMapSetup +#include "world/gamemap.h" /// @todo remove me. +#include "world/r_world.h" // ddMapSetup #include "render/r_main.h" // frameTimePos -#include "map/plane.h" +#include "world/plane.h" using namespace de; diff --git a/doomsday/client/src/map/polyobj.cpp b/doomsday/client/src/world/polyobj.cpp similarity index 99% rename from doomsday/client/src/map/polyobj.cpp rename to doomsday/client/src/world/polyobj.cpp index aa7b229e27..ad0bca1edb 100644 --- a/doomsday/client/src/map/polyobj.cpp +++ b/doomsday/client/src/world/polyobj.cpp @@ -1,4 +1,4 @@ -/** @file map/polyobj.cpp World Map Polyobj. +/** @file world/polyobj.cpp World Map Polyobj. * * @authors Copyright © 2003-2013 Jaakko Keränen * @authors Copyright © 2006-2013 Daniel Swanson @@ -25,8 +25,8 @@ #include "de_base.h" -#include "map/p_maptypes.h" -#include "map/gamemap.h" +#include "world/p_maptypes.h" +#include "world/gamemap.h" #include "Segment" #include "render/r_main.h" // validCount @@ -35,7 +35,7 @@ # include "render/rend_bias.h" #endif -#include "map/polyobj.h" +#include "world/polyobj.h" using namespace de; diff --git a/doomsday/client/src/map/propertyvalue.cpp b/doomsday/client/src/world/propertyvalue.cpp similarity index 97% rename from doomsday/client/src/map/propertyvalue.cpp rename to doomsday/client/src/world/propertyvalue.cpp index 25676a440b..9ad70215d0 100644 --- a/doomsday/client/src/map/propertyvalue.cpp +++ b/doomsday/client/src/world/propertyvalue.cpp @@ -1,4 +1,4 @@ -/** @file propertyvalue.cpp Data types for representing property values. +/** @file propertyvalue.cpp Data types for representing property values. * @ingroup data * * @authors Copyright © 2013 Daniel Swanson @@ -20,7 +20,7 @@ #include -#include "map/propertyvalue.h" +#include "world/propertyvalue.h" PropertyValue* BuildPropertyValue(valuetype_t type, void* valueAdr) { diff --git a/doomsday/client/src/map/r_world.cpp b/doomsday/client/src/world/r_world.cpp similarity index 99% rename from doomsday/client/src/map/r_world.cpp rename to doomsday/client/src/world/r_world.cpp index 37fc6c02e1..5545889374 100644 --- a/doomsday/client/src/map/r_world.cpp +++ b/doomsday/client/src/world/r_world.cpp @@ -32,7 +32,7 @@ #include "de_audio.h" #include "de_misc.h" -#include "map/lineowner.h" +#include "world/lineowner.h" #include "Plane" #ifdef __CLIENT__ # include "MaterialSnapshot" diff --git a/doomsday/client/src/map/reject.cpp b/doomsday/client/src/world/reject.cpp similarity index 97% rename from doomsday/client/src/map/reject.cpp rename to doomsday/client/src/world/reject.cpp index 1047730ea9..1209b84afb 100644 --- a/doomsday/client/src/map/reject.cpp +++ b/doomsday/client/src/world/reject.cpp @@ -1,4 +1,4 @@ -/** @file map/reject.cpp World Map, Reject LUT building. +/** @file world/reject.cpp World Map, Reject LUT building. * * @authors Copyright © 2007-2013 Daniel Swanson * @authors Copyright © 2000-2007 Andrew Apted @@ -27,7 +27,7 @@ #include #include "de_base.h" -#include "map/gamemap.h" +#include "world/gamemap.h" using namespace de; diff --git a/doomsday/client/src/map/sector.cpp b/doomsday/client/src/world/sector.cpp similarity index 99% rename from doomsday/client/src/map/sector.cpp rename to doomsday/client/src/world/sector.cpp index 7a2e896153..44048a3d74 100644 --- a/doomsday/client/src/map/sector.cpp +++ b/doomsday/client/src/world/sector.cpp @@ -24,15 +24,15 @@ #include "BspLeaf" #include "Line" -#include "map/gamemap.h" -#include "map/p_players.h" -#include "map/p_maptypes.h" +#include "world/gamemap.h" +#include "world/p_players.h" +#include "world/p_maptypes.h" #ifdef __CLIENT__ -# include "map/r_world.h" +# include "world/r_world.h" # include "render/rend_bias.h" #endif -#include "map/sector.h" +#include "world/sector.h" using namespace de; diff --git a/doomsday/client/src/map/segment.cpp b/doomsday/client/src/world/segment.cpp similarity index 98% rename from doomsday/client/src/map/segment.cpp rename to doomsday/client/src/world/segment.cpp index d98eaf3e7f..89a2cd724b 100644 --- a/doomsday/client/src/map/segment.cpp +++ b/doomsday/client/src/world/segment.cpp @@ -1,4 +1,4 @@ -/** @file map/segment.cpp World Map Line Segment. +/** @file world/segment.cpp World Map Line Segment. * * @authors Copyright © 2003-2013 Jaakko Keränen * @authors Copyright © 2006-2013 Daniel Swanson @@ -29,7 +29,7 @@ # include "render/rend_bias.h" #endif -#include "map/segment.h" +#include "world/segment.h" using namespace de; diff --git a/doomsday/client/src/map/surface.cpp b/doomsday/client/src/world/surface.cpp similarity index 99% rename from doomsday/client/src/map/surface.cpp rename to doomsday/client/src/world/surface.cpp index 3cf1fa6e58..3d81d72bb2 100644 --- a/doomsday/client/src/map/surface.cpp +++ b/doomsday/client/src/world/surface.cpp @@ -25,11 +25,11 @@ #include "de_defs.h" // Def_GetGenerator #include "Materials" -#include "map/gamemap.h" -#include "map/r_world.h" /// ddMapSetup @todo remove me +#include "world/gamemap.h" +#include "world/r_world.h" /// ddMapSetup @todo remove me #include "render/r_main.h" /// frameTimePos -#include "map/surface.h" +#include "world/surface.h" using namespace de; diff --git a/doomsday/client/src/map/vertex.cpp b/doomsday/client/src/world/vertex.cpp similarity index 97% rename from doomsday/client/src/map/vertex.cpp rename to doomsday/client/src/world/vertex.cpp index 6d77bc3b89..12566ec9d1 100644 --- a/doomsday/client/src/map/vertex.cpp +++ b/doomsday/client/src/world/vertex.cpp @@ -1,4 +1,4 @@ -/** @file map/vertex.cpp World Map Vertex. +/** @file world/vertex.cpp World Map Vertex. * * @authors Copyright © 2003-2013 Jaakko Keränen * @authors Copyright © 2006-2013 Daniel Swanson @@ -21,9 +21,9 @@ #include #include "Line" -#include "map/lineowner.h" /// @todo remove me +#include "world/lineowner.h" /// @todo remove me -#include "map/vertex.h" +#include "world/vertex.h" using namespace de; diff --git a/doomsday/server/include/server/sv_pool.h b/doomsday/server/include/server/sv_pool.h index fcfc2ff468..72e020b60d 100644 --- a/doomsday/server/include/server/sv_pool.h +++ b/doomsday/server/include/server/sv_pool.h @@ -22,8 +22,8 @@ #define __DOOMSDAY_SERVER_POOL_H__ #include "dd_share.h" -#include "map/p_maptypes.h" -#include "map/p_object.h" +#include "world/p_maptypes.h" +#include "world/p_object.h" #include "resource/r_data.h" #include "Materials" #include "sv_missile.h" diff --git a/doomsday/server/include/server_dummies.h b/doomsday/server/include/server_dummies.h index 780996616e..daa2c30058 100644 --- a/doomsday/server/include/server_dummies.h +++ b/doomsday/server/include/server_dummies.h @@ -30,7 +30,7 @@ #define SERVER_DUMMIES_H #include -#include "map/gamemap.h" +#include "world/gamemap.h" #ifndef __SERVER__ # error "Attempted to include server's header in a non-server build" diff --git a/doomsday/server/include/shellusers.h b/doomsday/server/include/shellusers.h index 77fdf8e9e4..d36fc21c64 100644 --- a/doomsday/server/include/shellusers.h +++ b/doomsday/server/include/shellusers.h @@ -23,7 +23,7 @@ #include #include #include "shelluser.h" -#include "map/r_world.h" +#include "world/r_world.h" /** * All remote shell users. diff --git a/doomsday/server/server.pro b/doomsday/server/server.pro index 56369ce04e..7a5c74852b 100644 --- a/doomsday/server/server.pro +++ b/doomsday/server/server.pro @@ -185,46 +185,6 @@ DENG_HEADERS += \ $$SRC/include/m_misc.h \ $$SRC/include/m_nodepile.h \ $$SRC/include/m_profiler.h \ - $$SRC/include/map/blockmap.h \ - $$SRC/include/map/bsp/bsptreenode.h \ - $$SRC/include/map/bsp/convexsubspace.h \ - $$SRC/include/map/bsp/edgetip.h \ - $$SRC/include/map/bsp/hplane.h \ - $$SRC/include/map/bsp/linesegment.h \ - $$SRC/include/map/bsp/partitioncost.h \ - $$SRC/include/map/bsp/partitioner.h \ - $$SRC/include/map/bsp/superblockmap.h \ - $$SRC/include/map/bspbuilder.h \ - $$SRC/include/map/bspleaf.h \ - $$SRC/include/map/bspnode.h \ - $$SRC/include/map/dam_file.h \ - $$SRC/include/map/entitydatabase.h \ - $$SRC/include/map/face.h \ - $$SRC/include/map/gamemap.h \ - $$SRC/include/map/generators.h \ - $$SRC/include/map/hedge.h \ - $$SRC/include/map/line.h \ - $$SRC/include/map/lineowner.h \ - $$SRC/include/map/linesighttest.h \ - $$SRC/include/map/mesh.h \ - $$SRC/include/map/p_dmu.h \ - $$SRC/include/map/p_intercept.h \ - $$SRC/include/map/p_mapdata.h \ - $$SRC/include/map/p_maptypes.h \ - $$SRC/include/map/p_maputil.h \ - $$SRC/include/map/p_object.h \ - $$SRC/include/map/p_particle.h \ - $$SRC/include/map/p_players.h \ - $$SRC/include/map/p_ticker.h \ - $$SRC/include/map/plane.h \ - $$SRC/include/map/polyobj.h \ - $$SRC/include/map/propertyvalue.h \ - $$SRC/include/map/r_world.h \ - $$SRC/include/map/reject.h \ - $$SRC/include/map/sector.h \ - $$SRC/include/map/segment.h \ - $$SRC/include/map/surface.h \ - $$SRC/include/map/vertex.h \ $$SRC/include/network/masterserver.h \ $$SRC/include/network/monitor.h \ $$SRC/include/network/net_buf.h \ @@ -267,7 +227,47 @@ DENG_HEADERS += \ $$SRC/include/ui/finaleinterpreter.h \ $$SRC/include/ui/p_control.h \ $$SRC/include/ui/ui2_main.h \ - $$SRC/include/uri.hh + $$SRC/include/uri.hh \ + $$SRC/include/world/blockmap.h \ + $$SRC/include/world/bsp/bsptreenode.h \ + $$SRC/include/world/bsp/convexsubspace.h \ + $$SRC/include/world/bsp/edgetip.h \ + $$SRC/include/world/bsp/hplane.h \ + $$SRC/include/world/bsp/linesegment.h \ + $$SRC/include/world/bsp/partitioncost.h \ + $$SRC/include/world/bsp/partitioner.h \ + $$SRC/include/world/bsp/superblockmap.h \ + $$SRC/include/world/bspbuilder.h \ + $$SRC/include/world/bspleaf.h \ + $$SRC/include/world/bspnode.h \ + $$SRC/include/world/dam_file.h \ + $$SRC/include/world/entitydatabase.h \ + $$SRC/include/world/face.h \ + $$SRC/include/world/gamemap.h \ + $$SRC/include/world/generators.h \ + $$SRC/include/world/hedge.h \ + $$SRC/include/world/line.h \ + $$SRC/include/world/lineowner.h \ + $$SRC/include/world/linesighttest.h \ + $$SRC/include/world/mesh.h \ + $$SRC/include/world/p_dmu.h \ + $$SRC/include/world/p_intercept.h \ + $$SRC/include/world/p_mapdata.h \ + $$SRC/include/world/p_maptypes.h \ + $$SRC/include/world/p_maputil.h \ + $$SRC/include/world/p_object.h \ + $$SRC/include/world/p_particle.h \ + $$SRC/include/world/p_players.h \ + $$SRC/include/world/p_ticker.h \ + $$SRC/include/world/plane.h \ + $$SRC/include/world/polyobj.h \ + $$SRC/include/world/propertyvalue.h \ + $$SRC/include/world/r_world.h \ + $$SRC/include/world/reject.h \ + $$SRC/include/world/sector.h \ + $$SRC/include/world/segment.h \ + $$SRC/include/world/surface.h \ + $$SRC/include/world/vertex.h INCLUDEPATH += \ include \ @@ -362,43 +362,6 @@ SOURCES += \ $$SRC/src/m_decomp64.cpp \ $$SRC/src/m_misc.cpp \ $$SRC/src/m_nodepile.cpp \ - $$SRC/src/map/blockmap.cpp \ - $$SRC/src/map/bsp/convexsubspace.cpp \ - $$SRC/src/map/bsp/hplane.cpp \ - $$SRC/src/map/bsp/linesegment.cpp \ - $$SRC/src/map/bsp/partitioner.cpp \ - $$SRC/src/map/bsp/superblockmap.cpp \ - $$SRC/src/map/bspbuilder.cpp \ - $$SRC/src/map/bspleaf.cpp \ - $$SRC/src/map/bspnode.cpp \ - $$SRC/src/map/dam_file.cpp \ - $$SRC/src/map/entitydatabase.cpp \ - $$SRC/src/map/face.cpp \ - $$SRC/src/map/gamemap.cpp \ - $$SRC/src/map/generators.cpp \ - $$SRC/src/map/hedge.cpp \ - $$SRC/src/map/line.cpp \ - $$SRC/src/map/linesighttest.cpp \ - $$SRC/src/map/mapelement.cpp \ - $$SRC/src/map/mesh.cpp \ - $$SRC/src/map/p_data.cpp \ - $$SRC/src/map/p_dmu.cpp \ - $$SRC/src/map/p_intercept.cpp \ - $$SRC/src/map/p_maputil.cpp \ - $$SRC/src/map/p_mobj.cpp \ - $$SRC/src/map/p_particle.cpp \ - $$SRC/src/map/p_players.cpp \ - $$SRC/src/map/p_think.cpp \ - $$SRC/src/map/p_ticker.cpp \ - $$SRC/src/map/plane.cpp \ - $$SRC/src/map/polyobj.cpp \ - $$SRC/src/map/propertyvalue.cpp \ - $$SRC/src/map/r_world.cpp \ - $$SRC/src/map/reject.cpp \ - $$SRC/src/map/sector.cpp \ - $$SRC/src/map/segment.cpp \ - $$SRC/src/map/surface.cpp \ - $$SRC/src/map/vertex.cpp \ $$SRC/src/network/masterserver.cpp \ $$SRC/src/network/monitor.cpp \ $$SRC/src/network/net_buf.cpp \ @@ -441,7 +404,44 @@ SOURCES += \ $$SRC/src/ui/finaleinterpreter.cpp \ $$SRC/src/ui/p_control.cpp \ $$SRC/src/ui/ui2_main.cpp \ - $$SRC/src/uri.cpp + $$SRC/src/uri.cpp \ + $$SRC/src/world/blockmap.cpp \ + $$SRC/src/world/bsp/convexsubspace.cpp \ + $$SRC/src/world/bsp/hplane.cpp \ + $$SRC/src/world/bsp/linesegment.cpp \ + $$SRC/src/world/bsp/partitioner.cpp \ + $$SRC/src/world/bsp/superblockmap.cpp \ + $$SRC/src/world/bspbuilder.cpp \ + $$SRC/src/world/bspleaf.cpp \ + $$SRC/src/world/bspnode.cpp \ + $$SRC/src/world/dam_file.cpp \ + $$SRC/src/world/entitydatabase.cpp \ + $$SRC/src/world/face.cpp \ + $$SRC/src/world/gamemap.cpp \ + $$SRC/src/world/generators.cpp \ + $$SRC/src/world/hedge.cpp \ + $$SRC/src/world/line.cpp \ + $$SRC/src/world/linesighttest.cpp \ + $$SRC/src/world/mapelement.cpp \ + $$SRC/src/world/mesh.cpp \ + $$SRC/src/world/p_data.cpp \ + $$SRC/src/world/p_dmu.cpp \ + $$SRC/src/world/p_intercept.cpp \ + $$SRC/src/world/p_maputil.cpp \ + $$SRC/src/world/p_mobj.cpp \ + $$SRC/src/world/p_particle.cpp \ + $$SRC/src/world/p_players.cpp \ + $$SRC/src/world/p_think.cpp \ + $$SRC/src/world/p_ticker.cpp \ + $$SRC/src/world/plane.cpp \ + $$SRC/src/world/polyobj.cpp \ + $$SRC/src/world/propertyvalue.cpp \ + $$SRC/src/world/r_world.cpp \ + $$SRC/src/world/reject.cpp \ + $$SRC/src/world/sector.cpp \ + $$SRC/src/world/segment.cpp \ + $$SRC/src/world/surface.cpp \ + $$SRC/src/world/vertex.cpp OTHER_FILES += \ data/cphelp.txt \ diff --git a/doomsday/server/src/server/sv_main.cpp b/doomsday/server/src/server/sv_main.cpp index 1d03fe1d45..d61c736b83 100644 --- a/doomsday/server/src/server/sv_main.cpp +++ b/doomsday/server/src/server/sv_main.cpp @@ -33,7 +33,7 @@ #include "de_defs.h" #include "api_materialarchive.h" -#include "map/r_world.h" +#include "world/r_world.h" #include #include diff --git a/doomsday/server/src/serversystem.cpp b/doomsday/server/src/serversystem.cpp index 29fd04a672..07e785bcdf 100644 --- a/doomsday/server/src/serversystem.cpp +++ b/doomsday/server/src/serversystem.cpp @@ -13,7 +13,7 @@ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General * Public License for more details. You should have received a copy of the GNU * General Public License along with this program; if not, see: - * http://www.gnu.org/licenses + * http://www.gnu.org/licenses */ #include "serversystem.h" @@ -27,8 +27,8 @@ #include "network/monitor.h" #include "con_main.h" #include "dd_loop.h" -#include "map/gamemap.h" -#include "map/p_players.h" +#include "world/gamemap.h" +#include "world/p_players.h" #include #include diff --git a/doomsday/server/src/shelluser.cpp b/doomsday/server/src/shelluser.cpp index ed82d63632..f3d1456679 100644 --- a/doomsday/server/src/shelluser.cpp +++ b/doomsday/server/src/shelluser.cpp @@ -30,9 +30,9 @@ #include "Game" #include "def_main.h" #include "network/net_main.h" -#include "map/gamemap.h" -#include "map/p_players.h" -#include "map/p_maptypes.h" +#include "world/gamemap.h" +#include "world/p_players.h" +#include "world/p_maptypes.h" using namespace de;