From 6d211635e6128f7b719e99262d1ea50c7a472742 Mon Sep 17 00:00:00 2001 From: Roman Fomin Date: Fri, 3 Dec 2021 16:29:39 +0700 Subject: [PATCH] netgame: fix connection to Chocolate Doom server --- Source/d_net.c | 2 +- Source/net_structrw.c | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Source/d_net.c b/Source/d_net.c index 5b6052fa..21aeed3a 100644 --- a/Source/d_net.c +++ b/Source/d_net.c @@ -126,7 +126,7 @@ static void LoadGameSettings(net_gamesettings_t *settings) } demo_version = settings->demo_version; - if (demo_version == 0) + if (demo_version == 0 || demo_version == 109) { // TODO: refactor comp options demo_version = 109; diff --git a/Source/net_structrw.c b/Source/net_structrw.c index 359f0386..e8cf5d3f 100644 --- a/Source/net_structrw.c +++ b/Source/net_structrw.c @@ -131,19 +131,15 @@ boolean NET_ReadSettings(net_packet_t *packet, net_gamesettings_t *settings) } } - if (!NET_ReadInt8(packet, (unsigned int *) &settings->demo_version)) - { - return false; - } + NET_ReadInt8(packet, (unsigned int *) &settings->demo_version); for (i = 0; i < NET_GAME_OPTION_SIZE; ++i) { unsigned int value; - if (!NET_ReadInt8(packet, &value)) + if (NET_ReadInt8(packet, &value)) { - return false; + settings->options[i] = (byte) value; } - settings->options[i] = (byte) value; } return true;