Merge branch 'NateEag-master-patch-12920' into 'master'

[xonotic/netradiant.git] / radiant / eclass_doom3.cpp

diff --git a/radiant/eclass_doom3.cpp b/radiant/eclass_doom3.cpp
index a358dccea4fcbdfc2b06065f6ca6bc864ba22c91..b6a5344037ef8b6038e51bc8ce2dcf2f30947f7c 100644 (file)
--- a/radiant/eclass_doom3.cpp
+++ b/radiant/eclass_doom3.cpp
@@ -84,7 +84,6 @@ inline void printParseError( const char* message ){
        globalErrorStream() << message;
 }
 
-//#define PARSE_RETURN_FALSE_IF_FAIL( expression ) if ( !( expression ) ) { printParseError( FILE_LINE "\nparse failed: " # expression "\n" ); return false; } else
 #define PARSE_RETURN_FALSE_IF_FAIL( expression ) do{ if ( !( expression ) ) { printParseError( FILE_LINE "\nparse failed: " # expression "\n" ); return false; } }while( 0 )
 
 bool EntityClassDoom3_parseToken( Tokeniser& tokeniser ){
@@ -503,7 +502,6 @@ static bool EntityClass_parse( EntityClass& entityClass, Tokeniser& tokeniser ){
                else
                {
                        CopiedString tmp( key );
-                       //ASSERT_MESSAGE( !string_equal_n( key, "editor_", 7 ), "unsupported editor key: " << makeQuoted( key ) );
                        if ( string_equal_n( key, "editor_", 7 ) ) {
                                globalErrorStream() << "unsupported editor key " << makeQuoted( key ) ;
                        }
@@ -691,7 +689,7 @@ EntityClassDoom3() : m_unrealised( 2 ){
 void realise(){
        if ( --m_unrealised == 0 ) {
                globalOutputStream() << "searching vfs directory " << makeQuoted( "def" ) << " for *.def\n";
-               GlobalFileSystem().forEachFile( "def/", "def", FreeCaller1<const char*, EntityClassDoom3_loadFile>() );
+               GlobalFileSystem().forEachFile( "def/", "def", makeCallbackF(EntityClassDoom3_loadFile) );
 
                {
                        for ( Models::iterator i = g_models.begin(); i != g_models.end(); ++i )