diff --git a/polymer/build/src/config.c b/polymer/build/src/config.c index 572d762fd..b5e727d1f 100644 --- a/polymer/build/src/config.c +++ b/polymer/build/src/config.c @@ -176,7 +176,7 @@ if (readconfig(fp, "renderer", val, VL) > 0) { i = Batoi(val); setrendermode(i); if (readconfig(fp, "key2dzoomin", val, VL) > 0) keys[16] = Bstrtol(val, NULL, 16); if (readconfig(fp, "key2dzoomout", val, VL) > 0) keys[17] = Bstrtol(val, NULL, 16); if (readconfig(fp, "keychat", val, VL) > 0) keys[18] = Bstrtol(val, NULL, 16); - if (readconfig(fp, "keyconsole", val, VL) > 0) { keys[19] = Bstrtol(val, NULL, 16); OSD_CaptureKey(keys[19]); } +if (readconfig(fp, "keyconsole", val, VL) > 0) { keys[19] = Bstrtol(val, NULL, 16); OSD_CaptureKey(keys[19]); } if (readconfig(fp, "mousesensitivity", val, VL) > 0) msens = Bstrtod(val, NULL); diff --git a/polymer/build/src/mmulti.c b/polymer/build/src/mmulti.c index 8da630d4a..894d9a6b6 100644 --- a/polymer/build/src/mmulti.c +++ b/polymer/build/src/mmulti.c @@ -362,7 +362,7 @@ if ((danetmode == 255) && (daindex)) { numplayers = 2; danetmode = 0; } //an IP for(i=0;i= 2)) || (numplayers == 2)); + // return (((!danetmode) && (numplayers >= 2)) || (numplayers == 2)); return (numplayers >= 2); } @@ -664,12 +664,12 @@ const char *getexternaladdress(void) WSADATA ws; if (WSAStartup(0x101,&ws) == SOCKET_ERROR) { - initprintf("winsock error %d\n",errno); + initprintf("mmulti: Winsock error in getexternaladdress() (%d)\n",errno); return(0); } #endif if ((h=gethostbyname(host)) == NULL) { - initprintf("gethostbyname error %d\n",h_errno); + initprintf("mmulti: gethostbyname() error in getexternaladdress() (%d)\n",h_errno); return(0); } @@ -681,22 +681,22 @@ const char *getexternaladdress(void) sockfd = socket(PF_INET, SOCK_STREAM, 0); if(sockfd == SOCKET_ERROR) { - initprintf("socket error %d\n",errno); + initprintf("mmulti: socket() error in getexternaladdress() (%d)\n",errno); return(0); } if(connect(sockfd, (struct sockaddr *)&dest_addr, sizeof(struct sockaddr)) == SOCKET_ERROR) { - initprintf("connect error %d\n",errno); + initprintf("mmulti: connect() error in getexternaladdress() (%d)\n",errno); return(0); } bytes_sent = send(sockfd, req, strlen(req), 0); if(bytes_sent == SOCKET_ERROR) { - initprintf("bytes_sent error %d\n",errno); + initprintf("mmulti: send() error in getexternaladdress() (%d)\n",errno); return(0); } -// initprintf("sent %d bytes\n",bytes_sent); + // initprintf("sent %d bytes\n",bytes_sent); recv(sockfd, (char *)&tempbuf, sizeof(tempbuf), 0); closesocket(sockfd); diff --git a/polymer/build/src/winlayer.c b/polymer/build/src/winlayer.c index 1022cda04..90578d368 100644 --- a/polymer/build/src/winlayer.c +++ b/polymer/build/src/winlayer.c @@ -1621,8 +1621,8 @@ static void ProcessInputDevices(void) if (result == DI_OK) { // process the mouse events -// mousex=0; -// mousey=0; + // mousex=0; + // mousey=0; for (i=0; i= 0 && (numplayers < 2 || MusicToggle)) + if(MusicDevice >= 0 && (numplayers < 2 || MusicToggle)) + { + MusicToggle = 1-MusicToggle; + if( MusicToggle == 0 ) MUSIC_Pause(); + else { - MusicToggle = 1-MusicToggle; - if( MusicToggle == 0 ) MUSIC_Pause(); - else - { - if(ud.recstat != 2 && ps[myconnectindex].gm&MODE_GAME) - playmusic(&music_fn[0][music_select][0]); - else playmusic(&env_music_fn[0][0]); + if(ud.recstat != 2 && ps[myconnectindex].gm&MODE_GAME) + playmusic(&music_fn[0][music_select][0]); + else playmusic(&env_music_fn[0][0]); - MUSIC_Continue(); - } + MUSIC_Continue(); } + } onbar = 0; break;