diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 6e73959e4..85c79a962 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,9 @@ D1X-Rebirth Changelog +20080414 +-------- +main/network.c: fix network bug where it got confused about the Function_mode and gave up + 20080413 -------- include/args.h, main/newmenu.c, main/collide.h, main/network.c, main/multi.c, main/multi.h, main/inferno.c, main/menu.c, main/menu.h, main/playsave.c, main/playsave.h, main/object.c, main/hud.c, main/weapon.c, main/hostage.c, main/newdemo.c, main/config.c, main/gameseq.c, main/endlevel.c, main/ai.h, main/game.c, main/gauges.c, main/game.h, main/kconfig.c, main/kconfig.h, misc/args.c, d1x.ini, arch/ogl/ogl.c, arch/ogl/gr.c, arch/sdl/joy.c, arch/include/joy.h: Added structure for values saved in PLR/PLX files; Added most common command-line options to options menu diff --git a/main/network.c b/main/network.c index 564241502..88394ae5f 100644 --- a/main/network.c +++ b/main/network.c @@ -2143,8 +2143,11 @@ void network_read_sync_packet( ubyte * data, int d1x ) #ifdef WORDS_BIGENDIAN netgame_info tmp_info; - receive_d1x_netgame_packet((ubyte *)sp, &tmp_info); - sp = &tmp_info; + if (data) + { + receive_d1x_netgame_packet((ubyte *)sp, &tmp_info); + sp = &tmp_info; + } #endif // This function is now called by all people entering the netgame.