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

[xonotic/netradiant.git] / contrib / bobtoolz / DBrush.cpp

diff --git a/contrib/bobtoolz/DBrush.cpp b/contrib/bobtoolz/DBrush.cpp
index 7c24cd0fa4ff3f25be30322c26f2257612ba3468..a0d97699c3411818f17ecf69c4cc0d822a78a263 100644 (file)
--- a/contrib/bobtoolz/DBrush.cpp
+++ b/contrib/bobtoolz/DBrush.cpp
@@ -22,8 +22,9 @@
 //////////////////////////////////////////////////////////////////////
 
 #include "DBrush.h"
+#include "globaldefs.h"
 
-#ifdef WIN32
+#if GDEF_COMPILER_MSVC
 #pragma warning(disable : 4786)
 #endif
 
@@ -68,7 +69,7 @@ DBrush::~DBrush(){
 //////////////////////////////////////////////////////////////////////
 
 DPlane* DBrush::AddFace( const vec3_t va, const vec3_t vb, const vec3_t vc, const _QERFaceData* texData ){
-#ifdef _DEBUG
+#if GDEF_DEBUG
 //     Sys_Printf("(%f %f %f) (%f %f %f) (%f %f %f)\n", va[0], va[1], va[2], vb[0], vb[1], vb[2], vc[0], vc[1], vc[2]);
 #endif
        bBoundsBuilt = false;
@@ -117,7 +118,7 @@ int DBrush::BuildPoints(){
                }
        }
 
-#ifdef _DEBUG
+#if GDEF_DEBUG
 //     Sys_Printf("%i points on brush\n", pointList.size());
 #endif
 
@@ -127,12 +128,12 @@ int DBrush::BuildPoints(){
 void DBrush_addFace( DBrush& brush, const _QERFaceData& faceData ){
        brush.AddFace( vector3_to_array( faceData.m_p0 ), vector3_to_array( faceData.m_p1 ), vector3_to_array( faceData.m_p2 ), 0 );
 }
-typedef ReferenceCaller1<DBrush, const _QERFaceData&, DBrush_addFace> DBrushAddFaceCaller;
+typedef ReferenceCaller<DBrush, void(const _QERFaceData&), DBrush_addFace> DBrushAddFaceCaller;
 
 void DBrush_addFaceTextured( DBrush& brush, const _QERFaceData& faceData ){
        brush.AddFace( vector3_to_array( faceData.m_p0 ), vector3_to_array( faceData.m_p1 ), vector3_to_array( faceData.m_p2 ), &faceData );
 }
-typedef ReferenceCaller1<DBrush, const _QERFaceData&, DBrush_addFaceTextured> DBrushAddFaceTexturedCaller;
+typedef ReferenceCaller<DBrush, void(const _QERFaceData&), DBrush_addFaceTextured> DBrushAddFaceTexturedCaller;
 
 void DBrush::LoadFromBrush( scene::Instance& brush, bool textured ){
        ClearFaces();
@@ -708,7 +709,7 @@ void DBrush::SaveToFile( FILE *pFile ){
                                 ( *pp )->texInfo.m_texdef.scale[0], ( *pp )->texInfo.m_texdef.scale[0],
                                 ( *pp )->texInfo.m_texdef.rotate );
 
-               fprintf( pFile, buffer );
+               fprintf( pFile, "%s", buffer );
        }
 
        fprintf( pFile, "}\n" );