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

Initialise 'playing' to 0 for UDP kmatrix, making sure player progresses to next level; always return 1 when starting to join a UDP game so it doesn't immediately return to the main menu

Browse source
This commit is contained in:
kreatordxx 2010-03-27 02:54:41 +00:00
parent 1bdfcc70f1
commit 68a1458abd
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.txt
View file

@ -1,5 +1,9 @@
D1X-Rebirth Changelog
20100327
--------
main/kmatrix.c, main/net_udp.c: Initialise 'playing' to 0 for UDP kmatrix, making sure player progresses to next level; always return 1 when starting to join a UDP game so it doesn't immediately return to the main menu
20100326
--------
main/endlevel.c, main/gameseq.c, main/mission.c, main/mission.h, main/titles.c, main/titles.h: In Endlevel sequence, re-align big explosion to draw in front of exit model, relative to viewer; Re-organized tex files for Briefings and Endings and created more general code to play them; Re-aligned Dravis' head

2
main/kmatrix.c
View file

@ -538,6 +538,8 @@ int kmatrix_handler(window *wind, d_event *event, kmatrix_screen *km)
if (km->network)
multi_do_protocol_frame(0, 1);
km->playing = 0;
// Check if all connected players are also looking at this screen ...
for (i = 0; i < MAX_PLAYERS; i++)
if (Players[i].connected)

10
main/net_udp.c
View file

@ -374,13 +374,9 @@ int net_udp_game_connect(manual_join *mj)
}
}
if (net_udp_do_join_game())
{
mj->connecting = 0;
return 1; // Success!
}
return 0;
mj->connecting = 0;
return net_udp_do_join_game();
}
static char *connecting_txt = "Connecting...";