diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 8c7684ed9..f2a40073c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -4,6 +4,7 @@ D1X-Rebirth Changelog -------- main/automap.c, main/gauges.c, main/gauges.h, main/kconfig.c, main/newmenu.c, main/newmenu.h: Fixed broken FlightSim indicator on Automap; Fixed Assert for using mouse buttons in kconfig (which can react to UP and DOWN states); Added scrolling support for menus flagged tiny_mode and all_text arch/ogl/gr.c, arch/sdl/gr.c, d1x.ini, include/args.h, main/inferno.c, misc/args.c: Simplified ogl version of gr.c in terms of SDL video flags and fullscreen toggle; Added command-line/INI option to remove borders from windowed program +main/multi.c: Fixed compiler warning related to generation of game_id for Coop Savegames 20110209 -------- diff --git a/main/multi.c b/main/multi.c index 06e5db32d..cc07d2b89 100644 --- a/main/multi.c +++ b/main/multi.c @@ -3473,7 +3473,11 @@ void multi_initiate_save_game() game_id = ((fix)timer_query()); game_id ^= N_players<<4; for (i = 0; i < N_players; i++ ) - game_id ^= *(fix *)Players[i].callsign; + { + fix call2i; + memcpy(&call2i, Players[i].callsign, sizeof(fix)); + game_id ^= call2i; + } if ( game_id == 0 ) game_id = 1; // 0 is invalid