Updated AddressFromPlayerInfo to return str instead of const char*

Author: Ayuto

src/core/modules/players/players_helpers_wrap.cpp

@@ -100,7 +100,7 @@ void export_player_conversion_functions(scope _helpers)
 	EXPORT_CONVERSION_FUNCTION(CBaseEntity *, BaseEntity, IPlayerInfo *, PlayerInfo, return_by_value_policy());
 
 	// To Address conversions...
-	EXPORT_CONVERSION_FUNCTION(const char *, Address, IPlayerInfo *, PlayerInfo);
+	EXPORT_CONVERSION_FUNCTION(str, Address, IPlayerInfo *, PlayerInfo);
 
 	// To UniqueID conversions...
 	EXPORT_CONVERSION_FUNCTION(str, UniqueID, IPlayerInfo *, PlayerInfo);

src/core/utilities/conversions.h

@@ -270,9 +270,10 @@ CREATE_EXC_CONVERSION_FUNCTION(CPointer, Pointer, IPlayerInfo *, PlayerInfo);
 //-----------------------------------------------------------------------------
 // AddressFrom* declarations
 //-----------------------------------------------------------------------------
-bool AddressFromPlayerInfo( IPlayerInfo* pInfo, const char*& output );
+bool AddressFromPlayerInfo2( IPlayerInfo* pInfo, const char*& output );
+bool AddressFromPlayerInfo( IPlayerInfo* pInfo, str& output );
 
-CREATE_EXC_CONVERSION_FUNCTION(const char*, Address, IPlayerInfo *, PlayerInfo);
+CREATE_EXC_CONVERSION_FUNCTION(str, Address, IPlayerInfo *, PlayerInfo);
 
 
 //-----------------------------------------------------------------------------

src/core/utilities/conversions/address_from.cpp

@@ -34,7 +34,7 @@
 //-----------------------------------------------------------------------------
 // Returns an address from the given PlayerInfo instance.
 //-----------------------------------------------------------------------------
-bool AddressFromPlayerInfo( IPlayerInfo* pInfo, const char*& output )
+bool AddressFromPlayerInfo2( IPlayerInfo* pInfo, const char*& output )
 {
 	if (!pInfo)
 		return false;
@@ -55,4 +55,14 @@ bool AddressFromPlayerInfo( IPlayerInfo* pInfo, const char*& output )
 
 	output = netinfo->GetAddress();
 	return true;
-}
+}
+
+bool AddressFromPlayerInfo( IPlayerInfo* pInfo, str& output )
+{
+	const char* result = NULL;
+	if (!AddressFromPlayerInfo2(pInfo, result))
+		return false;
+
+	output = str(result);
+	return true;
+}

src/core/utilities/conversions/uniqueid_from.cpp

@@ -53,7 +53,7 @@ bool UniqueIDFromPlayerInfo2( IPlayerInfo* pInfo, char*& output )
 	}
 
 	const char* szAddr = NULL;
-	if (!AddressFromPlayerInfo(pInfo, szAddr))
+	if (!AddressFromPlayerInfo2(pInfo, szAddr))
 		return false;
 
 	sprintf(output, "LAN_%s", szAddr);