From modemhero at users.sourceforge.net Tue Nov 7 19:44:47 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 08 Nov 2006 01:44:47 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.67, 1.68 clientr.suo, 1.43, 1.44 Message-ID: Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv12191 Modified Files: NetrekXP to do list.C clientr.suo Log Message: Reporting cambot playback bugs. Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.67 retrieving revision 1.68 diff -u -d -r1.67 -r1.68 --- NetrekXP to do list.C 20 Sep 2006 17:08:31 -0000 1.67 +++ NetrekXP to do list.C 8 Nov 2006 01:44:44 -0000 1.68 @@ -67,7 +67,11 @@ 8) Have client utilize new server torp vector code 10) Fade out ship explosion sound on quit 11) Pop-up dialog box for bad version response - +12) Bugs with cambot playback: + a) help window too small to display all options + b) < and > keys don't seem to work + c) t-mode on/off sound plays continually, something odd with tourn status packet + Stas's list: - color coded playerlist. - check inl server for behavior (observers and tractor/pressor packets) Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 Binary files /tmp/cvsgnuAoO and /tmp/cvstg7zO1 differ From quozl at users.sourceforge.net Fri Nov 17 17:27:06 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Fri, 17 Nov 2006 23:27:06 +0000 Subject: [netrek-cvs] client/cow TODO,1.2,1.3 Message-ID: Update of /cvsroot/netrek/client/cow In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv11230 Modified Files: TODO Log Message: Index: TODO =================================================================== RCS file: /cvsroot/netrek/client/cow/TODO,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- TODO 26 Nov 2001 04:49:26 -0000 1.2 +++ TODO 17 Nov 2006 23:27:03 -0000 1.3 @@ -1,3 +1,9 @@ +Andrew K. Bressen wrote "By the way, the docs for newbies, and maybe the server +login prompt, should probably explicitly explain that logins are per-server; +otherwise I think we might have folks creating, say, a warped login, and then +being pissed when they can't get onto continuum with it." + +-- !!! PLCLEAR is set too often. Does not need to be set for every draw, just for BEEPLITE and moves From quozl at users.sourceforge.net Sun Nov 26 18:40:33 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Mon, 27 Nov 2006 00:40:33 +0000 Subject: [netrek-cvs] client/cow parsemeta.c,1.12,1.13 Message-ID: <20061127004042.32F01B3EE@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/cow In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv18711 Modified Files: parsemeta.c Log Message: fix segfault from comment length Index: parsemeta.c =================================================================== RCS file: /cvsroot/netrek/client/cow/parsemeta.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- parsemeta.c 27 Nov 2006 00:36:55 -0000 1.12 +++ parsemeta.c 27 Nov 2006 00:40:31 -0000 1.13 @@ -1,6 +1,9 @@ /* meta.c * * $Log$ + * Revision 1.13 2006/11/27 00:40:31 quozl + * fix segfault from comment length + * * Revision 1.12 2006/11/27 00:36:55 quozl * fix segfault from comment length * @@ -1085,7 +1088,7 @@ sp = serverlist + i; - sprintf(buf, "%-40s %14s ", + snprintf(buf, 56, "%-40s %14s ", strlen(sp->comment) > 0 ? sp->comment : sp->address, statusStrings[sp->status]); From quozl at users.sourceforge.net Sun Nov 26 18:36:57 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Mon, 27 Nov 2006 00:36:57 +0000 Subject: [netrek-cvs] client/cow parsemeta.c,1.11,1.12 Message-ID: <20061127013810.4369C28F13@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/cow In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17089 Modified Files: parsemeta.c Log Message: fix segfault from comment length Index: parsemeta.c =================================================================== RCS file: /cvsroot/netrek/client/cow/parsemeta.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- parsemeta.c 14 Apr 2006 10:35:37 -0000 1.11 +++ parsemeta.c 27 Nov 2006 00:36:55 -0000 1.12 @@ -1,6 +1,9 @@ /* meta.c * * $Log$ + * Revision 1.12 2006/11/27 00:36:55 quozl + * fix segfault from comment length + * * Revision 1.11 2006/04/14 10:35:37 quozl * fix sscanf compiler warning * @@ -586,7 +589,7 @@ p = strtok(NULL,","); /* comment */ if (p == NULL) return; - char *comment = strdup(p); + char *comment = strndup(p, LINE-1); p = strtok(NULL,","); /* number of ports */ if (p == NULL) return; From modemhero at users.sourceforge.net Mon Nov 27 01:08:42 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 27 Nov 2006 07:08:42 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo,1.44,1.45 Message-ID: <20061127070851.72BD2B400@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27902 Modified Files: clientr.suo Log Message: This patch merges the COW metaserver code. It adds a UDP metaserver option, which can be refreshed, that merges data from all known metaservers. The UPD metaserver can also solicit other servers as if they were a metaserver, and supports the server option to display a comment rather than server name. There is also support for multicast server packets. data.h, data.c: Changes default metaserver format from array to comma delimited list parsemeta.h: Fixes description of parsemeta function console.c (LineToConsole): Increases buffer size (large error messages like displaying the metaserver packet was causing a buffer overflow) cowmain.c: Adds support for metatype sysdef option main.c: Renames old -m option to -M, and adds -m option for UDP metaserver newwin.c: Changes how metaserver window dimensions are set (slightly wider, height variable) parsemeta.c: Extensively rewritten. Highlights include new server fields, bug fixes related to the size/initialization of the comment field, and new metaserver headers based on what optional fields (age, ping) are displayed. Totally new functions, such as ReadMetasSend, grow, server_find, version_s, version_r, ReadMetasRecv, SaveMetasCache, and LoadMetasCache, have also been added. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 Binary files /tmp/cvsZgQbv8 and /tmp/cvsEJ8M30 differ From modemhero at users.sourceforge.net Mon Nov 27 01:08:43 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 27 Nov 2006 07:08:43 +0000 Subject: [netrek-cvs] client/netrekxp/src console.c, 1.2, 1.3 cowmain.c, 1.15, 1.16 data.c, 1.41, 1.42 main.c, 1.10, 1.11 newwin.c, 1.42, 1.43 parsemeta.c, 1.11, 1.12 Message-ID: <20061127070851.EB7E9B407@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27902/src Modified Files: console.c cowmain.c data.c main.c newwin.c parsemeta.c Log Message: This patch merges the COW metaserver code. It adds a UDP metaserver option, which can be refreshed, that merges data from all known metaservers. The UPD metaserver can also solicit other servers as if they were a metaserver, and supports the server option to display a comment rather than server name. There is also support for multicast server packets. data.h, data.c: Changes default metaserver format from array to comma delimited list parsemeta.h: Fixes description of parsemeta function console.c (LineToConsole): Increases buffer size (large error messages like displaying the metaserver packet was causing a buffer overflow) cowmain.c: Adds support for metatype sysdef option main.c: Renames old -m option to -M, and adds -m option for UDP metaserver newwin.c: Changes how metaserver window dimensions are set (slightly wider, height variable) parsemeta.c: Extensively rewritten. Highlights include new server fields, bug fixes related to the size/initialization of the comment field, and new metaserver headers based on what optional fields (age, ping) are displayed. Totally new functions, such as ReadMetasSend, grow, server_find, version_s, version_r, ReadMetasRecv, SaveMetasCache, and LoadMetasCache, have also been added. Index: newwin.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- newwin.c 9 Jul 2006 08:25:38 -0000 1.42 +++ newwin.c 27 Nov 2006 07:08:41 -0000 1.43 @@ -31,6 +31,7 @@ #include "proto.h" extern HINSTANCE MyInstance; +extern int metaHeight; /* height of metaserver window */ static int line = 0; int MaxMotdLine = 0; @@ -852,7 +853,7 @@ W_SetWindowButtonHandler (helpWin, helpaction); #ifdef META - metaWin = W_MakeMenu ("MetaServer List", 0, 0, 72, num_servers + 2, + metaWin = W_MakeMenu ("MetaServer List", 0, 0, 80, metaHeight, NULL, 2); W_SetWindowKeyDownHandler (metaWin, metaaction); W_SetWindowButtonHandler (metaWin, metaaction); Index: cowmain.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/cowmain.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- cowmain.c 28 May 2006 23:05:12 -0000 1.15 +++ cowmain.c 27 Nov 2006 07:08:41 -0000 1.16 @@ -496,6 +496,10 @@ #ifdef META int usemeta = 0; +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 */ #endif /******************************************************************************/ @@ -644,7 +648,13 @@ #ifdef META if (usemeta) - parsemeta (usemeta); + { + metaType = intDefault("metaType", usemeta); + /* use default metatype for illegal values */ + if ((metaType < 1) || (metaType > 3)) + metaType = DEFAULT_METATYPE; + parsemeta(metaType); + } #endif fed_ship_bmp = "bitmaps/shiplib/fedship.bmp"; Index: main.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/main.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- main.c 10 Aug 2006 10:59:15 -0000 1.10 +++ main.c 27 Nov 2006 07:08:41 -0000 1.11 @@ -67,8 +67,9 @@ LineToConsole (" [-c] run players check on the server\n"); #ifdef META - LineToConsole (" [-m] check metaserver for active servers\n"); - LineToConsole (" [-k] display known servers\n"); + LineToConsole (" [-m] list servers, using UDP/IP to multiple metaservers\n"); + LineToConsole (" [-M] list servers, using TCP/IP to single metaserver\n"); + LineToConsole (" [-k] list servers from cache generated by -M\n"); #endif LineToConsole (" [-D] output debug info\n"); @@ -214,25 +215,35 @@ break; #ifdef META - case 'm': /* show metaserver window */ + case 'm': /* use multiple metaservers by UDP */ if (usemeta && usemeta != 1) { - fputs ("The options -k and -m are mutually exclusive\n", + fputs ("The options -k, -m and -M are mutually exclusive\n", stderr); err++; } usemeta = 1; break; - case 'k': /* show metacache window */ + case 'k': /* use metaserver cache from prior -M usage */ if (usemeta && usemeta != 2) { - fputs ("The options -k and -m are mutually exclusive\n", + fputs ("The options -k, -m and -M are mutually exclusive\n", stderr); err++; } usemeta = 2; break; + + case 'M': /* use single metaserver by TCP */ + if (usemeta && usemeta != 3) + { + fputs("The options -k, -m and -M are mutually exclusive\n", + stderr); + err++; + } + usemeta = 3; + break; #endif #ifdef RSA @@ -377,7 +388,8 @@ } /* end while */ } /* end for */ - if (!usemeta && !servertmp) /* no meta type was selected, pick metaserver */ + if (!usemeta && !servertmp) /* no meta type was selected, and no server + specified, so pick metaserver */ usemeta = 1; if (usage || err) Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- data.c 20 Sep 2006 13:04:53 -0000 1.41 +++ data.c 27 Nov 2006 07:08:41 -0000 1.42 @@ -228,9 +228,8 @@ int updatesPerSec = 10; #ifdef META -/* Metaservers list */ -char *metaServer[] = {"metaserver.us.netrek.org", - "metaserver2.us.netrek.org"}; +/* Metaservers list - comma delimited */ +char *metaServer = "metaserver.us.netrek.org, metaserver2.us.netrek.org"; int metaPort = 3521; char *metaCache = NULL; #ifdef METAPING Index: parsemeta.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/parsemeta.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- parsemeta.c 6 Jun 2006 05:14:14 -0000 1.11 +++ parsemeta.c 27 Nov 2006 07:08:41 -0000 1.12 @@ -30,6 +30,8 @@ /*** 06/2003 Erik Hietbrink Added metaPing option. /*** Added Connecting Now state. /*** +/*** 11/2006 Bill Balcerski Merged COW UDP metaserver, server solicitation, +/** and multicast server packet code /******************************************************************************/ #undef DEBUG @@ -61,34 +63,45 @@ /* Constants */ [...1221 lines suppressed...] fd_set readfds; int nRet; - // untill I find a better way of killing this thread, only + FD_ZERO(&readfds); + if (s >= 0) FD_SET(s, &readfds); + + // until I find a better way of killing this thread, only // wait in periods of maximum 250ms. Better for menu responsiveness ;-) if (waittime > 250) waittime = 250; @@ -1151,7 +1849,7 @@ } // Refresh the displayed ping stats - for (i = 0; i < num_servers; ++i) metarefresh(i); + for (i = 0; i < num_servers; ++i) metarefresh(i, textColor); // Proceed to the next cycle of ping samples idx = (unsigned short) ((idx + 1) % RTT_AVG_BUFLEN); Index: console.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/console.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- console.c 7 May 2006 16:59:27 -0000 1.2 +++ console.c 27 Nov 2006 07:08:40 -0000 1.3 @@ -53,7 +53,7 @@ LineToConsole (char * format, ...) { struct cons_buffer * tmp; // temporary pointer to our linked list; - char str[256]; + char str[1024]; DWORD numChars; va_list args; From modemhero at users.sourceforge.net Mon Nov 27 01:08:43 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 27 Nov 2006 07:08:43 +0000 Subject: [netrek-cvs] client/netrekxp/include data.h, 1.37, 1.38 parsemeta.h, 1.3, 1.4 Message-ID: <20061127070851.80AAE28F13@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27902/include Modified Files: data.h parsemeta.h Log Message: This patch merges the COW metaserver code. It adds a UDP metaserver option, which can be refreshed, that merges data from all known metaservers. The UPD metaserver can also solicit other servers as if they were a metaserver, and supports the server option to display a comment rather than server name. There is also support for multicast server packets. data.h, data.c: Changes default metaserver format from array to comma delimited list parsemeta.h: Fixes description of parsemeta function console.c (LineToConsole): Increases buffer size (large error messages like displaying the metaserver packet was causing a buffer overflow) cowmain.c: Adds support for metatype sysdef option main.c: Renames old -m option to -M, and adds -m option for UDP metaserver newwin.c: Changes how metaserver window dimensions are set (slightly wider, height variable) parsemeta.c: Extensively rewritten. Highlights include new server fields, bug fixes related to the size/initialization of the comment field, and new metaserver headers based on what optional fields (age, ping) are displayed. Totally new functions, such as ReadMetasSend, grow, server_find, version_s, version_r, ReadMetasRecv, SaveMetasCache, and LoadMetasCache, have also been added. Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- data.h 20 Sep 2006 13:04:52 -0000 1.37 +++ data.h 27 Nov 2006 07:08:40 -0000 1.38 @@ -110,7 +110,7 @@ #endif #ifdef META -extern char *metaServer[]; +extern char *metaServer; extern int metaPort; extern char *metaCache; #ifdef METAPING Index: parsemeta.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/parsemeta.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- parsemeta.h 7 May 2006 16:59:26 -0000 1.3 +++ parsemeta.h 27 Nov 2006 07:08:40 -0000 1.4 @@ -16,11 +16,11 @@ void parsemeta (int metaType); /* - * Read and Parse the meta-server information, either from the meta- - * server (if metaType = 1) or from the cache (if metaType = 2). + * Read and Parse the metaserver information, either from the metaservers + * by UDP (1), from a single metaserver by TCP (3), or from the cache (2). * * NOTE: This function sets the variable "num_servers" which is - * later used to decide the hight of the meta-server window. + * used in newwin() to set the height of the meta-server window. */ From modemhero at users.sourceforge.net Mon Nov 27 01:10:40 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 27 Nov 2006 07:10:40 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C,1.68,1.69 Message-ID: <20061127071050.5632C28F13@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28769 Modified Files: NetrekXP to do list.C Log Message: Adds list of things still to fix with metaserver code. Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- NetrekXP to do list.C 8 Nov 2006 01:44:44 -0000 1.68 +++ NetrekXP to do list.C 27 Nov 2006 07:10:38 -0000 1.69 @@ -71,7 +71,10 @@ a) help window too small to display all options b) < and > keys don't seem to work c) t-mode on/off sound plays continually, something odd with tourn status packet - +13) metaserver related: fix color scheme for metaaction options, update documenation on +new metatype option, fix metastatuslevel option (broken by COW code merge) + + Stas's list: - color coded playerlist. - check inl server for behavior (observers and tractor/pressor packets) From modemhero at users.sourceforge.net Wed Nov 29 04:13:31 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 29 Nov 2006 10:13:31 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.69, 1.70 clientr.suo, 1.45, 1.46 Message-ID: <20061129101342.A1FF728F13@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13780 Modified Files: NetrekXP to do list.C clientr.suo Log Message: parsemeta.c: fixed all color issues. Padded metaserver string in case of servers with statuslevel > statusNull, so that ping column lines up properly. Fixed metaStatusLevel option so that it works with the UDP metaserver - broken in COW too. Turned off verbose variable (was only on for testing purposes). Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.69 retrieving revision 1.70 diff -u -d -r1.69 -r1.70 --- NetrekXP to do list.C 27 Nov 2006 07:10:38 -0000 1.69 +++ NetrekXP to do list.C 29 Nov 2006 10:13:29 -0000 1.70 @@ -71,8 +71,8 @@ a) help window too small to display all options b) < and > keys don't seem to work c) t-mode on/off sound plays continually, something odd with tourn status packet -13) metaserver related: fix color scheme for metaaction options, update documenation on -new metatype option, fix metastatuslevel option (broken by COW code merge) +13) metaserver related: update documenation on new metatype option, prevent UDP metaserver +from overwriting bottom 3 entries (quit/refresh/links) Stas's list: Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 Binary files /tmp/cvso9qlMI and /tmp/cvs4Lacg3 differ From modemhero at users.sourceforge.net Wed Nov 29 04:13:31 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 29 Nov 2006 10:13:31 +0000 Subject: [netrek-cvs] client/netrekxp/src parsemeta.c,1.12,1.13 Message-ID: <20061129101342.C42D6B3EA@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13780/src Modified Files: parsemeta.c Log Message: parsemeta.c: fixed all color issues. Padded metaserver string in case of servers with statuslevel > statusNull, so that ping column lines up properly. Fixed metaStatusLevel option so that it works with the UDP metaserver - broken in COW too. Turned off verbose variable (was only on for testing purposes). Index: parsemeta.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/parsemeta.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- parsemeta.c 27 Nov 2006 07:08:41 -0000 1.12 +++ parsemeta.c 29 Nov 2006 10:13:29 -0000 1.13 @@ -68,10 +68,21 @@ static int msock = -1; /* the socket to talk to the metaservers */ static int sent = 0; /* number of solicitations sent */ static int seen = 0; /* number of replies seen */ -static int verbose = 1; /* whether to talk a lot about it all */ +static int verbose = 0; /* whether to talk a lot about it all */ static int type; /* type of connection requested */ #define RTT_AVG_BUFLEN 5 /* number of samples used for average rtt time */ + /* from meta.h of metaserver code */ +#define SS_WORKING 0 +#define SS_QUEUE 1 +#define SS_OPEN 2 +#define SS_EMPTY 3 +#define SS_NOCONN 4 +#define SS_INIT 5 + /* not a real metaserver number, but overcomes a limitation of dropping text */ + /* description of sp->why_dead */ +#define SS_TOUT 6 + /* Local Types */ struct servers @@ -112,7 +123,7 @@ * particular point. * * The strings after statusNull are internal status types and are formatted - * separatly from the other strings. + * separately from the other strings. * * The string corresponding to "statusNull" is assigned to those servers which * have "statusNobody" or earlier strings in old, cached, meta-server data. */ @@ -491,6 +502,7 @@ struct servers *sp = NULL; char *host, type; int port, status, age, players, queue, throwaway; + int tempstatus = 0; throwaway = 0; @@ -505,8 +517,31 @@ if (p == NULL) continue; status = atoi(p); - /* ignore servers based on status */ - if (status > statusLevel) + /* Metaserver and client define status level differently, must convert + status so that client option metaStatusLevel works properly */ + switch (status) { + case SS_QUEUE: + tempstatus = statusWait; + break; + case SS_OPEN: + tempstatus = statusOpen; + break; + case SS_EMPTY: + tempstatus = statusNobody; + break; + case SS_TOUT: + tempstatus = statusTout; + break; + case SS_NOCONN: /* no connection */ + case SS_WORKING: /* metaserver should not return this */ + case SS_INIT: /* nor this */ + default: + tempstatus = statusNoConnect; + break; + } + + /* ignore servers based on converted status */ + if (tempstatus > statusLevel) throwaway++; /* the sp->why_dead workaround */ if (status == 6) @@ -564,16 +599,6 @@ } sp->refresh = 1; - /* from meta.h of metaserver code */ -#define SS_WORKING 0 -#define SS_QUEUE 1 -#define SS_OPEN 2 -#define SS_EMPTY 3 -#define SS_NOCONN 4 -#define SS_INIT 5 - /* not a real metaserver number, but overcomes a limitation of dropping text */ - /* description of sp->why_dead */ -#define SS_TOUT 6 switch (status) { case SS_QUEUE: sp->status = statusWait; @@ -1299,6 +1324,10 @@ strcat (buf, " "); } } + else { + /* Pad string with spaces for formatting purposes */ + strcat (buf, " "); + } #ifdef METAPING @@ -1384,7 +1413,7 @@ W_WriteText(metaWin, 0, metaHeight-3, W_Yellow, "Refresh", 7, 0); /* Add quit option */ - W_WriteText (metaWin, 0, metaHeight-2, textColor, "Quit", 4, 0); + W_WriteText (metaWin, 0, metaHeight-2, W_Yellow, "Quit", 4, 0); /* Additional Help Options */ W_WriteText (metaWin, 0, metaHeight-1, W_Yellow, From modemhero at users.sourceforge.net Wed Nov 29 04:34:11 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 29 Nov 2006 10:34:11 +0000 Subject: [netrek-cvs] client/netrekxp/src parsemeta.c,1.13,1.14 Message-ID: <20061129103419.5048828F13@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv23065/src Modified Files: parsemeta.c Log Message: parsemeta.c (version_r): Cleans up code on converting metaserver status. Removes need for sp->why_dead workaround. Index: parsemeta.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/parsemeta.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- parsemeta.c 29 Nov 2006 10:13:29 -0000 1.13 +++ parsemeta.c 29 Nov 2006 10:34:09 -0000 1.14 @@ -502,7 +502,7 @@ struct servers *sp = NULL; char *host, type; int port, status, age, players, queue, throwaway; - int tempstatus = 0; + int tempstatus, tempplayers; throwaway = 0; @@ -517,52 +517,54 @@ if (p == NULL) continue; status = atoi(p); + p = strtok(NULL,","); /* age (of data in seconds) */ + if (p == NULL) continue; + age = atoi(p); + + p = strtok(NULL,","); /* players */ + if (p == NULL) continue; + players = atoi(p); + + p = strtok(NULL,","); /* queue size */ + if (p == NULL) continue; + queue = atoi(p); + + p = strtok(NULL,"\n"); /* server type */ + if (p == NULL) continue; + type = p[0]; + /* Metaserver and client define status level differently, must convert - status so that client option metaStatusLevel works properly */ + status so that client option metaStatusLevel works properly. And + temporarily record player field as well. */ switch (status) { case SS_QUEUE: tempstatus = statusWait; + tempplayers = queue; break; case SS_OPEN: tempstatus = statusOpen; + tempplayers = players; break; case SS_EMPTY: tempstatus = statusNobody; + tempplayers = 0; break; case SS_TOUT: tempstatus = statusTout; + tempplayers = 0; break; case SS_NOCONN: /* no connection */ case SS_WORKING: /* metaserver should not return this */ case SS_INIT: /* nor this */ default: tempstatus = statusNoConnect; + tempplayers = 0; break; } /* ignore servers based on converted status */ if (tempstatus > statusLevel) throwaway++; - /* the sp->why_dead workaround */ - if (status == 6) - if ((status - 3) <= statusLevel) - throwaway--; - - p = strtok(NULL,","); /* age (of data in seconds) */ - if (p == NULL) continue; - age = atoi(p); - - p = strtok(NULL,","); /* players */ - if (p == NULL) continue; - players = atoi(p); - - p = strtok(NULL,","); /* queue size */ - if (p == NULL) continue; - queue = atoi(p); - - p = strtok(NULL,"\n"); /* server type */ - if (p == NULL) continue; - type = p[0]; /* ignore paradise servers */ if (type == 'P') throwaway++; @@ -599,31 +601,10 @@ } sp->refresh = 1; - switch (status) { - case SS_QUEUE: - sp->status = statusWait; - sp->players = queue; - break; - case SS_OPEN: - sp->status = statusOpen; - sp->players = players; - break; - case SS_EMPTY: - sp->status = statusNobody; - sp->players = 0; - break; - case SS_TOUT: - sp->status = statusTout; - sp->players = 0; - break; - case SS_NOCONN: /* no connection */ - case SS_WORKING: /* metaserver should not return this */ - case SS_INIT: /* nor this */ - default: - sp->status = statusNoConnect; - sp->players = 0; - break; - } + /* Use converted status and player values */ + sp->status = tempstatus; + sp->players = tempplayers; + sp->typeflag = type; strcpy(sp->comment, ""); #ifdef METAPING @@ -1166,11 +1147,11 @@ LoadMetasCache(); if (num_servers == 0) ReadMetasRecv(-1); if (num_servers != 0) { - metaHeight = num_servers + 10; + metaHeight = num_servers + 6; } else { LineToConsole("Warning: no response from metaservers, are you firewalled?\n" " (no reply to probe on UDP port %d)\n", metaPort); - metaHeight = num_servers + 15; + metaHeight = num_servers + 11; } return; break; From modemhero at users.sourceforge.net Wed Nov 29 06:06:36 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 29 Nov 2006 12:06:36 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.87, 1.88 netrekrc, 1.9, 1.10 netrekrc_options.txt, 1.15, 1.16 netrekxp.doc, 1.10, 1.11 Message-ID: <20061129120648.9B659B3EA@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv31025/resources/docs Modified Files: changes.txt netrekrc netrekrc_options.txt netrekxp.doc Log Message: Added documentation on metaType option. Made default metaserver the UDP metaserver. Clarified logic behind sizing metaserver window. Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- netrekrc 9 Jul 2006 04:26:10 -0000 1.9 +++ netrekrc 29 Nov 2006 12:06:34 -0000 1.10 @@ -133,6 +133,12 @@ # 4 - as above + servers that metaserver could not connect to metaStatusLevel: 3 +# What type of metaserver to use +# 1 - UDP multiple metaservers +# 2 - cache, then TCP metaserver +# 3 - TCP metaserver, then cache +metaType: 1 + # Use ICMP to ping the metaserver list metaPing: on Index: netrekxp.doc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekxp.doc,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- netrekxp.doc 29 May 2006 00:18:09 -0000 1.10 +++ netrekxp.doc 29 Nov 2006 12:06:34 -0000 1.11 @@ -96,7 +96,8 @@ -f : record game to file (can be viewed later with -F) -F : view recorded game -l : record all messages to log file - -m : connect to metaserver (default) + -m : connect to metaservers by UDP (default) + -M : connect to metaserver by TCP -k : display known servers The client generates a list of known servers after each call to the metaserver but only if the "metaCache" option is set in your .netrekrc. Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.87 retrieving revision 1.88 diff -u -d -r1.87 -r1.88 --- changes.txt 20 Sep 2006 17:08:31 -0000 1.87 +++ changes.txt 29 Nov 2006 12:06:34 -0000 1.88 @@ -1,4 +1,16 @@ Netrek XP 2006, Version 1.2: +- added "metaType: (integer)" for which type of metaserver you wish to use, where the + default is 1, and the options are: +# What type of metaserver to use +# 1 - UDP multiple metaservers +# 2 - cache, then TCP metaserver +# 3 - TCP metaserver, then cache +- merged the COW metaserver code. There is now a UDP metaserver option, which can be + refreshed, that merges data from all known metaservers. The UDP metaserver can also + solicit other servers as if they were a metaserver, and supports the server option to + display a comment rather than server name. There is also support for multicast server + packets. This change also renames the old -m option to -M, and changes -m option to + the UDP metaserver. - moved position of planet owner on galactic (if showPlanetOwner on) so that it does not overlap with the fuel can graphic. The letter indicating planet owner is now in the upper right hand corner of the planet rather than the center right. Index: netrekrc_options.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc_options.txt,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- netrekrc_options.txt 25 Jun 2006 08:19:40 -0000 1.15 +++ netrekrc_options.txt 29 Nov 2006 12:06:34 -0000 1.16 @@ -96,6 +96,11 @@ # 3 - servers timed out to metaserver (default) # 4 - servers that metaServer could not contact +metaType: (1-3) what type of metaserver to use +# 1 - UDP multiple metaservers +# 2 - cache, then TCP metaserver +# 3 - TCP metaserver, then cache + motionThresh: (int) mouse motion threshold mouseAsShift: (on/off) use mouse buttons to switch keymaps mungScrollbarColors: (on/off) set scrollbar colors to match background colors From modemhero at users.sourceforge.net Wed Nov 29 06:06:36 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 29 Nov 2006 12:06:36 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C,1.70,1.71 Message-ID: <20061129120648.019A928F13@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv31025 Modified Files: NetrekXP to do list.C Log Message: Added documentation on metaType option. Made default metaserver the UDP metaserver. Clarified logic behind sizing metaserver window. Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.70 retrieving revision 1.71 diff -u -d -r1.70 -r1.71 --- NetrekXP to do list.C 29 Nov 2006 10:13:29 -0000 1.70 +++ NetrekXP to do list.C 29 Nov 2006 12:06:33 -0000 1.71 @@ -71,9 +71,6 @@ a) help window too small to display all options b) < and > keys don't seem to work c) t-mode on/off sound plays continually, something odd with tourn status packet -13) metaserver related: update documenation on new metatype option, prevent UDP metaserver -from overwriting bottom 3 entries (quit/refresh/links) - Stas's list: - color coded playerlist. From modemhero at users.sourceforge.net Wed Nov 29 06:06:36 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 29 Nov 2006 12:06:36 +0000 Subject: [netrek-cvs] client/netrekxp/include data.h,1.38,1.39 Message-ID: <20061129120648.32AA528F17@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv31025/include Modified Files: data.h Log Message: Added documentation on metaType option. Made default metaserver the UDP metaserver. Clarified logic behind sizing metaserver window. Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- data.h 27 Nov 2006 07:08:40 -0000 1.38 +++ data.h 29 Nov 2006 12:06:34 -0000 1.39 @@ -609,6 +609,7 @@ extern int forceDisplay; extern int forceMono; +extern int metaType; extern int metaStatusLevel; extern int mungScrollbarColors; extern int showMotd; From modemhero at users.sourceforge.net Wed Nov 29 06:06:37 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 29 Nov 2006 12:06:37 +0000 Subject: [netrek-cvs] client/netrekxp/src cowmain.c, 1.16, 1.17 defaults.c, 1.30, 1.31 parsemeta.c, 1.14, 1.15 Message-ID: <20061129120648.B0BA428F1A@smtpgrey-1.real-time.com> 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, { From modemhero at users.sourceforge.net Wed Nov 29 06:40:24 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 29 Nov 2006 12:40:24 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C,1.71,1.72 Message-ID: <20061129124040.045474CD99@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13264 Modified Files: NetrekXP to do list.C Log Message: Increased playback help window size so all help options fit. Put sanity check on decrease playback speed, so that client doesn't get stuck in a long sleep(), as playback speed is controlled by calls to sleep(). Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.71 retrieving revision 1.72 diff -u -d -r1.71 -r1.72 --- NetrekXP to do list.C 29 Nov 2006 12:06:33 -0000 1.71 +++ NetrekXP to do list.C 29 Nov 2006 12:40:17 -0000 1.72 @@ -67,10 +67,8 @@ 8) Have client utilize new server torp vector code 10) Fade out ship explosion sound on quit 11) Pop-up dialog box for bad version response -12) Bugs with cambot playback: - a) help window too small to display all options - b) < and > keys don't seem to work - c) t-mode on/off sound plays continually, something odd with tourn status packet +12) Bugs with cambot playback: t-mode on/off sound plays continually, something odd with +tourn status packet, looks like it's server side in inl_move Stas's list: - color coded playerlist. From modemhero at users.sourceforge.net Wed Nov 29 06:40:24 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 29 Nov 2006 12:40:24 +0000 Subject: [netrek-cvs] client/netrekxp/src newwin.c, 1.43, 1.44 playback.c, 1.13, 1.14 Message-ID: <20061129124039.D650DB3EA@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13264/src Modified Files: newwin.c playback.c Log Message: Increased playback help window size so all help options fit. Put sanity check on decrease playback speed, so that client doesn't get stuck in a long sleep(), as playback speed is controlled by calls to sleep(). Index: newwin.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- newwin.c 27 Nov 2006 07:08:41 -0000 1.43 +++ newwin.c 29 Nov 2006 12:40:22 -0000 1.44 @@ -836,7 +836,7 @@ if (playback) helpWin = W_MakeTextWindow ("help", 286, YOFF + WINSIDE + 2 * BORDER + 2 * MESSAGESIZE + 50, - 72, 12, NULL, BORDER); + 72, 15, NULL, BORDER); else #endif helpWin = W_MakeTextWindow ("help", 20, Index: playback.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/playback.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- playback.c 7 May 2006 16:59:27 -0000 1.13 +++ playback.c 29 Nov 2006 12:40:22 -0000 1.14 @@ -437,6 +437,8 @@ break; case '>': pbdelay *= 2; + if (pbdelay > 600) + pbdelay = 600; break; case 'R': { From modemhero at users.sourceforge.net Wed Nov 29 07:06:43 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 29 Nov 2006 13:06:43 +0000 Subject: [netrek-cvs] client/netrekxp/include data.h,1.39,1.40 Message-ID: <20061129130651.870824CD99@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv24847/include Modified Files: data.h Log Message: New option maxScrollLines in netrekrc, controls size of window scrollback buffer, rather than it being fixed in stone as before. Updated help files on this option + metatype. Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- data.h 29 Nov 2006 12:06:34 -0000 1.39 +++ data.h 29 Nov 2006 13:06:40 -0000 1.40 @@ -636,6 +636,7 @@ extern int agriColor; /* agri planets font color on map */ extern int windowMove; /* allow moving of internal windows */ +extern int maxScrollLines; /* maximum number of scroll lines in a window */ extern int mainResizeable; /* allow resize of netrek window */ extern int mainTitleBar; /* start netrek window with title bar on */ extern int playerListMessaging; /* allow message zoom when clicking on player list */ From modemhero at users.sourceforge.net Wed Nov 29 07:06:42 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 29 Nov 2006 13:06:42 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C,1.72,1.73 Message-ID: <20061129130651.832D0B3EA@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv24847 Modified Files: NetrekXP to do list.C Log Message: New option maxScrollLines in netrekrc, controls size of window scrollback buffer, rather than it being fixed in stone as before. Updated help files on this option + metatype. Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.72 retrieving revision 1.73 diff -u -d -r1.72 -r1.73 --- NetrekXP to do list.C 29 Nov 2006 12:40:17 -0000 1.72 +++ NetrekXP to do list.C 29 Nov 2006 13:06:40 -0000 1.73 @@ -23,7 +23,6 @@ 14) on daemon exit in newbie/pret, kill any hosed bot slots 15) end game bots are stupid, and on timericide don't act right 16) if obs in game when merlin quits, queues still open..should be closed dammit -17) sndlogin not good when you login twice, it erases your login name Sturgeon problems 1) after free upgrade, ship cap packet not being sent to everyone..seems to From modemhero at users.sourceforge.net Wed Nov 29 07:06:43 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 29 Nov 2006 13:06:43 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html generalconfig.html, 1.18, 1.19 Message-ID: <20061129130651.C0D9E4CD9A@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv24847/resources/htmlhelp/html Modified Files: generalconfig.html Log Message: New option maxScrollLines in netrekrc, controls size of window scrollback buffer, rather than it being fixed in stone as before. Updated help files on this option + metatype. Index: generalconfig.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/generalconfig.html,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- generalconfig.html 25 Jun 2006 08:19:40 -0000 1.18 +++ generalconfig.html 29 Nov 2006 13:06:41 -0000 1.19 @@ -446,6 +446,11 @@ +maxScrollLines +Maximum number of scroll lines in a message window +integer
default: 300 + + messageHoldThresh Threshold value to put message on hold integer
default: 0 @@ -490,6 +495,17 @@ +metaType +What type of metaserver to use + +
    +
  • 1 (default) - UDP multiple metaservers
    • +
  • 2 - cache, then TCP metaserver
    • +
  • 3 - TCP metaserver, then cache
    • +
