diff --git a/src/d_net.c b/src/d_net.c index 5978fef5d..3799ecd13 100644 --- a/src/d_net.c +++ b/src/d_net.c @@ -192,9 +192,9 @@ typedef struct UINT8 nextacknum; UINT8 flags; -} node_t; +} netnode_t; -static node_t nodes[MAXNETNODES]; +static netnode_t nodes[MAXNETNODES]; #define NODETIMEOUT 14 // return <0 if a < b (mod 256) @@ -218,7 +218,7 @@ FUNCMATH static INT32 cmpack(UINT8 a, UINT8 b) */ static boolean GetFreeAcknum(UINT8 *freeack, boolean lowtimer) { - node_t *node = &nodes[doomcom->remotenode]; + netnode_t *node = &nodes[doomcom->remotenode]; INT32 i, numfreeslot = 0; if (cmpack((UINT8)((node->remotefirstack + MAXACKTOSEND) % 256), node->nextacknum) < 0) @@ -325,7 +325,7 @@ static boolean Processackpak(void) { INT32 i; boolean goodpacket = true; - node_t *node = &nodes[doomcom->remotenode]; + netnode_t *node = &nodes[doomcom->remotenode]; // Received an ack return, so remove the ack in the list if (netbuffer->ackreturn && cmpack(node->remotefirstack, netbuffer->ackreturn) < 0) @@ -492,7 +492,7 @@ void Net_AckTicker(void) for (i = 0; i < MAXACKPACKETS; i++) { const INT32 nodei = ackpak[i].destinationnode; - node_t *node = &nodes[nodei]; + netnode_t *node = &nodes[nodei]; if (ackpak[i].acknum && ackpak[i].senttime + NODETIMEOUT < I_GetTime()) { if (ackpak[i].resentnum > 20 && (node->flags & NF_CLOSE)) @@ -612,7 +612,7 @@ void Net_WaitAllAckReceived(UINT32 timeout) } } -static void InitNode(node_t *node) +static void InitNode(netnode_t *node) { node->acktosend_head = node->acktosend_tail = 0; node->firstacktosend = 0; diff --git a/src/r_defs.h b/src/r_defs.h index 1d3fa65d8..2c1c67dc0 100644 --- a/src/r_defs.h +++ b/src/r_defs.h @@ -709,7 +709,7 @@ struct seg_s // // BSP node. // -typedef struct +struct node_t { // Partition line. fixed_t x, y; @@ -720,7 +720,7 @@ typedef struct // If NF_SUBSECTOR its a subsector. UINT16 children[2]; -} node_t; +}; #if defined(_MSC_VER) #pragma pack(1) diff --git a/src/typedef.h b/src/typedef.h index bbfaafad4..4bdddd18d 100644 --- a/src/typedef.h +++ b/src/typedef.h @@ -303,7 +303,7 @@ TYPEDEF (cliprange_t); TYPEDEF (vertex_t); TYPEDEF (degenmobj_t); TYPEDEF (light_t); -//TYPEDEF (node_t); +TYPEDEF (node_t); TYPEDEF (post_t); TYPEDEF (drawseg_t); TYPEDEF (rotsprite_t);