World|Debug: Include decoration and mapped plane info in Subsector de…

…scriptions
skyjake · Aug 8, 2016 · 023bc11 · 023bc11
1 parent 856ab20
commit 023bc11
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/doomsday/apps/client/include/client/clientsubsector.h b/doomsday/apps/client/include/client/clientsubsector.h
@@ -51,7 +51,7 @@ class ClientSubsector : public Subsector, public de::LightGrid::IBlockLightSourc
     /**
      * Returns a human-friendly, textual description of the subsector.
      */
-    de::String description() const;
+    de::String description() const override;
 
     /**
      * Returns @c true if @a height (up-axis offset) lies above/below the ceiling/floor

diff --git a/doomsday/apps/client/include/world/subsector.h b/doomsday/apps/client/include/world/subsector.h
@@ -64,7 +64,7 @@ class Subsector
     /**
      * Returns a humman-friendly, textual description of the subsector.
      */
-    de::String description() const;
+    virtual de::String description() const;
 
     /**
      * Returns the automatically generated, unique identifier of the subsector.

diff --git a/doomsday/apps/client/src/client/clientsubsector.cpp b/doomsday/apps/client/src/client/clientsubsector.cpp
@@ -1445,7 +1445,7 @@ String ClientSubsector::description() const
     }
 
     DENG2_DEBUG_ONLY(
-        desc.prepend(String("[ClientSubsector 0x%1]\n").arg(de::dintptr(this), 0, 16));
+        desc.prepend(String(_E(b) "ClientSubsector " _E(.) "[0x%1]\n").arg(de::dintptr(this), 0, 16));
     )
     return Subsector::description() + "\n" + desc;
 }

diff --git a/doomsday/apps/client/src/render/decoration.cpp b/doomsday/apps/client/src/render/decoration.cpp
@@ -52,7 +52,7 @@ String Decoration::description() const
                   .arg(String("[0x%1]").arg(de::dintptr(&surface()), 0, 16));
 
 #ifdef DENG2_DEBUG
-    desc.prepend(String("[Decoration 0x%1]\n").arg(de::dintptr(this), 0, 16));
+    desc.prepend(String(_E(b) "Decoration " _E(.) "[0x%1]\n").arg(de::dintptr(this), 0, 16));
 #endif
     return desc;
 }

diff --git a/doomsday/apps/client/src/render/lightdecoration.cpp b/doomsday/apps/client/src/render/lightdecoration.cpp
@@ -46,7 +46,7 @@ String LightDecoration::description() const
 {
     String desc;
 #ifdef DENG2_DEBUG
-    desc.prepend(String("[LightDecoration 0x%1]\n").arg(de::dintptr(this), 0, 16));
+    desc.prepend(String(_E(b) "LightDecoration " _E(.) "[0x%1]\n").arg(de::dintptr(this), 0, 16));
 #endif
     return Decoration::description() + "\n" + desc;
 }

diff --git a/doomsday/apps/client/src/world/base/sector.cpp b/doomsday/apps/client/src/world/base/sector.cpp
@@ -671,8 +671,8 @@ D_CMD(InspectSector)
         return false;
     }
 
-    LOG_SCR_MSG(_E(b) "Sector %i" _E(.) " [%p]")
-            << sec->indexInMap() << sec;
+    LOG_SCR_MSG(_E(b) "Sector %s" _E(.) " [%p]")
+            << Id(sec->indexInMap()).asText() << sec;
     LOG_SCR_MSG(    _E(l) "Bounds: "      _E(.)_E(i) "%s" _E(.)
                 " " _E(l) "Light Color: " _E(.)_E(i) "%s" _E(.)
                 " " _E(l) "Light Level: " _E(.)_E(i) "%f")

diff --git a/doomsday/apps/client/src/world/base/subsector.cpp b/doomsday/apps/client/src/world/base/subsector.cpp
@@ -91,7 +91,7 @@ String Subsector::description() const
                     .arg(Rectangled(bounds().min, bounds().max).asText());
 
     DENG2_DEBUG_ONLY(
-        desc.prepend(String("[Subsector 0x%1]\n").arg(de::dintptr(this), 0, 16));
+        desc.prepend(String(_E(b) "Subsector " _E(.) "[0x%1]\n").arg(de::dintptr(this), 0, 16));
     )
     return desc;
 }

diff --git a/doomsday/apps/client/src/world/base/surface.cpp b/doomsday/apps/client/src/world/base/surface.cpp
@@ -172,7 +172,7 @@ String Surface::description() const
                   .arg(color().asText());
 
     DENG2_DEBUG_ONLY(
-        desc.prepend(String("[Surface 0x%1]\n").arg(de::dintptr(this), 0, 16));
+        desc.prepend(String(_E(b) "Surface " _E(.) "[0x%1]\n").arg(de::dintptr(this), 0, 16));
     )
     return desc;
 }