Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 30 additions & 1 deletion helpers_extended/source/InterfacePointers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,35 @@ namespace InterfacePointers
return iface_pointer;
}

template<class T>
static inline T *ResolveSymbolNoDereference(
SourceSDK::FactoryLoader &loader, const Symbol &symbol
)
{
if( symbol.type == Symbol::Type::None )
return nullptr;

return reinterpret_cast<T *>( symbol_finder.Resolve(
loader.GetModule( ), symbol.name.c_str( ), symbol.length
) );
}

template<class T>
static inline T *ResolveSymbolsNoDereference(
SourceSDK::FactoryLoader &loader, const std::vector<Symbol> &symbols
)
{
T *iface_pointer = nullptr;
for( const auto &symbol : symbols )
{
iface_pointer = ResolveSymbolNoDereference<T>( loader, symbol );
if( iface_pointer != nullptr )
break;
}

return iface_pointer;
}

namespace Internal
{
namespace Client
Expand Down Expand Up @@ -249,7 +278,7 @@ namespace InterfacePointers
if( iface_pointer == nullptr )
{
SourceSDK::FactoryLoader engine_loader( "engine" );
iface_pointer = ResolveSymbols<IServer>( engine_loader, Symbols::IServer );
iface_pointer = ResolveSymbolsNoDereference<IServer>( engine_loader, Symbols::IServer );
}

return iface_pointer;
Expand Down