From modemhero at users.sourceforge.net Thu Mar 1 01:35:47 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 01 Mar 2007 07:35:47 +0000 Subject: [netrek-cvs] client/netrekxp/src/cursors curslib.suo,1.5,1.6 Message-ID: <20070301073555.BF0751867D3@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src/cursors In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22007/src/cursors Modified Files: curslib.suo Log Message: Remove intro_wav from the sound arrays, forgot to do that. Add back the curslib and winkey projects to overall clientr, dunno how those got deleted. Added in COW's extended packet logging, only required a minor change due to XP 2006 supporting self_19flags, so minor change to how sequence packet was handled. Don't fade out music on reentry if background music option is set to on, thus music will continue to play through death/reentry. Index: curslib.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/cursors/curslib.suo,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 Binary files /tmp/cvs1SOczT and /tmp/cvsHAAGSa differ From modemhero at users.sourceforge.net Thu Mar 1 01:35:46 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 01 Mar 2007 07:35:46 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.107, 1.108 clientr.sln, 1.2, 1.3 clientr.suo, 1.86, 1.87 Message-ID: <20070301073555.C8469B3F0@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22007 Modified Files: NetrekXP to do list.C clientr.sln clientr.suo Log Message: Remove intro_wav from the sound arrays, forgot to do that. Add back the curslib and winkey projects to overall clientr, dunno how those got deleted. Added in COW's extended packet logging, only required a minor change due to XP 2006 supporting self_19flags, so minor change to how sequence packet was handled. Don't fade out music on reentry if background music option is set to on, thus music will continue to play through death/reentry. Index: clientr.sln =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.sln,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- clientr.sln 27 Feb 2007 08:37:05 -0000 1.2 +++ clientr.sln 1 Mar 2007 07:35:44 -0000 1.3 @@ -1,8 +1,12 @@ ??? Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual C++ Express 2005 +# Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clientr", "clientr.vcproj", "{AF2EDB01-9BF0-463A-96EF-046B5845BAE8}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curslib", "src\cursors\curslib.vcproj", "{74EFAF4D-D9A0-421D-8A94-08DBB03D533C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winkey", "src\winkey\winkey.vcproj", "{DEBF4D2E-001E-47DA-A88C-8FF90C55C6ED}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -13,6 +17,14 @@ {AF2EDB01-9BF0-463A-96EF-046B5845BAE8}.Debug|Win32.Build.0 = Debug|Win32 {AF2EDB01-9BF0-463A-96EF-046B5845BAE8}.Release|Win32.ActiveCfg = Release|Win32 {AF2EDB01-9BF0-463A-96EF-046B5845BAE8}.Release|Win32.Build.0 = Release|Win32 + {74EFAF4D-D9A0-421D-8A94-08DBB03D533C}.Debug|Win32.ActiveCfg = Debug|Win32 + {74EFAF4D-D9A0-421D-8A94-08DBB03D533C}.Debug|Win32.Build.0 = Debug|Win32 + {74EFAF4D-D9A0-421D-8A94-08DBB03D533C}.Release|Win32.ActiveCfg = Release|Win32 + {74EFAF4D-D9A0-421D-8A94-08DBB03D533C}.Release|Win32.Build.0 = Release|Win32 + {DEBF4D2E-001E-47DA-A88C-8FF90C55C6ED}.Debug|Win32.ActiveCfg = Debug|Win32 + {DEBF4D2E-001E-47DA-A88C-8FF90C55C6ED}.Debug|Win32.Build.0 = Debug|Win32 + {DEBF4D2E-001E-47DA-A88C-8FF90C55C6ED}.Release|Win32.ActiveCfg = Release|Win32 + {DEBF4D2E-001E-47DA-A88C-8FF90C55C6ED}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.86 retrieving revision 1.87 diff -u -d -r1.86 -r1.87 Binary files /tmp/cvsjaUCqr and /tmp/cvsOqzvJH differ Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.107 retrieving revision 1.108 diff -u -d -r1.107 -r1.108 --- NetrekXP to do list.C 28 Feb 2007 13:01:14 -0000 1.107 +++ NetrekXP to do list.C 1 Mar 2007 07:35:44 -0000 1.108 @@ -56,7 +56,6 @@ ! server: ita won't block RCDs (why not ?) ! after res if there cloaker around he will be seen briefly (speed 0 bug) - add "reset to defaults" to options menu -- add bitmap themes option (change default bitmap naming and processing) - add shiftMouse, controlMouse on/off - fix accelerated scroll for microsoft mice - add msg.phaser to enable formatting of phaser messages From modemhero at users.sourceforge.net Thu Mar 1 01:35:47 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 01 Mar 2007 07:35:47 +0000 Subject: [netrek-cvs] client/netrekxp/src cowmain.c, 1.26, 1.27 smessage.c, 1.4, 1.5 socket.c, 1.21, 1.22 sound.c, 1.32, 1.33 Message-ID: <20070301073555.A4BFFB3ED@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22007/src Modified Files: cowmain.c smessage.c socket.c sound.c Log Message: Remove intro_wav from the sound arrays, forgot to do that. Add back the curslib and winkey projects to overall clientr, dunno how those got deleted. Added in COW's extended packet logging, only required a minor change due to XP 2006 supporting self_19flags, so minor change to how sequence packet was handled. Don't fade out music on reentry if background music option is set to on, thus music will continue to play through death/reentry. Index: cowmain.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/cowmain.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- cowmain.c 28 Feb 2007 12:21:50 -0000 1.26 +++ cowmain.c 1 Mar 2007 07:35:44 -0000 1.27 @@ -1068,8 +1068,9 @@ #ifdef SOUND /* Kill all currently playing sounds when entering game */ Mix_HaltChannel(-1); - /* Fade out any music playing over 5 seconds */ - if (Mix_PlayingMusic()) + /* Fade out any music playing over 5 seconds if background + music is off (i.e fade out geno music) */ + if (Mix_PlayingMusic() && !soundMusicBkgd) { Mix_FadeOutMusic(5000); /* Attempt to start background music once fadeout done */ Index: smessage.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/smessage.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- smessage.c 7 May 2006 16:59:27 -0000 1.4 +++ smessage.c 1 Mar 2007 07:35:45 -0000 1.5 @@ -38,8 +38,8 @@ W_ClearWindow (messagew); - if (length == 0) - return; + if (length == 0) + return; if (length > 80) { Index: socket.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/socket.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- socket.c 28 Feb 2007 12:21:50 -0000 1.21 +++ socket.c 1 Mar 2007 07:35:45 -0000 1.22 @@ -333,6 +333,111 @@ fCloak, fBomb, fDockperm, fPhaser, fPlasma, fPlayLock, fPlanLock, fTractor, fRepress; +/* print the SP_S_TORP* packets. */ +/* sbuf = pointer to packet buff */ +/* type=1 print SP_S_TORP */ +/* type=2 print SP_S_8_TORP */ +/* type=3 print SP_S_TORP_INFO */ +void print_sp_s_torp(char *sbuf, int type) +{ + unsigned char which, *data, infobitset, *infodata; + unsigned char bitset; + int dx, dy; + int shiftvar; + int i; + char status, war; + register int shift = 0; /* How many torps are + * * extracted (for shifting) */ + if ( (type == 1) || (type == 2) ) + { + /* now we must find the data ... :-) */ + if (sbuf[0] == SP_S_8_TORP) + { /* MAX packet */ + bitset = 0xff; + which = sbuf[1]; + data = &sbuf[2]; + } + else + { /* Normal Packet */ + bitset = sbuf[1]; + which = sbuf[2]; + data = &sbuf[3]; + } + LineToConsole(" bitset=0x%0X, which=%d, ", bitset, which); +#ifdef CORRUPTED_PACKETS + /* we probably should do something clever here - jmn */ +#endif + for (shift = 0, i = 0; i < 8; i++, bitset >>= 1) + { + if (bitset & 01) + { + dx = (*data >> shift); + data++; + shiftvar = (unsigned char) *data; /* to silence gcc */ + shiftvar <<= (8 - shift); + dx |= (shiftvar & 511); + shift++; + dy = (*data >> shift); + data++; + shiftvar = (unsigned char) *data; /* to silence gcc */ + shiftvar <<= (8 - shift); + dy |= (shiftvar & 511); + shift++; + if (shift == 8) + { + shift = 0; + data++; + } + LineToConsole("dx=%d, dy=%d, ",dx, dy); + } + } + } + else if (type == 3) + { + /* now we must find the data ... :-) */ + bitset = sbuf[1]; + which = sbuf[2]; + infobitset = sbuf[3]; + /* Where is the data ? */ + data = &sbuf[4]; + LineToConsole(" bitset=0x%0X, which=%d, infobitset=0x%0X, ", + bitset, which, infobitset); + infodata = &sbuf[vtisize[numofbits[(unsigned char) sbuf[1]]]]; + for (shift = 0, i = 0; i < 8; bitset >>= 1, infobitset >>= 1, i++) + { + if (bitset & 01) + { + dx = (*data >> shift); + data++; + shiftvar = (unsigned char) *data; /* to silence gcc */ + shiftvar <<= (8 - shift); + dx |= (shiftvar & 511); + shift++; + dy = (*data >> shift); + data++; + shiftvar = (unsigned char) *data; /* to silence gcc */ + shiftvar <<= (8 - shift); + dy |= (shiftvar & 511); + shift++; + if (shift == 8) + { + shift = 0; + data++; + } + LineToConsole("dx=%d, dy=%d, ",dx, dy); + } + /* Now the TorpInfo */ + if (infobitset & 01) + { + war = (unsigned char) *infodata & 15 /* 0x0f */ ; + status = ((unsigned char) *infodata & 0xf0) >> 4; + infodata++; + LineToConsole("war=0x%0X, status=0x%0X, ", war, status); + } /* if */ + } /* for */ + } +} + /* reset all the "force command" variables */ void resetForce (void) @@ -1045,7 +1150,10 @@ #ifdef PACKET_LOG if (log_packets) + { (void) Log_Packet ((char) (*bufptr), size); + print_packet(bufptr, size); + } #endif if (asock == udpSock) @@ -1430,7 +1538,10 @@ #ifdef PACKET_LOG if (log_packets) + { Log_OPacket (packet->type, size); + print_opacket((char *) packet,size); + } #endif if (commMode == COMM_UDP) @@ -3251,6 +3362,855 @@ #endif } +void print_packet(char *packet, int size) +{ + int i; /* lcv */ + unsigned int j; + unsigned char *data; + int kills, pnum, nplanets; + struct planet_s_spacket *plpacket; + if(log_packets == 0) return; + switch ( packet[0] ) + { + case SP_MESSAGE: + LineToConsole("\nS->C SP_MESSAGE\t"); + if (log_packets > 1) + LineToConsole(" m_flags=0x%0X, m_recpt=%d, m_from=%d, mesg=\"%s\",", + ((struct mesg_spacket *) packet)->m_flags, + ((struct mesg_spacket *) packet)->m_recpt, + ((struct mesg_spacket *) packet)->m_from, + ((struct mesg_spacket *) packet)->mesg ); + break; + case SP_PLAYER_INFO : /* general player info not */ + /* * elsewhere */ + LineToConsole("\nS->C SP_PLAYER_INFO\t"); + if (log_packets > 1) + LineToConsole(" pnum=%d, shiptype=%d, team=%d,", + ((struct plyr_info_spacket *) packet)->pnum, + ((struct plyr_info_spacket *) packet)->shiptype, + ((struct plyr_info_spacket *) packet)->team ); + break; + case SP_KILLS : /* # kills a player has */ + LineToConsole("\nS->C SP_KILLS\t"); + if (log_packets > 1) + LineToConsole(" pnum=%d, kills=%u,", + ((struct kills_spacket *) packet)->pnum, + ntohl(((struct kills_spacket *) packet)->kills) ); + break; + case SP_PLAYER : /* x,y for player */ + LineToConsole("\nS->C SP_PLAYER\t"); + if (log_packets > 1) + LineToConsole(" pnum=%d, dir=%u, speed=%d,x=%ld, y=%d,", + ((struct player_spacket *) packet)->pnum, + ((struct player_spacket *) packet)->dir, + ((struct player_spacket *) packet)->speed, + ntohl(((struct player_spacket *) packet)->x), + ntohl(((struct player_spacket *) packet)->y) ); + break; + case SP_TORP_INFO : /* torp status */ + LineToConsole("\nS->C SP_TORP_INFO\t"); + if (log_packets > 1) + LineToConsole(" war=%d, status=%d, tnum=%u,", + ((struct torp_info_spacket *) packet)->war, + ((struct torp_info_spacket *) packet)->status, + ntohs(((struct torp_info_spacket *) packet)->tnum) ); + break; + case SP_TORP : /* torp location */ + LineToConsole("\nS->C SP_TORP\t"); + if (log_packets > 1) + LineToConsole(" dir=%d, tnum=%u, x=%u, y=%u,", + ((struct torp_spacket *) packet)->dir, + ntohs(((struct torp_spacket *) packet)->tnum), + ntohl(((struct torp_spacket *) packet)->x), + ntohl(((struct torp_spacket *) packet)->y) ); + break; + case SP_PHASER : /* phaser status and * * + * direction */ + LineToConsole("\nS->C SP_PHASER\t"); + if (log_packets > 1) + LineToConsole(" pnum=%d, status=%d, dir=%u, x=%ld, y=%ld, target=%ld,", + ((struct phaser_spacket *) packet)->pnum, + ((struct phaser_spacket *) packet)->status, + ((struct phaser_spacket *) packet)->dir, + ntohl(((struct phaser_spacket *) packet)->x), + ntohl(((struct phaser_spacket *) packet)->y), + ntohl(((struct phaser_spacket *) packet)->target) ); + break; + case SP_PLASMA_INFO : /* player login information */ + LineToConsole("\nS->C SP_PLASMA_INFO\t"); + if (log_packets > 1) + LineToConsole(" war=%d, status=%d pnum=%u,", + ((struct plasma_info_spacket *) packet)->war, + ((struct plasma_info_spacket *) packet)->status, + ntohs(((struct plasma_info_spacket *) packet)->pnum) ); + break; + case SP_PLASMA : /* like SP_TORP */ + LineToConsole("\nS->C SP_PLASMA\t"); + if (log_packets > 1) + LineToConsole(" pnum=%u, x=%ld, y=%ld,", + ntohs(((struct plasma_spacket *) packet)->pnum), + ntohl(((struct plasma_spacket *) packet)->x), + ntohl(((struct plasma_spacket *) packet)->y) ); + break; + case SP_WARNING : /* like SP_MESG */ + fprintf(stderr,"\nS->C SP_WARNING\t"); + if (log_packets > 1) + LineToConsole(" mesg=\"%s\",", + ((struct warning_spacket *) packet)->mesg); + break; + case SP_MOTD : /* line from .motd screen */ + fprintf(stderr,"\nS->C SP_MOTD\t"); + if (log_packets > 1) + LineToConsole(" line=\"%s\",", + ((struct motd_spacket *) packet)->line); + break; + case SP_YOU : /* info on you? */ + LineToConsole("\nS->C SP_YOU\t"); + if (log_packets > 1) + LineToConsole(" pnum=%d, hostile=%d, swar=%d, armies=%d, flags=0x%0X, damage=%ld, shield=%ld, fuel=%ld, etemp=%u, wtemp=%u, whydead=%u, whodead=%u,", + ((struct you_spacket *) packet)->pnum, + ((struct you_spacket *) packet)->hostile, + ((struct you_spacket *) packet)->swar, + ((struct you_spacket *) packet)->armies, + ntohs(((struct you_spacket *) packet)->flags), + ntohl(((struct you_spacket *) packet)->damage), + ntohl(((struct you_spacket *) packet)->shield), + ntohl(((struct you_spacket *) packet)->fuel), + ntohs(((struct you_spacket *) packet)->etemp), + ntohs(((struct you_spacket *) packet)->wtemp), + ntohs(((struct you_spacket *) packet)->whydead), + ntohs(((struct you_spacket *) packet)->whodead) ); + break; + case SP_QUEUE : /* estimated loc in queue? */ + LineToConsole("\nS->C SP_QUEUE\t"); + if (log_packets > 1) + LineToConsole(" pos=%u,", + ntohs(((struct queue_spacket *) packet)->pos) ); + break; + case SP_STATUS : /* galaxy status numbers */ + LineToConsole("\nS->C SP_STATUS\t"); + if (log_packets > 1) + LineToConsole(" tourn=%d, armsbomb=%u, planets=%u, kills=%u, losses=%u, time=%u, timeprod=%lu,", + ((struct status_spacket *) packet)->tourn, + ntohl(((struct status_spacket *) packet)->armsbomb), + ntohl(((struct status_spacket *) packet)->planets), + ntohl(((struct status_spacket *) packet)->kills), + ntohl(((struct status_spacket *) packet)->losses), + ntohl(((struct status_spacket *) packet)->time), + ntohl(((struct status_spacket *) packet)->timeprod) ); + break; + case SP_PLANET : /* planet armies & * * + * facilities */ + LineToConsole("\nS->C SP_PLANET\t"); + if (log_packets > 1) + LineToConsole(" pnum=%d, owner=%d, info=%d, flags=0x%0X, armies=%ld,", + ((struct planet_spacket *) packet)->pnum, + ((struct planet_spacket *) packet)->owner, + ((struct planet_spacket *) packet)->info, + ntohs(((struct planet_spacket *) packet)->flags), + ntohl(((struct planet_spacket *) packet)->armies) ); + break; + case SP_PICKOK : /* your team & ship was * * + * accepted */ + LineToConsole("\nS->C SP_PICKOK\t"); + if (log_packets > 1) + LineToConsole(" state=%d,", + ((struct pickok_spacket *) packet)-> state ); + break; + case SP_LOGIN : /* login response */ + LineToConsole("\nS->C SP_LOGIN\t"); + if (log_packets > 1) + LineToConsole(" accept=%d, flags=0x%0X, keymap=\"%s\",", + ((struct login_spacket *) packet)->accept, + ntohl(((struct login_spacket *) packet)->flags), + ((struct login_spacket *) packet)->keymap ); + break; + case SP_FLAGS : /* give flags for a player */ + LineToConsole("\nS->C SP_FLAGS\t"); + if (log_packets > 1) + LineToConsole(" pnum=%d, flags=0x%0X,", + ((struct flags_spacket *) packet)->pnum, + ntohl(((struct flags_spacket *) packet)->flags) ); + break; + case SP_MASK : /* tournament mode mask */ + LineToConsole("\nS->C SP_MASK\t"); + if (log_packets > 1) + LineToConsole(" mask=%d,", + ((struct mask_spacket *) packet)->mask ); + break; + case SP_PSTATUS : /* give status for a player */ + LineToConsole("\nS->C SP_PSTATUS\t"); + if (log_packets > 1) + LineToConsole(" pnum=%d, status=%d,", + ((struct pstatus_spacket *) packet)->pnum, + ((struct pstatus_spacket *) packet)->status ); + break; + case SP_BADVERSION : /* invalid version number */ + LineToConsole("\nS->C SP_BADVERSION\t"); + if (log_packets > 1) + LineToConsole(" why=%d,", + ((struct badversion_spacket *) packet)->why ); + break; + case SP_HOSTILE : /* hostility settings for a + * * * player */ + LineToConsole("\nS->C SP_HOSTILE\t"); + if (log_packets > 1) + LineToConsole(" pnum=%d, war=%d, hostile=%d,", + ((struct hostile_spacket *) packet)->pnum, + ((struct hostile_spacket *) packet)->war, + ((struct hostile_spacket *) packet)->hostile ); + break; + case SP_STATS : /* a player's statistics */ + LineToConsole("\nS->C SP_STATS\t"); + if (log_packets > 1) + LineToConsole(" pnum=%d, tkills=%ld, tlosses=%ld, kills=%ld, losses=%ld, tticks=%ld, tplanets=%ld, tarmies=%ld, sbkills=%ld, sblosses=%ld, armies=%ld, planets=%ld, maxkills=%ld, sbmaxkills=%ld,", + ((struct stats_spacket *) packet)->pnum, + ntohl(((struct stats_spacket *) packet)->tkills), + ntohl(((struct stats_spacket *) packet)->tlosses), + ntohl(((struct stats_spacket *) packet)->kills), + ntohl(((struct stats_spacket *) packet)->losses), + ntohl(((struct stats_spacket *) packet)->tticks), + ntohl(((struct stats_spacket *) packet)->tplanets), + ntohl(((struct stats_spacket *) packet)->tarmies), + ntohl(((struct stats_spacket *) packet)->sbkills), + ntohl(((struct stats_spacket *) packet)->sblosses), + ntohl(((struct stats_spacket *) packet)->armies), + ntohl(((struct stats_spacket *) packet)->planets), + ntohl(((struct stats_spacket *) packet)->maxkills), + ntohl(((struct stats_spacket *) packet)->sbmaxkills) ); + break; + case SP_PL_LOGIN : /* new player logs in */ + LineToConsole("\nS->C SP_PL_LOGIN\t"); + if (log_packets > 1) + LineToConsole(" pnum=%d, rank=%d, name=\"%s\", monitor=\"%s\", login=\"%s\",", + ((struct plyr_login_spacket *) packet)->pnum, + ((struct plyr_login_spacket *) packet)->rank, + ((struct plyr_login_spacket *) packet)->name, + ((struct plyr_login_spacket *) packet)->monitor, + ((struct plyr_login_spacket *) packet)->login ); + break; + case SP_RESERVED : /* for future use */ + LineToConsole("\nS->C SP_RESERVED\t"); + if (log_packets > 1) + { + LineToConsole(" data="); + for( i = 0; i < 16; i++) + LineToConsole("0x%0X ", (unsigned char)((struct reserved_spacket *) packet)->data[i]); + LineToConsole(","); + } + break; + case SP_PLANET_LOC : /* planet name, x, y */ + LineToConsole("\nS->C SP_PLANET_LOC\t"); + if (log_packets > 1) + LineToConsole(" pnum=%d, x=%ld, y=%ld, name=\"%s\",", + ((struct planet_loc_spacket *) packet)->pnum, + ntohl(((struct planet_loc_spacket *) packet)->x), + ntohl(((struct planet_loc_spacket *) packet)->y), + ((struct planet_loc_spacket *) packet)->name ); + break; +#ifdef INCLUDE_SCAN + /* NOTE: not implemented */ + case SP_SCAN : /* ATM: results of player * + * * scan */ + LineToConsole("\nS->C SP_SCAN\t"); + if(log_packets > 1) + LineToConsole("not implemented,"); + break; +#endif + case SP_UDP_REPLY : /* notify client of UDP * * + * status */ + LineToConsole("\nS->C SP_UDP_REPLY\t"); + if (log_packets > 1) + LineToConsole(" reply=%d, port=%d,", + ((struct udp_reply_spacket *) packet)->reply, + ntohl(((struct udp_reply_spacket *) packet)->port) ); + break; + case SP_SEQUENCE : /* sequence # packet */ + LineToConsole("\nS->C SP_SEQUENCE\t"); + if (log_packets > 1) + LineToConsole(" flag8=0x%0X, sequence=%u,", + ((struct sequence_spacket *) packet)->flag8, + ntohs(((struct sequence_spacket *) packet)->sequence) ); + break; + case SP_SC_SEQUENCE : /* this trans is * * + * semi-critical info */ + LineToConsole("\nS->C SP_SC_SEQUENCE\t"); + if (log_packets > 1) + LineToConsole(" sequence=%u,", + ntohs(((struct sc_sequence_spacket *) packet)->sequence) ); + break; +#ifdef RSA + case SP_RSA_KEY : /* handles binary * * + * verification */ + LineToConsole("\nS->C SP_RSA_KEY\t"); + if(log_packets > 1) + { + LineToConsole(" data="); + for(i = 0; i < KEY_SIZE; i++) + LineToConsole("0x%0X ",((struct rsa_key_spacket *) packet)->data[i]); + LineToConsole(","); + } + break; +#endif + case SP_SHIP_CAP : /* Handles server ship mods */ + LineToConsole("\nS->C SP_SHIP_CAP\t"); + if (log_packets > 1) + LineToConsole(" operation=%d, s_type=%u, s_torpspeed=%u, s_phaserrange=%u, s_maxspeed=%d, s_maxfuel=%d, s_maxshield=%d, s_maxdamage=%d, s_maxwpntemp=%d, s_maxegntemp=%d, s_width=%u, s_height=%d, s_maxarmies=%d, s_letter=%d, s_name=\"%s\", s_desig1=%c, s_desig2=%c, s_bitmap=%u,", + ((struct ship_cap_spacket *) packet)->operation, + ntohs(((struct ship_cap_spacket *) packet)->s_type), + ntohs(((struct ship_cap_spacket *) packet)->s_torpspeed), + ntohs(((struct ship_cap_spacket *) packet)->s_phaserrange), + ((struct ship_cap_spacket *) packet)->s_maxspeed, + ((struct ship_cap_spacket *) packet)->s_maxfuel, + ((struct ship_cap_spacket *) packet)->s_maxshield, + ((struct ship_cap_spacket *) packet)->s_maxdamage, + ((struct ship_cap_spacket *) packet)->s_maxwpntemp, + ((struct ship_cap_spacket *) packet)->s_maxegntemp, + ntohs(((struct ship_cap_spacket *) packet)->s_width), + ntohs(((struct ship_cap_spacket *) packet)->s_height), + ntohs(((struct ship_cap_spacket *) packet)->s_maxarmies), + ((struct ship_cap_spacket *) packet)->s_letter, + ((struct ship_cap_spacket *) packet)->s_name, + ((struct ship_cap_spacket *) packet)->s_desig1, + ((struct ship_cap_spacket *) packet)->s_desig2, + ntohs(((struct ship_cap_spacket *) packet)->s_bitmap) ); + break; +#ifdef SHORT_PACKETS + case SP_S_REPLY : /* reply to send-short * * + * request */ + LineToConsole("\nS->C SP_S_REPLY\t"); + if (log_packets > 1) + fprintf(stderr," repl=%d, windside=%u, gwidth=%ld,", + ((struct shortreply_spacket *) packet)->repl, + ntohs(((struct shortreply_spacket *) packet)->winside), + ntohl(((struct shortreply_spacket *) packet)->gwidth) ); + break; + case SP_S_MESSAGE : /* var. Message Packet */ + LineToConsole("\nS->C SP_S_MESSAGE\t"); + if (log_packets > 1) + LineToConsole(" m_flags=0x%0X, m_recpt=%u, m_from=%u, length=%u, mesg=\"%s\",", + ((struct mesg_s_spacket *) packet)->m_flags, + ((struct mesg_s_spacket *) packet)->m_recpt, + ((struct mesg_s_spacket *) packet)->m_from, + ((struct mesg_s_spacket *) packet)->length, + &( ((struct mesg_s_spacket *) packet)->mesg ) ); + break; + case SP_S_WARNING : /* Warnings with 4 Bytes */ + LineToConsole("\nS->C SP_S_WARNING\t"); + if (log_packets > 1) + LineToConsole(" whichmessage=%u, argument=%d, argument2=%d,", + ((struct warning_s_spacket *) packet)->whichmessage, + ((struct warning_s_spacket *) packet)->argument, + ((struct warning_s_spacket *) packet)->argument2 ); + break; + case SP_S_YOU : /* hostile,armies,whydead,etc + * * * .. */ + LineToConsole("\nS->C SP_S_YOU\t"); + if (log_packets > 1) + LineToConsole(" pnum=%d, hostile=%d, swar=%d, armies=%d, whydead=%d, whodead=%d, flags=0x%0X,", + ((struct youshort_spacket *) packet)->pnum, + ((struct youshort_spacket *) packet)->hostile, + ((struct youshort_spacket *) packet)->swar, + ((struct youshort_spacket *) packet)->armies, + ((struct youshort_spacket *) packet)->whydead, + ((struct youshort_spacket *) packet)->whodead, + ntohl(((struct youshort_spacket *) packet)->flags) ); + break; + case SP_S_YOU_SS : /* your ship status */ + LineToConsole("\nS->C SP_S_YOU_SS\t"); + if (log_packets > 1) + LineToConsole(" ddamage=%u, shield=%u, fuel=%u, etemp=%u, wtemp=%u,", + ntohs(((struct youss_spacket *) packet)->damage), + ntohs(((struct youss_spacket *) packet)->shield), + ntohs(((struct youss_spacket *) packet)->fuel), + ntohs(((struct youss_spacket *) packet)->etemp), + ntohs(((struct youss_spacket *) packet)->wtemp) ); + break; + case SP_S_PLAYER : /* variable length player * + * * packet */ + LineToConsole("\nS->C SP_S_PLAYER\t"); + if (log_packets > 1) + LineToConsole(" packets=%d, dir=%u, speed=%d, x=%ld, y=%ld,", + ((struct player_s_spacket *) packet)->packets, + ntohl(((struct player_s_spacket *) packet)->dir), + ((struct player_s_spacket *) packet)->speed, + ntohl(((struct player_s_spacket *) packet)->x), + ntohl(((struct player_s_spacket *) packet)->y) ); + break; +#endif +#ifdef PING + case SP_PING : /* ping packet */ + LineToConsole("\nS->C SP_PING\t"); + if (log_packets > 1) + LineToConsole(" number=%u, lag=%u, tloss_sc=%u, tloss_cs=%u, iloss_sc=%u, iloss_cs=%u,", + ((struct ping_spacket *) packet)->number, + ((struct ping_spacket *) packet)->lag, + ((struct ping_spacket *) packet)->tloss_sc, + ((struct ping_spacket *) packet)->tloss_cs, + ((struct ping_spacket *) packet)->iloss_sc, + ((struct ping_spacket *) packet)->iloss_cs ); + break; +#endif +#ifdef FEATURE_PACKETS + case SP_FEATURE : + LineToConsole("\nS->C SP_FEATURE\t"); + if (log_packets > 1) + LineToConsole(" feature_type=%c, arg1=%d, arg2=%d, value=%d, name=\"%s\",", + ((struct feature_cpacket *) packet)->feature_type, + ((struct feature_cpacket *) packet)->arg1, + ((struct feature_cpacket *) packet)->arg2, + ntohl(((struct feature_cpacket *) packet)->value), + ((struct feature_cpacket *) packet)->name ); + break; +#endif +#ifdef SHORT_PACKETS + case SP_S_TORP : /* variable length torp * * + * packet */ + LineToConsole("\nS->C SP_S_TORP\t"); + if (log_packets > 1) + print_sp_s_torp(packet, 1); + break; + case SP_S_TORP_INFO : /* SP_S_TORP with TorpInfo */ + LineToConsole("\nS->C SP_S_TORP_INFO\t"); + if (log_packets > 1) /* struct built by hand in handleVTorp */ + print_sp_s_torp(packet, 3); + break; + case SP_S_8_TORP : /* optimized SP_S_TORP */ + LineToConsole("\nS->C SP_S_8_TORP\t"); + if (log_packets > 1) + print_sp_s_torp(packet, 2); + break; + case SP_S_PLANET : /* see SP_PLANET */ + LineToConsole("\nS->C SP_S_PLANET\t"); + if (log_packets > 1) + { + plpacket = (struct planet_s_spacket *) &packet[2]; + nplanets = packet[1]; + LineToConsole("nplanets = %d, ", nplanets); + for(i = 0; i < nplanets; i++, plpacket++ ) + LineToConsole( + "pnum = %d, pl_owner = %d, info = %d, flags = %d, armies = %d ", + plpacket->pnum, + plpacket->owner, + plpacket->info, + plpacket->armies, + ntohs(plpacket->flags) ); + } + fprintf(stderr,"\n"); + break; + /* S_P2 */ + case SP_S_SEQUENCE : /* SP_SEQUENCE for * * + * compressed packets */ + LineToConsole("\nS->C SP_S_SEQUENCE\t"); + if (log_packets > 1) + LineToConsole(" No struct defined,"); + break; + case SP_S_PHASER : /* see struct */ + LineToConsole("\nS->C SP_S_PHASER\t"); + if (log_packets > 1) + LineToConsole(" status=%d, pnum=%d, target=%d, dir=%d, x=%d, y=%d", + ((((struct phaser_s_spacket *) packet)->status) & 0x0f), + ((((struct phaser_s_spacket *) packet)->pnum) & 0x3f), + ((struct phaser_s_spacket *) packet)->target, + ((struct phaser_s_spacket *) packet)->dir, + (SCALE * (ntohs(((struct phaser_s_spacket*) packet)->x))), + (SCALE * (ntohs(((struct phaser_s_spacket*) packet)->y))) ); + break; + case SP_S_KILLS : /* # of kills player have */ + LineToConsole("\nS->C SP_S_KILLS\t"); + if (log_packets > 1) + { + LineToConsole(" pnum=%d, ", + (unsigned char) packet[1]); + data = &packet[2]; + for (j = 0; j < (unsigned) packet[1]; j++) + { + kills = (unsigned short) *data++; + kills |= (unsigned short) ((*data & 0x03) << 8); + pnum = (unsigned char) *data++ >> 2; + LineToConsole("pnum = %d, kills = %d ",pnum, kills); + } + } + fprintf(stderr,"\n"); + break; + case SP_S_STATS : /* see SP_STATS */ + LineToConsole("\nS->C SP_S_STATS\t"); + if (log_packets > 1) + LineToConsole(" pnum=%d, tplanets=%d, tkills=%d, tlosses=%d, kills=%d, losses=%d, tticks=%d, tarmies=%d, sbkills=%d, sblosses=%d, armies=%d, planets=%d, maxkills=%d, sbmaxkills=%d,", + ((struct stats_spacket *) packet)->pnum, + ntohl(((struct stats_spacket *) packet)->tplanets), + ntohl(((struct stats_spacket *) packet)->tkills), + ntohl(((struct stats_spacket *) packet)->tlosses), + ntohl(((struct stats_spacket *) packet)->kills), + ntohl(((struct stats_spacket *) packet)->losses), + ntohl(((struct stats_spacket *) packet)->tticks), + ntohl(((struct stats_spacket *) packet)->tarmies), + ntohl(((struct stats_spacket *) packet)->sbkills), + ntohl(((struct stats_spacket *) packet)->sblosses), + ntohl(((struct stats_spacket *) packet)->armies), + ntohl(((struct stats_spacket *) packet)->planets), + ntohl(((struct stats_spacket *) packet)->maxkills), + ntohl(((struct stats_spacket *) packet)->sbmaxkills) ); + break; +#endif + default: + LineToConsole("\nS->C UNKNOWN\t"); + if(log_packets > 1) + LineToConsole(" type=%d,",packet[0]); + } +#ifdef nodef /* #ifdef SHORT_PACKETS */ + switch( *((char *) packet) ) + { + /* variable length packets */ + case VPLAYER_SIZE : + LineToConsole("\nS->C VPLAYER_SIZE\t"); + if (log_packets > 1) + LineToConsole(" No struct defined, same enum value as SP_PLAYER,"); + break; + case SHORTVERSION : /* other number blocks, like + * * * UDP Version */ + LineToConsole("\nS->C SHORTVERSION\t"); + if (log_packets > 1) + LineToConsole(" No struct defined, same enum value as SP_MOTD,"); + break; + case OLDSHORTVERSION : /* S_P2 */ + LineToConsole("\nS->C OLDSHORTVERSION\t"); + if (log_packets > 1) + LineToConsole(" No struct defined, same enum value as SP_WARNING,"); + break; + } +#endif +} +void print_opacket(char *packet, int size) +{ + int i; /* lcv */ + switch(packet[0]) + { + /* packets sent from remote client to xtrek server */ + case CP_MESSAGE : /* send a message */ + LineToConsole("\nC->S CP_MESSAGE\t"); + if (log_packets > 1) + LineToConsole(" group=%d, indiv=%d, mesg=\"%s\",", + ((struct mesg_cpacket *) packet)->group, + ((struct mesg_cpacket *) packet)->indiv, + ((struct mesg_cpacket *) packet)->mesg ); + break; + case CP_SPEED : /* set speed */ + LineToConsole("\nC->S CP_SPEED\t"); + if (log_packets > 1) + LineToConsole(" speed=%d,", + ((struct speed_cpacket *) packet)->speed ); + break; + case CP_DIRECTION : /* change direction */ + LineToConsole("\nC->S CP_DIRECTION\t"); + if (log_packets > 1) + LineToConsole(" dir=%u,", + ((struct dir_cpacket *) packet)->dir ); + break; + case CP_PHASER : /* phaser in a direction */ + LineToConsole("\nC->S CP_PHASER\t"); + if (log_packets > 1) + LineToConsole(" dir=%u,", + ((struct phaser_cpacket *) packet)-> dir ); + break; + case CP_PLASMA : /* plasma (in a direction) */ + LineToConsole("\nC->S CP_PLAMSA\t"); + if (log_packets > 1) + LineToConsole(" dir=%u,", + ((struct plasma_cpacket *) packet)->dir ); + break; + case CP_TORP : /* fire torp in a direction */ + LineToConsole("\nC->S CP_TORP\t"); + if (log_packets > 1) + LineToConsole(" dir=%u,", + ((struct torp_cpacket *) packet)->dir ); + break; + case CP_QUIT : /* self destruct */ + LineToConsole("\nC->S CP_QUIT\t"); + if (log_packets > 1) + LineToConsole(" no args,"); + break; + case CP_LOGIN : /* log in (name, password) */ + LineToConsole("\nC->S CP_LOGIN\t"); + if (log_packets > 1) + LineToConsole(" query=%d, name=\"%s\", password=\"%s\", login=\"%s\",", + ((struct login_cpacket *) packet)->query, + ((struct login_cpacket *) packet)->name, + ((struct login_cpacket *) packet)->password, + ((struct login_cpacket *) packet)->login ); + break; + case CP_OUTFIT : /* outfit to new ship */ + LineToConsole("\nC->S CP_OUTFIT\t"); + if (log_packets > 1) + LineToConsole(" team=%d, ship=%d,", + ((struct outfit_cpacket *) packet)->team, + ((struct outfit_cpacket *) packet)->ship ); + break; + case CP_WAR : /* change war status */ + LineToConsole("\nC->S CP_WAR\t"); + if (log_packets > 1) + LineToConsole(" newmask=0x%0X,", + ((struct war_cpacket *) packet)->newmask ); + break; + case CP_PRACTR : /* create practice robot? */ + LineToConsole("\nC->S CP_PRACTR\t"); + if (log_packets > 1) + LineToConsole(" no args,"); + break; + case CP_SHIELD : /* raise/lower sheilds */ + LineToConsole("\nC->S CP_SHIELD\t"); + if (log_packets > 1) + LineToConsole(" state=%d,", + ((struct shield_cpacket *) packet)->state ); + break; + case CP_REPAIR : /* enter repair mode */ + LineToConsole("\nC->S CP_REPAIR\t"); + if (log_packets > 1) + LineToConsole(" state=%d,", + ((struct repair_cpacket *) packet)-> state ); + break; + case CP_ORBIT : /* orbit planet/starbase */ + LineToConsole("\nC->S CP_ORBIT\t"); + if (log_packets > 1) + LineToConsole(" state=%d,", + ((struct orbit_cpacket *) packet)->state ); + break; + case CP_PLANLOCK : /* lock on planet */ + LineToConsole("\nC->S CP_PLANLOCK\t"); + if (log_packets > 1) + LineToConsole(" pnum = %d,", + ((struct planlock_cpacket *) packet)->pnum ); + break; + case CP_PLAYLOCK : /* lock on player */ + LineToConsole("\nC->S CP_PLAYLOCK\t"); + if (log_packets > 1) + LineToConsole(" pnum=%d,", + ((struct playlock_cpacket *) packet)->pnum ); + break; + case CP_BOMB : /* bomb a planet */ + LineToConsole("\nC->S CP_BOMB\t"); + if (log_packets > 1) + LineToConsole(" state=%d,", + ((struct bomb_cpacket *) packet)->state ); + break; + case CP_BEAM : /* beam armies up/down */ + LineToConsole("\nC->S CP_BEAM\t"); + if (log_packets > 1) + LineToConsole(" state=%d,", + ((struct beam_cpacket *) packet)->state ); + break; + case CP_CLOAK : /* cloak on/off */ + LineToConsole("\nC->S CP_CLOAK\t"); + if (log_packets > 1) + LineToConsole(" state=%d,", + ((struct cloak_cpacket *) packet)->state ); + break; + case CP_DET_TORPS : /* detonate enemy torps */ + LineToConsole("\nC->S CP_DET_TORPS\t"); + if (log_packets > 1) + LineToConsole(" no args,"); + break; + case CP_DET_MYTORP : /* detonate one of my torps */ + LineToConsole("\nC->S CP_DET_MYTORP\t"); + if (log_packets > 1) + LineToConsole(" tnum=%u,", + ntohs(((struct det_mytorp_cpacket *) packet)->tnum) ); + break; + case CP_COPILOT : /* toggle copilot mode */ + LineToConsole("\nC->S CP_COPILOT\t"); + if (log_packets > 1) + LineToConsole(" state=%d,", + ((struct copilot_cpacket *) packet)->state ); + break; + case CP_REFIT : /* refit to different ship * + * + * * type */ + LineToConsole("\nC->S CP_REFIT\t"); + if (log_packets > 1) + LineToConsole(" ship=%d,", + ((struct refit_cpacket *) packet)->ship ); + break; + case CP_TRACTOR : /* tractor on/off */ + LineToConsole("\nC->S CP_TRACTOR\t"); + if (log_packets > 1) + LineToConsole(" state=%d, pnum=%d,", + ((struct tractor_cpacket *) packet)->state, + ((struct tractor_cpacket *) packet)->pnum ); + break; + case CP_REPRESS : /* pressor on/off */ + LineToConsole("\nC->S CP_REPRESS\t"); + if (log_packets > 1) + LineToConsole(" state=%d, pnum=%d,", + ((struct repress_cpacket *) packet)->state, + ((struct repress_cpacket *) packet)->pnum ); + break; + case CP_COUP : /* coup home planet */ + LineToConsole("\nC->S CP_COUP\t"); + if (log_packets > 1) + LineToConsole(" no args,"); + break; + case CP_SOCKET : /* new socket for * * + * reconnection */ + LineToConsole("\nC->S CP_SOCKET\t"); + if (log_packets > 1) + LineToConsole(" version=%d, udp_version=%d\n, socket=%u,", + ((struct socket_cpacket *) packet)->version, + ((struct socket_cpacket *) packet)->udp_version, + ntohl(((struct socket_cpacket *) packet)->socket) ); + break; + case CP_OPTIONS : /* send my options to be * * + * saved */ + LineToConsole("\nC->S CP_OPTIONS\t"); + if (log_packets > 1) + LineToConsole(" flags=0x%0X, keymap=\"%s\",", + ntohl(((struct options_cpacket *) packet)->flags), + ((struct options_cpacket *) packet)->keymap ); + break; + case CP_BYE : /* I'm done! */ + LineToConsole("\nC->S CP_BYE\t"); + if (log_packets > 1) + LineToConsole(" no args,"); + break; + case CP_DOCKPERM : /* set docking permissions */ + LineToConsole("\nC->S CP_DOCKPERM\t"); + if (log_packets > 1) + LineToConsole(" state=%d,", + ((struct dockperm_cpacket *) packet)->state ); + break; + case CP_UPDATES : /* set number of usecs per * + * + * * update */ + LineToConsole("\nC->S CP_UPDATES\t"); + if (log_packets > 1) + LineToConsole(" usecs=%u,", + ntohl(((struct updates_cpacket *) packet)->usecs) ); + break; + case CP_RESETSTATS : /* reset my stats packet */ + LineToConsole("\nC->S CP_RESETSTATS\t"); + if (log_packets > 1) + LineToConsole(" verify=%c,", + ((struct resetstats_cpacket *) packet)->verify ); + break; + case CP_RESERVED : /* for future use */ + LineToConsole("\nC->S CP_RESERVED\t"); + if (log_packets > 1) + { + LineToConsole(" data=" ); + for( i = 0; i < 16; i++) + LineToConsole("0x%0X ", (unsigned char)((struct reserved_cpacket *) packet)->data[i]); + LineToConsole(", resp=" ); + for( i = 0; i < 16; i++) + LineToConsole("0x%0X ", (unsigned char)((struct reserved_cpacket *) packet)->resp[i]); + LineToConsole(","); + } + break; +#ifdef INCLUDE_SCAN + /* NOTE: not implemented. */ + case CP_SCAN : /* ATM: request for player * + * + * * scan */ + LineToConsole("\nC->S CP_SCAN\t"); + if (log_packets > 1) + LineToConsole(" not implemented," ); + break; +#endif + case CP_UDP_REQ : /* request UDP on/off */ + LineToConsole("\nC->S CP_UDP_REQ\t"); + if (log_packets > 1) + LineToConsole(" request=%d, connmode=%d, port=%d,", + ((struct udp_req_cpacket *) packet)->request, + ((struct udp_req_cpacket *) packet)->connmode, + ntohl(((struct udp_req_cpacket *) packet)->port) ); + break; + case CP_SEQUENCE : /* sequence # packet */ + LineToConsole("\nC->S CP_SEQUENCE\t"); + if (log_packets > 1) + LineToConsole(" sequence=%u,", + ntohs(((struct sequence_cpacket *) packet)->sequence) ); + break; +#ifdef RSA + case CP_RSA_KEY : /* handles binary * * + * verification */ + LineToConsole("\nC->S CP_RSA_KEY\t"); + if (log_packets > 1) + { + LineToConsole(" global="); + for(i = 0; i < KEY_SIZE; i++) + LineToConsole("0x%0X ",((struct rsa_key_cpacket *)packet)->global[i]); + fprintf(stderr,","); + LineToConsole(" public="); + for(i = 0; i < KEY_SIZE; i++) + LineToConsole("0x%0X ",((struct rsa_key_cpacket *)packet)->public[i]); + fprintf(stderr,","); + LineToConsole(" resp="); + for(i = 0; i < KEY_SIZE; i++) + LineToConsole("0x%0X ",((struct rsa_key_cpacket *)packet)->resp[i]); + fprintf(stderr,","); + } + break; +#endif + case CP_PING_RESPONSE : /* client response */ + LineToConsole("\nC->S CP_PING_RESPONSE\t"); + if (log_packets > 1) + LineToConsole(" number=%u, pingme=%d, cp_sent=%lu, cp_recv=%lu", + ((struct ping_cpacket *) packet)->number, + ((struct ping_cpacket *) packet)->pingme, + ntohl(((struct ping_cpacket *) packet)->cp_sent), + ntohl(((struct ping_cpacket *) packet)->cp_recv) ); + break; +#ifdef SHORT_PACKETS + case CP_S_REQ : + LineToConsole("\nC->S CP_S_REQ\t"); + if (log_packets > 1) + LineToConsole(" req=%d, version=%d,", + ((struct shortreq_cpacket *) packet)->req, + ((struct shortreq_cpacket *) packet)->version ); + break; + case CP_S_THRS : + LineToConsole("\nC->S CP_S_THRS\t"); + if (log_packets > 1) + LineToConsole(" thresh=%u,", + ntohs(((struct threshold_cpacket *) packet)->thresh) ); + break; + case CP_S_MESSAGE : /* vari. Message Packet */ + LineToConsole("\nC->S CP_S_MESSAGE\t"); + if (log_packets > 1) + LineToConsole(" size=%d, group=%d, indiv=%d, mess=\"%s\",", + ((struct mesg_cpacket *) packet)->pad1, + ((struct mesg_cpacket *) packet)->group, + ((struct mesg_cpacket *) packet)->indiv, + ((struct mesg_cpacket *) packet)->mesg ); + break; + case CP_S_RESERVED : + LineToConsole("\nC->S CP_S_RESERVED\t"); + if (log_packets > 1) + LineToConsole(" no struct defined,"); + break; + case CP_S_DUMMY : + LineToConsole("\nC->S CP_S_DUMMY\t"); + if (log_packets > 1) + LineToConsole(" no struct defined,"); + break; +#endif +#ifdef FEATURE_PACKETS + case CP_FEATURE : + LineToConsole("\nC->S CP_FEATURE\t"); + if (log_packets > 1) + LineToConsole(" feature_type=%c, arg1=%d, arg2=%d, value=%d, name=\"%s\",", + ((struct feature_cpacket *) packet)->feature_type, + ((struct feature_cpacket *) packet)->arg1, + ((struct feature_cpacket *) packet)->arg2, + ntohl(((struct feature_cpacket *) packet)->value), + ((struct feature_cpacket *) packet)->name ); + break; +#endif + default : + LineToConsole("\nC->S UNKNOWN\t"); + if(log_packets > 1) + LineToConsole(" type=%d,",packet[0]); + } +} + #endif char * Index: sound.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/sound.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- sound.c 28 Feb 2007 13:01:17 -0000 1.32 +++ sound.c 1 Mar 2007 07:35:45 -0000 1.33 @@ -62,7 +62,6 @@ sounds[BASE_EXPLOSION_WAV] = Mix_LoadWAV(DATAFILE("nt_base_explosion.wav")); sounds[FIRE_PLASMA_WAV] = Mix_LoadWAV(DATAFILE("nt_fire_plasma.wav")); sounds[FIRE_TORP_WAV] = Mix_LoadWAV(DATAFILE("nt_fire_torp.wav")); - sounds[INTRO_WAV] = Mix_LoadWAV(DATAFILE("nt_intro.wav")); sounds[MESSAGE_WAV] = Mix_LoadWAV(DATAFILE("nt_message.wav")); sounds[MESSAGE1_WAV] = Mix_LoadWAV(DATAFILE("nt_message1.wav")); sounds[MESSAGE2_WAV] = Mix_LoadWAV(DATAFILE("nt_message2.wav")); From modemhero at users.sourceforge.net Thu Mar 1 01:35:46 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 01 Mar 2007 07:35:46 +0000 Subject: [netrek-cvs] client/netrekxp/include proto.h, 1.35, 1.36 sound.h, 1.16, 1.17 Message-ID: <20070301073555.A94EB1867D0@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22007/include Modified Files: proto.h sound.h Log Message: Remove intro_wav from the sound arrays, forgot to do that. Add back the curslib and winkey projects to overall clientr, dunno how those got deleted. Added in COW's extended packet logging, only required a minor change due to XP 2006 supporting self_19flags, so minor change to how sequence packet was handled. Don't fade out music on reentry if background music option is set to on, thus music will continue to play through death/reentry. Index: sound.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/sound.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- sound.h 28 Feb 2007 12:21:49 -0000 1.16 +++ sound.h 1 Mar 2007 07:35:44 -0000 1.17 @@ -34,7 +34,6 @@ BASE_EXPLOSION_WAV, FIRE_PLASMA_WAV, FIRE_TORP_WAV, - INTRO_WAV, MESSAGE_WAV, MESSAGE1_WAV, MESSAGE2_WAV, Index: proto.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- proto.h 28 Feb 2007 12:21:49 -0000 1.35 +++ proto.h 1 Mar 2007 07:35:44 -0000 1.36 @@ -1134,6 +1134,8 @@ void handleSequence (struct sequence_spacket *packet); void Log_Packet (char type, int act_size); void Log_OPacket (int tpe, int size); +void print_opacket (char *packet, int size); +void print_packet (char *packet, int size); void Dump_Packet_Log_Info (void); char *strcpyp_return (register char *s1, register char *s2, From modemhero at users.sourceforge.net Thu Mar 1 01:35:47 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 01 Mar 2007 07:35:47 +0000 Subject: [netrek-cvs] client/netrekxp/src/winkey winkey.suo,1.2,1.3 Message-ID: <20070301073555.B19941867D2@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src/winkey In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22007/src/winkey Modified Files: winkey.suo Log Message: Remove intro_wav from the sound arrays, forgot to do that. Add back the curslib and winkey projects to overall clientr, dunno how those got deleted. Added in COW's extended packet logging, only required a minor change due to XP 2006 supporting self_19flags, so minor change to how sequence packet was handled. Don't fade out music on reentry if background music option is set to on, thus music will continue to play through death/reentry. Index: winkey.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/winkey/winkey.suo,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsuuucrW and /tmp/cvs1RUjTd differ From modemhero at users.sourceforge.net Thu Mar 1 05:13:23 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 01 Mar 2007 11:13:23 +0000 Subject: [netrek-cvs] client/netrekxp/src data.c, 1.57, 1.58 defaults.c, 1.48, 1.49 option.c, 1.30, 1.31 Message-ID: <20070301111332.633D81867D2@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv16177/src Modified Files: data.c defaults.c option.c Log Message: Set lastUpdateSpeed to be same as updatesPerSec during read_defaults, rather than setting it to arbitrary value. This fixes client so it only sends update request if value changes from initial value. Added special case to options menu to handle updates rate. Value is now constrained as divisors of server_fps, similiar to code in server daemon. I.e. for server running at 50 fps, only valid update values are 1,2,5,10,25,50. Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- data.c 28 Feb 2007 12:21:50 -0000 1.57 +++ data.c 1 Mar 2007 11:13:21 -0000 1.58 @@ -227,9 +227,10 @@ #endif -int updatesPerSec = 10; /* client requested updates per second */ -int server_ups = 10; /* server responded updates per second */ -int server_fps = 10; /* server configured frames per second */ +int updatesPerSec = 10; /* client requested updates per second */ +int lastUpdateSpeed = 10; /* last update speed client requested */ +int server_ups = 10; /* server responded updates per second */ +int server_fps = 10; /* server configured frames per second */ #ifdef META /* Metaservers list - comma delimited */ Index: option.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- option.c 28 Feb 2007 07:44:01 -0000 1.30 +++ option.c 1 Mar 2007 11:13:21 -0000 1.31 @@ -25,7 +25,6 @@ int notdone; /* not done flag */ -static int lastUpdateSpeed = 10; static char newkeys[14]; char *localmes[] = { "Show owner on local planets", @@ -668,8 +667,8 @@ * a hack). */ if (op->op_option == &colorClient) { - if (!dynamicBitmaps) - return; + if (!dynamicBitmaps) + return; } if (data->key == W_RBUTTON) { @@ -790,9 +789,31 @@ #endif } + /* Is it a special non-linear option range? i.e updatesPerSec */ + else if (op->op_range && op->op_option == &updatesPerSec) + { + if (data->key == W_RBUTTON) + { + if (++updatesPerSec > server_fps) ; /* Don't exceed server fps */ + else + while (server_fps % updatesPerSec != 0) updatesPerSec++; + } + else if (data->key == W_MBUTTON) + updatesPerSec = 1; + else if (data->key == W_LBUTTON) + { + if (--updatesPerSec < 1) ; /* Don't divide by 0 */ + else + while (server_fps % updatesPerSec != 0) updatesPerSec--; + } + /* wrap value around within updatesPerSec range */ + if (updatesPerSec > server_fps) + updatesPerSec = 1; + if (updatesPerSec < 1) + updatesPerSec = server_fps; + } /* Does the button have a range of values? */ - else if (op->op_range) { if (data->key == W_RBUTTON) Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- defaults.c 28 Feb 2007 13:01:17 -0000 1.48 +++ defaults.c 1 Mar 2007 11:13:21 -0000 1.49 @@ -1577,7 +1577,7 @@ detCircle = booleanDefault ("detCircle", detCircle); puckCircle = booleanDefault ("puckCircle", puckCircle); showArmy = booleanDefault ("showArmy", showArmy); - updatesPerSec = intDefault ("updatesPerSec", updatesPerSec); + lastUpdateSpeed = updatesPerSec = intDefault ("updatesPerSec", updatesPerSec); redrawDelay = intDefault ("redrawDelay", redrawDelay); planetHighlighting = booleanDefault ("planetHighlighting", planetHighlighting); rotatePlanets = booleanDefault ("rotatePlanets", rotatePlanets); From modemhero at users.sourceforge.net Thu Mar 1 05:13:23 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 01 Mar 2007 11:13:23 +0000 Subject: [netrek-cvs] client/netrekxp/include data.h,1.52,1.53 Message-ID: <20070301111332.609BC1867D0@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv16177/include Modified Files: data.h Log Message: Set lastUpdateSpeed to be same as updatesPerSec during read_defaults, rather than setting it to arbitrary value. This fixes client so it only sends update request if value changes from initial value. Added special case to options menu to handle updates rate. Value is now constrained as divisors of server_fps, similiar to code in server daemon. I.e. for server running at 50 fps, only valid update values are 1,2,5,10,25,50. Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- data.h 28 Feb 2007 12:21:49 -0000 1.52 +++ data.h 1 Mar 2007 11:13:21 -0000 1.53 @@ -138,6 +138,7 @@ #endif extern int updatesPerSec; /* client requested updates per second */ +extern int lastUpdateSpeed; /* last update speed client requested */ extern int server_ups; /* server responded updates per second */ extern int server_fps; /* server configured frames per second */ From modemhero at users.sourceforge.net Thu Mar 1 05:13:23 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 01 Mar 2007 11:13:23 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo,1.87,1.88 Message-ID: <20070301111332.5CA31B3ED@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv16177 Modified Files: clientr.suo Log Message: Set lastUpdateSpeed to be same as updatesPerSec during read_defaults, rather than setting it to arbitrary value. This fixes client so it only sends update request if value changes from initial value. Added special case to options menu to handle updates rate. Value is now constrained as divisors of server_fps, similiar to code in server daemon. I.e. for server running at 50 fps, only valid update values are 1,2,5,10,25,50. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.87 retrieving revision 1.88 diff -u -d -r1.87 -r1.88 Binary files /tmp/cvs0s3gmu and /tmp/cvszCqniv differ From modemhero at users.sourceforge.net Thu Mar 1 05:21:48 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 01 Mar 2007 11:21:48 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.117, 1.118 netrekrc, 1.28, 1.29 netrekrc_options.txt, 1.30, 1.31 Message-ID: <20070301112157.7B645B3ED@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv19639/resources/docs Modified Files: changes.txt netrekrc netrekrc_options.txt Log Message: Update documentation on how updatesPerSec works. Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- netrekrc 28 Feb 2007 13:01:17 -0000 1.28 +++ netrekrc 1 Mar 2007 11:21:45 -0000 1.29 @@ -401,7 +401,9 @@ udpSequenceCheck: on # How many updates per second to request -# 1-50 range +# 1-50 (or whatever server frame rate is) +# Value may be constrained by server to be evenly divisible +# by server frame rate updatesPerSec: 50 # Display other ships to 256 directions instead of 16 Index: netrekrc_options.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc_options.txt,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- netrekrc_options.txt 28 Feb 2007 13:06:44 -0000 1.30 +++ netrekrc_options.txt 1 Mar 2007 11:21:45 -0000 1.31 @@ -291,7 +291,7 @@ udpDebug: (0/1) debug UDP traffic udpSequenceCheck: (on/off) check UDP sequence -updatesPerSec: (0-50) how many data updates per second to request from server +updatesPerSec: (1-50 generally) how many data updates per second to request from server useFullShipInfo: (on/off) display other ships to 256 directions instead of 16 useLite: (on/off) use beeplite defLite: (on/off) use default beeplite settings Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.117 retrieving revision 1.118 diff -u -d -r1.117 -r1.118 --- changes.txt 28 Feb 2007 13:01:16 -0000 1.117 +++ changes.txt 1 Mar 2007 11:21:45 -0000 1.118 @@ -1,4 +1,7 @@ Netrek XP 2006, Version 1.2: (Released Feb-2007) +- changes updatesPerSec so it now only cycles over valid ranges as defined by the server. + For a server running at 10 fps, valid update/sec values are 1 2 5 and 10. For a server + running at 50 fps, valid update/sec ranges are 1 2 5 10 25 and 50. - both sound menu and netrekrc now have ability to turn sounds off by type, i.e. to turn all explosion sounds off, all message sounds off, etc. The netrekrc option is called "soundExclude", and the valid sound types are: From modemhero at users.sourceforge.net Thu Mar 1 05:21:48 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 01 Mar 2007 11:21:48 +0000 Subject: [netrek-cvs] client/netrekxp/src defaults.c, 1.49, 1.50 feature.c, 1.7, 1.8 Message-ID: <20070301112157.7D0AF1867D2@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv19639/src Modified Files: defaults.c feature.c Log Message: Update documentation on how updatesPerSec works. Index: feature.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/feature.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- feature.c 23 Feb 2007 13:43:56 -0000 1.7 +++ feature.c 1 Mar 2007 11:21:46 -0000 1.8 @@ -171,7 +171,7 @@ return; } if (strcmpi(packet->name, "UPS") == 0 && value != -1) { - updatesPerSec = server_ups = value; + lastUpdateSpeed = updatesPerSec = server_ups = value; LineToConsole("Server actually sending %d updates per second.\n", value); return; } Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- defaults.c 1 Mar 2007 11:13:21 -0000 1.49 +++ defaults.c 1 Mar 2007 11:21:46 -0000 1.50 @@ -778,7 +778,9 @@ {"updatesPerSec", &updatesPerSec, RC_INT, { "How many updates per second to request", - "1-50 range", + "1-50 (or whatever server frame rate is)", + "Value may be constrained by server to be evenly divisible", + "by server frame rate", NULL } }, From modemhero at users.sourceforge.net Thu Mar 1 12:31:18 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 01 Mar 2007 18:31:18 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo,1.88,1.89 Message-ID: <20070301183157.3EFB9B3ED@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25225 Modified Files: clientr.suo Log Message: Fix for sound with distance, now all weapon sounds will use distance sound (just not all will use angular sound). Changed highlight friendly phasers from on to off in netrekrc, phasers look better if off. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.88 retrieving revision 1.89 diff -u -d -r1.88 -r1.89 Binary files /tmp/cvsocSkgh and /tmp/cvsRKP36V differ From modemhero at users.sourceforge.net Thu Mar 1 12:31:21 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 01 Mar 2007 18:31:21 +0000 Subject: [netrek-cvs] client/netrekxp/src local.c, 1.65, 1.66 sound.c, 1.33, 1.34 Message-ID: <20070301183139.5A3CFB3ED@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25225/src Modified Files: local.c sound.c Log Message: Fix for sound with distance, now all weapon sounds will use distance sound (just not all will use angular sound). Changed highlight friendly phasers from on to off in netrekrc, phasers look better if off. Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.65 retrieving revision 1.66 diff -u -d -r1.65 -r1.66 --- local.c 28 Feb 2007 12:21:50 -0000 1.65 +++ local.c 1 Mar 2007 18:31:18 -0000 1.66 @@ -741,7 +741,7 @@ angle = 0; // At short distances, don't use angular sound if (!soundAngles || distance < SCALE/2) - Play_Sound(CLOAKED_WAV, SF_CLOAKING); + Play_Sound_Loc(CLOAKED_WAV, SF_CLOAKING, -1, distance); else Play_Sound_Loc(CLOAKED_WAV, SF_CLOAKING, angle, distance); } @@ -780,7 +780,7 @@ angle = 0; // At short distances, don't use angular sound if (!soundAngles || distance < SCALE/2) - Play_Sound(UNCLOAK_WAV, SF_CLOAKING); + Play_Sound_Loc(UNCLOAK_WAV, SF_CLOAKING, -1, distance); else Play_Sound_Loc(UNCLOAK_WAV, SF_CLOAKING, angle, distance); } @@ -1319,9 +1319,9 @@ if (!soundAngles || distance < SCALE/2) { if (j->p_ship.s_type == STARBASE) - Play_Sound(BASE_EXPLOSION_WAV, SF_EXPLOSIONS); + Play_Sound_Loc(BASE_EXPLOSION_WAV, SF_EXPLOSIONS, -1, distance); else - Play_Sound(EXPLOSION_OTHER_WAV, SF_OTHER|SF_EXPLOSIONS); + Play_Sound_Loc(EXPLOSION_OTHER_WAV, SF_OTHER|SF_EXPLOSIONS, -1, distance); } else { @@ -1403,7 +1403,7 @@ angle = 0; // At short distances, don't use angular sound if (!soundAngles || distance < SCALE/2) - Play_Sound(PHASER_OTHER_WAV, SF_OTHER|SF_WEAPONS); + Play_Sound_Loc(PHASER_OTHER_WAV, SF_OTHER|SF_WEAPONS, -1, distance); else Play_Sound_Loc(PHASER_OTHER_WAV, SF_OTHER|SF_WEAPONS, angle, distance); } @@ -1881,7 +1881,7 @@ angle = 0; // At short distances, don't use angular sound if (!soundAngles || distance < SCALE/2) - Play_Sound(TORP_HIT_WAV, SF_WEAPONS); + Play_Sound_Loc(TORP_HIT_WAV, SF_WEAPONS, -1, distance); else Play_Sound_Loc(TORP_HIT_WAV, SF_WEAPONS, angle, distance); } @@ -2143,7 +2143,7 @@ angle = 0; // At short distances, don't use angular sound if (!soundAngles || distance < SCALE/2) - Play_Sound(PLASMA_HIT_WAV, SF_WEAPONS); + Play_Sound_Loc(PLASMA_HIT_WAV, SF_WEAPONS, -1, distance); else Play_Sound_Loc(PLASMA_HIT_WAV, SF_WEAPONS, angle, distance); } @@ -2514,7 +2514,7 @@ if (sound_other_torps < num_other_torps) { if (!soundAngles || other_torp_dist < SCALE/2) - Play_Sound(FIRE_TORP_OTHER_WAV, SF_OTHER|SF_WEAPONS); + Play_Sound_Loc(FIRE_TORP_OTHER_WAV, SF_OTHER|SF_WEAPONS, -1, other_torp_dist); else Play_Sound_Loc(FIRE_TORP_OTHER_WAV, SF_OTHER|SF_WEAPONS, other_torp_angle, other_torp_dist); } @@ -2523,7 +2523,7 @@ if (sound_other_plasmas < num_other_plasmas) { if (!soundAngles || other_plasma_dist < SCALE/2) - Play_Sound(FIRE_PLASMA_OTHER_WAV, SF_OTHER|SF_WEAPONS); + Play_Sound_Loc(FIRE_PLASMA_OTHER_WAV, SF_OTHER|SF_WEAPONS, -1, other_plasma_dist); else Play_Sound_Loc(FIRE_PLASMA_OTHER_WAV, SF_OTHER|SF_WEAPONS, other_plasma_angle, other_plasma_dist); } Index: sound.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/sound.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- sound.c 1 Mar 2007 07:35:45 -0000 1.33 +++ sound.c 1 Mar 2007 18:31:18 -0000 1.34 @@ -316,7 +316,7 @@ distance = 0; if (distance > 255) distance = 255; - if (soundAngles) + if (angle >= 0) { // Adjust volume with distance and angle if (Mix_SetPosition(channel, angle, distance) == 0) From modemhero at users.sourceforge.net Thu Mar 1 12:31:20 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 01 Mar 2007 18:31:20 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs netrekrc,1.29,1.30 Message-ID: <20070301183139.55E7A1867D0@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25225/resources/docs Modified Files: netrekrc Log Message: Fix for sound with distance, now all weapon sounds will use distance sound (just not all will use angular sound). Changed highlight friendly phasers from on to off in netrekrc, phasers look better if off. Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- netrekrc 1 Mar 2007 11:21:45 -0000 1.29 +++ netrekrc 1 Mar 2007 18:31:16 -0000 1.30 @@ -96,7 +96,7 @@ forceMono: off # Highlight friendly phasers -highlightFriendlyPhasers: on +highlightFriendlyPhasers: off # Ignore Caps Lock key state ignoreCaps: on From modemhero at users.sourceforge.net Fri Mar 2 06:57:57 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 02 Mar 2007 12:57:57 +0000 Subject: [netrek-cvs] client/netrekxp/src data.c, 1.58, 1.59 defaults.c, 1.50, 1.51 helpwin.c, 1.7, 1.8 newwin.c, 1.49, 1.50 option.c, 1.31, 1.32 parsemeta.c, 1.31, 1.32 winmain.c, 1.5, 1.6 Message-ID: <20070302125823.34FF71867D0@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20265/src Modified Files: data.c defaults.c helpwin.c newwin.c option.c parsemeta.c winmain.c Log Message: Restore old perror() function. Add more debug info on failed metaping requests. New netrekrc feature messageKeyOnly which disables the somewhat annoying feature where any key pressed while mouse is over a message window will attempt to send a message to that player slot #. Index: newwin.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- newwin.c 28 Feb 2007 12:21:50 -0000 1.49 +++ newwin.c 2 Mar 2007 12:57:53 -0000 1.50 @@ -769,7 +769,15 @@ static void handleMessageWindowKeyDown (W_Event * event) { - smessage (event->key); + if (messageKeyOnly && messageon == 0) + { + if (mystats->st_keymap[(event->key)-32] != 109) /* Not a message key (Key109)*/ + return; + else /* It is a message key, allow them to start a message */ + Key109(); + } + else /* Attempt to send message to whatever key was pressed */ + smessage (event->key); } /******************************************************************************/ Index: winmain.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/winmain.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- winmain.c 26 Feb 2007 06:54:50 -0000 1.5 +++ winmain.c 2 Mar 2007 12:57:55 -0000 1.6 @@ -22,7 +22,6 @@ #include #include #include -#include #include "Wlib.h" #include "defs.h" @@ -262,13 +261,13 @@ //A more useful perror(), reports last winsock error as well -/* + void perror (const char *str) { LineToConsole ("%s: errno = %d, WSALast = %d\n", str, errno, WSAGetLastError ()); } -*/ + #ifdef NEW_SELECT // ********************************* select ******************************** Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- defaults.c 1 Mar 2007 11:21:46 -0000 1.50 +++ defaults.c 2 Mar 2007 12:57:52 -0000 1.51 @@ -253,6 +253,13 @@ NULL } }, + {"messageKeyOnly", &messageKeyOnly, RC_BOOL, + { + "Only start messages with the actual message key(s)", + "if cursor is in the message windows", + NULL + } + }, #endif #ifdef META {"metaPort", &metaPort, RC_INT, @@ -1689,6 +1696,7 @@ agriColor = intDefault ("agriColor", agriColor); playerListMessaging = booleanDefault ("playerListMessaging", playerListMessaging); + messageKeyOnly = booleanDefault ("messageKeyOnly", messageKeyOnly); highlightFriendlyPhasers = booleanDefault ("highlightFriendlyPhasers", highlightFriendlyPhasers); Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- data.c 1 Mar 2007 11:13:21 -0000 1.58 +++ data.c 2 Mar 2007 12:57:52 -0000 1.59 @@ -431,6 +431,7 @@ int playerListBlankZeroKills = 1; int playerListHack = 0; int playerListMessaging = 1; +int messageKeyOnly = 1; int showMySpeed = 0; Index: parsemeta.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/parsemeta.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- parsemeta.c 23 Feb 2007 13:43:56 -0000 1.31 +++ parsemeta.c 2 Mar 2007 12:57:54 -0000 1.32 @@ -1921,8 +1921,11 @@ (LPSOCKADDR)lpstToAddr, /* destination */ sizeof(SOCKADDR_IN)); /* address length */ - if (nRet == SOCKET_ERROR) - metaPing_ReportError("sendto()"); + if (nRet == SOCKET_ERROR) + { + metaPing_ReportError("sendto()"); + LineToConsole("IP address %s\n", lpstToAddr->sin_addr.s_addr); + } return (nRet); } @@ -1949,6 +1952,7 @@ if (nRet == SOCKET_ERROR) { metaPing_ReportError("recvfrom()"); + LineToConsole("IP address %s\n", lpsaFrom->sin_addr.s_addr); return SOCKET_ERROR; } Index: helpwin.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/helpwin.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- helpwin.c 29 Nov 2006 13:37:47 -0000 1.7 +++ helpwin.c 2 Mar 2007 12:57:52 -0000 1.8 @@ -345,25 +345,20 @@ if (key < 32 || key > 126) - { return; - } if (strlen (helpmessage) < 6) - { return; - } for (i = 0; i < 96; i++) { if (mystats->st_keymap[i] != key) continue; if (i + 32 == key) - { - default_set = 1; + { + default_set = 1; continue; - } /* it's already there! don't - * add it! */ + } /* it's already there! don't add it! */ /* we've found a key mapped to key! */ /* the key is i+32 */ Index: option.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- option.c 1 Mar 2007 11:13:21 -0000 1.31 +++ option.c 2 Mar 2007 12:57:54 -0000 1.32 @@ -314,6 +314,7 @@ {1, "", &windowMove, 0, 0, 0, windowmovemess, NULL}, {1, "avoid message kludge", &niftyNewMessages, 0, 0, 0, NULL, NULL}, {1, "", &playerListMessaging, 0, 0, 0, plistmessagingmess, NULL}, + {1, "have only msg key start msg", &messageKeyOnly, 0, 0, 0, NULL, NULL}, {1, "beep on private message", &beepOnPrivateMessage, 0, 0, 0, NULL, NULL}, {1, "done", ¬done, 0, 0, 0, NULL, NULL}, {-1, NULL, 0, 0, 0, 0, NULL, NULL} From modemhero at users.sourceforge.net Fri Mar 2 06:57:52 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 02 Mar 2007 12:57:52 +0000 Subject: [netrek-cvs] client/netrekxp/include data.h, 1.53, 1.54 proto.h, 1.36, 1.37 Message-ID: <20070302125835.D2A761867D0@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20265/include Modified Files: data.h proto.h Log Message: Restore old perror() function. Add more debug info on failed metaping requests. New netrekrc feature messageKeyOnly which disables the somewhat annoying feature where any key pressed while mouse is over a message window will attempt to send a message to that player slot #. Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- data.h 1 Mar 2007 11:13:21 -0000 1.53 +++ data.h 2 Mar 2007 12:57:50 -0000 1.54 @@ -653,6 +653,8 @@ 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 */ +extern int messageKeyOnly; /* only start messages with the actual message key(s), + if cursor in message windows */ extern int observerMode; /* set observer mode variable */ extern int observerPorts[]; /* predefined list of observer ports */ extern int showHockeyScore; /* show hockey score on map */ Index: proto.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- proto.h 1 Mar 2007 07:35:44 -0000 1.36 +++ proto.h 2 Mar 2007 12:57:50 -0000 1.37 @@ -1235,7 +1235,7 @@ struct passwd *getpwuid (); void sleep (int seconds); double rint (double r); -//void perror (const char *str); +void perror (const char *str); #ifdef NEW_SELECT int PASCAL select (int nfds, fd_set * readfds, From modemhero at users.sourceforge.net Fri Mar 2 06:57:54 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 02 Mar 2007 12:57:54 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html generalconfig.html, 1.31, 1.32 Message-ID: <20070302125834.D6DA6B3ED@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20265/resources/htmlhelp/html Modified Files: generalconfig.html Log Message: Restore old perror() function. Add more debug info on failed metaping requests. New netrekrc feature messageKeyOnly which disables the somewhat annoying feature where any key pressed while mouse is over a message window will attempt to send a message to that player slot #. Index: generalconfig.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/generalconfig.html,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- generalconfig.html 28 Feb 2007 13:06:45 -0000 1.31 +++ generalconfig.html 2 Mar 2007 12:57:52 -0000 1.32 @@ -477,6 +477,16 @@ +messageKeyOnly +Only start messages with the actual message key(s), if cursor is in the message windows + +
    +
  • on (default)
  • +
  • off
  • +
+ + + metaCache Path to cache file for Metaserver data path From modemhero at users.sourceforge.net Fri Mar 2 06:57:53 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 02 Mar 2007 12:57:53 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.118, 1.119 netrekrc, 1.30, 1.31 netrekrc_options.txt, 1.31, 1.32 Message-ID: <20070302125837.951931867D2@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20265/resources/docs Modified Files: changes.txt netrekrc netrekrc_options.txt Log Message: Restore old perror() function. Add more debug info on failed metaping requests. New netrekrc feature messageKeyOnly which disables the somewhat annoying feature where any key pressed while mouse is over a message window will attempt to send a message to that player slot #. Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- netrekrc 1 Mar 2007 18:31:16 -0000 1.30 +++ netrekrc 2 Mar 2007 12:57:51 -0000 1.31 @@ -128,6 +128,10 @@ # 2 - bottom of the window messageHUD: 0 +# Only start messages with the actual message key(s), +# if cursor is in the message windows +messageKeyOnly: 1 + # Metaserver port metaPort: 3521 Index: netrekrc_options.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc_options.txt,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- netrekrc_options.txt 1 Mar 2007 11:21:45 -0000 1.31 +++ netrekrc_options.txt 2 Mar 2007 12:57:51 -0000 1.32 @@ -87,6 +87,9 @@ # 1 - tactical top # 2 - tactical bottom +messageKeyOnly: (on/off) only start messages with the actual message key(s), + if cursor is in the message windows +messageKeyOnly: 1 metaCache: (path) path to metacache file metaPing: (on/off) show ping stats to all servers in metaserver window metaPort: (port) metaserver port Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.118 retrieving revision 1.119 diff -u -d -r1.118 -r1.119 --- changes.txt 1 Mar 2007 11:21:45 -0000 1.118 +++ changes.txt 2 Mar 2007 12:57:50 -0000 1.119 @@ -1,4 +1,8 @@ Netrek XP 2006, Version 1.2: (Released Feb-2007) +- added "messageKeyOnly: (on)/off" so that you will only start messages with the actual + message key(s) if the cursor is in the message windows. Previously, pressing any key + while the cursor was over the message windows/warning window would attempt to send a + message, which sometimes leads to accidental messaging. - changes updatesPerSec so it now only cycles over valid ranges as defined by the server. For a server running at 10 fps, valid update/sec values are 1 2 5 and 10. For a server running at 50 fps, valid update/sec ranges are 1 2 5 10 25 and 50. From modemhero at users.sourceforge.net Fri Mar 2 06:57:52 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 02 Mar 2007 12:57:52 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.108, 1.109 clientr.suo, 1.89, 1.90 Message-ID: <20070302125835.D2958B3F0@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20265 Modified Files: NetrekXP to do list.C clientr.suo Log Message: Restore old perror() function. Add more debug info on failed metaping requests. New netrekrc feature messageKeyOnly which disables the somewhat annoying feature where any key pressed while mouse is over a message window will attempt to send a message to that player slot #. Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.108 retrieving revision 1.109 diff -u -d -r1.108 -r1.109 --- NetrekXP to do list.C 1 Mar 2007 07:35:44 -0000 1.108 +++ NetrekXP to do list.C 2 Mar 2007 12:57:43 -0000 1.109 @@ -47,9 +47,9 @@ 9) Out of bounds message window calcs don't work with taskbar or menu bar, basewin rect doesn't take these into account. 10) Make sure all ping related fields are switched correctly via metasort. -11) ships orbiting and galactip map refresh..blinking..server not sending orbiters -until every 4th packet? at 50 fps? and every other packet at 20 fps. Where's the -code that makes vplayer not get sent if not moving/in orbit? +11) Server issue with ships in orbit at 50 fps. +12) sendto() error: 10049 on metaserver connect to a bad server +12a) Why getting recvfrom timeout errors from multicast metaserver connect? Stas's list: - color coded playerlist. @@ -61,8 +61,6 @@ - add msg.phaser to enable formatting of phaser messages - add copy/paste possibility from message windows (richtext ?) - add clickable urls from message windows (richtext ?) -- add "mKeyOnlyToStartMessages: on/off" to ignore keys [0-9][a-z][ATFOKRG] in message window when the messageon=0 - scrollable player list - parse Announcer messages in hockey games -- resize documentation window - pasting multiline prints \r\n instead of splitting lines Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.89 retrieving revision 1.90 diff -u -d -r1.89 -r1.90 Binary files /tmp/cvs2o0oeU and /tmp/cvsqwrjIK differ From modemhero at users.sourceforge.net Sat Mar 3 04:02:47 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 03 Mar 2007 10:02:47 +0000 Subject: [netrek-cvs] client/netrekxp/src cowmain.c, 1.27, 1.28 defaults.c, 1.51, 1.52 parsemeta.c, 1.32, 1.33 Message-ID: <20070303100301.38D0CB3ED@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv24500/src Modified Files: cowmain.c defaults.c parsemeta.c Log Message: Minor fixes to error request messgaes in certain metaserver/metaping cases. Moved initial read of updatesPerSec to occur after receipt of feature packets. Server is now sending both FPS and UPS on client connect, but we want client to send a request for updatesPerSec using the value in the netrekrc, so we need to read it in after those initial feature packets are received. Index: cowmain.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/cowmain.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- cowmain.c 1 Mar 2007 07:35:44 -0000 1.27 +++ cowmain.c 3 Mar 2007 10:02:44 -0000 1.28 @@ -1055,6 +1055,7 @@ sendUdpReq (COMM_UPDATE); #endif /* Send request for updatesPerSec. New servers now support 50 u/s */ + lastUpdateSpeed = updatesPerSec = intDefault ("updatesPerSec", updatesPerSec); sendUpdatePacket (1000000 / updatesPerSec); #ifdef HOCKEY_LINES Index: parsemeta.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/parsemeta.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- parsemeta.c 2 Mar 2007 12:57:54 -0000 1.32 +++ parsemeta.c 3 Mar 2007 10:02:44 -0000 1.33 @@ -746,7 +746,8 @@ if (bytes < 0) { /* Don't return on the initial call, allow time for other metaservers */ if (x != -1) { - perror("ReadMetasRecv: recvfrom"); + if (errno) + perror("ReadMetasRecv: recvfrom"); return 0; } } @@ -1924,7 +1925,7 @@ if (nRet == SOCKET_ERROR) { metaPing_ReportError("sendto()"); - LineToConsole("IP address %s\n", lpstToAddr->sin_addr.s_addr); + LineToConsole("Error pinging %s\n", inet_ntoa(lpstToAddr->sin_addr)); } return (nRet); } @@ -1952,7 +1953,7 @@ if (nRet == SOCKET_ERROR) { metaPing_ReportError("recvfrom()"); - LineToConsole("IP address %s\n", lpsaFrom->sin_addr.s_addr); + LineToConsole("Error receiving ping from %s\n", inet_ntoa(lpsaFrom->sin_addr)); return SOCKET_ERROR; } Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- defaults.c 2 Mar 2007 12:57:52 -0000 1.51 +++ defaults.c 3 Mar 2007 10:02:44 -0000 1.52 @@ -1586,7 +1586,6 @@ detCircle = booleanDefault ("detCircle", detCircle); puckCircle = booleanDefault ("puckCircle", puckCircle); showArmy = booleanDefault ("showArmy", showArmy); - lastUpdateSpeed = updatesPerSec = intDefault ("updatesPerSec", updatesPerSec); redrawDelay = intDefault ("redrawDelay", redrawDelay); planetHighlighting = booleanDefault ("planetHighlighting", planetHighlighting); rotatePlanets = booleanDefault ("rotatePlanets", rotatePlanets); From modemhero at users.sourceforge.net Sat Mar 3 04:02:46 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 03 Mar 2007 10:02:46 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.109, 1.110 clientr.suo, 1.90, 1.91 Message-ID: <20070303100301.37CB11867CE@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv24500 Modified Files: NetrekXP to do list.C clientr.suo Log Message: Minor fixes to error request messgaes in certain metaserver/metaping cases. Moved initial read of updatesPerSec to occur after receipt of feature packets. Server is now sending both FPS and UPS on client connect, but we want client to send a request for updatesPerSec using the value in the netrekrc, so we need to read it in after those initial feature packets are received. Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.109 retrieving revision 1.110 diff -u -d -r1.109 -r1.110 --- NetrekXP to do list.C 2 Mar 2007 12:57:43 -0000 1.109 +++ NetrekXP to do list.C 3 Mar 2007 10:02:43 -0000 1.110 @@ -47,20 +47,16 @@ 9) Out of bounds message window calcs don't work with taskbar or menu bar, basewin rect doesn't take these into account. 10) Make sure all ping related fields are switched correctly via metasort. -11) Server issue with ships in orbit at 50 fps. -12) sendto() error: 10049 on metaserver connect to a bad server -12a) Why getting recvfrom timeout errors from multicast metaserver connect? +10a) sendto() error: 10049 on metaserver connect to a bad server, believe it's due +to hostname not resolving Stas's list: -- color coded playerlist. -! server: ita won't block RCDs (why not ?) -! after res if there cloaker around he will be seen briefly (speed 0 bug) +- color coded (?) and scrollable playerlist. - add "reset to defaults" to options menu - add shiftMouse, controlMouse on/off - fix accelerated scroll for microsoft mice - add msg.phaser to enable formatting of phaser messages - add copy/paste possibility from message windows (richtext ?) - add clickable urls from message windows (richtext ?) -- scrollable player list - parse Announcer messages in hockey games - pasting multiline prints \r\n instead of splitting lines Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.90 retrieving revision 1.91 diff -u -d -r1.90 -r1.91 Binary files /tmp/cvs4Lvwin and /tmp/cvsrt52Za differ From modemhero at users.sourceforge.net Sat Mar 3 04:41:46 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 03 Mar 2007 10:41:46 +0000 Subject: [netrek-cvs] client/netrekxp/resources/unused art - New directory Message-ID: <20070303104155.411E1B3ED@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/unused art In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv8644/unused art Log Message: Directory /cvsroot/netrek/client/netrekxp/resources/unused art added to the repository From modemhero at users.sourceforge.net Sat Mar 3 04:52:00 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 03 Mar 2007 10:52:00 +0000 Subject: [netrek-cvs] client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET AssemblyInfo.vb, 1.1, NONE Form1.Designer.vb, 1.1, NONE Form1.resX, 1.1, NONE Form1.vb, 1.1, NONE Form2.Designer.vb, 1.1, NONE Form2.resX, 1.1, NONE Form2.vb, 1.1, NONE Form3.Designer.vb, 1.1, NONE Form3.resX, 1.1, NONE Form3.vb, 1.1, NONE _UpgradeReport.htm, 1.1, NONE netrekconfig.ico, 1.1, NONE netrekconfig.log, 1.1, NONE netrekconfig.sln, 1.1, NONE netrekconfig.suo, 1.1, NONE netrekconfig.vbproj, 1.1, NONE netrekconfig.vbproj.user, 1.1, NONE Message-ID: <20070303105208.669231867CE@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13251/tools/VBasic config utility/Netrek_Configurator.NET Removed Files: AssemblyInfo.vb Form1.Designer.vb Form1.resX Form1.vb Form2.Designer.vb Form2.resX Form2.vb Form3.Designer.vb Form3.resX Form3.vb _UpgradeReport.htm netrekconfig.ico netrekconfig.log netrekconfig.sln netrekconfig.suo netrekconfig.vbproj netrekconfig.vbproj.user Log Message: Removed VBasic config utility, that will have to be a separate project on sourceforge, if Joe decides to put it there. Added unused Defcom art folder. Minor netrekrc fixes. --- AssemblyInfo.vb DELETED --- --- netrekconfig.vbproj.user DELETED --- --- Form1.resX DELETED --- --- Form2.vb DELETED --- --- Form2.Designer.vb DELETED --- --- netrekconfig.suo DELETED --- --- Form3.Designer.vb DELETED --- --- Form3.resX DELETED --- --- netrekconfig.ico DELETED --- --- netrekconfig.log DELETED --- --- Form1.Designer.vb DELETED --- --- Form3.vb DELETED --- --- Form1.vb DELETED --- --- netrekconfig.sln DELETED --- --- Form2.resX DELETED --- --- _UpgradeReport.htm DELETED --- --- netrekconfig.vbproj DELETED --- From modemhero at users.sourceforge.net Sat Mar 3 04:51:35 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 03 Mar 2007 10:51:35 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs netrekrc,1.31,1.32 Message-ID: <20070303105214.D87321867D0@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13251/resources/docs Modified Files: netrekrc Log Message: Removed VBasic config utility, that will have to be a separate project on sourceforge, if Joe decides to put it there. Added unused Defcom art folder. Minor netrekrc fixes. Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- netrekrc 2 Mar 2007 12:57:51 -0000 1.31 +++ netrekrc 3 Mar 2007 10:51:32 -0000 1.32 @@ -128,9 +128,9 @@ # 2 - bottom of the window messageHUD: 0 -# Only start messages with the actual message key(s), +# Only start messages with the actual message key(s) # if cursor is in the message windows -messageKeyOnly: 1 +messageKeyOnly: on # Metaserver port metaPort: 3521 @@ -741,11 +741,11 @@ # Keys that will trigger macro without going to macro mode singleMacro: EF -macro.0.A:% __ __ ______ __ Want to see some better graphics? -macro.0.A:% / \ / /__/_ __/______ / /__ Want a better sounding client? -macro.0.A:% / /\ \/ / -_)/ / / __/ -_) '_/ +macro.0.A:% __ __ ______ __ 256 ship positions, 50 FPS support, +macro.0.A:% / \ / /__/_ __/______ / /__ all new music and sound, and a +macro.0.A:% / /\ \/ / -_)/ / / __/ -_) '_/ whole lot more! macro.0.A:% /_/ \__/\__//_/ /_/ \__/_/\_\ XP 2006, v1.2 -macro.0.A:% Get it today at http://www.netrek.org +macro.0.A:% Get it today at http://www.playnetrek.org macro.a.A:. o Just | Squeal boy... macro.a.A:. //\ %p: ABUSED! Plain | just like a From modemhero at users.sourceforge.net Sat Mar 3 04:51:46 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 03 Mar 2007 10:51:46 +0000 Subject: [netrek-cvs] client/netrekxp/tools/VBasic config utility Form1.frm, 1.1, NONE Form1.frx, 1.1, NONE Form2.frm, 1.1, NONE Form2.frx, 1.1, NONE Form3.frm, 1.1, NONE Form3.frx, 1.1, NONE MSSCCPRJ.SCC, 1.1, NONE README.txt, 1.1, NONE controls.txt, 1.1, NONE netrekconfig.VBP, 1.1, NONE netrekconfig.vbw, 1.1, NONE netrekrc, 1.1, NONE netrekrc.sav, 1.1, NONE Message-ID: <20070303105155.C3C081867CE@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/tools/VBasic config utility In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13251/tools/VBasic config utility Removed Files: Form1.frm Form1.frx Form2.frm Form2.frx Form3.frm Form3.frx MSSCCPRJ.SCC README.txt controls.txt netrekconfig.VBP netrekconfig.vbw netrekrc netrekrc.sav Log Message: Removed VBasic config utility, that will have to be a separate project on sourceforge, if Joe decides to put it there. Added unused Defcom art folder. Minor netrekrc fixes. --- Form2.frm DELETED --- --- Form3.frm DELETED --- --- Form1.frx DELETED --- --- MSSCCPRJ.SCC DELETED --- --- controls.txt DELETED --- --- Form1.frm DELETED --- --- netrekrc.sav DELETED --- --- netrekconfig.vbw DELETED --- --- Form3.frx DELETED --- --- Form2.frx DELETED --- --- netrekrc DELETED --- --- netrekconfig.VBP DELETED --- --- README.txt DELETED --- From modemhero at users.sourceforge.net Sat Mar 3 04:51:36 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 03 Mar 2007 10:51:36 +0000 Subject: [netrek-cvs] client/netrekxp/src defaults.c,1.52,1.53 Message-ID: <20070303105214.C85EEB3F0@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13251/src Modified Files: defaults.c Log Message: Removed VBasic config utility, that will have to be a separate project on sourceforge, if Joe decides to put it there. Added unused Defcom art folder. Minor netrekrc fixes. Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- defaults.c 3 Mar 2007 10:02:44 -0000 1.52 +++ defaults.c 3 Mar 2007 10:51:33 -0000 1.53 @@ -2136,20 +2136,22 @@ #ifdef SOUND // excluded sound categories - if ((adefault = stringDefault ("soundExclude")) != NULL) + adefault = stringDefault ("soundExclude"); + if (saveBig) { - if (saveBig) - { - fputs ("# Sound categories to turn off\n", fp); - fputs ("# e=explosions, w=weapons, a=alerts,\n", fp); - fputs ("# m=messages, i=info, c=cloaking,\n", fp); - fputs ("# s=shield, o=other ships\n", fp); - } - sprintf (str, "soundExclude: %s\n", adefault); - fputs (str, fp); - if (saveBig) - fputs ("\n", fp); + fputs ("# Sound categories to turn off\n", fp); + fputs ("# e=explosions, w=weapons, a=alerts,\n", fp); + fputs ("# m=messages, i=info, c=cloaking,\n", fp); + fputs ("# s=shield, o=other ships\n", fp); } + if (adefault == NULL) + sprintf (str, "soundExclude:\n"); + else + sprintf (str, "soundExclude: %s\n", adefault); + fputs (str, fp); + if (saveBig) + fputs ("\n", fp); + // sound directory if (sounddir != NULL) { From modemhero at users.sourceforge.net Sat Mar 3 04:51:37 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 03 Mar 2007 10:51:37 +0000 Subject: [netrek-cvs] client/netrekxp/resources/unused art Spock torpedo copy.jpg, NONE, 1.1 army men.jpg, NONE, 1.1 cloak.jpg, NONE, 1.1 gas can.jpg, NONE, 1.1 shield green.jpg, NONE, 1.1 shield red.jpg, NONE, 1.1 shield yellow.jpg, NONE, 1.1 wrench.jpg, NONE, 1.1 Message-ID: <20070303105146.304841867CE@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/unused art In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13251/resources/unused art Added Files: Spock torpedo copy.jpg army men.jpg cloak.jpg gas can.jpg shield green.jpg shield red.jpg shield yellow.jpg wrench.jpg Log Message: Removed VBasic config utility, that will have to be a separate project on sourceforge, if Joe decides to put it there. Added unused Defcom art folder. Minor netrekrc fixes. --- NEW FILE: gas can.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shield green.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: army men.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: cloak.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shield yellow.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: wrench.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Spock torpedo copy.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shield red.jpg --- (This appears to be a binary file; contents omitted.) From modemhero at users.sourceforge.net Sat Mar 3 04:52:03 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 03 Mar 2007 10:52:03 +0000 Subject: [netrek-cvs] client/netrekxp/tools/VBasic config utility/configs netrekrc.one, 1.1, NONE netrekrc.sep, 1.1, NONE Message-ID: <20070303105212.A963E1867CE@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/tools/VBasic config utility/configs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13251/tools/VBasic config utility/configs Removed Files: netrekrc.one netrekrc.sep Log Message: Removed VBasic config utility, that will have to be a separate project on sourceforge, if Joe decides to put it there. Added unused Defcom art folder. Minor netrekrc fixes. --- netrekrc.one DELETED --- --- netrekrc.sep DELETED --- From modemhero at users.sourceforge.net Sat Mar 3 04:52:02 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 03 Mar 2007 10:52:02 +0000 Subject: [netrek-cvs] client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET/bin Netrek_Configurator.vshost.exe, 1.1, NONE Message-ID: <20070303105210.35603B3ED@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET/bin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13251/tools/VBasic config utility/Netrek_Configurator.NET/bin Removed Files: Netrek_Configurator.vshost.exe Log Message: Removed VBasic config utility, that will have to be a separate project on sourceforge, if Joe decides to put it there. Added unused Defcom art folder. Minor netrekrc fixes. --- Netrek_Configurator.vshost.exe DELETED --- From modemhero at users.sourceforge.net Sat Mar 3 04:52:01 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 03 Mar 2007 10:52:01 +0000 Subject: [netrek-cvs] client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET/_UpgradeReport_Files UpgradeReport.css, 1.1, NONE UpgradeReport_Minus.gif, 1.1, NONE UpgradeReport_Plus.gif, 1.1, NONE Message-ID: <20070303105209.B42191867D0@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET/_UpgradeReport_Files In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13251/tools/VBasic config utility/Netrek_Configurator.NET/_UpgradeReport_Files Removed Files: UpgradeReport.css UpgradeReport_Minus.gif UpgradeReport_Plus.gif Log Message: Removed VBasic config utility, that will have to be a separate project on sourceforge, if Joe decides to put it there. Added unused Defcom art folder. Minor netrekrc fixes. --- UpgradeReport.css DELETED --- --- UpgradeReport_Minus.gif DELETED --- --- UpgradeReport_Plus.gif DELETED --- From modemhero at users.sourceforge.net Sat Mar 3 05:16:49 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 03 Mar 2007 11:16:49 +0000 Subject: [netrek-cvs] client/netrekxp/resources/unused art federation.png, NONE, 1.1 klingon.png, NONE, 1.1 orion.png, NONE, 1.1 romulan.png, NONE, 1.1 Message-ID: <20070303111658.0A2F21867CE@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/unused art In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25491/resources/unused art Added Files: federation.png klingon.png orion.png romulan.png Log Message: Added cool logo buttons from mactrek, maybe one day will have a use for these. --- NEW FILE: klingon.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: orion.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: romulan.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: federation.png --- (This appears to be a binary file; contents omitted.) From modemhero at users.sourceforge.net Sat Mar 3 05:16:47 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 03 Mar 2007 11:16:47 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo,1.91,1.92 Message-ID: <20070303111658.0956AB3ED@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25491 Modified Files: clientr.suo Log Message: Added cool logo buttons from mactrek, maybe one day will have a use for these. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.91 retrieving revision 1.92 diff -u -d -r1.91 -r1.92 Binary files /tmp/cvsHa47Qe and /tmp/cvsfgGl5Y differ From modemhero at users.sourceforge.net Sun Mar 4 16:27:15 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 04 Mar 2007 22:27:15 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.119, 1.120 Message-ID: <20070304222724.AD7A5B3F9@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22149/resources/docs Modified Files: changes.txt Log Message: Failed host lookup is not setting serverlist[i].ip_addr to INADDR_NONE, rather than find out why I just put in an extra check so as not to ping these failed hosts. Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.119 retrieving revision 1.120 diff -u -d -r1.119 -r1.120 --- changes.txt 2 Mar 2007 12:57:50 -0000 1.119 +++ changes.txt 4 Mar 2007 22:27:13 -0000 1.120 @@ -1,3 +1,5 @@ +Netrek XP 2006, Version 1.3: + Netrek XP 2006, Version 1.2: (Released Feb-2007) - added "messageKeyOnly: (on)/off" so that you will only start messages with the actual message key(s) if the cursor is in the message windows. Previously, pressing any key From modemhero at users.sourceforge.net Sun Mar 4 16:27:15 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 04 Mar 2007 22:27:15 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo,1.92,1.93 Message-ID: <20070304222724.A50F31867CC@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22149 Modified Files: clientr.suo Log Message: Failed host lookup is not setting serverlist[i].ip_addr to INADDR_NONE, rather than find out why I just put in an extra check so as not to ping these failed hosts. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.92 retrieving revision 1.93 diff -u -d -r1.92 -r1.93 Binary files /tmp/cvsBCXqsj and /tmp/cvsF2wZGu differ From modemhero at users.sourceforge.net Sun Mar 4 16:27:15 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 04 Mar 2007 22:27:15 +0000 Subject: [netrek-cvs] client/netrekxp/src parsemeta.c,1.33,1.34 Message-ID: <20070304222724.ACA4FB3F0@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22149/src Modified Files: parsemeta.c Log Message: Failed host lookup is not setting serverlist[i].ip_addr to INADDR_NONE, rather than find out why I just put in an extra check so as not to ping these failed hosts. Index: parsemeta.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/parsemeta.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- parsemeta.c 3 Mar 2007 10:02:44 -0000 1.33 +++ parsemeta.c 4 Mar 2007 22:27:13 -0000 1.34 @@ -2050,6 +2050,9 @@ saDest.sin_family = AF_INET; saDest.sin_port = 0; + // Address lookup failed somehow during init, don't ping + if (!saDest.sin_addr.s_addr) continue; + // Send ICMP echo request //printf("\nPinging %s [%s]", serverlist[i].address, inet_ntoa(saDest.sin_addr)); if (metaPing_sendEchoRequest(rawSocket, &saDest, idx) == SOCKET_ERROR) From modemhero at users.sourceforge.net Tue Mar 6 18:11:48 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 07 Mar 2007 00:11:48 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo,1.93,1.94 Message-ID: <20070307001158.36E821867D2@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv16125 Modified Files: clientr.suo Log Message: Minor release date updates. Formalize max lifetime for servers in cache. Check against out of bounds lifetime before saving. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.93 retrieving revision 1.94 diff -u -d -r1.93 -r1.94 Binary files /tmp/cvsrGuBdF and /tmp/cvsCErMxi differ From modemhero at users.sourceforge.net Tue Mar 6 18:11:49 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 07 Mar 2007 00:11:49 +0000 Subject: [netrek-cvs] client/netrekxp/src parsemeta.c,1.34,1.35 Message-ID: <20070307001158.0DCD51867CE@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv16125/src Modified Files: parsemeta.c Log Message: Minor release date updates. Formalize max lifetime for servers in cache. Check against out of bounds lifetime before saving. Index: parsemeta.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/parsemeta.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- parsemeta.c 4 Mar 2007 22:27:13 -0000 1.34 +++ parsemeta.c 7 Mar 2007 00:11:46 -0000 1.35 @@ -71,6 +71,7 @@ static int seen = 0; /* number of replies seen */ static int type; /* type of connection requested */ #define RTT_AVG_BUFLEN 5 /* number of samples used for average rtt time */ +#define MAX_LIFETIME 5 /* max # connects for server to stay in cache */ /* from meta.h of metaserver code */ #define SS_WORKING 0 @@ -598,12 +599,12 @@ sp->age = (int)now - (int)(sp->when-sp->age); sp->when = now; sp->refresh = 1; - sp->lifetime = 5; + sp->lifetime = MAX_LIFETIME; continue; } else { sp->age = age; sp->when = now; - sp->lifetime = 5; + sp->lifetime = MAX_LIFETIME; } } /* Use converted status and player values */ @@ -689,7 +690,7 @@ sp->age = 0; sp->when = now; sp->refresh = 1; - sp->lifetime = 5; + sp->lifetime = MAX_LIFETIME; sp->players = players; sp->status = statusOpen; sp->typeflag = type; @@ -854,7 +855,8 @@ serverlist[i].port, serverlist[i].when, serverlist[i].age, - serverlist[i].lifetime, + // Protect against corrupted data so at least lifetimes clear quickly + ((serverlist[i].lifetime > MAX_LIFETIME) ? MAX_LIFETIME : serverlist[i].lifetime), serverlist[i].players, ((serverlist[i].status <= statusNull) ? serverlist[i].status : statusNull), serverlist[i].typeflag); From modemhero at users.sourceforge.net Tue Mar 6 18:11:48 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 07 Mar 2007 00:11:48 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.120, 1.121 netrekrc, 1.32, 1.33 Message-ID: <20070307001158.2354E1867D0@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv16125/resources/docs Modified Files: changes.txt netrekrc Log Message: Minor release date updates. Formalize max lifetime for servers in cache. Check against out of bounds lifetime before saving. Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- netrekrc 3 Mar 2007 10:51:32 -0000 1.32 +++ netrekrc 7 Mar 2007 00:11:46 -0000 1.33 @@ -744,7 +744,7 @@ macro.0.A:% __ __ ______ __ 256 ship positions, 50 FPS support, macro.0.A:% / \ / /__/_ __/______ / /__ all new music and sound, and a macro.0.A:% / /\ \/ / -_)/ / / __/ -_) '_/ whole lot more! -macro.0.A:% /_/ \__/\__//_/ /_/ \__/_/\_\ XP 2006, v1.2 +macro.0.A:% /_/ \__/\__//_/ /_/ \__/_/\_\ XP 2006, v1.2, released March 2007 macro.0.A:% Get it today at http://www.playnetrek.org macro.a.A:. o Just | Squeal boy... @@ -917,7 +917,7 @@ macro.).A:/* 10pm EST/7pm PST */ macro.(.A: /* Get the latest version of Netrek XP 2006 today! */ -macro.(.A: /* Current version is 1.2, released February 2007 */ +macro.(.A: /* Current version is 1.2, released March 2007 */ macro.(.A: /* Download it at http://www.netrek.org/files/NetrekXP_2006/ */ macro.(.A: /* or */ macro.(.A: /* http://www.playnetrek.org/ */ Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.120 retrieving revision 1.121 diff -u -d -r1.120 -r1.121 --- changes.txt 4 Mar 2007 22:27:13 -0000 1.120 +++ changes.txt 7 Mar 2007 00:11:46 -0000 1.121 @@ -1,6 +1,6 @@ Netrek XP 2006, Version 1.3: -Netrek XP 2006, Version 1.2: (Released Feb-2007) +Netrek XP 2006, Version 1.2: (Released Mar-2007) - added "messageKeyOnly: (on)/off" so that you will only start messages with the actual message key(s) if the cursor is in the message windows. Previously, pressing any key while the cursor was over the message windows/warning window would attempt to send a From modemhero at users.sourceforge.net Sun Mar 11 17:16:01 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 11 Mar 2007 22:16:01 +0000 Subject: [netrek-cvs] client/netrekxp/src mswindow.c, 1.44, 1.45 newwin.c, 1.50, 1.51 parsemeta.c, 1.35, 1.36 playback.c, 1.18, 1.19 Message-ID: <20070311221611.CF5911867E6@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28663/src Modified Files: mswindow.c newwin.c parsemeta.c playback.c Log Message: Fixed error messages with cambot and beeplite by removing the DBICONHEADER printout on bitmap/window hwnd mismatch. Fixed beeplite bitmap storage so they are set to window 'w' rather than 'mapw'. Fixed music playback with cambot so it stops playing on entry properly. Fixed bug with metaserver not sorting correcty sometimes, and some server entries not having their metaping field initialized. Also added a better check against saving corrupted server entries. Index: mswindow.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- mswindow.c 28 Feb 2007 07:44:00 -0000 1.44 +++ mswindow.c 11 Mar 2007 22:15:58 -0000 1.45 @@ -189,7 +189,6 @@ win = (Window *)window;\ if (bitmap->hwnd != win->hwnd)\ {\ - LineToConsole("DBICONHEADER - bitmap and window mismatch\n");\ hdc = GetDC (win->hwnd);\ usebitmaphwnd = 0;\ }\ Index: newwin.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- newwin.c 2 Mar 2007 12:57:53 -0000 1.50 +++ newwin.c 11 Mar 2007 22:15:58 -0000 1.51 @@ -1153,7 +1153,7 @@ beeplite1 = W_StoreBitmap3 ("bitmaps/misclib/beepliteplayerm.bmp", emph_player_seq_width, emph_player_seq_height * emph_player_seq_frames, BMP_BEEPLITE1, - mapw, LR_MONOCHROME); + w, LR_MONOCHROME); for (i = 0; i < emph_player_seq_frames; i++) emph_player_seq[emph_player_seq_frames - (i + 1)] = @@ -1162,7 +1162,7 @@ beeplite2 = W_StoreBitmap3 ("bitmaps/misclib/beepliteplayerl.bmp", emph_player_seql_width, emph_player_seql_height * emph_player_seql_frames, BMP_BEEPLITE2, - mapw, LR_MONOCHROME); + w, LR_MONOCHROME); for (i = 0; i < emph_player_seql_frames; i++) emph_player_seql[emph_player_seql_frames - (i + 1)] = @@ -1171,7 +1171,7 @@ beeplite3 = W_StoreBitmap3 ("bitmaps/misclib/beepliteplanet.bmp", emph_planet_seq_width, emph_planet_seq_height * emph_planet_seq_frames, BMP_BEEPLITE3, - mapw, LR_MONOCHROME); + w, LR_MONOCHROME); for (i = 0; i < emph_planet_seq_frames; i++) emph_planet_seq[emph_planet_seq_frames - (i + 1)] = Index: playback.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/playback.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- playback.c 28 Feb 2007 12:21:50 -0000 1.18 +++ playback.c 11 Mar 2007 22:15:58 -0000 1.19 @@ -347,6 +347,14 @@ #ifdef SOUND Mix_HaltChannel(-1); /* Kill all currently playing sounds when entering game */ + /* Fade out any music playing over 5 seconds if background + music is off (i.e fade out geno music) */ + if (Mix_PlayingMusic() && !soundMusicBkgd) + { + Mix_FadeOutMusic(5000); + /* Attempt to start background music once fadeout done */ + Mix_HookMusicFinished(Play_Music_Bkgd); + } Play_Sound(ENTER_SHIP_WAV, SF_INFO); #endif Index: parsemeta.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/parsemeta.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- parsemeta.c 7 Mar 2007 00:11:46 -0000 1.35 +++ parsemeta.c 11 Mar 2007 22:15:58 -0000 1.36 @@ -148,7 +148,7 @@ /* Functions */ extern void terminate (int error); - +static void metasort (void); static int open_port (char *host, @@ -788,6 +788,7 @@ metaWin = W_MakeMenu ("MetaServer List", 0, 0, 80, metaHeight, NULL, 2); W_SetWindowKeyDownHandler (metaWin, metaaction); W_SetWindowButtonHandler (metaWin, metaaction); + metasort(); } /* if we have seen the same number of replies to what we sent, end */ @@ -850,13 +851,16 @@ if (metaPing && serverlist[i].pkt_rtt[0] == -2) continue; #endif + /* Protect against saving corrupted server data */ + if (serverlist[i].address == NULL || serverlist[i].lifetime > MAX_LIFETIME) + continue; + sprintf(str,"%s,%d,%lld,%d,%d,%d,%d,%c\n", serverlist[i].address, serverlist[i].port, serverlist[i].when, serverlist[i].age, - // Protect against corrupted data so at least lifetimes clear quickly - ((serverlist[i].lifetime > MAX_LIFETIME) ? MAX_LIFETIME : serverlist[i].lifetime), + serverlist[i].lifetime, serverlist[i].players, ((serverlist[i].status <= statusNull) ? serverlist[i].status : statusNull), serverlist[i].typeflag); @@ -1380,6 +1384,13 @@ memcpy(&tempserver[0],&serverlist[i],sizeof(struct servers)); memcpy(&serverlist[i],&serverlist[i+1],sizeof(struct servers)); memcpy(&serverlist[i+1],&tempserver[0],sizeof(struct servers)); +#ifdef METAPING + /* Reset IP lookup flag, as metaping initialization is a concurrent + thread and changing the ordering of the serverlist can lead to + assigning IP addresses to the wrong serverlist entry. */ + serverlist[i].ip_lookup = 0; + serverlist[i+1].ip_lookup = 0; +#endif /* Start back at beginning - could be more efficient with maybe a qsort but the serverlist is so small it doesn't matter much */ i = 0; @@ -2051,7 +2062,7 @@ saDest.sin_addr.s_addr = serverlist[i].ip_addr; saDest.sin_family = AF_INET; saDest.sin_port = 0; - + // Address lookup failed somehow during init, don't ping if (!saDest.sin_addr.s_addr) continue; From modemhero at users.sourceforge.net Sun Mar 11 17:16:00 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 11 Mar 2007 22:16:00 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.121, 1.122 Message-ID: <20070311221610.6A5EFB3ED@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28663/resources/docs Modified Files: changes.txt Log Message: Fixed error messages with cambot and beeplite by removing the DBICONHEADER printout on bitmap/window hwnd mismatch. Fixed beeplite bitmap storage so they are set to window 'w' rather than 'mapw'. Fixed music playback with cambot so it stops playing on entry properly. Fixed bug with metaserver not sorting correcty sometimes, and some server entries not having their metaping field initialized. Also added a better check against saving corrupted server entries. Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.121 retrieving revision 1.122 diff -u -d -r1.121 -r1.122 --- changes.txt 7 Mar 2007 00:11:46 -0000 1.121 +++ changes.txt 11 Mar 2007 22:15:58 -0000 1.122 @@ -1,4 +1,8 @@ Netrek XP 2006, Version 1.3: +- fixed error messages with cambot and beeplite +- fixed music playback with cambot so it stops playing on entry properly +- fixed bug with metaserver not sorting correcty sometimes, and some server entries not + having their metaping field initialized. Netrek XP 2006, Version 1.2: (Released Mar-2007) - added "messageKeyOnly: (on)/off" so that you will only start messages with the actual From modemhero at users.sourceforge.net Sun Mar 11 17:16:00 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 11 Mar 2007 22:16:00 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.110, 1.111 clientr.suo, 1.94, 1.95 Message-ID: <20070311221608.C7C21B3EB@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28663 Modified Files: NetrekXP to do list.C clientr.suo Log Message: Fixed error messages with cambot and beeplite by removing the DBICONHEADER printout on bitmap/window hwnd mismatch. Fixed beeplite bitmap storage so they are set to window 'w' rather than 'mapw'. Fixed music playback with cambot so it stops playing on entry properly. Fixed bug with metaserver not sorting correcty sometimes, and some server entries not having their metaping field initialized. Also added a better check against saving corrupted server entries. Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.110 retrieving revision 1.111 diff -u -d -r1.110 -r1.111 --- NetrekXP to do list.C 3 Mar 2007 10:02:43 -0000 1.110 +++ NetrekXP to do list.C 11 Mar 2007 22:15:57 -0000 1.111 @@ -35,20 +35,16 @@ 2) Save options for observer/servernick/servertype need to be saved 3) Get square planet bitmaps so I can turn them into mapped rotating globes. 4) Pop-up dialog box for bad version response -5) new UDP metaserver code has issue if 2nd metaserver responding has more servers, can be -awkward to resize window if user going to click on a server. However if cache is working -properly, after the first connect, all servers should be stored and the metaserver window -should not resize due to differences between the metaservers. -5a) Metaping on a Unknown server is causing unseemly delay due to threading. +5) Metaping on a Unknown server is causing unseemly delay due to threading. 7) Some sort of click action on player list brings up a menu with settings for that player's candock, cantranswarp, ban, ignore, etc. 8) Maybe fix galactic new planet bitmap redraw sequence, caused incredible lag on a P166 Win98 xp computer 9) Out of bounds message window calcs don't work with taskbar or menu bar, basewin rect doesn't take these into account. -10) Make sure all ping related fields are switched correctly via metasort. -10a) sendto() error: 10049 on metaserver connect to a bad server, believe it's due -to hostname not resolving +10) sendto() error: 10049 on metaserver connect to a bad server, believe it's due +to hostname not resolving. Should be fixed. +12) fix redraw for stationary ships with new planets Stas's list: - color coded (?) and scrollable playerlist. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.94 retrieving revision 1.95 diff -u -d -r1.94 -r1.95 Binary files /tmp/cvsKT2X7j and /tmp/cvsfDdykc differ From modemhero at users.sourceforge.net Tue Mar 13 13:35:02 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 13 Mar 2007 18:35:02 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html generalconfig.html, 1.32, 1.33 Message-ID: <20070313183513.A69441867F5@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv23170/resources/htmlhelp/html Modified Files: generalconfig.html Log Message: Added "autoSetWar: (0-2)" netrekrc option that controls declare war settings with enemy races when you first join. Can now automatically declare peace on 3rd space races, for example. Fixed bug where alert border was not working right upon death with old ship bitmaps Index: generalconfig.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/generalconfig.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- generalconfig.html 2 Mar 2007 12:57:52 -0000 1.32 +++ generalconfig.html 13 Mar 2007 18:35:00 -0000 1.33 @@ -61,6 +61,17 @@ +autoSetWar +Declare war with enemy races when you first join + +
    +
  • 0 - Don't set war
  • +
  • 1 (default) - Set war with nonzero player teams, peace w/ 0 player teams
  • +
  • 2 - Set war with largest enemy team, peace w/ everyone else
  • +
+ + + baseUdpLocalPort Base port for UDP connections integer
default: 0 From modemhero at users.sourceforge.net Tue Mar 13 13:35:02 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 13 Mar 2007 18:35:02 +0000 Subject: [netrek-cvs] client/netrekxp/include data.h, 1.54, 1.55 proto.h, 1.37, 1.38 Message-ID: <20070313183513.801801867F1@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv23170/include Modified Files: data.h proto.h Log Message: Added "autoSetWar: (0-2)" netrekrc option that controls declare war settings with enemy races when you first join. Can now automatically declare peace on 3rd space races, for example. Fixed bug where alert border was not working right upon death with old ship bitmaps Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- data.h 2 Mar 2007 12:57:50 -0000 1.54 +++ data.h 13 Mar 2007 18:34:59 -0000 1.55 @@ -137,6 +137,7 @@ extern int old_rotate_deg; #endif +extern int autoSetWar; extern int updatesPerSec; /* client requested updates per second */ extern int lastUpdateSpeed; /* last update speed client requested */ extern int server_ups; /* server responded updates per second */ Index: proto.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- proto.h 2 Mar 2007 12:57:50 -0000 1.37 +++ proto.h 13 Mar 2007 18:34:59 -0000 1.38 @@ -162,6 +162,7 @@ /******************************************************************************/ void enter (void); void openmem (void); +void do_autosetwar (int team); void rotateTeams (void); void drawTstats (void); #ifdef HOCKEY_LINES From modemhero at users.sourceforge.net Tue Mar 13 13:35:02 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 13 Mar 2007 18:35:02 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.122, 1.123 netrekrc, 1.33, 1.34 netrekrc_options.txt, 1.32, 1.33 Message-ID: <20070313183513.6A8D8B3FA@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv23170/resources/docs Modified Files: changes.txt netrekrc netrekrc_options.txt Log Message: Added "autoSetWar: (0-2)" netrekrc option that controls declare war settings with enemy races when you first join. Can now automatically declare peace on 3rd space races, for example. Fixed bug where alert border was not working right upon death with old ship bitmaps Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- netrekrc 7 Mar 2007 00:11:46 -0000 1.33 +++ netrekrc 13 Mar 2007 18:34:59 -0000 1.34 @@ -32,6 +32,12 @@ # Automatically rotate galaxy so teams are on left side of map autoRotate: off +# Declare war with enemy races when you first join +# 0 - Don't set war +# 1 - Set war with nonzero player teams, peace w/ 0 player teams +# 2 - Set war with largest enemy team, peace w/ everyone else +autoSetWar: 1 + # Base UDP local port baseUdpLocalPort: 0 Index: netrekrc_options.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc_options.txt,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- netrekrc_options.txt 2 Mar 2007 12:57:51 -0000 1.32 +++ netrekrc_options.txt 13 Mar 2007 18:34:59 -0000 1.33 @@ -10,6 +10,11 @@ allowWheelActions: (on/off) allow mouse wheel to work in non-scrolling windows autoQuit: (int) autoquit time after death autoRotate: (on/off) automatically rotate galaxy so teams are on left side of map +autoSetWar: (0-2) declare war with enemy races when you first join +# 0 - Don't set war +# 1 - Set war with nonzero player teams, peace w/ 0 player teams +# 2 - Set war with largest enemy team, peace w/ everyone else + b1keymap: (string) keymap for mouse button 1 (mouseAsShift=on) b2keymap: (string) keymap for mouse button 2 (mouseAsShift=on) b3keymap: (string) keymap for mouse button 3 (mouseAsShift=on) Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.122 retrieving revision 1.123 diff -u -d -r1.122 -r1.123 --- changes.txt 11 Mar 2007 22:15:58 -0000 1.122 +++ changes.txt 13 Mar 2007 18:34:59 -0000 1.123 @@ -1,4 +1,8 @@ Netrek XP 2006, Version 1.3: +- added "autoSetWar: (0-2)" netrekrc option that controls declare war settings with + enemy races when you first join. Can now automatically declare peace on 3rd space + races, for example. +- fixed bug where alert border was not working right upon death with old ship bitmaps - fixed error messages with cambot and beeplite - fixed music playback with cambot so it stops playing on entry properly - fixed bug with metaserver not sorting correcty sometimes, and some server entries not From modemhero at users.sourceforge.net Tue Mar 13 13:35:02 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 13 Mar 2007 18:35:02 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo,1.95,1.96 Message-ID: <20070313183513.7E22B1867EF@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv23170 Modified Files: clientr.suo Log Message: Added "autoSetWar: (0-2)" netrekrc option that controls declare war settings with enemy races when you first join. Can now automatically declare peace on 3rd space races, for example. Fixed bug where alert border was not working right upon death with old ship bitmaps Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.95 retrieving revision 1.96 diff -u -d -r1.95 -r1.96 Binary files /tmp/cvsoUlun1 and /tmp/cvsQTZ9CW differ From modemhero at users.sourceforge.net Tue Mar 13 13:35:02 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 13 Mar 2007 18:35:02 +0000 Subject: [netrek-cvs] client/netrekxp/src cowmain.c, 1.28, 1.29 data.c, 1.59, 1.60 death.c, 1.14, 1.15 defaults.c, 1.53, 1.54 enter.c, 1.7, 1.8 Message-ID: <20070313183513.9B25C1867F4@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv23170/src Modified Files: cowmain.c data.c death.c defaults.c enter.c Log Message: Added "autoSetWar: (0-2)" netrekrc option that controls declare war settings with enemy races when you first join. Can now automatically declare peace on 3rd space races, for example. Fixed bug where alert border was not working right upon death with old ship bitmaps Index: enter.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/enter.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- enter.c 28 Feb 2007 07:44:00 -0000 1.7 +++ enter.c 13 Mar 2007 18:35:00 -0000 1.8 @@ -22,6 +22,7 @@ #include "defs.h" #include "struct.h" #include "data.h" +#include "packets.h" #include "proto.h" /******************************************************************************/ @@ -107,6 +108,70 @@ } } +/******************************************************************************/ +/*** do_autosetwar(int team) ***/ +/*** Set war declares on first entry into game. Passes int team as ***/ +/*** player's p_team is not set at the time this function is called ***/ +/******************************************************************************/ +void +do_autosetwar (int team) +{ + int i, newhostile; + int playercount = 0; + int largestenemy = -1; + int largestenemycount = 0; + + /* Get my current hostile settings. Should be hostile with all teams, + set earlier in cowmain() */ + newhostile = me->p_hostile; + + /* Loop through all teams, and set war as appropriate*/ + for (i = 0; i < 4; i++) + { + /* Don't change war settings with own team */ + if (team == i) + continue; + + /* If team has 0 players ... */ + if ((playercount = realNumShips(1 << i)) == 0) + { + /* Declare peace? Yes for non-zero autoSetWar */ + if (autoSetWar) + newhostile ^= (1 << i); + continue; + } + + /* Keep track of largest enemy team */ + if (playercount > largestenemycount) + { + largestenemy = i; + largestenemycount = playercount; + } + } + /* No enemy team? Don't change war settings. */ + if (largestenemy < 0) + return; + + /* If autoSetWar is 2, keep hostile with largest enemy team, but + peace with all other teams even if they have 1 or more players */ + if (autoSetWar == 2) + { + for (i = 0; i < 4; i++) + { + /* Skip own team and zero enemy teams, these were handled earlier */ + if (team == i || (realNumShips(1 << i)) == 0) + continue; + + /* Non-zero players team that isn't largest opponent? */ + if (i != largestenemy) + newhostile ^= (1 << i); + } + } + + sendWarReq (newhostile); + return; +} + #ifdef ROTATERACE /******************************************************************************/ /*** rotateTeams() ***/ @@ -138,7 +203,7 @@ nextlargestteamcount = playercount; } } - /* Server empty or only 1 team? Don't rotate. */ + /* Server empty or only 1 team? Don't rotate. */ if (largestteam < 0 || nextlargestteam < 0) return; Index: death.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/death.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- death.c 28 Feb 2007 09:35:20 -0000 1.14 +++ death.c 13 Mar 2007 18:35:00 -0000 1.15 @@ -59,7 +59,6 @@ else alertBorderColor = W_White; W_ChangeBorder (baseWin, gColor); - oldalert = PFGREEN; } if (W_IsMapped (statwin)) { Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- defaults.c 3 Mar 2007 10:51:33 -0000 1.53 +++ defaults.c 13 Mar 2007 18:35:00 -0000 1.54 @@ -74,6 +74,15 @@ } }, #endif + {"autoSetWar", &autoSetWar, RC_INT, + { + "Declare war with enemy races when you first join", + "0 - Don't set war", + "1 - Set war with nonzero player teams, peace w/ 0 player teams", + "2 - Set war with largest enemy team, peace w/ everyone else", + NULL + } + }, {"baseUdpLocalPort", &baseUdpLocalPort, RC_INT, { "Base UDP local port", @@ -1590,6 +1599,7 @@ planetHighlighting = booleanDefault ("planetHighlighting", planetHighlighting); rotatePlanets = booleanDefault ("rotatePlanets", rotatePlanets); autoRotate = booleanDefault ("autoRotate", autoRotate); + autoSetWar = intDefault ("autoSetWar", autoSetWar); logging = booleanDefault ("logging", logging); maxScrollLines = intDefault ("maxScrollLines", maxScrollLines); if (maxScrollLines > 500) Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- data.c 2 Mar 2007 12:57:52 -0000 1.59 +++ data.c 13 Mar 2007 18:35:00 -0000 1.60 @@ -134,6 +134,7 @@ int old_rotate_deg = 0; #endif +int autoSetWar = 1; int loginAccept = -1; unsigned localflags = 0; int tournMask = 15; Index: cowmain.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/cowmain.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- cowmain.c 3 Mar 2007 10:02:44 -0000 1.28 +++ cowmain.c 13 Mar 2007 18:35:00 -0000 1.29 @@ -1062,6 +1062,9 @@ /* Playing hockey? */ check_hockey_mode(); #endif + /* Set up autowar settings */ + do_autosetwar(team); + isFirstEntry = 0; } From modemhero at users.sourceforge.net Tue Mar 13 14:11:13 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 13 Mar 2007 19:11:13 +0000 Subject: [netrek-cvs] client/netrekxp/src local.c,1.66,1.67 Message-ID: <20070313191123.8BAFDB3FA@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv7561/src Modified Files: local.c Log Message: Merge a bunch of common angular sound code into SetDistAngle() function. Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- local.c 1 Mar 2007 18:31:18 -0000 1.66 +++ local.c 13 Mar 2007 19:11:10 -0000 1.67 @@ -40,6 +40,8 @@ static int last_speed = 0; static int streaks_on = 0; #ifdef SOUND +static int distance = 0; /* For angular sound */ +static int angle = 0; /* For angular sound */ static int sound_torps = 0; static int sound_other_torps = 0; static int num_other_torps = 0; @@ -75,6 +77,32 @@ /* Function Defininitions */ +#ifdef SOUND +/* Sets global variables distance and sound used with angular sound */ +void SetDistAngle(int dx, int dy) +{ + int newdx, newdy; + + newdx = dx - WINSIDE/2; + newdy = dy - WINSIDE/2; + + distance = (int) sqrt((newdx)*(newdx) + (newdy)*(newdy)); + // Normalize from 0 to 255, 0 being on top of player, 255 being max distance + // which would be a diagonal from player to corner of tactical + // Reason for normalization is Mix_SetDistance requires that range + distance = (int)((255 * distance)/CORNER_DIST); + // Calculate angle, then adjust as necessary for Mix_SetDistance + if (distance != 0) + { + angle = (int)(atan2(-newdy, newdx)*180/XPI); + angle = 90 - angle; + } + else + angle = 0; + return; +} +#endif + int randcolor() { @@ -641,7 +669,6 @@ const int view = SCALE * WINSIDE / 2 + BMP_SHIELD_WIDTH * SCALE / 2; int dx, dy, px, py, wx, wy, tx, ty, lx, ly; int new_dx, new_dy; - int newdx, newdy, distance, angle; W_Icon (*ship_bits)[SHIP_VIEWS]; W_Icon (*ship_bitsHR); @@ -722,23 +749,8 @@ { // To avoid hearing twarp cloak sounds as the twarper/observer if ( (myPlayer(j) || isObsLockPlayer(j)) ? ((me->p_flags & PFTWARP) ? 0 : 1) : 1 ) - { - newdx = dx - WINSIDE/2; - newdy = dy - WINSIDE/2; - - distance = (int) sqrt((newdx)*(newdx) + (newdy)*(newdy)); - // Normalize from 0 to 255, 0 being on top of player, 255 being max distance - // which would be a diagonal from player to corner of tactical - // Reason for normalization is Mix_SetDistance requires that range - distance = (int)((255 * distance)/CORNER_DIST); - // Calculate angle, then adjust as necessary for Mix_SetDistance - if (distance != 0) - { - angle = (int)(atan2(-newdy, newdx)*180/XPI); - angle = 90 - angle; - } - else - angle = 0; + { + SetDistAngle(dx, dy); // At short distances, don't use angular sound if (!soundAngles || distance < SCALE/2) Play_Sound_Loc(CLOAKED_WAV, SF_CLOAKING, -1, distance); @@ -762,23 +774,8 @@ { if (j->p_cloakphase == cloak_phases - 1) { - newdx = dx - WINSIDE/2; - newdy = dy - WINSIDE/2; - - distance = (int) sqrt((newdx)*(newdx) + (newdy)*(newdy)); - // Normalize from 0 to 255, 0 being on top of player, 255 being max distance - // which would be a diagonal from player to corner of tactical - // Reason for normalization is Mix_SetDistance requires that range - distance = (int)((255 * distance)/CORNER_DIST); - // Calculate angle, then adjust as necessary for Mix_SetDistance - if (distance != 0) - { - angle = (int)(atan2(-newdy, newdx)*180/XPI); - angle = 90 - angle; - } - else - angle = 0; - // At short distances, don't use angular sound + SetDistAngle(dx, dy); + // At short distances, don't use angular sound if (!soundAngles || distance < SCALE/2) Play_Sound_Loc(UNCLOAK_WAV, SF_CLOAKING, -1, distance); else @@ -1297,24 +1294,7 @@ } else { - int newdx, newdy, distance, angle; - - newdx = dx - WINSIDE/2; - newdy = dy - WINSIDE/2; - - distance = (int) sqrt((newdx)*(newdx) + (newdy)*(newdy)); - // Normalize from 0 to 255, 0 being on top of player, 255 being max distance - // which would be a diagonal from player to corner of tactical - // Reason for normalization is Mix_SetDistance requires that range - distance = (int)((255 * distance)/CORNER_DIST); - // Calculate angle, then adjust as necessary for Mix_SetDistance - if (distance != 0) - { - angle = (int)(atan2(-newdy, newdx)*180/XPI); - angle = 90 - angle; - } - else - angle = 0; + SetDistAngle(dx, dy); // At short distances, don't use angular sound if (!soundAngles || distance < SCALE/2) { @@ -1383,24 +1363,7 @@ Play_Sound(PHASER_WAV, SF_WEAPONS); else { - int newdx, newdy, distance, angle; - - newdx = dx - WINSIDE/2; - newdy = dy - WINSIDE/2; - - distance = (int) sqrt((newdx)*(newdx) + (newdy)*(newdy)); - // Normalize from 0 to 255, 0 being on top of player, 255 being max distance - // which would be a diagonal from player to corner of tactical - // Reason for normalization is Mix_SetDistance requires that range - distance = (int)((255 * distance)/CORNER_DIST); - // Calculate angle, then adjust as necessary for Mix_SetDistance - if (distance != 0) - { - angle = (int)(atan2(-newdy, newdx)*180/XPI); - angle = 90 - angle; - } - else - angle = 0; + SetDistAngle(dx, dy); // At short distances, don't use angular sound if (!soundAngles || distance < SCALE/2) Play_Sound_Loc(PHASER_OTHER_WAV, SF_OTHER|SF_WEAPONS, -1, distance); @@ -1861,24 +1824,7 @@ #ifdef SOUND if (k->t_fuse == (MAX(2, BMP_TORPDET_FRAMES * server_ups / 10) - 1)) { - int newdx, newdy, distance, angle; - - newdx = dx - WINSIDE/2; - newdy = dy - WINSIDE/2; - - distance = (int) sqrt((newdx)*(newdx) + (newdy)*(newdy)); - // Normalize from 0 to 255, 0 being on top of player, 255 being max distance - // which would be a diagonal from player to corner of tactical - // Reason for normalization is Mix_SetDistance requires that range - distance = (int)((255 * distance)/CORNER_DIST); - // Calculate angle, then adjust as necessary for Mix_SetDistance - if (distance != 0) - { - angle = (int)(atan2(-newdy, newdx)*180/XPI); - angle = 90 - angle; - } - else - angle = 0; + SetDistAngle(dx, dy); // At short distances, don't use angular sound if (!soundAngles || distance < SCALE/2) Play_Sound_Loc(TORP_HIT_WAV, SF_WEAPONS, -1, distance); @@ -2123,24 +2069,7 @@ #ifdef SOUND if (pt->pt_fuse == (MAX(2, BMP_TORPDET_FRAMES * server_ups / 10) - 1)) { - int newdx, newdy, distance, angle; - - newdx = dx - WINSIDE/2; - newdy = dy - WINSIDE/2; - - distance = (int) sqrt((newdx)*(newdx) + (newdy)*(newdy)); - // Normalize from 0 to 255, 0 being on top of player, 255 being max distance - // which would be a diagonal from player to corner of tactical - // Reason for normalization is Mix_SetDistance requires that range - distance = (int)((255 * distance)/CORNER_DIST); - // Calculate angle, then adjust as necessary for Mix_SetDistance - if (distance != 0) - { - angle = (int)(atan2(-newdy, newdx)*180/XPI); - angle = 90 - angle; - } - else - angle = 0; + SetDistAngle(dx, dy); // At short distances, don't use angular sound if (!soundAngles || distance < SCALE/2) Play_Sound_Loc(PLASMA_HIT_WAV, SF_WEAPONS, -1, distance); From modemhero at users.sourceforge.net Tue Mar 13 14:24:21 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 13 Mar 2007 19:24:21 +0000 Subject: [netrek-cvs] client/netrekxp/src local.c,1.67,1.68 Message-ID: <20070313192429.B2EA9B3FA@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13259/src Modified Files: local.c Log Message: More SetDistAngle() code merging, this time for other's plasmas and torps. Noted the problem with finding most recent torp/plasma to play sound. Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.67 retrieving revision 1.68 diff -u -d -r1.67 -r1.68 --- local.c 13 Mar 2007 19:11:10 -0000 1.67 +++ local.c 13 Mar 2007 19:24:18 -0000 1.68 @@ -50,10 +50,8 @@ static int num_other_plasmas = 0; static unsigned int sound_flags = 0; static int other_torp_dist = 0; -static int new_other_torp_dist = 0; static int other_torp_angle = 0; static int other_plasma_dist = 0; -static int new_other_plasma_dist = 0; static int other_plasma_angle = 0; static int warpchange = 0; static unsigned int twarpflag = 0; @@ -1771,40 +1769,22 @@ continue; } + dx = dx / SCALE + WINSIDE / 2; + dy = dy / SCALE + WINSIDE / 2; + #ifdef SOUND if (j != me) { - int new_angle; - int newdy, newdx; - - newdy = dy / SCALE; - newdx = dx / SCALE; - // Store location of torp. - new_other_torp_dist = (int) sqrt((newdx)*(newdx) + (newdy)*(newdy)); - // Normalize from 0 to 255, 0 being on top of player, 255 being max distance - // which would be a diagonal from player to corner of tactical - // Reason for normalization is Mix_SetDistance requires that range - new_other_torp_dist = (int)((255 * new_other_torp_dist)/CORNER_DIST); - // Find how long till torp expires...BROKEN! - // Calculate angle, then adjust as necessary for Mix_SetDistance - if (new_other_torp_dist != 0) - { - new_angle = (int)(atan2(-newdy, newdx)*180/XPI); - new_angle = 90 - new_angle; - } - else - new_angle = 0; + SetDistAngle(dx, dy); // Choose closest torp - yes this sucks sometimes, but better than nothing - if (new_other_torp_dist < other_torp_dist) + // Proper fix would be to get torp expiry information + if (distance < other_torp_dist) { - other_torp_dist = new_other_torp_dist; - other_torp_angle = new_angle; + other_torp_dist = distance; + other_torp_angle = angle; } } #endif - dx = dx / SCALE + WINSIDE / 2; - dy = dy / SCALE + WINSIDE / 2; - if (k->t_status == TEXPLODE) { @@ -2015,42 +1995,23 @@ if (dx > view || dx < -view || dy > view || dy < -view) continue; + dx = dx / SCALE + WINSIDE / 2; + dy = dy / SCALE + WINSIDE / 2; #ifdef SOUND if (pt->pt_owner != me->p_no) { - int new_angle; - int newdy, newdx; - - newdy = dy / SCALE; - newdx = dx / SCALE; - // Store location of plasma. - new_other_plasma_dist = (int) sqrt((newdx)*(newdx) + (newdy)*(newdy)); - // Normalize from 0 to 255, 0 being on top of player, 255 being max distance - // which would be a diagonal from player to corner of tactical - // Reason for normalization is Mix_SetDistance requires that range - new_other_plasma_dist = (int)((255 * new_other_plasma_dist)/CORNER_DIST); - // Find how long till torp expires...BROKEN! - // Calculate angle, then adjust as necessary for Mix_SetDistance - if (new_other_plasma_dist != 0) - { - new_angle = (int)(atan2(-newdy, newdx)*180/XPI); - new_angle = 90 - new_angle; - } - else - new_angle = 0; + SetDistAngle(dx, dy); // Choose closest plasma - yes this sucks sometimes, but better than nothing - if (new_other_plasma_dist < other_plasma_dist) + // Proper fix would be to get plasma expiry information + if (distance < other_plasma_dist) { - other_plasma_dist = new_other_plasma_dist; - other_plasma_angle = new_angle; + other_plasma_dist = distance; + other_plasma_angle = angle; } } #endif - dx = dx / SCALE + WINSIDE / 2; - dy = dy / SCALE + WINSIDE / 2; - if (pt->pt_status == PTEXPLODE) { pt->pt_fuse--; @@ -2458,10 +2419,8 @@ } // Reset locations and fuses of other's closest torps and plasmas other_torp_dist = CORNER_DIST; - new_other_torp_dist = 0; other_torp_angle = 0; other_plasma_dist = CORNER_DIST; - new_other_plasma_dist = 0; other_plasma_angle = 0; sound_flags = me->p_flags; From modemhero at users.sourceforge.net Tue Mar 13 14:42:08 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 13 Mar 2007 19:42:08 +0000 Subject: [netrek-cvs] client/netrekxp/include version.h,1.6,1.7 Message-ID: <20070313194219.76A0D1867FA@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20735/include Modified Files: version.h Log Message: Update version from 1.2 to 1.3. Index: version.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/version.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- version.h 30 Nov 2006 01:25:05 -0000 1.6 +++ version.h 13 Mar 2007 19:42:06 -0000 1.7 @@ -2,5 +2,5 @@ /* store the version info here */ -static char mvers[] = "1.2"; +static char mvers[] = "1.3"; static char version[] = "Netrek XP 2006"; \ No newline at end of file From modemhero at users.sourceforge.net Tue Mar 13 14:42:08 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 13 Mar 2007 19:42:08 +0000 Subject: [netrek-cvs] client/netrekxp/src bccnetrek.rc, 1.7, 1.8 netrek.rc, 1.5, 1.6 vccnetrek.rc, 1.5, 1.6 Message-ID: <20070313194220.694B7B3EB@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20735/src Modified Files: bccnetrek.rc netrek.rc vccnetrek.rc Log Message: Update version from 1.2 to 1.3. Index: vccnetrek.rc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/vccnetrek.rc,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- vccnetrek.rc 30 Nov 2006 01:25:05 -0000 1.5 +++ vccnetrek.rc 13 Mar 2007 19:42:06 -0000 1.6 @@ -3,8 +3,8 @@ MAIN ICON DISCARDABLE "main.ico" 1 VERSIONINFO -FILEVERSION 1, 2, 0, 0 -PRODUCTVERSION 1, 2, 0, 0 +FILEVERSION 1, 3, 0, 0 +PRODUCTVERSION 1, 3, 0, 0 { BLOCK "StringFileInfo" { BLOCK "040904E4" { Index: bccnetrek.rc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/bccnetrek.rc,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- bccnetrek.rc 30 Nov 2006 01:25:05 -0000 1.7 +++ bccnetrek.rc 13 Mar 2007 19:42:06 -0000 1.8 @@ -1,8 +1,8 @@ #include "resource.h" 1 VERSIONINFO -FILEVERSION 1, 2, 0, 0 -PRODUCTVERSION 1, 2, 0, 0 +FILEVERSION 1, 3, 0, 0 +PRODUCTVERSION 1, 3, 0, 0 FILEOS VOS_DOS_WINDOWS32 FILETYPE VFT_APP { BLOCK "StringFileInfo" Index: netrek.rc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/netrek.rc,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- netrek.rc 30 Nov 2006 01:25:05 -0000 1.5 +++ netrek.rc 13 Mar 2007 19:42:06 -0000 1.6 @@ -28,8 +28,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,1,0,0 - PRODUCTVERSION 1,1,0,0 + FILEVERSION 1,3,0,0 + PRODUCTVERSION 1,3,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x3L @@ -47,14 +47,14 @@ VALUE "Comments", "\0" VALUE "CompanyName", "Netrek\0" VALUE "FileDescription", "Netrek XP 2006 Client\0" - VALUE "FileVersion", "1, 2, 0, 0\0" + VALUE "FileVersion", "1, 3, 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, 2\0" + VALUE "ProductVersion", "1, 3, 0, 0\0" VALUE "SpecialBuild", "\0" END END From modemhero at users.sourceforge.net Tue Mar 13 14:42:08 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 13 Mar 2007 19:42:08 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo,1.96,1.97 Message-ID: <20070313194217.555D41867F4@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20735 Modified Files: clientr.suo Log Message: Update version from 1.2 to 1.3. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.96 retrieving revision 1.97 diff -u -d -r1.96 -r1.97 Binary files /tmp/cvs93M3vK and /tmp/cvsZOQvGy differ From modemhero at users.sourceforge.net Tue Mar 13 17:31:19 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 13 Mar 2007 22:31:19 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo,1.97,1.98 Message-ID: <20070313223130.07D731867EF@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv32227 Modified Files: clientr.suo Log Message: Yet another attempt at fixing border issues. Deals with problem of double buffering and how it changes border on death, but not to the same "window" that is used for the local/map windows. Forces a border redraw upon reentry into game for all cases, to be safe. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.97 retrieving revision 1.98 diff -u -d -r1.97 -r1.98 Binary files /tmp/cvsqsokDb and /tmp/cvsXQNces differ From modemhero at users.sourceforge.net Tue Mar 13 17:31:19 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 13 Mar 2007 22:31:19 +0000 Subject: [netrek-cvs] client/netrekxp/src data.c, 1.60, 1.61 death.c, 1.15, 1.16 local.c, 1.68, 1.69 Message-ID: <20070313223130.559971867F1@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv32227/src Modified Files: data.c death.c local.c Log Message: Yet another attempt at fixing border issues. Deals with problem of double buffering and how it changes border on death, but not to the same "window" that is used for the local/map windows. Forces a border redraw upon reentry into game for all cases, to be safe. Index: death.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/death.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- death.c 13 Mar 2007 18:35:00 -0000 1.15 +++ death.c 13 Mar 2007 22:31:17 -0000 1.16 @@ -59,6 +59,11 @@ else alertBorderColor = W_White; W_ChangeBorder (baseWin, gColor); + oldalert = PFGREEN; + /* Need a border refresh on death with double buffering, as the + W_ChangeBorder above does not change the double buffered local + or map windows, but rather than non-double buffered "entry" window*/ + forceBorder = 1; } if (W_IsMapped (statwin)) { Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- local.c 13 Mar 2007 19:24:18 -0000 1.68 +++ local.c 13 Mar 2007 22:31:17 -0000 1.69 @@ -2323,8 +2323,9 @@ } /* Change border color to signify alert status */ - if (oldalert != (me->p_flags & (PFGREEN | PFYELLOW | PFRED))) + if (oldalert != (me->p_flags & (PFGREEN | PFYELLOW | PFRED)) || forceBorder) { + forceBorder = 0; oldalert = (me->p_flags & (PFGREEN | PFYELLOW | PFRED)); switch (oldalert) { Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- data.c 13 Mar 2007 18:35:00 -0000 1.60 +++ data.c 13 Mar 2007 22:31:17 -0000 1.61 @@ -64,6 +64,7 @@ unsigned int oldalert = 0; unsigned char oldtourn = (unsigned char) 2; /* placeholder starting status */ int alertBorderColor = 0; +int forceBorder = 0; int remap[16] = { 0, 1, 2, 0, 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0 }; int messpend = 0; #ifdef XTRA_MESSAGE_UI From modemhero at users.sourceforge.net Tue Mar 13 17:31:19 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 13 Mar 2007 22:31:19 +0000 Subject: [netrek-cvs] client/netrekxp/include data.h,1.55,1.56 Message-ID: <20070313223130.1E644B3FA@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv32227/include Modified Files: data.h Log Message: Yet another attempt at fixing border issues. Deals with problem of double buffering and how it changes border on death, but not to the same "window" that is used for the local/map windows. Forces a border redraw upon reentry into game for all cases, to be safe. Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- data.h 13 Mar 2007 18:34:59 -0000 1.55 +++ data.h 13 Mar 2007 22:31:17 -0000 1.56 @@ -51,6 +51,7 @@ extern unsigned int oldalert; extern unsigned char oldtourn; extern int alertBorderColor; +extern int forceBorder; extern int remap[]; extern int udcounter; extern char *title; From modemhero at users.sourceforge.net Wed Mar 14 10:37:23 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 14 Mar 2007 15:37:23 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo,1.98,1.99 Message-ID: <20070314153744.F1E1FB407@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv4081 Modified Files: clientr.suo Log Message: Following COW, added back in debug showRegions function. Increased granularity of rough maps. Redraw check against player in region, doesn't quite work yet, region is too small. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.98 retrieving revision 1.99 diff -u -d -r1.98 -r1.99 Binary files /tmp/cvsDL9NTj and /tmp/cvssqZjap differ From modemhero at users.sourceforge.net Wed Mar 14 10:37:23 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 14 Mar 2007 15:37:23 +0000 Subject: [netrek-cvs] client/netrekxp/src map.c,1.26,1.27 Message-ID: <20070314153744.F04E0186807@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv4081/src Modified Files: map.c Log Message: Following COW, added back in debug showRegions function. Increased granularity of rough maps. Redraw check against player in region, doesn't quite work yet, region is too small. Index: map.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- map.c 28 Feb 2007 09:35:20 -0000 1.26 +++ map.c 14 Mar 2007 15:37:21 -0000 1.27 @@ -23,6 +23,9 @@ #include "map.h" #include "proto.h" +/* debugging feature, show rectangular redraw regions on galactic */ +#undef DEBUG_SHOW_REGIONS + /* * Local Constants: * @@ -32,7 +35,7 @@ * Note: Detail *MUST* be a factor of GWIDTH. */ -#define DETAIL 40 +#define DETAIL 100 #define SIZE (GWIDTH/DETAIL) @@ -188,6 +191,59 @@ initialized = 1; } +#ifdef DEBUG_SHOW_REGIONS /* Debugging code */ +void +showRegions(void) +/* + * Make a rough map of the location of all the planets to help decide + * whether a ship is possibly overlapping a planet. + */ +{ + int k; + int startX, startY; + int endX, endY; + struct planet *pl; +#ifdef BEEPLITE + const int pRadius = 3 * BMP_MPLANET_WIDTH * GWIDTH / WINSIDE / 5; +#else + const int pRadius = BMP_MPLANET_WIDTH * GWIDTH / WINSIDE / 2; +#endif + const int tHeight = W_Textheight * GWIDTH / WINSIDE; + const int tWidth = W_Textwidth * GWIDTH / WINSIDE; + + for (k = 0, pl = planets; k < MAXPLANETS; k++, pl++) + { + startX = (pl->pl_x - pRadius - tWidth) / SIZE; + endX = (pl->pl_x + pRadius + tWidth + (tWidth / 2)) / SIZE; + + startY = (pl->pl_y - pRadius - (tHeight / 2)) / SIZE; + endY = (pl->pl_y + pRadius + tHeight + (tHeight / 2)) / SIZE; + + if (startX < 0) + startX = 0; + + if (endX >= DETAIL) + endX = DETAIL - 1; + + if (startY < 0) + startY = 0; + + if (endY >= DETAIL) + endY = DETAIL - 1; + + startX = startX * SIZE * WINSIDE / GWIDTH; + startY = startY * SIZE * WINSIDE / GWIDTH; + endX = (endX * SIZE + SIZE - 1) * WINSIDE / GWIDTH; + endY = (endY * SIZE + SIZE - 1) * WINSIDE / GWIDTH; + + W_MakeLine(mapw, startX, startY, startX, endY, W_White); + W_MakeLine(mapw, startX, startY, endX, startY, W_White); + W_MakeLine(mapw, endX, endY, startX, endY, W_White); + W_MakeLine(mapw, endX, endY, endX, startY, W_White); + } +} +#endif /* Debugging code */ + /******************************************************************************/ /*** checkRedraw() /******************************************************************************/ @@ -198,9 +254,14 @@ * Compare the given location of a ship with the rough planet map created * by initPlanets() to decide if part of the planet may have been erased * by the ship. + * + * Also force a redraw of every other player in the same grid square, + * otherwise they will blink out of existence as a result of the + * planet redraw. */ { int i; + struct player *j; x /= SIZE; y /= SIZE; @@ -209,33 +270,39 @@ { i = roughMap[x][y]; - if (i != -1) + if (i == -1) return; + planets[i].pl_flags |= PLREDRAW; + + for (i = 0, j = &players[i]; i < MAXPLAYER; i++, j++) { - planets[i].pl_flags |= PLREDRAW; - - i = roughMap2[x][y]; - - if (i != -1) - { - planets[i].pl_flags |= PLREDRAW; - } + if (j->p_status != PALIVE) continue; + if (j->p_flags & PFOBSERV) continue; + if ((j->p_x / SIZE) == x && (j->p_y / SIZE) == y ) + redrawPlayer[i] = 1; } + + i = roughMap2[x][y]; + if (i == -1) return; + planets[i].pl_flags |= PLREDRAW; } else { i = roughMap3[x][y]; - - if (i != -1) + + if (i == -1) return; + planets[i].pl_flags |= PLREDRAW; + + for (i = 0, j = &players[i]; i < MAXPLAYER; i++, j++) { - planets[i].pl_flags |= PLREDRAW; - - i = roughMap4[x][y]; - - if (i != -1) - { - planets[i].pl_flags |= PLREDRAW; - } + if (j->p_status != PALIVE) continue; + if (j->p_flags & PFOBSERV) continue; + if ((j->p_x / SIZE) == x && (j->p_y / SIZE) == y ) + redrawPlayer[i] = 1; } + + i = roughMap4[x][y]; + if (i == -1) return; + planets[i].pl_flags |= PLREDRAW; } } @@ -803,7 +870,7 @@ lastRedraw[i] = 0; } - if (lastRedraw[i] == 10) + if (lastRedraw[i] == server_ups) { /* Redraw stationary ships every update so that these ships are not hidden by planet updates. */ @@ -822,6 +889,10 @@ DrawPlanets (); +#ifdef DEBUG_SHOW_REGIONS /* Debugging code */ + showRegions(); +#endif + /* draw viewBox */ if (viewBox) { From modemhero at users.sourceforge.net Wed Mar 14 13:36:10 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 14 Mar 2007 18:36:10 +0000 Subject: [netrek-cvs] client/netrekxp/src dashboard.c, 1.16, 1.17 defaults.c, 1.54, 1.55 inform.c, 1.3, 1.4 input.c, 1.26, 1.27 newwin.c, 1.51, 1.52 option.c, 1.32, 1.33 playerlist.c, 1.10, 1.11 short.c, 1.16, 1.17 war.c, 1.3, 1.4 Message-ID: <20070314183619.B100A186807@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28441/src Modified Files: dashboard.c defaults.c inform.c input.c newwin.c option.c playerlist.c short.c war.c Log Message: First of what will be several patches recoding Paradise-2000 features. Support for AT ship in playerlist and info window (shows 'AT' instead of '??') Improved explanation of keymap/buttonmap in the netrekrc Main window titlebar now shows your loginname and slot number, in addition to showing the servername New dashboard message for warp 0 ("Stopped") instead of saying "Impulse" War window now says "Re-program" instead of "Save" for changing war settings Added autowar settings to the options menu Index: dashboard.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/dashboard.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- dashboard.c 13 Dec 2006 23:39:33 -0000 1.16 +++ dashboard.c 14 Mar 2007 18:36:07 -0000 1.17 @@ -362,11 +362,18 @@ msgtype = 4; color = W_White; } + /* Ship stopped */ + else if (me->p_speed == 0) + { + sprintf (buf, "Stopped"); + msgtype = 5; + color = W_Grey; + } /* Default impulse text */ else { sprintf (buf, "Impulse"); - msgtype = 5; + msgtype = 6; color = W_Yellow; } Index: newwin.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- newwin.c 11 Mar 2007 22:15:58 -0000 1.51 +++ newwin.c 14 Mar 2007 18:36:07 -0000 1.52 @@ -1402,7 +1402,14 @@ updatedeath (); if (remap[me->p_team] == NOBODY) - RedrawPlayerList (); /* When you first login */ + { + /* When you first login */ + char buf[80]; + + RedrawPlayerList (); + sprintf (buf, "Netrek - %s(%c)@%s", me->p_name, me->p_mapchars[1], serverName); + W_RenameWindow (baseWin, buf); + } else UpdatePlayerList (); /* Otherwise */ Index: input.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/input.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- input.c 28 Feb 2007 12:21:50 -0000 1.26 +++ input.c 14 Mar 2007 18:36:07 -0000 1.27 @@ -624,36 +624,36 @@ case 'c': buttonmap[12] = getctrlkey (&str); break; - case 'd': - buttonmap[13] = getctrlkey (&str); - break; - case 'e': - buttonmap[14] = getctrlkey (&str); - break; - case 'f': - buttonmap[15] = getctrlkey (&str); - break; - case 'g': - buttonmap[16] = getctrlkey (&str); - break; - case 'h': - buttonmap[17] = getctrlkey (&str); - break; - case 'i': - buttonmap[18] = getctrlkey (&str); - break; - case 'j': - buttonmap[19] = getctrlkey (&str); - break; - case 'k': - buttonmap[20] = getctrlkey (&str); - break; - case 'l': - buttonmap[21] = getctrlkey (&str); - break; - case 'm': - buttonmap[22] = getctrlkey (&str); - break; + case 'd': + buttonmap[13] = getctrlkey (&str); + break; + case 'e': + buttonmap[14] = getctrlkey (&str); + break; + case 'f': + buttonmap[15] = getctrlkey (&str); + break; + case 'g': + buttonmap[16] = getctrlkey (&str); + break; + case 'h': + buttonmap[17] = getctrlkey (&str); + break; + case 'i': + buttonmap[18] = getctrlkey (&str); + break; + case 'j': + buttonmap[19] = getctrlkey (&str); + break; + case 'k': + buttonmap[20] = getctrlkey (&str); + break; + case 'l': + buttonmap[21] = getctrlkey (&str); + break; + case 'm': + buttonmap[22] = getctrlkey (&str); + break; #endif /* SHIFTED_MOUSE */ default: Index: short.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/short.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- short.c 26 Feb 2007 06:54:49 -0000 1.16 +++ short.c 14 Mar 2007 18:36:08 -0000 1.17 @@ -222,7 +222,7 @@ char no_memory[] = { "Not enough memory for warning string!" }; /* For INL Server */ -char *shiptype[NUM_TYPES] = { "SC", "DD", "CA", "BB", "AS", "SB", "??" }; +char *shiptype[NUM_TYPES] = { "SC", "DD", "CA", "BB", "AS", "SB", "AT" }; int spwinside = 500; /* WINSIDE from Server */ #define SPWINSIDE 500 /* To make it safe */ Index: playerlist.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/playerlist.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- playerlist.c 21 Feb 2007 15:17:07 -0000 1.10 +++ playerlist.c 14 Mar 2007 18:36:07 -0000 1.11 @@ -107,7 +107,7 @@ static int plistWidth = 0; static int plist2Width = 0; static char *my_classes[NUM_TYPES] = - { "SC", "DD", "CA", "BB", "AS", "SB", "GA", "??" }; + { "SC", "DD", "CA", "BB", "AS", "SB", "GA", "AT" }; /* Local Functions */ Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- defaults.c 13 Mar 2007 18:35:00 -0000 1.54 +++ defaults.c 14 Mar 2007 18:36:07 -0000 1.55 @@ -2010,40 +2010,7 @@ if (saveBig) fputs ("\n", fp); } - - // Let's print buttonmap - str[0] = '\0'; - str1[0] = '\0'; - -#ifdef SHIFTED_MOUSE - for (i = W_LBUTTON; i <= W_XBUTTON2_4; i++) -#else - for (i = W_LBUTTON; i <= W_WHEELDOWN; i++) -#endif - { - if (buttonmap[i] != 0) - { - c = getkeyfromctrl (buttonmap[i]); - if (c == '^') - sprintf (str, "%c^^", getcharfromdec (i)); - else - sprintf (str, "%c%c", getcharfromdec (i), getkeyfromctrl (buttonmap[i])); - strcat (str1, str); - } - } - if (saveBig && strlen (str1) != 0) - fputs ("# Mouse button mapping\n", fp); - if (strlen (str1) != 0) - { - strcpy (str, "buttonmap: "); - strcat (str, str1); - strcat (str, "\n"); - fputs (str, fp); - } - if (saveBig && strlen (str1) != 0) - fputs ("\n", fp); - // keymap part // we're going to print only keymap that differs from standard one // we have to start from second key, because first one is space @@ -2072,7 +2039,16 @@ strcat (str, str1); } if (saveBig && strlen (str) != 0) + { fputs ("# Key mapping\n", fp); + fputs ("# Define you keymap here. The format is newkey defaultkey. For example, the\n", fp); + fputs ("# default key for shield toggle is 's', if you want to remap shield toggle to\n", fp); + fputs ("# 'q', you would put 'qs' in your keymap. Shields would still be mapped to\n", fp); + fputs ("# 's' as well as now being on 'q'. Adding a mapping doesn't delete the old\n", fp); + fputs ("# one. If you want shields on 'w' as well, put 'ws' in your keymap. If you\n", fp); + fputs ("# had instead put 'wq', it would have mapped quit, the default action of 'q',\n", fp); + fputs ("# onto 'w'.\n", fp); + } if (strlen (str) != 0) { strcpy (str1, "keymap: "); @@ -2083,6 +2059,50 @@ if (saveBig && strlen (str) != 0) fputs ("\n", fp); + // Let's print buttonmap + str[0] = '\0'; + str1[0] = '\0'; + +#ifdef SHIFTED_MOUSE + for (i = W_LBUTTON; i <= W_XBUTTON2_4; i++) +#else + for (i = W_LBUTTON; i <= W_WHEELDOWN; i++) +#endif + { + if (buttonmap[i] != 0) + { + c = getkeyfromctrl (buttonmap[i]); + if (c == '^') + sprintf (str, "%c^^", getcharfromdec (i)); + else + sprintf (str, "%c%c", getcharfromdec (i), getkeyfromctrl (buttonmap[i])); + strcat (str1, str); + } + } + + if (saveBig && strlen (str1) != 0) + { + fputs ("# Mouse button mapping\n", fp); + fputs ("# Button map lets you map the mouse buttons. Unfortunately, it works in a\n", fp); + fputs ("# different way than keymap. The format is . To map\n", fp); + fputs ("# shields onto button 1 (the left one), you would put '1s' in your keymap.\n", fp); + fputs ("# The buttonmap works through the keymap, so if you have shields mapped to\n", fp); + fputs ("# 'q', putting '1q' would make button 1 shields and not quit. Buttons 4 and\n", fp); + fputs ("# 5 are support for Microsoft Xbuttons. If you have a wheel mouse, the up\n", fp); + fputs ("# wheel is button 6 and the down wheel is button 7. There is also support\n", fp); + fputs ("# for shifted, controled, and control-shifted mouse actions, see the netrek\n", fp); + fputs ("# help file for more details.\n", fp); + } + if (strlen (str1) != 0) + { + strcpy (str, "buttonmap: "); + strcat (str, str1); + strcat (str, "\n"); + fputs (str, fp); + } + if (saveBig && strlen (str1) != 0) + fputs ("\n", fp); + // macroKey if (strlen (macroKey) == 0) { Index: war.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/war.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- war.c 13 Dec 2006 00:00:00 -0000 1.3 +++ war.c 14 Mar 2007 18:36:08 -0000 1.4 @@ -36,7 +36,7 @@ static char *roms = "ROM - "; static char *klis = "KLI - "; static char *oris = "ORI - "; -static char *gos = " Save"; +static char *gos = " Re-program"; static char *exs = " Exit - no change"; static char *peaces = "Peace"; Index: inform.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/inform.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- inform.c 16 May 2006 05:10:13 -0000 1.3 +++ inform.c 14 Mar 2007 18:36:07 -0000 1.4 @@ -33,7 +33,7 @@ * care to keep it from extending beyond the main * window boundaries. */ static char *my_classes[NUM_TYPES] = { - "SC", "DD", "CA", "BB", "AS", "SB", "GA", "??" + "SC", "DD", "CA", "BB", "AS", "SB", "GA", "AT" }; /******************************************************************************/ Index: option.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- option.c 2 Mar 2007 12:57:54 -0000 1.32 +++ option.c 14 Mar 2007 18:36:07 -0000 1.33 @@ -168,6 +168,11 @@ "Show New color bitmaps on galactic map", "" }; +static char *autowarmess[] = { "Don't auto set war declarations", + "Set war with nonzero player teams", + "Set war with largest enemy team", + "" +}; /* Only one of op_option, op_targetwin, and op_string should be defined. If * op_string is defined, op_size should be too and op_text is used without a * "Don't" prefix. if op_range is defined, there should be a %d in op_text @@ -300,6 +305,7 @@ {0, "Control Menu", &MenuPage, 0, 0, 0, NULL, &Menus_Range}, {1, "Page %d (click to change)", &MenuPage, 0, 0, 0, NULL, &Menus_Range}, {1, "stay peaceful when reborn", &keepPeace, 0, 0, 0, NULL, NULL}, + {1, "", &autoSetWar, 0, 0, 0, autowarmess, NULL}, {1, "use new distress", &newDistress, 0, 0, 0, NULL, NULL}, #ifdef MOTION_MOUSE {1, "use continuous mouse", &continuousMouse, 0, 0, 0, NULL, NULL}, From modemhero at users.sourceforge.net Wed Mar 14 13:36:09 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 14 Mar 2007 18:36:09 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.123, 1.124 netrekrc, 1.34, 1.35 Message-ID: <20070314183619.71121B402@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28441/resources/docs Modified Files: changes.txt netrekrc Log Message: First of what will be several patches recoding Paradise-2000 features. Support for AT ship in playerlist and info window (shows 'AT' instead of '??') Improved explanation of keymap/buttonmap in the netrekrc Main window titlebar now shows your loginname and slot number, in addition to showing the servername New dashboard message for warp 0 ("Stopped") instead of saying "Impulse" War window now says "Re-program" instead of "Save" for changing war settings Added autowar settings to the options menu Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- netrekrc 13 Mar 2007 18:34:59 -0000 1.34 +++ netrekrc 14 Mar 2007 18:36:06 -0000 1.35 @@ -4,12 +4,28 @@ # Login name login: netrek_player -# Mouse button mapping -buttonmap: 1P2f3k - # Key mapping +# Define you keymap here. The format is newkey defaultkey. For example, the +# default key for shield toggle is 's', if you want to remap shield toggle to +# 'q', you would put 'qs' in your keymap. Shields would still be mapped to +# 's' as well as now being on 'q'. Adding a mapping doesn't delete the old +# one. If you want shields on 'w' as well, put 'ws' in your keymap. If you +# had instead put 'wq', it would have mapped quit, the default action of 'q', +# onto 'w'. keymap: PpW Zva%d_eyftg^jmnrpPrls3tfuwvDwsye d +# Mouse button mapping +# Button map lets you map the mouse buttons. Unfortunately, it works in a +# different way than keymap. The format is . To map +# shields onto button 1 (the left one), you would put '1s' in your keymap. +# The buttonmap works through the keymap, so if you have shields mapped to +# 'q', putting '1q' would make button 1 shields and not quit. Buttons 4 and +# 5 are support for Microsoft Xbuttons. If you have a wheel mouse, the up +# wheel is button 6 and the down wheel is button 7. There is also support +# for shifted, controled, and control-shifted mouse actions, see the netrek +# help file for more details. +buttonmap: 1P2f3k + # Key to switch to macro mode # TAB, ESC could be used too macroKey: X Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.123 retrieving revision 1.124 diff -u -d -r1.123 -r1.124 --- changes.txt 13 Mar 2007 18:34:59 -0000 1.123 +++ changes.txt 14 Mar 2007 18:36:06 -0000 1.124 @@ -1,4 +1,10 @@ Netrek XP 2006, Version 1.3: +- support for AT ship in playerlist and info window (shows 'AT' instead of '??') +- improved explanation of keymap/buttonmap in the netrekrc +- main window titlebar now shows your loginname and slot number, in addition to showing + the servername +- new dashboard message for warp 0 ("Stopped") instead of saying "Impulse" +- war window now says "Re-program" instead of "Save" for changing war settings - added "autoSetWar: (0-2)" netrekrc option that controls declare war settings with enemy races when you first join. Can now automatically declare peace on 3rd space races, for example. From modemhero at users.sourceforge.net Wed Mar 14 18:24:10 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 14 Mar 2007 23:24:10 +0000 Subject: [netrek-cvs] client/netrekxp/include bitmaps.h, 1.14, 1.15 data.h, 1.56, 1.57 Message-ID: <20070314232453.7B2BF1867FF@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv618/include Modified Files: bitmaps.h data.h Log Message: New graphics for the team select windows The "Flags" text on COW and KRP dashboards will now turn red if your ship is weapon temped or engine temped Index: bitmaps.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/bitmaps.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- bitmaps.h 14 Jun 2006 10:38:38 -0000 1.14 +++ bitmaps.h 14 Mar 2007 23:24:05 -0000 1.15 @@ -86,6 +86,10 @@ #define BMP_STIPPLE 22 #define BMP_GENO 23 #define BMP_GENO2 24 +#define BMP_FEDTEAM 25 +#define BMP_ROMTEAM 26 +#define BMP_KLITEAM 27 +#define BMP_ORITEAM 28 #define BMP_SHIPEXPL_FRAMES 5 #define BMP_SBEXPL_FRAMES 7 @@ -103,6 +107,8 @@ #define BMP_CCLOCK_HEIGHT 100 #define BMP_CLOAK_WIDTH 20 #define BMP_CLOAK_HEIGHT 20 +#define BMP_TEAM_SELECT_WIDTH 100 +#define BMP_TEAM_SELECT_HEIGHT 100 #define BMP_SHIELD_WIDTH 20 #define BMP_SHIELD_HEIGHT 20 #define BMP_STIPPLE_WIDTH 16 Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- data.h 13 Mar 2007 22:31:17 -0000 1.56 +++ data.h 14 Mar 2007 23:24:05 -0000 1.57 @@ -258,6 +258,7 @@ extern double Sin[], Cos[]; +extern W_Icon fedteam, romteam, kliteam, oriteam; extern W_Icon stipple, clockpic, clockhandpic, genopic, genopic2; extern W_Icon base_expview; From modemhero at users.sourceforge.net Wed Mar 14 18:24:10 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 14 Mar 2007 23:24:10 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.124, 1.125 Message-ID: <20070314232453.2A9C4B3FA@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv618/resources/docs Modified Files: changes.txt Log Message: New graphics for the team select windows The "Flags" text on COW and KRP dashboards will now turn red if your ship is weapon temped or engine temped Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.124 retrieving revision 1.125 diff -u -d -r1.124 -r1.125 --- changes.txt 14 Mar 2007 18:36:06 -0000 1.124 +++ changes.txt 14 Mar 2007 23:24:08 -0000 1.125 @@ -1,4 +1,7 @@ Netrek XP 2006, Version 1.3: +- new graphics for the team select windows +- the "Flags" text on COW and KRP dashboards will now turn red if your ship is + weapon temped or engine temped - support for AT ship in playerlist and info window (shows 'AT' instead of '??') - improved explanation of keymap/buttonmap in the netrekrc - main window titlebar now shows your loginname and slot number, in addition to showing From modemhero at users.sourceforge.net Wed Mar 14 18:24:07 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 14 Mar 2007 23:24:07 +0000 Subject: [netrek-cvs] client/netrekxp build.cmd, 1.23, 1.24 clientr.suo, 1.99, 1.100 Message-ID: <20070314232446.3E246B3FA@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv618 Modified Files: build.cmd clientr.suo Log Message: New graphics for the team select windows The "Flags" text on COW and KRP dashboards will now turn red if your ship is weapon temped or engine temped Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.99 retrieving revision 1.100 diff -u -d -r1.99 -r1.100 Binary files /tmp/cvsBgTqeA and /tmp/cvs827Wm2 differ Index: build.cmd =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/build.cmd,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- build.cmd 24 Feb 2007 10:19:52 -0000 1.23 +++ build.cmd 14 Mar 2007 23:23:59 -0000 1.24 @@ -496,6 +496,7 @@ copy resources\misclib\color\clockhand.bmp %InstCWD%\netrek\bitmaps\misclib\color copy resources\misclib\color\genocide.bmp %InstCWD%\netrek\bitmaps\misclib\color copy resources\misclib\color\genocide2.bmp %InstCWD%\netrek\bitmaps\misclib\color +copy resources\misclib\color\*team.bmp %InstCWD%\netrek\bitmaps\misclib\color copy resources\fonts\ntfonts2.fon %InstCWD%\netrek From modemhero at users.sourceforge.net Wed Mar 14 18:24:13 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 14 Mar 2007 23:24:13 +0000 Subject: [netrek-cvs] client/netrekxp/resources/misclib/color fedteam.bmp, NONE, 1.1 kliteam.bmp, NONE, 1.1 oriteam.bmp, NONE, 1.1 romteam.bmp, NONE, 1.1 Message-ID: <20070314232423.0467BB40B@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/misclib/color In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv618/resources/misclib/color Added Files: fedteam.bmp kliteam.bmp oriteam.bmp romteam.bmp Log Message: New graphics for the team select windows The "Flags" text on COW and KRP dashboards will now turn red if your ship is weapon temped or engine temped --- NEW FILE: fedteam.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: romteam.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kliteam.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: oriteam.bmp --- (This appears to be a binary file; contents omitted.) From modemhero at users.sourceforge.net Wed Mar 14 18:24:11 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 14 Mar 2007 23:24:11 +0000 Subject: [netrek-cvs] client/netrekxp/src dashboard.c, 1.17, 1.18 data.c, 1.61, 1.62 enter.c, 1.8, 1.9 mswindow.c, 1.45, 1.46 newwin.c, 1.52, 1.53 Message-ID: <20070314232423.007F7B3FA@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv618/src Modified Files: dashboard.c data.c enter.c mswindow.c newwin.c Log Message: New graphics for the team select windows The "Flags" text on COW and KRP dashboards will now turn red if your ship is weapon temped or engine temped Index: newwin.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- newwin.c 14 Mar 2007 18:36:07 -0000 1.52 +++ newwin.c 14 Mar 2007 23:24:09 -0000 1.53 @@ -1328,6 +1328,19 @@ W_StoreBitmap3 ("bitmaps/misclib/clock.bmp", BMP_CLOCK_WIDTH, BMP_CLOCK_HEIGHT, BMP_CLOCK, qwin, LR_MONOCHROME); } + + fedteam = + W_StoreBitmap3 ("bitmaps/misclib/color/fedteam.bmp", BMP_TEAM_SELECT_WIDTH, + BMP_TEAM_SELECT_HEIGHT, BMP_FEDTEAM, w, LR_DEFAULTCOLOR); + romteam = + W_StoreBitmap3 ("bitmaps/misclib/color/romteam.bmp", BMP_TEAM_SELECT_WIDTH, + BMP_TEAM_SELECT_HEIGHT, BMP_ROMTEAM, w, LR_DEFAULTCOLOR); + kliteam = + W_StoreBitmap3 ("bitmaps/misclib/color/kliteam.bmp", BMP_TEAM_SELECT_WIDTH, + BMP_TEAM_SELECT_HEIGHT, BMP_KLITEAM, w, LR_DEFAULTCOLOR); + oriteam = + W_StoreBitmap3 ("bitmaps/misclib/color/oriteam.bmp", BMP_TEAM_SELECT_WIDTH, + BMP_TEAM_SELECT_HEIGHT, BMP_ORITEAM, w, LR_DEFAULTCOLOR); genopic = W_StoreBitmap3 ("bitmaps/misclib/color/genocide.bmp", WINSIDE, WINSIDE, BMP_GENO, w, LR_DEFAULTCOLOR); @@ -2049,8 +2062,25 @@ return; W_ClearWindow (win); +#if 0 /* Old team windows */ W_WriteText (win, 5, 5, shipCol[teamNo + 1], teams[teamNo], strlen (teams[teamNo]), W_RegularFont); +#endif + switch (teamNo) + { + case 0: + W_WriteBitmap ( 0, 0, fedteam, foreColor, win); + break; + case 1: + W_WriteBitmap ( 0, 0, romteam, foreColor, win); + break; + case 2: + W_WriteBitmap ( 0, 0, kliteam, foreColor, win); + break; + case 3: + W_WriteBitmap ( 0, 0, oriteam, foreColor, win); + break; + } (void) sprintf (buf, "%d", num); W_MaskText (win, 5, 46, shipCol[teamNo + 1], buf, strlen (buf), W_BigFont); Index: mswindow.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- mswindow.c 11 Mar 2007 22:15:58 -0000 1.45 +++ mswindow.c 14 Mar 2007 23:24:09 -0000 1.46 @@ -494,6 +494,10 @@ free (ship_bitmaps[4]); // Free other bitmaps + free (fedteam); + free (romteam); + free (kliteam); + free (oriteam); free (clockpic); free (clockhandpic); Index: enter.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/enter.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- enter.c 13 Mar 2007 18:35:00 -0000 1.8 +++ enter.c 14 Mar 2007 23:24:08 -0000 1.9 @@ -258,7 +258,7 @@ if (newDashboard) return; sprintf (buf, - "Flags Warp Dam Shd Torps Kills Armies Fuel Wtemp Etemp"); + "Flags Warp Dam Shd Torps Kills Armies Fuel Wtemp Etemp Time"); W_WriteText (tstatw, 50, 5, textColor, buf, strlen (buf), W_RegularFont); sprintf (buf, "Maximum: %2d %3d %3d %3d %6d %3d %3d", Index: dashboard.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/dashboard.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- dashboard.c 14 Mar 2007 18:36:07 -0000 1.17 +++ dashboard.c 14 Mar 2007 23:24:08 -0000 1.18 @@ -469,7 +469,10 @@ else buf[11] = ' '; - W_WriteText (tstatw, 2, 3, textColor, "Flags", 5, W_RegularFont); + if (me->p_flags & (PFWEP | PFENG)) + W_WriteText (tstatw, 2, 3, W_Red, "Flags", 5, W_RegularFont); + else + W_WriteText (tstatw, 2, 3, textColor, "Flags", 5, W_RegularFont); W_WriteText (tstatw, 2, 17, textColor, buf, 12, W_RegularFont); old_flags = me->p_flags; } Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- data.c 13 Mar 2007 22:31:17 -0000 1.61 +++ data.c 14 Mar 2007 23:24:08 -0000 1.62 @@ -256,6 +256,7 @@ extern double Sin[], Cos[]; +W_Icon fedteam, romteam, kliteam, oriteam; W_Icon stipple, clockpic, clockhandpic, genopic, genopic2, icon; W_Color borderColor, backColor, textColor, myColor, warningColor, shipCol[5], From modemhero at users.sourceforge.net Wed Mar 14 20:44:35 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Mar 2007 01:44:35 +0000 Subject: [netrek-cvs] client/netrekxp/resources/sounds nt_enginemelt.wav, NONE, 1.1 nt_engineok.wav, NONE, 1.1 Message-ID: <20070315014445.6B45418680D@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/sounds In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25426/resources/sounds Added Files: nt_enginemelt.wav nt_engineok.wav Log Message: Added new sounds for when engine melt, and then for when they are unmelted Tracked via dashboards - leads to some repetitive code, but it is unavoidable as engine flag status can be received via multiple packet types, so tracking it from packet receipt (which is what is done for t-mode start/stop sounds) is just as complex. --- NEW FILE: nt_engineok.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nt_enginemelt.wav --- (This appears to be a binary file; contents omitted.) From modemhero at users.sourceforge.net Wed Mar 14 20:44:35 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Mar 2007 01:44:35 +0000 Subject: [netrek-cvs] client/netrekxp/src dashboard.c, 1.18, 1.19 dashboard3.c, 1.6, 1.7 data.c, 1.62, 1.63 redraw.c, 1.9, 1.10 sound.c, 1.34, 1.35 Message-ID: <20070315014445.9ED71B40A@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25426/src Modified Files: dashboard.c dashboard3.c data.c redraw.c sound.c Log Message: Added new sounds for when engine melt, and then for when they are unmelted Tracked via dashboards - leads to some repetitive code, but it is unavoidable as engine flag status can be received via multiple packet types, so tracking it from packet receipt (which is what is done for t-mode start/stop sounds) is just as complex. Index: redraw.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/redraw.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- redraw.c 15 Jun 2006 05:09:04 -0000 1.9 +++ redraw.c 15 Mar 2007 01:44:33 -0000 1.10 @@ -181,6 +181,16 @@ buf[7] = (char) (me->p_flags & PFCLOAK ? 'C' : ' '); buf[8] = (char) (me->p_flags & PFWEP ? 'W' : ' '); buf[9] = (char) (me->p_flags & PFENG ? 'E' : ' '); +#ifdef SOUND + if (ingame && oldengflag != (me->p_flags & PFENG)) + { + if (me->p_flags & PFENG) + Play_Sound(ENGINE_MELT_WAV, SF_INFO); + else + Play_Sound(ENGINE_OK_WAV, SF_INFO); + } + oldengflag = (me->p_flags & PFENG); +#endif if (me->p_flags & PFPRESS) buf[10] = 'P'; else if (me->p_flags & PFTRACT) Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- data.c 14 Mar 2007 23:24:08 -0000 1.62 +++ data.c 15 Mar 2007 01:44:33 -0000 1.63 @@ -63,6 +63,7 @@ int niftyNewMessages = 1; unsigned int oldalert = 0; unsigned char oldtourn = (unsigned char) 2; /* placeholder starting status */ +unsigned int oldengflag = 0; int alertBorderColor = 0; int forceBorder = 0; int remap[16] = { 0, 1, 2, 0, 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0 }; Index: dashboard.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/dashboard.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- dashboard.c 14 Mar 2007 23:24:08 -0000 1.18 +++ dashboard.c 15 Mar 2007 01:44:33 -0000 1.19 @@ -475,6 +475,16 @@ W_WriteText (tstatw, 2, 3, textColor, "Flags", 5, W_RegularFont); W_WriteText (tstatw, 2, 17, textColor, buf, 12, W_RegularFont); old_flags = me->p_flags; +#ifdef SOUND + if (ingame && oldengflag != (me->p_flags & PFENG)) + { + if (me->p_flags & PFENG) + Play_Sound(ENGINE_MELT_WAV, SF_INFO); + else + Play_Sound(ENGINE_OK_WAV, SF_INFO); + } + oldengflag = (me->p_flags & PFENG); +#endif } if (fr || status->tourn != old_tourn) Index: dashboard3.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/dashboard3.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- dashboard3.c 19 May 2006 18:08:07 -0000 1.6 +++ dashboard3.c 15 Mar 2007 01:44:33 -0000 1.7 @@ -328,6 +328,16 @@ old_flags = me->p_flags; old_tourn = status->tourn; +#ifdef SOUND + if (ingame && oldengflag != (me->p_flags & PFENG)) + { + if (me->p_flags & PFENG) + Play_Sound(ENGINE_MELT_WAV, SF_INFO); + else + Play_Sound(ENGINE_OK_WAV, SF_INFO); + } + oldengflag = (me->p_flags & PFENG); +#endif } } Index: sound.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/sound.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- sound.c 1 Mar 2007 18:31:18 -0000 1.34 +++ sound.c 15 Mar 2007 01:44:33 -0000 1.35 @@ -55,6 +55,8 @@ sounds[CLOAKED_WAV] = Mix_LoadWAV(DATAFILE("nt_cloaked.wav")); sounds[ENGINE_WAV] = Mix_LoadWAV(DATAFILE("nt_engine.wav")); + sounds[ENGINE_MELT_WAV] = Mix_LoadWAV(DATAFILE("nt_enginemelt.wav")); + sounds[ENGINE_OK_WAV] = Mix_LoadWAV(DATAFILE("nt_engineok.wav")); sounds[ENTER_SHIP_WAV] = Mix_LoadWAV(DATAFILE("nt_enter_ship.wav")); sounds[ENTER_WARP_WAV] = Mix_LoadWAV(DATAFILE("nt_enter_warp.wav")); sounds[EXIT_WARP_WAV] = Mix_LoadWAV(DATAFILE("nt_exit_warp.wav")); From modemhero at users.sourceforge.net Wed Mar 14 20:44:35 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Mar 2007 01:44:35 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.125, 1.126 Message-ID: <20070315014443.C00DB186809@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25426/resources/docs Modified Files: changes.txt Log Message: Added new sounds for when engine melt, and then for when they are unmelted Tracked via dashboards - leads to some repetitive code, but it is unavoidable as engine flag status can be received via multiple packet types, so tracking it from packet receipt (which is what is done for t-mode start/stop sounds) is just as complex. Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.125 retrieving revision 1.126 diff -u -d -r1.125 -r1.126 --- changes.txt 14 Mar 2007 23:24:08 -0000 1.125 +++ changes.txt 15 Mar 2007 01:44:32 -0000 1.126 @@ -1,4 +1,5 @@ Netrek XP 2006, Version 1.3: +- added new sounds for when engine melt, and then for when they are unmelted - new graphics for the team select windows - the "Flags" text on COW and KRP dashboards will now turn red if your ship is weapon temped or engine temped From modemhero at users.sourceforge.net Wed Mar 14 20:44:34 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Mar 2007 01:44:34 +0000 Subject: [netrek-cvs] client/netrekxp/include data.h, 1.57, 1.58 sound.h, 1.17, 1.18 Message-ID: <20070315014443.C00AFB407@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25426/include Modified Files: data.h sound.h Log Message: Added new sounds for when engine melt, and then for when they are unmelted Tracked via dashboards - leads to some repetitive code, but it is unavoidable as engine flag status can be received via multiple packet types, so tracking it from packet receipt (which is what is done for t-mode start/stop sounds) is just as complex. Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- data.h 14 Mar 2007 23:24:05 -0000 1.57 +++ data.h 15 Mar 2007 01:44:32 -0000 1.58 @@ -50,6 +50,7 @@ extern unsigned int oldalert; extern unsigned char oldtourn; +extern unsigned int oldengflag; extern int alertBorderColor; extern int forceBorder; extern int remap[]; Index: sound.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/sound.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- sound.h 1 Mar 2007 07:35:44 -0000 1.17 +++ sound.h 15 Mar 2007 01:44:32 -0000 1.18 @@ -27,6 +27,8 @@ enum { CLOAKED_WAV, ENGINE_WAV, + ENGINE_MELT_WAV, + ENGINE_OK_WAV, ENTER_SHIP_WAV, ENTER_WARP_WAV, EXIT_WARP_WAV, From modemhero at users.sourceforge.net Wed Mar 14 22:09:18 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Mar 2007 03:09:18 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.126, 1.127 Message-ID: <20070315030927.329DFB407@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv30172/resources/docs Modified Files: changes.txt Log Message: BRMH shrink phasers working proper, both obeying shrink phaser on miss, as well as shrinking enemy phaser hits. Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.126 retrieving revision 1.127 diff -u -d -r1.126 -r1.127 --- changes.txt 15 Mar 2007 01:44:32 -0000 1.126 +++ changes.txt 15 Mar 2007 03:09:16 -0000 1.127 @@ -1,4 +1,6 @@ Netrek XP 2006, Version 1.3: +- several fixes to BRMH shrink phasers - they now can shrink on miss, and enemy phasers + also shrink properly - added new sounds for when engine melt, and then for when they are unmelted - new graphics for the team select windows - the "Flags" text on COW and KRP dashboards will now turn red if your ship is From modemhero at users.sourceforge.net Wed Mar 14 22:09:18 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Mar 2007 03:09:18 +0000 Subject: [netrek-cvs] client/netrekxp/src local.c,1.69,1.70 Message-ID: <20070315030927.3156018680D@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv30172/src Modified Files: local.c Log Message: BRMH shrink phasers working proper, both obeying shrink phaser on miss, as well as shrinking enemy phaser hits. Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.69 retrieving revision 1.70 diff -u -d -r1.69 -r1.70 --- local.c 13 Mar 2007 22:31:17 -0000 1.69 +++ local.c 15 Mar 2007 03:09:16 -0000 1.70 @@ -623,7 +623,7 @@ static void get_shrink_phaser_coords(int *rx, int *ry, int dx, int dy, int tx, - int ty, int curr_fuse, int max_fuse) + int ty, int curr_fuse, int max_fuse, int shrink_amount) { register int ph_dir, range, phaser_shrink; @@ -641,7 +641,7 @@ * Calculate current drawing range of phaser based on distance and phaser * fuse */ - phaser_shrink = 16 - phaserShrink; + phaser_shrink = 16 - shrink_amount; if (phaser_shrink < 5) phaser_shrink = 5; @@ -1393,8 +1393,6 @@ tx = (j->p_x + tx - me->p_x) / SCALE + WINSIDE / 2; ty = (j->p_y + ty - me->p_y) / SCALE + WINSIDE / 2; - php->ph_fuse = 0; - } else if (php->ph_status == PHHIT2) { @@ -1419,12 +1417,19 @@ if (shrinkPhaserOnMiss || php->ph_status != PHMISS) { + if (myPlayer(j) || isObsLockPlayer(j)) { if (phaserShrinkStyle == 1) { px = (dx * 16 + 8) / 16; py = (dy * 16 + 8) / 16; + get_shrink_phaser_coords(&new_dx, &new_dy, + px, py, tx, ty, + php->ph_fuse, php->ph_maxfuse, + phaserShrink); + px = new_dx; + py = new_dy; } else { @@ -1436,11 +1441,25 @@ } else { - px = (dx * (16 - theirPhaserShrink) + - tx * theirPhaserShrink + 8) / 16; + if (phaserShrinkStyle == 1) + { + px = (dx * 16 + 8) / 16; + py = (dy * 16 + 8) / 16; + get_shrink_phaser_coords(&new_dx, &new_dy, + px, py, tx, ty, + php->ph_fuse, php->ph_maxfuse, + theirPhaserShrink); + px = new_dx; + py = new_dy; + } + else + { + px = (dx * (16 - theirPhaserShrink) + + tx * theirPhaserShrink + 8) / 16; - py = (dy * (16 - theirPhaserShrink) + - ty * theirPhaserShrink + 8) / 16; + py = (dy * (16 - theirPhaserShrink) + + ty * theirPhaserShrink + 8) / 16; + } } } else @@ -1483,28 +1502,12 @@ } ph_col += (10/j->p_ship.s_phaserfuse); scaled_ph_col = ph_col * 10 / server_ups; - if (phaserShrinkStyle == 1) - { - get_shrink_phaser_coords(&new_dx, &new_dy, - px, py, tx, ty, - php->ph_fuse, php->ph_maxfuse); - px = new_dx; - py = new_dy; - } W_CacheLine (w, px, py, tx, ty, col); } else { if (php->ph_status != PHMISS) { - if (phaserShrinkStyle == 1 && (myPlayer(j) || isObsLockPlayer(j))) - { - get_shrink_phaser_coords(&new_dx, &new_dy, - px, py, tx, ty, - php->ph_fuse, php->ph_maxfuse); - px = new_dx; - py = new_dy; - } if (highlightFriendlyPhasers) W_CacheLine (w, px, py, tx, ty, foreColor); else From modemhero at users.sourceforge.net Wed Mar 14 23:34:46 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Mar 2007 04:34:46 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html generalconfig.html, 1.33, 1.34 Message-ID: <20070315043455.62B96B407@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv32252/resources/htmlhelp/html Modified Files: generalconfig.html Log Message: Netrekrc option newTeams for using new graphical team windows Index: generalconfig.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/generalconfig.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- generalconfig.html 13 Mar 2007 18:35:00 -0000 1.33 +++ generalconfig.html 15 Mar 2007 04:34:44 -0000 1.34 @@ -634,6 +634,16 @@ +newTeams +Use new team windows + +
    +
  • on
  • +
  • off(default)
  • +
+ + + omitTeamLetter Don't draw team letter on galaxy From modemhero at users.sourceforge.net Wed Mar 14 23:34:46 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Mar 2007 04:34:46 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.127, 1.128 netrekrc, 1.35, 1.36 netrekrc_options.txt, 1.33, 1.34 Message-ID: <20070315043455.641DFB40A@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv32252/resources/docs Modified Files: changes.txt netrekrc netrekrc_options.txt Log Message: Netrekrc option newTeams for using new graphical team windows Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- netrekrc 14 Mar 2007 18:36:06 -0000 1.35 +++ netrekrc 15 Mar 2007 04:34:44 -0000 1.36 @@ -199,6 +199,9 @@ # Use new quit window newQuit: on +# Use new team windows +newTeams: on + # Omit team letter on galaxy omitTeamLetter: off Index: netrekrc_options.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc_options.txt,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- netrekrc_options.txt 13 Mar 2007 18:34:59 -0000 1.33 +++ netrekrc_options.txt 15 Mar 2007 04:34:44 -0000 1.34 @@ -130,6 +130,7 @@ # off - old style newQuit: (on/off) use new quit window +newTeams: (on/off) use new team windows omitTeamLetter: (on/off) omit team letter on galaxy orishipbmpfile: (path) - old color bitmaps oriship1bmpfile: (path) - new color bitmaps Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.127 retrieving revision 1.128 diff -u -d -r1.127 -r1.128 --- changes.txt 15 Mar 2007 03:09:16 -0000 1.127 +++ changes.txt 15 Mar 2007 04:34:44 -0000 1.128 @@ -2,7 +2,8 @@ - several fixes to BRMH shrink phasers - they now can shrink on miss, and enemy phasers also shrink properly - added new sounds for when engine melt, and then for when they are unmelted -- new graphics for the team select windows +- new graphics for the team select windows, and new option "newTeams: (on)/off" whether + to use these graphics or the old team windows - the "Flags" text on COW and KRP dashboards will now turn red if your ship is weapon temped or engine temped - support for AT ship in playerlist and info window (shows 'AT' instead of '??') From modemhero at users.sourceforge.net Wed Mar 14 23:34:46 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Mar 2007 04:34:46 +0000 Subject: [netrek-cvs] client/netrekxp/include data.h,1.58,1.59 Message-ID: <20070315043455.5EA881867DA@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv32252/include Modified Files: data.h Log Message: Netrekrc option newTeams for using new graphical team windows Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- data.h 15 Mar 2007 01:44:32 -0000 1.58 +++ data.h 15 Mar 2007 04:34:44 -0000 1.59 @@ -704,6 +704,7 @@ extern int richText; /* temporary variable to enable/disable rich text windows */ extern int newQuit; /* new quit clock */ +extern int newTeams; /* new team windows */ extern int soundVolume; /* Starting sound volume (0-128 range) */ extern int soundEffects; /* Use sound effects playback */ extern int soundMusic; /* Use music playback */ From modemhero at users.sourceforge.net Wed Mar 14 23:34:46 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Mar 2007 04:34:46 +0000 Subject: [netrek-cvs] client/netrekxp/src data.c, 1.63, 1.64 defaults.c, 1.55, 1.56 newwin.c, 1.53, 1.54 Message-ID: <20070315043455.6658A186810@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv32252/src Modified Files: data.c defaults.c newwin.c Log Message: Netrekrc option newTeams for using new graphical team windows Index: newwin.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- newwin.c 14 Mar 2007 23:24:09 -0000 1.53 +++ newwin.c 15 Mar 2007 04:34:44 -0000 1.54 @@ -2062,25 +2062,28 @@ return; W_ClearWindow (win); -#if 0 /* Old team windows */ - W_WriteText (win, 5, 5, shipCol[teamNo + 1], teams[teamNo], - strlen (teams[teamNo]), W_RegularFont); -#endif - switch (teamNo) + if (newTeams) { - case 0: - W_WriteBitmap ( 0, 0, fedteam, foreColor, win); - break; - case 1: - W_WriteBitmap ( 0, 0, romteam, foreColor, win); - break; - case 2: - W_WriteBitmap ( 0, 0, kliteam, foreColor, win); - break; - case 3: - W_WriteBitmap ( 0, 0, oriteam, foreColor, win); - break; + switch (teamNo) + { + case 0: + W_WriteBitmap ( 0, 0, fedteam, foreColor, win); + break; + case 1: + W_WriteBitmap ( 0, 0, romteam, foreColor, win); + break; + case 2: + W_WriteBitmap ( 0, 0, kliteam, foreColor, win); + break; + case 3: + W_WriteBitmap ( 0, 0, oriteam, foreColor, win); + break; + } } + else + W_WriteText (win, 5, 5, shipCol[teamNo + 1], teams[teamNo], + strlen (teams[teamNo]), W_RegularFont); + (void) sprintf (buf, "%d", num); W_MaskText (win, 5, 46, shipCol[teamNo + 1], buf, strlen (buf), W_BigFont); Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- defaults.c 14 Mar 2007 18:36:07 -0000 1.55 +++ defaults.c 15 Mar 2007 04:34:44 -0000 1.56 @@ -357,6 +357,12 @@ NULL } }, + {"newTeams", &newTeams, RC_BOOL, + { + "Use new team windows", + NULL + } + }, {"omitTeamLetter", &omitTeamLetter, RC_BOOL, { "Omit team letter on galaxy", @@ -1556,6 +1562,7 @@ doubleBuffering = booleanDefault ("doubleBuffering", doubleBuffering); allowWheelActions = booleanDefault ("allowWheelActions", allowWheelActions); newQuit = booleanDefault ("newQuit", newQuit); + newTeams = booleanDefault ("newTeams", newTeams); soundVolume= intDefault ("soundVolume", soundVolume); soundEffects= booleanDefault ("soundEffects", soundEffects); soundMusic = booleanDefault ("soundMusic", soundMusic); Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- data.c 15 Mar 2007 01:44:33 -0000 1.63 +++ data.c 15 Mar 2007 04:34:44 -0000 1.64 @@ -800,6 +800,7 @@ int richText = 0; /* temporary variable to select rich text message windows */ int newQuit = 0; /* new quit clock */ +int newTeams = 0; /* new team windows */ int soundVolume = 64; /* Starting sound volume (0-128 range) */ int soundEffects = 1; /* Use sound effects playback */ int soundMusic = 1; /* Use music playback */ From modemhero at users.sourceforge.net Thu Mar 15 10:39:29 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Mar 2007 15:39:29 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html generalconfig.html, 1.34, 1.35 Message-ID: <20070315153940.19D44B40A@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv14821/resources/htmlhelp/html Modified Files: generalconfig.html Log Message: Netrekrc option for puck heading marker. Index: generalconfig.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/generalconfig.html,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- generalconfig.html 15 Mar 2007 04:34:44 -0000 1.34 +++ generalconfig.html 15 Mar 2007 15:39:27 -0000 1.35 @@ -852,6 +852,17 @@ +puckArrow +Put a small tic mark on the puck to indicate its direction + +
    +
  • on (default)
  • +
  • off
  • +
+ + + + puckCircle Show the puck's max shot range as a circle around your ship From modemhero at users.sourceforge.net Thu Mar 15 10:39:28 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Mar 2007 15:39:28 +0000 Subject: [netrek-cvs] client/netrekxp/include data.h, 1.59, 1.60 defs.h, 1.13, 1.14 Message-ID: <20070315153940.0097C18680D@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv14821/include Modified Files: data.h defs.h Log Message: Netrekrc option for puck heading marker. Index: defs.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/defs.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- defs.h 28 Feb 2007 07:44:00 -0000 1.13 +++ defs.h 15 Mar 2007 15:39:26 -0000 1.14 @@ -45,6 +45,7 @@ * in a cloak * engage/disengage */ #define NUMRANKS 9 +#define PUCKARROW_LEN 6 /* These are configuration definitions */ Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- data.h 15 Mar 2007 04:34:44 -0000 1.59 +++ data.h 15 Mar 2007 15:39:25 -0000 1.60 @@ -662,6 +662,7 @@ extern int observerMode; /* set observer mode variable */ extern int observerPorts[]; /* predefined list of observer ports */ extern int showHockeyScore; /* show hockey score on map */ +extern int puckArrow; /* draw heading tic on puck */ extern char pigcall[]; /* pigcall string */ extern char cowid[]; /* cowid string */ From modemhero at users.sourceforge.net Thu Mar 15 10:39:29 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Mar 2007 15:39:29 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.128, 1.129 netrekrc, 1.36, 1.37 netrekrc_options.txt, 1.34, 1.35 Message-ID: <20070315153940.1765EB400@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv14821/resources/docs Modified Files: changes.txt netrekrc netrekrc_options.txt Log Message: Netrekrc option for puck heading marker. Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- netrekrc 15 Mar 2007 04:34:44 -0000 1.36 +++ netrekrc 15 Mar 2007 15:39:26 -0000 1.37 @@ -271,6 +271,9 @@ # Use new UDP code portSwap: on +# Put a small tic mark on the puck to indicate its direction +puckArrow: on + # Show the puck's max shot range as a circle around your ship puckCircle: off Index: netrekrc_options.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc_options.txt,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- netrekrc_options.txt 15 Mar 2007 04:34:44 -0000 1.34 +++ netrekrc_options.txt 15 Mar 2007 15:39:26 -0000 1.35 @@ -212,6 +212,7 @@ port: (port) default port port.: (port) port for portSwap: (on/off) use UDP port swap code (use if you behind NAT) +puckArrow: (on/off) put a small tic mark on the puck to indicate its direction puckCircle: (on/off) show the puck's max shot range as a circle around your ship rcfile-: (path) use this file as netrekrc for ship (sc,dd,ca,bb,as,sb,ga,att) redrawDelay: (0-10) how many updates to wait before redraw Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.128 retrieving revision 1.129 diff -u -d -r1.128 -r1.129 --- changes.txt 15 Mar 2007 04:34:44 -0000 1.128 +++ changes.txt 15 Mar 2007 15:39:26 -0000 1.129 @@ -1,4 +1,6 @@ Netrek XP 2006, Version 1.3: +- added "puckArrow: (on)/off" option to draw a tic mark on the puck in hockey to indicate + puck direction - several fixes to BRMH shrink phasers - they now can shrink on miss, and enemy phasers also shrink properly - added new sounds for when engine melt, and then for when they are unmelted From modemhero at users.sourceforge.net Thu Mar 15 10:39:29 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Mar 2007 15:39:29 +0000 Subject: [netrek-cvs] client/netrekxp/src data.c, 1.64, 1.65 defaults.c, 1.56, 1.57 local.c, 1.70, 1.71 option.c, 1.33, 1.34 Message-ID: <20070315153940.1D3C0B421@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv14821/src Modified Files: data.c defaults.c local.c option.c Log Message: Netrekrc option for puck heading marker. Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.70 retrieving revision 1.71 diff -u -d -r1.70 -r1.71 --- local.c 15 Mar 2007 03:09:16 -0000 1.70 +++ local.c 15 Mar 2007 15:39:27 -0000 1.71 @@ -1180,6 +1180,28 @@ clearcount++; } } + /* Puck tick heading */ + if (puckArrow && playing_hockey && + j->p_speed != 0 && + strcmp(j->p_name, "Puck") == 0 && + strcmp(j->p_login, "Robot") == 0 && + j->p_team == NOBODY && + j->p_ship.s_type == SCOUT) + { + int startx, starty, endx, endy; + + startx = dx + (int) ((shield_width / 2) * Cos[j->p_dir]); + starty = dy + (int) ((shield_width / 2) * Sin[j->p_dir]); + endx = startx + (int) (PUCKARROW_LEN * Cos[j->p_dir]); + endy = starty + (int) (PUCKARROW_LEN * Sin[j->p_dir]); + + W_MakeLine(w, startx, starty, endx, endy, W_White); + clearline[0][clearlcount] = startx; + clearline[1][clearlcount] = starty; + clearline[2][clearlcount] = endx; + clearline[3][clearlcount] = endy; + clearlcount++; + } #endif #ifdef BEEPLITE Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- defaults.c 15 Mar 2007 04:34:44 -0000 1.56 +++ defaults.c 15 Mar 2007 15:39:27 -0000 1.57 @@ -484,6 +484,12 @@ } }, #endif + {"puckArrow", &puckArrow, RC_BOOL, + { + "Put a small tic mark on the puck to indicate its direction", + NULL + } + }, {"puckCircle", &puckCircle, RC_BOOL, { "Show the puck's max shot range as a circle around your ship", @@ -1579,7 +1585,7 @@ #ifdef HOCKEY_LINES showHockeyLinesLocal = booleanDefault ("showHockeyLinesLocal", showHockeyLinesLocal); showHockeyLinesMap = booleanDefault ("showHockeyLinesMap", showHockeyLinesMap); - showHockeyScore = booleanDefault ("showHockeyScore", showHockeyScore); + showHockeyScore = booleanDefault ("showHockeyScore", showHockeyScore); #endif saveBig = booleanDefault ("saveBig", saveBig); @@ -1601,6 +1607,7 @@ newDashboard = intDefault ("newDashboard", newDashboard); detCircle = booleanDefault ("detCircle", detCircle); puckCircle = booleanDefault ("puckCircle", puckCircle); + puckArrow = booleanDefault ("puckArrow", puckArrow); showArmy = booleanDefault ("showArmy", showArmy); redrawDelay = intDefault ("redrawDelay", redrawDelay); planetHighlighting = booleanDefault ("planetHighlighting", planetHighlighting); Index: option.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- option.c 14 Mar 2007 18:36:07 -0000 1.33 +++ option.c 15 Mar 2007 15:39:27 -0000 1.34 @@ -274,6 +274,7 @@ {1, "show det circle", &detCircle, 0, 0, 0, NULL, NULL}, #ifdef HOCKEY_LINES {1, "show puck circle", &puckCircle, 0, 0, 0, NULL, NULL}, + {1, "show puck arrow", &puckArrow, 0, 0, 0, NULL, NULL}, #endif {1, "done", ¬done, 0, 0, 0, NULL, NULL}, {-1, NULL, 0, 0, 0, 0, NULL, NULL} Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.64 retrieving revision 1.65 diff -u -d -r1.64 -r1.65 --- data.c 15 Mar 2007 04:34:44 -0000 1.64 +++ data.c 15 Mar 2007 15:39:27 -0000 1.65 @@ -756,6 +756,7 @@ int mainTitleBar = 0; int observerMode = 0; int showHockeyScore = 1; +int puckArrow = 1; int observerPorts[] = { 2593, 2595, 4000, 5000, 0 }; From modemhero at users.sourceforge.net Thu Mar 15 10:39:27 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Mar 2007 15:39:27 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo,1.100,1.101 Message-ID: <20070315153940.1B82FB40B@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv14821 Modified Files: clientr.suo Log Message: Netrekrc option for puck heading marker. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.100 retrieving revision 1.101 diff -u -d -r1.100 -r1.101 Binary files /tmp/cvscVo9Ai and /tmp/cvsWTGhhM differ From modemhero at users.sourceforge.net Thu Mar 15 11:42:31 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Mar 2007 16:42:31 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs netrekrc, 1.37, 1.38 netrekrc_options.txt, 1.35, 1.36 Message-ID: <20070315164240.DCECD186815@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17400/resources/docs Modified Files: netrekrc netrekrc_options.txt Log Message: New Hockey options menu. 5 new netrekrc options, not functional yet but these patches include all the backend work for loading/changing/documenting the new options. The options are headingTic, tractorID, lockLine, weaponsOnMap, and sortPlanets Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- netrekrc 15 Mar 2007 15:39:26 -0000 1.37 +++ netrekrc 15 Mar 2007 16:42:29 -0000 1.38 @@ -117,6 +117,9 @@ # (but only works if forceDisplay = 0). forceMono: off +# Draw a tic mark indicating your ship's direction +headingTic: on + # Highlight friendly phasers highlightFriendlyPhasers: off @@ -129,6 +132,10 @@ # Keep peace with enemy team after death keepPeace: on +# Draw dashed green line on map from your ship to lock target, +# requires showLock to be on for map +lockLine: on + # Log all messages to file. Requires "logfile" option logging: off @@ -370,6 +377,9 @@ # Put my team first in the player list sortMyTeamFirst: off +# Sort the planet list by team and army count +sortPlanets: on + # Sort players by team sortPlayers: on @@ -407,6 +417,9 @@ # Distance between tractor/pressor dots tpDotDist: 10 +# Show the ID of player you are tractoring as a number below your ship +tractorID: on + # Use short packets for communications tryShort: on @@ -470,6 +483,9 @@ # Draw warp streaks while transwarping to starbase warpStreaks: on +# Show phasers, torps and plasmas on galactic map +weaponsOnMap: on + # Enable internal windows moving windowMove: on Index: netrekrc_options.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc_options.txt,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- netrekrc_options.txt 15 Mar 2007 15:39:26 -0000 1.35 +++ netrekrc_options.txt 15 Mar 2007 16:42:29 -0000 1.36 @@ -63,6 +63,7 @@ forceMono: (on/off) outdated option, that will force display to 16 colors (but only works if forceDisplay = 0). fullScreen: (on/off) create border for main window +headingTic: (on/off) draw a tic mark indicating your ship's direction highlightFriendlyPhasers: (on/off) use white color for friendly phasers ignoreCaps: (on/off) ignore CapsLock key state indshipbmpfile: (path) - old color bitmaps @@ -79,6 +80,8 @@ klishipGbmpfile: (path) - your own ship's grayscale bitmaps klishipTbmpfile: (path) - shaded color bitmaps klishipMbmpfile: (path) - mono bitmaps +lockLine: (on/off) draw dashed green line on map from your ship to lock target, + requires showLock to be on for map logfile: (path) path to logfile logging: (on/off) enable logging login: (string) character login @@ -257,6 +260,7 @@ shrinkPhaserOnMiss: (on/off) don't draw phaser line on miss singleMacro: (string) macro keys that will trigger macro without macro mode sortMyTeamFirst: (on/off) show my team first in the player list +sortPlanets: (on/off) sort the planet list by team and army count sortPlayers: (on/off) sort players by teams sound: (on/off) enable layered, stereo sound soundVolume: (0-128) starting sound volume @@ -286,6 +290,7 @@ # 4 - user-set time tpDotDist: (int) distance between tractor/pressor dots (default 10) +tractorID: (on/off) show the ID of player you are tractoring as a number below your ship tryShort: (on/off) enable short packets tryUdp: (on/off) try using UDP udpClientReceive: (0-2) how to receive data from server @@ -313,6 +318,7 @@ warnHull: (on/off) warn hull state based on damage warnShields: (on/off) change shields color on enemy approach warpStreaks: (on/off) show streaks while warping to starbase +weaponsOnMap: (on/off) show phasers, torps and plasmas on galactic map windowMove: (on/off) enable internal windows to be moved with mouse .allow: [A][T][I][P][K] From modemhero at users.sourceforge.net Thu Mar 15 11:42:31 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Mar 2007 16:42:31 +0000 Subject: [netrek-cvs] client/netrekxp/include data.h,1.60,1.61 Message-ID: <20070315164240.D9BFC186811@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17400/include Modified Files: data.h Log Message: New Hockey options menu. 5 new netrekrc options, not functional yet but these patches include all the backend work for loading/changing/documenting the new options. The options are headingTic, tractorID, lockLine, weaponsOnMap, and sortPlanets Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- data.h 15 Mar 2007 15:39:25 -0000 1.60 +++ data.h 15 Mar 2007 16:42:28 -0000 1.61 @@ -712,5 +712,10 @@ extern int soundMusicBkgd; /* Play random background music continuously */ extern int soundAngles; /* Use 3D sound */ -extern int useFullShipInfo; /* Prefer SP_PLAYER packets over SP_S_PLAYER packets */ +extern int useFullShipInfo; /* Prefer SP_PLAYER packets over SP_S_PLAYER packets */ +extern int headingTic; /* show ship heading tic */ +extern int tractorID; /* show ID of player you are tractoring */ +extern int lockLine; /* draw dashed line on map from you to lock target */ +extern int weaponsOnMap; /* draw weapons fire on map */ +extern int sortPlanets; /* sort planet list by team and army count */ #endif /* _h_data */ From modemhero at users.sourceforge.net Thu Mar 15 11:42:32 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Mar 2007 16:42:32 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html generalconfig.html, 1.35, 1.36 Message-ID: <20070315164240.D61C1B407@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17400/resources/htmlhelp/html Modified Files: generalconfig.html Log Message: New Hockey options menu. 5 new netrekrc options, not functional yet but these patches include all the backend work for loading/changing/documenting the new options. The options are headingTic, tractorID, lockLine, weaponsOnMap, and sortPlanets Index: generalconfig.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/generalconfig.html,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- generalconfig.html 15 Mar 2007 15:39:27 -0000 1.35 +++ generalconfig.html 15 Mar 2007 16:42:29 -0000 1.36 @@ -327,6 +327,16 @@ +headingTic +Draw a tic mark indicating your ship's direction + +
    +
  • on (default)
  • +
  • off
  • +
+ + + highlightFriendlyPhasers Highlight phasers of friendly players @@ -422,6 +432,16 @@ path + +lockLine +Draw dashed green line on map from your ship to lock target + +
    +
  • on (default)
  • +
  • off
  • +
+ + logFile Path to log file path @@ -861,7 +881,6 @@ - puckCircle Show the puck's max shot range as a circle around your ship @@ -1191,6 +1210,16 @@ +sortPlanets +Sort the planet list by team and army count + +
    +
  • on (default)
  • +
  • off
  • +
+ + + sortPlayers Sort players by team @@ -1288,6 +1317,16 @@ integer
default: 10 +tractorID +Show the ID of player you are tractoring as a number below your ship + +
    +
  • on (default)
  • +
  • off
  • +
+ + + tryShort Use short packets for communications @@ -1456,6 +1495,16 @@ +weaponsOnMap +Show phasers, torps and plasmas on galactic map + +
    +
  • on (default)
  • +
  • off
  • +
+ + + windowMove Enable moving internal windows From modemhero at users.sourceforge.net Thu Mar 15 11:42:32 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Mar 2007 16:42:32 +0000 Subject: [netrek-cvs] client/netrekxp/src data.c, 1.65, 1.66 defaults.c, 1.57, 1.58 option.c, 1.34, 1.35 Message-ID: <20070315164241.E8E89186810@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17400/src Modified Files: data.c defaults.c option.c Log Message: New Hockey options menu. 5 new netrekrc options, not functional yet but these patches include all the backend work for loading/changing/documenting the new options. The options are headingTic, tractorID, lockLine, weaponsOnMap, and sortPlanets Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- defaults.c 15 Mar 2007 15:39:27 -0000 1.57 +++ defaults.c 15 Mar 2007 16:42:30 -0000 1.58 @@ -198,6 +198,12 @@ NULL } }, + {"headingTic", &headingTic, RC_BOOL, + { + "Draw a tic mark indicating your ship's direction", + NULL + } + }, {"highlightFriendlyPhasers", &highlightFriendlyPhasers, RC_BOOL, { "Highlight friendly phasers", @@ -222,6 +228,13 @@ NULL } }, + {"lockLine", &lockLine, RC_BOOL, + { + "Draw dashed green line on map from your ship to lock target," + "requires showLock to be on for map", + NULL + } + }, {"logging", &logging, RC_BOOL, { "Log all messages to file. Requires \"logfile\" option", @@ -689,6 +702,12 @@ NULL } }, + {"sortPlanets", &sortPlanets, RC_BOOL, + { + "Sort the planet list by team and army count", + NULL + } + }, {"sortPlayers", &sortPlayers, RC_BOOL, { "Sort players by team", @@ -758,6 +777,12 @@ NULL } }, + {"tractorID", &tractorID, RC_BOOL, + { + "Show the ID of player you are tractoring as a number below your ship", + NULL + } + }, #ifdef SHORT_PACKETS {"tryShort", &tryShort, RC_BOOL, { @@ -880,6 +905,12 @@ NULL } }, + {"weaponsOnMap", &weaponsOnMap, RC_BOOL, + { + "Show phasers, torps and plasmas on galactic map", + NULL + } + }, {"windowMove", &windowMove, RC_BOOL, { "Enable internal windows moving", @@ -1575,6 +1606,11 @@ soundMusicBkgd = booleanDefault ("soundMusicBkgd", soundMusicBkgd); soundAngles = booleanDefault ("soundAngles", soundAngles); useFullShipInfo = booleanDefault ("useFullShipInfo", useFullShipInfo); + headingTic = booleanDefault ("headingTic", headingTic); + tractorID = booleanDefault ("tractorID", tractorID); + lockLine = booleanDefault ("lockLine", lockLine); + weaponsOnMap = booleanDefault ("weaponsOnMap", weaponsOnMap); + sortPlanets = booleanDefault ("sortPlanets", sortPlanets); tpDotDist = intDefault ("tpDotDist", tpDotDist); omitTeamLetter = booleanDefault ("omitTeamLetter", omitTeamLetter); beepOnPrivateMessage = booleanDefault ("beepOnPrivateMessage", beepOnPrivateMessage); Index: option.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- option.c 15 Mar 2007 15:39:27 -0000 1.34 +++ option.c 15 Mar 2007 16:42:30 -0000 1.35 @@ -263,7 +263,8 @@ #endif {1, "highlight friendly phasers", &highlightFriendlyPhasers, 0, 0, 0, NULL, NULL}, {1, "show tractor/pressor beams", &showTractorPressor, 0, 0, 0, NULL, NULL}, - {1, "show tractors after lock ", &continueTractor, 0, 0, 0, NULL, NULL}, + {1, "show tractors after lock", &continueTractor, 0, 0, 0, NULL, NULL}, + {1, "show tractor target ID", &tractorID, 0, 0, 0, NULL, NULL}, {1, "show all players tract/press", &showAllTractorPressor, 0, 0, 0, NULL, NULL}, {1, "enemy phaser width: %d", &enemyPhasers, 0, 0, 0, NULL, &enPhasRng}, {1, "", &phaserShrinkStyle, 0, 0, 0, shrinkphasermess, NULL}, @@ -271,11 +272,9 @@ {1, "shrink their phasers by %d/16", &theirPhaserShrink, 0, 0, 0, NULL, &phaserShrinkRng}, {1, "shrink phasers on a miss", &shrinkPhaserOnMiss, 0, 0, 0, NULL, NULL}, {1, "report kills", &reportKills, 0, 0, 0, NULL, NULL}, + {1, "show heading tic mark", &headingTic, 0, 0, 0, NULL, NULL}, + {1, "show lock line", &lockLine, 0, 0, 0, NULL, NULL}, {1, "show det circle", &detCircle, 0, 0, 0, NULL, NULL}, -#ifdef HOCKEY_LINES - {1, "show puck circle", &puckCircle, 0, 0, 0, NULL, NULL}, - {1, "show puck arrow", &puckArrow, 0, 0, 0, NULL, NULL}, -#endif {1, "done", ¬done, 0, 0, 0, NULL, NULL}, {-1, NULL, 0, 0, 0, 0, NULL, NULL} }; @@ -289,6 +288,7 @@ {1, "rotate new planets", &rotatePlanets, 0, 0, 0, NULL, NULL}, {1, "show planet names on local", &showPlanetNames, 0, 0, 0, NULL, NULL}, {1, "show army count on orbit", &showArmy, 0, 0, 0, NULL, NULL}, + {1, "show weapons on galactic", &weaponsOnMap, 0, 0, 0, NULL, NULL}, {1, "show owner on galactic", &showPlanetOwner, 0, 0, 0, NULL, NULL}, {1, "show IND planets", &showIND, 0, 0, 0, NULL, NULL}, {1, "show AGRI in caps on map", &agriCAPS, 0, 0, 0, NULL, NULL}, @@ -298,6 +298,7 @@ {1, "autorotate galaxy", &autoRotate, 0, 0, 0, NULL, NULL}, {1, "", &rotate, 0, 0, 0, rotatemess, NULL}, #endif + {1, "sort the planetlist window", &sortPlanets, 0, 0, 0, NULL, NULL}, {1, "done", ¬done, 0, 0, 0, NULL, NULL}, {-1, NULL, 0, 0, 0, 0, NULL, NULL} }; @@ -389,11 +390,6 @@ {1, "draw view box on map", &viewBox, 0, 0, 0, NULL, NULL}, {1, "draw stars on local", &showStars, 0, 0, 0, NULL, NULL}, {1, "draw warp streaks", &warpStreaks, 0, 0, 0, NULL, NULL}, -#ifdef HOCKEY_LINES - {1, "show hockey lines on local", &showHockeyLinesLocal, 0, 0, 0, NULL, NULL}, - {1, "show hockey lines on map", &showHockeyLinesMap, 0, 0, 0, NULL, NULL}, - {1, "show hockey score on map", &showHockeyScore, 0, 0, 0, NULL, NULL}, -#endif {1, "alert on extra border(s)", &extraAlertBorder, 0, 0, 0, NULL, NULL}, #ifdef PHASER_STATS {1, "", &phaserStats, 0, 0, 0, phaserstatmess, NULL}, @@ -406,6 +402,20 @@ {-1, NULL, 0, 0, 0, 0, NULL, NULL} }; +struct option Hockey_Menu[] = { + {0, "Hockey Menu", &MenuPage, 0, 0, 0, NULL, &Menus_Range}, + {1, "Page %d (click to change)", &MenuPage, 0, 0, 0, NULL, &Menus_Range}, +#ifdef HOCKEY_LINES + {1, "show puck circle", &puckCircle, 0, 0, 0, NULL, NULL}, + {1, "show puck arrow", &puckArrow, 0, 0, 0, NULL, NULL}, + {1, "show hockey lines on local", &showHockeyLinesLocal, 0, 0, 0, NULL, NULL}, + {1, "show hockey lines on map", &showHockeyLinesMap, 0, 0, 0, NULL, NULL}, + {1, "show hockey score on map", &showHockeyScore, 0, 0, 0, NULL, NULL}, +#endif + {1, "done", ¬done, 0, 0, 0, NULL, NULL}, + {-1, NULL, 0, 0, 0, 0, NULL, NULL} +}; + struct option Save_Menu[] = { {0, "Save Menu", &MenuPage, 0, 0, 0, NULL, &Menus_Range}, {1, "Page %d (click to change)", &MenuPage, 0, 0, 0, NULL, &Menus_Range}, @@ -1018,6 +1028,7 @@ AddOptMenu (Visual_Menu, 0); AddOptMenu (Window_Menu, 0); AddOptMenu (Playerlist_Menu, 0); + AddOptMenu (Hockey_Menu, 0); AddOptMenu (Save_Menu, 0); Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.65 retrieving revision 1.66 diff -u -d -r1.65 -r1.66 --- data.c 15 Mar 2007 15:39:27 -0000 1.65 +++ data.c 15 Mar 2007 16:42:29 -0000 1.66 @@ -808,4 +808,9 @@ int soundMusicBkgd = 0; /* Play random background music continuously */ int soundAngles = 0; /* Use 3D sound */ -int useFullShipInfo = 1; /* Prefer SP_PLAYER packets over SP_S_PLAYER packets */ \ No newline at end of file +int useFullShipInfo = 1; /* Prefer SP_PLAYER packets over SP_S_PLAYER packets */ +int headingTic = 1; /* show ship heading tic */ +int tractorID = 1; /* show ID of player you are tractoring */ +int lockLine = 1; /* draw dashed line on map from you to lock target */ +int weaponsOnMap = 1; /* draw weapons fire on map */ +int sortPlanets = 1; /* sort planet list by team and army count */ From modemhero at users.sourceforge.net Thu Mar 15 11:59:51 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Mar 2007 16:59:51 +0000 Subject: [netrek-cvs] client/netrekxp/src local.c,1.71,1.72 Message-ID: <20070315165959.DAA4C1867FB@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25797/src Modified Files: local.c Log Message: Adds tractorID functionality. Shows ship # of player you are tractor/pressoring underneath your ship. Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.71 retrieving revision 1.72 diff -u -d -r1.71 -r1.72 --- local.c 15 Mar 2007 15:39:27 -0000 1.71 +++ local.c 15 Mar 2007 16:59:49 -0000 1.72 @@ -1293,6 +1293,25 @@ clearzone[2][clearcount] = buflen * W_Textwidth; clearzone[3][clearcount] = W_Textheight; clearcount++; + + /* Tractor target ID */ + if (tractorID && (myPlayer(j) || isObsLockPlayer(j))) + { + if (j->p_flags & (PFTRACT | PFPRESS)) + { + idbuf[0] = *(shipnos + players[j->p_tractor].p_no); + buflen = 1; + W_MaskText (w, dx - (j->p_ship.s_width / 2), + dy + (j->p_ship.s_height / 2), + (j->p_flags & PFTRACT) ? gColor : yColor, + idbuf, buflen, shipFont (j)); + clearzone[0][clearcount] = dx - (j->p_ship.s_width / 2); + clearzone[1][clearcount] = dy + (j->p_ship.s_height / 2); + clearzone[2][clearcount] = buflen * W_Textwidth; + clearzone[3][clearcount] = W_Textheight; + clearcount++; + } + } } } From modemhero at users.sourceforge.net Thu Mar 15 11:59:51 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Mar 2007 16:59:51 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.129, 1.130 Message-ID: <20070315170000.0CC0BB407@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25797/resources/docs Modified Files: changes.txt Log Message: Adds tractorID functionality. Shows ship # of player you are tractor/pressoring underneath your ship. Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.129 retrieving revision 1.130 diff -u -d -r1.129 -r1.130 --- changes.txt 15 Mar 2007 15:39:26 -0000 1.129 +++ changes.txt 15 Mar 2007 16:59:49 -0000 1.130 @@ -1,4 +1,7 @@ Netrek XP 2006, Version 1.3: +- added "tractorID: (on)/off" to draw the player number of the person you are tractoring + or pressoring below and to the left of your ship. Continues to display who you are + tractor/pressoring even if they cloak. - added "puckArrow: (on)/off" option to draw a tic mark on the puck in hockey to indicate puck direction - several fixes to BRMH shrink phasers - they now can shrink on miss, and enemy phasers From modemhero at users.sourceforge.net Thu Mar 15 12:45:44 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Mar 2007 17:45:44 +0000 Subject: [netrek-cvs] client/netrekxp/src local.c,1.72,1.73 Message-ID: <20070315174553.C52B91867FF@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20903/src Modified Files: local.c Log Message: Apparently tractor flag is not cleared properly sometimes, so will have to go by pressor flag to determine color. Note that both dashboard and tractor line drawing always check pressor flag first, must be a longstanding issue. Monitoring player's flag showed that sometimes a pressoring ship is flagged as both PFTRACT and PFPRESS, but a tractoring ship is only flagged as PFTRACT. Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.72 retrieving revision 1.73 diff -u -d -r1.72 -r1.73 --- local.c 15 Mar 2007 16:59:49 -0000 1.72 +++ local.c 15 Mar 2007 17:45:42 -0000 1.73 @@ -1303,7 +1303,7 @@ buflen = 1; W_MaskText (w, dx - (j->p_ship.s_width / 2), dy + (j->p_ship.s_height / 2), - (j->p_flags & PFTRACT) ? gColor : yColor, + (j->p_flags & PFPRESS) ? yColor : gColor, idbuf, buflen, shipFont (j)); clearzone[0][clearcount] = dx - (j->p_ship.s_width / 2); clearzone[1][clearcount] = dy + (j->p_ship.s_height / 2); From modemhero at users.sourceforge.net Thu Mar 15 14:09:50 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Mar 2007 19:09:50 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.130, 1.131 Message-ID: <20070315191001.2EBEAB3F6@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27696/resources/docs Modified Files: changes.txt Log Message: Added lockLine functionality. The line gets drawn like a single tractor line. It is cleared similarly. Since the line can span the entire galactic and can overwrite many planets along the way, several checkRedraw calls are made using evenly spaced points along the length of the lockLine. The # of points checked was arbitrarily chosen at 10, as this number seemed to work fine even at long distances. Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.130 retrieving revision 1.131 diff -u -d -r1.130 -r1.131 --- changes.txt 15 Mar 2007 16:59:49 -0000 1.130 +++ changes.txt 15 Mar 2007 19:09:48 -0000 1.131 @@ -1,4 +1,6 @@ Netrek XP 2006, Version 1.3: +- added "lockLine: (on)/off" to draw a dashed green line on the galactic map between your + ship and the target you are locked on to, whether it be a player or a planet. - added "tractorID: (on)/off" to draw the player number of the person you are tractoring or pressoring below and to the left of your ship. Continues to display who you are tractor/pressoring even if they cloak. From modemhero at users.sourceforge.net Thu Mar 15 14:09:50 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Mar 2007 19:09:50 +0000 Subject: [netrek-cvs] client/netrekxp/src map.c,1.27,1.28 Message-ID: <20070315191001.2CABB1867F4@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27696/src Modified Files: map.c Log Message: Added lockLine functionality. The line gets drawn like a single tractor line. It is cleared similarly. Since the line can span the entire galactic and can overwrite many planets along the way, several checkRedraw calls are made using evenly spaced points along the length of the lockLine. The # of points checked was arbitrarily chosen at 10, as this number seemed to work fine even at long distances. Index: map.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- map.c 14 Mar 2007 15:37:21 -0000 1.27 +++ map.c 15 Mar 2007 19:09:48 -0000 1.28 @@ -54,7 +54,7 @@ static signed char roughMap3[DETAIL][DETAIL]; static signed char roughMap4[DETAIL][DETAIL]; static int initialized = 0; - +static int maplockline[4]; /* Coordinates for lock line on map */ /* * Global Variables: @@ -767,6 +767,7 @@ register int dx, dy; static char clearlock = 0; + static char clearlockline = 0; static int mclearzone[6][MAXPLAYER]; static int clearlmark[4]; static unsigned int lastRedraw[MAXPLAYER]; @@ -805,6 +806,7 @@ W_ClearWindow (mapw); clearlock = 0; + clearlockline = 0; clearviewbox = 0; viewboxcleared = 1; @@ -829,6 +831,13 @@ clearlmark[2], clearlmark[3], backColor); } + if (clearlockline) + { + W_MakeTractLine (mapw, maplockline[0], maplockline[1], + maplockline[2], maplockline[3], backColor); + clearlockline = 0; + } + if (clearviewbox) { clearviewbox = 0; @@ -1017,10 +1026,11 @@ { j = &players[me->p_playerl]; + dx = j->p_x * WINSIDE / GWIDTH; + dy = j->p_y * WINSIDE / GWIDTH; + if (j->p_status == PALIVE && !(j->p_flags & PFCLOAK)) { - dx = j->p_x * WINSIDE / GWIDTH; - dy = j->p_y * WINSIDE / GWIDTH; W_WriteTriangle (mapw, dx, dy + 6, 4, 1, foreColor); clearlmark[0] = dx; @@ -1029,6 +1039,26 @@ clearlmark[3] = 1; clearlock = 1; } + if (lockLine && (dx <= view && dx >= 0 && dy <= view && dy >= 0)) + { + int mydx, mydy; + + mydx = me->p_x * WINSIDE / GWIDTH; + mydy = me->p_y * WINSIDE / GWIDTH; + W_MakeTractLine (mapw, + mydx, + mydy, + dx, dy, W_Green); + maplockline[0] = mydx; + maplockline[1] = mydy; + maplockline[2] = dx; + maplockline[3] = dy; + clearlockline = 1; + /* Check 10 points in between start and end of line for planet overlap */ + for (i = 0; i < 10; i++) + checkRedraw(me->p_x + i * (j->p_x - me->p_x)/10, + me->p_y + i * (j->p_y - me->p_y)/10); + } } else if ((me->p_flags & PFPLLOCK) && (showLock & 1)) { @@ -1043,6 +1073,27 @@ clearlmark[2] = 4; clearlmark[3] = 0; clearlock = 1; + + if (lockLine) + { + int mydx, mydy; + + mydx = me->p_x * WINSIDE / GWIDTH; + mydy = me->p_y * WINSIDE / GWIDTH; + W_MakeTractLine (mapw, + mydx, + mydy, + dx, dy, W_Green); + maplockline[0] = mydx; + maplockline[1] = mydy; + maplockline[2] = dx; + maplockline[3] = dy; + clearlockline = 1; + /* Check 10 points in between start and end of line for planet overlap */ + for (i = 0; i < 10; i++) + checkRedraw(me->p_x + i * (l->pl_x - me->p_x)/10, + me->p_y + i * (l->pl_y - me->p_y)/10); + } } #ifdef RECORDGAME From modemhero at users.sourceforge.net Thu Mar 15 15:49:36 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Mar 2007 20:49:36 +0000 Subject: [netrek-cvs] client/netrekxp/include defs.h,1.14,1.15 Message-ID: <20070315204947.240A9B40A@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv5643/include Modified Files: defs.h Log Message: Added headingTic functionality. A white tic is drawn at some distance from your ship, indicating your heading. A smaller tic is drawn indicating your desired heading, or in the case that you are locked onto a target, indicating the direction to that target. Previously unused p_desdir variable now being used for these calculations. This smaller tic is white, except for the case of player/planet lock, in which case the tic is green. Index: defs.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/defs.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- defs.h 15 Mar 2007 15:39:26 -0000 1.14 +++ defs.h 15 Mar 2007 20:49:33 -0000 1.15 @@ -46,6 +46,10 @@ * engage/disengage */ #define NUMRANKS 9 #define PUCKARROW_LEN 6 +#define TIC_DIST 5000 /* distance from ship to draw + * heading tic mark */ +#define TIC_LEN 20 /* for current heading */ +#define DESIRED_TIC_LEN 10 /* for desired heading */ /* These are configuration definitions */ From modemhero at users.sourceforge.net Thu Mar 15 15:49:36 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Mar 2007 20:49:36 +0000 Subject: [netrek-cvs] client/netrekxp/src interface.c, 1.2, 1.3 local.c, 1.73, 1.74 Message-ID: <20070315204947.1AE441867F4@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv5643/src Modified Files: interface.c local.c Log Message: Added headingTic functionality. A white tic is drawn at some distance from your ship, indicating your heading. A smaller tic is drawn indicating your desired heading, or in the case that you are locked onto a target, indicating the direction to that target. Previously unused p_desdir variable now being used for these calculations. This smaller tic is white, except for the case of player/planet lock, in which case the tic is green. Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.73 retrieving revision 1.74 diff -u -d -r1.73 -r1.74 --- local.c 15 Mar 2007 17:45:42 -0000 1.73 +++ local.c 15 Mar 2007 20:49:34 -0000 1.74 @@ -667,6 +667,7 @@ const int view = SCALE * WINSIDE / 2 + BMP_SHIELD_WIDTH * SCALE / 2; int dx, dy, px, py, wx, wy, tx, ty, lx, ly; int new_dx, new_dy; + int startx, starty, endx, endy; W_Icon (*ship_bits)[SHIP_VIEWS]; W_Icon (*ship_bitsHR); @@ -1166,6 +1167,53 @@ showdetCircle--; } } + /* Self tic heading */ + if (headingTic) + { + if (myPlayer(j)) + { + startx = dx + (int) (TIC_DIST/SCALE * Cos[j->p_dir]); + starty = dy + (int) (TIC_DIST/SCALE * Sin[j->p_dir]); + endx = startx + (int) (TIC_LEN * Cos[j->p_dir]); + endy = starty + (int) (TIC_LEN * Sin[j->p_dir]); + + W_MakeLine(w, startx, starty, endx, endy, W_White); + clearline[0][clearlcount] = startx; + clearline[1][clearlcount] = starty; + clearline[2][clearlcount] = endx; + clearline[3][clearlcount] = endy; + clearlcount++; + + /* Update desired heading if locked, in a similiar way + to how the server sets our heading */ + if (j->p_flags & PFPLOCK) + { + j->p_desdir = (int) (atan2(players[j->p_playerl].p_x - me->p_x, + j->p_y - players[j->p_playerl].p_y) / XPI * 128.); + } + else if (j->p_flags & PFPLLOCK) + { + j->p_desdir = (int) (atan2(planets[j->p_planet].pl_x - me->p_x, + j->p_y - planets[j->p_planet].pl_y) / XPI * 128.); + } + + if (j->p_dir != j->p_desdir && !(j->p_flags & (PFORBIT | PFDOCK))) + { + startx = dx + (int) (TIC_DIST/SCALE * Cos[j->p_desdir]); + starty = dy + (int) (TIC_DIST/SCALE * Sin[j->p_desdir]); + endx = startx + (int) (DESIRED_TIC_LEN * Cos[j->p_desdir]); + endy = starty + (int) (DESIRED_TIC_LEN * Sin[j->p_desdir]); + + W_MakeLine(w, startx, starty, endx, endy, + (j->p_flags & (PFPLOCK | PFPLLOCK)) ? W_Green : W_White); + clearline[0][clearlcount] = startx; + clearline[1][clearlcount] = starty; + clearline[2][clearlcount] = endx; + clearline[3][clearlcount] = endy; + clearlcount++; + } + } + } #ifdef HOCKEY_LINES /* Puck circle */ if (puckCircle && playing_hockey) @@ -1180,7 +1228,7 @@ clearcount++; } } - /* Puck tick heading */ + /* Puck tic heading */ if (puckArrow && playing_hockey && j->p_speed != 0 && strcmp(j->p_name, "Puck") == 0 && @@ -1188,8 +1236,6 @@ j->p_team == NOBODY && j->p_ship.s_type == SCOUT) { - int startx, starty, endx, endy; - startx = dx + (int) ((shield_width / 2) * Cos[j->p_dir]); starty = dy + (int) ((shield_width / 2) * Sin[j->p_dir]); endx = startx + (int) (PUCKARROW_LEN * Cos[j->p_dir]); Index: interface.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/interface.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- interface.c 7 May 2006 16:59:27 -0000 1.2 +++ interface.c 15 Mar 2007 20:49:34 -0000 1.3 @@ -42,6 +42,7 @@ void set_course (unsigned char dir) { + me->p_desdir = dir; sendDirReq (dir); } From modemhero at users.sourceforge.net Thu Mar 15 15:49:36 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Mar 2007 20:49:36 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.131, 1.132 Message-ID: <20070315204947.25F87B40B@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv5643/resources/docs Modified Files: changes.txt Log Message: Added headingTic functionality. A white tic is drawn at some distance from your ship, indicating your heading. A smaller tic is drawn indicating your desired heading, or in the case that you are locked onto a target, indicating the direction to that target. Previously unused p_desdir variable now being used for these calculations. This smaller tic is white, except for the case of player/planet lock, in which case the tic is green. Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.131 retrieving revision 1.132 diff -u -d -r1.131 -r1.132 --- changes.txt 15 Mar 2007 19:09:48 -0000 1.131 +++ changes.txt 15 Mar 2007 20:49:34 -0000 1.132 @@ -1,4 +1,8 @@ Netrek XP 2006, Version 1.3: +- added "headingTic: (on)/off" to draw a tick mark indicating your ship's heading, as well + as a smaller secondary mark indicating where you are turning to, or in the case of when + you are locked on to a player/planet, indicating the direction to that player/planet. + This option helps with aiming in hockey and hitting cloaked ships you are locked on to. - added "lockLine: (on)/off" to draw a dashed green line on the galactic map between your ship and the target you are locked on to, whether it be a player or a planet. - added "tractorID: (on)/off" to draw the player number of the person you are tractoring From modemhero at users.sourceforge.net Thu Mar 15 20:44:26 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 16 Mar 2007 01:44:26 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.132, 1.133 Message-ID: <20070316014436.C31AD18680D@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv1181/resources/docs Modified Files: changes.txt Log Message: Te planet list window can now be used with info, lock and certain RCDs. In other words, you can lock onto planets through the planet list window, and send planet-related RCDs through the window as well. Left clicking the planet list window will toggle between a sorted and unsorted planet list, right clicking will close the planet window. Team's starting planets are now separated by a white line. Sorting functionality to come in a later patch. Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.132 retrieving revision 1.133 diff -u -d -r1.132 -r1.133 --- changes.txt 15 Mar 2007 20:49:34 -0000 1.132 +++ changes.txt 16 Mar 2007 01:44:23 -0000 1.133 @@ -1,4 +1,10 @@ Netrek XP 2006, Version 1.3: +- the planet list window can now be used with info, lock and certain RCDs. In other words, + you can lock onto planets through the planet list window, and send planet-related RCDs + through the window as well. +- left clicking the planet list window will toggle between a sorted and unsorted planet + list, right clicking will close the planet window. Team's starting planets are now + separated by a white line. - added "headingTic: (on)/off" to draw a tick mark indicating your ship's heading, as well as a smaller secondary mark indicating where you are turning to, or in the case of when you are locked on to a player/planet, indicating the direction to that player/planet. From modemhero at users.sourceforge.net Thu Mar 15 20:44:26 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 16 Mar 2007 01:44:26 +0000 Subject: [netrek-cvs] client/netrekxp/include proto.h,1.38,1.39 Message-ID: <20070316014436.C0102186809@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv1181/include Modified Files: proto.h Log Message: Te planet list window can now be used with info, lock and certain RCDs. In other words, you can lock onto planets through the planet list window, and send planet-related RCDs through the window as well. Left clicking the planet list window will toggle between a sorted and unsorted planet list, right clicking will close the planet window. Team's starting planets are now separated by a white line. Sorting functionality to come in a later patch. Index: proto.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- proto.h 13 Mar 2007 18:34:59 -0000 1.38 +++ proto.h 16 Mar 2007 01:44:23 -0000 1.39 @@ -868,6 +868,7 @@ /******************************************************************************/ void planetlist (void); void updatePlanetw (void); +int GetPlanetFromPlist (int x, int y); /******************************************************************************/ /*** playback.c From modemhero at users.sourceforge.net Thu Mar 15 20:44:26 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 16 Mar 2007 01:44:26 +0000 Subject: [netrek-cvs] client/netrekxp/src input.c, 1.27, 1.28 planetlist.c, 1.4, 1.5 playerlist.c, 1.11, 1.12 util.c, 1.3, 1.4 Message-ID: <20070316014436.B5F2EB407@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv1181/src Modified Files: input.c planetlist.c playerlist.c util.c Log Message: Te planet list window can now be used with info, lock and certain RCDs. In other words, you can lock onto planets through the planet list window, and send planet-related RCDs through the window as well. Left clicking the planet list window will toggle between a sorted and unsorted planet list, right clicking will close the planet window. Team's starting planets are now separated by a white line. Sorting functionality to come in a later patch. Index: playerlist.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/playerlist.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- playerlist.c 14 Mar 2007 18:36:07 -0000 1.11 +++ playerlist.c 16 Mar 2007 01:44:24 -0000 1.12 @@ -1506,6 +1506,6 @@ } } - // We didn't find player or its state is wrong + // We didn't find player or its state is wrong return (-1); } \ No newline at end of file Index: util.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/util.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- util.c 7 May 2006 16:59:27 -0000 1.3 +++ util.c 16 Mar 2007 01:44:24 -0000 1.4 @@ -67,6 +67,17 @@ targ = &_targ; return (targ); } + if (ww == planetw) + { + /* Here we will get planet from planet list */ + static struct obtype _targ; + g_x = (x - 1) / W_Textwidth; + g_y = (y - 4) / W_Textheight - 2; // Two header lines + _targ.o_type = PLANETTYPE; + _targ.o_num = GetPlanetFromPlist (g_x, g_y); + targ = &_targ; + return (targ); + } if (ww == mapw) { Index: input.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/input.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- input.c 14 Mar 2007 18:36:07 -0000 1.27 +++ input.c 16 Mar 2007 01:44:24 -0000 1.28 @@ -1210,7 +1210,7 @@ * fastquit! */ if (data->Window != mapw && data->Window != w && data->Window != infow - && data->Window != playerw) + && data->Window != playerw && data->Window != planetw) return; key = data->key; @@ -1231,6 +1231,12 @@ data->x = x; data->y = y; } + else if (findMouseInWin (&x, &y, planetw)) + { /* planet list window */ + data->Window = planetw; + data->x = x; + data->y = y; + } else if (findMouseInWin (&x, &y, playerw)) { /* player list window */ data->Window = playerw; @@ -1386,9 +1392,9 @@ return; } - /* If the mouse is in player list window - enable info and lock */ - /* This part has to be after macros, so point macros will work on */ - /* the players from playerlist */ + /* If the mouse is in player list window - enable info and lock, as + well as certain RCDs. This part has to be after macros, so the RCDs + will work on the players from this list */ if (data->Window == playerw) { switch (key) @@ -1410,6 +1416,29 @@ return; } } + /* If the mouse is in planet list window - enable info and lock, as + well as certain RCDs. This part has to be after macros, so that RCDs + will work on the planets from this list */ + if (data->Window == planetw) + { + switch (key) + { + case 'i': + case 'I': + case 'l': + case 194: /* ^b */ + case 195: /* ^c */ + case 204: /* ^l */ + case 205: /* ^m */ + case 212: /* ^t */ + case 144: /* ^0 */ + case 145: /* ^1 */ + case 150: /* ^6 */ + break; + default: + return; + } + } #ifdef MOTION_MOUSE if ((data->type == W_EV_CM_BUTTON) && /* KOC - 10/18/95 */ @@ -1496,10 +1525,31 @@ #endif if (data->Window != w && data->Window != mapw - && data->Window != infow - && data->Window != playerw) + && data->Window != infow && data->Window != playerw + && data->Window != planetw) return; + if (data->Window == planetw) + { + int x, y; + + if (findMouseInWin (&x, &y, planetw)) + { + data->Window = planetw; + data->x = x; + data->y = y; + } + if (data->key == W_LBUTTON) + { + sortPlanets = !sortPlanets; + updatePlanetw(); + } + else if (data->key == W_RBUTTON) + W_UnmapWindow (planetw); + + return; + } + if (data->Window == playerw) { int x, y; Index: planetlist.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/planetlist.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- planetlist.c 12 Dec 2006 04:47:08 -0000 1.4 +++ planetlist.c 16 Mar 2007 01:44:24 -0000 1.5 @@ -32,6 +32,8 @@ "ORI" }; +int planet_row[MAXPLANETS]; /* planets location in current plist */ + /* * Open a window which contains all the planets and their current * * statistics. Players will not know about planets that their team * has not * orbited. */ @@ -42,8 +44,10 @@ char buf[BUFSIZ]; /* W_ClearWindow(planetw); */ - (void) sprintf (buf, "Planet Name own armies REPAIR FUEL AGRI CORE info"); + (void) sprintf (buf, "Planet Name Own Armies REPAIR FUEL AGRI CORE Info"); W_WriteText (planetw, 2, 1, textColor, buf, strlen (buf), W_RegularFont); + /* Underline heading */ + W_MakeLine (planetw, 2, 2 + 2 * W_Textheight, 2 + 57 * W_Textwidth , 2 + 2 * W_Textheight, W_White); /* Initialize planet window string array */ for (i = 0; i < MAXPLANETS; i++) strcpy(priorplanets[i], ""); @@ -60,6 +64,9 @@ for (i = 0, j = &planets[i]; i < MAXPLANETS; i++, j++) { + /* Fill planet_row to get right planet placement in the list */ + planet_row[i] = j->pl_no; + if (j->pl_info & me->p_team) { (void) sprintf (buf, "%-16s %3s %3d %6s %4s %4s %4s %c%c%c%c", @@ -93,5 +100,34 @@ strcpy(priorplanets[i], buf); } } + if (i != 0 && (i % 10) == 0) + { + W_MakeLine (planetw, + 2 + 18 * W_Textwidth, + 2 + W_Textheight * (i+2), + 2 + 39 * W_Textwidth, + 2 + W_Textheight * (i+2), + W_White); + } + } +} + +int +GetPlanetFromPlist (int x, int y) +{ + int i; + int planet_no; + + /* Let's find what planet sits in poition y in the list */ + for (i = 0; i < MAXPLANETS; i++) + { + if (planet_row[i] == y) + { + planet_no = i; + return planet_no; + } } + + // We didn't find planet + return (-1); } \ No newline at end of file From modemhero at users.sourceforge.net Thu Mar 15 20:44:25 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 16 Mar 2007 01:44:25 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.111, 1.112 clientr.suo, 1.101, 1.102 Message-ID: <20070316014436.DFB55186810@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv1181 Modified Files: NetrekXP to do list.C clientr.suo Log Message: Te planet list window can now be used with info, lock and certain RCDs. In other words, you can lock onto planets through the planet list window, and send planet-related RCDs through the window as well. Left clicking the planet list window will toggle between a sorted and unsorted planet list, right clicking will close the planet window. Team's starting planets are now separated by a white line. Sorting functionality to come in a later patch. Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.111 retrieving revision 1.112 diff -u -d -r1.111 -r1.112 --- NetrekXP to do list.C 11 Mar 2007 22:15:57 -0000 1.111 +++ NetrekXP to do list.C 16 Mar 2007 01:44:23 -0000 1.112 @@ -45,6 +45,7 @@ 10) sendto() error: 10049 on metaserver connect to a bad server, believe it's due to hostname not resolving. Should be fixed. 12) fix redraw for stationary ships with new planets +13) fix crash bug with %u macros via playerlist to non-visible players Stas's list: - color coded (?) and scrollable playerlist. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.101 retrieving revision 1.102 diff -u -d -r1.101 -r1.102 Binary files /tmp/cvsc1G59T and /tmp/cvs15lO0p differ From modemhero at users.sourceforge.net Fri Mar 16 12:24:18 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 16 Mar 2007 17:24:18 +0000 Subject: [netrek-cvs] client/netrekxp/src input.c, 1.28, 1.29 planetlist.c, 1.5, 1.6 senddist.c, 1.5, 1.6 Message-ID: <20070316172429.536ED1867FB@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv30771/src Modified Files: input.c planetlist.c senddist.c Log Message: Fix for macro crash bug with sending macros through the playerlist to enemies who were not visible. Added mapSort functionality. Separates planet list to show ind planets first, then your team's planets, then your largest enemy's planets, then your second largest enemy's planets, then the last remaining team, and finally the unknown planets. Also added separator lines to both the sorted and unsorted planet list. Separator lines occur at regular 10 planet intervals in the unsorted list, so as to show each team's original planets. In the sorted list, they appear as divisors between the current planet owners (rather than original owners). Index: input.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/input.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- input.c 16 Mar 2007 01:44:24 -0000 1.28 +++ input.c 16 Mar 2007 17:24:16 -0000 1.29 @@ -1542,7 +1542,9 @@ if (data->key == W_LBUTTON) { sortPlanets = !sortPlanets; - updatePlanetw(); + /* Do a full refresh */ + W_UnmapWindow (planetw); + W_MapWindow (planetw); } else if (data->key == W_RBUTTON) W_UnmapWindow (planetw); Index: senddist.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/senddist.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- senddist.c 28 May 2006 23:05:12 -0000 1.5 +++ senddist.c 16 Mar 2007 17:24:16 -0000 1.6 @@ -89,11 +89,11 @@ dist->preappend[0] = '\0'; dist->macroflag = 0; - /* If any of gettarget calls returned -1 -> meaning we are in playerlist - window trying to send distress to not available person */ - if (dist->tclose_pl == 255 || dist->tclose_en == 255 || - dist->tclose_fr == 255 || dist->tclose_j == 255) - dist->sender = 255; + /* If any of gettarget calls returned -1 -> meaning we are in playerlist + window trying to send distress to not available person */ + if (dist->tclose_pl == 255 || dist->tclose_en == 255 || + dist->tclose_fr == 255 || dist->tclose_j == 255) + dist->sender = 255; return (dist); } @@ -116,8 +116,8 @@ recip = me->p_team; dist = loaddistress (i, data); - if (dist->sender == 255) - return; + if (dist->sender == 255) + return; if (gen_distress) { @@ -193,6 +193,8 @@ pm = macro[mnum].string; dist = loaddistress (0, data); + if (dist->sender == 255) + return (0); len = makedistress (dist, cry, pm); if (len > 0) Index: planetlist.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/planetlist.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- planetlist.c 16 Mar 2007 01:44:24 -0000 1.5 +++ planetlist.c 16 Mar 2007 17:24:16 -0000 1.6 @@ -19,6 +19,7 @@ #include "proto.h" static char priorplanets[MAXPLANETS][BUFSIZ]; +int planet_row[MAXPLANETS]; /* planets location in current plist */ static char *teamname[9] = { "IND", @@ -32,8 +33,6 @@ "ORI" }; -int planet_row[MAXPLANETS]; /* planets location in current plist */ - /* * Open a window which contains all the planets and their current * * statistics. Players will not know about planets that their team * has not * orbited. */ @@ -58,14 +57,133 @@ void updatePlanetw (void) { - register int i; + register int i, pos; char buf[BUFSIZ]; register struct planet *j; + int planetCount[NUMTEAM + 2]; /* Ind Fed Rom Kli Ori Unknown */ + int planetOffset[NUMTEAM + 2]; + int counter[NUMTEAM + 2]; + int playercount = 0; + int largestteam = -1, nextlargestteam= -1; + int largestteamcount = -1, nextlargestteamcount = -1; + + if (sortPlanets) + { + /* Must first know how many planets we have info on, that belong to + our team, then the ones belonging to the other 3 teams, plus + independent. Order on planet list will be independent planets, + then our team, then the next largest team (player-wise), and + then the second-largest team (player-wise). */ + + /* Init arrays. Array position 0 will be always be independents, + array position 1 will always be my team, and final array position + will always be unknown planets */ + for (i = NUMTEAM + 1; i >= 0; --i) + { + planetCount[i] = 0; + planetOffset[i] = 0; + counter[i] = 0; + } + + /* Find the 2 largest teams enemy teams. Team bits suck. */ + for (i = 0; i < NUMTEAM; i++) + { + if (me->p_team == (1 << i)) + continue; + + playercount = realNumShips(1 << i); + if (playercount > largestteamcount) + { + nextlargestteam = largestteam; + nextlargestteamcount = largestteamcount; + largestteam = (1 << i); + largestteamcount = playercount; + } + else if (playercount > nextlargestteamcount) + { + nextlargestteam = (1 << i); + nextlargestteamcount = playercount; + } + } + /* Store # of visible planets from each team */ + for (i = 0, j = &planets[i]; i < MAXPLANETS; i++, j++) + { + if (j->pl_info & me->p_team) + { + if (j->pl_owner == 0) /* Independent */ + ++planetCount[0]; + else if (j->pl_owner == me->p_team) /* My team */ + ++planetCount[1]; + else if (j->pl_owner == largestteam) /* Largest enemy */ + ++planetCount[2]; + else if (j->pl_owner == nextlargestteam) /* Next largest enemy */ + ++planetCount[3]; + else /* Smallest enemy */ + ++planetCount[4]; + } + else + ++planetCount[5]; + } + /* Set the offsets */ + planetOffset[0] = 0; + planetOffset[1] = planetOffset[0] + planetCount[0]; + planetOffset[2] = planetOffset[1] + planetCount[1]; + planetOffset[3] = planetOffset[2] + planetCount[2]; + planetOffset[4] = planetOffset[3] + planetCount[3]; + planetOffset[5] = planetOffset[4] + planetCount[4]; + } +#if 0 /* Debug */ + LineToConsole("My team %d, Largest enemy %d, next %d\n", + remap[me->p_team], largestteam, nextlargestteam); + LineToConsole("Pl counts are %d %d %d %d %d\n", + planetCount[1],planetCount[2],planetCount[3],planetCount[4],planetCount[5]); + LineToConsole("Offsets are %d %d %d %d %d\n", + planetOffset[1],planetOffset[2],planetOffset[3],planetOffset[4],planetOffset[5]); +#endif for (i = 0, j = &planets[i]; i < MAXPLANETS; i++, j++) { + if (sortPlanets) + { + if (j->pl_info & me->p_team) + { + if (j->pl_owner == 0) /* Independent */ + { + pos = planetOffset[0] + counter[0]; + counter[0]++; + } + else if (j->pl_owner == me->p_team) /* My team */ + { + pos = planetOffset[1] + counter[1]; + counter[1]++; + } + else if (j->pl_owner == largestteam) /* Largest enemy */ + { + pos = planetOffset[2] + counter[2]; + counter[2]++; + } + else if (j->pl_owner == nextlargestteam) /* Next largest enemy */ + { + pos = planetOffset[3] + counter[3]; + counter[3]++; + } + else /* Smallest enemy */ + { + pos = planetOffset[4] + counter[4]; + counter[4]++; + } + } + else + { + pos = planetOffset[5] + counter[5]; + counter[5]++; + } + } + else + pos = i; + /* Fill planet_row to get right planet placement in the list */ - planet_row[i] = j->pl_no; + planet_row[pos] = j->pl_no; if (j->pl_info & me->p_team) { @@ -81,33 +199,64 @@ (j->pl_info & ROM ? 'R' : ' '), (j->pl_info & KLI ? 'K' : ' '), (j->pl_info & ORI ? 'O' : ' ')); - if (strcmp(priorplanets[i], buf)) - { - W_ClearArea (planetw, 2, i+2, 55, 1); - W_WriteText (planetw, 2, i+2, planetColor (j), buf, strlen (buf), - planetFont (j)); - strcpy(priorplanets[i], buf); - } } else - { (void) sprintf (buf, "%-16s", j->pl_name); - if (strcmp(priorplanets[i], buf)) - { - W_ClearArea (planetw, 2, i+2, 55, 1); - W_WriteText (planetw, 2, i+2, unColor, buf, strlen (buf), - W_RegularFont); - strcpy(priorplanets[i], buf); - } - } - if (i != 0 && (i % 10) == 0) + + if (strcmp(priorplanets[pos], buf)) { - W_MakeLine (planetw, - 2 + 18 * W_Textwidth, - 2 + W_Textheight * (i+2), - 2 + 39 * W_Textwidth, - 2 + W_Textheight * (i+2), - W_White); + W_ClearArea (planetw, 2, pos+2, 55, 1); + if (j->pl_info & me->p_team) + W_WriteText (planetw, 2, pos+2, planetColor (j), buf, strlen (buf), + planetFont (j)); + else + W_WriteText (planetw, 2, pos+2, unColor, buf, strlen (buf), + W_RegularFont); + strcpy(priorplanets[pos], buf); + /* Do we need to redraw a team separator line? */ + if (!sortPlanets) + { + /* Static line positions - only redraw them if the relevant + line changed */ + if (pos == 9 || pos == 19 || pos == 29) + { + W_MakeLine (planetw, + 2 + 18 * W_Textwidth, + 2 + W_Textheight * (pos+3), + 2 + 39 * W_Textwidth, + 2 + W_Textheight * (pos+3), + W_White); + } + } + else + { + /* Dynamic team separators, sorted map */ + if ((pos == planetOffset[1] - 1) + || (pos == (planetOffset[2] - 1)) + || (pos == (planetOffset[3] - 1)) + || (pos == (planetOffset[4] - 1)) + || (pos == (planetOffset[5] - 1))) + { + /* Erase any line above it first, if it was + part of the same team */ + if (pos != 0 && (planets[planet_row[pos]].pl_owner == + planets[planet_row[pos-1]].pl_owner)) + { + W_MakeLine (planetw, + 2 + 18 * W_Textwidth, + 2 + W_Textheight * (pos+2), + 2 + 39 * W_Textwidth, + 2 + W_Textheight * (pos+2), + W_Black); + } + W_MakeLine (planetw, + 2 + 18 * W_Textwidth, + 2 + W_Textheight * (pos+3), + 2 + 39 * W_Textwidth, + 2 + W_Textheight * (pos+3), + W_White); + } + } } } } @@ -115,19 +264,8 @@ int GetPlanetFromPlist (int x, int y) { - int i; - int planet_no; - - /* Let's find what planet sits in poition y in the list */ - for (i = 0; i < MAXPLANETS; i++) - { - if (planet_row[i] == y) - { - planet_no = i; - return planet_no; - } - } - - // We didn't find planet - return (-1); + if (y < MAXPLANETS && y >= 0) + return planet_row[y]; + else + return (-1); } \ No newline at end of file From modemhero at users.sourceforge.net Fri Mar 16 12:24:18 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 16 Mar 2007 17:24:18 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.133, 1.134 Message-ID: <20070316172429.51B67B402@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv30771/resources/docs Modified Files: changes.txt Log Message: Fix for macro crash bug with sending macros through the playerlist to enemies who were not visible. Added mapSort functionality. Separates planet list to show ind planets first, then your team's planets, then your largest enemy's planets, then your second largest enemy's planets, then the last remaining team, and finally the unknown planets. Also added separator lines to both the sorted and unsorted planet list. Separator lines occur at regular 10 planet intervals in the unsorted list, so as to show each team's original planets. In the sorted list, they appear as divisors between the current planet owners (rather than original owners). Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.133 retrieving revision 1.134 diff -u -d -r1.133 -r1.134 --- changes.txt 16 Mar 2007 01:44:23 -0000 1.133 +++ changes.txt 16 Mar 2007 17:24:16 -0000 1.134 @@ -1,4 +1,7 @@ Netrek XP 2006, Version 1.3: +- fixed macro crash bug with sending macros to invisible players on the playerlist +- added "mapSort: (on)/off" to sort the planet list, with your planets first, then the planets + of the other teams, starting with the team with the most players. - the planet list window can now be used with info, lock and certain RCDs. In other words, you can lock onto planets through the planet list window, and send planet-related RCDs through the window as well. From modemhero at users.sourceforge.net Fri Mar 16 23:46:26 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 17 Mar 2007 04:46:26 +0000 Subject: [netrek-cvs] client/netrekxp/src local.c,1.74,1.75 Message-ID: <20070318115903.B49AFB402@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27034/src Modified Files: local.c Log Message: Observer fixes for headingTic. Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.74 retrieving revision 1.75 diff -u -d -r1.74 -r1.75 --- local.c 15 Mar 2007 20:49:34 -0000 1.74 +++ local.c 17 Mar 2007 04:46:23 -0000 1.75 @@ -1170,7 +1170,7 @@ /* Self tic heading */ if (headingTic) { - if (myPlayer(j)) + if (myPlayer(j) || isObsLockPlayer(j)) { startx = dx + (int) (TIC_DIST/SCALE * Cos[j->p_dir]); starty = dy + (int) (TIC_DIST/SCALE * Sin[j->p_dir]); @@ -1197,7 +1197,7 @@ j->p_y - planets[j->p_planet].pl_y) / XPI * 128.); } - if (j->p_dir != j->p_desdir && !(j->p_flags & (PFORBIT | PFDOCK))) + if (j == me && j->p_dir != j->p_desdir && !(j->p_flags & (PFORBIT | PFDOCK | PFOBSERV))) { startx = dx + (int) (TIC_DIST/SCALE * Cos[j->p_desdir]); starty = dy + (int) (TIC_DIST/SCALE * Sin[j->p_desdir]); From modemhero at users.sourceforge.net Sat Mar 17 12:12:11 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 17 Mar 2007 17:12:11 +0000 Subject: [netrek-cvs] client/netrekxp/src map.c, 1.28, 1.29 mswindow.c, 1.46, 1.47 parsemeta.c, 1.36, 1.37 socket.c, 1.22, 1.23 sound.c, 1.35, 1.36 Message-ID: <20070318115852.C7FE3186809@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25602/src Modified Files: map.c mswindow.c parsemeta.c socket.c sound.c Log Message: Compile fixes picked up by VS6. Including a SDB free() fix that was causing exceptions, but only when running in debugger. Don't know why never caught this one before. Index: mswindow.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- mswindow.c 14 Mar 2007 23:24:09 -0000 1.46 +++ mswindow.c 17 Mar 2007 17:12:09 -0000 1.47 @@ -640,13 +640,11 @@ SelectObject (localSDB->mem_dc, localSDB->old_bmp); DeleteObject (localSDB->mem_bmp); ReleaseDC (((Window *)localSDB->window)->hwnd, localSDB->win_dc); - free (localSDB->window); free (localSDB); SelectObject (mapSDB->mem_dc, mapSDB->old_bmp); DeleteObject (mapSDB->mem_bmp); ReleaseDC (((Window *)mapSDB->window)->hwnd, mapSDB->win_dc); - free (mapSDB->window); free (mapSDB); //WinKey Kill Library Stop Index: sound.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/sound.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- sound.c 15 Mar 2007 01:44:33 -0000 1.35 +++ sound.c 17 Mar 2007 17:12:09 -0000 1.36 @@ -321,7 +321,7 @@ if (angle >= 0) { // Adjust volume with distance and angle - if (Mix_SetPosition(channel, angle, distance) == 0) + if (Mix_SetPosition(channel, (char) angle, (char) distance) == 0) { LineToConsole("Mix_SetPosition: %s\n", Mix_GetError()); return; @@ -330,7 +330,7 @@ else { // Adjust volume with distance - if (Mix_SetDistance(channel, distance) == 0) + if (Mix_SetDistance(channel, (char) distance) == 0) { LineToConsole("Mix_SetDistance: %s\n", Mix_GetError()); return; Index: socket.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/socket.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- socket.c 1 Mar 2007 07:35:45 -0000 1.22 +++ socket.c 17 Mar 2007 17:12:09 -0000 1.23 @@ -3472,7 +3472,7 @@ ((struct you_spacket *) packet)->hostile, ((struct you_spacket *) packet)->swar, ((struct you_spacket *) packet)->armies, - ntohs(((struct you_spacket *) packet)->flags), + ntohl(((struct you_spacket *) packet)->flags), ntohl(((struct you_spacket *) packet)->damage), ntohl(((struct you_spacket *) packet)->shield), ntohl(((struct you_spacket *) packet)->fuel), Index: parsemeta.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/parsemeta.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- parsemeta.c 11 Mar 2007 22:15:58 -0000 1.36 +++ parsemeta.c 17 Mar 2007 17:12:09 -0000 1.37 @@ -373,7 +373,7 @@ /* send request to a multicast metaserver on local area network */ address.sin_family = AF_INET; - address.sin_port = htons(metaPort); + address.sin_port = htons((u_short) metaPort); address.sin_addr.s_addr = inet_addr("224.0.0.1"); if (metaVerbose) LineToConsole ("Requesting player list from nearby servers on %s\n", @@ -392,7 +392,7 @@ while (token != NULL) { /* compose the address structure */ address.sin_family = AF_INET; - address.sin_port = htons(metaPort); + address.sin_port = htons((u_short) metaPort); /* skip any blanks */ while (*token == ' ') token++; Index: map.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- map.c 15 Mar 2007 19:09:48 -0000 1.28 +++ map.c 17 Mar 2007 17:12:09 -0000 1.29 @@ -879,7 +879,7 @@ lastRedraw[i] = 0; } - if (lastRedraw[i] == server_ups) + if (lastRedraw[i] == (u_int) server_ups) { /* Redraw stationary ships every update so that these ships are not hidden by planet updates. */ From modemhero at users.sourceforge.net Fri Mar 16 22:05:46 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 17 Mar 2007 03:05:46 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.135, 1.136 Message-ID: <20070318125913.C9008186809@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv19013/resources/docs Modified Files: changes.txt Log Message: Don't unmap planet window on death. Safety check against missing high res ship bitmaps. Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.135 retrieving revision 1.136 diff -u -d -r1.135 -r1.136 --- changes.txt 17 Mar 2007 01:21:48 -0000 1.135 +++ changes.txt 17 Mar 2007 03:05:43 -0000 1.136 @@ -1,4 +1,5 @@ Netrek XP 2006, Version 1.3: +- planet window no longer gets unmapped on death - fixed macro crash bug with sending macros to invisible players on the playerlist - added "mapSort: (on)/off" to sort the planet list, with your planets first, then the planets of the other teams, starting with the team with the most players. Within a team, planets From modemhero at users.sourceforge.net Fri Mar 16 22:05:46 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 17 Mar 2007 03:05:46 +0000 Subject: [netrek-cvs] client/netrekxp/src death.c, 1.16, 1.17 newwin.c, 1.54, 1.55 Message-ID: <20070318125905.11664186811@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv19013/src Modified Files: death.c newwin.c Log Message: Don't unmap planet window on death. Safety check against missing high res ship bitmaps. Index: death.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/death.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- death.c 13 Mar 2007 22:31:17 -0000 1.16 +++ death.c 17 Mar 2007 03:05:44 -0000 1.17 @@ -76,7 +76,7 @@ } if (infomapped) destroyInfo (); - W_UnmapWindow (planetw); +// W_UnmapWindow (planetw); W_UnmapWindow (rankw); W_UnmapWindow (war); if (optionWin) Index: newwin.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- newwin.c 15 Mar 2007 04:34:44 -0000 1.54 +++ newwin.c 17 Mar 2007 03:05:44 -0000 1.55 @@ -464,8 +464,13 @@ BMP_SHIP_HEIGHT_HR, BMP_ROM_SHIP, w, LR_DEFAULTCOLOR); } - else // No bitmaps, doh! + else // No bitmaps, doh! Force to mono and don't allow swapping + { + LineToConsole("Failed to load high res ship bitmaps, defaulting to mono.\n"); + dynamicBitmaps = 0; + colorClient = 0; return; + } for (j = 0; j < NUM_TYPES; j++) { From modemhero at users.sourceforge.net Sat Mar 17 12:12:11 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 17 Mar 2007 17:12:11 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo,1.103,1.104 Message-ID: <20070318125922.4B07A186809@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25602 Modified Files: clientr.suo Log Message: Compile fixes picked up by VS6. Including a SDB free() fix that was causing exceptions, but only when running in debugger. Don't know why never caught this one before. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.103 retrieving revision 1.104 diff -u -d -r1.103 -r1.104 Binary files /tmp/cvsVNSlXO and /tmp/cvsQeQFQb differ From modemhero at users.sourceforge.net Sat Mar 17 18:16:21 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 17 Mar 2007 23:16:21 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.138, 1.139 Message-ID: <20070318125903.05E16B3FA@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv18239/resources/docs Modified Files: changes.txt Log Message: Added ability to change buttonmap via options menu Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.138 retrieving revision 1.139 diff -u -d -r1.138 -r1.139 --- changes.txt 17 Mar 2007 22:40:05 -0000 1.138 +++ changes.txt 17 Mar 2007 23:16:18 -0000 1.139 @@ -1,4 +1,5 @@ Netrek XP 2006, Version 1.3: +- added ability to update buttonmap through the options menu - added "weaponsOnMap: (on)/off" to show torps, plasmas and phasers on the galactic map. Currently server only shows weapons fire within local window, but perhaps in the future it will show all weapons for observers. From modemhero at users.sourceforge.net Sat Mar 17 18:16:21 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 17 Mar 2007 23:16:21 +0000 Subject: [netrek-cvs] client/netrekxp/src option.c,1.37,1.38 Message-ID: <20070318125903.0DC7E186809@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv18239/src Modified Files: option.c Log Message: Added ability to change buttonmap via options menu Index: option.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- option.c 17 Mar 2007 22:40:06 -0000 1.37 +++ option.c 17 Mar 2007 23:16:19 -0000 1.38 @@ -26,6 +26,7 @@ int notdone; /* not done flag */ static char newkeys[14]; +static char newbuttons[10]; char *localmes[] = { "Show owner on local planets", "Show resources on local planets", @@ -322,6 +323,7 @@ #endif {1, "allow wheel actions", &allowWheelActions, 0, 0, 0, NULL, NULL}, {1, "new keymap entries: %s", 0, 0, newkeys, 13, NULL, NULL}, + {1, "new buttonmap entries: %s", 0, 0, newbuttons, 9, NULL, NULL}, {1, "ignore the capslock key", &ignoreCaps, 0, 0, 0, NULL, NULL}, {1, "%d updates per second", &updatesPerSec, 0, 0, 0, 0, &updates_range}, {1, "%d 1/10 sec screen refresh delay", &redrawDelay, 0, 0, 0, 0, @@ -457,6 +459,7 @@ notdone = 1; *newkeys = '\0'; + *newbuttons = '\0'; if (FirstMenu == NULL) { MaxOptions = InitOptionMenus (); @@ -1010,6 +1013,93 @@ } *newkeys = '\0'; + /* update buttonmap */ + str = newbuttons; + while (*str != '\0' && *(str + 1) != '\0') + { + switch (*str++) + { + case '1': + buttonmap[1] = getctrlkey (&str); + break; + case '2': + buttonmap[2] = getctrlkey (&str); + break; + case '3': + buttonmap[3] = getctrlkey (&str); + break; + /* XButton 1 */ + case '4': + buttonmap[4] = getctrlkey (&str); + break; + /* XButton 2 */ + case '5': + buttonmap[5] = getctrlkey (&str); + break; + /* Wheel Up */ + case '6': + buttonmap[6] = getctrlkey (&str); + break; + /* Wheel Down */ + case '7': + buttonmap[7] = getctrlkey (&str); + break; + +#ifdef SHIFTED_MOUSE + case '8': + buttonmap[8] = getctrlkey (&str); + break; + case '9': + buttonmap[9] = getctrlkey (&str); + break; + case 'a': + buttonmap[10] = getctrlkey (&str); + break; + case 'b': + buttonmap[11] = getctrlkey (&str); + break; + case 'c': + buttonmap[12] = getctrlkey (&str); + break; + case 'd': + buttonmap[13] = getctrlkey (&str); + break; + case 'e': + buttonmap[14] = getctrlkey (&str); + break; + case 'f': + buttonmap[15] = getctrlkey (&str); + break; + case 'g': + buttonmap[16] = getctrlkey (&str); + break; + case 'h': + buttonmap[17] = getctrlkey (&str); + break; + case 'i': + buttonmap[18] = getctrlkey (&str); + break; + case 'j': + buttonmap[19] = getctrlkey (&str); + break; + case 'k': + buttonmap[20] = getctrlkey (&str); + break; + case 'l': + buttonmap[21] = getctrlkey (&str); + break; + case 'm': + buttonmap[22] = getctrlkey (&str); + break; +#endif /* SHIFTED_MOUSE */ + + default: + LineToConsole ("%c ignored in buttonmap\n", *(str - 1)); + break; + } + } + *newbuttons = '\0'; + if (updatesPerSec != lastUpdateSpeed) { sendUpdatePacket (1000000 / updatesPerSec); From modemhero at users.sourceforge.net Sat Mar 17 17:40:08 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 17 Mar 2007 22:40:08 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.137, 1.138 Message-ID: <20070318233241.61AEDB3FA@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv32534/resources/docs Modified Files: changes.txt Log Message: Adds weaponsOnMap functionality. Mirrors how xsg handles weapons, though also adds support for plasmas and torp/plasma explosions. Sets up clearzones similiar to how local() does it. Also adds several checkRedraw() checks so planets don't get overwritten. Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.137 retrieving revision 1.138 diff -u -d -r1.137 -r1.138 --- changes.txt 17 Mar 2007 08:03:07 -0000 1.137 +++ changes.txt 17 Mar 2007 22:40:05 -0000 1.138 @@ -1,4 +1,7 @@ Netrek XP 2006, Version 1.3: +- added "weaponsOnMap: (on)/off" to show torps, plasmas and phasers on the galactic map. + Currently server only shows weapons fire within local window, but perhaps in the future + it will show all weapons for observers. - new Options menus for Hockey and Weapons - planet window no longer gets unmapped on death - fixed macro crash bug with sending macros to invisible players on the playerlist From modemhero at users.sourceforge.net Sat Mar 17 20:46:51 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 18 Mar 2007 01:46:51 +0000 Subject: [netrek-cvs] client/netrekxp/include data.h, 1.61, 1.62 sound.h, 1.18, 1.19 Message-ID: <20070318233145.D61B91867E6@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20937/include Modified Files: data.h sound.h Log Message: Removed unused engine.wav. Bug fix for phaser fuse, fuse = 0 was removed in a previous patch, this restores that, but (hopefully) in the proper location. Added support for server feature packet full_weapon_resolution, which allows observers to see all weapons. And lets you see your own torps beyond tactical as well. Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- data.h 15 Mar 2007 16:42:28 -0000 1.61 +++ data.h 18 Mar 2007 01:46:49 -0000 1.62 @@ -570,6 +570,7 @@ extern int F_show_all_tractors; extern int F_sp_generic_32; extern int F_full_direction_resolution; +extern int F_full_weapon_resolution; #ifdef RECORDGAME extern int F_many_self; Index: sound.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/sound.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- sound.h 15 Mar 2007 01:44:32 -0000 1.18 +++ sound.h 18 Mar 2007 01:46:49 -0000 1.19 @@ -26,7 +26,6 @@ enum { CLOAKED_WAV, - ENGINE_WAV, ENGINE_MELT_WAV, ENGINE_OK_WAV, ENTER_SHIP_WAV, From modemhero at users.sourceforge.net Sat Mar 17 03:03:10 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 17 Mar 2007 08:03:10 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.136, 1.137 Message-ID: <20070318233145.D5239B3FA@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv9066/resources/docs Modified Files: changes.txt Log Message: Move weapons options to new Weapons Menu. Compile fixes for Visual Studio 6. Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.136 retrieving revision 1.137 diff -u -d -r1.136 -r1.137 --- changes.txt 17 Mar 2007 03:05:43 -0000 1.136 +++ changes.txt 17 Mar 2007 08:03:07 -0000 1.137 @@ -1,4 +1,5 @@ Netrek XP 2006, Version 1.3: +- new Options menus for Hockey and Weapons - planet window no longer gets unmapped on death - fixed macro crash bug with sending macros to invisible players on the playerlist - added "mapSort: (on)/off" to sort the planet list, with your planets first, then the planets From modemhero at users.sourceforge.net Sun Mar 18 14:04:13 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 18 Mar 2007 19:04:13 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.141, 1.142 Message-ID: <20070318235446.D29731867E6@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13121/resources/docs Modified Files: changes.txt Log Message: Bug fix for redraw zone for stationary people near planets. Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.141 retrieving revision 1.142 diff -u -d -r1.141 -r1.142 --- changes.txt 18 Mar 2007 16:43:35 -0000 1.141 +++ changes.txt 18 Mar 2007 19:04:11 -0000 1.142 @@ -1,4 +1,6 @@ Netrek XP 2006, Version 1.3: +- fixed flicker experienced sometimes seen with stationary ships near a planet + on the galactic map - the old mono torps are now default. Big torps are nice and all, but I think there is a loss in dodging ability with the bigger torps. - added support for feature packet FULL_WEAPON_RESOLUTION, this means that observers From modemhero at users.sourceforge.net Sun Mar 18 11:43:37 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 18 Mar 2007 16:43:37 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.140, 1.141 netrekrc, 1.39, 1.40 netrekxp.doc, 1.12, 1.13 Message-ID: <20070318235529.9DE451867E6@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv18174/resources/docs Modified Files: changes.txt netrekrc netrekxp.doc Log Message: Colorweapons now default to off in netrekrc Fixed up team bitmaps graphics Updated credits Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- netrekrc 18 Mar 2007 01:46:49 -0000 1.39 +++ netrekrc 18 Mar 2007 16:43:35 -0000 1.40 @@ -72,7 +72,7 @@ colorfulPhasers: off # Use colored bitmaps for torps and plasmas -colorWeapons: on +colorWeapons: off # Show tractor/pressor after lock continueTractor: on Index: netrekxp.doc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekxp.doc,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- netrekxp.doc 8 Feb 2007 00:39:19 -0000 1.12 +++ netrekxp.doc 18 Mar 2007 16:43:35 -0000 1.13 @@ -70,6 +70,9 @@ Jonathan Shekter Steve Sheldon Stas Pirogov + James Cameron + Joe Evango + Pascal Gagnon 3.0 Features Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.140 retrieving revision 1.141 diff -u -d -r1.140 -r1.141 --- changes.txt 18 Mar 2007 01:46:49 -0000 1.140 +++ changes.txt 18 Mar 2007 16:43:35 -0000 1.141 @@ -1,4 +1,6 @@ Netrek XP 2006, Version 1.3: +- the old mono torps are now default. Big torps are nice and all, but I think + there is a loss in dodging ability with the bigger torps. - added support for feature packet FULL_WEAPON_RESOLUTION, this means that observers can see all weapons on the galaxy map, yay! It also means you can see your torps on the galaxy map beyond your tactical range (good for plinking). From modemhero at users.sourceforge.net Sat Mar 17 17:40:08 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 17 Mar 2007 22:40:08 +0000 Subject: [netrek-cvs] client/netrekxp/include proto.h,1.39,1.40 Message-ID: <20070319000247.8FF9B1867E6@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv32534/include Modified Files: proto.h Log Message: Adds weaponsOnMap functionality. Mirrors how xsg handles weapons, though also adds support for plasmas and torp/plasma explosions. Sets up clearzones similiar to how local() does it. Also adds several checkRedraw() checks so planets don't get overwritten. Index: proto.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- proto.h 16 Mar 2007 01:44:23 -0000 1.39 +++ proto.h 17 Mar 2007 22:40:02 -0000 1.40 @@ -457,7 +457,8 @@ static inline void mplanetResourcesC (register struct planet *p, int destwidth, int destheight, int dx, int dy, W_Window window); //static void DrawPlanets(); -void map (void); +inline void map (void); +inline void clearMap (void); /******************************************************************************/ /*** mswindow.c From modemhero at users.sourceforge.net Sat Mar 17 17:40:08 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 17 Mar 2007 22:40:08 +0000 Subject: [netrek-cvs] client/netrekxp/src local.c, 1.75, 1.76 map.c, 1.29, 1.30 option.c, 1.36, 1.37 Message-ID: <20070319000148.6C295B3FA@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv32534/src Modified Files: local.c map.c option.c Log Message: Adds weaponsOnMap functionality. Mirrors how xsg handles weapons, though also adds support for plasmas and torp/plasma explosions. Sets up clearzones similiar to how local() does it. Also adds several checkRedraw() checks so planets don't get overwritten. Index: map.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- map.c 17 Mar 2007 17:12:09 -0000 1.29 +++ map.c 17 Mar 2007 22:40:06 -0000 1.30 @@ -55,6 +55,12 @@ static signed char roughMap4[DETAIL][DETAIL]; static int initialized = 0; static int maplockline[4]; /* Coordinates for lock line on map */ +static int mclearlcount; /* For phasers */ +static int mclearline[4][MAXPLAYER + 2 * MAXPLAYER]; +static int mclearpcount; /* For torps */ +static int mclearpoint[2][(MAXTORP + 1) * MAXPLAYER]; +static int mclearacount; /* For torp explosions, plasmas, and plasma explosions */ +static int mcleararea[4][(MAXTORP + 1) * MAXPLAYER + (MAXPLASMA + 1) * MAXPLAYER]; /* * Global Variables: @@ -755,7 +761,7 @@ /******************************************************************************/ /*** map() /******************************************************************************/ -void +inline void map (void) /* * Update the 'galactic' map. @@ -786,6 +792,7 @@ if (doubleBuffering) W_Win2Mem (mapSDB); #endif + clearMap (); dx = (me->p_x) / (GWIDTH / WINSIDE); dy = (me->p_y) / (GWIDTH / WINSIDE); @@ -1020,6 +1027,132 @@ #endif } + /* Draw weapons */ + if (weaponsOnMap) + { + register int h; + register struct phaser *ph; + register struct torp *k; + register struct plasmatorp *pt; + int tx, ty; + + for (i = 0, j = &players[i]; i < MAXPLAYER; i++, j++) + { + if (j->p_status == PFREE) + continue; + + dx = j->p_x * WINSIDE / GWIDTH; + dy = j->p_y * WINSIDE / GWIDTH; + + /* phasers */ + ph = &phasers[j->p_no]; + if (ph->ph_status != PHFREE && + (j->p_status == PALIVE || j->p_status == PEXPLODE || j->p_status == PDEAD)) + { + switch(ph->ph_status) + { + case PHMISS: + /* Here I will have to compute end coordinate */ + tx = (int) (j->p_x + PHASEDIST * j->p_ship.s_phaserdamage / 100 + * Cos[ph->ph_dir]) * WINSIDE / GWIDTH; + ty = (int) (j->p_y + PHASEDIST * j->p_ship.s_phaserdamage / 100 + * Sin[ph->ph_dir]) * WINSIDE / GWIDTH; + break; + case PHHIT2: + tx = ph->ph_x * WINSIDE / GWIDTH; + ty = ph->ph_y * WINSIDE / GWIDTH; + break; + default: + tx = players[ph->ph_target].p_x * WINSIDE / GWIDTH; + ty = players[ph->ph_target].p_y * WINSIDE / GWIDTH; + break; + } + W_MakeLine(mapw, dx, dy, tx, ty, phaserColor(ph)); + mclearline[0][mclearlcount] = dx; + mclearline[1][mclearlcount] = dy; + mclearline[2][mclearlcount] = tx; + mclearline[3][mclearlcount] = ty; + mclearlcount++; + /* Check for overwriting planets, corrected from view scale*/ + checkRedraw(j->p_x, j->p_y); + checkRedraw(tx * (GWIDTH / WINSIDE), ty * (GWIDTH / WINSIDE)); + } + + if (!j->p_ntorp && !j->p_nplasmatorp) + continue; + + /* torps */ + for (h = 0, k = &torps[MAXTORP * i + h]; h < MAXTORP; h++, k++) + { + if (!k->t_status) + continue; + if (k->t_x < 0 || k->t_y < 0) + continue; + dx = k->t_x * WINSIDE / GWIDTH; + dy = k->t_y * WINSIDE / GWIDTH; + + if (k->t_status == TEXPLODE) + { + /* Use frame 0 (smallest) to limit size of torp explosions + on the galactic */ + W_WriteBitmap (dx - (BMP_TORPDET_WIDTH / 2), dy - (BMP_TORPDET_HEIGHT / 2), + cloud[0], torpColor (k), mapw); + mcleararea[0][mclearacount] = dx - (BMP_TORPDET_WIDTH / 2); + mcleararea[1][mclearacount] = dy - (BMP_TORPDET_HEIGHT / 2); + mcleararea[2][mclearacount] = BMP_TORPDET_WIDTH; + mcleararea[3][mclearacount] = BMP_TORPDET_HEIGHT; + mclearacount++; + } + else + { + W_MakePoint(mapw, dx, dy, torpColor (k)); + mclearpoint[0][mclearpcount] = dx; + mclearpoint[1][mclearpcount] = dy; + mclearpcount++; + } + /* Check for overwriting planets */ + checkRedraw(k->t_x, k->t_y); + } + + /* plasmas */ + for (h = 0, pt = &plasmatorps[MAXPLASMA * i + h]; h < MAXPLASMA; h++, pt++) + { + if (!pt->pt_status) + continue; + if (pt->pt_x < 0 || pt->pt_y < 0) + continue; + dx = pt->pt_x * WINSIDE / GWIDTH; + dy = pt->pt_y * WINSIDE / GWIDTH; + + if (pt->pt_status == TEXPLODE) + { + /* Use frame 0 (smallest) of the TORP animations to limit size of plasma + explosions galactic. Plasma explosion bitmaps are just too big */ + W_WriteBitmap (dx - (BMP_TORPDET_WIDTH / 2), dy - (BMP_TORPDET_HEIGHT / 2), + cloud[0], plasmatorpColor (pt), mapw); + mcleararea[0][mclearacount] = dx - (BMP_TORPDET_WIDTH / 2); + mcleararea[1][mclearacount] = dy - (BMP_TORPDET_HEIGHT / 2); + mcleararea[2][mclearacount] = BMP_TORPDET_WIDTH; + mcleararea[3][mclearacount] = BMP_TORPDET_HEIGHT; + mclearacount++; + } + else + { + /* Draw plasmas as a 2x2 pixel torp */ + W_MakeLine(mapw, dx, dy, dx + 1, dy, plasmatorpColor (pt)); + W_MakeLine(mapw, dx, dy + 1, dx + 1, dy + 1, plasmatorpColor (pt)); + mcleararea[0][mclearacount] = dx; + mcleararea[1][mclearacount] = dy; + mcleararea[2][mclearacount] = 2; + mcleararea[3][mclearacount] = 2; + mclearacount++; + } + /* Check for overwriting planets */ + checkRedraw(pt->pt_x, pt->pt_y); + } + } + } + /* Draw the lock symbol (if needed) */ if ((me->p_flags & PFPLOCK) && (showLock & 1)) @@ -1103,4 +1236,27 @@ if (doubleBuffering) W_Mem2Win (mapSDB); #endif -} \ No newline at end of file +} + + +inline void +clearMap (void) +/* + Clear the weapons fire on the galactic map (intelligently rather than + just simply wiping the map). Similar to clearLocal(). +*/ +{ + int i; + + W_ClearAreas (mapw, mcleararea[0], mcleararea[1], mcleararea[2], + mcleararea[3], mclearacount); + mclearacount = 0; + + for (i = 0; i < mclearpcount; i++) + W_MakePoint (mapw, mclearpoint[0][i], mclearpoint[1][i], backColor); + mclearpcount = 0; + + W_MakeLines (mapw, mclearline[0], mclearline[1], mclearline[2], + mclearline[3], mclearlcount, backColor); + mclearlcount = 0; +} Index: option.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- option.c 17 Mar 2007 08:03:08 -0000 1.36 +++ option.c 17 Mar 2007 22:40:06 -0000 1.37 @@ -273,6 +273,7 @@ {0, "Weapons Menu", &MenuPage, 0, 0, 0, NULL, &Menus_Range}, {1, "Page %d (click to change)", &MenuPage, 0, 0, 0, NULL, &Menus_Range}, {1, "use color weapon bitmaps", &colorWeapons, 0, 0, 0, NULL, NULL}, + {1, "show weapons on galactic", &weaponsOnMap, 0, 0, 0, NULL, NULL}, #ifdef JUBILEE_PHASERS {1, "use colorful phasers", &colorfulPhasers, 0, 0, 0, NULL, NULL}, #endif @@ -295,7 +296,6 @@ {1, "rotate new planets", &rotatePlanets, 0, 0, 0, NULL, NULL}, {1, "show planet names on local", &showPlanetNames, 0, 0, 0, NULL, NULL}, {1, "show army count on orbit", &showArmy, 0, 0, 0, NULL, NULL}, - {1, "show weapons on galactic", &weaponsOnMap, 0, 0, 0, NULL, NULL}, {1, "show owner on galactic", &showPlanetOwner, 0, 0, 0, NULL, NULL}, {1, "show IND planets", &showIND, 0, 0, 0, NULL, NULL}, {1, "show AGRI in caps on map", &agriCAPS, 0, 0, 0, NULL, NULL}, Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.75 retrieving revision 1.76 diff -u -d -r1.75 -r1.76 --- local.c 17 Mar 2007 04:46:23 -0000 1.75 +++ local.c 17 Mar 2007 22:40:06 -0000 1.76 @@ -1949,9 +1949,9 @@ } else { - if (colorWeapons) - { - k->t_fuse++; + if (colorWeapons) + { + k->t_fuse++; frame = k->t_fuse * 10 / server_ups; @@ -1996,7 +1996,6 @@ dy - (BMP_CTORP_HEIGHT / 2), mtorpC[torpTeam][frame], torpColor (k), w); } - clearzone[0][clearcount] = dx - (BMP_CTORP_WIDTH / 2); clearzone[1][clearcount] = dy - (BMP_CTORP_HEIGHT / 2); clearzone[2][clearcount] = BMP_CTORP_WIDTH; From modemhero at users.sourceforge.net Sat Mar 17 20:46:51 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 18 Mar 2007 01:46:51 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.139, 1.140 netrekrc, 1.38, 1.39 Message-ID: <20070319000500.D02F5B3FA@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20937/resources/docs Modified Files: changes.txt netrekrc Log Message: Removed unused engine.wav. Bug fix for phaser fuse, fuse = 0 was removed in a previous patch, this restores that, but (hopefully) in the proper location. Added support for server feature packet full_weapon_resolution, which allows observers to see all weapons. And lets you see your own torps beyond tactical as well. Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- netrekrc 15 Mar 2007 16:42:29 -0000 1.38 +++ netrekrc 18 Mar 2007 01:46:49 -0000 1.39 @@ -785,10 +785,10 @@ # Keys that will trigger macro without going to macro mode singleMacro: EF -macro.0.A:% __ __ ______ __ 256 ship positions, 50 FPS support, -macro.0.A:% / \ / /__/_ __/______ / /__ all new music and sound, and a -macro.0.A:% / /\ \/ / -_)/ / / __/ -_) '_/ whole lot more! -macro.0.A:% /_/ \__/\__//_/ /_/ \__/_/\_\ XP 2006, v1.2, released March 2007 +macro.0.A:% __ __ ______ __ Bug fixes, hockey improvements, +macro.0.A:% / \ / /__/_ __/______ / /__ observers see all weapons, etc. +macro.0.A:% / /\ \/ / -_)/ / / __/ -_) '_/ Plus 50 updates/sec support! +macro.0.A:% /_/ \__/\__//_/ /_/ \__/_/\_\ XP 2006, v1.3, released March 2007 macro.0.A:% Get it today at http://www.playnetrek.org macro.a.A:. o Just | Squeal boy... @@ -961,7 +961,7 @@ macro.).A:/* 10pm EST/7pm PST */ macro.(.A: /* Get the latest version of Netrek XP 2006 today! */ -macro.(.A: /* Current version is 1.2, released March 2007 */ +macro.(.A: /* Current version is 1.3, released March 2007 */ macro.(.A: /* Download it at http://www.netrek.org/files/NetrekXP_2006/ */ macro.(.A: /* or */ macro.(.A: /* http://www.playnetrek.org/ */ Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.139 retrieving revision 1.140 diff -u -d -r1.139 -r1.140 --- changes.txt 17 Mar 2007 23:16:18 -0000 1.139 +++ changes.txt 18 Mar 2007 01:46:49 -0000 1.140 @@ -1,8 +1,9 @@ Netrek XP 2006, Version 1.3: +- added support for feature packet FULL_WEAPON_RESOLUTION, this means that observers + can see all weapons on the galaxy map, yay! It also means you can see your torps + on the galaxy map beyond your tactical range (good for plinking). - added ability to update buttonmap through the options menu - added "weaponsOnMap: (on)/off" to show torps, plasmas and phasers on the galactic map. - Currently server only shows weapons fire within local window, but perhaps in the future - it will show all weapons for observers. - new Options menus for Hockey and Weapons - planet window no longer gets unmapped on death - fixed macro crash bug with sending macros to invisible players on the playerlist From modemhero at users.sourceforge.net Sun Mar 18 14:04:13 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 18 Mar 2007 19:04:13 +0000 Subject: [netrek-cvs] client/netrekxp/src map.c,1.30,1.31 Message-ID: <20070319000442.80ED5B3FA@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13121/src Modified Files: map.c Log Message: Bug fix for redraw zone for stationary people near planets. Index: map.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- map.c 17 Mar 2007 22:40:06 -0000 1.30 +++ map.c 18 Mar 2007 19:04:11 -0000 1.31 @@ -283,7 +283,7 @@ { if (j->p_status != PALIVE) continue; if (j->p_flags & PFOBSERV) continue; - if ((j->p_x / SIZE) == x && (j->p_y / SIZE) == y ) + if (roughMap[j->p_x / SIZE][j->p_y / SIZE] != -1) redrawPlayer[i] = 1; } @@ -302,7 +302,7 @@ { if (j->p_status != PALIVE) continue; if (j->p_flags & PFOBSERV) continue; - if ((j->p_x / SIZE) == x && (j->p_y / SIZE) == y ) + if (roughMap3[j->p_x / SIZE][j->p_y / SIZE] != -1) redrawPlayer[i] = 1; } From modemhero at users.sourceforge.net Sat Mar 17 03:03:10 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 17 Mar 2007 08:03:10 +0000 Subject: [netrek-cvs] client/netrekxp/src option.c,1.35,1.36 Message-ID: <20070319000737.294F9B3FA@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv9066/src Modified Files: option.c Log Message: Move weapons options to new Weapons Menu. Compile fixes for Visual Studio 6. Index: option.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- option.c 15 Mar 2007 16:42:30 -0000 1.35 +++ option.c 17 Mar 2007 08:03:08 -0000 1.36 @@ -250,7 +250,6 @@ {0, "Ship Menu", &MenuPage, 0, 0, 0, NULL, &Menus_Range}, {1, "Page %d (click to change)", &MenuPage, 0, 0, 0, NULL, &Menus_Range}, {1, "", &colorClient, 0, 0, 0, bitmaptypemess, &bitmap_range}, - {1, "use color weapon bitmaps", &colorWeapons, 0, 0, 0, NULL, NULL}, #ifdef VSHIELD_BITMAPS {1, "vary shields bitmap w/ dam", &varyShields, 0, 0, 0, NULL, NULL}, {1, "vary shields color w/ dam", &varyShieldsColor, 0, 0, 0, NULL, NULL}, @@ -258,23 +257,31 @@ {1, "use warning shields", &warnShields, 0, 0, 0, NULL, NULL}, {1, "use warning hull", &vary_hull, 0, 0, 0, NULL, NULL}, {1, "show speed on tactical", &showMySpeed, 0, 0, 0, NULL, NULL}, -#ifdef JUBILEE_PHASERS - {1, "use colorful phasers", &colorfulPhasers, 0, 0, 0, NULL, NULL}, -#endif - {1, "highlight friendly phasers", &highlightFriendlyPhasers, 0, 0, 0, NULL, NULL}, {1, "show tractor/pressor beams", &showTractorPressor, 0, 0, 0, NULL, NULL}, {1, "show tractors after lock", &continueTractor, 0, 0, 0, NULL, NULL}, {1, "show tractor target ID", &tractorID, 0, 0, 0, NULL, NULL}, {1, "show all players tract/press", &showAllTractorPressor, 0, 0, 0, NULL, NULL}, + {1, "report kills", &reportKills, 0, 0, 0, NULL, NULL}, + {1, "show heading tic mark", &headingTic, 0, 0, 0, NULL, NULL}, + {1, "show lock line", &lockLine, 0, 0, 0, NULL, NULL}, + {1, "show det circle", &detCircle, 0, 0, 0, NULL, NULL}, + {1, "done", ¬done, 0, 0, 0, NULL, NULL}, + {-1, NULL, 0, 0, 0, 0, NULL, NULL} +}; + +struct option Weapons_Menu[] = { + {0, "Weapons Menu", &MenuPage, 0, 0, 0, NULL, &Menus_Range}, + {1, "Page %d (click to change)", &MenuPage, 0, 0, 0, NULL, &Menus_Range}, + {1, "use color weapon bitmaps", &colorWeapons, 0, 0, 0, NULL, NULL}, +#ifdef JUBILEE_PHASERS + {1, "use colorful phasers", &colorfulPhasers, 0, 0, 0, NULL, NULL}, +#endif + {1, "highlight friendly phasers", &highlightFriendlyPhasers, 0, 0, 0, NULL, NULL}, {1, "enemy phaser width: %d", &enemyPhasers, 0, 0, 0, NULL, &enPhasRng}, {1, "", &phaserShrinkStyle, 0, 0, 0, shrinkphasermess, NULL}, {1, "shrink my phaser by %d/16", &phaserShrink, 0, 0, 0, NULL, &phaserShrinkRng}, {1, "shrink their phasers by %d/16", &theirPhaserShrink, 0, 0, 0, NULL, &phaserShrinkRng}, {1, "shrink phasers on a miss", &shrinkPhaserOnMiss, 0, 0, 0, NULL, NULL}, - {1, "report kills", &reportKills, 0, 0, 0, NULL, NULL}, - {1, "show heading tic mark", &headingTic, 0, 0, 0, NULL, NULL}, - {1, "show lock line", &lockLine, 0, 0, 0, NULL, NULL}, - {1, "show det circle", &detCircle, 0, 0, 0, NULL, NULL}, {1, "done", ¬done, 0, 0, 0, NULL, NULL}, {-1, NULL, 0, 0, 0, 0, NULL, NULL} }; @@ -1024,6 +1031,7 @@ /* AddOptMenu( &OptionsMenu, 0); */ AddOptMenu (Control_Menu, 0); AddOptMenu (Ship_Menu, 0); + AddOptMenu (Weapons_Menu, 0); AddOptMenu (Planet_Menu, 0); AddOptMenu (Visual_Menu, 0); AddOptMenu (Window_Menu, 0); From modemhero at users.sourceforge.net Fri Mar 16 20:21:51 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 17 Mar 2007 01:21:51 +0000 Subject: [netrek-cvs] client/netrekxp/src planetlist.c,1.6,1.7 Message-ID: <20070319002227.9AC23B3FA@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6614/src Modified Files: planetlist.c Log Message: Planet list now sorts armies (low to high) within a team. Not as simple as it sounds, as it turns out. Index: planetlist.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/planetlist.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- planetlist.c 16 Mar 2007 17:24:16 -0000 1.6 +++ planetlist.c 17 Mar 2007 01:21:49 -0000 1.7 @@ -57,15 +57,18 @@ void updatePlanetw (void) { - register int i, pos; + register int i, k, pos; char buf[BUFSIZ]; register struct planet *j; int planetCount[NUMTEAM + 2]; /* Ind Fed Rom Kli Ori Unknown */ int planetOffset[NUMTEAM + 2]; int counter[NUMTEAM + 2]; + int planetPos[NUMTEAM + 2][MAXPLANETS]; + int planetArm[NUMTEAM + 2][MAXPLANETS]; int playercount = 0; int largestteam = -1, nextlargestteam= -1; int largestteamcount = -1, nextlargestteamcount = -1; + int temp, temparm, z; if (sortPlanets) { @@ -83,6 +86,11 @@ planetCount[i] = 0; planetOffset[i] = 0; counter[i] = 0; + for (k = 0; k < MAXPLANETS; k++) + { + planetArm[i][k] = 0; + planetPos[i][k] = 0; + } } /* Find the 2 largest teams enemy teams. Team bits suck. */ @@ -106,24 +114,91 @@ } } - /* Store # of visible planets from each team */ + /* Store # of visible planets from each team. And let's sort them + by army count (low to high) while we are at it. */ for (i = 0, j = &planets[i]; i < MAXPLANETS; i++, j++) { if (j->pl_info & me->p_team) { - if (j->pl_owner == 0) /* Independent */ - ++planetCount[0]; + if (j->pl_owner == 0) /* Independent (no sorting)*/ + { + planetPos[0][planetCount[0]] = planetCount[0]; + planetCount[0]++; + } else if (j->pl_owner == me->p_team) /* My team */ - ++planetCount[1]; + { + planetPos[1][planetCount[1]] = planetCount[1]; + planetArm[1][planetCount[1]] = j->pl_armies; + k = planetCount[1]; + while (k > 0 && planetArm[1][k] < planetArm[1][k - 1]) + { + temp = planetPos[1][k]; + temparm = planetArm[1][k]; + planetPos[1][k] = planetPos[1][k - 1]; + planetArm[1][k] = planetArm[1][k - 1]; + planetPos[1][k - 1] = temp; + planetArm[1][k - 1] = temparm; + k--; + } + planetCount[1]++; + } else if (j->pl_owner == largestteam) /* Largest enemy */ - ++planetCount[2]; + { + planetPos[2][planetCount[2]] = planetCount[2]; + planetArm[2][planetCount[2]] = j->pl_armies; + k = planetCount[2]; + while (k > 0 && planetArm[2][k] < planetArm[2][k - 1]) + { + temp = planetPos[2][k]; + temparm = planetArm[2][k]; + planetPos[2][k] = planetPos[2][k - 1]; + planetArm[2][k] = planetArm[2][k - 1]; + planetPos[2][k - 1] = temp; + planetArm[2][k - 1] = temparm; + k--; + } + planetCount[2]++; + } else if (j->pl_owner == nextlargestteam) /* Next largest enemy */ - ++planetCount[3]; + { + planetPos[3][planetCount[3]] = planetCount[3]; + planetArm[3][planetCount[3]] = j->pl_armies; + k = planetCount[3]; + while (k > 0 && planetArm[3][k] < planetArm[3][k - 1]) + { + temp = planetPos[3][k]; + temparm = planetArm[3][k]; + planetPos[3][k] = planetPos[3][k - 1]; + planetArm[3][k] = planetArm[3][k - 1]; + planetPos[3][k - 1] = temp; + planetArm[3][k - 1] = temparm; + k--; + } + planetCount[3]++; + } else /* Smallest enemy */ - ++planetCount[4]; + { + planetPos[4][planetCount[4]] = planetCount[4]; + planetArm[4][planetCount[4]] = j->pl_armies; + k = planetCount[4]; + while (k > 0 && planetArm[4][k] < planetArm[4][k - 1]) + { + temp = planetPos[4][k]; + temparm = planetArm[4][k]; + planetPos[4][k] = planetPos[4][k - 1]; + planetArm[4][k] = planetArm[4][k - 1]; + planetPos[4][k - 1] = temp; + planetArm[4][k - 1] = temparm; + k--; + } + planetCount[4]++; + } } else - ++planetCount[5]; + { + planetPos[5][planetCount[5]] = planetCount[5]; + planetCount[5]++; + } } /* Set the offsets */ planetOffset[0] = 0; @@ -141,6 +216,7 @@ LineToConsole("Offsets are %d %d %d %d %d\n", planetOffset[1],planetOffset[2],planetOffset[3],planetOffset[4],planetOffset[5]); #endif + for (i = 0, j = &planets[i]; i < MAXPLANETS; i++, j++) { if (sortPlanets) @@ -149,33 +225,53 @@ { if (j->pl_owner == 0) /* Independent */ { - pos = planetOffset[0] + counter[0]; + pos = planetOffset[0] + planetPos[0][counter[0]]; counter[0]++; } else if (j->pl_owner == me->p_team) /* My team */ { - pos = planetOffset[1] + counter[1]; + for (z = 0; z < planetCount[1]; z++) + { + if (planetPos[1][z] == counter[1]) + break; + } + pos = z + planetOffset[1]; counter[1]++; } else if (j->pl_owner == largestteam) /* Largest enemy */ { - pos = planetOffset[2] + counter[2]; + for (z = 0; z < planetCount[2]; z++) + { + if (planetPos[2][z] == counter[2]) + break; + } + pos = z + planetOffset[2]; counter[2]++; } else if (j->pl_owner == nextlargestteam) /* Next largest enemy */ { - pos = planetOffset[3] + counter[3]; + for (z = 0; z < planetCount[3]; z++) + { + if (planetPos[3][z] == counter[3]) + break; + } + pos = z + planetOffset[3]; counter[3]++; } else /* Smallest enemy */ { - pos = planetOffset[4] + counter[4]; + for (z = 0; z < planetCount[4]; z++) + { + if (planetPos[4][z] == counter[4]) + break; + } + pos = z + planetOffset[4]; counter[4]++; } } else { - pos = planetOffset[5] + counter[5]; + pos = planetOffset[5] + planetPos[5][counter[5]]; counter[5]++; } } From modemhero at users.sourceforge.net Sun Mar 18 19:05:15 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 19 Mar 2007 00:05:15 +0000 Subject: [netrek-cvs] client/netrekxp/include data.h, 1.62, 1.63 defs.h, 1.15, 1.16 proto.h, 1.40, 1.41 wlib.h, 1.9, 1.10 Message-ID: <20070319002623.1A5E31867DA@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv12533/include Modified Files: data.h defs.h proto.h wlib.h Log Message: Added drawRange option to show range at which enemies can see you. The extent of range is calculated identical to the server. Planets within the range of the circle are flagged as needing redraws. Added a new flag to W_WriteCircle function to indicate whether to draw the circle dashed or not. Index: wlib.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/wlib.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- wlib.h 6 Jun 2006 19:50:38 -0000 1.9 +++ wlib.h 19 Mar 2007 00:05:13 -0000 1.10 @@ -197,6 +197,7 @@ int, int, int, + int, W_Color); extern void W_WriteTriangle (W_Window, int, Index: defs.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/defs.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- defs.h 15 Mar 2007 20:49:33 -0000 1.15 +++ defs.h 19 Mar 2007 00:05:12 -0000 1.16 @@ -76,6 +76,12 @@ * person can go into orbit */ #define PFIREDIST 1500 /* At this range a planet * will shoot at a player */ +#define MAXDISTCLOAK (WINSIDE/7) + /* At this range a player can + be seen while cloaked */ +#define MAXDISTVIS (WINSIDE/3) + /* At this range a player can be + seen while visible (uncloaked) */ /* 6 minutes is maximum for autoquit -- anything more causes problems in the * server. (?) */ Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- data.h 18 Mar 2007 01:46:49 -0000 1.62 +++ data.h 19 Mar 2007 00:05:12 -0000 1.63 @@ -685,6 +685,7 @@ extern int omitTeamLetter; /* don't show team letter on map */ extern int viewBox; /* show local window box on map */ +extern int viewRange; /* show range at which enemies can see you as a circle on map */ extern struct stringlist * defaults; /* pointer to defaults list */ Index: proto.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- proto.h 17 Mar 2007 22:40:02 -0000 1.40 +++ proto.h 19 Mar 2007 00:05:13 -0000 1.41 @@ -602,6 +602,7 @@ int y, int r, int highlight, + int dashed, W_Color color); void W_WriteTriangle (W_Window window, int x, From modemhero at users.sourceforge.net Sun Mar 18 19:05:16 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 19 Mar 2007 00:05:16 +0000 Subject: [netrek-cvs] client/netrekxp/src data.c, 1.67, 1.68 defaults.c, 1.58, 1.59 local.c, 1.77, 1.78 map.c, 1.31, 1.32 mswindow.c, 1.47, 1.48 option.c, 1.38, 1.39 Message-ID: <20070319002622.DC8A71867D9@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv12533/src Modified Files: data.c defaults.c local.c map.c mswindow.c option.c Log Message: Added drawRange option to show range at which enemies can see you. The extent of range is calculated identical to the server. Planets within the range of the circle are flagged as needing redraws. Added a new flag to W_WriteCircle function to indicate whether to draw the circle dashed or not. Index: mswindow.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- mswindow.c 17 Mar 2007 17:12:09 -0000 1.47 +++ mswindow.c 19 Mar 2007 00:05:13 -0000 1.48 @@ -3302,6 +3302,7 @@ int y, int r, int highlight, + int dashed, W_Color color) { DBHEADER_VOID; @@ -3315,7 +3316,10 @@ RealizePalette (hdc); } - SelectObject (hdc, colortable[color].pen); + if (dashed) + SelectObject (hdc, colortable[color].dashedpen); + else + SelectObject (hdc, colortable[color].pen); SelectObject (hdc, GetStockObject (NULL_BRUSH)); Ellipse (hdc, x - r, y - r, x + r, y + r); Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.77 retrieving revision 1.78 diff -u -d -r1.77 -r1.78 --- local.c 18 Mar 2007 01:46:50 -0000 1.77 +++ local.c 19 Mar 2007 00:05:13 -0000 1.78 @@ -1158,7 +1158,7 @@ { if (myPlayer(j)) { - W_WriteCircle(w, WINSIDE/2, WINSIDE/2, DETDIST/SCALE, 0, W_Red); + W_WriteCircle(w, WINSIDE/2, WINSIDE/2, DETDIST/SCALE, 0, 0, W_Red); clearzone[0][clearcount] = WINSIDE/2 - (DETDIST/SCALE); clearzone[1][clearcount] = WINSIDE/2 - (DETDIST/SCALE); clearzone[2][clearcount] = 2*DETDIST/SCALE + 1; @@ -1220,7 +1220,7 @@ { if (myPlayer(j) || isObsLockPlayer(j)) { - W_WriteCircle(w, WINSIDE/2, WINSIDE/2, SHOTRANGE/SCALE, 0, W_Grey); + W_WriteCircle(w, WINSIDE/2, WINSIDE/2, SHOTRANGE/SCALE, 0, 0, W_Grey); clearzone[0][clearcount] = WINSIDE/2 - (SHOTRANGE/SCALE); clearzone[1][clearcount] = WINSIDE/2 - (SHOTRANGE/SCALE); clearzone[2][clearcount] = 2*SHOTRANGE/SCALE + 1; Index: option.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- option.c 17 Mar 2007 23:16:19 -0000 1.38 +++ option.c 19 Mar 2007 00:05:13 -0000 1.39 @@ -397,6 +397,7 @@ #endif {1, "omit team letter on map", &omitTeamLetter, 0, 0, 0, NULL, NULL}, {1, "draw view box on map", &viewBox, 0, 0, 0, NULL, NULL}, + {1, "draw detect limits on map", &viewRange, 0, 0, 0, NULL, NULL}, {1, "draw stars on local", &showStars, 0, 0, 0, NULL, NULL}, {1, "draw warp streaks", &warpStreaks, 0, 0, 0, NULL, NULL}, {1, "alert on extra border(s)", &extraAlertBorder, 0, 0, 0, NULL, NULL}, Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.67 retrieving revision 1.68 diff -u -d -r1.67 -r1.68 --- data.c 18 Mar 2007 01:46:50 -0000 1.67 +++ data.c 19 Mar 2007 00:05:13 -0000 1.68 @@ -781,6 +781,7 @@ int omitTeamLetter = 0; int viewBox = 1; +int viewRange = 1; struct stringlist *defaults = NULL; Index: map.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- map.c 18 Mar 2007 19:04:11 -0000 1.31 +++ map.c 19 Mar 2007 00:05:13 -0000 1.32 @@ -61,6 +61,8 @@ static int mclearpoint[2][(MAXTORP + 1) * MAXPLAYER]; static int mclearacount; /* For torp explosions, plasmas, and plasma explosions */ static int mcleararea[4][(MAXTORP + 1) * MAXPLAYER + (MAXPLASMA + 1) * MAXPLAYER]; +static int mclearx, mcleary, mclearr; /* x,y,radius for range circle */ +static int mclearccount; /* * Global Variables: @@ -625,7 +627,7 @@ #endif if (planetHighlighting && (l->pl_info & me->p_team)) /* Draw halo */ W_WriteCircle(mapw, dx, dy, BMP_MPLANET_WIDTH / 2, - l->pl_armies > 4 ? 1 : 0, planetColor(l)); + l->pl_armies > 4 ? 1 : 0, 0, planetColor(l)); if ((l->pl_flags & PLAGRI) && (l->pl_info & me->p_team)) { @@ -1025,6 +1027,47 @@ #ifdef BEEPLITE } #endif + + /* Draw range circle */ + if (viewRange && (myPlayer(j) || isObsLockPlayer(j))) + { + /* Orbitting any non-owned planet gets you seen, + so don't draw the circle */ + if ((j->p_flags & PFORBIT) && + (planets[j->p_planet].pl_owner != j->p_team)) ; + else + { + struct planet *pl; + int pRadius; + int planx, plany; + int distx, disty; + int rad; + +#ifdef BEEPLITE + pRadius = 3 * BMP_MPLANET_WIDTH / 5; +#else + pRadius = BMP_MPLANET_WIDTH / 2; +#endif + rad = (j->p_flags & PFCLOAK) ? MAXDISTCLOAK : MAXDISTVIS; + W_WriteCircle(mapw, dx, dy, rad, 0, 1, W_White); + mclearx = dx; + mcleary = dy; + mclearr = rad; + mclearccount++; + for (pl = planets + MAXPLANETS - 1; pl >= planets; --pl) + { + /* Redraw check - redraw all planets in range. Have to + adjust distance to account for planet radius and text + of planet name */ + planx = pl->pl_x * WINSIDE / GWIDTH; + plany = pl->pl_y * WINSIDE / GWIDTH; + distx = ABS(planx - dx) - pRadius - W_Textwidth; + disty = ABS(plany - dy) - pRadius - W_Textheight; + if (distx*distx + disty*disty < (rad*rad)) + pl->pl_flags |= PLREDRAW; + } + } + } } /* Draw weapons */ @@ -1259,4 +1302,10 @@ W_MakeLines (mapw, mclearline[0], mclearline[1], mclearline[2], mclearline[3], mclearlcount, backColor); mclearlcount = 0; + + if (mclearccount) + { + W_WriteCircle(mapw, mclearx, mcleary, mclearr, 0, 1, backColor); + mclearccount--; + } } Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- defaults.c 15 Mar 2007 16:42:30 -0000 1.58 +++ defaults.c 19 Mar 2007 00:05:13 -0000 1.59 @@ -887,6 +887,12 @@ NULL } }, + {"viewRange", &viewRange, RC_BOOL, + { + "Show range at which enemies can see you as a circle on map", + NULL + } + }, {"warnHull", &vary_hull, RC_BOOL, { "Warn hull state based on damage", @@ -1615,6 +1621,7 @@ omitTeamLetter = booleanDefault ("omitTeamLetter", omitTeamLetter); beepOnPrivateMessage = booleanDefault ("beepOnPrivateMessage", beepOnPrivateMessage); viewBox = booleanDefault ("viewBox", viewBox); + viewRange = booleanDefault ("viewRange", viewRange); warpStreaks = booleanDefault ("warpStreaks", warpStreaks); showStars = booleanDefault ("showStars", showStars); From modemhero at users.sourceforge.net Sun Mar 18 19:05:15 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 19 Mar 2007 00:05:15 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html generalconfig.html, 1.36, 1.37 Message-ID: <20070319002622.E3FF4B3FA@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv12533/resources/htmlhelp/html Modified Files: generalconfig.html Log Message: Added drawRange option to show range at which enemies can see you. The extent of range is calculated identical to the server. Planets within the range of the circle are flagged as needing redraws. Added a new flag to W_WriteCircle function to indicate whether to draw the circle dashed or not. Index: generalconfig.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/generalconfig.html,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- generalconfig.html 15 Mar 2007 16:42:29 -0000 1.36 +++ generalconfig.html 19 Mar 2007 00:05:13 -0000 1.37 @@ -1465,6 +1465,16 @@ +viewRange +Show range at which enemies can see you as a circle on map + +
    +
  • on (default)
  • +
  • off
  • +
+ + + warnHull Warn hull state based on damage From modemhero at users.sourceforge.net Sun Mar 18 19:05:14 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 19 Mar 2007 00:05:14 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo,1.104,1.105 Message-ID: <20070319002623.5938F1867E6@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv12533 Modified Files: clientr.suo Log Message: Added drawRange option to show range at which enemies can see you. The extent of range is calculated identical to the server. Planets within the range of the circle are flagged as needing redraws. Added a new flag to W_WriteCircle function to indicate whether to draw the circle dashed or not. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.104 retrieving revision 1.105 diff -u -d -r1.104 -r1.105 Binary files /tmp/cvsLbD8Zs and /tmp/cvs2Nc4qI differ From modemhero at users.sourceforge.net Sun Mar 18 19:05:15 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 19 Mar 2007 00:05:15 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.142, 1.143 netrekrc, 1.40, 1.41 netrekrc_options.txt, 1.36, 1.37 Message-ID: <20070319002623.139C9B3FC@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv12533/resources/docs Modified Files: changes.txt netrekrc netrekrc_options.txt Log Message: Added drawRange option to show range at which enemies can see you. The extent of range is calculated identical to the server. Planets within the range of the circle are flagged as needing redraws. Added a new flag to W_WriteCircle function to indicate whether to draw the circle dashed or not. Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- netrekrc 18 Mar 2007 16:43:35 -0000 1.40 +++ netrekrc 19 Mar 2007 00:05:13 -0000 1.41 @@ -474,6 +474,9 @@ # Show limits of tactical display on galaxy viewBox: on +# Show range at which enemies can see you as a circle on map +viewRange: on + # Warn hull state based on damage warnHull: off Index: netrekrc_options.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc_options.txt,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- netrekrc_options.txt 15 Mar 2007 16:42:29 -0000 1.36 +++ netrekrc_options.txt 19 Mar 2007 00:05:13 -0000 1.37 @@ -315,6 +315,7 @@ varyShields: (on/off) change shields graphic on shield damage varyShieldsColor: (on/off) change shields color on shield damage viewBox: (on/off) show tactical window boundaries on map +viewRange: (on/off) show range at which enemies can see you as a circle on map warnHull: (on/off) warn hull state based on damage warnShields: (on/off) change shields color on enemy approach warpStreaks: (on/off) show streaks while warping to starbase Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.142 retrieving revision 1.143 diff -u -d -r1.142 -r1.143 --- changes.txt 18 Mar 2007 19:04:11 -0000 1.142 +++ changes.txt 19 Mar 2007 00:05:13 -0000 1.143 @@ -1,4 +1,8 @@ Netrek XP 2006, Version 1.3: +- added "viewRange: (on)/off" option to draw a dashed circle on the map showing + the range at which enemies can see you. Circle radius depends on if you are + cloaked or not. If orbitting a foreign planet, no circle is drawn, as you are + visible to all. - fixed flicker experienced sometimes seen with stationary ships near a planet on the galactic map - the old mono torps are now default. Big torps are nice and all, but I think From modemhero at users.sourceforge.net Sat Mar 17 20:46:52 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 18 Mar 2007 01:46:52 +0000 Subject: [netrek-cvs] client/netrekxp/src data.c, 1.66, 1.67 feature.c, 1.8, 1.9 local.c, 1.76, 1.77 sound.c, 1.36, 1.37 Message-ID: <20070319010748.281131867E6@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20937/src Modified Files: data.c feature.c local.c sound.c Log Message: Removed unused engine.wav. Bug fix for phaser fuse, fuse = 0 was removed in a previous patch, this restores that, but (hopefully) in the proper location. Added support for server feature packet full_weapon_resolution, which allows observers to see all weapons. And lets you see your own torps beyond tactical as well. Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- data.c 15 Mar 2007 16:42:29 -0000 1.66 +++ data.c 18 Mar 2007 01:46:50 -0000 1.67 @@ -675,6 +675,7 @@ int F_show_all_tractors = 1; int F_sp_generic_32 = 0; int F_full_direction_resolution = 0; +int F_full_weapon_resolution = 0; #ifdef RECORDGAME int F_many_self = 0; Index: feature.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/feature.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- feature.c 1 Mar 2007 11:21:46 -0000 1.8 +++ feature.c 18 Mar 2007 01:46:50 -0000 1.9 @@ -78,6 +78,7 @@ {"SHIP_CAP", &F_ship_cap, 'S', 1, 0, 0}, {"SP_GENERIC_32", &F_sp_generic_32, 'S', 1, 0, 0}, {"FULL_DIRECTION_RESOLUTION", &F_full_direction_resolution, 'S', 1, 0, 0}, + {"FULL_WEAPON_RESOLUTION", &F_full_weapon_resolution, 'S', 1, 0, 0}, #ifdef WARP_DEAD {"DEAD_WARP", &F_dead_warp, 'S', 1, 0, 0}, Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.76 retrieving revision 1.77 diff -u -d -r1.76 -r1.77 --- local.c 17 Mar 2007 22:40:06 -0000 1.76 +++ local.c 18 Mar 2007 01:46:50 -0000 1.77 @@ -1466,6 +1466,7 @@ #ifdef SOUND php->sound_phaser = 0; #endif + php->ph_fuse = 0; } else { Index: sound.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/sound.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- sound.c 17 Mar 2007 17:12:09 -0000 1.36 +++ sound.c 18 Mar 2007 01:46:50 -0000 1.37 @@ -54,7 +54,6 @@ int i; sounds[CLOAKED_WAV] = Mix_LoadWAV(DATAFILE("nt_cloaked.wav")); - sounds[ENGINE_WAV] = Mix_LoadWAV(DATAFILE("nt_engine.wav")); sounds[ENGINE_MELT_WAV] = Mix_LoadWAV(DATAFILE("nt_enginemelt.wav")); sounds[ENGINE_OK_WAV] = Mix_LoadWAV(DATAFILE("nt_engineok.wav")); sounds[ENTER_SHIP_WAV] = Mix_LoadWAV(DATAFILE("nt_enter_ship.wav")); From modemhero at users.sourceforge.net Sun Mar 18 11:43:37 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 18 Mar 2007 16:43:37 +0000 Subject: [netrek-cvs] client/netrekxp/resources/misclib/color fedteam.bmp, 1.1, 1.2 kliteam.bmp, 1.1, 1.2 oriteam.bmp, 1.1, 1.2 romteam.bmp, 1.1, 1.2 Message-ID: <20070319011104.59C4C1867E6@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/misclib/color In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv18174/resources/misclib/color Modified Files: fedteam.bmp kliteam.bmp oriteam.bmp romteam.bmp Log Message: Colorweapons now default to off in netrekrc Fixed up team bitmaps graphics Updated credits Index: fedteam.bmp =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/misclib/color/fedteam.bmp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsmCkKDB and /tmp/cvsAUxHI8 differ Index: romteam.bmp =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/misclib/color/romteam.bmp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsVzv7JE and /tmp/cvsO3i1Tb differ Index: kliteam.bmp =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/misclib/color/kliteam.bmp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvs73BYwK and /tmp/cvsJ3oEMh differ Index: oriteam.bmp =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/misclib/color/oriteam.bmp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvs7f2dgL and /tmp/cvsC7QxAi differ From modemhero at users.sourceforge.net Fri Mar 16 20:21:51 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 17 Mar 2007 01:21:51 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.134, 1.135 Message-ID: <20070319012057.833611867E6@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6614/resources/docs Modified Files: changes.txt Log Message: Planet list now sorts armies (low to high) within a team. Not as simple as it sounds, as it turns out. Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.134 retrieving revision 1.135 diff -u -d -r1.134 -r1.135 --- changes.txt 16 Mar 2007 17:24:16 -0000 1.134 +++ changes.txt 17 Mar 2007 01:21:48 -0000 1.135 @@ -1,7 +1,8 @@ Netrek XP 2006, Version 1.3: - fixed macro crash bug with sending macros to invisible players on the playerlist - added "mapSort: (on)/off" to sort the planet list, with your planets first, then the planets - of the other teams, starting with the team with the most players. + of the other teams, starting with the team with the most players. Within a team, planets + are sorted from low to high army count. - the planet list window can now be used with info, lock and certain RCDs. In other words, you can lock onto planets through the planet list window, and send planet-related RCDs through the window as well. From modemhero at users.sourceforge.net Sat Mar 17 20:46:52 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 18 Mar 2007 01:46:52 +0000 Subject: [netrek-cvs] client/netrekxp/resources/sounds nt_enginemelt.wav, 1.1, 1.2 nt_engine.wav, 1.1, NONE Message-ID: <20070319012106.3F9B61867E6@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/sounds In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20937/resources/sounds Modified Files: nt_enginemelt.wav Removed Files: nt_engine.wav Log Message: Removed unused engine.wav. Bug fix for phaser fuse, fuse = 0 was removed in a previous patch, this restores that, but (hopefully) in the proper location. Added support for server feature packet full_weapon_resolution, which allows observers to see all weapons. And lets you see your own torps beyond tactical as well. Index: nt_enginemelt.wav =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/sounds/nt_enginemelt.wav,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsTbtn4s and /tmp/cvs3gYI7S differ --- nt_engine.wav DELETED --- From modemhero at users.sourceforge.net Sat Mar 17 03:03:09 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 17 Mar 2007 08:03:09 +0000 Subject: [netrek-cvs] client/netrekxp clientr.dsp, 1.4, 1.5 clientr.suo, 1.102, 1.103 Message-ID: <20070319012231.BAE1B1867E6@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv9066 Modified Files: clientr.dsp clientr.suo Log Message: Move weapons options to new Weapons Menu. Compile fixes for Visual Studio 6. Index: clientr.dsp =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- clientr.dsp 21 Apr 2006 12:00:06 -0000 1.4 +++ clientr.dsp 17 Mar 2007 08:03:05 -0000 1.5 @@ -74,7 +74,8 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 libcmt.lib user32.lib gdi32.lib wsock32.lib kernel32.lib shell32.lib winmm.lib mpr.lib msvcrt.lib libgmp.lib /nologo /subsystem:console /profile /debug /machine:I386 /nodefaultlib /out:"\netrek_files\netrek\netrek.exe" /libpath:"win32/lib" /mapinfo:lines /mapinfo:exports +# ADD LINK32 libcmt.lib user32.lib gdi32.lib wsock32.lib kernel32.lib shell32.lib winmm.lib mpr.lib msvcrt.lib libgmp.lib msimg32.lib SDL.lib SDLmain.lib SDL_mixer.lib /nologo /subsystem:console /profile /debug /machine:I386 /nodefaultlib /out:"\netrek_files\netrek\netrek.exe" /libpath:"win32/lib" /mapinfo:lines /mapinfo:exports +# SUBTRACT LINK32 /map !ENDIF @@ -333,10 +334,6 @@ SOURCE=.\src\winmain.c # End Source File -# Begin Source File - -SOURCE=.\src\winsndlib.c -# End Source File # End Group # Begin Group "config" Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.102 retrieving revision 1.103 diff -u -d -r1.102 -r1.103 Binary files /tmp/cvsUSVdrq and /tmp/cvsdwBa3n differ From modemhero at users.sourceforge.net Sun Mar 18 21:20:34 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 19 Mar 2007 02:20:34 +0000 Subject: [netrek-cvs] client/netrekxp/src map.c, 1.32, 1.33 mswindow.c, 1.48, 1.49 Message-ID: <20070319022050.40E3FB3FA@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv9565/src Modified Files: map.c mswindow.c Log Message: WriteCircle - set background to black in case of dashed pen. Make drawRange turn red when cloaked. Use entire circle for clearzone instead of only dashed region. Index: mswindow.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- mswindow.c 19 Mar 2007 00:05:13 -0000 1.48 +++ mswindow.c 19 Mar 2007 02:20:26 -0000 1.49 @@ -3317,7 +3317,10 @@ } if (dashed) + { + SetBkColor (hdc, colortable[BLACK].rgb); SelectObject (hdc, colortable[color].dashedpen); + } else SelectObject (hdc, colortable[color].pen); SelectObject (hdc, GetStockObject (NULL_BRUSH)); Index: map.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- map.c 19 Mar 2007 00:05:13 -0000 1.32 +++ map.c 19 Mar 2007 02:20:26 -0000 1.33 @@ -1042,14 +1042,24 @@ int planx, plany; int distx, disty; int rad; + int color; #ifdef BEEPLITE pRadius = 3 * BMP_MPLANET_WIDTH / 5; #else pRadius = BMP_MPLANET_WIDTH / 2; #endif - rad = (j->p_flags & PFCLOAK) ? MAXDISTCLOAK : MAXDISTVIS; - W_WriteCircle(mapw, dx, dy, rad, 0, 1, W_White); + if (j->p_flags & PFCLOAK) + { + rad = MAXDISTCLOAK; + color = W_Red; + } + else + { + rad = MAXDISTVIS; + color = W_White; + } + W_WriteCircle(mapw, dx, dy, rad, 0, 1, color); mclearx = dx; mcleary = dy; mclearr = rad; @@ -1305,7 +1315,7 @@ if (mclearccount) { - W_WriteCircle(mapw, mclearx, mcleary, mclearr, 0, 1, backColor); + W_WriteCircle(mapw, mclearx, mcleary, mclearr, 0, 0, backColor); mclearccount--; } } From modemhero at users.sourceforge.net Sun Mar 18 23:00:34 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 19 Mar 2007 04:00:34 +0000 Subject: [netrek-cvs] client/netrekxp/src defaults.c, 1.59, 1.60 map.c, 1.33, 1.34 option.c, 1.39, 1.40 Message-ID: <20070319040043.A127CB3FA@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv19558/src Modified Files: defaults.c map.c option.c Log Message: Changed viewRange from on/off to on/only when cloaked/off. Index: map.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- map.c 19 Mar 2007 02:20:26 -0000 1.33 +++ map.c 19 Mar 2007 04:00:29 -0000 1.34 @@ -1031,10 +1031,12 @@ /* Draw range circle */ if (viewRange && (myPlayer(j) || isObsLockPlayer(j))) { - /* Orbitting any non-owned planet gets you seen, - so don't draw the circle */ + /* Orbitting any non-owned planet gets you seen, + so don't draw the circle */ if ((j->p_flags & PFORBIT) && (planets[j->p_planet].pl_owner != j->p_team)) ; + /* Don't draw if uncloaked and viewRange is 1 */ + else if (!(j->p_flags & PFCLOAK) && viewRange == 1) ; else { struct planet *pl; Index: option.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- option.c 19 Mar 2007 00:05:13 -0000 1.39 +++ option.c 19 Mar 2007 04:00:31 -0000 1.40 @@ -169,11 +169,19 @@ "Show New color bitmaps on galactic map", "" }; + static char *autowarmess[] = { "Don't auto set war declarations", "Set war with nonzero player teams", "Set war with largest enemy team", "" }; + +static char *viewrangemess[] = { "Don't show range circle", + "Only show range circle when cloaked", + "Show range circle at all times", + "" +}; + /* Only one of op_option, op_targetwin, and op_string should be defined. If * op_string is defined, op_size should be too and op_text is used without a * "Don't" prefix. if op_range is defined, there should be a %d in op_text @@ -397,7 +405,7 @@ #endif {1, "omit team letter on map", &omitTeamLetter, 0, 0, 0, NULL, NULL}, {1, "draw view box on map", &viewBox, 0, 0, 0, NULL, NULL}, - {1, "draw detect limits on map", &viewRange, 0, 0, 0, NULL, NULL}, + {1, "", &viewRange, 0, 0, 0, viewrangemess, NULL}, {1, "draw stars on local", &showStars, 0, 0, 0, NULL, NULL}, {1, "draw warp streaks", &warpStreaks, 0, 0, 0, NULL, NULL}, {1, "alert on extra border(s)", &extraAlertBorder, 0, 0, 0, NULL, NULL}, Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- defaults.c 19 Mar 2007 00:05:13 -0000 1.59 +++ defaults.c 19 Mar 2007 04:00:27 -0000 1.60 @@ -887,9 +887,12 @@ NULL } }, - {"viewRange", &viewRange, RC_BOOL, + {"viewRange", &viewRange, RC_INT, { "Show range at which enemies can see you as a circle on map", + "0 - Don't show range circle", + "1 - Only show range circle when cloaked", + "2 - Show range circle at all times", NULL } }, @@ -1621,7 +1624,7 @@ omitTeamLetter = booleanDefault ("omitTeamLetter", omitTeamLetter); beepOnPrivateMessage = booleanDefault ("beepOnPrivateMessage", beepOnPrivateMessage); viewBox = booleanDefault ("viewBox", viewBox); - viewRange = booleanDefault ("viewRange", viewRange); + viewRange = intDefault ("viewRange", viewRange); warpStreaks = booleanDefault ("warpStreaks", warpStreaks); showStars = booleanDefault ("showStars", showStars); From modemhero at users.sourceforge.net Sun Mar 18 23:33:53 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 19 Mar 2007 04:33:53 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html generalconfig.html, 1.38, 1.39 Message-ID: <20070319044803.13F0AB400@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv1276/resources/htmlhelp/html Modified Files: generalconfig.html Log Message: Netrekrc option useFullWeapInfo to control whether to use the new feature packet. Cleaned up reportFeatures some to allow for more control of user to choose what features to request. Index: generalconfig.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/generalconfig.html,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- generalconfig.html 19 Mar 2007 04:00:27 -0000 1.38 +++ generalconfig.html 19 Mar 2007 04:33:50 -0000 1.39 @@ -1405,6 +1405,16 @@ +useFullWeapInfo +Support showing more weapon info on galaxy map + +
    +
  • on (default)
  • +
  • off
  • +
+ + + useRsa Use RSA client verification From modemhero at users.sourceforge.net Sun Mar 18 23:33:53 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 19 Mar 2007 04:33:53 +0000 Subject: [netrek-cvs] client/netrekxp/src data.c, 1.68, 1.69 defaults.c, 1.60, 1.61 feature.c, 1.9, 1.10 Message-ID: <20070319044802.E8D38B3FC@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv1276/src Modified Files: data.c defaults.c feature.c Log Message: Netrekrc option useFullWeapInfo to control whether to use the new feature packet. Cleaned up reportFeatures some to allow for more control of user to choose what features to request. Index: feature.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/feature.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- feature.c 18 Mar 2007 01:46:50 -0000 1.9 +++ feature.c 19 Mar 2007 04:33:51 -0000 1.10 @@ -104,20 +104,28 @@ reportFeatures (void) { struct feature *f; + int value; for (f = features; f->name != 0; f++) { if (strcmpi (f->name, "FEATURE_PACKETS") != 0) + { + if (!strcmp(f->name, "FULL_DIRECTION_RESOLUTION")) + value = useFullShipInfo; + else if (!strcmp(f->name, "FULL_WEAPON_RESOLUTION")) + value = useFullWeapInfo; + else + value = f->value; sendFeature (f->name, f->feature_type, - (!strcmp(f->name, "FULL_DIRECTION_RESOLUTION") ? useFullShipInfo : f->value), + value, (char) (f->arg1 ? *f->arg1 : 0), (char) (f->arg2 ? *f->arg2 : 0)); #ifdef DEBUG - LineToConsole ("(C->S) %s (%c): %d\n", f->name, f->feature_type, - !strcmp(f->name, "FULL_DIRECTION_RESOLUTION") ? useFullShipInfo : f->value); + LineToConsole ("(C->S) %s (%c): %d\n", f->name, f->feature_type, value); #endif + } } } Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- defaults.c 19 Mar 2007 04:00:27 -0000 1.60 +++ defaults.c 19 Mar 2007 04:33:51 -0000 1.61 @@ -845,6 +845,15 @@ NULL } }, + {"useFullWeapInfo", &useFullWeapInfo, RC_BOOL, + { + "Allows observers to see all weapons fire on galaxy map", + "by using long torp packets instead of short torp packets,", + "slight increase in bandwidth usage. Also allows self torps", + "to be seen beyond tactical range, again via galactic map", + NULL + } + }, #ifdef BEEPLITE {"useLite", &useLite, RC_BOOL, { @@ -1615,6 +1624,7 @@ soundMusicBkgd = booleanDefault ("soundMusicBkgd", soundMusicBkgd); soundAngles = booleanDefault ("soundAngles", soundAngles); useFullShipInfo = booleanDefault ("useFullShipInfo", useFullShipInfo); + useFullWeapInfo = booleanDefault ("useFullWeapInfo", useFullWeapInfo); headingTic = booleanDefault ("headingTic", headingTic); tractorID = booleanDefault ("tractorID", tractorID); lockLine = booleanDefault ("lockLine", lockLine); Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- data.c 19 Mar 2007 00:05:13 -0000 1.68 +++ data.c 19 Mar 2007 04:33:50 -0000 1.69 @@ -811,6 +811,8 @@ int soundAngles = 0; /* Use 3D sound */ int useFullShipInfo = 1; /* Prefer SP_PLAYER packets over SP_S_PLAYER packets */ +int useFullWeapInfo = 1; /* Receive larger torp packets, get self torp info beyond + tactical, allow observer to see all weapons fire */ int headingTic = 1; /* show ship heading tic */ int tractorID = 1; /* show ID of player you are tractoring */ int lockLine = 1; /* draw dashed line on map from you to lock target */ From modemhero at users.sourceforge.net Sun Mar 18 23:33:52 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 19 Mar 2007 04:33:52 +0000 Subject: [netrek-cvs] client/netrekxp/include data.h,1.63,1.64 Message-ID: <20070319044802.D19D01867E6@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv1276/include Modified Files: data.h Log Message: Netrekrc option useFullWeapInfo to control whether to use the new feature packet. Cleaned up reportFeatures some to allow for more control of user to choose what features to request. Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- data.h 19 Mar 2007 00:05:12 -0000 1.63 +++ data.h 19 Mar 2007 04:33:50 -0000 1.64 @@ -715,6 +715,8 @@ extern int soundAngles; /* Use 3D sound */ extern int useFullShipInfo; /* Prefer SP_PLAYER packets over SP_S_PLAYER packets */ +extern int useFullWeapInfo; /* Receive larger torp packets, get self torp info beyond + tactical, allow observer to see all weapons fire */ extern int headingTic; /* show ship heading tic */ extern int tractorID; /* show ID of player you are tractoring */ extern int lockLine; /* draw dashed line on map from you to lock target */ From modemhero at users.sourceforge.net Sun Mar 18 23:33:52 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 19 Mar 2007 04:33:52 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.144, 1.145 netrekrc, 1.42, 1.43 netrekrc_options.txt, 1.38, 1.39 Message-ID: <20070319044802.DEB0EB3F6@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv1276/resources/docs Modified Files: changes.txt netrekrc netrekrc_options.txt Log Message: Netrekrc option useFullWeapInfo to control whether to use the new feature packet. Cleaned up reportFeatures some to allow for more control of user to choose what features to request. Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- netrekrc 19 Mar 2007 04:00:25 -0000 1.42 +++ netrekrc 19 Mar 2007 04:33:50 -0000 1.43 @@ -456,6 +456,12 @@ # slight increase in bandwidth usage useFullShipInfo: on +# Allows observers to see all weapons fire on galaxy map +# by using long torp packets instead of short torp packets, +# slight increase in bandwidth usage. Also allows self torps +# to be seen beyond tactical range, again via galactic map +useFullWeapInfo: on + # Use beeplite useLite: on Index: netrekrc_options.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc_options.txt,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- netrekrc_options.txt 19 Mar 2007 04:00:25 -0000 1.38 +++ netrekrc_options.txt 19 Mar 2007 04:33:50 -0000 1.39 @@ -308,6 +308,7 @@ udpSequenceCheck: (on/off) check UDP sequence updatesPerSec: (1-50 generally) how many data updates per second to request from server useFullShipInfo: (on/off) display other ships to 256 directions instead of 16 +useFullWeapInfo: (on/off) support showing more weapon info on galaxy map useLite: (on/off) use beeplite defLite: (on/off) use default beeplite settings useRSA: (on/off) use RSA client verification Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.144 retrieving revision 1.145 diff -u -d -r1.144 -r1.145 --- changes.txt 19 Mar 2007 04:00:25 -0000 1.144 +++ changes.txt 19 Mar 2007 04:33:50 -0000 1.145 @@ -9,7 +9,8 @@ there is a loss in dodging ability with the bigger torps. - added support for feature packet FULL_WEAPON_RESOLUTION, this means that observers can see all weapons on the galaxy map, yay! It also means you can see your torps - on the galaxy map beyond your tactical range (good for plinking). + on the galaxy map beyond your tactical range (good for plinking). Can turn this + feature packet on/off with the netrekrc option "useFullWeapInfo: (on)/off". - added ability to update buttonmap through the options menu - added "weaponsOnMap: (on)/off" to show torps, plasmas and phasers on the galactic map. - new Options menus for Hockey and Weapons From modemhero at users.sourceforge.net Sun Mar 18 23:00:29 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 19 Mar 2007 04:00:29 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html generalconfig.html, 1.37, 1.38 Message-ID: <20070319061329.D06911867E6@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv19558/resources/htmlhelp/html Modified Files: generalconfig.html Log Message: Changed viewRange from on/off to on/only when cloaked/off. Index: generalconfig.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/generalconfig.html,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- generalconfig.html 19 Mar 2007 00:05:13 -0000 1.37 +++ generalconfig.html 19 Mar 2007 04:00:27 -0000 1.38 @@ -1469,8 +1469,9 @@ Show range at which enemies can see you as a circle on map
    -
  • on (default)
  • -
  • off
  • +
  • 0 - don't show range circle
  • +
  • 1 (default) - only show circle while cloaked
  • +
  • 2 - always show range circle
From modemhero at users.sourceforge.net Sun Mar 18 23:00:29 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 19 Mar 2007 04:00:29 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.143, 1.144 netrekrc, 1.41, 1.42 netrekrc_options.txt, 1.37, 1.38 Message-ID: <20070319061339.8D0791867E6@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv19558/resources/docs Modified Files: changes.txt netrekrc netrekrc_options.txt Log Message: Changed viewRange from on/off to on/only when cloaked/off. Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- netrekrc 19 Mar 2007 00:05:13 -0000 1.41 +++ netrekrc 19 Mar 2007 04:00:25 -0000 1.42 @@ -475,7 +475,10 @@ viewBox: on # Show range at which enemies can see you as a circle on map -viewRange: on +# 0 - don't show range circle +# 1 - only show range circle when cloaked +# 2 - show range circle at all times +viewRange: 1 # Warn hull state based on damage warnHull: off Index: netrekrc_options.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc_options.txt,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- netrekrc_options.txt 19 Mar 2007 00:05:13 -0000 1.37 +++ netrekrc_options.txt 19 Mar 2007 04:00:25 -0000 1.38 @@ -315,7 +315,11 @@ varyShields: (on/off) change shields graphic on shield damage varyShieldsColor: (on/off) change shields color on shield damage viewBox: (on/off) show tactical window boundaries on map -viewRange: (on/off) show range at which enemies can see you as a circle on map +viewRange: (0-2) show range at which enemies can see you as a circle on map +# 0 - don't show range circle +# 1 - only show range circle when cloaked +# 2 - show range circle at all times + warnHull: (on/off) warn hull state based on damage warnShields: (on/off) change shields color on enemy approach warpStreaks: (on/off) show streaks while warping to starbase Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.143 retrieving revision 1.144 diff -u -d -r1.143 -r1.144 --- changes.txt 19 Mar 2007 00:05:13 -0000 1.143 +++ changes.txt 19 Mar 2007 04:00:25 -0000 1.144 @@ -1,8 +1,8 @@ Netrek XP 2006, Version 1.3: -- added "viewRange: (on)/off" option to draw a dashed circle on the map showing - the range at which enemies can see you. Circle radius depends on if you are - cloaked or not. If orbitting a foreign planet, no circle is drawn, as you are - visible to all. +- added "viewRange: (0-2)" option to draw a dashed circle on the map showing + the range at which enemies can see you. You can choose to draw it at all times, + only when you are cloaked, or not at all. If orbitting a foreign planet, no + circle is drawn, as you are visible to all. - fixed flicker experienced sometimes seen with stationary ships near a planet on the galactic map - the old mono torps are now default. Big torps are nice and all, but I think From modemhero at users.sourceforge.net Mon Mar 19 04:25:19 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 19 Mar 2007 09:25:19 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C,1.112,1.113 Message-ID: <20070319092529.6A12EB3FA@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv7060 Modified Files: NetrekXP to do list.C Log Message: Using DeleteDC instead of ReleaseDC on map SDB buffer, apparently this is the correct way to release a DC made by CreateCompatibleDC. Added some extra precautions during creating the SDB DCs, apparently one needs to worry about the objects stored into a DC when it is created. So following what is done for the other global DCs, the object is selected and removed. The reason for these changes is to try and stop a hard to reproduce bug where certain bitmap graphics are not displaying correct, most noticeable on the new planet and team window bitmaps. Since it's not a pointer problem (these are only stored not pointed to), and it's not a memory allocation error (that would crash the program), and since the graphics that display during the error state look oddly like Windows buttons or icons,I believe it's some sort of default bitmap/whatever not being freed. Only time will tell if these changes actually fix the problem. Also cleaned up todo list. Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.112 retrieving revision 1.113 diff -u -d -r1.112 -r1.113 --- NetrekXP to do list.C 16 Mar 2007 01:44:23 -0000 1.112 +++ NetrekXP to do list.C 19 Mar 2007 09:25:15 -0000 1.113 @@ -35,17 +35,18 @@ 2) Save options for observer/servernick/servertype need to be saved 3) Get square planet bitmaps so I can turn them into mapped rotating globes. 4) Pop-up dialog box for bad version response -5) Metaping on a Unknown server is causing unseemly delay due to threading. +5) Metaping on a Unknown server is causing unseemly delay due to threading. I believe +this is fixed. 7) Some sort of click action on player list brings up a menu with settings for that player's candock, cantranswarp, ban, ignore, etc. 8) Maybe fix galactic new planet bitmap redraw sequence, caused incredible lag on a P166 -Win98 xp computer +Win98 xp computer (already checked for CPU usage, not so bad, plus 50 updates/sec has +more impact). 9) Out of bounds message window calcs don't work with taskbar or menu bar, basewin rect doesn't take these into account. 10) sendto() error: 10049 on metaserver connect to a bad server, believe it's due -to hostname not resolving. Should be fixed. -12) fix redraw for stationary ships with new planets -13) fix crash bug with %u macros via playerlist to non-visible players +to hostname not resolving. Currently fixed by using mulitple attempts to resolve bad +host names. Stas's list: - color coded (?) and scrollable playerlist. From modemhero at users.sourceforge.net Mon Mar 19 04:25:20 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 19 Mar 2007 09:25:20 +0000 Subject: [netrek-cvs] client/netrekxp/src mswindow.c,1.49,1.50 Message-ID: <20070319101141.ADCD01867E6@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv7060/src Modified Files: mswindow.c Log Message: Using DeleteDC instead of ReleaseDC on map SDB buffer, apparently this is the correct way to release a DC made by CreateCompatibleDC. Added some extra precautions during creating the SDB DCs, apparently one needs to worry about the objects stored into a DC when it is created. So following what is done for the other global DCs, the object is selected and removed. The reason for these changes is to try and stop a hard to reproduce bug where certain bitmap graphics are not displaying correct, most noticeable on the new planet and team window bitmaps. Since it's not a pointer problem (these are only stored not pointed to), and it's not a memory allocation error (that would crash the program), and since the graphics that display during the error state look oddly like Windows buttons or icons,I believe it's some sort of default bitmap/whatever not being freed. Only time will tell if these changes actually fix the problem. Also cleaned up todo list. Index: mswindow.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- mswindow.c 19 Mar 2007 02:20:26 -0000 1.49 +++ mswindow.c 19 Mar 2007 09:25:17 -0000 1.50 @@ -644,7 +644,7 @@ SelectObject (mapSDB->mem_dc, mapSDB->old_bmp); DeleteObject (mapSDB->mem_bmp); - ReleaseDC (((Window *)mapSDB->window)->hwnd, mapSDB->win_dc); + DeleteDC (mapSDB->win_dc); free (mapSDB); //WinKey Kill Library Stop @@ -5611,6 +5611,7 @@ { Window * win; SDBUFFER * sdb; + HBITMAP junk; win = ((Window *)window); @@ -5636,6 +5637,14 @@ if (sdb->mem_dc == NULL) return NULL; + //This code ripped from W_Initialize, better safe than sorry + junk = CreateBitmap (1, 1, 1, 1, NULL); + GlobalOldMemDCBitmap = (HBITMAP) SelectObject (sdb->win_dc, junk); + SelectObject (sdb->win_dc, GlobalOldMemDCBitmap); + GlobalOldMemDC2Bitmap = (HBITMAP) SelectObject (sdb->mem_dc, junk); + SelectObject (sdb->mem_dc, GlobalOldMemDC2Bitmap); + DeleteObject (junk); + sdb->mem_bmp = CreateCompatibleBitmap (sdb->win_dc, sdb->wr.right, sdb->wr.bottom); if (sdb->mem_bmp == NULL) return NULL; From modemhero at users.sourceforge.net Mon Mar 19 14:59:45 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 19 Mar 2007 19:59:45 +0000 Subject: [netrek-cvs] client/netrekxp/src data.c, 1.69, 1.70 defaults.c, 1.61, 1.62 mswindow.c, 1.50, 1.51 Message-ID: <20070319225905.C57BE1867D2@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28263/src Modified Files: data.c defaults.c mswindow.c Log Message: Added a disabled richText option. Disabled cause it's buggy in several respects. Requires a windows guru to fix, I've tried several times to fix it completely. Main issues are scrolling (all richtext windows seem to have an extra blank line at the end) and keyboard actions over message windows (messaging is broken with cursor in message windows). Also the order of loading defaults and window creation do not allow the option to be set as a netrekrc option at this time. I did manage to fix the problem with keyboard input being locked out upon the cursor entering a richtext window. URL support and cut/paste out of richtext message windows does work. Index: mswindow.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- mswindow.c 19 Mar 2007 09:25:17 -0000 1.50 +++ mswindow.c 19 Mar 2007 19:59:43 -0000 1.51 @@ -2290,8 +2290,12 @@ case WM_MOUSEMOVE: GET_STRUCT_PTR; - /*if (win->hwnd != GetFocus ()) - SetFocus (win->hwnd);*/ + if (richText) /* Richtext windows set focus, we need to get it back + if mouse moves out of the window */ + { + if (win->hwnd != GetFocus ()) + SetFocus (win->hwnd); + } SetCursor (win->cursor); #if defined(MOTION_MOUSE) || defined(XTRA_MESSAGE_UI) @@ -2758,31 +2762,31 @@ GET_STRUCT_PTR; // If we're not in message windows then we'll map wheel up and - // wheel down events as regular mouse events + // wheel down events as regular mouse events if (win->type == WIN_GRAPH || win->type == WIN_TEXT || win->type == WIN_MENU) - { - //BringWindowToTop (hwnd); - //GET_STRUCT_PTR; + { + //BringWindowToTop (hwnd); + //GET_STRUCT_PTR; /* Let's see whether we should process wheel messages */ if (!allowWheelActions) return (1); - STORE_EVENT_MOUSE; - LastPressHwnd = hwnd; + STORE_EVENT_MOUSE; + LastPressHwnd = hwnd; - if (wheel > 0) - { - EventQueue[EventTail].key = W_WHEELUP; - EventQueue[EventTail].type = W_EV_BUTTON; - } - else if (wheel < 0) - { - EventQueue[EventTail].key = W_WHEELDOWN; - EventQueue[EventTail].type = W_EV_BUTTON; - } + if (wheel > 0) + { + EventQueue[EventTail].key = W_WHEELUP; + EventQueue[EventTail].type = W_EV_BUTTON; + } + else if (wheel < 0) + { + EventQueue[EventTail].key = W_WHEELDOWN; + EventQueue[EventTail].type = W_EV_BUTTON; + } return (0); - } + } else if (win->type == WIN_SCROLL) { i = GetScrollPos (hwnd, SB_VERT); @@ -2814,7 +2818,7 @@ SendMessage (win->hwnd, EM_GETRECT, 0, (LPARAM) &r); visline = SendMessage (win->hwnd, EM_GETFIRSTVISIBLELINE, 0, 0); lines = SendMessage (win->hwnd, EM_GETLINECOUNT, 0, 0); - + //LineToConsole("%d visline, %d total lines\n", visline, lines); maxscroll = ((lines - visline) - (r.bottom / W_Textheight)) * W_Textheight; switch (wheel) @@ -5875,9 +5879,8 @@ W_ChangeBorder ((W_Window) win, W_White); break;*/ -/* case WM_KEYDOWN: - LineToConsole ("key down\n"); - return (0);*/ + case WM_KEYDOWN: + return (0); case WM_LBUTTONDOWN: BringWindowToTop (hwnd); break; Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- defaults.c 19 Mar 2007 04:33:51 -0000 1.61 +++ defaults.c 19 Mar 2007 19:59:43 -0000 1.62 @@ -527,6 +527,12 @@ NULL } }, + {"richText", &richText, RC_BOOL, + { + "Use rich text message windows, currently disabled", + NULL + } + }, {"rotatePlanets", &rotatePlanets, RC_BOOL, { "Rotate planets (only works with new planet bitmaps)", @@ -1616,6 +1622,7 @@ doubleBuffering = booleanDefault ("doubleBuffering", doubleBuffering); allowWheelActions = booleanDefault ("allowWheelActions", allowWheelActions); + //richText = booleanDefault ("richText", richText); newQuit = booleanDefault ("newQuit", newQuit); newTeams = booleanDefault ("newTeams", newTeams); soundVolume= intDefault ("soundVolume", soundVolume); Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.69 retrieving revision 1.70 diff -u -d -r1.69 -r1.70 --- data.c 19 Mar 2007 04:33:50 -0000 1.69 +++ data.c 19 Mar 2007 19:59:43 -0000 1.70 @@ -801,7 +801,7 @@ WNDPROC lpfnDefRichEditWndProc; /* default window proc */ -int richText = 0; /* temporary variable to select rich text message windows */ +int richText = 0; /* rich text message windows */ int newQuit = 0; /* new quit clock */ int newTeams = 0; /* new team windows */ int soundVolume = 64; /* Starting sound volume (0-128 range) */ From modemhero at users.sourceforge.net Mon Mar 19 14:59:45 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 19 Mar 2007 19:59:45 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.145, 1.146 netrekrc, 1.43, 1.44 netrekrc_options.txt, 1.39, 1.40 netrekxp.doc, 1.13, 1.14 Message-ID: <20070319225830.81DCA1867D2@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28263/resources/docs Modified Files: changes.txt netrekrc netrekrc_options.txt netrekxp.doc Log Message: Added a disabled richText option. Disabled cause it's buggy in several respects. Requires a windows guru to fix, I've tried several times to fix it completely. Main issues are scrolling (all richtext windows seem to have an extra blank line at the end) and keyboard actions over message windows (messaging is broken with cursor in message windows). Also the order of loading defaults and window creation do not allow the option to be set as a netrekrc option at this time. I did manage to fix the problem with keyboard input being locked out upon the cursor entering a richtext window. URL support and cut/paste out of richtext message windows does work. Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- netrekrc 19 Mar 2007 04:33:50 -0000 1.43 +++ netrekrc 19 Mar 2007 19:59:43 -0000 1.44 @@ -293,6 +293,9 @@ # Report kills reportKills: on +# Use rich text message windows, currently disabled +richText: off + # Rotate planets (only works with new planet bitmaps) rotatePlanets: on Index: netrekxp.doc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekxp.doc,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- netrekxp.doc 18 Mar 2007 16:43:35 -0000 1.13 +++ netrekxp.doc 19 Mar 2007 19:59:43 -0000 1.14 @@ -46,8 +46,10 @@ Many people contributed to the making of NetrekXP, and many many others contributed to its ancestor clients such as COW. Here is an undoubtedly incomplete list of credits presented in no particular order: - Scott Silvey - Kevin Smith + Code Art + + Scott Silvey Pascal Gagnon + Kevin Smith Chris Lukassen Rick Weinstein J. Mark Noworolski Tedd Hadley @@ -72,7 +74,6 @@ Stas Pirogov James Cameron Joe Evango - Pascal Gagnon 3.0 Features Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.145 retrieving revision 1.146 diff -u -d -r1.145 -r1.146 --- changes.txt 19 Mar 2007 04:33:50 -0000 1.145 +++ changes.txt 19 Mar 2007 19:59:43 -0000 1.146 @@ -1,4 +1,5 @@ Netrek XP 2006, Version 1.3: +- some bug fixes related to handling graphics initilization and exit - added "viewRange: (0-2)" option to draw a dashed circle on the map showing the range at which enemies can see you. You can choose to draw it at all times, only when you are cloaked, or not at all. If orbitting a foreign planet, no Index: netrekrc_options.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc_options.txt,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- netrekrc_options.txt 19 Mar 2007 04:33:50 -0000 1.39 +++ netrekrc_options.txt 19 Mar 2007 19:59:43 -0000 1.40 @@ -221,6 +221,7 @@ redrawDelay: (0-10) how many updates to wait before redraw rejectMacro: (on/off) reject macros reportKills: (on/off) report kills +richText: (on/off) use rich text message windows, currently disabled romshipbmpfile: (path) - old color bitmaps romship1bmpfile: (path) - new color bitmaps romshipGbmpfile: (path) - your own ship's grayscale bitmaps From modemhero at users.sourceforge.net Mon Mar 19 14:59:45 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 19 Mar 2007 19:59:45 +0000 Subject: [netrek-cvs] client/netrekxp/include data.h,1.64,1.65 Message-ID: <20070319225858.235B31867D2@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28263/include Modified Files: data.h Log Message: Added a disabled richText option. Disabled cause it's buggy in several respects. Requires a windows guru to fix, I've tried several times to fix it completely. Main issues are scrolling (all richtext windows seem to have an extra blank line at the end) and keyboard actions over message windows (messaging is broken with cursor in message windows). Also the order of loading defaults and window creation do not allow the option to be set as a netrekrc option at this time. I did manage to fix the problem with keyboard input being locked out upon the cursor entering a richtext window. URL support and cut/paste out of richtext message windows does work. Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.64 retrieving revision 1.65 diff -u -d -r1.64 -r1.65 --- data.h 19 Mar 2007 04:33:50 -0000 1.64 +++ data.h 19 Mar 2007 19:59:43 -0000 1.65 @@ -705,7 +705,7 @@ extern WNDPROC lpfnDefRichEditWndProc; /* default window procedure for our richedit controls */ -extern int richText; /* temporary variable to enable/disable rich text windows */ +extern int richText; /* rich text message windows */ extern int newQuit; /* new quit clock */ extern int newTeams; /* new team windows */ extern int soundVolume; /* Starting sound volume (0-128 range) */ From modemhero at users.sourceforge.net Mon Mar 19 14:59:45 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 19 Mar 2007 19:59:45 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C,1.113,1.114 Message-ID: <20070319231231.E4CF21867D2@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28263 Modified Files: NetrekXP to do list.C Log Message: Added a disabled richText option. Disabled cause it's buggy in several respects. Requires a windows guru to fix, I've tried several times to fix it completely. Main issues are scrolling (all richtext windows seem to have an extra blank line at the end) and keyboard actions over message windows (messaging is broken with cursor in message windows). Also the order of loading defaults and window creation do not allow the option to be set as a netrekrc option at this time. I did manage to fix the problem with keyboard input being locked out upon the cursor entering a richtext window. URL support and cut/paste out of richtext message windows does work. Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.113 retrieving revision 1.114 diff -u -d -r1.113 -r1.114 --- NetrekXP to do list.C 19 Mar 2007 09:25:15 -0000 1.113 +++ NetrekXP to do list.C 19 Mar 2007 19:59:42 -0000 1.114 @@ -40,7 +40,7 @@ 7) Some sort of click action on player list brings up a menu with settings for that player's candock, cantranswarp, ban, ignore, etc. 8) Maybe fix galactic new planet bitmap redraw sequence, caused incredible lag on a P166 -Win98 xp computer (already checked for CPU usage, not so bad, plus 50 updates/sec has +Win98 xp computer (already profiled for CPU usage, not so bad, plus 50 updates/sec has more impact). 9) Out of bounds message window calcs don't work with taskbar or menu bar, basewin rect doesn't take these into account. From modemhero at users.sourceforge.net Mon Mar 19 14:59:45 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 19 Mar 2007 19:59:45 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html generalconfig.html, 1.39, 1.40 Message-ID: <20070319231219.AB12BB3F2@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28263/resources/htmlhelp/html Modified Files: generalconfig.html Log Message: Added a disabled richText option. Disabled cause it's buggy in several respects. Requires a windows guru to fix, I've tried several times to fix it completely. Main issues are scrolling (all richtext windows seem to have an extra blank line at the end) and keyboard actions over message windows (messaging is broken with cursor in message windows). Also the order of loading defaults and window creation do not allow the option to be set as a netrekrc option at this time. I did manage to fix the problem with keyboard input being locked out upon the cursor entering a richtext window. URL support and cut/paste out of richtext message windows does work. Index: generalconfig.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/generalconfig.html,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- generalconfig.html 19 Mar 2007 04:33:50 -0000 1.39 +++ generalconfig.html 19 Mar 2007 19:59:43 -0000 1.40 @@ -922,6 +922,16 @@ +richText +Use rich text message windows, currently disabled + +
    +
  • on
  • +
  • off (default)
  • +
+ + + romshipbmpfile Path to Rom bitmaps for old color ships path From modemhero at users.sourceforge.net Wed Mar 21 18:59:52 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 21 Mar 2007 23:59:52 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html generalconfig.html, 1.40, 1.41 Message-ID: <20070322000000.D6A20B42D@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27697/resources/htmlhelp/html Modified Files: generalconfig.html Log Message: Added a "only when carrying" option to view range circle. Fixed up a few macros. Index: generalconfig.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/generalconfig.html,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- generalconfig.html 19 Mar 2007 19:59:43 -0000 1.40 +++ generalconfig.html 21 Mar 2007 23:59:50 -0000 1.41 @@ -1490,8 +1490,9 @@
  • 0 - don't show range circle
  • -
  • 1 (default) - only show circle while cloaked
  • -
  • 2 - always show range circle
  • +
  • 1 - only show circle while cloaked
  • +
  • 2 (default) - only show circle while carrying
  • +
  • 3 - always show range circle
From modemhero at users.sourceforge.net Wed Mar 21 18:59:52 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 21 Mar 2007 23:59:52 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.146, 1.147 netrekrc, 1.44, 1.45 netrekrc_options.txt, 1.40, 1.41 Message-ID: <20070322000000.C6453B429@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27697/resources/docs Modified Files: changes.txt netrekrc netrekrc_options.txt Log Message: Added a "only when carrying" option to view range circle. Fixed up a few macros. Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- netrekrc 19 Mar 2007 19:59:43 -0000 1.44 +++ netrekrc 21 Mar 2007 23:59:49 -0000 1.45 @@ -486,8 +486,9 @@ # Show range at which enemies can see you as a circle on map # 0 - don't show range circle # 1 - only show range circle when cloaked -# 2 - show range circle at all times -viewRange: 1 +# 2 - only show range circle when carrying +# 3 - show range circle at all times +viewRange: 2 # Warn hull state based on damage warnHull: off @@ -875,8 +876,8 @@ macro.Z.A:% \__o__/ macro.z.A:% /-----\ -macro.z.A:% |\ /| The Klew meter (tm) is pointing at %u (%p) -macro.z.A:% | \ / | Eh, it's broken! +macro.z.A:% | | | The Klew meter (tm) is pointing at %u (%p) +macro.z.A:% | | | Eh, he's alright! macro.z.A:% \__o__/ macro.A.A:% /-----\ @@ -970,6 +971,11 @@ macro.9.A:% .:>: .> >. :/*/:./.X__ | macro.9.A:% --------------------:--:--**#:-<<:^/^<**#**#**:._/--------/->--- +mac.^y.A:% __ __ _____ _____ _ +mac.^y.A:% \ \_/ /| ___|| ___| | | It's %u (%p) +mac.^y.A:% \ / | ___||___ | |_| Now we will win! +mac.^y.A:% |_| |_____||_____| (_) + macro.).A:/* Join the netrek clue game mailing list today! At */ macro.).A:/* http://groups.google.com/group/netrek-clue-games */ macro.).A:/* INL-style timed bronco games are every Wednesday */ Index: netrekrc_options.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc_options.txt,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- netrekrc_options.txt 19 Mar 2007 19:59:43 -0000 1.40 +++ netrekrc_options.txt 21 Mar 2007 23:59:49 -0000 1.41 @@ -317,10 +317,11 @@ varyShields: (on/off) change shields graphic on shield damage varyShieldsColor: (on/off) change shields color on shield damage viewBox: (on/off) show tactical window boundaries on map -viewRange: (0-2) show range at which enemies can see you as a circle on map +viewRange: (0-3) show range at which enemies can see you as a circle on map # 0 - don't show range circle # 1 - only show range circle when cloaked -# 2 - show range circle at all times +# 2 - only show range when carrying +# 3 - show range circle at all times warnHull: (on/off) warn hull state based on damage warnShields: (on/off) change shields color on enemy approach Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.146 retrieving revision 1.147 diff -u -d -r1.146 -r1.147 --- changes.txt 19 Mar 2007 19:59:43 -0000 1.146 +++ changes.txt 21 Mar 2007 23:59:49 -0000 1.147 @@ -1,9 +1,9 @@ Netrek XP 2006, Version 1.3: - some bug fixes related to handling graphics initilization and exit -- added "viewRange: (0-2)" option to draw a dashed circle on the map showing +- added "viewRange: (0-3)" option to draw a dashed circle on the map showing the range at which enemies can see you. You can choose to draw it at all times, - only when you are cloaked, or not at all. If orbitting a foreign planet, no - circle is drawn, as you are visible to all. + only when you are cloaked, only when carrying, or not at all. If orbitting a + foreign planet, no circle is drawn, as you are visible to all. - fixed flicker experienced sometimes seen with stationary ships near a planet on the galactic map - the old mono torps are now default. Big torps are nice and all, but I think From modemhero at users.sourceforge.net Wed Mar 21 18:59:52 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 21 Mar 2007 23:59:52 +0000 Subject: [netrek-cvs] client/netrekxp/src data.c, 1.70, 1.71 defaults.c, 1.62, 1.63 map.c, 1.34, 1.35 option.c, 1.40, 1.41 Message-ID: <20070322000000.B2933B40B@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27697/src Modified Files: data.c defaults.c map.c option.c Log Message: Added a "only when carrying" option to view range circle. Fixed up a few macros. Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.70 retrieving revision 1.71 diff -u -d -r1.70 -r1.71 --- data.c 19 Mar 2007 19:59:43 -0000 1.70 +++ data.c 21 Mar 2007 23:59:50 -0000 1.71 @@ -781,7 +781,7 @@ int omitTeamLetter = 0; int viewBox = 1; -int viewRange = 1; +int viewRange = 2; struct stringlist *defaults = NULL; Index: map.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- map.c 19 Mar 2007 04:00:29 -0000 1.34 +++ map.c 21 Mar 2007 23:59:50 -0000 1.35 @@ -1037,6 +1037,8 @@ (planets[j->p_planet].pl_owner != j->p_team)) ; /* Don't draw if uncloaked and viewRange is 1 */ else if (!(j->p_flags & PFCLOAK) && viewRange == 1) ; + /* Don't draw if not carrying and viewRange is 2 */ + else if (j->p_armies == 0 && viewRange == 2) ; else { struct planet *pl; Index: option.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- option.c 19 Mar 2007 04:00:31 -0000 1.40 +++ option.c 21 Mar 2007 23:59:50 -0000 1.41 @@ -177,7 +177,8 @@ }; static char *viewrangemess[] = { "Don't show range circle", - "Only show range circle when cloaked", + "Only show range circle if cloaked", + "Only show range circle if carrying", "Show range circle at all times", "" }; Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- defaults.c 19 Mar 2007 19:59:43 -0000 1.62 +++ defaults.c 21 Mar 2007 23:59:50 -0000 1.63 @@ -907,7 +907,8 @@ "Show range at which enemies can see you as a circle on map", "0 - Don't show range circle", "1 - Only show range circle when cloaked", - "2 - Show range circle at all times", + "2 - Only show range circle when carrying", + "3 - Show range circle at all times", NULL } }, From modemhero at users.sourceforge.net Wed Mar 21 18:59:51 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 21 Mar 2007 23:59:51 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.114, 1.115 clientr.suo, 1.105, 1.106 Message-ID: <20070322000000.AAFEDB406@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27697 Modified Files: NetrekXP to do list.C clientr.suo Log Message: Added a "only when carrying" option to view range circle. Fixed up a few macros. Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.114 retrieving revision 1.115 diff -u -d -r1.114 -r1.115 --- NetrekXP to do list.C 19 Mar 2007 19:59:42 -0000 1.114 +++ NetrekXP to do list.C 21 Mar 2007 23:59:48 -0000 1.115 @@ -16,7 +16,6 @@ 9) on daemon exit in newbie/pret, kill any hosed bot slots 10) end game bots are stupid, and on timericide don't act right 11) feature packet for rank names and requirements -12) final planet count and cscore would be nice in pw_stats 15) phaser misses have the client computer phaser length, but with phaser upgrades, this causes a mismatch in the actual phaser length for other players. Server needs to somehow relay phaser damage values for other ships, perhaps in generic_32? Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.105 retrieving revision 1.106 diff -u -d -r1.105 -r1.106 Binary files /tmp/cvsfPBp4Z and /tmp/cvs2coMsL differ From modemhero at users.sourceforge.net Thu Mar 22 01:40:21 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 22 Mar 2007 06:40:21 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.147, 1.148 netrekrc_options.txt, 1.41, 1.42 Message-ID: <20070322064031.D528E1867E7@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21756/resources/docs Modified Files: changes.txt netrekrc_options.txt Log Message: Restored ability for middle and right mouse clicks to raise the current window to the top, helps with overlapped windows Removed the netrek.w32caption option that was undocumented and has since been replaced by the mainTitleBar option Index: netrekrc_options.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc_options.txt,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- netrekrc_options.txt 21 Mar 2007 23:59:49 -0000 1.41 +++ netrekrc_options.txt 22 Mar 2007 06:40:18 -0000 1.42 @@ -120,7 +120,6 @@ mouseAsShift: (on/off) use mouse buttons to switch keymaps mungScrollbarColors: (on/off) set scrollbar colors to match background colors name: (string) character nick name -netrek.w32caption: (on/off) when off - shows titlebar in netrek window newDashboard: (0-3) dashboard style # 0 - Text # 1 - COW Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.147 retrieving revision 1.148 diff -u -d -r1.147 -r1.148 --- changes.txt 21 Mar 2007 23:59:49 -0000 1.147 +++ changes.txt 22 Mar 2007 06:40:18 -0000 1.148 @@ -1,4 +1,8 @@ Netrek XP 2006, Version 1.3: +- restored ability for middle and right mouse clicks to raise the current window to the + top, helps with overlapped windows +- removed the netrek.w32caption option that was undocumented and has since been replaced + by the mainTitleBar option - some bug fixes related to handling graphics initilization and exit - added "viewRange: (0-3)" option to draw a dashed circle on the map showing the range at which enemies can see you. You can choose to draw it at all times, From modemhero at users.sourceforge.net Thu Mar 22 01:40:21 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 22 Mar 2007 06:40:21 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C,1.115,1.116 Message-ID: <20070322064031.D33FAB432@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21756 Modified Files: NetrekXP to do list.C Log Message: Restored ability for middle and right mouse clicks to raise the current window to the top, helps with overlapped windows Removed the netrek.w32caption option that was undocumented and has since been replaced by the mainTitleBar option Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.115 retrieving revision 1.116 diff -u -d -r1.115 -r1.116 --- NetrekXP to do list.C 21 Mar 2007 23:59:48 -0000 1.115 +++ NetrekXP to do list.C 22 Mar 2007 06:40:15 -0000 1.116 @@ -46,6 +46,7 @@ 10) sendto() error: 10049 on metaserver connect to a bad server, believe it's due to hostname not resolving. Currently fixed by using mulitple attempts to resolve bad host names. +13) _ bug with backspace and messages in HUD Stas's list: - color coded (?) and scrollable playerlist. From modemhero at users.sourceforge.net Thu Mar 22 01:40:23 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 22 Mar 2007 06:40:23 +0000 Subject: [netrek-cvs] client/netrekxp/src mswindow.c, 1.51, 1.52 smessage.c, 1.5, 1.6 Message-ID: <20070322064033.BA1B61867E9@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21756/src Modified Files: mswindow.c smessage.c Log Message: Restored ability for middle and right mouse clicks to raise the current window to the top, helps with overlapped windows Removed the netrek.w32caption option that was undocumented and has since been replaced by the mainTitleBar option Index: mswindow.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- mswindow.c 19 Mar 2007 19:59:43 -0000 1.51 +++ mswindow.c 22 Mar 2007 06:40:18 -0000 1.52 @@ -1486,8 +1486,6 @@ ShowWindow (win->hwnd, SW_SHOWNORMAL); BringWindowToTop (win->hwnd); - if (window == baseWin && !booleanDefault ("netrek.w32caption", 1)) - PostMessage (win->hwnd, WM_SYSKEYDOWN, VK_RETURN, 0); } //Hides the window. @@ -2054,7 +2052,7 @@ case WM_MBUTTONDOWN: - //BringWindowToTop (hwnd); + BringWindowToTop (hwnd); GET_STRUCT_PTR; STORE_EVENT_MOUSE; @@ -2085,7 +2083,7 @@ return (0); case WM_RBUTTONDOWN: - //BringWindowToTop (hwnd); + BringWindowToTop (hwnd); GET_STRUCT_PTR; STORE_EVENT_MOUSE; Index: smessage.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/smessage.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- smessage.c 1 Mar 2007 07:35:45 -0000 1.5 +++ smessage.c 22 Mar 2007 06:40:21 -0000 1.6 @@ -53,7 +53,10 @@ #ifdef XTRA_MESSAGE_UI if (HUDoffset) + { + //W_WriteText (w, 5 + W_Textwidth * length, HUDoffset, textColor, " ", 1, W_RegularFont); W_WriteText (w, 5, HUDoffset, textColor, tmp, length, W_RegularFont); + } #endif W_WriteText (messagew, 5, 5, textColor, tmp, length, W_RegularFont); } From modemhero at users.sourceforge.net Thu Mar 22 01:40:21 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 22 Mar 2007 06:40:21 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html generalconfig.html, 1.41, 1.42 Message-ID: <20070322064100.1AFAA1867E7@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21756/resources/htmlhelp/html Modified Files: generalconfig.html Log Message: Restored ability for middle and right mouse clicks to raise the current window to the top, helps with overlapped windows Removed the netrek.w32caption option that was undocumented and has since been replaced by the mainTitleBar option Index: generalconfig.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/generalconfig.html,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- generalconfig.html 21 Mar 2007 23:59:50 -0000 1.41 +++ generalconfig.html 22 Mar 2007 06:40:18 -0000 1.42 @@ -612,16 +612,6 @@ string -netrek.w32caption -Hide titlebar in the main window - -
    -
  • on (default) - hide titlebar
  • -
  • off - show titlebar
  • -
- - - newDashboard Dashboard style From modemhero at users.sourceforge.net Sun Mar 25 17:09:45 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 25 Mar 2007 22:09:45 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.116, 1.117 build.cmd, 1.24, 1.25 clientr.suo, 1.106, 1.107 Message-ID: <20070325220954.4CCB8B456@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv8797 Modified Files: NetrekXP to do list.C build.cmd clientr.suo Log Message: Added few bugs to todo list. Added commented out lines to build script to build starbase mono bitmaps as non-rotating (per a user request for these bitmaps). Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.116 retrieving revision 1.117 diff -u -d -r1.116 -r1.117 --- NetrekXP to do list.C 22 Mar 2007 06:40:15 -0000 1.116 +++ NetrekXP to do list.C 25 Mar 2007 22:09:41 -0000 1.117 @@ -46,6 +46,8 @@ 10) sendto() error: 10049 on metaserver connect to a bad server, believe it's due to hostname not resolving. Currently fixed by using mulitple attempts to resolve bad host names. +11) mouse click repeat rate +12) range circle overwrite border with anything but HR bitmap set 13) _ bug with backspace and messages in HUD Stas's list: Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.106 retrieving revision 1.107 diff -u -d -r1.106 -r1.107 Binary files /tmp/cvsWvORw6 and /tmp/cvsVfOTNn differ Index: build.cmd =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/build.cmd,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- build.cmd 14 Mar 2007 23:23:59 -0000 1.24 +++ build.cmd 25 Mar 2007 22:09:41 -0000 1.25 @@ -149,6 +149,7 @@ %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 1x32 fed_dd01.bmp fed_dd02.bmp fed_dd03.bmp fed_dd04.bmp fed_dd05.bmp fed_dd06.bmp fed_dd07.bmp fed_dd08.bmp fed_dd09.bmp fed_dd10.bmp fed_dd11.bmp fed_dd12.bmp fed_dd13.bmp fed_dd14.bmp fed_dd15.bmp fed_dd16.bmp fed_dd17.bmp fed_dd18.bmp fed_dd19.bmp fed_dd20.bmp fed_dd21.bmp fed_dd22.bmp fed_dd23.bmp fed_dd24.bmp fed_dd25.bmp fed_dd26.bmp fed_dd27.bmp fed_dd28.bmp fed_dd29.bmp fed_dd30.bmp fed_dd31.bmp fed_dd32.bmp fed_dd.bmp %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 1x32 fed_ga01.bmp fed_ga02.bmp fed_ga03.bmp fed_ga04.bmp fed_ga05.bmp fed_ga06.bmp fed_ga07.bmp fed_ga08.bmp fed_ga09.bmp fed_ga10.bmp fed_ga11.bmp fed_ga12.bmp fed_ga13.bmp fed_ga14.bmp fed_ga15.bmp fed_ga16.bmp fed_ga17.bmp fed_ga18.bmp fed_ga19.bmp fed_ga20.bmp fed_ga21.bmp fed_ga22.bmp fed_ga23.bmp fed_ga24.bmp fed_ga25.bmp fed_ga26.bmp fed_ga27.bmp fed_ga28.bmp fed_ga29.bmp fed_ga30.bmp fed_ga31.bmp fed_ga32.bmp fed_ga.bmp %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 1x32 fed_sb01.bmp fed_sb02.bmp fed_sb03.bmp fed_sb04.bmp fed_sb05.bmp fed_sb06.bmp fed_sb07.bmp fed_sb08.bmp fed_sb09.bmp fed_sb10.bmp fed_sb11.bmp fed_sb12.bmp fed_sb13.bmp fed_sb14.bmp fed_sb15.bmp fed_sb16.bmp fed_sb17.bmp fed_sb18.bmp fed_sb19.bmp fed_sb20.bmp fed_sb21.bmp fed_sb22.bmp fed_sb23.bmp fed_sb24.bmp fed_sb25.bmp fed_sb26.bmp fed_sb27.bmp fed_sb28.bmp fed_sb29.bmp fed_sb30.bmp fed_sb31.bmp fed_sb32.bmp fed_sb.bmp +::%MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 1x32 fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb01.bmp fed_sb.bmp %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 1x32 fed_sc01.bmp fed_sc02.bmp fed_sc03.bmp fed_sc04.bmp fed_sc05.bmp fed_sc06.bmp fed_sc07.bmp fed_sc08.bmp fed_sc09.bmp fed_sc10.bmp fed_sc11.bmp fed_sc12.bmp fed_sc13.bmp fed_sc14.bmp fed_sc15.bmp fed_sc16.bmp fed_sc17.bmp fed_sc18.bmp fed_sc19.bmp fed_sc20.bmp fed_sc21.bmp fed_sc22.bmp fed_sc23.bmp fed_sc24.bmp fed_sc25.bmp fed_sc26.bmp fed_sc27.bmp fed_sc28.bmp fed_sc29.bmp fed_sc30.bmp fed_sc31.bmp fed_sc32.bmp fed_sc.bmp %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 8x1 fed_sc.bmp fed_dd.bmp fed_ca.bmp fed_bb.bmp fed_as.bmp fed_sb.bmp fed_ga.bmp fed_at.bmp fedshipM.bmp popd @@ -161,6 +162,7 @@ %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 1x32 ind_dd01.bmp ind_dd02.bmp ind_dd03.bmp ind_dd04.bmp ind_dd05.bmp ind_dd06.bmp ind_dd07.bmp ind_dd08.bmp ind_dd09.bmp ind_dd10.bmp ind_dd11.bmp ind_dd12.bmp ind_dd13.bmp ind_dd14.bmp ind_dd15.bmp ind_dd16.bmp ind_dd17.bmp ind_dd18.bmp ind_dd19.bmp ind_dd20.bmp ind_dd21.bmp ind_dd22.bmp ind_dd23.bmp ind_dd24.bmp ind_dd25.bmp ind_dd26.bmp ind_dd27.bmp ind_dd28.bmp ind_dd29.bmp ind_dd30.bmp ind_dd31.bmp ind_dd32.bmp ind_dd.bmp %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 1x32 ind_ga01.bmp ind_ga02.bmp ind_ga03.bmp ind_ga04.bmp ind_ga05.bmp ind_ga06.bmp ind_ga07.bmp ind_ga08.bmp ind_ga09.bmp ind_ga10.bmp ind_ga11.bmp ind_ga12.bmp ind_ga13.bmp ind_ga14.bmp ind_ga15.bmp ind_ga16.bmp ind_ga17.bmp ind_ga18.bmp ind_ga19.bmp ind_ga20.bmp ind_ga21.bmp ind_ga22.bmp ind_ga23.bmp ind_ga24.bmp ind_ga25.bmp ind_ga26.bmp ind_ga27.bmp ind_ga28.bmp ind_ga29.bmp ind_ga30.bmp ind_ga31.bmp ind_ga32.bmp ind_ga.bmp %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 1x32 ind_sb01.bmp ind_sb02.bmp ind_sb03.bmp ind_sb04.bmp ind_sb05.bmp ind_sb06.bmp ind_sb07.bmp ind_sb08.bmp ind_sb09.bmp ind_sb10.bmp ind_sb11.bmp ind_sb12.bmp ind_sb13.bmp ind_sb14.bmp ind_sb15.bmp ind_sb16.bmp ind_sb17.bmp ind_sb18.bmp ind_sb19.bmp ind_sb20.bmp ind_sb21.bmp ind_sb22.bmp ind_sb23.bmp ind_sb24.bmp ind_sb25.bmp ind_sb26.bmp ind_sb27.bmp ind_sb28.bmp ind_sb29.bmp ind_sb30.bmp ind_sb31.bmp ind_sb32.bmp ind_sb.bmp +::%MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 1x32 ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb01.bmp ind_sb.bmp %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 1x32 ind_sc01.bmp ind_sc02.bmp ind_sc03.bmp ind_sc04.bmp ind_sc05.bmp ind_sc06.bmp ind_sc07.bmp ind_sc08.bmp ind_sc09.bmp ind_sc10.bmp ind_sc11.bmp ind_sc12.bmp ind_sc13.bmp ind_sc14.bmp ind_sc15.bmp ind_sc16.bmp ind_sc17.bmp ind_sc18.bmp ind_sc19.bmp ind_sc20.bmp ind_sc21.bmp ind_sc22.bmp ind_sc23.bmp ind_sc24.bmp ind_sc25.bmp ind_sc26.bmp ind_sc27.bmp ind_sc28.bmp ind_sc29.bmp ind_sc30.bmp ind_sc31.bmp ind_sc32.bmp ind_sc.bmp %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 8x1 ind_sc.bmp ind_dd.bmp ind_ca.bmp ind_bb.bmp ind_as.bmp ind_sb.bmp ind_ga.bmp ind_at.bmp indshipM.bmp popd @@ -173,6 +175,7 @@ %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 1x32 kli_dd01.bmp kli_dd02.bmp kli_dd03.bmp kli_dd04.bmp kli_dd05.bmp kli_dd06.bmp kli_dd07.bmp kli_dd08.bmp kli_dd09.bmp kli_dd10.bmp kli_dd11.bmp kli_dd12.bmp kli_dd13.bmp kli_dd14.bmp kli_dd15.bmp kli_dd16.bmp kli_dd17.bmp kli_dd18.bmp kli_dd19.bmp kli_dd20.bmp kli_dd21.bmp kli_dd22.bmp kli_dd23.bmp kli_dd24.bmp kli_dd25.bmp kli_dd26.bmp kli_dd27.bmp kli_dd28.bmp kli_dd29.bmp kli_dd30.bmp kli_dd31.bmp kli_dd32.bmp kli_dd.bmp %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 1x32 kli_ga01.bmp kli_ga02.bmp kli_ga03.bmp kli_ga04.bmp kli_ga05.bmp kli_ga06.bmp kli_ga07.bmp kli_ga08.bmp kli_ga09.bmp kli_ga10.bmp kli_ga11.bmp kli_ga12.bmp kli_ga13.bmp kli_ga14.bmp kli_ga15.bmp kli_ga16.bmp kli_ga17.bmp kli_ga18.bmp kli_ga19.bmp kli_ga20.bmp kli_ga21.bmp kli_ga22.bmp kli_ga23.bmp kli_ga24.bmp kli_ga25.bmp kli_ga26.bmp kli_ga27.bmp kli_ga28.bmp kli_ga29.bmp kli_ga30.bmp kli_ga31.bmp kli_ga32.bmp kli_ga.bmp %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 1x32 kli_sb01.bmp kli_sb02.bmp kli_sb03.bmp kli_sb04.bmp kli_sb05.bmp kli_sb06.bmp kli_sb07.bmp kli_sb08.bmp kli_sb09.bmp kli_sb10.bmp kli_sb11.bmp kli_sb12.bmp kli_sb13.bmp kli_sb14.bmp kli_sb15.bmp kli_sb16.bmp kli_sb17.bmp kli_sb18.bmp kli_sb19.bmp kli_sb20.bmp kli_sb21.bmp kli_sb22.bmp kli_sb23.bmp kli_sb24.bmp kli_sb25.bmp kli_sb26.bmp kli_sb27.bmp kli_sb28.bmp kli_sb29.bmp kli_sb30.bmp kli_sb31.bmp kli_sb32.bmp kli_sb.bmp +::%MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 1x32 kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb01.bmp kli_sb.bmp %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 1x32 kli_sc01.bmp kli_sc02.bmp kli_sc03.bmp kli_sc04.bmp kli_sc05.bmp kli_sc06.bmp kli_sc07.bmp kli_sc08.bmp kli_sc09.bmp kli_sc10.bmp kli_sc11.bmp kli_sc12.bmp kli_sc13.bmp kli_sc14.bmp kli_sc15.bmp kli_sc16.bmp kli_sc17.bmp kli_sc18.bmp kli_sc19.bmp kli_sc20.bmp kli_sc21.bmp kli_sc22.bmp kli_sc23.bmp kli_sc24.bmp kli_sc25.bmp kli_sc26.bmp kli_sc27.bmp kli_sc28.bmp kli_sc29.bmp kli_sc30.bmp kli_sc31.bmp kli_sc32.bmp kli_sc.bmp %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 8x1 kli_sc.bmp kli_dd.bmp kli_ca.bmp kli_bb.bmp kli_as.bmp kli_sb.bmp kli_ga.bmp kli_at.bmp klishipM.bmp popd @@ -185,6 +188,7 @@ %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 1x32 ori_dd01.bmp ori_dd02.bmp ori_dd03.bmp ori_dd04.bmp ori_dd05.bmp ori_dd06.bmp ori_dd07.bmp ori_dd08.bmp ori_dd09.bmp ori_dd10.bmp ori_dd11.bmp ori_dd12.bmp ori_dd13.bmp ori_dd14.bmp ori_dd15.bmp ori_dd16.bmp ori_dd17.bmp ori_dd18.bmp ori_dd19.bmp ori_dd20.bmp ori_dd21.bmp ori_dd22.bmp ori_dd23.bmp ori_dd24.bmp ori_dd25.bmp ori_dd26.bmp ori_dd27.bmp ori_dd28.bmp ori_dd29.bmp ori_dd30.bmp ori_dd31.bmp ori_dd32.bmp ori_dd.bmp %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 1x32 ori_ga01.bmp ori_ga02.bmp ori_ga03.bmp ori_ga04.bmp ori_ga05.bmp ori_ga06.bmp ori_ga07.bmp ori_ga08.bmp ori_ga09.bmp ori_ga10.bmp ori_ga11.bmp ori_ga12.bmp ori_ga13.bmp ori_ga14.bmp ori_ga15.bmp ori_ga16.bmp ori_ga17.bmp ori_ga18.bmp ori_ga19.bmp ori_ga20.bmp ori_ga21.bmp ori_ga22.bmp ori_ga23.bmp ori_ga24.bmp ori_ga25.bmp ori_ga26.bmp ori_ga27.bmp ori_ga28.bmp ori_ga29.bmp ori_ga30.bmp ori_ga31.bmp ori_ga32.bmp ori_ga.bmp %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 1x32 ori_sb01.bmp ori_sb02.bmp ori_sb03.bmp ori_sb04.bmp ori_sb05.bmp ori_sb06.bmp ori_sb07.bmp ori_sb08.bmp ori_sb09.bmp ori_sb10.bmp ori_sb11.bmp ori_sb12.bmp ori_sb13.bmp ori_sb14.bmp ori_sb15.bmp ori_sb16.bmp ori_sb17.bmp ori_sb18.bmp ori_sb19.bmp ori_sb20.bmp ori_sb21.bmp ori_sb22.bmp ori_sb23.bmp ori_sb24.bmp ori_sb25.bmp ori_sb26.bmp ori_sb27.bmp ori_sb28.bmp ori_sb29.bmp ori_sb30.bmp ori_sb31.bmp ori_sb32.bmp ori_sb.bmp +::%MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 1x32 ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb01.bmp ori_sb.bmp %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 1x32 ori_sc01.bmp ori_sc02.bmp ori_sc03.bmp ori_sc04.bmp ori_sc05.bmp ori_sc06.bmp ori_sc07.bmp ori_sc08.bmp ori_sc09.bmp ori_sc10.bmp ori_sc11.bmp ori_sc12.bmp ori_sc13.bmp ori_sc14.bmp ori_sc15.bmp ori_sc16.bmp ori_sc17.bmp ori_sc18.bmp ori_sc19.bmp ori_sc20.bmp ori_sc21.bmp ori_sc22.bmp ori_sc23.bmp ori_sc24.bmp ori_sc25.bmp ori_sc26.bmp ori_sc27.bmp ori_sc28.bmp ori_sc29.bmp ori_sc30.bmp ori_sc31.bmp ori_sc32.bmp ori_sc.bmp %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 8x1 ori_sc.bmp ori_dd.bmp ori_ca.bmp ori_bb.bmp ori_as.bmp ori_sb.bmp ori_ga.bmp ori_at.bmp orishipM.bmp popd @@ -197,6 +201,7 @@ %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 1x32 rom_dd01.bmp rom_dd02.bmp rom_dd03.bmp rom_dd04.bmp rom_dd05.bmp rom_dd06.bmp rom_dd07.bmp rom_dd08.bmp rom_dd09.bmp rom_dd10.bmp rom_dd11.bmp rom_dd12.bmp rom_dd13.bmp rom_dd14.bmp rom_dd15.bmp rom_dd16.bmp rom_dd17.bmp rom_dd18.bmp rom_dd19.bmp rom_dd20.bmp rom_dd21.bmp rom_dd22.bmp rom_dd23.bmp rom_dd24.bmp rom_dd25.bmp rom_dd26.bmp rom_dd27.bmp rom_dd28.bmp rom_dd29.bmp rom_dd30.bmp rom_dd31.bmp rom_dd32.bmp rom_dd.bmp %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 1x32 rom_ga01.bmp rom_ga02.bmp rom_ga03.bmp rom_ga04.bmp rom_ga05.bmp rom_ga06.bmp rom_ga07.bmp rom_ga08.bmp rom_ga09.bmp rom_ga10.bmp rom_ga11.bmp rom_ga12.bmp rom_ga13.bmp rom_ga14.bmp rom_ga15.bmp rom_ga16.bmp rom_ga17.bmp rom_ga18.bmp rom_ga19.bmp rom_ga20.bmp rom_ga21.bmp rom_ga22.bmp rom_ga23.bmp rom_ga24.bmp rom_ga25.bmp rom_ga26.bmp rom_ga27.bmp rom_ga28.bmp rom_ga29.bmp rom_ga30.bmp rom_ga31.bmp rom_ga32.bmp rom_ga.bmp %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 1x32 rom_sb01.bmp rom_sb02.bmp rom_sb03.bmp rom_sb04.bmp rom_sb05.bmp rom_sb06.bmp rom_sb07.bmp rom_sb08.bmp rom_sb09.bmp rom_sb10.bmp rom_sb11.bmp rom_sb12.bmp rom_sb13.bmp rom_sb14.bmp rom_sb15.bmp rom_sb16.bmp rom_sb17.bmp rom_sb18.bmp rom_sb19.bmp rom_sb20.bmp rom_sb21.bmp rom_sb22.bmp rom_sb23.bmp rom_sb24.bmp rom_sb25.bmp rom_sb26.bmp rom_sb27.bmp rom_sb28.bmp rom_sb29.bmp rom_sb30.bmp rom_sb31.bmp rom_sb32.bmp rom_sb.bmp +::%MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 1x32 rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb01.bmp rom_sb.bmp %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 1x32 rom_sc01.bmp rom_sc02.bmp rom_sc03.bmp rom_sc04.bmp rom_sc05.bmp rom_sc06.bmp rom_sc07.bmp rom_sc08.bmp rom_sc09.bmp rom_sc10.bmp rom_sc11.bmp rom_sc12.bmp rom_sc13.bmp rom_sc14.bmp rom_sc15.bmp rom_sc16.bmp rom_sc17.bmp rom_sc18.bmp rom_sc19.bmp rom_sc20.bmp rom_sc21.bmp rom_sc22.bmp rom_sc23.bmp rom_sc24.bmp rom_sc25.bmp rom_sc26.bmp rom_sc27.bmp rom_sc28.bmp rom_sc29.bmp rom_sc30.bmp rom_sc31.bmp rom_sc32.bmp rom_sc.bmp %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 8x1 rom_sc.bmp rom_dd.bmp rom_ca.bmp rom_bb.bmp rom_as.bmp rom_sb.bmp rom_ga.bmp rom_at.bmp romshipM.bmp popd From modemhero at users.sourceforge.net Sun Mar 25 17:20:56 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 25 Mar 2007 22:20:56 +0000 Subject: [netrek-cvs] client/netrekxp/src local.c,1.78,1.79 Message-ID: <20070325222105.150B3B458@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv15530/src Modified Files: local.c Log Message: Changed border refresh to happen at 10/second for all bitmap sets rather than just the high res bitmaps. As now there are several things that ignore borders (high res ships, range circles) it just makes more sense to redraw borders semi-constantly. Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.78 retrieving revision 1.79 diff -u -d -r1.78 -r1.79 --- local.c 19 Mar 2007 00:05:13 -0000 1.78 +++ local.c 25 Mar 2007 22:20:53 -0000 1.79 @@ -2472,11 +2472,11 @@ break; } } - /* Force a border redraw? Only needed for bitmaps rotated realtime, due - to the overwriting border issue. Also, very CPU expensive to write + /* Force a border redraw? Bitmaps rotated realtime as well as viewRange circles + will overwrite the border. Since it is very CPU expensive to write rectangles (drawborder function) to the active window, especially if double - buffering is off, so let's slow down redraws to at most 10 per second */ - else if (colorClient == 4) + buffering is off, let's slow down redraws to at most 10 per second */ + else { static int border_refresh = 0; From modemhero at users.sourceforge.net Sun Mar 25 17:20:55 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 25 Mar 2007 22:20:55 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C,1.117,1.118 Message-ID: <20070325222104.E0245B456@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv15530 Modified Files: NetrekXP to do list.C Log Message: Changed border refresh to happen at 10/second for all bitmap sets rather than just the high res bitmaps. As now there are several things that ignore borders (high res ships, range circles) it just makes more sense to redraw borders semi-constantly. Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.117 retrieving revision 1.118 diff -u -d -r1.117 -r1.118 --- NetrekXP to do list.C 25 Mar 2007 22:09:41 -0000 1.117 +++ NetrekXP to do list.C 25 Mar 2007 22:20:52 -0000 1.118 @@ -47,7 +47,6 @@ to hostname not resolving. Currently fixed by using mulitple attempts to resolve bad host names. 11) mouse click repeat rate -12) range circle overwrite border with anything but HR bitmap set 13) _ bug with backspace and messages in HUD Stas's list: From modemhero at users.sourceforge.net Sun Mar 25 18:44:37 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 25 Mar 2007 23:44:37 +0000 Subject: [netrek-cvs] client/netrekxp/include data.h,1.65,1.66 Message-ID: <20070325234447.2B2ADB45C@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21338/include Modified Files: data.h Log Message: Backend for new options clickDelay (controls continous mouse repeat rate) and packetLights (show packets via 2 blinking dots on dash). Taken from TedTurner client. Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.65 retrieving revision 1.66 diff -u -d -r1.65 -r1.66 --- data.h 19 Mar 2007 19:59:43 -0000 1.65 +++ data.h 25 Mar 2007 23:44:35 -0000 1.66 @@ -478,6 +478,7 @@ extern int continuousMouse; extern int continuousMouseFix; extern int motionThresh; +extern int clickDelay; extern int motion_mouse_enablable; extern int motion_mouse_steering; @@ -722,4 +723,5 @@ extern int lockLine; /* draw dashed line on map from you to lock target */ extern int weaponsOnMap; /* draw weapons fire on map */ extern int sortPlanets; /* sort planet list by team and army count */ +extern int packetLights; /* show packet send/receive via dashboard */ #endif /* _h_data */ From modemhero at users.sourceforge.net Sun Mar 25 18:44:39 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 25 Mar 2007 23:44:39 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html generalconfig.html, 1.42, 1.43 Message-ID: <20070325234447.934B1B450@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21338/resources/htmlhelp/html Modified Files: generalconfig.html Log Message: Backend for new options clickDelay (controls continous mouse repeat rate) and packetLights (show packets via 2 blinking dots on dash). Taken from TedTurner client. Index: generalconfig.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/generalconfig.html,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- generalconfig.html 22 Mar 2007 06:40:18 -0000 1.42 +++ generalconfig.html 25 Mar 2007 23:44:37 -0000 1.43 @@ -133,6 +133,11 @@ string +clickDelay +Delay before continuous mouse clicks, in updates +integer
default: 0
to disable: 0 + + cloakChars What characters display on galaxy for cloaked player two characters @@ -688,7 +693,16 @@ Path to Ori monochrome bitmaps path - + +packetLights +Show packets sent and received by blinking dashboard lights + +
    +
  • on (default)
  • +
  • off
  • +
+ + partitionPlist Separate teams by a blank line in the player list From modemhero at users.sourceforge.net Sun Mar 25 18:44:39 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 25 Mar 2007 23:44:39 +0000 Subject: [netrek-cvs] client/netrekxp/src data.c, 1.71, 1.72 defaults.c, 1.63, 1.64 option.c, 1.41, 1.42 Message-ID: <20070325234449.9440E186826@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21338/src Modified Files: data.c defaults.c option.c Log Message: Backend for new options clickDelay (controls continous mouse repeat rate) and packetLights (show packets via 2 blinking dots on dash). Taken from TedTurner client. Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- defaults.c 21 Mar 2007 23:59:50 -0000 1.63 +++ defaults.c 25 Mar 2007 23:44:37 -0000 1.64 @@ -95,6 +95,14 @@ NULL } }, +#ifdef MOTION_MOUSE + {"clickDelay", &clickDelay, RC_INT, + { + "Delay before continuous mouse clicks, in updates (0 = no delay)", + NULL + } + }, +#endif {"colorClient", &colorClient, RC_INT, { "What type of ship bitmaps to use", @@ -382,6 +390,12 @@ NULL } }, + {"packetLights", &packetLights, RC_BOOL, + { + "Show packets sent and received by blinking dashboard lights", + NULL + } + }, {"partitionPlist", &partitionPlist, RC_BOOL, { "Add space between teams in player list", @@ -1637,7 +1651,8 @@ tractorID = booleanDefault ("tractorID", tractorID); lockLine = booleanDefault ("lockLine", lockLine); weaponsOnMap = booleanDefault ("weaponsOnMap", weaponsOnMap); - sortPlanets = booleanDefault ("sortPlanets", sortPlanets); + sortPlanets = booleanDefault ("sortPlanets", sortPlanets); + packetLights = booleanDefault ("packetLights", packetLights); tpDotDist = intDefault ("tpDotDist", tpDotDist); omitTeamLetter = booleanDefault ("omitTeamLetter", omitTeamLetter); beepOnPrivateMessage = booleanDefault ("beepOnPrivateMessage", beepOnPrivateMessage); @@ -1797,6 +1812,7 @@ continuousMouseFix = booleanDefault ("continuousMouseFix", continuousMouseFix); motionThresh = intDefault ("motionThresh", motionThresh); + clickDelay = intDefault ("clickDelay", clickDelay); #endif #ifdef SHIFTED_MOUSE Index: option.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- option.c 21 Mar 2007 23:59:50 -0000 1.41 +++ option.c 25 Mar 2007 23:44:37 -0000 1.42 @@ -246,6 +246,10 @@ struct int_range messagehud_range = { 0, 2, 1 }; #endif +#ifdef MOTION_MOUSE +struct int_range clickdelay_range = { 0, 50, 1 }; +#endif + struct int_range playerlistobserver_range = { 0, 4, 1 }; struct int_range planetbitmaprange = { 0, 3, 1 }; @@ -329,6 +333,7 @@ #ifdef MOTION_MOUSE {1, "use continuous mouse", &continuousMouse, 0, 0, 0, NULL, NULL}, {1, "fix continuous mouse", &continuousMouseFix, 0, 0, 0, NULL, NULL}, + {1, "%d updates repeat delay", &clickDelay, 0, 0, 0, NULL, &clickdelay_range}, #endif {1, "allow wheel actions", &allowWheelActions, 0, 0, 0, NULL, NULL}, {1, "new keymap entries: %s", 0, 0, newkeys, 13, NULL, NULL}, @@ -399,6 +404,7 @@ {0, "Visuals Menu", &MenuPage, 0, 0, 0, NULL, &Menus_Range}, {1, "Page %d (click to change)", &MenuPage, 0, 0, 0, NULL, &Menus_Range}, {1, "", &newDashboard, 0, 0, 0, dashboardoptions, NULL}, + {1, "show packet lights", &packetLights, 0, 0, 0, NULL, NULL}, {1, "", &timerType, 0, 0, 0, timermess, NULL}, {1, "keep info on for %d x .1s (0=perm)", &keepInfo, 0, 0, 0, 0, &keepInfo_range}, #ifdef BEEPLITE Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.71 retrieving revision 1.72 diff -u -d -r1.71 -r1.72 --- data.c 21 Mar 2007 23:59:50 -0000 1.71 +++ data.c 25 Mar 2007 23:44:37 -0000 1.72 @@ -581,6 +581,7 @@ int continuousMouse = 1; int continuousMouseFix = 1; int motionThresh = 16; +int clickDelay = 0; /* # of updates to delay before repeating */ int motion_mouse_enablable = 1; int motion_mouse_steering = 0; @@ -818,3 +819,4 @@ int lockLine = 1; /* draw dashed line on map from you to lock target */ int weaponsOnMap = 1; /* draw weapons fire on map */ int sortPlanets = 1; /* sort planet list by team and army count */ +int packetLights = 1; /* show packet send/receive via dashboard */ \ No newline at end of file From modemhero at users.sourceforge.net Sun Mar 25 18:44:39 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 25 Mar 2007 23:44:39 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.148, 1.149 netrekrc, 1.45, 1.46 netrekrc_options.txt, 1.42, 1.43 Message-ID: <20070325234448.9B7A7186829@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21338/resources/docs Modified Files: changes.txt netrekrc netrekrc_options.txt Log Message: Backend for new options clickDelay (controls continous mouse repeat rate) and packetLights (show packets via 2 blinking dots on dash). Taken from TedTurner client. Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- netrekrc 21 Mar 2007 23:59:49 -0000 1.45 +++ netrekrc 25 Mar 2007 23:44:36 -0000 1.46 @@ -60,6 +60,9 @@ # Beep if received private message beepOnPrivateMessage: off +# Delay before continuous mouse clicks, in updates (0 = no delay) +clickDelay: 0 + # What type of ship bitmaps to use # 0 - mono # 1 - new color bitmaps (default) @@ -212,6 +215,9 @@ # Omit team letter on galaxy omitTeamLetter: off +# Show packets sent and received by blinking dashboard lights +packetLights: on + # Add space between teams in player list partitionPlist: off Index: netrekrc_options.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc_options.txt,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- netrekrc_options.txt 22 Mar 2007 06:40:18 -0000 1.42 +++ netrekrc_options.txt 25 Mar 2007 23:44:36 -0000 1.43 @@ -27,6 +27,7 @@ ckeymap: (string) change control keymap ckeymap-: (string) use this ckeymap for ship (sc,dd,ca,bb,as,sb,ga,att) cloakChars: (two chars) how to display cloaker on galactic +clickDelay: (0-50) delay before continuous mouse clicks, in updates (0 = no delay) color.: (color) replace first with (color) color.: (color) replace that race color with (color) colorClient: (0-3) what type of ship bitmaps to use @@ -139,6 +140,7 @@ orishipGbmpfile: (path) - your own ship's grayscale bitmaps orishipTbmpfile: (path) - shaded color bitmaps orishipMbmpfile: (path) - mono bitmaps +packetLights: (on/off) show packets sent and received by blinking dashboard lights partitionList: (on/off) add blank line between teams in player list password: (string) password for autologin phaserShrink: (0-16) shrink own phaser by x/16 of its length Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.148 retrieving revision 1.149 diff -u -d -r1.148 -r1.149 --- changes.txt 22 Mar 2007 06:40:18 -0000 1.148 +++ changes.txt 25 Mar 2007 23:44:35 -0000 1.149 @@ -1,4 +1,8 @@ Netrek XP 2006, Version 1.3: +- added "clickDelay: (0-50)" to allow for a delay between continuous mouse clicks, range + is in # of updates +- added "packetLights: (on)/off" to show packets sent and received via blinking lights + on dashboard - restored ability for middle and right mouse clicks to raise the current window to the top, helps with overlapped windows - removed the netrek.w32caption option that was undocumented and has since been replaced From modemhero at users.sourceforge.net Sun Mar 25 18:44:37 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 25 Mar 2007 23:44:37 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C,1.118,1.119 Message-ID: <20070325234518.C1612186826@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21338 Modified Files: NetrekXP to do list.C Log Message: Backend for new options clickDelay (controls continous mouse repeat rate) and packetLights (show packets via 2 blinking dots on dash). Taken from TedTurner client. Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.118 retrieving revision 1.119 diff -u -d -r1.118 -r1.119 --- NetrekXP to do list.C 25 Mar 2007 22:20:52 -0000 1.118 +++ NetrekXP to do list.C 25 Mar 2007 23:44:33 -0000 1.119 @@ -46,8 +46,7 @@ 10) sendto() error: 10049 on metaserver connect to a bad server, believe it's due to hostname not resolving. Currently fixed by using mulitple attempts to resolve bad host names. -11) mouse click repeat rate -13) _ bug with backspace and messages in HUD +11) _ bug with backspace and messages in HUD Stas's list: - color coded (?) and scrollable playerlist. From modemhero at users.sourceforge.net Sun Mar 25 21:47:20 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 26 Mar 2007 02:47:20 +0000 Subject: [netrek-cvs] client/netrekxp/src mswindow.c,1.52,1.53 Message-ID: <20070326024729.7FAD9B44C@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv7203/src Modified Files: mswindow.c Log Message: Add clickDelay functionality. As with any continuous mouse event, only while the mouse is moving, is mouse input processed. Index: mswindow.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- mswindow.c 22 Mar 2007 06:40:18 -0000 1.52 +++ mswindow.c 26 Mar 2007 02:47:18 -0000 1.53 @@ -1870,6 +1870,7 @@ #if defined(MOTION_MOUSE) || defined(XTRA_MESSAGE_UI) static POINTS prev_pos; static HWND LastPressHwnd; + static int delaytime = 0; #endif switch (msg) @@ -2046,6 +2047,7 @@ #ifdef MOTION_MOUSE prev_pos = MAKEPOINTS (lParam); + delaytime = udcounter; #endif EventQueue[EventTail].type = W_EV_BUTTON; return (0); @@ -2078,6 +2080,7 @@ #ifdef MOTION_MOUSE prev_pos = MAKEPOINTS (lParam); + delaytime = udcounter; #endif EventQueue[EventTail].type = W_EV_BUTTON; return (0); @@ -2109,6 +2112,7 @@ #ifdef MOTION_MOUSE prev_pos = MAKEPOINTS (lParam); + delaytime = udcounter; #endif EventQueue[EventTail].type = W_EV_BUTTON; return (0); @@ -2167,6 +2171,7 @@ #ifdef MOTION_MOUSE prev_pos = MAKEPOINTS (lParam); + delaytime = udcounter; #endif EventQueue[EventTail].type = W_EV_BUTTON; return (TRUE); /* MSDN says you SHOULD return TRUE if processing WM_XBUTTONDOWN */ @@ -2343,6 +2348,18 @@ if (thresh < motionThresh) return (0); + //Check to see if click delay in effect. If so, return. If not, reset timer. + //Only works if mouse is moving, but that is true for all continuous mouse events, + //i.e. holding down torp button without moving the mouse will not release a continuous + //stream of torps. This problem is due to a design flaw in the Windows event loop. + if (clickDelay) + { + if (delaytime + clickDelay > udcounter) + return (0); + else + delaytime = udcounter; + } + prev_pos = MAKEPOINTS (lParam); #ifdef SHIFTED_MOUSE From modemhero at users.sourceforge.net Sun Mar 25 21:47:20 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 26 Mar 2007 02:47:20 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C,1.119,1.120 Message-ID: <20070326024729.85DFCB450@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv7203 Modified Files: NetrekXP to do list.C Log Message: Add clickDelay functionality. As with any continuous mouse event, only while the mouse is moving, is mouse input processed. Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.119 retrieving revision 1.120 diff -u -d -r1.119 -r1.120 --- NetrekXP to do list.C 25 Mar 2007 23:44:33 -0000 1.119 +++ NetrekXP to do list.C 26 Mar 2007 02:47:15 -0000 1.120 @@ -47,6 +47,7 @@ to hostname not resolving. Currently fixed by using mulitple attempts to resolve bad host names. 11) _ bug with backspace and messages in HUD +12) implement packet lights Stas's list: - color coded (?) and scrollable playerlist. From modemhero at users.sourceforge.net Sun Mar 25 23:40:54 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 26 Mar 2007 04:40:54 +0000 Subject: [netrek-cvs] client/netrekxp/src dashboard.c, 1.19, 1.20 dashboard3.c, 1.7, 1.8 newwin.c, 1.55, 1.56 redraw.c, 1.10, 1.11 socket.c, 1.23, 1.24 Message-ID: <20070326044105.848A2186828@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv30618/src Modified Files: dashboard.c dashboard3.c newwin.c redraw.c socket.c Log Message: Adds packetLights functionality, to all 4 dashboards. Modified to blink the same (mostly) at any update rate. Index: redraw.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/redraw.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- redraw.c 15 Mar 2007 01:44:33 -0000 1.10 +++ redraw.c 26 Mar 2007 04:40:52 -0000 1.11 @@ -162,7 +162,9 @@ } /* TIMER */ db_timer (flag, WINSIDE - 12 * W_Textwidth, 27); - + + light_erase(); + buf[0] = (char) (me->p_flags & PFSHIELD ? 'S' : ' '); if (me->p_flags & PFGREEN) buf[1] = 'G'; Index: newwin.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- newwin.c 17 Mar 2007 03:05:44 -0000 1.55 +++ newwin.c 26 Mar 2007 04:40:52 -0000 1.56 @@ -1410,6 +1410,9 @@ lastplayercount[i] = -1; /* force redraw first time * through */ } + + light_erase(); + W_MapWindow (qwin); *team = -1; @@ -1464,6 +1467,7 @@ (udpSock >= 0 && FD_ISSET (udpSock, &rfds))) { readFromServer (&rfds); + light_erase(); } elapsed = time (0) - startTime; if (elapsed > (time_t)(autoQuit)) Index: dashboard.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/dashboard.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- dashboard.c 15 Mar 2007 01:44:33 -0000 1.19 +++ dashboard.c 26 Mar 2007 04:40:52 -0000 1.20 @@ -40,6 +40,62 @@ #define SPACING 4 +/* code to draw and erase packet lights 2/5/94 [BDyess] */ + +#define SENDX 7 +#define SENDY 1 +#define RECEIVEX 3 +#define RECEIVEY 1 + +static int send_lit = 0, receive_lit = 0; + +void +light_send() +{ + if (send_lit) + return; + send_lit = MAX(1, server_ups / 10); + W_MakePoint(tstatw, SENDX, SENDY, W_Green); + W_MakePoint(tstatw, SENDX + 1, SENDY, W_Green); + W_MakePoint(tstatw, SENDX, SENDY + 1, W_Green); + W_MakePoint(tstatw, SENDX + 1, SENDY + 1, W_Green); +} + +void +light_receive() +{ + if (receive_lit) + return; + receive_lit = MAX(2, 2 * server_ups / 10); + W_MakePoint(tstatw, RECEIVEX, RECEIVEY, W_Yellow); + W_MakePoint(tstatw, RECEIVEX + 1, RECEIVEY, W_Yellow); + W_MakePoint(tstatw, RECEIVEX, RECEIVEY + 1, W_Yellow); + W_MakePoint(tstatw, RECEIVEX + 1, RECEIVEY + 1, W_Yellow); +} + +void +light_erase() +{ + if (receive_lit == MAX(1, server_ups / 10)) + { + W_MakePoint(tstatw, RECEIVEX, RECEIVEY, backColor); + W_MakePoint(tstatw, RECEIVEX + 1, RECEIVEY, backColor); + W_MakePoint(tstatw, RECEIVEX, RECEIVEY + 1, backColor); + W_MakePoint(tstatw, RECEIVEX + 1, RECEIVEY + 1, backColor); + } + if (receive_lit) + receive_lit--; + if (send_lit == MAX(1, server_ups / 20)) + { + W_MakePoint(tstatw, SENDX, SENDY, backColor); + W_MakePoint(tstatw, SENDX + 1, SENDY, backColor); + W_MakePoint(tstatw, SENDX, SENDY + 1, backColor); + W_MakePoint(tstatw, SENDX + 1, SENDY + 1, backColor); + } + if (send_lit) + send_lit--; +} + /******************************************************************************/ /*** timerString() ***/ /******************************************************************************/ @@ -568,6 +624,8 @@ /* TIMER */ db_timer (fr, 2, 3 + 2 * (W_Textheight + SPACING)); + light_erase(); + // SRS - inserted some additional casts to clear up compiler warnings cur_max = (int) ((me->p_ship.s_maxspeed + 2) - ((me->p_ship.s_maxspeed + 1) * @@ -740,6 +798,8 @@ db_timer (fr, 2, 3 + 2 * (W_Textheight + SPACING)); + light_erase(); + // SRS - inserted some additional casts to clear up compiler warnings cur_max = (int) ((me->p_ship.s_maxspeed + 2) - ((me->p_ship.s_maxspeed + 1) * Index: dashboard3.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/dashboard3.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- dashboard3.c 15 Mar 2007 01:44:33 -0000 1.7 +++ dashboard3.c 26 Mar 2007 04:40:52 -0000 1.8 @@ -378,7 +378,9 @@ /* TIMER */ db_timer (fr, WINSIDE - 12 * W_Textwidth, 32); - + + light_erase(); + // SRS - inserted some additional casts to clear up compiler warnings cur_max = (int) ((me->p_ship.s_maxspeed + 2) - ((me->p_ship.s_maxspeed + 1) * Index: socket.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/socket.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- socket.c 17 Mar 2007 17:12:09 -0000 1.23 +++ socket.c 26 Mar 2007 04:40:52 -0000 1.24 @@ -1081,6 +1081,9 @@ } #endif /* SHORT_PACKETS */ + if (packetLights) + light_receive(); + if (size == 0) { LineToConsole ("Variable packet has 0 length! type=%d Trying to read more!\n", @@ -1544,6 +1547,9 @@ } #endif + if (packetLights) + light_send(); + if (commMode == COMM_UDP) { /* for now, just sent everything via TCP */ From modemhero at users.sourceforge.net Sun Mar 25 23:40:54 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 26 Mar 2007 04:40:54 +0000 Subject: [netrek-cvs] client/netrekxp/include proto.h,1.41,1.42 Message-ID: <20070326044105.8EA64186829@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv30618/include Modified Files: proto.h Log Message: Adds packetLights functionality, to all 4 dashboards. Modified to blink the same (mostly) at any update rate. Index: proto.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- proto.h 19 Mar 2007 00:05:13 -0000 1.41 +++ proto.h 26 Mar 2007 04:40:51 -0000 1.42 @@ -63,6 +63,9 @@ //static void db_box(int x, int y, int w, int h, int f, int color); //static void db_bar(char *lab, int x, int y, int value, int tmpmax, int max, int digits, int color); //static void db_flags(int fr); +void light_erase (void); +void light_receive (void); +void light_send (void); void db_timer (int fr, int xloc, int yloc); void db_redraw_krp (int fr); void db_redraw_COW (int fr); From modemhero at users.sourceforge.net Wed Mar 28 06:18:00 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 28 Mar 2007 11:18:00 +0000 Subject: [netrek-cvs] client/netrekxp/src local.c, 1.79, 1.80 map.c, 1.35, 1.36 Message-ID: <20070328111811.81A8E18680F@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17048/src Modified Files: local.c map.c Log Message: New netrekrc macro. Found a bug that has been around for a long time, with phasers and short packets. On a phaser hit, target's x/y is not sent (it IS with long packets though). In the case where the target is no longer visibile while the phaser cycle is still active (i.e. you die while phasering and the person who killed you is no longer galactically visible to your team), the target's x/y is set to -10000,-10000 and the phaser is seen to draw across the local screen. And with the addition of drawing weapons on the galaxy map, the bug was evident there as well. Solution is to set phaser target location to self location (i.e. make phaser length 0), if target location is out of bounds. Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.79 retrieving revision 1.80 diff -u -d -r1.79 -r1.80 --- local.c 25 Mar 2007 22:20:53 -0000 1.79 +++ local.c 28 Mar 2007 11:17:57 -0000 1.80 @@ -1488,11 +1488,25 @@ ty = (php->ph_y - me->p_y) / SCALE + WINSIDE / 2; } else - { /* Start point is dx, dy */ - tx = (players[php->ph_target].p_x - me->p_x) / - SCALE + WINSIDE / 2; - ty = (players[php->ph_target].p_y - me->p_y) / - SCALE + WINSIDE / 2; + { + /* Start point is dx, dy. With short packets, target + dx, dy not sent, and thus can be out of galaxy bounds + in certain cases. For example, if you die while phasering, + and your target's ship is no longer visible to your team. + Best solution seems to be to not draw the phaser by setting + phaser length to 0. */ + if (players[php->ph_target].p_x < 0 || players[php->ph_target].p_y < 0) + { + tx = WINSIDE / 2; + ty = WINSIDE / 2; + } + else + { + tx = (players[php->ph_target].p_x - me->p_x) / + SCALE + WINSIDE / 2; + ty = (players[php->ph_target].p_y - me->p_y) / + SCALE + WINSIDE / 2; + } } Index: map.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- map.c 21 Mar 2007 23:59:50 -0000 1.35 +++ map.c 28 Mar 2007 11:17:58 -0000 1.36 @@ -1120,8 +1120,17 @@ ty = ph->ph_y * WINSIDE / GWIDTH; break; default: - tx = players[ph->ph_target].p_x * WINSIDE / GWIDTH; - ty = players[ph->ph_target].p_y * WINSIDE / GWIDTH; + /* Don't draw phasers to ships out of galactic bounds */ + if (players[ph->ph_target].p_x < 0 || players[ph->ph_target].p_y < 0) + { + tx = dx; + ty = dy; + } + else + { + tx = players[ph->ph_target].p_x * WINSIDE / GWIDTH; + ty = players[ph->ph_target].p_y * WINSIDE / GWIDTH; + } break; } W_MakeLine(mapw, dx, dy, tx, ty, phaserColor(ph)); From modemhero at users.sourceforge.net Wed Mar 28 06:17:59 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 28 Mar 2007 11:17:59 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.149, 1.150 netrekrc, 1.46, 1.47 Message-ID: <20070328111811.8332CB437@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17048/resources/docs Modified Files: changes.txt netrekrc Log Message: New netrekrc macro. Found a bug that has been around for a long time, with phasers and short packets. On a phaser hit, target's x/y is not sent (it IS with long packets though). In the case where the target is no longer visibile while the phaser cycle is still active (i.e. you die while phasering and the person who killed you is no longer galactically visible to your team), the target's x/y is set to -10000,-10000 and the phaser is seen to draw across the local screen. And with the addition of drawing weapons on the galaxy map, the bug was evident there as well. Solution is to set phaser target location to self location (i.e. make phaser length 0), if target location is out of bounds. Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- netrekrc 25 Mar 2007 23:44:36 -0000 1.46 +++ netrekrc 28 Mar 2007 11:17:57 -0000 1.47 @@ -982,6 +982,11 @@ mac.^y.A:% \ / | ___||___ | |_| Now we will win! mac.^y.A:% |_| |_____||_____| (_) +mac.^n.A:% _ _ _____ _____ _ +mac.^n.A:% | \ | || _ || _ | | | It's %u (%p) +mac.^n.A:% | |\| || |_| || |_| | |_| Great, now we're fucked! +mac.^n.A:% |_| \_||_____||_____| (_) + macro.).A:/* Join the netrek clue game mailing list today! At */ macro.).A:/* http://groups.google.com/group/netrek-clue-games */ macro.).A:/* INL-style timed bronco games are every Wednesday */ Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.149 retrieving revision 1.150 diff -u -d -r1.149 -r1.150 --- changes.txt 25 Mar 2007 23:44:35 -0000 1.149 +++ changes.txt 28 Mar 2007 11:17:57 -0000 1.150 @@ -1,4 +1,6 @@ Netrek XP 2006, Version 1.3: +- fixed bug with self phasers where they would sometimes stretch across the screen + upon death. - added "clickDelay: (0-50)" to allow for a delay between continuous mouse clicks, range is in # of updates - added "packetLights: (on)/off" to show packets sent and received via blinking lights From modemhero at users.sourceforge.net Wed Mar 28 06:17:59 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 28 Mar 2007 11:17:59 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.120, 1.121 clientr.suo, 1.107, 1.108 Message-ID: <20070328111811.8C065B43A@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17048 Modified Files: NetrekXP to do list.C clientr.suo Log Message: New netrekrc macro. Found a bug that has been around for a long time, with phasers and short packets. On a phaser hit, target's x/y is not sent (it IS with long packets though). In the case where the target is no longer visibile while the phaser cycle is still active (i.e. you die while phasering and the person who killed you is no longer galactically visible to your team), the target's x/y is set to -10000,-10000 and the phaser is seen to draw across the local screen. And with the addition of drawing weapons on the galaxy map, the bug was evident there as well. Solution is to set phaser target location to self location (i.e. make phaser length 0), if target location is out of bounds. Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.120 retrieving revision 1.121 diff -u -d -r1.120 -r1.121 --- NetrekXP to do list.C 26 Mar 2007 02:47:15 -0000 1.120 +++ NetrekXP to do list.C 28 Mar 2007 11:17:55 -0000 1.121 @@ -47,7 +47,6 @@ to hostname not resolving. Currently fixed by using mulitple attempts to resolve bad host names. 11) _ bug with backspace and messages in HUD -12) implement packet lights Stas's list: - color coded (?) and scrollable playerlist. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.107 retrieving revision 1.108 diff -u -d -r1.107 -r1.108 Binary files /tmp/cvsaOHlZ9 and /tmp/cvsEV3qeZ differ From modemhero at users.sourceforge.net Thu Mar 29 21:50:55 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 30 Mar 2007 02:50:55 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.150, 1.151 Message-ID: <20070330025104.5388B186809@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv9162/resources/docs Modified Files: changes.txt Log Message: 2 bug fixes for redrawing phasers when player is off galactic coords. Sound on via sound menu now can initialize sound. Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.150 retrieving revision 1.151 diff -u -d -r1.150 -r1.151 --- changes.txt 28 Mar 2007 11:17:57 -0000 1.150 +++ changes.txt 30 Mar 2007 02:50:52 -0000 1.151 @@ -1,4 +1,5 @@ Netrek XP 2006, Version 1.3: +- sound can now be initialized via sound menu if program starts with sound off - fixed bug with self phasers where they would sometimes stretch across the screen upon death. - added "clickDelay: (0-50)" to allow for a delay between continuous mouse clicks, range From modemhero at users.sourceforge.net Thu Mar 29 21:50:56 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 30 Mar 2007 02:50:56 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo,1.108,1.109 Message-ID: <20070330025104.48B1C186807@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv9162 Modified Files: clientr.suo Log Message: 2 bug fixes for redrawing phasers when player is off galactic coords. Sound on via sound menu now can initialize sound. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.108 retrieving revision 1.109 diff -u -d -r1.108 -r1.109 Binary files /tmp/cvsxTGuDX and /tmp/cvsFNlFOw differ From modemhero at users.sourceforge.net Thu Mar 29 21:50:55 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 30 Mar 2007 02:50:55 +0000 Subject: [netrek-cvs] client/netrekxp/src local.c, 1.80, 1.81 map.c, 1.36, 1.37 sound.c, 1.37, 1.38 Message-ID: <20070330025104.4BD85B468@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv9162/src Modified Files: local.c map.c sound.c Log Message: 2 bug fixes for redrawing phasers when player is off galactic coords. Sound on via sound menu now can initialize sound. Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.80 retrieving revision 1.81 diff -u -d -r1.80 -r1.81 --- local.c 28 Mar 2007 11:17:57 -0000 1.80 +++ local.c 30 Mar 2007 02:50:53 -0000 1.81 @@ -1497,8 +1497,8 @@ phaser length to 0. */ if (players[php->ph_target].p_x < 0 || players[php->ph_target].p_y < 0) { - tx = WINSIDE / 2; - ty = WINSIDE / 2; + tx = dx; + ty = dy; } else { Index: map.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- map.c 28 Mar 2007 11:17:58 -0000 1.36 +++ map.c 30 Mar 2007 02:50:53 -0000 1.37 @@ -1104,7 +1104,8 @@ /* phasers */ ph = &phasers[j->p_no]; if (ph->ph_status != PHFREE && - (j->p_status == PALIVE || j->p_status == PEXPLODE || j->p_status == PDEAD)) + (j->p_status == PALIVE || j->p_status == PEXPLODE || j->p_status == PDEAD) && + !(j->p_x < 0 || j->p_x >= GWIDTH)) { switch(ph->ph_status) { Index: sound.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/sound.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- sound.c 18 Mar 2007 01:46:50 -0000 1.37 +++ sound.c 30 Mar 2007 02:50:53 -0000 1.38 @@ -29,6 +29,7 @@ static void soundrefresh (int i); static void Init_sound_flags (void); +static int init_success = 0; static Mix_Chunk *sounds[NUM_WAVES]; static Mix_Music *music[NUM_MUSIC]; @@ -191,6 +192,9 @@ /* Toggle on sound, and load sound files */ sound_toggle = 1; loadSounds(); + + /* Keep track of successful sound initialization */ + init_success = 1; /* Load music files, and play random intro music */ loadMusic(); @@ -552,7 +556,12 @@ if (i == SOUND_TOGGLE) { - if (sound_init) + if (!init_success) + { + sound_init = 1; + Init_Sound(); + } + else sound_toggle = (sound_toggle == 1) ? 0 : 1; // Halt all sounds if toggled off if (!sound_toggle) From modemhero at users.sourceforge.net Sat Mar 31 20:25:52 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 01 Apr 2007 01:25:52 +0000 Subject: [netrek-cvs] client/netrekxp/src defaults.c,1.64,1.65 Message-ID: <20070401012601.47AA5186824@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv2046/src Modified Files: defaults.c Log Message: Turn heading tic off by default (it's annoying in bronco). Allow dist.taking to work (that was old format prior to a May 06 change, so now either dist.take or dist.taking will work in the netrekrc). Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.64 retrieving revision 1.65 diff -u -d -r1.64 -r1.65 --- defaults.c 25 Mar 2007 23:44:37 -0000 1.64 +++ defaults.c 1 Apr 2007 01:25:50 -0000 1.65 @@ -1213,7 +1213,9 @@ dm->name && notdone; dm++, dm_def++) { - if (strcmpi (str, dm->name) == 0) + /* Allow dist.taking to work, as that was the old dist name prior to 2006 */ + if (strcmpi (str, dm->name) == 0 + || (strcmpi (str, "taking") == 0 && strcmpi (dm->name, "take") == 0) ) { dm->macro = strdup (v); From modemhero at users.sourceforge.net Sat Mar 31 20:25:52 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 01 Apr 2007 01:25:52 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.151, 1.152 netrekrc, 1.47, 1.48 Message-ID: <20070401012601.45F80B45E@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv2046/resources/docs Modified Files: changes.txt netrekrc Log Message: Turn heading tic off by default (it's annoying in bronco). Allow dist.taking to work (that was old format prior to a May 06 change, so now either dist.take or dist.taking will work in the netrekrc). Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- netrekrc 28 Mar 2007 11:17:57 -0000 1.47 +++ netrekrc 1 Apr 2007 01:25:50 -0000 1.48 @@ -121,7 +121,7 @@ forceMono: off # Draw a tic mark indicating your ship's direction -headingTic: on +headingTic: off # Highlight friendly phasers highlightFriendlyPhasers: off Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.151 retrieving revision 1.152 diff -u -d -r1.151 -r1.152 --- changes.txt 30 Mar 2007 02:50:52 -0000 1.151 +++ changes.txt 1 Apr 2007 01:25:50 -0000 1.152 @@ -1,4 +1,6 @@ Netrek XP 2006, Version 1.3: +- dist.taking (used in older netrekrc files) will now work, though dist.take is still + the preferred name for that distress call - sound can now be initialized via sound menu if program starts with sound off - fixed bug with self phasers where they would sometimes stretch across the screen upon death. From modemhero at users.sourceforge.net Sat Mar 31 20:25:52 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 01 Apr 2007 01:25:52 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo,1.109,1.110 Message-ID: <20070401012601.4A99418682B@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv2046 Modified Files: clientr.suo Log Message: Turn heading tic off by default (it's annoying in bronco). Allow dist.taking to work (that was old format prior to a May 06 change, so now either dist.take or dist.taking will work in the netrekrc). Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.109 retrieving revision 1.110 diff -u -d -r1.109 -r1.110 Binary files /tmp/cvsCjYwVk and /tmp/cvsYvKTRX differ