From b07e9ac0fa2712abc0e9b1152a69340c36a805f6 Mon Sep 17 00:00:00 2001 From: Martin Schaffner Date: Sat, 30 Oct 2004 10:30:57 +0000 Subject: [PATCH] fix crash introduced with previous change --- ChangeLog | 4 ++++ main/network.c | 15 +++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index ab840954..afb5f1d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-10-30 Chris Taylor + + * main/network.c: fix crash introduced with previous change + 2004-10-24 Chris Taylor * main/gameseq.c, main/gameseq.h, main/mission.c, main/mission.h, diff --git a/main/network.c b/main/network.c index 99c53533..27a47422 100644 --- a/main/network.c +++ b/main/network.c @@ -1,4 +1,4 @@ -/* $Id: network.c,v 1.26 2004-10-23 19:39:35 schaffner Exp $ */ +/* $Id: network.c,v 1.27 2004-10-30 10:30:57 schaffner Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -23,7 +23,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: network.c,v 1.26 2004-10-23 19:39:35 schaffner Exp $"; +static char rcsid[] = "$Id: network.c,v 1.27 2004-10-30 10:30:57 schaffner Exp $"; #endif #define PATCH12 @@ -398,9 +398,6 @@ network_init(void) My_Seq.type = PID_REQUEST; memcpy(My_Seq.player.callsign, Players[Player_num].callsign, CALLSIGN_LEN+1); - if (is_D2_OEM) - Version_minor|=NETWORK_OEM; - My_Seq.player.version_major=Version_major; My_Seq.player.version_minor=Version_minor; My_Seq.player.rank=GetMyNetRanking(); @@ -3750,6 +3747,9 @@ network_start_game() if (i<0) return; + if (is_D2_OEM) + My_Seq.player.version_minor|=NETWORK_OEM; + N_players = 0; // LoadLevel(level); Old, no longer used. @@ -4452,7 +4452,10 @@ remenu: nm_messagebox(NULL, 1, TXT_OK, TXT_MISSION_NOT_FOUND); goto remenu; } - } + + if (is_D2_OEM) + My_Seq.player.version_minor|=NETWORK_OEM; + } #endif if (is_D2_OEM) -- 2.39.2