fix some more crashes (on OS X only)

git-svn-id: svn://svn.icculus.org/netradiant/trunk@208 61c419a2-8eb2-4b30-bcec-8cead039b335

diff --git a/contrib/brushexport/export.cpp b/contrib/brushexport/export.cpp
index 6b680c9ed472ca1488a4096247cb9b05f4d435df..a83f7ebcbaf521efb22162c0bb9148f6192a5a42 100644 (file)
--- a/contrib/brushexport/export.cpp
+++ b/contrib/brushexport/export.cpp
@@ -149,7 +149,7 @@ void ExportData::GetShaderNameFromShaderPath(const char* path, std::string& name
                name = tmp.substr(last_slash + 1, tmp.length() - last_slash);
 
 #ifdef _DEBUG
-       globalOutputStream() << "Last: " << last_slash << " " << "length: " << (const unsigned int)tmp.length() << "Name: " << name.c_str() << "\n";
+       globalOutputStream() << "Last: " << (const unsigned int) last_slash << " " << "length: " << (const unsigned int)tmp.length() << "Name: " << name.c_str() << "\n";
 #endif
 }
 

diff --git a/radiant/commands.cpp b/radiant/commands.cpp
index f94f2a3304632844b731e6a23287e5c2ef3966ca..9e372bab3de96ade711960daf2616a53133d7603 100644 (file)
--- a/radiant/commands.cpp
+++ b/radiant/commands.cpp
@@ -212,7 +212,11 @@ void DoCommandListDlg()
  
             if(!m_commandList.failed())
             {
-              m_commandList << makeLeftJustified(name, 25) << " " << modifiers.c_str() << '\n';
+              int l = strlen(name);
+              m_commandList << name;
+              while(l++ < 25)
+               m_commandList << ' ';
+              m_commandList << modifiers.c_str() << '\n';
             }
           }
         } visitor(path.c_str(), store);

diff --git a/radiant/map.cpp b/radiant/map.cpp
index 91fb5c51d24d4f8cdf891abfb025ae149c02f423..3e5e8128ab1d978d03a0f25a80dd6dfc13946cde 100644 (file)
--- a/radiant/map.cpp
+++ b/radiant/map.cpp
@@ -1044,8 +1044,8 @@ void Map_LoadFile (const char *filename)
   globalOutputStream() << "--- LoadMapFile ---\n";
   globalOutputStream() << g_map.m_name.c_str() << "\n";
   
-  globalOutputStream() << makeLeftJustified(Unsigned(g_brushCount.get()), 5) << " primitive\n";
-  globalOutputStream() << makeLeftJustified(Unsigned(g_entityCount.get()), 5) << " entities\n";
+  globalOutputStream() << Unsigned(g_brushCount.get()) << " primitive\n";
+  globalOutputStream() << Unsigned(g_entityCount.get()) << " entities\n";
 
   //GlobalEntityCreator().printStatistics();