Map|Client: Moved the map's Generator collection into de::Map

Todo: Continue tearing down this now obsolete abstraction.

doomsday/client/client.pro

@@ -436,7 +436,6 @@ DENG_HEADERS += \
     include/world/dmuargs.h \
     include/world/entitydatabase.h \
     include/world/entitydef.h \
-    include/world/generators.h \
     include/world/grabbable.h \
     include/world/hand.h \
     include/world/huecircle.h \
@@ -755,7 +754,6 @@ SOURCES += \
     src/world/dmuargs.cpp \
     src/world/entitydatabase.cpp \
     src/world/entitydef.cpp \
-    src/world/generators.cpp \
     src/world/grabbable.cpp \
     src/world/hand.cpp \
     src/world/huecircle.cpp \

doomsday/client/include/world/map.h

@@ -117,6 +117,9 @@ class Map
      */
 #ifdef __CLIENT__
     static int const MAX_BIAS_SOURCES = 8 * 32; // Hard limit due to change tracking.
+
+    /// Maximum number of generators per map.
+    static int const MAX_GENERATORS = 512;
 #endif
 
     /*

doomsday/client/src/render/rend_particle.cpp

@@ -35,7 +35,6 @@
 #include "BspLeaf"
 #include "Line"
 #include "Plane"
-#include "world/generators.h" // Generators::GENERATORS_MAX
 #include "world/map.h"
 
 #include "render/rend_main.h"
@@ -44,7 +43,7 @@
 using namespace de;
 
 // Point + custom textures.
-#define NUM_TEX_NAMES           (MAX_PTC_TEXTURES)
+#define NUM_TEX_NAMES (MAX_PTC_TEXTURES)
 
 struct porder_t
 {
@@ -54,16 +53,16 @@ struct porder_t
 };
 
 DGLuint pointTex, ptctexname[MAX_PTC_TEXTURES];
-int particleNearLimit = 0;
+int particleNearLimit;
 float particleDiffuse = 4;
 
 static size_t numParts;
 static dd_bool hasPoints, hasLines, hasModels, hasNoBlend, hasBlend;
 static dd_bool hasPointTexs[NUM_TEX_NAMES];
-static byte visibleGenerators[Generators::GENERATORS_MAX];
+static byte visibleGenerators[Map::MAX_GENERATORS];
 
-static size_t orderSize = 0;
-static porder_t *order = NULL;
+static size_t orderSize;
+static porder_t *order;
 
 void Rend_ParticleRegister()
 {