Fixed|World|Map Renderer: Benign compiler warnings about unused/unini…

…tialized variables
skyjake · Jun 14, 2013 · 1d7966f · 1d7966f
1 parent 1cef65a
commit 1d7966f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/doomsday/client/src/render/rend_main.cpp b/doomsday/client/src/render/rend_main.cpp
@@ -1366,8 +1366,7 @@ static uint projectSurfaceShadows(Surface &surface, float glowStrength,
 static void writeWallSection(Segment &segment, int section,
     bool *retWroteOpaque = 0, coord_t *retBottomZ = 0, coord_t *retTopZ = 0)
 {
-    BspLeaf *bspLeaf = currentBspLeaf;
-    DENG_ASSERT(!isNullLeaf(bspLeaf));
+    DENG_ASSERT(!isNullLeaf(currentBspLeaf));
     DENG_ASSERT(segment.isFlagged(Segment::FacingFront));
     DENG_ASSERT(segment.hasLineSide() && segment.lineSide().hasSections());
 

diff --git a/doomsday/client/src/world/p_objlink.cpp b/doomsday/client/src/world/p_objlink.cpp
@@ -455,9 +455,9 @@ static void findContacts(objlink_t *link)
 {
     DENG_ASSERT(link != 0);
 
-    coord_t radius;
-    pvec3d_t origin;
-    BspLeaf *bspLeaf;
+    coord_t radius = 0;
+    pvec3d_t origin = 0;
+    BspLeaf *bspLeaf = 0;
 
     switch(link->type)
     {
@@ -582,7 +582,7 @@ static void linkObjlinkInBlockmap(objlinkblockmap_t &obm, objlink_t &link, Gridm
 void R_LinkObjs()
 {
     uint block[2];
-    pvec3d_t origin;
+    pvec3d_t origin = 0;
 
 BEGIN_PROF( PROF_OBJLINK_LINK );
 
@@ -598,6 +598,10 @@ BEGIN_PROF( PROF_OBJLINK_LINK );
 #endif
         case OT_MOBJ:
             origin = ((mobj_t *)link->obj)->origin; break;
+
+        case NUM_OBJ_TYPES:
+            DENG_ASSERT(false);
+            break;
         }
 
         objlinkblockmap_t &obm = chooseObjlinkBlockmap(link->type);

diff --git a/doomsday/client/src/world/world.cpp b/doomsday/client/src/world/world.cpp
@@ -73,7 +73,7 @@ boolean ddMapSetup;
 timespan_t ddMapTime;
 
 // Should we be caching successfully loaded maps?
-static byte mapCache = true; // cvar
+//static byte mapCache = true; // cvar
 
 static char const *mapCacheDir = "mapcache/";