TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Unpack netgame_info

Browse source
This commit is contained in:
Kp 2014-06-26 02:27:16 +00:00
parent e99b496d72
commit 65fedf7b59
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/main/multi.h
View file

@ -52,6 +52,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
#include "pack.h"
#ifdef IPv6 #ifdef IPv6
#define _sockaddr sockaddr_in6 #define _sockaddr sockaddr_in6
@ -479,7 +480,7 @@ struct netplayer_info
* Contains protocol-specific data with designated prefixes and general game-related data. * Contains protocol-specific data with designated prefixes and general game-related data.
* Note that not all of these infos will be sent to clients - some are used and/or set locally, only. * Note that not all of these infos will be sent to clients - some are used and/or set locally, only.
*/ */
struct netgame_info struct netgame_info : prohibit_void_ptr<netgame_info>
{ {
#if defined(USE_UDP) #if defined(USE_UDP)
union union
@ -540,7 +541,7 @@ struct netgame_info
#ifdef USE_TRACKER #ifdef USE_TRACKER
ubyte Tracker; ubyte Tracker;
#endif #endif
} __pack__; };
#endif #endif
#endif /* _MULTI_H */ #endif /* _MULTI_H */

2
similar/main/net_udp.cpp
View file

@ -1071,7 +1071,7 @@ void net_udp_init()
if( UDP_Socket[1] != -1 ) if( UDP_Socket[1] != -1 )
udp_close_socket(1); udp_close_socket(1);
memset(&Netgame, 0, sizeof(netgame_info)); Netgame = {};
memset(&UDP_Seq, 0, sizeof(UDP_sequence_packet)); memset(&UDP_Seq, 0, sizeof(UDP_sequence_packet));
memset(&UDP_MData, 0, sizeof(UDP_mdata_info)); memset(&UDP_MData, 0, sizeof(UDP_mdata_info));
net_udp_noloss_init_mdata_queue(); net_udp_noloss_init_mdata_queue();