Fixes for rev1148: Was too hasty with calling net_udp_close; Fixing typo in WSACleanup()
This commit is contained in:
parent
44d6e096d6
commit
d87c4ab289
|
@ -5,6 +5,7 @@ D1X-Rebirth Changelog
|
||||||
main/net_udp.c: Fixed Compiler-warning on Windows
|
main/net_udp.c: Fixed Compiler-warning on Windows
|
||||||
main/net_ipx.c, main/net_udp.c: Implemented Winsock functions for UDP which I totally forgot about; Now when leaving game in any way, close sockets and Winsock stuff
|
main/net_ipx.c, main/net_udp.c: Implemented Winsock functions for UDP which I totally forgot about; Now when leaving game in any way, close sockets and Winsock stuff
|
||||||
main/gameseq.c, main/multi.c: Since time is not suspended between levels in Multiplayer, call reset_time after level change. Apply this in Singleplayer, too since it should always be safe - and appropriate - to reset timer_value soon as a new level begins
|
main/gameseq.c, main/multi.c: Since time is not suspended between levels in Multiplayer, call reset_time after level change. Apply this in Singleplayer, too since it should always be safe - and appropriate - to reset timer_value soon as a new level begins
|
||||||
|
main/net_udp.c: Fixes for rev1148: Was too hasty with calling net_udp_close; Fixing typo in WSACleanup()
|
||||||
|
|
||||||
20100701
|
20100701
|
||||||
--------
|
--------
|
||||||
|
|
|
@ -389,7 +389,7 @@ static int time_paused=0;
|
||||||
void stop_time()
|
void stop_time()
|
||||||
{
|
{
|
||||||
if (time_paused==0) {
|
if (time_paused==0) {
|
||||||
fix time;printf("STOP\n");
|
fix time;
|
||||||
time = timer_get_fixed_seconds();
|
time = timer_get_fixed_seconds();
|
||||||
last_timer_value = time - last_timer_value;
|
last_timer_value = time - last_timer_value;
|
||||||
if (last_timer_value < 0) {
|
if (last_timer_value < 0) {
|
||||||
|
@ -404,7 +404,7 @@ void start_time()
|
||||||
time_paused--;
|
time_paused--;
|
||||||
Assert(time_paused >= 0);
|
Assert(time_paused >= 0);
|
||||||
if (time_paused==0) {
|
if (time_paused==0) {
|
||||||
fix time;printf("START\n");
|
fix time;
|
||||||
time = timer_get_fixed_seconds();
|
time = timer_get_fixed_seconds();
|
||||||
last_timer_value = time - last_timer_value;
|
last_timer_value = time - last_timer_value;
|
||||||
}
|
}
|
||||||
|
@ -453,7 +453,7 @@ void FixedStepCalc()
|
||||||
}
|
}
|
||||||
|
|
||||||
void reset_time()
|
void reset_time()
|
||||||
{printf("RESET\n");
|
{
|
||||||
last_timer_value = timer_get_fixed_seconds();
|
last_timer_value = timer_get_fixed_seconds();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -453,7 +453,6 @@ static int manual_join_game_handler(newmenu *menu, d_event *event, direct_join *
|
||||||
|
|
||||||
case EVENT_WINDOW_CLOSE:
|
case EVENT_WINDOW_CLOSE:
|
||||||
d_free(dj);
|
d_free(dj);
|
||||||
net_udp_close();
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
@ -467,7 +466,7 @@ void net_udp_manual_join_game()
|
||||||
{
|
{
|
||||||
direct_join *dj;
|
direct_join *dj;
|
||||||
newmenu_item m[7];
|
newmenu_item m[7];
|
||||||
int nitems = 0;
|
int nitems = 0, i = 0;
|
||||||
|
|
||||||
MALLOC(dj, direct_join, 1);
|
MALLOC(dj, direct_join, 1);
|
||||||
if (!dj)
|
if (!dj)
|
||||||
|
@ -501,7 +500,9 @@ void net_udp_manual_join_game()
|
||||||
m[nitems].type = NM_TYPE_INPUT; m[nitems].text=UDP_MyPort; m[nitems].text_len=5; nitems++;
|
m[nitems].type = NM_TYPE_INPUT; m[nitems].text=UDP_MyPort; m[nitems].text_len=5; nitems++;
|
||||||
m[nitems].type = NM_TYPE_TEXT; m[nitems].text=blank; nitems++; // for connecting_txt
|
m[nitems].type = NM_TYPE_TEXT; m[nitems].text=blank; nitems++; // for connecting_txt
|
||||||
|
|
||||||
newmenu_do1( NULL, "ENTER GAME ADDRESS", nitems, m, (int (*)(newmenu *, d_event *, void *))manual_join_game_handler, dj, 0 );
|
i = newmenu_do1( NULL, "ENTER GAME ADDRESS", nitems, m, (int (*)(newmenu *, d_event *, void *))manual_join_game_handler, dj, 0 );
|
||||||
|
if (i != -2)
|
||||||
|
net_udp_close();
|
||||||
}
|
}
|
||||||
|
|
||||||
static int NLPage = 0;
|
static int NLPage = 0;
|
||||||
|
@ -770,7 +771,7 @@ void net_udp_init()
|
||||||
WORD wVersionRequested;
|
WORD wVersionRequested;
|
||||||
WSADATA wsaData;
|
WSADATA wsaData;
|
||||||
wVersionRequested = MAKEWORD(2, 0);
|
wVersionRequested = MAKEWORD(2, 0);
|
||||||
WSACleanUp();
|
WSACleanup();
|
||||||
if (WSAStartup( wVersionRequested, &wsaData))
|
if (WSAStartup( wVersionRequested, &wsaData))
|
||||||
nm_messagebox( TXT_ERROR, 1, TXT_OK, "Cannot init Winsock!"); // no break here... game will fail at socket creation anyways...
|
nm_messagebox( TXT_ERROR, 1, TXT_OK, "Cannot init Winsock!"); // no break here... game will fail at socket creation anyways...
|
||||||
}
|
}
|
||||||
|
@ -805,7 +806,7 @@ void net_udp_init()
|
||||||
void net_udp_close()
|
void net_udp_close()
|
||||||
{
|
{
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
WSACleanUp();
|
WSACleanup();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if( UDP_Socket[0] != -1 )
|
if( UDP_Socket[0] != -1 )
|
||||||
|
|
Loading…
Reference in a new issue