Revert partially (auto) "reformat code! now the code is only ugly on the *inside*"

[xonotic/netradiant.git] / contrib / brushexport / export.cpp

diff --git a/contrib/brushexport/export.cpp b/contrib/brushexport/export.cpp
index 4a1e2d4c2d2566796aeebc2033c5b9eefd511c89..cbc4abf608fc26dae7fbb56e20c5b3df6bee9829 100644 (file)
--- a/contrib/brushexport/export.cpp
+++ b/contrib/brushexport/export.cpp
@@ -1,4 +1,5 @@
 #include "export.h"
+#include "globaldefs.h"
 #include "debugging/debugging.h"
 #include "ibrush.h"
 #include "iscenegraph.h"
@@ -12,7 +13,7 @@
 #include "../../radiant/brush.h"
 
 // for limNames
-#define MAX_MATERIAL_NAME 20
+const int MAX_MATERIAL_NAME = 20;
 
 /*
     Abstract baseclass for modelexporters
@@ -126,7 +127,7 @@ void ExportData::AddBrushFace( Face& f ){
        // add face to current group
        current->faces.push_back( &f );
 
-#ifdef _DEBUG
+#if GDEF_DEBUG
        globalOutputStream() << "Added Face to group " << current->name.c_str() << "\n";
 #endif
 }
@@ -143,7 +144,7 @@ void ExportData::GetShaderNameFromShaderPath( const char* path, std::string& nam
                name = tmp.substr( last_slash + 1, tmp.length() - last_slash );
        }
 
-#ifdef _DEBUG
+#if GDEF_DEBUG
        globalOutputStream() << "Last: " << (const unsigned int) last_slash << " " << "length: " << (const unsigned int)tmp.length() << "Name: " << name.c_str() << "\n";
 #endif
 }