fix return reference to local variable added in c6252fe3fc
This commit is contained in:
parent
bf579cc278
commit
0b43b1744f
|
|
@ -125,23 +125,14 @@ bool g_stupidQuakeBug = false;
|
||||||
|
|
||||||
class ConnectEntities
|
class ConnectEntities
|
||||||
{
|
{
|
||||||
public:
|
|
||||||
Entity* m_e1;
|
Entity* m_e1;
|
||||||
Entity* m_e2;
|
Entity* m_e2;
|
||||||
int m_index;
|
public:
|
||||||
ConnectEntities( Entity* e1, Entity* e2, int index ) : m_e1( e1 ), m_e2( e2 ), m_index( index ){
|
const char* m_keyname;
|
||||||
}
|
ConnectEntities( Entity* e1, Entity* e2, int index ) : m_e1( e1 ), m_e2( e2 ), m_keyname( index == 1? "killtarget" : "target" ){
|
||||||
const char *keyname(){
|
|
||||||
if ( m_index <= 0 ) {
|
|
||||||
return "target";
|
|
||||||
}
|
|
||||||
if ( m_index == 1 ) {
|
|
||||||
return "killtarget";
|
|
||||||
}
|
|
||||||
return StringStream<16>( "target", m_index );
|
|
||||||
}
|
}
|
||||||
void connect( const char* name ){
|
void connect( const char* name ){
|
||||||
m_e1->setKeyValue( keyname(), name );
|
m_e1->setKeyValue( m_keyname, name );
|
||||||
m_e2->setKeyValue( "targetname", name );
|
m_e2->setKeyValue( "targetname", name );
|
||||||
}
|
}
|
||||||
typedef MemberCaller1<ConnectEntities, const char*, &ConnectEntities::connect> ConnectCaller;
|
typedef MemberCaller1<ConnectEntities, const char*, &ConnectEntities::connect> ConnectCaller;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user