Add operator!= to callsign_t
This commit is contained in:
parent
737b66fb96
commit
6977a0eb74
|
@ -95,6 +95,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
||||||
|
|
||||||
struct callsign_t
|
struct callsign_t
|
||||||
{
|
{
|
||||||
|
operator const void *() const = delete;
|
||||||
typedef array<char, CALLSIGN_LEN + 1> array_t;
|
typedef array<char, CALLSIGN_LEN + 1> array_t;
|
||||||
array_t a;
|
array_t a;
|
||||||
static char lower_predicate(char c)
|
static char lower_predicate(char c)
|
||||||
|
@ -149,6 +150,10 @@ struct callsign_t
|
||||||
{
|
{
|
||||||
return a == r.a;
|
return a == r.a;
|
||||||
}
|
}
|
||||||
|
bool operator!=(const callsign_t &r) const
|
||||||
|
{
|
||||||
|
return !(*this == r);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
static_assert(sizeof(callsign_t) == CALLSIGN_LEN + 1, "callsign_t too big");
|
static_assert(sizeof(callsign_t) == CALLSIGN_LEN + 1, "callsign_t too big");
|
||||||
|
|
||||||
|
|
|
@ -1030,7 +1030,7 @@ static void net_udp_send_sequence_packet(UDP_sequence_packet seq, struct _sockad
|
||||||
len = 0;
|
len = 0;
|
||||||
memset(buf, 0, sizeof(buf));
|
memset(buf, 0, sizeof(buf));
|
||||||
buf[0] = seq.type; len++;
|
buf[0] = seq.type; len++;
|
||||||
memcpy(&buf[len], seq.player.callsign, CALLSIGN_LEN+1); len += CALLSIGN_LEN+1;
|
memcpy(&buf[len], seq.player.callsign.buffer(), CALLSIGN_LEN+1); len += CALLSIGN_LEN+1;
|
||||||
buf[len] = seq.player.connected; len++;
|
buf[len] = seq.player.connected; len++;
|
||||||
buf[len] = seq.player.rank; len++;
|
buf[len] = seq.player.rank; len++;
|
||||||
|
|
||||||
|
@ -2214,7 +2214,7 @@ void net_udp_send_game_info(struct _sockaddr sender_addr, ubyte info_upid)
|
||||||
your_index = 0xcc;
|
your_index = 0xcc;
|
||||||
for (int i = 0; i < Netgame.players.size(); i++)
|
for (int i = 0; i < Netgame.players.size(); i++)
|
||||||
{
|
{
|
||||||
memcpy(&buf[len], Netgame.players[i].callsign, CALLSIGN_LEN+1); len += CALLSIGN_LEN+1;
|
memcpy(&buf[len], Netgame.players[i].callsign.buffer(), CALLSIGN_LEN+1); len += CALLSIGN_LEN+1;
|
||||||
buf[len] = Netgame.players[i].connected; len++;
|
buf[len] = Netgame.players[i].connected; len++;
|
||||||
buf[len] = Netgame.players[i].rank; len++;
|
buf[len] = Netgame.players[i].rank; len++;
|
||||||
if (!memcmp((struct _sockaddr *)&sender_addr, (struct _sockaddr *)&Netgame.players[i].protocol.udp.addr, sizeof(struct _sockaddr)))
|
if (!memcmp((struct _sockaddr *)&sender_addr, (struct _sockaddr *)&Netgame.players[i].protocol.udp.addr, sizeof(struct _sockaddr)))
|
||||||
|
|
Loading…
Reference in a new issue