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

[xonotic/netradiant.git] / include / ientity.h

diff --git a/include/ientity.h b/include/ientity.h
index c315b3abb2708a527c355ee7759efe44ef5d5363..797e00a196da857ddb4ff91facb436d7bdd3fdbe 100644 (file)
--- a/include/ientity.h
+++ b/include/ientity.h
@@ -29,11 +29,12 @@
 
 class EntityClass;
 
-typedef Callback1<const char*> KeyObserver;
+typedef Callback<void(const char*)> KeyObserver;
 
 class EntityKeyValue
 {
 public:
+virtual ~EntityKeyValue() = default;
 virtual const char* c_str() const = 0;
 virtual void assign( const char* other ) = 0;
 virtual void attach( const KeyObserver& observer ) = 0;
@@ -123,9 +124,11 @@ virtual void setCounter( Counter* counter ) = 0;
 virtual void connectEntities( const scene::Path& e1, const scene::Path& e2, int index ) = 0;
 
 virtual void setLightRadii( bool lightRadii ) = 0;
-virtual bool getLightRadii() = 0;
+virtual bool getLightRadii() const = 0;
 virtual void setShowNames( bool showNames ) = 0;
 virtual bool getShowNames() = 0;
+virtual void setShowTargetNames( bool showNames ) = 0;
+virtual bool getShowTargetNames() = 0;
 virtual void setShowAngles( bool showAngles ) = 0;
 virtual bool getShowAngles() = 0;