X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=plugins%2Fentity%2Fgeneric.cpp;h=b80ae8300a1bb14cabb0fd0af830dee6b30afd93;hb=18d60f90d7603cb420150739251cf98519c57406;hp=bfdd22e89e158a595bd4f721ee78d8cb6da0c3ea;hpb=f6b4543bd54926411cb71a776bc5b37eea846c4f;p=xonotic%2Fnetradiant.git

diff --git a/plugins/entity/generic.cpp b/plugins/entity/generic.cpp
index bfdd22e8..b80ae830 100644
--- a/plugins/entity/generic.cpp
+++ b/plugins/entity/generic.cpp
@@ -97,8 +97,8 @@ RenderableSolidAABB m_aabb_solid;
 RenderableWireframeAABB m_aabb_wire;
 RenderableNamedEntity m_renderName;
 
-Callback m_transformChanged;
-Callback m_evaluateTransform;
+Callback<void()> m_transformChanged;
+Callback<void()> m_evaluateTransform;
 
 void construct(){
 	read_aabb( m_aabb_local, m_entity.getEntityClass() );
@@ -120,20 +120,20 @@ void updateTransform(){
 	matrix4_translate_by_vec3( m_transform.localToParent(), m_origin );
 	m_transformChanged();
 }
-typedef MemberCaller<GenericEntity, &GenericEntity::updateTransform> UpdateTransformCaller;
+typedef MemberCaller<GenericEntity, void(), &GenericEntity::updateTransform> UpdateTransformCaller;
 void originChanged(){
 	m_origin = m_originKey.m_origin;
 	updateTransform();
 }
-typedef MemberCaller<GenericEntity, &GenericEntity::originChanged> OriginChangedCaller;
+typedef MemberCaller<GenericEntity, void(), &GenericEntity::originChanged> OriginChangedCaller;
 void anglesChanged(){
 	m_angles = m_anglesKey.m_angles;
 	updateTransform();
 }
-typedef MemberCaller<GenericEntity, &GenericEntity::anglesChanged> AnglesChangedCaller;
+typedef MemberCaller<GenericEntity, void(), &GenericEntity::anglesChanged> AnglesChangedCaller;
 public:
 
-GenericEntity( EntityClass* eclass, scene::Node& node, const Callback& transformChanged, const Callback& evaluateTransform ) :
+GenericEntity( EntityClass* eclass, scene::Node& node, const Callback<void()>& transformChanged, const Callback<void()>& evaluateTransform ) :
 	m_entity( eclass ),
 	m_originKey( OriginChangedCaller( *this ) ),
 	m_origin( ORIGINKEY_IDENTITY ),
@@ -150,7 +150,7 @@ GenericEntity( EntityClass* eclass, scene::Node& node, const Callback& transform
 	m_evaluateTransform( evaluateTransform ){
 	construct();
 }
-GenericEntity( const GenericEntity& other, scene::Node& node, const Callback& transformChanged, const Callback& evaluateTransform ) :
+GenericEntity( const GenericEntity& other, scene::Node& node, const Callback<void()>& transformChanged, const Callback<void()>& evaluateTransform ) :
 	m_entity( other.m_entity ),
 	m_originKey( OriginChangedCaller( *this ) ),
 	m_origin( ORIGINKEY_IDENTITY ),
@@ -264,7 +264,7 @@ void transformChanged(){
 	m_evaluateTransform();
 	updateTransform();
 }
-typedef MemberCaller<GenericEntity, &GenericEntity::transformChanged> TransformChangedCaller;
+typedef MemberCaller<GenericEntity, void(), &GenericEntity::transformChanged> TransformChangedCaller;
 };
 
 class GenericEntityInstance :
@@ -342,7 +342,7 @@ void applyTransform(){
 	evaluateTransform();
 	m_contained.freezeTransform();
 }
-typedef MemberCaller<GenericEntityInstance, &GenericEntityInstance::applyTransform> ApplyTransformCaller;
+typedef MemberCaller<GenericEntityInstance, void(), &GenericEntityInstance::applyTransform> ApplyTransformCaller;
 };
 
 class GenericEntityNode :