Merge commit '7d7436ec3dd43cbdb04ad41f0a2c92a905f26807' into garux-merge

[xonotic/netradiant.git] / plugins / md3model / model.h

diff --git a/plugins/md3model/model.h b/plugins/md3model/model.h
index ee76006494978a9b94b6d24376619ba0820fe527..5f03d73495b83dd278527ca4fa5cf45f77089d4b 100644 (file)
--- a/plugins/md3model/model.h
+++ b/plugins/md3model/model.h
@@ -22,6 +22,7 @@
 #if !defined( INCLUDED_MODEL_H )
 #define INCLUDED_MODEL_H
 
+#include "globaldefs.h"
 #include "cullable.h"
 #include "renderable.h"
 #include "selectable.h"
@@ -180,7 +181,7 @@ void render( RenderStateFlags state ) const {
        glEnd();
 #endif
 
-#if defined( _DEBUG )
+#if GDEF_DEBUG
        glBegin( GL_LINES );
 
        for ( VertexBuffer<ArbitraryMeshVertex>::const_iterator i = m_vertices.begin(); i != m_vertices.end(); ++i )
@@ -235,7 +236,7 @@ surfaces_t m_surfaces;
 
 AABB m_aabb_local;
 public:
-Callback m_lightsChanged;
+Callback<void()> m_lightsChanged;
 
 ~Model(){
        for ( surfaces_t::iterator i = m_surfaces.begin(); i != m_surfaces.end(); ++i )
@@ -345,7 +346,7 @@ Cullable& get( NullType<Cullable>){
 void lightsChanged(){
        m_lightList->lightsChanged();
 }
-typedef MemberCaller<ModelInstance, &ModelInstance::lightsChanged> LightsChangedCaller;
+typedef MemberCaller<ModelInstance, void(), &ModelInstance::lightsChanged> LightsChangedCaller;
 
 void constructRemaps(){
        ModelSkin* skin = NodeTypeCast<ModelSkin>::cast( path().parent() );
@@ -396,9 +397,9 @@ ModelInstance( const scene::Path& path, scene::Instance* parent, Model& model )
 ~ModelInstance(){
        destroyRemaps();
 
-       Instance::setTransformChangedCallback( Callback() );
+       Instance::setTransformChangedCallback( Callback<void()>() );
 
-       m_model.m_lightsChanged = Callback();
+       m_model.m_lightsChanged = Callback<void()>();
        GlobalShaderCache().detach( *this );
 }