From 0b43b1744f326160a720405c1d80be77c8cd6a7b Mon Sep 17 00:00:00 2001 From: Garux Date: Sun, 11 Feb 2024 22:21:09 +0600 Subject: [PATCH] fix return reference to local variable added in c6252fe3fce6b3054e6b80275bea0dc74e19bbd4 --- plugins/entity/entity.cpp | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/plugins/entity/entity.cpp b/plugins/entity/entity.cpp index c40d5602..e8c844bc 100644 --- a/plugins/entity/entity.cpp +++ b/plugins/entity/entity.cpp @@ -125,23 +125,14 @@ bool g_stupidQuakeBug = false; class ConnectEntities { -public: Entity* m_e1; Entity* m_e2; - int m_index; - ConnectEntities( Entity* e1, Entity* e2, int index ) : m_e1( e1 ), m_e2( e2 ), m_index( index ){ - } - const char *keyname(){ - if ( m_index <= 0 ) { - return "target"; - } - if ( m_index == 1 ) { - return "killtarget"; - } - return StringStream<16>( "target", m_index ); +public: + const char* m_keyname; + ConnectEntities( Entity* e1, Entity* e2, int index ) : m_e1( e1 ), m_e2( e2 ), m_keyname( index == 1? "killtarget" : "target" ){ } void connect( const char* name ){ - m_e1->setKeyValue( keyname(), name ); + m_e1->setKeyValue( m_keyname, name ); m_e2->setKeyValue( "targetname", name ); } typedef MemberCaller1 ConnectCaller;