Merge commit '87d5b6efe557ee73b613c030cca2374dd23bc1be' into garux-merge

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

diff --git a/plugins/entity/namedentity.h b/plugins/entity/namedentity.h
index 29170d9e795bd112c78e4bc6d461191f6f90c8b5..8e604ec58341af392d07719eaebb5f5c09463e63 100644 (file)
--- a/plugins/entity/namedentity.h
+++ b/plugins/entity/namedentity.h
@@ -26,6 +26,7 @@
 #include "eclasslib.h"
 #include "generic/callback.h"
 #include "nameable.h"
+#include "entity.h" //g_showTargetNames
 
 #include <set>
 
@@ -62,6 +63,9 @@ const char* name() const {
        }
        return m_name.c_str();
 }
+const char* classname() const {
+       return m_entity.getEntityClass().name();
+}
 void attach( const NameCallback& callback ){
        m_changed.insert( callback );
 }
@@ -79,7 +83,7 @@ void identifierChanged( const char* value ){
        }
        m_name = value;
 }
-typedef MemberCaller1<NamedEntity, const char*, &NamedEntity::identifierChanged> IdentifierChangedCaller;
+typedef MemberCaller<NamedEntity, void(const char*), &NamedEntity::identifierChanged> IdentifierChangedCaller;
 };
 
 class RenderableNamedEntity : public OpenGLRenderable
@@ -92,7 +96,7 @@ RenderableNamedEntity( const NamedEntity& named, const Vector3& position )
 }
 void render( RenderStateFlags state ) const {
        glRasterPos3fv( vector3_to_array( m_position ) );
-       GlobalOpenGL().drawString( m_named.name() );
+       GlobalOpenGL().drawString( g_showTargetNames ? m_named.name() : m_named.classname() );
 }
 };