Cleanup: Log entries, levels, and domains (continued)

skyjake · Jan 13, 2014 · 7a339f5 · 7a339f5
1 parent 5e9ac8a
commit 7a339f5
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/doomsday/client/src/ui/b_main.cpp b/doomsday/client/src/ui/b_main.cpp
@@ -552,7 +552,7 @@ D_CMD(ClearBindings)
 
     for(i = 0; i < B_ContextCount(); ++i)
     {
-        LOG_INPUT_MSG("Clearing binding context '%s'") << B_ContextByPos(i)->name;
+        LOG_INPUT_VERBOSE("Clearing binding context '%s'") << B_ContextByPos(i)->name;
         B_ClearContext(B_ContextByPos(i));
     }
 

diff --git a/doomsday/client/src/world/worldsystem.cpp b/doomsday/client/src/world/worldsystem.cpp
@@ -159,7 +159,7 @@ class MapConversionReporter
             for(int i = 0; i < numToLog; ++i, ++it)
             {
                 if(i != 0) str += "\n";
-                str += String("Sector #%1 is unclosed near %2.")
+                str += String("Sector #%1 is unclosed near %2")
                            .arg(it->first).arg(it->second.asText());
             }
 

diff --git a/doomsday/libdeng2/include/de/c_wrapper.h b/doomsday/libdeng2/include/de/c_wrapper.h
@@ -74,7 +74,7 @@ DENG2_PUBLIC int CommandLine_IsMatchingAlias(char const *original, char const *o
 /*
  * LogBuffer
  */
-#define DE2_ESC(StringLiteral) "\x1b" StringLiteral
+#define DE2_ESC(StringLiteral) "\x1b" #StringLiteral
 
 // Log levels (see de::Log for description).
 typedef enum logentry_metadata_e

diff --git a/doomsday/libgui/src/canvas.cpp b/doomsday/libgui/src/canvas.cpp
@@ -108,10 +108,10 @@ DENG2_PIMPL(Canvas)
     {
         if(!self.isVisible()/* || mouseDisabled*/) return;
 
-        LOG_INPUT_MSG("Ungrabbing mouse (presently grabbed? %b)") << mouseGrabbed;
-
         if(mouseGrabbed)
         {
+            LOG_INPUT_VERBOSE("Ungrabbing mouse") << mouseGrabbed;
+
             // Tell the mouse driver that the mouse is untrapped.
             mouseGrabbed = false;
 

diff --git a/doomsday/plugins/common/src/d_netsv.c b/doomsday/plugins/common/src/d_netsv.c
@@ -732,7 +732,7 @@ void NetSv_SendGameState(int flags, int to)
     Uri* mapUri;
     AutoStr* str;
 
-    if(IS_CLIENT)
+    if(!IS_NETWORK_SERVER)
         return;
 
     DD_GameInfo(&gameInfo);

diff --git a/doomsday/plugins/common/src/g_game.c b/doomsday/plugins/common/src/g_game.c
@@ -1158,16 +1158,16 @@ static void printMapBanner(void)
 {
     const char* name = P_GetMapNiceName();
 
-    App_Log(DE2_LOG_MAP, "");
+    App_Log(DE2_LOG_MAP, DE2_ESC(R));
     if(name)
     {
         char buf[64];
 #if __JHEXEN__
-        dd_snprintf(buf, 64, "Map %u (%u): %s", P_GetMapWarpTrans(gameMap)+1, gameMap+1, name);
+        dd_snprintf(buf, 64, "Map %u (%u): " DE2_ESC(b) "%s", P_GetMapWarpTrans(gameMap)+1, gameMap+1, name);
 #else
-        dd_snprintf(buf, 64, "Map %u: %s", gameMap+1, name);
+        dd_snprintf(buf, 64, "Map %u: " DE2_ESC(b) "%s", gameMap+1, name);
 #endif
-        App_Log(DE2_LOG_MAP, "%s\n", buf);
+        App_Log(DE2_LOG_MAP, "%s", buf);
     }
 
 #if !__JHEXEN__
@@ -1181,7 +1181,7 @@ static void printMapBanner(void)
     if(!lauthor)
         lauthor = unknownAuthorStr;
 
-    App_Log(DE2_LOG_MAP, "Author: %s\n", lauthor);
+    App_Log(DE2_MAP_VERBOSE, "Author: %s", lauthor);
 
     Uri_Delete(uri);
     }

diff --git a/doomsday/plugins/wadmapconverter/src/wadmapconverter.cpp b/doomsday/plugins/wadmapconverter/src/wadmapconverter.cpp
@@ -139,7 +139,7 @@ static Id1Map::Format recognizeMapFormat(MapDataLumps &lumps)
         return Id1Map::UnknownFormat;
     }
 
-    LOG_MAP_MSG("Recognized a %s format map") << Id1Map::formatName(mapFormat);
+    LOG_MAP_MSG("Recognized %s format map") << Id1Map::formatName(mapFormat);
     return mapFormat;
 }