TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

addition for last commit - forgot to fix when resolving merge-conflict

Browse source
This commit is contained in:
zicodxx 2012-04-15 16:05:59 +02:00
parent a92f7497a3
commit c308f45544
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.txt
View file

@ -7,6 +7,7 @@ editor/meddraw.c: Set edge_list_size to Num_segments*12 to avoid crashes in the
2d/gpixel.c, arch/ogl/gr.c, editor/meddraw.c, include/ogl_init.h, main/multi.c, main/render.c: Clicking on mine elements in the editor now works in ogl
main/bmread.c, main/game.c, main/gameseq.c, main/gameseq.h, main/gauges.c, main/kmatrix.c, main/multi.c, main/multi.h, main/net_udp.c, main/state.c: Further Multiplayer cleanup: moved gobal variable resets from multi_new_game() to proper function calls; added pnum variable to init_player_stats_game() and init_player_stats_new_ship() so these can be set for each player when starting match; added multi_new_level() calls when setting up game as well when trying to join game; cleaned multi_reset_stuff() from variable resetting that happen in general game code; when being dumped from game, made sure no packets are sent during messagebox dispaly; replaced MAX_NUM_NET_PLAYERS by MAX_PLAYERS as it's the same definition
misc/hmp.c: Addition for last change in hmp_reset(): execute midiOutShortMsg() even if midiOutPrepareHeader() fails as not related to SysEx part
main/titles.c: made -notitles suppress show_order_form() as well
20120414
--------

2
main/multi.c
View file

@ -835,7 +835,7 @@ void multi_send_data_direct(unsigned char *buf, int len, int pnum, int priority)
Error("multi_send_data_direct: Packet type %i length: %i, expected: %i\n", buf[0], len, message_length[(int)buf[0]]);
if (buf[0] > MULTI_MAX_TYPE)
Error("multi_send_data_direct: Illegal packet type %i\n", buf[0]);
if (pnum < 0 || pnum > MAX_NUM_NET_PLAYERS)
if (pnum < 0 || pnum > MAX_PLAYERS)
Error("multi_send_data_direct: Illegal player num: %i\n", pnum);
switch (multi_protocol)