From modemhero at users.sourceforge.net Wed Nov 28 23:29:08 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 29 Nov 2007 05:29:08 +0000 Subject: [netrek-cvs] client/netrekxp/src data.c, 1.100, 1.101 local.c, 1.107, 1.108 Message-ID: <20071129060559.BE8393B4075@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20951/src Modified Files: data.c local.c Log Message: More bugs on paradise todo list. Addition of 3rd metaserver. Fix to cloak bug where ships would briefly be seen to flash when entering tactical range. Was introduced when cloaking sounds were added to all ships. Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.107 retrieving revision 1.108 diff -u -d -r1.107 -r1.108 --- local.c 16 Jul 2007 23:44:18 -0000 1.107 +++ local.c 29 Nov 2007 05:29:06 -0000 1.108 @@ -885,28 +885,24 @@ if (!(j->p_flags & PFCLOAK)) continue; } - + + cloak_phases = CLOAK_PHASES * server_ups / 10; dx = j->p_x - me->p_x; dy = j->p_y - me->p_y; - if (dx > view || dx < -view || dy > view || dy < -view) - continue; - dx = dx / scaleFactor + TWINSIDE / 2; - dy = dy / scaleFactor + TWINSIDE / 2; - - cloak_phases = CLOAK_PHASES * server_ups / 10; if (j->p_flags & PFCLOAK) { if (j->p_cloakphase < (cloak_phases - 1)) { #ifdef SOUND - if (j->p_cloakphase == 0) + /* Only play sounds for ships on tactical */ + if (j->p_cloakphase == 0 && dx <= view && dx >= -view && dy <= view && dy >= -view) { // To avoid hearing twarp cloak sounds as the twarper/observer if ( (myPlayer(j) || isObsLockPlayer(j)) ? ((me->p_flags & PFTWARP) ? 0 : 1) : 1 ) { - SetDistAngle(dx, dy); + SetDistAngle(dx / scaleFactor + TWINSIDE / 2, dy / scaleFactor + TWINSIDE / 2); // At short distances, don't use angular sound if (!soundAngles || distance < SCALE/2) Play_Sound_Loc(CLOAKED_WAV, SF_CLOAKING, -1, distance); @@ -928,9 +924,10 @@ // To avoid twarp cloak sounds as the twarper/observer if ( (myPlayer(j) || isObsLockPlayer(j)) ? ((me->p_flags & PFTWARP) ? 0 : 1) : 1 ) { - if (j->p_cloakphase == cloak_phases - 1) + /* Only play sounds for ships on tactical */ + if (j->p_cloakphase == (cloak_phases - 1) && dx <= view && dx >= -view && dy <= view && dy >= -view) { - SetDistAngle(dx, dy); + SetDistAngle(dx / scaleFactor + TWINSIDE / 2, dy / scaleFactor + TWINSIDE / 2); // At short distances, don't use angular sound if (!soundAngles || distance < SCALE/2) Play_Sound_Loc(UNCLOAK_WAV, SF_CLOAKING, -1, distance); @@ -946,6 +943,12 @@ } } + if (dx > view || dx < -view || dy > view || dy < -view) + continue; + + dx = dx / scaleFactor + TWINSIDE / 2; + dy = dy / scaleFactor + TWINSIDE / 2; + /* If cloaking cycle is complete, just draw the cloak icon, and skip over the ship drawing code with the goto statement */ if (j->p_flags & PFCLOAK && (j->p_cloakphase == (cloak_phases - 1))) Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.100 retrieving revision 1.101 diff -u -d -r1.100 -r1.101 --- data.c 29 Jul 2007 01:38:41 -0000 1.100 +++ data.c 29 Nov 2007 05:29:05 -0000 1.101 @@ -254,7 +254,7 @@ #ifdef META /* Metaservers list - comma delimited */ -char *metaServer = "metaserver.us.netrek.org, metaserver2.us.netrek.org"; +char *metaServer = "metaserver.us.netrek.org, metaserver2.us.netrek.org, metaserver3.us.netrek.org"; int metaPort = 3521; int metaVerbose = 0; char *metaCache = NULL; From modemhero at users.sourceforge.net Wed Nov 28 23:29:07 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 29 Nov 2007 05:29:07 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.155, 1.156 clientr.suo, 1.139, 1.140 Message-ID: <20071129060607.8240CB3EA@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20951 Modified Files: NetrekXP to do list.C clientr.suo Log Message: More bugs on paradise todo list. Addition of 3rd metaserver. Fix to cloak bug where ships would briefly be seen to flash when entering tactical range. Was introduced when cloaking sounds were added to all ships. Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.155 retrieving revision 1.156 diff -u -d -r1.155 -r1.156 --- NetrekXP to do list.C 29 Jul 2007 01:38:35 -0000 1.155 +++ NetrekXP to do list.C 29 Nov 2007 05:29:04 -0000 1.156 @@ -37,6 +37,7 @@ Paradise issues: Motd paging system gutted for sake of simplicity +Autologin with name and password seems to break any motd pics A bunch of gridline/zoom options should be made into netrekrc options. The galactic zoom doesn't work Some of the paradise packet types may need some work @@ -48,6 +49,10 @@ Info window not working right with paradise. Need popup box that works, when connecting to wrong server type CV army capacity is wrong +Login messages are being sent to review window (mapped for kills and phasers), not all! +Seems a commodore char doesn't have the proper rank info..player info is all blank. +Kill messages are being sent to all, not review, why? +Cambot playback is broken. Packet handler needs updating. Wish list: 1) Rewrite graphics engine using SDL Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.139 retrieving revision 1.140 diff -u -d -r1.139 -r1.140 Binary files /tmp/cvsyDrJ0o and /tmp/cvsnDRyhx differ