zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-24 10:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Whitespace

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@139 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-05-02 03:51:06 +00:00
parent 0709b4ba67
commit 19a7ae03e6
5 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/build/src/config.c
View file

@ -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, "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, "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, "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); if (readconfig(fp, "mousesensitivity", val, VL) > 0) msens = Bstrtod(val, NULL);

14
polymer/build/src/mmulti.c
View file

@ -362,7 +362,7 @@ if ((danetmode == 255) && (daindex)) { numplayers = 2; danetmode = 0; } //an IP
for(i=0;i<numplayers-1;i++) connectpoint2[i] = i+1; for(i=0;i<numplayers-1;i++) connectpoint2[i] = i+1;
connectpoint2[numplayers-1] = -1; connectpoint2[numplayers-1] = -1;
// return (((!danetmode) && (numplayers >= 2)) || (numplayers == 2)); // return (((!danetmode) && (numplayers >= 2)) || (numplayers == 2));
return (numplayers >= 2); return (numplayers >= 2);
} }
@ -664,12 +664,12 @@ const char *getexternaladdress(void)
WSADATA ws; WSADATA ws;
if (WSAStartup(0x101,&ws) == SOCKET_ERROR) { if (WSAStartup(0x101,&ws) == SOCKET_ERROR) {
initprintf("winsock error %d\n",errno); initprintf("mmulti: Winsock error in getexternaladdress() (%d)\n",errno);
return(0); return(0);
} }
#endif #endif
if ((h=gethostbyname(host)) == NULL) { if ((h=gethostbyname(host)) == NULL) {
initprintf("gethostbyname error %d\n",h_errno); initprintf("mmulti: gethostbyname() error in getexternaladdress() (%d)\n",h_errno);
return(0); return(0);
} }
@ -681,22 +681,22 @@ const char *getexternaladdress(void)
sockfd = socket(PF_INET, SOCK_STREAM, 0); sockfd = socket(PF_INET, SOCK_STREAM, 0);
if(sockfd == SOCKET_ERROR) { if(sockfd == SOCKET_ERROR) {
initprintf("socket error %d\n",errno); initprintf("mmulti: socket() error in getexternaladdress() (%d)\n",errno);
return(0); return(0);
} }
if(connect(sockfd, (struct sockaddr *)&dest_addr, sizeof(struct sockaddr)) == SOCKET_ERROR) { 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); return(0);
} }
bytes_sent = send(sockfd, req, strlen(req), 0); bytes_sent = send(sockfd, req, strlen(req), 0);
if(bytes_sent == SOCKET_ERROR) { if(bytes_sent == SOCKET_ERROR) {
initprintf("bytes_sent error %d\n",errno); initprintf("mmulti: send() error in getexternaladdress() (%d)\n",errno);
return(0); return(0);
} }
// initprintf("sent %d bytes\n",bytes_sent); // initprintf("sent %d bytes\n",bytes_sent);
recv(sockfd, (char *)&tempbuf, sizeof(tempbuf), 0); recv(sockfd, (char *)&tempbuf, sizeof(tempbuf), 0);
closesocket(sockfd); closesocket(sockfd);

4
polymer/build/src/winlayer.c
View file

@ -1621,8 +1621,8 @@ static void ProcessInputDevices(void)
if (result == DI_OK) { if (result == DI_OK) {
// process the mouse events // process the mouse events
// mousex=0; // mousex=0;
// mousey=0; // mousey=0;
for (i=0; i<dwElements; i++) { for (i=0; i<dwElements; i++) {
switch (didod[i].dwOfs) { switch (didod[i].dwOfs) {
case DIMOFS_BUTTON0: case DIMOFS_BUTTON0:

4
polymer/eduke32/source/game.c
View file

@ -7670,7 +7670,6 @@ void checkcommandline(int argc,char **argv)
if(j != netparamcount) if(j != netparamcount)
netparam[j] = rancid_local_port_string; netparam[j] = rancid_local_port_string;
} }
// initprintf("ip: %s\n",rancid_ip_strings[MAXPLAYERS]);
} }
i++; i++;
continue; continue;
@ -8394,6 +8393,9 @@ void Startup(void)
for(i=0;i<MAXPLAYERS;i++) playerreadyflag[i] = 0; for(i=0;i<MAXPLAYERS;i++) playerreadyflag[i] = 0;
if(rancid_ip_strings[MAXPLAYERS])
initprintf("net: Using %s as sort IP\n",rancid_ip_strings[MAXPLAYERS]);
//initmultiplayers(netparamcount,netparam, 0,0,0); //initmultiplayers(netparamcount,netparam, 0,0,0);
if (initmultiplayersparms(netparamcount,netparam)) { if (initmultiplayersparms(netparamcount,netparam)) {
initprintf("Waiting for players...\n"); initprintf("Waiting for players...\n");

20
polymer/eduke32/source/menus.c
View file

@ -3476,19 +3476,19 @@ cheat_for_port_credits:
} }
break; break;
case 1: case 1:
if(MusicDevice >= 0 && (numplayers < 2 || MusicToggle)) if(MusicDevice >= 0 && (numplayers < 2 || MusicToggle))
{
MusicToggle = 1-MusicToggle;
if( MusicToggle == 0 ) MUSIC_Pause();
else
{ {
MusicToggle = 1-MusicToggle; if(ud.recstat != 2 && ps[myconnectindex].gm&MODE_GAME)
if( MusicToggle == 0 ) MUSIC_Pause(); playmusic(&music_fn[0][music_select][0]);
else 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; onbar = 0;
break; break;