Server|Fixed: Unidentifiable sound emitters

skyjake · Apr 28, 2013 · 64ef163 · 64ef163
1 parent 75dc96d
commit 64ef163
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/doomsday/client/include/map/gamemap.h b/doomsday/client/include/map/gamemap.h
@@ -217,11 +217,22 @@ class GameMap
      */
     Surface *surfaceBySoundEmitter(ddmobj_base_t const &soundEmitter) const;
 
-//#ifdef __SERVER__
-    /// @return  @c true iff @a emitter is an identifiable map element.
+#if defined(__SERVER__) || defined(DENG_DEBUG)
+    /**
+     * Given an @a emitter origin, attempt to identify the map element
+     * to which it belongs.
+     *
+     * @param emitter  The sound emitter to be identified.
+     * @param sector   The identified sector if found is written here.
+     * @param poly     The identified polyobj if found is written here.
+     * @param plane    The identified plane if found is written here.
+     * @param surface  The identified line side surface if found is written here.
+     *
+     * @return  @c true iff @a emitter is an identifiable map element.
+     */
     bool identifySoundEmitter(ddmobj_base_t const &emitter, Sector **sector,
         Polyobj **poly, Plane **plane, Surface **surface) const;
-//#endif
+#endif
 
     /**
      * Provides access to the list of polyobjs for efficient traversal.

diff --git a/doomsday/client/src/map/gamemap.cpp b/doomsday/client/src/map/gamemap.cpp
@@ -759,7 +759,7 @@ Surface *GameMap::surfaceBySoundEmitter(ddmobj_base_t const &soundEmitter) const
     return 0; // Not found.
 }
 
-//#ifdef __SERVER__
+#if defined(__SERVER__) || defined(DENG_DEBUG)
 bool GameMap::identifySoundEmitter(ddmobj_base_t const &emitter, Sector **sector,
     Polyobj **poly, Plane **plane, Surface **surface) const
 {
@@ -790,7 +790,7 @@ bool GameMap::identifySoundEmitter(ddmobj_base_t const &emitter, Sector **sector
 
     return (*sector != 0 || *poly != 0|| *plane != 0|| *surface != 0);
 }
-//#endif // __SERVER__
+#endif // defined(__SERVER__) || defined(DENG_DEBUG)
 
 Polyobj *GameMap::polyobjByTag(int tag) const
 {

diff --git a/doomsday/client/src/map/r_world.cpp b/doomsday/client/src/map/r_world.cpp
@@ -735,7 +735,7 @@ static void updateAllMapSectors(GameMap &map)
     }
 }
 
-#if /*defined(__SERVER__) &&*/ defined(DENG_DEBUG)
+#ifdef DENG_DEBUG
 static void verifyAllSoundEmitters()
 {
     DENG_ASSERT(theMap != 0);
@@ -768,7 +768,7 @@ static void verifyAllSoundEmitters()
         DENG_ASSERT(theMap->identifySoundEmitter(side.topSoundEmitter(), &emSec, &emPoly, &emPln, &emSuf));
     }
 }
-#endif // defined(__SERVER__) && defined(DENG_DEBUG)
+#endif // DENG_DEBUG
 
 #undef R_SetupMap
 DENG_EXTERN_C void R_SetupMap(int mode, int flags)
@@ -843,7 +843,7 @@ DENG_EXTERN_C void R_SetupMap(int mode, int flags)
 
         // Map setup has been completed.
 
-#if /*defined(__SERVER__) &&*/ defined(DENG_DEBUG)
+#ifdef DENG_DEBUG
         // Ensure all sound emitters are identifiable.
         verifyAllSoundEmitters();
 #endif