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
This commit is contained in:
parent
1bdfcc70f1
commit
68a1458abd
|
@ -1,5 +1,9 @@
|
||||||
D1X-Rebirth Changelog
|
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
|
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
|
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
|
||||||
|
|
|
@ -538,6 +538,8 @@ int kmatrix_handler(window *wind, d_event *event, kmatrix_screen *km)
|
||||||
if (km->network)
|
if (km->network)
|
||||||
multi_do_protocol_frame(0, 1);
|
multi_do_protocol_frame(0, 1);
|
||||||
|
|
||||||
|
km->playing = 0;
|
||||||
|
|
||||||
// Check if all connected players are also looking at this screen ...
|
// Check if all connected players are also looking at this screen ...
|
||||||
for (i = 0; i < MAX_PLAYERS; i++)
|
for (i = 0; i < MAX_PLAYERS; i++)
|
||||||
if (Players[i].connected)
|
if (Players[i].connected)
|
||||||
|
|
|
@ -374,13 +374,9 @@ int net_udp_game_connect(manual_join *mj)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (net_udp_do_join_game())
|
mj->connecting = 0;
|
||||||
{
|
|
||||||
mj->connecting = 0;
|
return net_udp_do_join_game();
|
||||||
return 1; // Success!
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static char *connecting_txt = "Connecting...";
|
static char *connecting_txt = "Connecting...";
|
||||||
|
|
Loading…
Reference in a new issue