Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-19 20:16:10 +08:00
Code Activity

Rename netadr_s to netadr_t (#227)

Browse Source 
Also remove SetIPAndPort from the tier0 export
This commit is contained in:
xen
2024-04-05 21:23:18 +02:00
committed by GitHub
parent 5d33fddc8e
commit 00644551e4
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/ihltv.h
View File

@ -18,7 +18,7 @@
class IServer; class IServer;
class IHLTVDirector; class IHLTVDirector;
class IGameEvent; class IGameEvent;
struct netadr_s; struct netadr_t;
class CGameInfo; class CGameInfo;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -38,7 +38,7 @@ public:
virtual void GetLocalStats( int &proxies, int &slots, int &specs ) = 0; virtual void GetLocalStats( int &proxies, int &slots, int &specs ) = 0;
virtual void GetGlobalStats( int &proxies, int &slots, int &specs ) = 0; virtual void GetGlobalStats( int &proxies, int &slots, int &specs ) = 0;
virtual const netadr_s *GetRelayAddress( void ) = 0; // returns relay address virtual const netadr_t *GetRelayAddress( void ) = 0; // returns relay address
virtual bool IsMasterProxy( void ) = 0; // true, if this is the HLTV master proxy virtual bool IsMasterProxy( void ) = 0; // true, if this is the HLTV master proxy
virtual bool IsDemoPlayback( void ) = 0; // true if this is a HLTV demo virtual bool IsDemoPlayback( void ) = 0; // true if this is a HLTV demo

2
public/ireplay.h
View File

@ -18,7 +18,7 @@
class IServer; class IServer;
class IReplayDirector; class IReplayDirector;
class IGameEvent; class IGameEvent;
struct netadr_s; struct netadr_t;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Interface the Replay module exposes to the engine // Interface the Replay module exposes to the engine

22
public/tier1/netadr.h
View File

@ -24,12 +24,12 @@ typedef enum
NA_IP, NA_IP,
} netadrtype_t; } netadrtype_t;
typedef struct netadr_s struct netadr_t
{ {
public: public:
netadr_s() { SetIP( 0 ); SetPort( 0 ); SetType( NA_IP ); } netadr_t() { SetIP( 0 ); SetPort( 0 ); SetType( NA_IP ); }
netadr_s( uint unIP, uint16 usPort ) { SetIP( unIP ); SetPort( usPort ); SetType( NA_IP ); } netadr_t( uint unIP, uint16 usPort ) { SetIP( unIP ); SetPort( usPort ); SetType( NA_IP ); }
netadr_s( const char *pch ) { SetFromString( pch ); } netadr_t( const char *pch ) { SetFromString( pch ); }
// invalids Address // invalids Address
DLL_CLASS_IMPORT void Clear(); DLL_CLASS_IMPORT void Clear();
@ -41,14 +41,14 @@ public:
DLL_CLASS_IMPORT void SetIP( uint8 b1, uint8 b2, uint8 b3, uint8 b4 ); DLL_CLASS_IMPORT void SetIP( uint8 b1, uint8 b2, uint8 b3, uint8 b4 );
// unIP is in host order (little-endian) // unIP is in host order (little-endian)
DLL_CLASS_IMPORT void SetIP( uint unIP ); DLL_CLASS_IMPORT void SetIP( uint unIP );
DLL_CLASS_IMPORT void SetIPAndPort( uint unIP, unsigned short usPort ) { SetIP( unIP ); SetPort( usPort ); } void SetIPAndPort( uint unIP, unsigned short usPort ) { SetIP( unIP ); SetPort( usPort ); }
// if bUseDNS is true then do a DNS lookup if needed // if bUseDNS is true then do a DNS lookup if needed
DLL_CLASS_IMPORT void SetFromString( const char *pch, bool bUseDNS = false ); DLL_CLASS_IMPORT void SetFromString( const char *pch, bool bUseDNS = false );
DLL_CLASS_IMPORT bool CompareAdr( const netadr_s &a, bool onlyBase = false ) const; DLL_CLASS_IMPORT bool CompareAdr( const netadr_t &a, bool onlyBase = false ) const;
DLL_CLASS_IMPORT bool CompareClassBAdr( const netadr_s &a ) const; DLL_CLASS_IMPORT bool CompareClassBAdr( const netadr_t &a ) const;
DLL_CLASS_IMPORT bool CompareClassCAdr( const netadr_s &a ) const; DLL_CLASS_IMPORT bool CompareClassCAdr( const netadr_t &a ) const;
DLL_CLASS_IMPORT netadrtype_t GetType() const; DLL_CLASS_IMPORT netadrtype_t GetType() const;
DLL_CLASS_IMPORT unsigned short GetPort() const; DLL_CLASS_IMPORT unsigned short GetPort() const;
@ -79,14 +79,14 @@ public:
DLL_CLASS_IMPORT bool Serialize( bf_write &writeBuf ); DLL_CLASS_IMPORT bool Serialize( bf_write &writeBuf );
DLL_CLASS_IMPORT bool Unserialize( bf_read &readBuf ); DLL_CLASS_IMPORT bool Unserialize( bf_read &readBuf );
bool operator==( const netadr_s &netadr ) const { return (CompareAdr( netadr )); } bool operator==( const netadr_t &netadr ) const { return (CompareAdr( netadr )); }
DLL_CLASS_IMPORT bool operator<( const netadr_s &netadr ) const; DLL_CLASS_IMPORT bool operator<( const netadr_t &netadr ) const;
public: // members are public to avoid to much changes public: // members are public to avoid to much changes
netadrtype_t type; netadrtype_t type;
unsigned char ip[4]; unsigned char ip[4];
unsigned short port; unsigned short port;
} netadr_t; };
#endif // NETADR_H #endif // NETADR_H