+ + + metaPing Show PING round trip time in Metaserver Window From modemhero at users.sourceforge.net Wed Nov 29 07:06:43 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 29 Nov 2006 13:06:43 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.88, 1.89 netrekrc, 1.10, 1.11 netrekrc_options.txt, 1.16, 1.17 Message-ID: <20061129130651.C987DB3EB@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv24847/resources/docs Modified Files: changes.txt netrekrc netrekrc_options.txt Log Message: New option maxScrollLines in netrekrc, controls size of window scrollback buffer, rather than it being fixed in stone as before. Updated help files on this option + metatype. Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- netrekrc 29 Nov 2006 12:06:34 -0000 1.10 +++ netrekrc 29 Nov 2006 13:06:41 -0000 1.11 @@ -113,6 +113,9 @@ # Start main window with title bar on (can be toggled by alt+enter) mainTitleBar: off +# maximum number of scroll lines in a message window (range of values 50-500) +maxScrollLines: 300 + # Message hold threshold messageHoldThresh: 0 Index: netrekrc_options.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc_options.txt,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- netrekrc_options.txt 29 Nov 2006 12:06:34 -0000 1.16 +++ netrekrc_options.txt 29 Nov 2006 13:06:41 -0000 1.17 @@ -78,6 +78,7 @@ login: (string) character login macroKey: (char, ESC, TAB) key to toggle macro mode mainResizeable: (on/off) make main window (netrek) resizeable +maxScrollLines: (50-500) maximum number of scroll lines in a message window mainTitleBar: (on/off) start main window with title bar on (can be toggled by alt-enter) messageHoldThresh: (integer) put message on hold after mouse move (Adds # to the end of message) messageHUD: (0-2) where to duplicate message that is written in message window Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.88 retrieving revision 1.89 diff -u -d -r1.88 -r1.89 --- changes.txt 29 Nov 2006 12:06:34 -0000 1.88 +++ changes.txt 29 Nov 2006 13:06:41 -0000 1.89 @@ -1,4 +1,8 @@ Netrek XP 2006, Version 1.2: +- added "maxScrollLines: (integer)" to control how many lines of scrollback you want, + range of acceptable values is 50-500 +- fixed cambot playback help window size, and fixed bug where you could make the + the client lock up by using the decrease playback speed button continuously - added "metaType: (integer)" for which type of metaserver you wish to use, where the default is 1, and the options are: # What type of metaserver to use @@ -26,7 +30,6 @@ - added -L option for logging to an automatically generated logfile that is datestamped (i.e. 20061002.log will be the log file generated on October 2, 2006). - added support for multiline macros sent using NEWMACRO variables (%p, %z, etc) -- upped max number of lines in the message window scrollback buffer from 100 to 300 Netrek XP 2006, Version 1.1: (Released 26-Jun-2006) - middle mouse button now closes the help window From modemhero at users.sourceforge.net Wed Nov 29 07:06:43 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 29 Nov 2006 13:06:43 +0000 Subject: [netrek-cvs] client/netrekxp/src data.c, 1.42, 1.43 defaults.c, 1.31, 1.32 mswindow.c, 1.38, 1.39 Message-ID: <20061129130652.354ACB3EE@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv24847/src Modified Files: data.c defaults.c mswindow.c Log Message: New option maxScrollLines in netrekrc, controls size of window scrollback buffer, rather than it being fixed in stone as before. Updated help files on this option + metatype. Index: mswindow.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- mswindow.c 7 Aug 2006 08:04:05 -0000 1.38 +++ mswindow.c 29 Nov 2006 13:06:41 -0000 1.39 @@ -89,13 +89,6 @@ #define WM_TERMINATE_WAIT 0x8000 #define WM_CROSS_THREAD_DESTROY 0x8001 -#ifdef DEBUG -#define MAX_SCROLLWINDOW_LINES 300 -#else -#define MAX_SCROLLWINDOW_LINES 300 /* Was 100, but that's too small! - BB 7/2006*/ -#endif -//The max # lines a scrollwindow will have - #define EVENT_Q_SIZE 15 //The number of events our custom queue will hold @@ -4424,7 +4417,7 @@ NumStrings = 0; } - if (NumStrings < MAX_SCROLLWINDOW_LINES) //Create a new stringList item + if (NumStrings < maxScrollLines) //Create a new stringList item { p2 = (struct stringList *) malloc (sizeof (struct stringList)); if (!p2) @@ -5738,7 +5731,7 @@ NumStrings = 0; } - if (NumStrings < MAX_SCROLLWINDOW_LINES) //Create a new stringList item + if (NumStrings < maxScrollLines) //Create a new stringList item { p2 = (struct stringList *) malloc (sizeof (struct stringList)); if (!p2) Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- defaults.c 29 Nov 2006 12:06:34 -0000 1.31 +++ defaults.c 29 Nov 2006 13:06:41 -0000 1.32 @@ -223,6 +223,12 @@ NULL } }, + {"maxScrollLines", &maxScrollLines, RC_INT, + { + "Maximum number of lines in message window scrollback", + NULL + } + }, #ifdef XTRA_MESSAGE_UI {"messageHoldThresh", &messageHoldThresh, RC_INT, { @@ -1513,6 +1519,11 @@ planetHighlighting = booleanDefault ("planetHighlighting", planetHighlighting); rotatePlanets = booleanDefault ("rotatePlanets", rotatePlanets); logging = booleanDefault ("logging", logging); + maxScrollLines = intDefault ("maxScrollLines", maxScrollLines); + if (maxScrollLines > 500) + maxScrollLines = 500; + else if (maxScrollLines < 50) + maxScrollLines = 50; phaserShrink = intDefault ("phaserShrink", phaserShrink); if (phaserShrink > 16) Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- data.c 27 Nov 2006 07:08:41 -0000 1.42 +++ data.c 29 Nov 2006 13:06:41 -0000 1.43 @@ -735,6 +735,7 @@ int windowMove = 0; int mainResizeable = 1; +int maxScrollLines = 300; int mainTitleBar = 0; int observerMode = 0; int showHockeyScore = 1; From modemhero at users.sourceforge.net Wed Nov 29 07:37:49 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 29 Nov 2006 13:37:49 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.89,1.90 Message-ID: <20061129133757.BEE444CD99@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv5852/resources/docs Modified Files: changes.txt Log Message: Help window and hint window are now closeable by shift-right click Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.89 retrieving revision 1.90 diff -u -d -r1.89 -r1.90 --- changes.txt 29 Nov 2006 13:06:41 -0000 1.89 +++ changes.txt 29 Nov 2006 13:37:47 -0000 1.90 @@ -1,4 +1,6 @@ Netrek XP 2006, Version 1.2: +- help window and hint window are now closeable by shift-right click (assuming shiftedMouse + is on) - added "maxScrollLines: (integer)" to control how many lines of scrollback you want, range of acceptable values is 50-500 - fixed cambot playback help window size, and fixed bug where you could make the From modemhero at users.sourceforge.net Wed Nov 29 07:37:50 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 29 Nov 2006 13:37:50 +0000 Subject: [netrek-cvs] client/netrekxp/src helpwin.c, 1.6, 1.7 hintwin.c, 1.3, 1.4 Message-ID: <20061129133758.2FA75B3EA@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv5852/src Modified Files: helpwin.c hintwin.c Log Message: Help window and hint window are now closeable by shift-right click Index: hintwin.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/hintwin.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- hintwin.c 21 Apr 2006 12:00:07 -0000 1.3 +++ hintwin.c 29 Nov 2006 13:37:47 -0000 1.4 @@ -172,6 +172,9 @@ curhint = 0; showhint (curhint); return; +#ifdef SHIFTED_MOUSE + case W_RBUTTON2: +#endif case W_MBUTTON: showHints = 0; W_UnmapWindow (hintWin); Index: helpwin.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/helpwin.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- helpwin.c 20 Sep 2006 14:23:48 -0000 1.6 +++ helpwin.c 29 Nov 2006 13:37:47 -0000 1.7 @@ -250,7 +250,11 @@ int row, column = 0; /* Close window? */ - if (data->key == W_MBUTTON) + if (data->key == W_MBUTTON +#ifdef SHIFTED_MOUSE + || (data->key == W_RBUTTON2) +#endif + ) { W_UnmapWindow (helpWin); return; From modemhero at users.sourceforge.net Wed Nov 29 08:08:52 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 29 Nov 2006 14:08:52 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C,1.73,1.74 Message-ID: <20061129140901.D63BA4CD9B@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv19275 Modified Files: NetrekXP to do list.C Log Message: - close windows key now closes ping stats window, graphical ship stats window, sound window, xtrekrc window, documentation window, and short packets window - remapped close special windows key to W (was unused in the prior xp 2006 keymap) - remapped lower volume key to Z (was unused in the prior xp 2006 keymap) Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.73 retrieving revision 1.74 diff -u -d -r1.73 -r1.74 --- NetrekXP to do list.C 29 Nov 2006 13:06:40 -0000 1.73 +++ NetrekXP to do list.C 29 Nov 2006 14:08:50 -0000 1.74 @@ -52,8 +52,6 @@ 1) resizeable message windows. Perhaps memory of window positions if you choose to save settings. Text in windows should adjust to new window size. 2) Save options for observer/servernick/servertype need to be saved -3) A lot of annoying pop up windows (like macro window, default controls) should be -closeable by shift right click. 4) Get source code for installer from Joe. 5) Get square planet bitmaps so I can turn them into mapped rotating globes. 7) problem with message windows, text getting garbled near top, goes away with @@ -68,6 +66,7 @@ 11) Pop-up dialog box for bad version response 12) Bugs with cambot playback: t-mode on/off sound plays continually, something odd with tourn status packet, looks like it's server side in inl_move +13) detcircle, cow version history Stas's list: - color coded playerlist. From modemhero at users.sourceforge.net Wed Nov 29 08:08:53 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 29 Nov 2006 14:08:53 +0000 Subject: [netrek-cvs] client/netrekxp/src input.c,1.15,1.16 Message-ID: <20061129140901.C40364CD9A@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv19275/src Modified Files: input.c Log Message: - close windows key now closes ping stats window, graphical ship stats window, sound window, xtrekrc window, documentation window, and short packets window - remapped close special windows key to W (was unused in the prior xp 2006 keymap) - remapped lower volume key to Z (was unused in the prior xp 2006 keymap) Index: input.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/input.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- input.c 20 Sep 2006 14:23:48 -0000 1.15 +++ input.c 29 Nov 2006 14:08:50 -0000 1.16 @@ -2112,6 +2112,21 @@ Key32 (void) { /* ' ' = clear special windows */ +#ifdef SOUND + W_UnmapWindow (soundWin); +#endif + +#ifdef DOC_WIN + W_UnmapWindow (xtrekrcwin); + W_UnmapWindow (docwin); +#endif + +#ifdef SHORT_PACKETS + W_UnmapWindow (spWin); +#endif + + W_UnmapWindow (pStats); + W_UnmapWindow (statwin); W_UnmapWindow (planetw); W_UnmapWindow (rankw); if (infomapped) From modemhero at users.sourceforge.net Wed Nov 29 08:08:52 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 29 Nov 2006 14:08:52 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.90, 1.91 netrekrc, 1.11, 1.12 Message-ID: <20061129140901.862414CD99@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv19275/resources/docs Modified Files: changes.txt netrekrc Log Message: - close windows key now closes ping stats window, graphical ship stats window, sound window, xtrekrc window, documentation window, and short packets window - remapped close special windows key to W (was unused in the prior xp 2006 keymap) - remapped lower volume key to Z (was unused in the prior xp 2006 keymap) Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- netrekrc 29 Nov 2006 13:06:41 -0000 1.11 +++ netrekrc 29 Nov 2006 14:08:50 -0000 1.12 @@ -8,7 +8,7 @@ buttonmap: 1P2k # Key mapping -keymap: Ppa%d_eyftg^jmnrpPrls3tfuwvDwsye d +keymap: Ppa%d_eyftg^jmnrpPrls3tfuwvDwsye dW Zv # Key to switch to macro mode # TAB, ESC could be used too Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.90 retrieving revision 1.91 diff -u -d -r1.90 -r1.91 --- changes.txt 29 Nov 2006 13:37:47 -0000 1.90 +++ changes.txt 29 Nov 2006 14:08:50 -0000 1.91 @@ -1,4 +1,8 @@ Netrek XP 2006, Version 1.2: +- close windows key now closes ping stats window, graphical ship stats window, + sound window, xtrekrc window, documentation window, and short packets window +- remapped close special windows key to W (was unused in the prior xp 2006 keymap) +- remapped lower volume key to Z (was unused in the prior xp 2006 keymap) - help window and hint window are now closeable by shift-right click (assuming shiftedMouse is on) - added "maxScrollLines: (integer)" to control how many lines of scrollback you want, From modemhero at users.sourceforge.net Wed Nov 29 09:01:35 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 29 Nov 2006 15:01:35 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html generalconfig.html, 1.19, 1.20 Message-ID: <20061129150144.A6B3DB3EB@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv9311/resources/htmlhelp/html Modified Files: generalconfig.html Log Message: - added "metaVerbose: on/(off)" and "metaUDPCache: (filename)" options to netrekrc and help docs, these were part of the UDP metaserver merge Index: generalconfig.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/generalconfig.html,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- generalconfig.html 29 Nov 2006 13:06:41 -0000 1.19 +++ generalconfig.html 29 Nov 2006 15:01:33 -0000 1.20 @@ -472,6 +472,11 @@ path +metaUDPCache +Name of cache file for UDP Metaserver data +filename + + metaPort Port of Metaserver integer
default: 3521 @@ -516,6 +521,16 @@ +metaVerbose +Show detailed messages during connect to metaserver + +
    +
  • on
    • +
  • off (default)
    • +
