Fixed: mapdata-c++ > master branch merge errors

skyjake · Apr 25, 2013 · f576e29 · f576e29
1 parent 598e065
commit f576e29
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/doomsday/client/include/map/bspleaf.h b/doomsday/client/include/map/bspleaf.h
@@ -225,7 +225,7 @@ class BspLeaf : public de::MapElement
      *
      * @see fanBase()
      */
-    inline uint BspLeaf::numFanVertices() const
+    inline uint numFanVertices() const
     {
         // Are we to use one of the half-edge vertexes as the fan base?
         return hedgeCount() + (fanBase()? 0 : 2);

diff --git a/doomsday/client/include/map/sector.h b/doomsday/client/include/map/sector.h
@@ -390,7 +390,7 @@ class Sector : public de::MapElement,
      *
      * @see setLightColor(), setLightRed(), setLightGreen(), setLightBlue()
      */
-    inline void setLightColorComponent(int component, float newStrength);
+    void setLightColorComponent(int component, float newStrength);
 
     /**
      * Change the strength of the red component of the ambient light color in

diff --git a/doomsday/client/include/map/surface.h b/doomsday/client/include/map/surface.h
@@ -365,7 +365,7 @@ class Surface : public de::MapElement
      *
      * @see setTintColor(), setTintRed(), setTintGreen(), setTintBlue()
      */
-    inline void setTintColorComponent(int component, float newStrength);
+    void setTintColorComponent(int component, float newStrength);
 
     /**
      * Change the strength of the red component of the tint color for the surface.

diff --git a/doomsday/client/src/map/hedge.cpp b/doomsday/client/src/map/hedge.cpp
@@ -527,7 +527,7 @@ void WallDivs_AssertInRange(walldivs_t *wd, coord_t low, coord_t hi)
         DENG2_ASSERT(node->height >= low && node->height <= hi);
     }
 #else
-    DENG2_UNUSED3(wd, ow, hi);
+    DENG2_UNUSED3(wd, low, hi);
 #endif
 }