From bigjoe at japan.com Mon Feb 5 10:26:48 2001 From: bigjoe at japan.com (bigjoe@japan.com) Date: Wed Jan 12 00:50:28 2005 Subject: [Netrek Clients] Brand New E-Mail pager for FR-EE! 32190 Message-ID: <000061bd6ef0$000039e5$00007dbe@mailb1.phonelink.com> No long term contract No activation fee No big prepayment of airtime No credit check PAGING AMERICA is going to give you absolutely Free the Brand new Motorola Accessmate E-Mail display pager. This is the top of the line PCS technology pager made today. This side viewable display pager has a retail value of $189.00and comes with its own e-mail address so you can receive your e-mails as well as alpha-numeric and numeric messages instantly where ever you are. Your new e-mail pager has features like 50,000 character memory, message time stamping, automatic garbled message correction, beeps or vibrates, incandescent backlight, saved message folder, a unique never out of range feature that allows your pager to retrieve messages sent earlier when your pager was out of range or turned completely off. You can also receive weather, news and sports .The Motorola e-mail pager is very small and uses only a single double A battery. All we ask before we ship you your Free pager is for you to allow us to provide the airtime for you. There is no long term contract or credit check. Airtime is month to month and can be cancelled at any time. This pager will comes pre-programmed with its own e-mail address as well as a local telephone number to receive numeric pages. This pager comes with a complete 30 day money back guarantee, if after receiving this pager you're not completely happy, send it back and receive a full refund. For immediate delivery call Paging America at toll free at 877-699-8546 Brand New E-Mail pager for FREE! From sco at openface.ca Tue Feb 6 21:34:46 2001 From: sco at openface.ca (Scott Thompson) Date: Wed Jan 12 00:50:28 2005 Subject: [Netrek Clients] COW 3.00pl3 NetBSD/i386 ELF Message-ID: Hi, I have compiled the latest COW3 for NetBSD/i386 ELF (release 1.5 or later). It is available here: ftp://ftp.openface.ca/pub/netrek/ I'll be submitting the key to clientkeys subsequent to this e-mail. Let me know if you have any questions (or if I've done anything wrong!). I'll be happy to maintain this binary. Cheers, Scott -- Openface Inc. Scott Thompson Montreal, Canada sco@openface.ca (514) 281-8585 Network Operations From ahn at vec.wfubmc.edu Thu Feb 8 11:22:05 2001 From: ahn at vec.wfubmc.edu (Dave Ahn) Date: Wed Jan 12 00:50:28 2005 Subject: [Netrek Clients] Re: COW client Message-ID: <20010208122205.M87544@cecum.vec.wfubmc.edu> I'll put this on ftp.netrek.org as soon as Kurt approves the new client key. On Tue, Feb 06, 2001 at 10:34:46PM -0500, Scott Thompson wrote: > Hi, > > I have compiled the latest COW3 for NetBSD/i386 ELF (release 1.5 or later). > It is available here: > > ftp://ftp.openface.ca/pub/netrek/ > > I'll be submitting the key to clientkeys subsequent to this e-mail. > > Let me know if you have any questions (or if I've done anything wrong!). > I'll be happy to maintain this binary. > > Cheers, > Scott > > -- > Openface Inc. Scott Thompson > Montreal, Canada sco@openface.ca > (514) 281-8585 Network Operations -- Dave Ahn | ahn@vec.wfubmc.edu | Wake Forest University Baptist Medical Center When you were born, you cried and the world rejoiced. Try to live your life so that when you die, you will rejoice and the world will cry. -1/2 jj^2 From christine at trafficmagnet.net Fri Feb 9 06:41:56 2001 From: christine at trafficmagnet.net (Christine Hall) Date: Wed Jan 12 00:50:28 2005 Subject: [Netrek Clients] COW.NETREK.ORG Message-ID: <200102091241.UAA29780@portalglue.net> An HTML attachment was scrubbed... URL: http://shadowknight.real-time.com/pipermail/netrek-dev/attachments/20010209/3ed96a1f/attachment.html From ahn at vec.wfubmc.edu Sat Feb 10 21:40:03 2001 From: ahn at vec.wfubmc.edu (Dave Ahn) Date: Wed Jan 12 00:50:28 2005 Subject: [Netrek Clients] Re: COW client In-Reply-To: <200102091237615.SM00748@m2w052>; from gandalf#enns.cc@mx.graz.inode.at on Fri, Feb 09, 2001 at 12:37:07PM -0500 References: <200102091237615.SM00748@m2w052> Message-ID: <20010210224003.A97593@cecum.vec.wfubmc.edu> > > I have compiled the latest COW3 for NetBSD/i386 ELF (release 1.5 or later). > > It is available here: > > > > ftp://ftp.openface.ca/pub/netrek/ Available at ftp://ftp.netrek.org/pub/netrek/clients/cow/COW-bin/ The new key should be accepted on all psychosis.net/crackaddict.com/cmu.edu/ wfubmc.edu servers. Bug the appropriate server admins if it gets rejected. -- Dave Ahn | ahn@vec.wfubmc.edu | Wake Forest University Baptist Medical Center When you were born, you cried and the world rejoiced. Try to live your life so that when you die, you will rejoice and the world will cry. -1/2 jj^2 From quozl at us.netrek.org Sat Feb 10 22:19:14 2001 From: quozl at us.netrek.org (James Cameron) Date: Wed Jan 12 00:50:29 2005 Subject: [Netrek Clients] Re: COW client In-Reply-To: <20010210224003.A97593@cecum.vec.wfubmc.edu>; from ahn@vec.wfubmc.edu on Sat, Feb 10, 2001 at 10:40:03PM -0500 References: <200102091237615.SM00748@m2w052> <20010210224003.A97593@cecum.vec.wfubmc.edu> Message-ID: <20010211151914.C12499@us.netrek.org> On Sat, Feb 10, 2001 at 10:40:03PM -0500, Dave Ahn wrote: > The new key should be accepted on all psychosis.net/crackaddict.com/cmu.edu/ > wfubmc.edu servers. Bug the appropriate server admins if it gets rejected. I saw the key adopted by continuum's update process. Let me know if it fails to work there. -- James Cameron mailto:quozl@us.netrek.org http://quozl.netrek.org/ From ahn at vec.wfubmc.edu Thu Feb 22 20:38:52 2001 From: ahn at vec.wfubmc.edu (Dave Ahn) Date: Wed Jan 12 00:50:29 2005 Subject: [Netrek Clients] det radius in BRMH Message-ID: <20010222213852.A107798@cecum.vec.wfubmc.edu> Hey, I am about to commit some bug fixes to BRMH submitted by John Hitt. There is an additional patch from him that adds the det radius feature (from Paradise 2000) to BRMH. I personally do not like the det radius feature but thought I'd solicit your opinions on whether it should be added. Dave -- Dave Ahn | ahn@vec.wfubmc.edu | Wake Forest University Baptist Medical Center When you were born, you cried and the world rejoiced. Try to live your life so that when you die, you will rejoice and the world will cry. -1/2 jj^2 From ssheldon at sodablue.org Thu Feb 22 23:33:17 2001 From: ssheldon at sodablue.org (Steve Sheldon) Date: Wed Jan 12 00:50:29 2005 Subject: [Netrek Clients] det radius in BRMH In-Reply-To: <20010222213852.A107798@cecum.vec.wfubmc.edu> Message-ID: <000601c09d5a$3a4a9e00$8400000a@win2k.sodablue.com> Dave Ahn wrote: > Hey, > > I am about to commit some bug fixes to BRMH submitted by John > Hitt. There > is an additional patch from him that adds the det radius feature (from > Paradise 2000) to BRMH. I personally do not like the det > radius feature > but thought I'd solicit your opinions on whether it should be added. I think I need it. I can't seem to det right any more. But what I really need is a leading indicator showing me where to shoot torps so I have a chance of hitting. I'm getting really bad at leading torps, and keep whiffing. :( From vanilla-devel at us.netrek.org Fri Feb 2 02:11:07 2001 From: vanilla-devel at us.netrek.org (Vanilla CVS Development) Date: Wed Jan 12 00:51:23 2005 Subject: [Vanilla Devel] CVS update: Vanilla/rpm Message-ID: <200102020811.f128B7k07431@swashbuckler.fortress.real-time.com> Date: Friday February 2, 2001 @ 2:11 Author: cameron Update of /home/netrek/cvsroot/Vanilla/rpm In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv7421/rpm Modified Files: netrek.spec Log Message: Prerelease version change and tidy-up **************************************** Index: Vanilla/rpm/netrek.spec diff -u Vanilla/rpm/netrek.spec:1.6 Vanilla/rpm/netrek.spec:1.7 --- Vanilla/rpm/netrek.spec:1.6 Tue Jun 27 17:09:29 2000 +++ Vanilla/rpm/netrek.spec Fri Feb 2 02:11:07 2001 @@ -1,6 +1,6 @@ Summary: Netrek Software Suite Name: netrek -Version: 2.9pl6 +Version: 2.9pl7 Release: 1 Copyright: Undetermined Packager: Vanilla Server Development Team From vanilla-devel at us.netrek.org Fri Feb 2 02:11:06 2001 From: vanilla-devel at us.netrek.org (Vanilla CVS Development) Date: Wed Jan 12 00:51:23 2005 Subject: [Vanilla Devel] CVS update: Vanilla Message-ID: <200102020811.f128B6W07424@swashbuckler.fortress.real-time.com> Date: Friday February 2, 2001 @ 2:11 Author: cameron Update of /home/netrek/cvsroot/Vanilla In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv7421 Modified Files: ChangeLog README.releasing patchlevel.h Log Message: Prerelease version change and tidy-up **************************************** Index: Vanilla/ChangeLog diff -u Vanilla/ChangeLog:1.102 Vanilla/ChangeLog:1.103 --- Vanilla/ChangeLog:1.102 Fri Jan 26 17:59:05 2001 +++ Vanilla/ChangeLog Fri Feb 2 02:11:06 2001 @@ -95,12 +95,13 @@ Thu Jul 6 22:12:10 EDT 2000 Karthik Arumugham - * ntserv/defs.h, ntserv/queue.c, ntserv/solicit.c, ntserv/struct.h, - robots/newbie.c, robots/newbiedefs.h: - Newbie server changes to properly limit humans to 8 players by means of a - separate queue, as well as to stop reporting bots to the metaserver. (When - the human queue is full, the game will still be reported as Wait Queue, but - when it is not full, only the human count will be reported.) + * ntserv/defs.h, ntserv/queue.c, ntserv/solicit.c, + ntserv/struct.h, robots/newbie.c, robots/newbiedefs.h: Newbie + server changes to properly limit humans to 8 players by means of a + separate queue, as well as to stop reporting bots to the + metaserver. (When the human queue is full, the game will still be + reported as Wait Queue, but when it is not full, only the human + count will be reported.) Fri Jul 7 09:12:20 2000 root @@ -216,12 +217,13 @@ Fri Mar 24 14:54:48 EST 2000 Karthik Arumugham - * ntserv/commands.c, ntserv/genspkt.c, ntserv/ntscmds.c, ntserv/proto.h, - robots/inlcmds.c, tools/cambot.c: Added a 'whois' command to facilitate - identifying a slot in the case where your player list is not long enough - to display all players (in particular, with a high MAXPLAYERS value). - Triggered by sending yourself 'whois ', or by sending a single - '@' character to the slot that you want to whois. + * ntserv/commands.c, ntserv/genspkt.c, ntserv/ntscmds.c, + ntserv/proto.h, robots/inlcmds.c, tools/cambot.c: Added a 'whois' + command to facilitate identifying a slot in the case where your + player list is not long enough to display all players (in + particular, with a high MAXPLAYERS value). Triggered by sending + yourself 'whois ', or by sending a single '@' character to + the slot that you want to whois. Thu Mar 23 21:42:14 EST 2000 Karthik Arumugham @@ -1107,4 +1109,4 @@ update_sys_defaults in updateMessages to a more appropriate location - updateClient in socket.c. - $Id: ChangeLog,v 1.102 2001/01/26 23:59:05 ahn Exp $ + $Id: ChangeLog,v 1.103 2001/02/02 08:11:06 cameron Exp $ Index: Vanilla/README.releasing diff -u Vanilla/README.releasing:1.1 Vanilla/README.releasing:1.2 --- Vanilla/README.releasing:1.1 Tue Oct 31 22:46:07 2000 +++ Vanilla/README.releasing Fri Feb 2 02:11:06 2001 @@ -1,5 +1,5 @@ -$Id: README.releasing,v 1.1 2000/11/01 04:46:07 cameron Exp $ +$Id: README.releasing,v 1.2 2001/02/02 08:11:06 cameron Exp $ Release Procedure @@ -8,8 +8,8 @@ cd Vanilla # set variables to ease the rest of this ... - set VS=2.9pl6 - set VL=v_2_9_6 + set VS=2.9pl7 + set VL=v_2_9_7 # make sure you have committed all changes cvs -z9 diff -u > tmp.tmp Index: Vanilla/patchlevel.h diff -u Vanilla/patchlevel.h:1.9 Vanilla/patchlevel.h:1.10 --- Vanilla/patchlevel.h:1.9 Mon Feb 28 00:32:03 2000 +++ Vanilla/patchlevel.h Fri Feb 2 02:11:06 2001 @@ -12,7 +12,7 @@ * (a) reset this to zero before each major release, and; * (b) increment this number before each patch release. */ -#define PATCHLEVEL 6 +#define PATCHLEVEL 7 #if !defined(NULL) #define NULL 0 #endif From vanilla-devel at us.netrek.org Fri Feb 2 02:40:44 2001 From: vanilla-devel at us.netrek.org (Vanilla CVS Development) Date: Wed Jan 12 00:51:23 2005 Subject: [Vanilla Devel] CVS update: Vanilla/ntserv Message-ID: <200102020840.f128ei707469@swashbuckler.fortress.real-time.com> Date: Friday February 2, 2001 @ 2:40 Author: cameron Update of /home/netrek/cvsroot/Vanilla/ntserv In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv7460/ntserv Modified Files: orbit.c Log Message: * ntserv/orbit.c (dock): was returning TRUE for failure to dock, so if a base was in the game orbiting failed to be considered. Moved many of the new checks with messages after the check for proximity. Adjusted code indent. * README.releasing: minor adjustments to procedure. **************************************** Index: Vanilla/ntserv/orbit.c diff -u Vanilla/ntserv/orbit.c:1.5 Vanilla/ntserv/orbit.c:1.6 --- Vanilla/ntserv/orbit.c:1.5 Wed Jan 3 03:15:19 2001 +++ Vanilla/ntserv/orbit.c Fri Feb 2 02:40:44 2001 @@ -76,35 +76,6 @@ u_char dir_from_base; /* - * Can't dock on enemy bases: */ - if (! friendlyPlayer(base)) - { - new_warning(UNDEF, "Docking onto a hostile base is unwise, Captain!"); - de_lock(me); - return TRUE; - } - - /* - * Can't dock if you aren't allowed to */ - if ( me->candock == 0 ) - { - new_warning(UNDEF, - "Starbase %s allows everybody else except us to dock, Captain.", - base->p_name); - de_lock(me); - return TRUE; - } - - /* Disallow SB to SB docking */ - - if (me->p_ship.s_type == STARBASE) - { - new_warning(UNDEF, "Starbases are too big to dock onto other starbases."); - de_lock(me); - return TRUE; - } - - /* * See if I am close enough: */ dx = base->p_x - me->p_x; if ((dx > DOCKDIST) || (dx < -DOCKDIST)) @@ -116,6 +87,31 @@ return FALSE; /* + * Can't dock on enemy bases: */ + if (! friendlyPlayer(base)) { + new_warning(UNDEF, "Docking onto a hostile base is unwise, Captain!"); + de_lock(me); + return FALSE; + } + + /* + * Can't dock if you aren't allowed to */ + if ( me->candock == 0 ) { + new_warning(UNDEF, + "Starbase %s allows everybody else except us to dock, Captain.", + base->p_name); + de_lock(me); + return FALSE; + } + + /* Disallow SB to SB docking */ + if (me->p_ship.s_type == STARBASE) { + new_warning(UNDEF, "Starbases are too big to dock onto other starbases."); + de_lock(me); + return FALSE; + } + + /* * See if the base is allowing docking: */ if (! (base->p_flags & PFDOCKOK)) { if (send_short) @@ -125,7 +121,7 @@ "Starbase %s refusing us docking permission, captain.", base->p_name); de_lock(me); - return TRUE; + return FALSE; } /* @@ -136,7 +132,7 @@ else new_warning(UNDEF, "Starbase %s: Permission to dock denied, all ports currently occupied.", base->p_name); de_lock(me); - return TRUE; + return FALSE; } /* @@ -158,8 +154,7 @@ RETURN_IF_VACANT(base, 1); port_id = 1; } - } - else { + } else { /* Below and to left of base: */ if (base->p_port[2] == VACANT) port_id = 2; @@ -172,8 +167,7 @@ port_id = 0; } } - } - else { + } else { /* We are to the right of the base: */ if (dy > 0) { /* Above and to right of base: */ @@ -187,8 +181,7 @@ RETURN_IF_VACANT(base, 2); port_id = 2; } - } - else { + } else { /* Below and to right of base: */ if (base->p_port[1] == VACANT) port_id = 1; @@ -347,7 +340,7 @@ me->p_speed = me->p_desspeed = 0; me->p_planet = l->pl_no; return; - } + } new_warning(81, "Helmsman: Sensors read no valid targets in range to dock or orbit sir!"); } From vanilla-devel at us.netrek.org Fri Feb 2 02:40:43 2001 From: vanilla-devel at us.netrek.org (Vanilla CVS Development) Date: Wed Jan 12 00:51:24 2005 Subject: [Vanilla Devel] CVS update: Vanilla Message-ID: <200102020840.f128eho07463@swashbuckler.fortress.real-time.com> Date: Friday February 2, 2001 @ 2:40 Author: cameron Update of /home/netrek/cvsroot/Vanilla In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv7460 Modified Files: ChangeLog README.releasing Log Message: * ntserv/orbit.c (dock): was returning TRUE for failure to dock, so if a base was in the game orbiting failed to be considered. Moved many of the new checks with messages after the check for proximity. Adjusted code indent. * README.releasing: minor adjustments to procedure. **************************************** Index: Vanilla/ChangeLog diff -u Vanilla/ChangeLog:1.103 Vanilla/ChangeLog:1.104 --- Vanilla/ChangeLog:1.103 Fri Feb 2 02:11:06 2001 +++ Vanilla/ChangeLog Fri Feb 2 02:40:42 2001 @@ -1,3 +1,10 @@ +Fri Feb 2 19:31:36 2001 James Cameron + + * ntserv/orbit.c (dock): was returning TRUE for failure to dock, + so if a base was in the game orbiting failed to be considered. + Moved many of the new checks with messages after the check for + proximity. Adjusted code indent. + Fri Jan 26 18:29:30 EST 2001 Dave Ahn * robots/*: Added momentum scoring support. See README.scores @@ -1109,4 +1116,4 @@ update_sys_defaults in updateMessages to a more appropriate location - updateClient in socket.c. - $Id: ChangeLog,v 1.103 2001/02/02 08:11:06 cameron Exp $ + $Id: ChangeLog,v 1.104 2001/02/02 08:40:42 cameron Exp $ Index: Vanilla/README.releasing diff -u Vanilla/README.releasing:1.2 Vanilla/README.releasing:1.3 --- Vanilla/README.releasing:1.2 Fri Feb 2 02:11:06 2001 +++ Vanilla/README.releasing Fri Feb 2 02:40:42 2001 @@ -1,5 +1,5 @@ -$Id: README.releasing,v 1.2 2001/02/02 08:11:06 cameron Exp $ +$Id: README.releasing,v 1.3 2001/02/02 08:40:42 cameron Exp $ Release Procedure @@ -7,7 +7,7 @@ # be in your local copy of the CVS repository cd Vanilla - # set variables to ease the rest of this ... + # set variables to ease the rest of this ... (csh or tcsh) set VS=2.9pl7 set VL=v_2_9_7 @@ -26,12 +26,11 @@ cd .. setenv CVSROOT :pserver:cameron@cvs.us.netrek.org:/home/netrek/cvsroot cvs -z9 export -d Vanilla-$VS -r $VL Vanilla - # package res-rsa with .tar.gz as per dave ahn 28th june 2000 + # package res-rsa with .tar.gz as per Dave Ahn 28th June 2000 cd Vanilla-$VS - tar xf ../Vanilla/res-rsa-2.9.2.tar.gz + tar xzf ../Vanilla/res-rsa-2.9.2.tar.gz mv res-rsa-2.9.2/* res-rsa/ rmdir res-rsa-2.9.2 - # code above unverified cd .. tar cf Vanilla-$VS.tar Vanilla-$VS gzip -9 Vanilla-$VS.tar @@ -41,9 +40,8 @@ # test build kit cd Vanilla-$VS - - mkdir /tmp/$VS ./configure --prefix=/tmp/$VS + make # test install kit make install From vanilla-devel at us.netrek.org Fri Feb 2 03:17:53 2001 From: vanilla-devel at us.netrek.org (Vanilla CVS Development) Date: Wed Jan 12 00:51:24 2005 Subject: [Vanilla Devel] CVS update: Vanilla/ntserv Message-ID: <200102020917.f129Hrm07513@swashbuckler.fortress.real-time.com> Date: Friday February 2, 2001 @ 3:17 Author: cameron Update of /home/netrek/cvsroot/Vanilla/ntserv In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv7504/ntserv Modified Files: enter.c interface.c main.c ntscmds.c orbit.c struct.h Log Message: * ntserv/orbit.c (dock): reworked handling of return status, probably in a superfluous manner, but I've tested the various conditions now. * ntserv/struct.h, ntserv/ntscmds.c (do_nodock), ntserv/main.c (main), ntserv/enter.c (enter): change candock to p_candock to comply with convention. * ntserv/interface.c (lock_player): only mention docking status on a lock if the player is permitted to dock, otherwise treat it as a normal lock on a ship. **************************************** Index: Vanilla/ntserv/enter.c diff -u Vanilla/ntserv/enter.c:1.9 Vanilla/ntserv/enter.c:1.10 --- Vanilla/ntserv/enter.c:1.9 Wed Jan 3 03:15:19 2001 +++ Vanilla/ntserv/enter.c Fri Feb 2 03:17:52 2001 @@ -135,7 +135,7 @@ { me->p_flags |= PFDOCKOK; /* allow docking by default */ for(i = 0; i < MAXPLAYER; i++) - players[i].candock = 1; /* give everybody permission to dock */ + players[i].p_candock = 1; /* give everybody permission to dock */ } me->p_dir = 0; me->p_desdir = 0; Index: Vanilla/ntserv/interface.c diff -u Vanilla/ntserv/interface.c:1.8 Vanilla/ntserv/interface.c:1.9 --- Vanilla/ntserv/interface.c:1.8 Tue Aug 15 05:16:28 2000 +++ Vanilla/ntserv/interface.c Fri Feb 2 03:17:52 2001 @@ -228,7 +228,8 @@ /* notify player docking perm status of own SB when locking 7/19/92 TC */ if ((players[player].p_team == me->p_team) && - (players[player].p_ship.s_type == STARBASE)) + (players[player].p_ship.s_type == STARBASE) && + (me->p_candock)) { if(send_short) { swarning(SBLOCKMYTEAM,player,0); Index: Vanilla/ntserv/main.c diff -u Vanilla/ntserv/main.c:1.21 Vanilla/ntserv/main.c:1.22 --- Vanilla/ntserv/main.c:1.21 Wed Jan 3 03:15:19 2001 +++ Vanilla/ntserv/main.c Fri Feb 2 03:17:52 2001 @@ -404,7 +404,7 @@ for (i = 0, j = &players[i]; i < MAXPLAYER; i++, j++) j->voting[me->p_no] = -1; #endif - me->candock = 1; + me->p_candock = 1; /* Get input until the player quits or dies */ living++; while (living) input(); Index: Vanilla/ntserv/ntscmds.c diff -u Vanilla/ntserv/ntscmds.c:1.17 Vanilla/ntserv/ntscmds.c:1.18 --- Vanilla/ntserv/ntscmds.c:1.17 Wed Jan 3 16:51:38 2001 +++ Vanilla/ntserv/ntscmds.c Fri Feb 2 03:17:52 2001 @@ -1,4 +1,4 @@ -/* $Id: ntscmds.c,v 1.17 2001/01/03 22:51:38 unbelver Exp $ +/* $Id: ntscmds.c,v 1.18 2001/02/02 09:17:52 cameron Exp $ */ /* @@ -1148,12 +1148,12 @@ if( !strcmp("off", what) ) { - victim->candock = 0; + victim->p_candock = 0; pmessage(whofrom, MINDIV, addr, "Slot %c no longer allowed to dock to SB", *who); } else if ( !strcmp("on", what) ) { - victim->candock = 1; + victim->p_candock = 1; pmessage(whofrom, MINDIV, addr, "Slot %c is allowed to dock to SB", *who); } else pmessage(whofrom, MINDIV, addr, "dock usage: dock 0 on|off"); Index: Vanilla/ntserv/orbit.c diff -u Vanilla/ntserv/orbit.c:1.6 Vanilla/ntserv/orbit.c:1.7 --- Vanilla/ntserv/orbit.c:1.6 Fri Feb 2 02:40:44 2001 +++ Vanilla/ntserv/orbit.c Fri Feb 2 03:17:53 2001 @@ -63,12 +63,12 @@ * Dock with a ship; * assumes it is a base, is alive, and is friendly. * (If one or more of these is not true, various nasty things happen.) - * Returns TRUE if the docking worked, or FALSE if it failed. - * Changed 3-Jan-2001. Villalpando Returns true if docking failed and - * a warning was issued. De-locks you and keeps "no valid targets" warning - * from clobbering starbase failure warnings. */ +#define DOCK_NO_BASE 0 +#define DOCK_FAILURE 1 +#define DOCK_SUCCESS 2 + static int dock(struct player *base) { LONG dx, dy; @@ -79,49 +79,49 @@ * See if I am close enough: */ dx = base->p_x - me->p_x; if ((dx > DOCKDIST) || (dx < -DOCKDIST)) - return FALSE; + return DOCK_NO_BASE; dy = base->p_y - me->p_y; if ((dy > DOCKDIST) || (dy < -DOCKDIST)) - return FALSE; + return DOCK_NO_BASE; if (dx*dx + dy*dy > DOCKDIST*DOCKDIST) - return FALSE; + return DOCK_NO_BASE; /* * Can't dock on enemy bases: */ - if (! friendlyPlayer(base)) { + if (!friendlyPlayer(base)) { new_warning(UNDEF, "Docking onto a hostile base is unwise, Captain!"); de_lock(me); - return FALSE; + return DOCK_FAILURE; } /* * Can't dock if you aren't allowed to */ - if ( me->candock == 0 ) { - new_warning(UNDEF, - "Starbase %s allows everybody else except us to dock, Captain.", - base->p_name); + if (me->p_candock == 0) { + if (send_short) + swarning(SBDOCKREFUSE_TEXT, base->p_no, 0); + else + new_warning(UNDEF, + "Starbase %s refusing us docking permission, Captain.", + base->p_name); de_lock(me); - return FALSE; + return DOCK_FAILURE; } /* Disallow SB to SB docking */ if (me->p_ship.s_type == STARBASE) { new_warning(UNDEF, "Starbases are too big to dock onto other starbases."); de_lock(me); - return FALSE; + return DOCK_FAILURE; } /* * See if the base is allowing docking: */ if (! (base->p_flags & PFDOCKOK)) { - if (send_short) - swarning(SBDOCKREFUSE_TEXT, base->p_no, 0); - else - new_warning(UNDEF, - "Starbase %s refusing us docking permission, captain.", - base->p_name); + new_warning(UNDEF, + "Starbase %s refusing all docking requests, Captain.", + base->p_name); de_lock(me); - return FALSE; + return DOCK_FAILURE; } /* @@ -132,7 +132,7 @@ else new_warning(UNDEF, "Starbase %s: Permission to dock denied, all ports currently occupied.", base->p_name); de_lock(me); - return FALSE; + return DOCK_FAILURE; } /* @@ -226,7 +226,7 @@ swarning(ONEARG_TEXT, 2, port_id); else new_warning(UNDEF,"Helmsman: Docking manuever completed Captain. All moorings secured at port %d.", port_id); - return TRUE; + return DOCK_SUCCESS; } @@ -285,9 +285,14 @@ continue; if (! isAlive(j)) continue; - /* There is! Try to dock: */ - if (dock(j)) + switch (dock(j)) { + case DOCK_NO_BASE: + break; + case DOCK_FAILURE: return; + case DOCK_SUCCESS: + return; + } } } Index: Vanilla/ntserv/struct.h diff -u Vanilla/ntserv/struct.h:1.14 Vanilla/ntserv/struct.h:1.15 --- Vanilla/ntserv/struct.h:1.14 Wed Jan 3 03:15:19 2001 +++ Vanilla/ntserv/struct.h Fri Feb 2 03:17:53 2001 @@ -382,7 +382,7 @@ #ifdef VOTING time_t voting[PV_TOTAL]; /* voting array */ #endif - int candock; /* is this player allowed to dock onto SB */ + int p_candock; /* is this player allowed to dock onto SB */ }; struct statentry { From vanilla-devel at us.netrek.org Fri Feb 2 03:17:52 2001 From: vanilla-devel at us.netrek.org (Vanilla CVS Development) Date: Wed Jan 12 00:51:24 2005 Subject: [Vanilla Devel] CVS update: Vanilla Message-ID: <200102020917.f129Hqm07507@swashbuckler.fortress.real-time.com> Date: Friday February 2, 2001 @ 3:17 Author: cameron Update of /home/netrek/cvsroot/Vanilla In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv7504 Modified Files: ChangeLog README.releasing Log Message: * ntserv/orbit.c (dock): reworked handling of return status, probably in a superfluous manner, but I've tested the various conditions now. * ntserv/struct.h, ntserv/ntscmds.c (do_nodock), ntserv/main.c (main), ntserv/enter.c (enter): change candock to p_candock to comply with convention. * ntserv/interface.c (lock_player): only mention docking status on a lock if the player is permitted to dock, otherwise treat it as a normal lock on a ship. **************************************** Index: Vanilla/ChangeLog diff -u Vanilla/ChangeLog:1.104 Vanilla/ChangeLog:1.105 --- Vanilla/ChangeLog:1.104 Fri Feb 2 02:40:42 2001 +++ Vanilla/ChangeLog Fri Feb 2 03:17:51 2001 @@ -1,3 +1,17 @@ +Fri Feb 2 19:59:53 2001 James Cameron + + * ntserv/orbit.c (dock): reworked handling of return status, + probably in a superfluous manner, but I've tested the various + conditions now. + + * ntserv/struct.h, ntserv/ntscmds.c (do_nodock), ntserv/main.c + (main), ntserv/enter.c (enter): change candock to p_candock to + comply with convention. + + * ntserv/interface.c (lock_player): only mention docking status on + a lock if the player is permitted to dock, otherwise treat it as a + normal lock on a ship. + Fri Feb 2 19:31:36 2001 James Cameron * ntserv/orbit.c (dock): was returning TRUE for failure to dock, @@ -1116,4 +1130,4 @@ update_sys_defaults in updateMessages to a more appropriate location - updateClient in socket.c. - $Id: ChangeLog,v 1.104 2001/02/02 08:40:42 cameron Exp $ + $Id: ChangeLog,v 1.105 2001/02/02 09:17:51 cameron Exp $ Index: Vanilla/README.releasing diff -u Vanilla/README.releasing:1.3 Vanilla/README.releasing:1.4 --- Vanilla/README.releasing:1.3 Fri Feb 2 02:40:42 2001 +++ Vanilla/README.releasing Fri Feb 2 03:17:51 2001 @@ -1,87 +1,88 @@ -$Id: README.releasing,v 1.3 2001/02/02 08:40:42 cameron Exp $ +$Id: README.releasing,v 1.4 2001/02/02 09:17:51 cameron Exp $ Release Procedure - # assumes csh or tcsh - # be in your local copy of the CVS repository - cd Vanilla - - # set variables to ease the rest of this ... (csh or tcsh) - set VS=2.9pl7 - set VL=v_2_9_7 - - # make sure you have committed all changes - cvs -z9 diff -u > tmp.tmp - # review uncommitted changes - more tmp.tmp - # commit changes - cvs -z9 commit - - # tag the release - cvs -z9 tag $VL - cvs -z9 tag -F v_release - - # export the tagged release to a new directory and tar - cd .. - setenv CVSROOT :pserver:cameron@cvs.us.netrek.org:/home/netrek/cvsroot - cvs -z9 export -d Vanilla-$VS -r $VL Vanilla - # package res-rsa with .tar.gz as per Dave Ahn 28th June 2000 - cd Vanilla-$VS - tar xzf ../Vanilla/res-rsa-2.9.2.tar.gz - mv res-rsa-2.9.2/* res-rsa/ - rmdir res-rsa-2.9.2 - cd .. - tar cf Vanilla-$VS.tar Vanilla-$VS - gzip -9 Vanilla-$VS.tar - - # record md5sum of kit for publishing - md5sum Vanilla-$VS.tar.gz > Vanilla-$VS.tar.gz.md5sum - - # test build kit - cd Vanilla-$VS - ./configure --prefix=/tmp/$VS - make - - # test install kit - make install - /tmp/$VS/netrekd - - # test client - cow -h localhost - - # clean up - /tmp/$VS/netrekd stop - rm -rf /tmp/$VS - cd .. - rm -rf Vanilla-$VS - - # rpm packaging - Vanilla/rpm/tar2rpm - cp Vanilla/res-rsa-*.tar.gz /usr/src/redhat/SOURCES - cd /usr/src/redhat/SPECS - rpm -ba netrek.spec - # test package install - - # send .tar.gz and .rpm to ftp sites - ftp://ftp.netrek.org/pub/netrek/incoming/ (note 15 second login timer) - ftp://ftp.real-time.com/pub/Incoming/ +# assumes csh or tcsh +# be in your local copy of the CVS repository +cd Vanilla + +# set variables to ease the rest of this ... (csh or tcsh) +set VS=2.9pl7 +set VL=v_2_9_7 + +# make sure you have committed all changes +cvs -z9 diff -u > tmp.tmp +# review uncommitted changes +more tmp.tmp +# commit changes +cvs -z9 commit + +# tag the release +cvs -z9 tag $VL +cvs -z9 tag -F v_release + +# export the tagged release to a new directory and tar +cd .. +setenv CVSROOT :pserver:cameron@cvs.us.netrek.org:/home/netrek/cvsroot +cvs -z9 export -d Vanilla-$VS -r $VL Vanilla +# package res-rsa with .tar.gz as per Dave Ahn 28th June 2000 +cd Vanilla-$VS +tar xzf ../Vanilla/res-rsa-2.9.2.tar.gz +mv res-rsa-2.9.2/* res-rsa/ +rmdir res-rsa-2.9.2 +cd .. +tar cf Vanilla-$VS.tar Vanilla-$VS +gzip -9 Vanilla-$VS.tar + +# record md5sum of kit for publishing +md5sum Vanilla-$VS.tar.gz > Vanilla-$VS.tar.gz.md5sum + +# test build kit +cd Vanilla-$VS +./configure --prefix=/tmp/$VS +make + +# test install kit +make install +/tmp/$VS/netrekd + +# test client +cow -h localhost + +# clean up +/tmp/$VS/netrekd stop +rm -rf /tmp/$VS +cd .. +rm -rf Vanilla-$VS + +# rpm packaging +Vanilla/rpm/tar2rpm +cp Vanilla/res-rsa-*.tar.gz /usr/src/redhat/SOURCES +cd /usr/src/redhat/SPECS +rpm -ba netrek.spec +# test package install + +# send .tar.gz and .rpm to ftp sites +ftp://ftp.netrek.org/pub/netrek/incoming/ (note 15 second login timer) +ftp://ftp.real-time.com/pub/Incoming/ - # notify mirror owners, include URL of incoming copy and md5sum. - mailto:vanilla-list@us.netrek.org +# notify mirror owners, include URL of incoming copy and md5sum. +mailto:vanilla-list@us.netrek.org - # build differences between this version and previous +# build differences between this version and previous - # update web page - http://vanilla.us.netrek.org/index.html - setenv CVSROOT :pserver:cameron@cvs.us.netrek.org:/home/netrek/cvsroot - cvs checkout web [or] cvs update - # review differences and generate short change list in index.html - cvs commit - - # await mirror completion - # notify others - mailto:vanilla-announce@us.netrek.org - news:rec.games.netrek +# update web page +http://vanilla.us.netrek.org/index.html +setenv CVSROOT :pserver:cameron@cvs.us.netrek.org:/home/netrek/cvsroot +cvs checkout web [or] cvs update +# review differences and generate short change list in index.html +cvs commit + +# await mirror completion +# notify others +mailto:vanilla-announce@us.netrek.org +news:rec.games.netrek - # update version number, patchlevel.h, version.h, rpm/netrek.spec, rpm/tar2rpm here +# update version number in files +# patchlevel.h, version.h, rpm/netrek.spec, rpm/tar2rpm, README.releasing From vanilla-devel at us.netrek.org Thu Feb 8 13:42:35 2001 From: vanilla-devel at us.netrek.org (Vanilla CVS Development) Date: Wed Jan 12 00:51:24 2005 Subject: [Vanilla Devel] CVS update: metaserver Message-ID: <200102081942.f18JgZG12164@swashbuckler.fortress.real-time.com> Date: Thursday February 8, 2001 @ 13:42 Author: unbelver Update of /home/netrek/cvsroot/metaserver In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv12161 Modified Files: rsa_keys Log Message: **************************************** Index: metaserver/rsa_keys diff -u metaserver/rsa_keys:2.23 metaserver/rsa_keys:2.24 --- metaserver/rsa_keys:2.23 Wed Jan 3 12:59:01 2001 +++ metaserver/rsa_keys Thu Feb 8 13:42:35 2001 @@ -650,6 +650,12 @@ :gk=7d38a6ed7c54718497c705a151b94ebca8c31df4cf90f454ecfe301ef2244435:\ :pk=ef3613b3cda1fbc9918c28f14fca99418f59729daa002658b252b19392530714: # +key.cow3.netbsd_i386_elf:ct=Client Of Win v3:cr=sco@openface.ca:\ + :cd=February 2001:ar=NetBSD/i386 ELF (1.5+):cl=inl,standard2:\ + :cm=reserved.c blessed. Located via ftp at ftp.openface.ca:\ + :gk=690c8160f03b4aa544f88f750d8b2688948506fe6ec8622fe50f329791774d9a:\ + :pk=cb7e4468f6d4726d8d69796ca4204ec1e70969c72f97039b3b4b9467cfe37d10: +# # COW-lite Clients # COW-lite RSA Key v1.20:ct=COW-lite:cr=powell@csl.ncsa.uiuc.edu:\ From vanilla-devel at us.netrek.org Sun Feb 11 17:58:34 2001 From: vanilla-devel at us.netrek.org (Vanilla CVS Development) Date: Wed Jan 12 00:51:24 2005 Subject: [Vanilla Devel] CVS update: Vanilla Message-ID: <200102112358.f1BNwYT14199@swashbuckler.fortress.real-time.com> Date: Sunday February 11, 2001 @ 17:58 Author: unbelver Update of /home/netrek/cvsroot/Vanilla In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv14196 Modified Files: ChangeLog config.h.in Log Message: * ntserv/ntscmds.c (nts_commands): Made NODOCK a config.h option * ntserv/ntscmds.c (do_nodock): Observers can't change dock permission **************************************** Index: Vanilla/ChangeLog diff -u Vanilla/ChangeLog:1.105 Vanilla/ChangeLog:1.106 --- Vanilla/ChangeLog:1.105 Fri Feb 2 03:17:51 2001 +++ Vanilla/ChangeLog Sun Feb 11 17:58:34 2001 @@ -1,3 +1,8 @@ +Sun Feb 11 15:49:06 2001 Carlos Y. Villalpando + + * ntserv/ntscmds.c (nts_commands): Made NODOCK a config.h option + * ntserv/ntscmds.c (do_nodock): Observers can't change dock permission + Fri Feb 2 19:59:53 2001 James Cameron * ntserv/orbit.c (dock): reworked handling of return status, @@ -1130,4 +1135,4 @@ update_sys_defaults in updateMessages to a more appropriate location - updateClient in socket.c. - $Id: ChangeLog,v 1.105 2001/02/02 09:17:51 cameron Exp $ + $Id: ChangeLog,v 1.106 2001/02/11 23:58:34 unbelver Exp $ Index: Vanilla/config.h.in diff -u Vanilla/config.h.in:1.24 Vanilla/config.h.in:1.25 --- Vanilla/config.h.in:1.24 Sun Jul 2 22:03:34 2000 +++ Vanilla/config.h.in Sun Feb 11 17:58:34 2001 @@ -358,6 +358,8 @@ #endif #endif +#define NODOCK /* NODOCK allow per-slot docking priveledges */ + /* NO_BRUTALITY - disallow fighting between waiting players in the dogfighting mode */ From vanilla-devel at us.netrek.org Sun Feb 11 17:58:35 2001 From: vanilla-devel at us.netrek.org (Vanilla CVS Development) Date: Wed Jan 12 00:51:24 2005 Subject: [Vanilla Devel] CVS update: Vanilla/ntserv Message-ID: <200102112358.f1BNwZx14205@swashbuckler.fortress.real-time.com> Date: Sunday February 11, 2001 @ 17:58 Author: unbelver Update of /home/netrek/cvsroot/Vanilla/ntserv In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv14196/ntserv Modified Files: ntscmds.c Log Message: * ntserv/ntscmds.c (nts_commands): Made NODOCK a config.h option * ntserv/ntscmds.c (do_nodock): Observers can't change dock permission **************************************** Index: Vanilla/ntserv/ntscmds.c diff -u Vanilla/ntserv/ntscmds.c:1.18 Vanilla/ntserv/ntscmds.c:1.19 --- Vanilla/ntserv/ntscmds.c:1.18 Fri Feb 2 03:17:52 2001 +++ Vanilla/ntserv/ntscmds.c Sun Feb 11 17:58:35 2001 @@ -1,4 +1,4 @@ -/* $Id: ntscmds.c,v 1.18 2001/02/02 09:17:52 cameron Exp $ +/* $Id: ntscmds.c,v 1.19 2001/02/11 23:58:35 unbelver Exp $ */ /* @@ -114,10 +114,12 @@ C_PR_INPICKUP, "Administration commands for privileged users", do_admin }, /* ADMIN */ +#ifdef NODOCK { "DOCK", C_PR_INPICKUP, "Toggle individual player docking permission. eg. 'DOCK 0 ON|OFF'", do_nodock }, +#endif #ifdef ALLOW_PAUSE { "PAUSE", @@ -1104,6 +1106,14 @@ return; } +#ifdef OBSERVERS + if (p->p_status == POBSERV) + { + pmessage(whofrom, MINDIV, addr, "dock: Observers cannot change dock permissions"); + return; + } +#endif + who = strtok(comm, " "); if ( who == NULL) return; From vanilla-devel at us.netrek.org Sun Feb 11 18:10:48 2001 From: vanilla-devel at us.netrek.org (Vanilla CVS Development) Date: Wed Jan 12 00:51:24 2005 Subject: [Vanilla Devel] CVS update: Vanilla Message-ID: <200102120010.f1C0Amg14223@swashbuckler.fortress.real-time.com> Date: Sunday February 11, 2001 @ 18:10 Author: unbelver Update of /home/netrek/cvsroot/Vanilla In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv14220 Modified Files: ChangeLog Log Message: * tools/xtkill.c (main): Added bounds checking to promote/demote. ntserv will crash if there is an invalid rank. **************************************** Index: Vanilla/ChangeLog diff -u Vanilla/ChangeLog:1.106 Vanilla/ChangeLog:1.107 --- Vanilla/ChangeLog:1.106 Sun Feb 11 17:58:34 2001 +++ Vanilla/ChangeLog Sun Feb 11 18:10:48 2001 @@ -1,3 +1,8 @@ +Sun Feb 11 16:02:10 2001 Carlos Y. Villalpando + + * tools/xtkill.c (main): Added bounds checking to + promote/demote. ntserv will crash if there is an invalid rank. + Sun Feb 11 15:49:06 2001 Carlos Y. Villalpando * ntserv/ntscmds.c (nts_commands): Made NODOCK a config.h option @@ -1135,4 +1140,4 @@ update_sys_defaults in updateMessages to a more appropriate location - updateClient in socket.c. - $Id: ChangeLog,v 1.106 2001/02/11 23:58:34 unbelver Exp $ + $Id: ChangeLog,v 1.107 2001/02/12 00:10:48 unbelver Exp $ From vanilla-devel at us.netrek.org Sun Feb 11 18:10:48 2001 From: vanilla-devel at us.netrek.org (Vanilla CVS Development) Date: Wed Jan 12 00:51:24 2005 Subject: [Vanilla Devel] CVS update: Vanilla/tools Message-ID: <200102120010.f1C0Am314228@swashbuckler.fortress.real-time.com> Date: Sunday February 11, 2001 @ 18:10 Author: unbelver Update of /home/netrek/cvsroot/Vanilla/tools In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv14220/tools Modified Files: xtkill.c Log Message: * tools/xtkill.c (main): Added bounds checking to promote/demote. ntserv will crash if there is an invalid rank. **************************************** Index: Vanilla/tools/xtkill.c diff -u Vanilla/tools/xtkill.c:1.6 Vanilla/tools/xtkill.c:1.7 --- Vanilla/tools/xtkill.c:1.6 Fri Jun 23 04:12:59 2000 +++ Vanilla/tools/xtkill.c Sun Feb 11 18:10:48 2001 @@ -171,14 +171,18 @@ players[player].p_ship.s_maxdamage = 750; players[player].p_ship.s_maxegntemp = 5000; break; - case 'D': /* demote */ + case 'D': /* demote, but not beyond ensign */ + if(players[player].p_stats.st_rank == 0) + players[player].p_stats.st_rank++; + --players[player].p_stats.st_rank; sprintf(buf, "GOD->ALL %2s was (temporarily) demoted for rank normalization purposes.", players[player].p_mapchars); _pmessage(buf, 0, MALL); break; - case 'P': /* promote */ - ++players[player].p_stats.st_rank; + case 'P': /* promote, but not beyond admiral */ + if( players[player].p_stats.st_rank < (NUMRANKS - 1) ) + ++players[player].p_stats.st_rank; break; case 'k': /* kill increment */ players[player].p_kills += 1.0; From vanilla-devel at us.netrek.org Mon Feb 12 23:05:01 2001 From: vanilla-devel at us.netrek.org (Vanilla CVS Development) Date: Wed Jan 12 00:51:24 2005 Subject: [Vanilla Devel] CVS update: Vanilla Message-ID: <200102130505.f1D551P15123@swashbuckler.fortress.real-time.com> Date: Monday February 12, 2001 @ 23:05 Author: ahn Update of /home/netrek/cvsroot/Vanilla In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv15120 Modified Files: ChangeLog Log Message: Fix Extra Time message. **************************************** Index: Vanilla/ChangeLog diff -u Vanilla/ChangeLog:1.107 Vanilla/ChangeLog:1.108 --- Vanilla/ChangeLog:1.107 Sun Feb 11 18:10:48 2001 +++ Vanilla/ChangeLog Mon Feb 12 23:05:01 2001 @@ -1,3 +1,6 @@ +Mon Feb 12 23:59:36 EST 2001 Dave Ahn + * robots/inlcomm.c: Fix Extra Time message. + Sun Feb 11 16:02:10 2001 Carlos Y. Villalpando * tools/xtkill.c (main): Added bounds checking to @@ -1140,4 +1143,4 @@ update_sys_defaults in updateMessages to a more appropriate location - updateClient in socket.c. - $Id: ChangeLog,v 1.107 2001/02/12 00:10:48 unbelver Exp $ + $Id: ChangeLog,v 1.108 2001/02/13 05:05:01 ahn Exp $ From vanilla-devel at us.netrek.org Mon Feb 12 23:05:02 2001 From: vanilla-devel at us.netrek.org (Vanilla CVS Development) Date: Wed Jan 12 00:51:24 2005 Subject: [Vanilla Devel] CVS update: Vanilla/robots Message-ID: <200102130505.f1D552g15128@swashbuckler.fortress.real-time.com> Date: Monday February 12, 2001 @ 23:05 Author: ahn Update of /home/netrek/cvsroot/Vanilla/robots In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv15120/robots Modified Files: inlcomm.c Log Message: Fix Extra Time message. **************************************** Index: Vanilla/robots/inlcomm.c diff -u Vanilla/robots/inlcomm.c:1.20 Vanilla/robots/inlcomm.c:1.21 --- Vanilla/robots/inlcomm.c:1.20 Fri Jan 26 17:58:01 2001 +++ Vanilla/robots/inlcomm.c Mon Feb 12 23:05:01 2001 @@ -342,7 +342,7 @@ int seconds = ( (time - inl_stat.game_ticks) / PERSEC ) % 60; int minutes = ( (time - inl_stat.game_ticks) / PERMIN ); - if (inl_stat.overtime) + if (inl_stat.extratime) pmessage(who, MINDIV, addr_mess(who, MINDIV), "Extra Time remaining: %d:%02.2d", minutes, seconds); else From vanilla-devel at us.netrek.org Thu Feb 22 20:34:06 2001 From: vanilla-devel at us.netrek.org (Vanilla CVS Development) Date: Wed Jan 12 00:51:24 2005 Subject: [Vanilla Devel] CVS update: Vanilla Message-ID: <200102230234.f1N2Y6a22841@swashbuckler.fortress.real-time.com> Date: Thursday February 22, 2001 @ 20:34 Author: ahn Update of /home/netrek/cvsroot/Vanilla In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv22838 Modified Files: ChangeLog Log Message: Changes to continuous scoring formula. **************************************** Index: Vanilla/ChangeLog diff -u Vanilla/ChangeLog:1.108 Vanilla/ChangeLog:1.109 --- Vanilla/ChangeLog:1.108 Mon Feb 12 23:05:01 2001 +++ Vanilla/ChangeLog Thu Feb 22 20:33:59 2001 @@ -1,3 +1,7 @@ +Thu Feb 22 21:00:12 EST 2001 Dave Ahn + * robots/inl.c: Adjust continuous scoring weight formula (again). + See README.scores for details. + Mon Feb 12 23:59:36 EST 2001 Dave Ahn * robots/inlcomm.c: Fix Extra Time message. @@ -1143,4 +1147,4 @@ update_sys_defaults in updateMessages to a more appropriate location - updateClient in socket.c. - $Id: ChangeLog,v 1.108 2001/02/13 05:05:01 ahn Exp $ + $Id: ChangeLog,v 1.109 2001/02/23 02:33:59 ahn Exp $ From vanilla-devel at us.netrek.org Thu Feb 22 20:34:09 2001 From: vanilla-devel at us.netrek.org (Vanilla CVS Development) Date: Wed Jan 12 00:51:24 2005 Subject: [Vanilla Devel] CVS update: Vanilla/robots Message-ID: <200102230234.f1N2Y9R22846@swashbuckler.fortress.real-time.com> Date: Thursday February 22, 2001 @ 20:34 Author: ahn Update of /home/netrek/cvsroot/Vanilla/robots In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv22838/robots Modified Files: inl.c Log Message: Changes to continuous scoring formula. **************************************** Index: Vanilla/robots/inl.c diff -u Vanilla/robots/inl.c:1.36 Vanilla/robots/inl.c:1.37 --- Vanilla/robots/inl.c:1.36 Fri Jan 26 17:58:01 2001 +++ Vanilla/robots/inl.c Thu Feb 22 20:34:09 2001 @@ -1,7 +1,7 @@ -/* $Id: inl.c,v 1.36 2001/01/26 23:58:01 ahn Exp $ */ +/* $Id: inl.c,v 1.37 2001/02/23 02:34:09 ahn Exp $ */ #ifndef lint -static char vcid[] = "$Id: inl.c,v 1.36 2001/01/26 23:58:01 ahn Exp $"; +static char vcid[] = "$Id: inl.c,v 1.37 2001/02/23 02:34:09 ahn Exp $"; #endif /* lint */ /* @@ -601,7 +601,7 @@ int p, t; double weight = (double) inl_stat.game_ticks / (double) inl_stat.time; - static const double weight_max = 2.7408445; /* 0.5 + 0.5 * exp(1.5); */ + static const double weight_max = 2.0; /* exp(1.0) - 0.71828183 */ /* sanity check! */ if (weight < 0.0) @@ -611,11 +611,11 @@ /* weight = linear range between 0.0 and 1.0 during regulation. * map this to exponential curve using formula: - * weight = 0.5 + 0.5 * exp(1.5 * time) - * weight range is 1.0 to 2.7408445 + * weight = exp(time) - (0.71828183 * time) + * weight range is 1.0 to 2.0 * -da */ - weight = 0.5 + 0.5 * exp(1.5 * weight); + weight = exp(weight) - (0.71828183 * weight); /* sanity check */ if (weight < 1.0) From vanilla-devel at us.netrek.org Thu Feb 22 20:34:10 2001 From: vanilla-devel at us.netrek.org (Vanilla CVS Development) Date: Wed Jan 12 00:51:24 2005 Subject: [Vanilla Devel] CVS update: Vanilla/docs Message-ID: <200102230234.f1N2YAM22851@swashbuckler.fortress.real-time.com> Date: Thursday February 22, 2001 @ 20:34 Author: ahn Update of /home/netrek/cvsroot/Vanilla/docs In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv22838/docs Modified Files: README.scores Log Message: Changes to continuous scoring formula. **************************************** Index: Vanilla/docs/README.scores diff -u Vanilla/docs/README.scores:1.4 Vanilla/docs/README.scores:1.5 --- Vanilla/docs/README.scores:1.4 Fri Jan 26 18:37:12 2001 +++ Vanilla/docs/README.scores Thu Feb 22 20:34:09 2001 @@ -1,4 +1,4 @@ -$Id: README.scores,v 1.4 2001/01/27 00:37:12 ahn Exp $ +$Id: README.scores,v 1.5 2001/02/23 02:34:09 ahn Exp $ Continuous Scoring System Momentum Scoring System @@ -36,13 +36,13 @@ that a weak score at the beginning of the game (from poor play such as losing the base+25 at opening) can be more easily offset by improved play at the end of the game. The weight factor is exponential and -ranges from 1.0 to 2.7408445. The formula for the weight at each tick +ranges from 1.0 to 2.0. The formula for the weight at each tick is: - weight = 0.5 + 0.5 * exp(1.5 * time) + weight = exp(time) - (0.71828183 * time) time = range from 0.0 to 1.0, from start to end (regulation) -If the game goes to OT, the weight stays capped at 2.7408445. +If the game goes to OT, the weight stays capped at 2.0. The total number of points awarded at each tick for each team is: From ahn at vec.wfubmc.edu Thu Feb 1 20:03:53 2001 From: ahn at vec.wfubmc.edu (Dave Ahn) Date: Wed Jan 12 00:52:17 2005 Subject: [Vanilla List] latest server code fucked Message-ID: <20010201210353.A80025@cecum.vec.wfubmc.edu> Hey, the latest INL server code is messed up. Half the people can't orbit before and during the game. Did anyone make changes to the orbit code? All current servers were updated to this code, so please be advised that the only safe server is on genocide.netrek.org 4566/4577/4000/5000. Also, inl.real-time.com is rejecting all player logins. -- Dave Ahn | ahn@vec.wfubmc.edu | Wake Forest University Baptist Medical Center When you were born, you cried and the world rejoiced. Try to live your life so that when you die, you will rejoice and the world will cry. -1/2 jj^2 From ahn at vec.wfubmc.edu Thu Feb 1 22:04:13 2001 From: ahn at vec.wfubmc.edu (Dave Ahn) Date: Wed Jan 12 00:52:17 2005 Subject: [Vanilla List] latest server code fucked In-Reply-To: <20010201210353.A80025@cecum.vec.wfubmc.edu>; from ahn@vec.wfubmc.edu on Thu, Feb 01, 2001 at 09:03:53PM -0500 References: <20010201210353.A80025@cecum.vec.wfubmc.edu> Message-ID: <20010201230413.A79652@cecum.vec.wfubmc.edu> On Thu, Feb 01, 2001 at 09:03:53PM -0500, Dave Ahn wrote: > Hey, the latest INL server code is messed up. Half the people can't orbit > before and during the game. Did anyone make changes to the orbit code? Ok, I tracked the problem down to Carlos' orbit patch. I backed up ntserv/orbit.c to 1.4, and the problem went away. I'm downgrading all the servers to use this rev until it's fixed in the CVS. -- Dave Ahn | ahn@vec.wfubmc.edu | Wake Forest University Baptist Medical Center When you were born, you cried and the world rejoiced. Try to live your life so that when you die, you will rejoice and the world will cry. -1/2 jj^2 From xyzzy at speakeasy.org Fri Feb 2 05:23:29 2001 From: xyzzy at speakeasy.org (Trent Piepho) Date: Wed Jan 12 00:52:17 2005 Subject: [Vanilla List] this nodocking thing Message-ID: So if there are two or more bases on a team, and one base uses nodock, can the player effected not dock on the other base either? What about a friendly base on another team, could they dock on that base? Can a friendly base turn off docking for players on another team? Does not being able to dock on a base really make a difference to dead d00dz anyway? If a base quits, will docking disables be turned off? If a player quits, will the next guy to get his slot be blocked from docking? From quozl at us.netrek.org Fri Feb 2 06:40:13 2001 From: quozl at us.netrek.org (James Cameron) Date: Wed Jan 12 00:52:17 2005 Subject: [Vanilla List] this nodocking thing In-Reply-To: ; from xyzzy@speakeasy.org on Fri, Feb 02, 2001 at 03:23:29AM -0800 References: Message-ID: <20010202234013.A11848@us.netrek.org> On Fri, Feb 02, 2001 at 03:23:29AM -0800, Trent Piepho wrote: > So if there are two or more bases on a team, and one base uses > nodock, can the player effected not dock on the other base either? Yes. But the other base can change the flag back. > What about a friendly base on another team, could they dock on that > base? No. The p_candock status is part of the player struct. > Can a friendly base turn off docking for players on another team? No. Line 1143 of ntserv/ntscmds.c. > Does not being able to dock on a base really make a difference to > dead d00dz anyway? This is a question outside the code. If you mean the anti-social non-base players, no. If you mean the base owner, yes, they will be happier. > If a base quits, will docking disables be turned off? No. They are turned off when a player enters as a base. Line 138 of ntserv/enter.c. The disables will be kept if a base refits out and another base refits in. > If a player quits, will the next guy to get his slot be blocked from > docking? No. Line 407 of ntserv/main.c. -- James Cameron mailto:quozl@us.netrek.org http://quozl.netrek.org/ From ahn at vec.wfubmc.edu Fri Feb 2 11:32:51 2001 From: ahn at vec.wfubmc.edu (Dave Ahn) Date: Wed Jan 12 00:52:17 2005 Subject: [Vanilla List] this nodocking thing In-Reply-To: <20010202234013.A11848@us.netrek.org>; from quozl@us.netrek.org on Fri, Feb 02, 2001 at 11:40:13PM +1100 References: <20010202234013.A11848@us.netrek.org> Message-ID: <20010202123251.C81292@cecum.vec.wfubmc.edu> On Fri, Feb 02, 2001 at 11:40:13PM +1100, James Cameron wrote: > On Fri, Feb 02, 2001 at 03:23:29AM -0800, Trent Piepho wrote: > > So if there are two or more bases on a team, and one base uses > > nodock, can the player effected not dock on the other base either? > > Yes. But the other base can change the flag back. > > > What about a friendly base on another team, could they dock on that > > base? You should make sure that the flag is cleared in a team change. -- Dave Ahn | ahn@vec.wfubmc.edu | Wake Forest University Baptist Medical Center When you were born, you cried and the world rejoiced. Try to live your life so that when you die, you will rejoice and the world will cry. -1/2 jj^2 From exelrud at usa.net Fri Feb 2 18:11:33 2001 From: exelrud at usa.net (Jacques Exelrud) Date: Wed Jan 12 00:52:17 2005 Subject: [Vanilla List] UWin port to netrek References: <20010201210353.A80025@cecum.vec.wfubmc.edu> Message-ID: <005e01c08d78$75ef1a90$45f4fbc8@pc.com.br> I would like to know if someone has tested the UWin port of netrek If it's working fine I need to send the patches to someone so that in the future there is no need to port it again. Thanks in advance, Jacques From hk67hk89 at yahoo.com Mon Feb 5 01:31:35 2001 From: hk67hk89 at yahoo.com (hk67hk89@yahoo.com) Date: Wed Jan 12 00:52:17 2005 Subject: [Vanilla List] PREDICT THE SEX OF YOUR FUTURE BABY ONLINE. Message-ID: <8XPBk5rIpeJ6h2jlR> THE MOST IMPORTANT WEB SITE TO VISIT WWW.BOYORGIRL.COM WHEN YOU’RE READY TO START A FAMILY! Tired of guessing whether you’ll have a boy or girl? Guess no more because our revolutionary mathematical method will predict the sex of your future baby with 92% accuracy! VISIT US TODAY! click here www.boyorgirl.com ** REMOVE ** REMOVE ** REMOVE ** REMOVE ** REMOVE ** To be removed from our mailing list, please email hk67hk89@yahoo.com All REMOVE requests AUTOMATICALLY honored upon receipt. PLEASE understand that any effort to disrupt, close or block this REMOVE account can only result in difficulties for others wanting to be removed from our mailing list as it will be impossible to take anyone off the list if the remove instruction can not be received. From victoria_simms at fsmail.net Mon Feb 5 17:15:00 2001 From: victoria_simms at fsmail.net (Victoria Simms) Date: Wed Jan 12 00:52:17 2005 Subject: [Vanilla List] Strategic Partnership Proposal Message-ID: <20010205231502.25226.qmail@fsmail.net> Hello, I recently visited your website and believe you may be interested in forming a strategic partnership. Our company owns and operates fully licensed online casinos. We have over 30,000 clients and 8,500 partner websites. The online gaming industry is the most explosive on the net, with over $10 billion projected by 2002. We would like to offer you the following proposal: Qwest Global Intertainment provides: * Casino / sportsbook front end design (for an example, go to http://216.36.255.157) * All gaming software, customer service, credit card processing, and logistical support * Up to 50% of casino net-win (tracked in real-time) * Profit checks mailed each Friday, rain or shine You provide: * Website Promotion via banners, email, or search engine placement. Without assuming any of the risk, you can drive traffic to your personal Internet casino and immediately increase your company's residual income. I invite you to look at our corporate website at the following address: http://216.36.255.157 Please email me at partners@getyourcasino.com if you have any questions or comments. I look forward to hearing from you! Regards, Victoria Simms partners@getyourcasino.com _______________________________________________________________________ FSmail - Get your free web-based email from Freeserve: www.fsmail.net From unbelver at brain.jpl.nasa.gov Mon Feb 5 19:21:14 2001 From: unbelver at brain.jpl.nasa.gov (Carlos Y. Villalpando) Date: Wed Jan 12 00:52:17 2005 Subject: [Vanilla List] Strategic Partnership Proposal In-Reply-To: <20010205231502.25226.qmail@fsmail.net>; from victoria_simms@fsmail.net on Mon, Feb 05, 2001 at 11:15:00PM +0000 References: <20010205231502.25226.qmail@fsmail.net> Message-ID: <20010205172114.A24221@skyweir.jpl.nasa.gov> Wow. One of the spam crawlers finally got around to www.netrek.org. Ugh. At least its a refreshing change from the regular "Senor Ted Turner, mandemos dinero por favor" mailings. --Carlos V. From xyzzy at speakeasy.org Sat Feb 10 07:30:36 2001 From: xyzzy at speakeasy.org (Trent Piepho) Date: Wed Jan 12 00:52:17 2005 Subject: [Vanilla List] this nodocking thing In-Reply-To: <20010202234013.A11848@us.netrek.org> Message-ID: On Fri, 2 Feb 2001, James Cameron wrote: > On Fri, Feb 02, 2001 at 03:23:29AM -0800, Trent Piepho wrote: > > So if there are two or more bases on a team, and one base uses > > nodock, can the player effected not dock on the other base either? > > Yes. But the other base can change the flag back. > > > What about a friendly base on another team, could they dock on that > > base? > > No. The p_candock status is part of the player struct. How about making this docking thing optional. It seems rather ill-conceived for servers like chaos.eic.net where you have more than two teams and more than one base. How about someone observing a base, can they turn docking off? From quozl at us.netrek.org Sat Feb 10 20:51:40 2001 From: quozl at us.netrek.org (James Cameron) Date: Wed Jan 12 00:52:17 2005 Subject: [Vanilla List] this nodocking thing In-Reply-To: ; from xyzzy@speakeasy.org on Sat, Feb 10, 2001 at 05:30:36AM -0800 References: <20010202234013.A11848@us.netrek.org> Message-ID: <20010211135140.C11544@us.netrek.org> On Sat, Feb 10, 2001 at 05:30:36AM -0800, Trent Piepho wrote: > How about making this docking thing optional? [...] Excellent idea. Are you going to do the patch or will we leave it to Carlos? He did call for comment at the time. > How about someone observing a base, can they turn docking off? I haven't tested that aspect. A quick look at the code in ntscmds.c shows no check for observers. A test would be a good idea. Let me know what you find. -- James Cameron mailto:quozl@us.netrek.org http://quozl.netrek.org/ From ahn at vec.wfubmc.edu Sat Feb 10 21:50:12 2001 From: ahn at vec.wfubmc.edu (Dave Ahn) Date: Wed Jan 12 00:52:17 2005 Subject: [Vanilla List] 2.9pl7pre1 available Message-ID: <20010210225012.A97340@cecum.vec.wfubmc.edu> Looks like somebody (James?) uploaded Vanilla 2.9pl7pre1 to ftp.netrek.org. It's available at /pub/netrek/servers/vanilla/. My FTP watcher script must be broken. Didn't see those files sitting in incoming for weeks now. -- Dave Ahn | ahn@vec.wfubmc.edu | Wake Forest University Baptist Medical Center When you were born, you cried and the world rejoiced. Try to live your life so that when you die, you will rejoice and the world will cry. -1/2 jj^2 From quozl at us.netrek.org Sat Feb 10 22:17:44 2001 From: quozl at us.netrek.org (James Cameron) Date: Wed Jan 12 00:52:17 2005 Subject: [Vanilla List] 2.9pl7pre1 available In-Reply-To: <20010210225012.A97340@cecum.vec.wfubmc.edu>; from ahn@vec.wfubmc.edu on Sat, Feb 10, 2001 at 10:50:12PM -0500 References: <20010210225012.A97340@cecum.vec.wfubmc.edu> Message-ID: <20010211151744.B12499@us.netrek.org> On Sat, Feb 10, 2001 at 10:50:12PM -0500, Dave Ahn wrote: > Looks like somebody (James?) uploaded Vanilla 2.9pl7pre1 to ftp.netrek.org. > It's available at /pub/netrek/servers/vanilla/. Thanks. I'm waiting for confirmation of this orbit bug being fixed by this release before I make it final. Also I'd like someone to test it, beyond what I've tested it with. Here is the md5sum of my master copy ... 327fde0aaefe41ea711d9aeba274ee72 Vanilla-2.9pl7pre1.tar.gz -- James Cameron mailto:quozl@us.netrek.org http://quozl.netrek.org/ From xyzzy at speakeasy.org Sun Feb 11 00:02:41 2001 From: xyzzy at speakeasy.org (Trent Piepho) Date: Wed Jan 12 00:52:17 2005 Subject: [Vanilla List] this nodocking thing In-Reply-To: <20010211135140.C11544@us.netrek.org> Message-ID: On Sun, 11 Feb 2001, James Cameron wrote: > On Sat, Feb 10, 2001 at 05:30:36AM -0800, Trent Piepho wrote: > > How about making this docking thing optional? [...] > > Excellent idea. Are you going to do the patch or will we leave it to > Carlos? He did call for comment at the time. He did? I don't remember anything about this nodock thing until it was found that it broke orbiting. > > How about someone observing a base, can they turn docking off? > > I haven't tested that aspect. A quick look at the code in ntscmds.c > shows no check for observers. A test would be a good idea. Let me know > what you find. The only problem is my CVS isn't up to date and I there are conflicts I've got to merge to get there. I thought the person who wrote the code would know if they thought of that or not. From unbelver at brain.jpl.nasa.gov Sun Feb 11 20:19:08 2001 From: unbelver at brain.jpl.nasa.gov (Carlos Y. Villalpando) Date: Wed Jan 12 00:52:17 2005 Subject: [Vanilla List] this nodocking thing In-Reply-To: ; from xyzzy@speakeasy.org on Sat, Feb 10, 2001 at 10:02:41PM -0800 References: <20010211135140.C11544@us.netrek.org> Message-ID: <20010211181908.A28325@brain.jpl.nasa.gov> Quoting Trent Piepho : > On Sun, 11 Feb 2001, James Cameron wrote: > > > > Excellent idea. Are you going to do the patch or will we leave it to > > Carlos? He did call for comment at the time. > > He did? I don't remember anything about this nodock thing until it was found > that it broke orbiting. No, I didn't. At least not on vanilla-l, I did elsewhere. Anyway my bug wasn't entirely the nodock thing. It was me trying to rearrange the checks so that the user got a sane failure message. As it stood earlier, all the error messages were getting clobbered by the last one sent, which was always "no valid targets to orbit" one. The bug was if a slot was denied docking permissions, he couldn't orbit either. > > > How about someone observing a base, can they turn docking off? > > > > I haven't tested that aspect. A quick look at the code in ntscmds.c > > shows no check for observers. A test would be a good idea. Let me know > > what you find. > The only problem is my CVS isn't up to date and I there are > conflicts I've got to merge to get there. I thought the person who > wrote the code would know if they thought of that or not. The original patch did allow observers to bases to set docking permissions. I've patched it to disallow observers as well. I've also changed it to an option in config.h.in/config.h. Sorry it took me a while. I've been snowed under in workload and schoolwork. Any free time I take to the fullest just to goof off. --Carlos V. From ahn at vec.wfubmc.edu Mon Feb 12 20:13:13 2001 From: ahn at vec.wfubmc.edu (Dave Ahn) Date: Wed Jan 12 00:52:17 2005 Subject: [Vanilla List] stat modifications Message-ID: <20010212211313.A102856@cecum.vec.wfubmc.edu> Did anyone make changes to the stats code recently? It appears that stats are awarded out of T mode when they shouldn't be. -- Dave Ahn | ahn@vec.wfubmc.edu | Wake Forest University Baptist Medical Center When you were born, you cried and the world rejoiced. Try to live your life so that when you die, you will rejoice and the world will cry. -1/2 jj^2 From ahn at vec.wfubmc.edu Thu Feb 22 20:32:47 2001 From: ahn at vec.wfubmc.edu (Dave Ahn) Date: Wed Jan 12 00:52:17 2005 Subject: [Vanilla List] orbit.c? Message-ID: <20010222213246.A121305@cecum.vec.wfubmc.edu> Are all the orbit related bugs fixed in CVS? -- Dave Ahn | ahn@vec.wfubmc.edu | Wake Forest University Baptist Medical Center When you were born, you cried and the world rejoiced. Try to live your life so that when you die, you will rejoice and the world will cry. -1/2 jj^2