+ + + motionThresh Threshold for mouse motion integerdefault: 16 From modemhero at users.sourceforge.net Wed Nov 29 09:01:35 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 29 Nov 2006 15:01:35 +0000 Subject: [netrek-cvs] client/netrekxp/src data.c, 1.43, 1.44 defaults.c, 1.32, 1.33 parsemeta.c, 1.15, 1.16 Message-ID: <20061129150145.57C334CD99@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv9311/src Modified Files: data.c defaults.c parsemeta.c Log Message: - added "metaVerbose: on/(off)" and "metaUDPCache: (filename)" options to netrekrc and help docs, these were part of the UDP metaserver merge Index: parsemeta.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/parsemeta.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- parsemeta.c 29 Nov 2006 12:06:35 -0000 1.15 +++ parsemeta.c 29 Nov 2006 15:01:33 -0000 1.16 @@ -68,7 +68,6 @@ static int msock = -1; /* the socket to talk to the metaservers */ static int sent = 0; /* number of solicitations sent */ static int seen = 0; /* number of replies seen */ -static int verbose = 0; /* whether to talk a lot about it all */ static int type; /* type of connection requested */ #define RTT_AVG_BUFLEN 5 /* number of samples used for average rtt time */ @@ -357,7 +356,7 @@ metaPort = intDefault("metaPort", metaPort); /* whether to report everything that happens */ - verbose = booleanDefault("metaVerbose", verbose); + metaVerbose = booleanDefault("metaVerbose", metaVerbose); /* create the socket */ if (msock < 0) { @@ -379,7 +378,7 @@ address.sin_family = AF_INET; address.sin_port = htons(metaPort); address.sin_addr.s_addr = inet_addr("224.0.0.1"); - if (verbose) + if (metaVerbose) LineToConsole ("Requesting player list from nearby servers on %s\n", inet_ntoa(address.sin_addr)); if (sendto(msock, "?", 1, 0, (struct sockaddr *)&address, @@ -418,7 +417,7 @@ /* check for end of list of addresses */ if (hp->h_addr_list[i] == NULL) break; address.sin_addr.s_addr = *(long *) hp->h_addr_list[i]; - if (verbose) + if (metaVerbose) LineToConsole ("Requesting player list from metaserver %s at %s\n", token, inet_ntoa(address.sin_addr)); if (sendto(msock, "?", 1, 0, (struct sockaddr *)&address, @@ -431,7 +430,7 @@ } } else { /* call to inet_addr() worked, host name is in IP address form */ - if (verbose) + if (metaVerbose) LineToConsole ("Requesting player list from metaserver %s\n", inet_ntoa(address.sin_addr)); if (sendto(msock, "?", 1, 0, (struct sockaddr *)&address, @@ -489,7 +488,7 @@ if (servers > 2048) return; if (servers < 0) return; - if (verbose) + if (metaVerbose) LineToConsole ("Metaserver at %s responded with %d server%s\n", inet_ntoa(address->sin_addr), servers, @@ -630,7 +629,7 @@ is the case with multihomed machines */ host = inet_ntoa(address->sin_addr); - if (verbose) + if (metaVerbose) LineToConsole ("Server at %s responded\n", host); p = strtok(NULL,","); /* server type */ Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- defaults.c 29 Nov 2006 13:06:41 -0000 1.32 +++ defaults.c 29 Nov 2006 15:01:33 -0000 1.33 @@ -281,6 +281,12 @@ } }, #endif + {"metaVerbose", &metaVerbose, RC_BOOL, + { + "Show detailed messages during connect to metaserver", + NULL + } + }, #endif #ifdef MOTION_MOUSE @@ -2078,6 +2084,16 @@ if (saveBig) fputs ("\n", fp); } + // UDP metacache + if (metaUDPCache != NULL) + { + if (saveBig) + fputs ("# UDP Metacache file\n", fp); + sprintf (str, "metaUDPCache: %s\n", metaUDPCache); + fputs (str, fp); + if (saveBig) + fputs ("\n", fp); + } // player list if (strlen (plistLayout) != 0) Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- data.c 29 Nov 2006 13:06:41 -0000 1.43 +++ data.c 29 Nov 2006 15:01:33 -0000 1.44 @@ -231,7 +231,9 @@ /* Metaservers list - comma delimited */ char *metaServer = "metaserver.us.netrek.org, metaserver2.us.netrek.org"; int metaPort = 3521; +int metaVerbose = 0; char *metaCache = NULL; +char *metaUDPCache = NULL; #ifdef METAPING int metaPing = 1; /* ICMP ping the metaserverlist */ #endif From modemhero at users.sourceforge.net Wed Nov 29 09:01:35 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 29 Nov 2006 15:01:35 +0000 Subject: [netrek-cvs] client/netrekxp/include data.h,1.40,1.41 Message-ID: <20061129150148.C7CAB4CD9B@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv9311/include Modified Files: data.h Log Message: - added "metaVerbose: on/(off)" and "metaUDPCache: (filename)" options to netrekrc and help docs, these were part of the UDP metaserver merge Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- data.h 29 Nov 2006 13:06:40 -0000 1.40 +++ data.h 29 Nov 2006 15:01:33 -0000 1.41 @@ -112,7 +112,9 @@ #ifdef META extern char *metaServer; extern int metaPort; +extern int metaVerbose; extern char *metaCache; +extern char *metaUDPCache; #ifdef METAPING extern int metaPing; #endif From modemhero at users.sourceforge.net Wed Nov 29 09:01:35 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 29 Nov 2006 15:01:35 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.91, 1.92 netrekrc, 1.12, 1.13 netrekrc_options.txt, 1.17, 1.18 Message-ID: <20061129150148.950DE4CD9A@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv9311/resources/docs Modified Files: changes.txt netrekrc netrekrc_options.txt Log Message: - added "metaVerbose: on/(off)" and "metaUDPCache: (filename)" options to netrekrc and help docs, these were part of the UDP metaserver merge Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- netrekrc 29 Nov 2006 14:08:50 -0000 1.12 +++ netrekrc 29 Nov 2006 15:01:33 -0000 1.13 @@ -145,6 +145,9 @@ # Use ICMP to ping the metaserver list metaPing: on +# Show detailed messages during connect to metaserver +metaVerbose: off + # Mouse motion threshold motionThresh: 0 @@ -421,6 +424,9 @@ # Metacache file metaCache: metacache +# UDP Metacache file +metaUDPCache: metaUDPcache + # Custom style for player list # ' ' - White Space # 'b' - Armies Bombed Index: netrekrc_options.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc_options.txt,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- netrekrc_options.txt 29 Nov 2006 13:06:41 -0000 1.17 +++ netrekrc_options.txt 29 Nov 2006 15:01:33 -0000 1.18 @@ -102,6 +102,8 @@ # 2 - cache, then TCP metaserver # 3 - TCP metaserver, then cache +metaUDPCache: (filename) name of UDP metacache file +metaVerbose: (on/off) show detailed messages during connect to metaserver motionThresh: (int) mouse motion threshold mouseAsShift: (on/off) use mouse buttons to switch keymaps mungScrollbarColors: (on/off) set scrollbar colors to match background colors Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.91 retrieving revision 1.92 diff -u -d -r1.91 -r1.92 --- changes.txt 29 Nov 2006 14:08:50 -0000 1.91 +++ changes.txt 29 Nov 2006 15:01:33 -0000 1.92 @@ -1,4 +1,6 @@ Netrek XP 2006, Version 1.2: +- added "metaVerbose: on/(off)" and "metaUDPCache: (filename)" options to netrekrc + and help docs, these were part of the UDP metaserver merge - close windows key now closes ping stats window, graphical ship stats window, sound window, xtrekrc window, documentation window, and short packets window - remapped close special windows key to W (was unused in the prior xp 2006 keymap) From modemhero at users.sourceforge.net Wed Nov 29 09:01:35 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 29 Nov 2006 15:01:35 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C,1.74,1.75 Message-ID: <20061129150144.0E446B3EA@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv9311 Modified Files: NetrekXP to do list.C Log Message: - added "metaVerbose: on/(off)" and "metaUDPCache: (filename)" options to netrekrc and help docs, these were part of the UDP metaserver merge Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.74 retrieving revision 1.75 diff -u -d -r1.74 -r1.75 --- NetrekXP to do list.C 29 Nov 2006 14:08:50 -0000 1.74 +++ NetrekXP to do list.C 29 Nov 2006 15:01:33 -0000 1.75 @@ -66,7 +66,6 @@ 11) Pop-up dialog box for bad version response 12) Bugs with cambot playback: t-mode on/off sound plays continually, something odd with tourn status packet, looks like it's server side in inl_move -13) detcircle, cow version history Stas's list: - color coded playerlist. From modemhero at users.sourceforge.net Wed Nov 29 09:09:37 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 29 Nov 2006 15:09:37 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.92,1.93 Message-ID: <20061129150949.99029B3EA@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv12672/resources/docs Modified Files: changes.txt Log Message: Det circle changed so it only flashes on det, rather than be on all the time Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.92 retrieving revision 1.93 diff -u -d -r1.92 -r1.93 --- changes.txt 29 Nov 2006 15:01:33 -0000 1.92 +++ changes.txt 29 Nov 2006 15:09:35 -0000 1.93 @@ -1,4 +1,5 @@ Netrek XP 2006, Version 1.2: +- det circle changed so it only flashes on det, rather than be on all the time - added "metaVerbose: on/(off)" and "metaUDPCache: (filename)" options to netrekrc and help docs, these were part of the UDP metaserver merge - close windows key now closes ping stats window, graphical ship stats window, From modemhero at users.sourceforge.net Wed Nov 29 09:09:38 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 29 Nov 2006 15:09:38 +0000 Subject: [netrek-cvs] client/netrekxp/src input.c, 1.16, 1.17 local.c, 1.47, 1.48 Message-ID: <20061129150949.BFB3FB3EB@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv12672/src Modified Files: input.c local.c Log Message: Det circle changed so it only flashes on det, rather than be on all the time Index: input.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/input.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- input.c 29 Nov 2006 14:08:50 -0000 1.16 +++ input.c 29 Nov 2006 15:09:35 -0000 1.17 @@ -3023,6 +3023,7 @@ lastdet = curtime; } #endif /* AUTOKEY */ + detCircle = 1; } Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- local.c 3 Jul 2006 17:03:24 -0000 1.47 +++ local.c 29 Nov 2006 15:09:35 -0000 1.48 @@ -1184,6 +1184,7 @@ clearzone[2][clearcount] = 2*DETDIST/SCALE + 1; clearzone[3][clearcount] = 2*DETDIST/SCALE + 1; clearcount++; + detCircle--; } } #ifdef HOCKEY_LINES From modemhero at users.sourceforge.net Wed Nov 29 19:25:07 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 30 Nov 2006 01:25:07 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo, 1.46, 1.47 compile.txt, 1.10, 1.11 Message-ID: <20061130012517.7EDA9B3F2@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv19426 Modified Files: clientr.suo compile.txt Log Message: Updated compile instruction to mention NOT to use cygwin or it breaks makefiles. Version changed from 1.1 to 1.2. Infinite loop fixed in parsemeta.c (LoadMetasCache). Minor makefile formatting and debug fixes. Updated cygwin1.dll binary so mkkey program works. Index: compile.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/compile.txt,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- compile.txt 11 Jul 2006 05:06:24 -0000 1.10 +++ compile.txt 30 Nov 2006 01:25:05 -0000 1.11 @@ -40,7 +40,8 @@ Step 3: -------- -Open command prompt in the source tree directory and run build.cmd +Open command prompt in the source tree directory and run build.cmd. Note that this build +script must use borland make, not GNU make, so don't try and run it under cygwin. If everything is correct and working then after a couple of minutes you will have compiled a working client under InstCWD\netrek. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 Binary files /tmp/cvsGbos24 and /tmp/cvsoIbuaT differ From modemhero at users.sourceforge.net Wed Nov 29 19:25:08 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 30 Nov 2006 01:25:08 +0000 Subject: [netrek-cvs] client/netrekxp/tools cygwin1.dll,1.1,1.2 Message-ID: <20061130012517.5D3F5B3EE@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/tools In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv19426/tools Modified Files: cygwin1.dll Log Message: Updated compile instruction to mention NOT to use cygwin or it breaks makefiles. Version changed from 1.1 to 1.2. Infinite loop fixed in parsemeta.c (LoadMetasCache). Minor makefile formatting and debug fixes. Updated cygwin1.dll binary so mkkey program works. Index: cygwin1.dll =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/tools/cygwin1.dll,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvs4SIOfQ and /tmp/cvsQ52wUF differ From modemhero at users.sourceforge.net Wed Nov 29 19:25:07 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 30 Nov 2006 01:25:07 +0000 Subject: [netrek-cvs] client/netrekxp/src/cursors makefile,1.2,1.3 Message-ID: <20061130012517.594DBB3EB@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src/cursors In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv19426/src/cursors Modified Files: makefile Log Message: Updated compile instruction to mention NOT to use cygwin or it breaks makefiles. Version changed from 1.1 to 1.2. Infinite loop fixed in parsemeta.c (LoadMetasCache). Minor makefile formatting and debug fixes. Updated cygwin1.dll binary so mkkey program works. Index: makefile =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/cursors/makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- makefile 7 May 2006 16:59:27 -0000 1.2 +++ makefile 30 Nov 2006 01:25:05 -0000 1.3 @@ -13,7 +13,7 @@ RESOURCES = curslib.res $(RESOURCES): curslib.rc - $(rc) -FOcurslib.res curslib.rc + $(rc) -FOcurslib.res curslib.rc curslib.dll: $(RESOURCES) $(link) -Tpd -aa -V4.0 -c -x C0d32.OBJ, curslib.dll,, import32.lib cw32i.lib, , $(RESOURCES) From modemhero at users.sourceforge.net Wed Nov 29 19:25:07 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 30 Nov 2006 01:25:07 +0000 Subject: [netrek-cvs] client/netrekxp/include version.h,1.5,1.6 Message-ID: <20061130012517.7B2A828F1A@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv19426/include Modified Files: version.h Log Message: Updated compile instruction to mention NOT to use cygwin or it breaks makefiles. Version changed from 1.1 to 1.2. Infinite loop fixed in parsemeta.c (LoadMetasCache). Minor makefile formatting and debug fixes. Updated cygwin1.dll binary so mkkey program works. Index: version.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/version.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- version.h 13 Jun 2006 11:40:00 -0000 1.5 +++ version.h 30 Nov 2006 01:25:05 -0000 1.6 @@ -2,5 +2,5 @@ /* store the version info here */ -static char mvers[] = "1.1"; +static char mvers[] = "1.2"; static char version[] = "Netrek XP 2006"; \ No newline at end of file From modemhero at users.sourceforge.net Wed Nov 29 19:25:08 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 30 Nov 2006 01:25:08 +0000 Subject: [netrek-cvs] client/netrekxp/src/winkey makefile,1.2,1.3 Message-ID: <20061130012517.5301028F13@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src/winkey In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv19426/src/winkey Modified Files: makefile Log Message: Updated compile instruction to mention NOT to use cygwin or it breaks makefiles. Version changed from 1.1 to 1.2. Infinite loop fixed in parsemeta.c (LoadMetasCache). Minor makefile formatting and debug fixes. Updated cygwin1.dll binary so mkkey program works. Index: makefile =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/winkey/makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- makefile 7 May 2006 21:10:52 -0000 1.2 +++ makefile 30 Nov 2006 01:25:05 -0000 1.3 @@ -2,6 +2,8 @@ # This makefile is written for Borland C++ 5.5 # +#DEBUG = 1 + # Borland C++ 5.5 cc = bcc32 rc = brcc32 @@ -19,7 +21,7 @@ all: winkey.dll .cpp.obj: - $(cc) $(cflags) $(ccompileonly) $< + $(cc) $(cflags) $(ccompileonly) $< winkey.dll: winkey.obj winkeyshared.obj $(link) $(LIBOPTS) -Tpd -aa -V4.0 -c -x -GS:SHSEG=rws C0d32.OBJ winkey.obj winkeyshared.obj, winkey.dll,, import32.lib cw32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib, winkeybcc.def From modemhero at users.sourceforge.net Wed Nov 29 19:25:07 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 30 Nov 2006 01:25:07 +0000 Subject: [netrek-cvs] client/netrekxp/src bccnetrek.rc, 1.6, 1.7 netrek.rc, 1.4, 1.5 parsemeta.c, 1.16, 1.17 vccnetrek.rc, 1.4, 1.5 Message-ID: <20061130012517.54F4C28F17@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv19426/src Modified Files: bccnetrek.rc netrek.rc parsemeta.c vccnetrek.rc Log Message: Updated compile instruction to mention NOT to use cygwin or it breaks makefiles. Version changed from 1.1 to 1.2. Infinite loop fixed in parsemeta.c (LoadMetasCache). Minor makefile formatting and debug fixes. Updated cygwin1.dll binary so mkkey program works. Index: bccnetrek.rc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/bccnetrek.rc,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- bccnetrek.rc 13 Jun 2006 11:40:00 -0000 1.6 +++ bccnetrek.rc 30 Nov 2006 01:25:05 -0000 1.7 @@ -1,8 +1,8 @@ #include "resource.h" 1 VERSIONINFO -FILEVERSION 1, 1, 0, 0 -PRODUCTVERSION 1, 1, 0, 0 +FILEVERSION 1, 2, 0, 0 +PRODUCTVERSION 1, 2, 0, 0 FILEOS VOS_DOS_WINDOWS32 FILETYPE VFT_APP { BLOCK "StringFileInfo" Index: vccnetrek.rc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/vccnetrek.rc,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- vccnetrek.rc 13 Jun 2006 11:40:00 -0000 1.4 +++ vccnetrek.rc 30 Nov 2006 01:25:05 -0000 1.5 @@ -3,8 +3,8 @@ MAIN ICON DISCARDABLE "main.ico" 1 VERSIONINFO -FILEVERSION 1, 1, 0, 0 -PRODUCTVERSION 1, 1, 0, 0 +FILEVERSION 1, 2, 0, 0 +PRODUCTVERSION 1, 2, 0, 0 { BLOCK "StringFileInfo" { BLOCK "040904E4" { Index: netrek.rc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/netrek.rc,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- netrek.rc 13 Jun 2006 11:40:00 -0000 1.4 +++ netrek.rc 30 Nov 2006 01:25:05 -0000 1.5 @@ -47,14 +47,14 @@ VALUE "Comments", "\0" VALUE "CompanyName", "Netrek\0" VALUE "FileDescription", "Netrek XP 2006 Client\0" - VALUE "FileVersion", "1, 1, 0, 0\0" + VALUE "FileVersion", "1, 2, 0, 0\0" VALUE "InternalName", "Netrek XP 2006\0" VALUE "LegalCopyright", "Copyright ? 1986-2006\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "netrek.rc\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "Netrek XP 2006 Client\0" - VALUE "ProductVersion", "1, 0, 0, 1\0" + VALUE "ProductVersion", "1, 0, 0, 2\0" VALUE "SpecialBuild", "\0" END END Index: parsemeta.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/parsemeta.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- parsemeta.c 29 Nov 2006 15:01:33 -0000 1.16 +++ parsemeta.c 30 Nov 2006 01:25:05 -0000 1.17 @@ -886,7 +886,7 @@ if (serverlist[i].lifetime-- > 0) continue; /* delete this entry by moving the ones above down */ - for(j=i;j Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22793 Modified Files: NetrekXP to do list.C Log Message: T mode start/stop sounds will no longer be heard if in playback (cambot viewing) mode, as the INL server seems somewhat broken with regard to tourn status, especially near the end game (during "x time left" messages, it seems that tourn status flips from on to off to on again rapidly. Plus, if the server is running INL mode, tourn status isn't that important. Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.75 retrieving revision 1.76 diff -u -d -r1.75 -r1.76 --- NetrekXP to do list.C 29 Nov 2006 15:01:33 -0000 1.75 +++ NetrekXP to do list.C 30 Nov 2006 01:32:36 -0000 1.76 @@ -52,6 +52,8 @@ 1) resizeable message windows. Perhaps memory of window positions if you choose to save settings. Text in windows should adjust to new window size. 2) Save options for observer/servernick/servertype need to be saved +3) Although the borland build works without errors, the netrek executable crashes, and +it is beyond my knowledge to know how to debug it. 4) Get source code for installer from Joe. 5) Get square planet bitmaps so I can turn them into mapped rotating globes. 7) problem with message windows, text getting garbled near top, goes away with @@ -64,8 +66,7 @@ 8) Have client utilize new server torp vector code 10) Fade out ship explosion sound on quit 11) Pop-up dialog box for bad version response -12) Bugs with cambot playback: t-mode on/off sound plays continually, something odd with -tourn status packet, looks like it's server side in inl_move + Stas's list: - color coded playerlist. From modemhero at users.sourceforge.net Wed Nov 29 19:32:38 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 30 Nov 2006 01:32:38 +0000 Subject: [netrek-cvs] client/netrekxp/src socket.c,1.8,1.9 Message-ID: <20061130013246.3A2C128F17@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22793/src Modified Files: socket.c Log Message: T mode start/stop sounds will no longer be heard if in playback (cambot viewing) mode, as the INL server seems somewhat broken with regard to tourn status, especially near the end game (during "x time left" messages, it seems that tourn status flips from on to off to on again rapidly. Plus, if the server is running INL mode, tourn status isn't that important. Index: socket.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/socket.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- socket.c 20 Sep 2006 16:54:20 -0000 1.8 +++ socket.c 30 Nov 2006 01:32:36 -0000 1.9 @@ -1172,6 +1172,9 @@ if (oldtourn != status->tourn && oldtourn != 2) { #ifdef SOUND +#ifdef RECORDGAME + if (!inplayback) { +#endif if (status->tourn) { if (newSound) @@ -1185,7 +1188,10 @@ Play_Sound(STOP_TMODE_WAV); else Play_Sound(STOP_TMODE_SOUND); - } + } +#ifdef RECORDGAME + } +#endif #endif } oldtourn = status->tourn; From modemhero at users.sourceforge.net Thu Nov 30 05:28:59 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 30 Nov 2006 11:28:59 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C,1.76,1.77 Message-ID: <20061130112910.0E245B3F2@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv16835 Modified Files: NetrekXP to do list.C Log Message: Compile fixes with SOUND undefined. Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.76 retrieving revision 1.77 diff -u -d -r1.76 -r1.77 --- NetrekXP to do list.C 30 Nov 2006 01:32:36 -0000 1.76 +++ NetrekXP to do list.C 30 Nov 2006 11:28:56 -0000 1.77 @@ -23,6 +23,7 @@ 14) on daemon exit in newbie/pret, kill any hosed bot slots 15) end game bots are stupid, and on timericide don't act right 16) if obs in game when merlin quits, queues still open..should be closed dammit +17) final planet count and cscore would be nice in pw_stats Sturgeon problems 1) after free upgrade, ship cap packet not being sent to everyone..seems to @@ -67,7 +68,6 @@ 10) Fade out ship explosion sound on quit 11) Pop-up dialog box for bad version response - Stas's list: - color coded playerlist. - check inl server for behavior (observers and tractor/pressor packets) From modemhero at users.sourceforge.net Thu Nov 30 05:28:59 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 30 Nov 2006 11:28:59 +0000 Subject: [netrek-cvs] client/netrekxp/src defaults.c, 1.33, 1.34 input.c, 1.17, 1.18 newwin.c, 1.44, 1.45 Message-ID: <20061130112910.0D256B3EE@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv16835/src Modified Files: defaults.c input.c newwin.c Log Message: Compile fixes with SOUND undefined. Index: newwin.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- newwin.c 29 Nov 2006 12:40:22 -0000 1.44 +++ newwin.c 30 Nov 2006 11:28:57 -0000 1.45 @@ -1002,6 +1002,7 @@ getResources (progname); } +#if defined(SOUND) /******************************************************************************/ /*** newsoundwin() - Need to map it after reset_defaults, so pulled out of newwin /******************************************************************************/ @@ -1026,6 +1027,7 @@ W_DefineArrowCursor(soundWin); } } +#endif /******************************************************************************/ /*** mapAll() Index: input.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/input.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- input.c 29 Nov 2006 15:09:35 -0000 1.17 +++ input.c 30 Nov 2006 11:28:57 -0000 1.18 @@ -2849,7 +2849,7 @@ #ifdef SOUND ChangeVolume (1); #else - emptykey (); + emptyKey (); #endif } Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- defaults.c 29 Nov 2006 15:01:33 -0000 1.33 +++ defaults.c 30 Nov 2006 11:28:56 -0000 1.34 @@ -665,12 +665,14 @@ NULL } }, +#ifdef SOUND {"sound", &sound_init, RC_BOOL, { "Enable sound", NULL } }, +#endif {"theirPhaserShrink", &theirPhaserShrink, RC_INT, { "Shrink enemy phaser by x/16 of its length", @@ -2062,7 +2064,8 @@ fputs (str, fp); if (saveBig) fputs ("\n", fp); - + +#ifdef SOUND // sound directory if (sounddir != NULL) { @@ -2073,7 +2076,8 @@ if (saveBig) fputs ("\n", fp); } - +#endif + // metacache if (metaCache != NULL) { From modemhero at users.sourceforge.net Thu Nov 30 18:43:13 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 01 Dec 2006 00:43:13 +0000 Subject: [netrek-cvs] client/netrekxp/src cowmain.c, 1.17, 1.18 parsemeta.c, 1.17, 1.18 Message-ID: <20061201004323.EC2444CD9A@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv23953/src Modified Files: cowmain.c parsemeta.c Log Message: Add sanity check on server status in metarefresh() so it doesn't fall out of bounds. Index: cowmain.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/cowmain.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- cowmain.c 29 Nov 2006 12:06:34 -0000 1.17 +++ cowmain.c 1 Dec 2006 00:43:11 -0000 1.18 @@ -656,7 +656,7 @@ parsemeta(metaType); } #endif - + fed_ship_bmp = "bitmaps/shiplib/fedship.bmp"; if ((stringDefault ("fedshipbmpfile")) != NULL) fed_ship_bmp = stringDefault ("fedshipbmpfile"); Index: parsemeta.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/parsemeta.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- parsemeta.c 30 Nov 2006 01:25:05 -0000 1.17 +++ parsemeta.c 1 Dec 2006 00:43:11 -0000 1.18 @@ -839,7 +839,7 @@ FILE *cache; char *cacheName; char cacheFileName[PATH_MAX]; - int i; + int i, j; cacheName = stringDefault("metaUDPCache"); @@ -877,8 +877,6 @@ /* hunt and kill old server lines from cache */ for(i=0;istatus < statusOpen || sp->status > statusConnecting) + sp->status = statusNull; + sprintf(buf + strlen (buf), "%14s ", statusStrings[sp->status]); if (sp->status == statusConnecting) color = W_Yellow; From modemhero at users.sourceforge.net Thu Nov 30 18:43:13 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 01 Dec 2006 00:43:13 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C,1.77,1.78 Message-ID: <20061201004323.E8E50B3EB@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv23953 Modified Files: NetrekXP to do list.C Log Message: Add sanity check on server status in metarefresh() so it doesn't fall out of bounds. Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.77 retrieving revision 1.78 diff -u -d -r1.77 -r1.78 --- NetrekXP to do list.C 30 Nov 2006 11:28:56 -0000 1.77 +++ NetrekXP to do list.C 1 Dec 2006 00:43:10 -0000 1.78 @@ -53,8 +53,6 @@ 1) resizeable message windows. Perhaps memory of window positions if you choose to save settings. Text in windows should adjust to new window size. 2) Save options for observer/servernick/servertype need to be saved -3) Although the borland build works without errors, the netrek executable crashes, and -it is beyond my knowledge to know how to debug it. 4) Get source code for installer from Joe. 5) Get square planet bitmaps so I can turn them into mapped rotating globes. 7) problem with message windows, text getting garbled near top, goes away with From modemhero at users.sourceforge.net Thu Nov 30 18:49:58 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 01 Dec 2006 00:49:58 +0000 Subject: [netrek-cvs] client/netrekxp/src parsemeta.c,1.18,1.19 Message-ID: <20061201005006.50F964CD99@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26472/src Modified Files: parsemeta.c Log Message: Changed how metarefresh() handes comment/address field, so it now has a sanity check on the length of both, not just on comment. Index: parsemeta.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/parsemeta.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- parsemeta.c 1 Dec 2006 00:43:11 -0000 1.18 +++ parsemeta.c 1 Dec 2006 00:49:56 -0000 1.19 @@ -1182,7 +1182,7 @@ /* Refresh line i in the list */ { struct servers *sp; - char comment[LINE]; + char serverline[LINE]; char buf[LINE + 1]; #ifdef METAPING @@ -1203,29 +1203,26 @@ if (metablock(sp->address)) return; + /* Ensure comment/address field not longer than we want */ #ifdef METAPING if (metaPing) { if (strlen(sp->comment)) - { - strncpy(comment, sp->comment, 34); - comment[34] = '\0'; - sprintf(buf, "%-34s ", comment); - } + strncpy(serverline, sp->comment, 34); else - sprintf (buf, "%-34s ", sp->address); + strncpy(serverline, sp->address, 34); + serverline[34] = '\0'; + sprintf(buf, "%-34s ", serverline); } else { #endif if (strlen(sp->comment)) - { - strncpy(comment, sp->comment, 40); - comment[40] = '\0'; - sprintf(buf, "%-40s ", comment); - } + strncpy(serverline, sp->comment, 40); else - sprintf (buf, "%-40s ", sp->address); + strncpy(serverline, sp->address, 40); + serverline[40] = '\0'; + sprintf(buf, "%-40s ", serverline); #ifdef METAPING } #endif