From 1ab18dcff48867fb46ed58382e57308c4d903f0a Mon Sep 17 00:00:00 2001 From: Fabian Greffrath Date: Tue, 28 Jan 2025 13:35:20 +0100 Subject: [PATCH] prevent G_ReadOptions() overriding netgame settings (#2163) * prevent G_ReadOptions() overriding netgame settings * reorder commands Co-Authored-By: Roman Fomin --------- Co-authored-by: Roman Fomin --- src/d_net.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/d_net.c b/src/d_net.c index bcd55b62..12a5d660 100644 --- a/src/d_net.c +++ b/src/d_net.c @@ -98,18 +98,6 @@ static void LoadGameSettings(net_gamesettings_t *settings) { unsigned int i; - deathmatch = settings->deathmatch; - startepisode = settings->episode; - startmap = settings->map; - startskill = settings->skill; - startloadgame = settings->loadgame; - lowres_turn = settings->lowres_turn; - nomonsters = settings->nomonsters; - fastparm = settings->fast_monsters; - respawnparm = settings->respawn_monsters; - timelimit = settings->timelimit; - consoleplayer = settings->consoleplayer; - if (lowres_turn) { I_Printf(VB_WARNING, "NOTE: Turning resolution is reduced; this is probably " @@ -141,6 +129,18 @@ static void LoadGameSettings(net_gamesettings_t *settings) { G_ReadOptions(settings->options); } + + deathmatch = settings->deathmatch; + startepisode = settings->episode; + startmap = settings->map; + startskill = settings->skill; + startloadgame = settings->loadgame; + lowres_turn = settings->lowres_turn; + nomonsters = settings->nomonsters; + fastparm = settings->fast_monsters; + respawnparm = settings->respawn_monsters; + timelimit = settings->timelimit; + consoleplayer = settings->consoleplayer; } // Save the game settings from global variables to the specified