From bfad1aac593f59a67b9b810f5674c33414db46b5 Mon Sep 17 00:00:00 2001 From: zicodxx Date: Fri, 20 May 2011 16:15:04 +0200 Subject: [PATCH] Making D1X- and D2X-Rebirth more similar in behavior of which player limit is needed to start team-based game in both RELEASE and DEBUG builds --- CHANGELOG.txt | 1 + main/net_udp.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index ecc2b505d..7d75b9827 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -5,6 +5,7 @@ D1X-Rebirth Changelog INSTALL.txt, RELEASE-NOTES.txt: Updated docs and fixed some typos main/net_ipx.c, main/net_udp.c: Rearranged code to check for netgame-closed flag and refuse-players flag so they are updated correctly if another part of the code changes the menu item without activating it main/automap.c, main/menu.c, main/playsave.c, main/playsave.h: Made Automap Free Flight controls an optional feature which can be set in MISC OPTIONS; Fixed possible path string issue in plyr_read_stats_v() and fixed compiler warning regarding set but unused variable +main/net_udp.c: Making D1X- and D2X-Rebirth more similar in behavior of which player limit is needed to start team-based game in both RELEASE and DEBUG builds 20110519 -------- diff --git a/main/net_udp.c b/main/net_udp.c index f3f900614..ac2cbce81 100644 --- a/main/net_udp.c +++ b/main/net_udp.c @@ -3440,7 +3440,9 @@ menu: if ((opt-2-opt_team_b < 2) || (opt_team_b == 1)) { nm_messagebox(NULL, 1, TXT_OK, TXT_TEAM_MUST_ONE); + #ifdef RELEASE goto menu; + #endif } Netgame.team_vector = team_vector;