Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv9616/src
Modified Files:
data.c newwin.c parsemeta.c
Log Message:
Fixed typo in metaserver2 name
Changed the key to pick ATT from X to *, to be consistent with the key for refitting
More spacing fixes
Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- newwin.c 2 Jun 2006 21:06:55 -0000 1.35
+++ newwin.c 6 Jun 2006 05:14:14 -0000 1.36
@@ -1506,7 +1506,7 @@
case 'g':
*s_type = SGALAXY;
break;
- case 'X':
+ case '*':
*s_type = ATT;
break;
case 'a':
Index: parsemeta.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/parsemeta.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- parsemeta.c 2 Jun 2006 21:06:55 -0000 1.10
+++ parsemeta.c 6 Jun 2006 05:14:14 -0000 1.11
@@ -746,7 +746,7 @@
int sock;
char buf[80];
struct servers *slist;
- int x;
+ int x;
#ifdef DEBUG
LineToConsole ("Got meta window action, y=%d\n", data->y);
@@ -761,12 +761,12 @@
LineToConsole ("Attempting to observe on port %d...\n", xtrekPort);
}
serverName = strdup (slist->address);
- serverType = metaGetServerType (slist->typeflag);
+ serverType = metaGetServerType (slist->typeflag);
#ifdef RSA
useRsa = slist->RSA_client;
#endif
- slist->status = statusConnecting;
+ slist->status = statusConnecting;
metarefresh (data->y);
LineToConsole ("Checking %s on port %d\n", serverName, xtrekPort);
@@ -785,25 +785,25 @@
}
}
else if (data->y == num_servers) /* Quit selected */
- {
- W_WriteText (metaWin, 0, num_servers, W_Yellow, "Quit", 4, 0);
- metadone();
+ {
+ W_WriteText (metaWin, 0, num_servers, W_Yellow, "Quit", 4, 0);
+ metadone();
terminate (0);
- }
- else if (data->y == num_servers + 1) /* Help Line */
- {
- x = data->x / W_Textwidth;
- if (x >= 0 && x <= 19) /* Netrek Home Page */
- ShellExecute (NULL, "open", "http://www.netrek.org", NULL, NULL, SW_SHOWNORMAL);
- else if (x >= 21 && x <= 35) /* Newbie Manual */
- ShellExecute (NULL, "open", "http://genocide.netrek.org/beginner/newbie.php", NULL, NULL, SW_SHOWNORMAL);
- else if (x >= 37 && x <= 43) /* Forums */
- ShellExecute (NULL, "open", "http://groups-beta.google.com/group/rec.games.netrek", NULL, NULL, SW_SHOWNORMAL);
- else if (x >= 45 && x <= 49) /* FAQ */
- ShellExecute (NULL, "open", "http://www.inl.org/netrek/netrekFAQ.html", NULL, NULL, SW_SHOWNORMAL);
- else if (x >= 51 && x <= 67) /* Dogfight Manual */
- ShellExecute (NULL, "open", "http://cha.rlie.nl/dfmanual/", NULL, NULL, SW_SHOWNORMAL);
- }
+ }
+ else if (data->y == num_servers + 1) /* Help Line */
+ {
+ x = data->x / W_Textwidth;
+ if (x >= 0 && x <= 19) /* Netrek Home Page */
+ ShellExecute (NULL, "open", "http://www.netrek.org", NULL, NULL, SW_SHOWNORMAL);
+ else if (x >= 21 && x <= 35) /* Newbie Manual */
+ ShellExecute (NULL, "open", "http://genocide.netrek.org/beginner/newbie.php", NULL, NULL, SW_SHOWNORMAL);
+ else if (x >= 37 && x <= 43) /* Forums */
+ ShellExecute (NULL, "open", "http://groups-beta.google.com/group/rec.games.netrek", NULL, NULL, SW_SHOWNORMAL);
+ else if (x >= 45 && x <= 49) /* FAQ */
+ ShellExecute (NULL, "open", "http://www.inl.org/netrek/netrekFAQ.html", NULL, NULL, SW_SHOWNORMAL);
+ else if (x >= 51 && x <= 67) /* Dogfight Manual */
+ ShellExecute (NULL, "open", "http://cha.rlie.nl/dfmanual/", NULL, NULL, SW_SHOWNORMAL);
+ }
}
@@ -1057,7 +1057,7 @@
readfds.fd_count = 1;
readfds.fd_array[0] = s;
Timeout.tv_sec = waittime / 1000;
- Timeout.tv_usec = waittime % 1000;
+ Timeout.tv_usec = waittime % 1000;
nRet=(select(1, &readfds, NULL, NULL, &Timeout));
return nRet;
@@ -1072,7 +1072,7 @@
int elapsed; // waiting time for icmp replies between loops
DWORD timestamp; // begin timestamp just before echo reply waiting loop
u_short nSeq; // icmp ping request sequence number
- DWORD rtt; // round trip time in milliseconds
+ DWORD rtt; // round trip time in milliseconds
SOCKET rawSocket;
struct sockaddr_in saDest;
struct sockaddr_in saSrc;
@@ -1095,7 +1095,7 @@
return (unsigned long) -1;
}
- while (!thread_ready)
+ while (!thread_ready)
{
// Flood ping all netrek servers at once
for (i = 0; i < num_servers; ++i)
Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- data.c 2 Jun 2006 21:06:55 -0000 1.31
+++ data.c 6 Jun 2006 05:14:14 -0000 1.32
@@ -227,7 +227,7 @@
#ifdef META
/* Metaservers list */
char *metaServer[] = {"metaserver.us.netrek.org",
- "metaserever2.us.netrek.org"};
+ "metaserver2.us.netrek.org"};
int metaPort = 3521;
char *metaCache = NULL;
#ifdef METAPING