Merge branch 'restart' into 'master'

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

diff --git a/radiant/points.cpp b/radiant/points.cpp
index 342c5be0fc09ed999fb3b4437574499d1831734b..c4a56492ee86ed73f0c2093d7f73ecfb08e91442 100644 (file)
--- a/radiant/points.cpp
+++ b/radiant/points.cpp
@@ -330,9 +330,9 @@ void Pointfile_Construct(){
 
        GlobalShaderCache().attachRenderable( s_pointfile );
 
-       GlobalCommands_insert( "TogglePointfile", FreeCaller<Pointfile_Toggle>() );
-       GlobalCommands_insert( "NextLeakSpot", FreeCaller<Pointfile_Next>(), Accelerator( 'K', (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
-       GlobalCommands_insert( "PrevLeakSpot", FreeCaller<Pointfile_Prev>(), Accelerator( 'L', (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
+       GlobalCommands_insert( "TogglePointfile", makeCallbackF(Pointfile_Toggle) );
+       GlobalCommands_insert( "NextLeakSpot", makeCallbackF(Pointfile_Next), Accelerator( 'K', (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
+       GlobalCommands_insert( "PrevLeakSpot", makeCallbackF(Pointfile_Prev), Accelerator( 'L', (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
 }
 
 void Pointfile_Destroy(){