Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv31025/src
Modified Files:
cowmain.c defaults.c parsemeta.c
Log Message:
Added documentation on metaType option.
Made default metaserver the UDP metaserver.
Clarified logic behind sizing metaserver window.
Index: cowmain.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/cowmain.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- cowmain.c 27 Nov 2006 07:08:41 -0000 1.16
+++ cowmain.c 29 Nov 2006 12:06:34 -0000 1.17
@@ -499,7 +499,7 @@
int metaType; /* which meta to use, UDP, cache, or TCP */
/* can be set in xtrekrc with metaType: */
/* 1 == UDP, 2 == cache, TCP, 3 = TCP, cache */
-#define DEFAULT_METATYPE 3 /* want TCP, cache as the default */
+#define DEFAULT_METATYPE 1 /* want UDP as the default */
#endif
/******************************************************************************/
Index: parsemeta.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/parsemeta.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- parsemeta.c 29 Nov 2006 10:34:09 -0000 1.14
+++ parsemeta.c 29 Nov 2006 12:06:35 -0000 1.15
@@ -1147,18 +1147,20 @@
LoadMetasCache();
if (num_servers == 0) ReadMetasRecv(-1);
if (num_servers != 0) {
- metaHeight = num_servers + 6;
+ /* Allocate 4 spots for header/refresh/quit/link, and 3 slots for additional servers */
+ metaHeight = num_servers + 7;
} else {
LineToConsole("Warning: no response from metaservers, are you firewalled?\n"
" (no reply to probe on UDP port %d)\n", metaPort);
- metaHeight = num_servers + 11;
+ /* Allocate 4 spots for header/refresh/quit/link, and 8 server slots */
+ metaHeight = num_servers + 12;
}
return;
break;
case 2:
if (ReadFromCache() || ReadFromMeta())
{
- /* add 3 for header and quit button and link bar */
+ /* Allocate 3 spots for header/quit/link */
metaHeight = num_servers + 3;
return;
}
@@ -1167,7 +1169,7 @@
case 3:
if (ReadFromMeta() || ReadFromCache())
{
- /* add 2 for header and quit button and link bar */
+ /* Allocate 3 spots for header/quit/link */
metaHeight = num_servers + 3;
return;
}
Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- defaults.c 10 Aug 2006 10:00:52 -0000 1.30
+++ defaults.c 29 Nov 2006 12:06:34 -0000 1.31
@@ -258,6 +258,15 @@
NULL
}
},
+ {"metaType", &metaType, RC_INT,
+ {
+ "What type of metaserver to use",
+ "1 - UDP multiple metaservers",
+ "2 - cache, then TCP metaserver",
+ "3 - TCP metaserver, then cache",
+ NULL
+ }
+ },
#ifdef METAPING
{"metaPing", &metaPing, RC_BOOL,
{