Merge commit 'af4e2d29cfd3a54b44eb09e4289f3fa3f29412c9' into garux-merge

[xonotic/netradiant.git] / plugins / entity / angles.h

diff --git a/plugins/entity/angles.h b/plugins/entity/angles.h
index 1ace81ea605cf18417f2af48ffbea7022f75017a..e44c6fcfc14ed006308f7f0e0f833f17ecab58f0 100644 (file)
--- a/plugins/entity/angles.h
+++ b/plugins/entity/angles.h
@@ -97,12 +97,12 @@ inline Vector3 angles_rotated( const Vector3& angles, const Quaternion& rotation
 
 class AnglesKey
 {
-Callback m_anglesChanged;
+Callback<void()> m_anglesChanged;
 public:
 Vector3 m_angles;
 
 
-AnglesKey( const Callback& anglesChanged )
+AnglesKey( const Callback<void()>& anglesChanged )
        : m_anglesChanged( anglesChanged ), m_angles( ANGLESKEY_IDENTITY ){
 }
 
@@ -110,13 +110,13 @@ void angleChanged( const char* value ){
        read_angle( m_angles, value );
        m_anglesChanged();
 }
-typedef MemberCaller1<AnglesKey, const char*, &AnglesKey::angleChanged> AngleChangedCaller;
+typedef MemberCaller<AnglesKey, void(const char*), &AnglesKey::angleChanged> AngleChangedCaller;
 
 void anglesChanged( const char* value ){
        read_angles( m_angles, value );
        m_anglesChanged();
 }
-typedef MemberCaller1<AnglesKey, const char*, &AnglesKey::anglesChanged> AnglesChangedCaller;
+typedef MemberCaller<AnglesKey, void(const char*), &AnglesKey::anglesChanged> AnglesChangedCaller;
 
 void write( Entity* entity ) const {
        write_angles( m_angles, entity );