//////////////////////////////////////////////////////////////////////
#include "DBrush.h"
+#include "globaldefs.h"
-#ifdef WIN32
+#if GDEF_COMPILER_MSVC
#pragma warning(disable : 4786)
#endif
//////////////////////////////////////////////////////////////////////
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;
}
}
-#ifdef _DEBUG
+#if GDEF_DEBUG
// Sys_Printf("%i points on brush\n", pointList.size());
#endif
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();