Update of /cvsroot/netrek/server/Vanilla
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28256
Modified Files:
BUGS ChangeLog INSTALL.Newbie Makefile.in NEWS PROJECTS
README.releasing STYLE configure configure.in
Log Message:
merge 2.11.1 from darcs
Index: STYLE
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/STYLE,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- STYLE 23 Apr 2006 11:17:03 -0000 1.2
+++ STYLE 1 Jun 2006 03:17:24 -0000 1.3
@@ -1,11 +1,19 @@
-Coding style for patch acceptance on Vanilla project.
+Coding Style
+------------
- * for minor changes, do not change indentation,
- * for major changes to a function, reindent the function,
- * for major changes to a file, reindent the file.
- * indent by either two or four spaces, or use tabs, just be consistent within a file, preferred is four spaces.
+1. for minor changes, do not change indentation, keep it consistent
+ with the indentation in the file you are working on,
+
+2. for major changes to a file, reindent the file according to 4
+ below,
+
+3. for new files, indent the file according to 4 below,
+
+4. indent by either two or four spaces, or use tabs, but be
+ consistent within a file, preferred is four spaces, no tabs.
+
+An example
-{{{
static int foo(int a)
{
if (a) {
@@ -16,4 +24,54 @@
jkl;
}
}
-}}}
+
+
+Darcs - Sending Patches
+-----------------------
+
+1. if code is your own work, distribute it as a darcs patch, either
+using "darcs send", "darcs send --output=somefile.dpatch" or by
+publishing it on a repository accessible via HTTP.
+
+2. if you are unable to use darcs, and want your code to appear
+in the upstream darcs repositories, send a unified diff privately to
+another person who can use darcs. Don't send it to the list. That
+person can create the patch (using --author "youremail at example.com")
+in your name, and publish it as a dpatch.
+
+3. if you receive code via the mailing list that is in a non-darcs
+format, please branch your repository to test the patch. If you feel
+the need to use "darcs record" please do not publish the dpatch. Wait
+until a dpatch is sent to the list before applying it to your main
+working repository.
+
+The intention of these patch sending guidelines is to reduce the
+effort required by developers in resolving conflicts.
+
+
+Darcs - Patch Name and Long Comment
+-----------------------------------
+
+1. the patch name should be the text that would normally be entered
+into the NEWS file of the project. It is a user-visible description
+of the change, less than about 60 characters, in plain english.
+
+http://www.gnu.org/prep/standards/html_node/NEWS-File.html
+
+2. the long comment should be the text that would normally be entered
+into the ChangeLog file of the project, minus the date, who made the
+change, and their e-mail address. It is the body of the ChangeLog
+entry.
+
+http://www.gnu.org/prep/standards/html_node/Style-of-Change-Logs.html
+
+
+Darcs - Signed-off-by
+---------------------
+
+Peer review is where another developer reviews a patch and agrees to
+inclusion. Some developers may be responsible for certain components.
+Their sign-off may be helpful. To sign off on a patch, reply to it
+and add a line:
+
+Signed-off-by: Your Name <you at example.com>
Index: configure
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/configure,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- configure 30 Sep 2005 03:10:56 -0000 1.4
+++ configure 1 Jun 2006 03:17:24 -0000 1.5
@@ -1,37 +1,881 @@
#! /bin/sh
-
# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+# Generated by GNU Autoconf 2.59d.
#
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
[...28138 lines suppressed...]
- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
- esac
- echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
+ { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
+echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
# The eval makes quoting arguments work.
- if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
- then :
- else
- { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; }
- fi
+ eval "$ac_sub_configure $ac_sub_configure_args \
+ --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" ||
+ { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
+echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
+ { (exit 1); exit 1; }; }
fi
cd "$ac_popdir"
Index: configure.in
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/configure.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- configure.in 12 May 2006 03:44:47 -0000 1.6
+++ configure.in 1 Jun 2006 03:17:24 -0000 1.7
@@ -240,13 +240,24 @@
# Check for gmp and mp
#--------------------------------------------------------------------
-AC_MSG_CHECKING(for mp.h)
AC_ARG_WITH(gmp,[ --with-gmp GMP Dir], MPINC="-I$withval/include" MPLIB="-L$withval/lib -lgmp" search=false, MPINC=nope MPLIB=nope)
if test "$MPINC" = nope; then
-AC_EGREP_CPP( GNU_MP,[
+ AC_MSG_CHECKING(for mp.h)
+ AC_EGREP_CPP(GNU_MP,[
#include <mp.h>
__GNU_MP__
-], [MPINC=nope search=true AC_MSG_RESULT(no)], [MPINC="" search=false AC_MSG_RESULT(no)] )
+],
+ [gnu_mp_ok=yes],
+ [gnu_mp_ok=no])
+ if test "x$gnu_mp_ok" = xyes; then
+ MPINC=nope
+ search=true
+ AC_MSG_RESULT(yes)
+ else
+ MPINC=""
+ search=false
+ AC_MSG_RESULT(no)
+ fi
fi
AC_MSG_CHECKING(for gmp.h)
@@ -479,6 +490,20 @@
# Check for system dependend programs
#--------------------------------------------------------------------
+AC_PROG_LIBTOOL
+
+AC_MSG_CHECKING(for OSX ranlib)
+(eval $RANLIB -c) 2>&5
+if test $? -ne 0; then
+ RANLIB_FLAGS=
+ AC_MSG_RESULT(no)
+else
+ RANLIB_FLAGS='-c'
+ AC_MSG_RESULT(drat - yes)
+fi
+
+AC_SUBST(RANLIB_FLAGS)
+
if test "$code" = server; then
AC_MSG_CHECKING(for netstat)
Index: Makefile.in
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/Makefile.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile.in 15 May 2006 09:13:17 -0000 1.12
+++ Makefile.in 1 Jun 2006 03:17:24 -0000 1.13
@@ -5,8 +5,9 @@
#
PACKAGE=netrek-server-vanilla
-VERSION=2.11.0
+VERSION=2.11.1
+RANLIB = @RANLIB@
VPATH = @srcdir@
srcdir = @srcdir@
@@ -186,6 +187,7 @@
NAME=$(PACKAGE)-$(VERSION)
dist:
+ chmod +x debian/rules tools/mktrekon configure
mkdir $(NAME)
# what has changed
cp -p ChangeLog NEWS $(NAME)/
Index: INSTALL.Newbie
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/INSTALL.Newbie,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- INSTALL.Newbie 28 Sep 2005 12:14:04 -0000 1.2
+++ INSTALL.Newbie 1 Jun 2006 03:17:24 -0000 1.3
@@ -2,9 +2,47 @@
Instructions for installing the Vanilla Netrek Server as a Newbie Server
- install as described in INSTALL
-- change .sysdef to include NEWBIE=1
-- change .ports (see docs/sample_ports)
+- change etc/sysdef to include NEWBIE=1
+- change etc/syddef the following modes to 0
+ INL=0
+ DOGFIGHT=0
+ TOPGUN=0
+ BASEPRACTISE=0
+ PRET=0
+ HOCKEY=0
+ These are exclusive to each other.
+- change etc/sysdef to include NEWTURN=0 robots don't know how to fly w/ this.
+- change etc/sysdef to include VECTOR=0 robots don't know how to shoot w/ this.
+- change etc/sysdef to include TOURN=4 Merlin assumes this.
+- change etc/sysdef to include CONFIRM=0 (or 2) Robots only have reserved.c
+ verification.
+- change etc/sysdef to include CHECKSCUM=0 Or you will get lots of logs
+- change etc/ports (see docs/sample_ports)
- port 3592, enable with -q 10 for the practice robots
- port 2592, use as normal but with -q 9
- consider blocking port 3592 inbound connections from offsite
- restart netrekd with SIGHUP
+
+- create a file named "og" in lib/og
+- this is the initial commands the newbie robots will read
+- add the line "hm 9" into the og file. This will make the bots easy on you.
+
+- test that your "og" file works by adding the line "coff" and "woff"
+- This will make the bots not cloak and not shoot weapons.
+
+- Remove coff and woff, as that makes the game too easy.
+- hm 0 is tough and robots will default to this.
+
+Below is a sample robot command file named "og". Please remove anything in
+comment lines /* */
+
+---BEGIN SAMPLE lib/og/og file
+hm 9
+randtorp
+upd 2 /* 5 updates a second */
+human /* emulate a human */
+hcr /* toggle logic to on that assumes humans carry (hm_cr) */
+ogh /* logic that switches to ogg mode while bombing (ogg_happy) */
+coff /* use this for testing only, cloak OFF */
+woff /* use this for testing only, weapons OFF*/
+---END FILE
Index: ChangeLog
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ChangeLog,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- ChangeLog 15 May 2006 09:13:17 -0000 1.44
+++ ChangeLog 1 Jun 2006 03:17:24 -0000 1.45
@@ -1,3 +1,488 @@
+Thu Jun 1 12:47:18 2006 James Cameron <quozl at us.netrek.org>
+
+ * netrek-server-vanilla-2.11.1 released
+
+Tue May 30 09:49:50 2006 Stas Pirogov <keyos at keyos.org>
+
+ * autogen.sh: aclocal should be run first to avoid libtoolize
+ warning about missing aclocal.m4. Also added --copy to libtoolize
+ to make sure developer doesn't mess up system wide config.guess
+ and config.sub.
+
+ * config.h.in: comments are not allowed to present in same line as
+ 'undef VARIABLE', otherwise the VARIABLE will never be set. This
+ patch fixes two such mistakes by moving the comments one line
+ above.
+
+Mon May 29 19:32:48 2006 Bill Balcerski <williamb at its.caltech.edu>
+
+ * ntserv/detonate.c (detothers): the sysdef CHAOS option ignores
+ weapontemp, except for on torp detonation. Fix that
+ inconsistency.
+
+Mon May 29 14:24:44 2006 Jimmy Huang <jimmyhua73 at yahoo.com>
+
+ * robotd/update_players.c removed this check
+ (strcmp(j->p_login,"robot!") != 0) || !(j->p_flags&PFBPROBOT).
+ and placed it in a Notrobot(p,j) function.
+
+ * robotd/update_players.c removed some unused variables in
+ army_check3(p,j) function.
+
+ * robotd/update_players.c fixed indent on army_check3() function
+ and also army_check2() function.
+
+Sat May 27 18:55:49 2006 James Cameron <quozl at us.netrek.org>
+
+ * ntserv/openmem.c: experimental rework to support wait queue
+ dumping, and multiple server instances in separate shared memory
+ segments. Provide interface so findslot will be able to detach
+ from an active game segment and create and attach to a new game
+ segment. Accept NETREK_PKEY environment variable.
+
+Sat May 27 17:10:00 2006 James Cameron <quozl at us.netrek.org>
+
+ * ntserv/ntscmds.c (do_become): add experimental and not yet
+ functioning code to support change of slot number for a player.
+ Requires client-side support and further work.
+
+Sat May 27 11:57:00 2006 Jimmy Huang <jimmyhua73 at yahoo.com>
+
+ * INSTALL.Newbie updated INSTALL.Newbie to document newer switches.
+ Need to include all possible robot switches in the future.
+
+ * robotd/data.c added initialization of global variables hm_cr and
+ ogg_happy
+
+ * robotd/data.h added global variables hm_cr and ogg_happy
+
+ * robotd/decide.c added check for ogg_happy mode before
+ check_ogg while bombing
+
+ * robotd/dmessage.c added hcr and ogh message decoding.
+
+ * robotd/update_players.c moved conservative assumptions that
+ humans carry into a new function called army_check3.
+
+ * robotd/update_players.c added logic so army_check3 only
+ executes if (hm_cr) global variable is active.
+
+Fri May 26 15:45:00 2006 Jimmy Huang <jimmyhua73 at yahoo.com>
+
+ * INSTALL.Newbie updated documentation to show how to configure
+ the robots to be dumber
+
+ * robotd/data.c changed default updates=2.0 instead of 1.0, decreases
+ CPU load by 50% and fights about the same. This is 5 updates
+ per second.
+
+ * robotd/dmessage.c allow decoding of local messages and commandfile
+ messages even if robot is in INL mode. In INL mode, robots will
+ ignore other players and GOD's commands.
+
+ * robots/newbie.c checkpos() returns 1, to avoid compiler warning
+
+ * robots/newbie.c added a bunch of comments on what each option
+ does when Merlin forks a robot.
+
+ * robots/newbie.c modified the command so robots now read a command
+ file on startup.
+Thu May 25 14:33:37 2006 Trent Piepho <xyzzy at speakeasy.org>
+
+ * res-rsa/configure: this is a generated file and shouldn't be
+ kept in the repository.
+
+ * ntserv/genspkt.c (sndPlasma): in Ping-Pong plasma mode, a plasma
+ changes teams when it is bounced. There is no way to send this
+ change to the client, so the client doesn't know. For example, if
+ a player at peace with us but who we are at war with bounces our
+ (or a teammate's) plasma back at us, it appears to the client that
+ the plasma is friendly. But really, it's not, since we are at war
+ with the plasma's new team. Fix this by setting the plasma's war
+ flag if the player is hostile to the plasma's team.
+
+ In order to take advantage of this, clients will need to be sure
+ to:
+
+ 1. Not assume that the player's own plasma is friendly.
+ 2. Not assume that plasma from the player's team is friendly.
+ 3. Make sure to check the plasma's war flags, and not the flags
+ of the player who fired it.
+
+ * robotd/socket.c (handlePlasmaInfo):
+ * robotd/robot.c (phaser_plasmas):
+ * robotd/dodge.c (init_torps):
+
+ The robot has code to deal with Ping-Pong plasma, but it's an old
+ version. It doesn't work properly with the current ping-pong
+ plasmas, written by Trent Piepho in 1995 (so the old ones are
+ really old!). Basically, the bots needs to allow for plasma fired
+ by a friendly player becoming hostile to it.
+
+ Also sets the pl_team member of the plasma struct, which makes
+ getting the plasma's team easier.
+
+Thu May 25 14:12:16 2006 James Cameron <quozl at us.netrek.org>
+
+ * include/defs.h (WARMONGER): add customisation setting for
+ configuration of local warmonger, so that we are not caught by
+ change again so easily.
+
+ * ntserv/daemonII.c (political_begin): deprecate Dan Quayle in
+ favour of George Bush, subject to mailing list discussion. Patch
+ by: William Balcerski with rework by James Cameron.
+
+Thu May 25 11:37:27 2006 James Cameron <quozl at us.netrek.org>
+
+ * autogen.sh: add res-rsa to autoconf re-run,
+
+ * tests/build: test for correct directory, use darcs get instead
+ of put, use autogen.sh instead of running autotools here, add the
+ install target.
+
+ "darcs put" is slow, the darcs manual recommends "darcs get" instead,
+ which is certainly faster. But "darcs get" must have the exact path to
+ a repo, not like "darcs put". So a test is added to check that we are
+ in the right directory first.
+
+Thu May 25 09:57:18 2006 Stas Pirogov <keyos at keyos.org>
+
+ * configure.in: configure.in: test for ranlib was failing on
+ Solaris. This is probably caused by different /bin/sh
+ interpreters. This fix should satisfy all of them.
+
+Mon May 22 14:31:58 2006 Trent Piepho <xyzzy at speakeasy.org>
+
+ * Makefile.in: remove calls to glib-config, they aren't needed
+ and fail if glib-config isn't present.
+
+Tue May 23 17:21:56 2006 Trent Piepho <xyzzy at speakeasy.org>
+
+ * ntserv/genspkt.c Fix SP_2 flags, for real. The sndFlags
+ function will not send flags of observers (except for PFOBSERV of
+ course). The SP_2 flag sampling code will sample the flags of
+ robots now. It will not sample observers' flags, except for an
+ observer's own flags. The SP_2 sampling code will update the last
+ sent flags data, so shield/cloak are not sent again via
+ sndFlags(). When sndFlags() does send flags, it will send the
+ correct shield/cloak and not zero.
+
+Wed May 24 11:18:31 2006 James Cameron <quozl at us.netrek.org>
+
+ * autogen.sh: add GNU standard autotools configuration sequence,
+ deprecating execution of README.darcs. Manual build process then
+ becomes "sh autogen.sh" followed by the usual configure, make, and
+ make install.
+
+Wed May 24 10:48:23 2006 James Cameron <quozl at us.netrek.org>
+
+ * robotd/util.c (mfprintf): fix a regression caused by conversion
+ to stdargs done on Fri Oct 31 09:15:42 2003.
+
+Wed May 24 00:34:00 2006 Jimmy Huang <jimmyhua73 at yahoo.com>
+
+ * robots/newbie.c changed some tabbing for better indent and
+ bracing consistency.
+
+ * robots/newbie.c added #defines POSITIONX and POSITIONY so
+ there's only one place the change the desired x and y position of
+ Merlin.
+
+ * robots/newbie.c added checkpos() function which checks for
+ changes in Merlin's position. Replaces him back into POSITIONX and
+ POSITIONY once it finds that Merlin has stopped moving for 15
+ seconds.
+
+ * robots/newbie.c corrected misspellings of various comments.
+
+ * robots/newbie.c modified num_players() function to return the
+ correct *next_team based on 4 vs. 4 t-mode settings also.
+
+Tue May 23 23:36:00 2006 Jimmy Huang <jimmyhua73 at yahoo.com>
+
+ * robotd/input.c re-wrote the setflag() function. This function is
+ supposed to update the global variable _udcounter. _udcounter is
+ supposed to be a counter that starts at 0, and increments by 1 for
+ every 100 milliseconds. In the orignal code. _udcounter would do
+ this properly for an undetermined amount of time,
+ (anywhere between 30 minutees to 18 hours, depending on what time
+ of day it was!!!). When _udcounter breaks, usually for several
+ hours on an 18 hour cycle, robots report armies carried, but do
+ not report which planet it intends to take. This is because
+ instead of a positive incrementing number, udcounter counts with a
+ negative decrementing number. A whole bunch of other things
+ break, but they are not obvious unless you are playing the
+ game. Now, _udcounter should work for about 250 days, before
+ breaking. (It still breaks).
+
+Tue May 23 14:00:37 2006 James Cameron <quozl at us.netrek.org>
+
+ * ntserv/genspkt.c (sndFlags): for practice robots, terminators,
+ and hunter-killer, in conjunction with short packets version two,
+ shields were not being sent. Changed to send shields in SP_FLAGS.
+ See also "S_P2 new flag sampling" in updateShips(). Reported by
+ William Balcerski.
+
+Tue May 23 04:06:08 2006 Trent Piepho <xyzzy at speakeasy.org>
+
+ * ntserv/genspkt.c Hadley's bot expects to get torp direction
+ from the server, but the server only sends it for your own torps.
+ Changed to send it for other torps too. Without it, the bot
+ thinks all torps are going straight up, making it a very bad
+ dodger (unless you attack from below). Should be fixed to only
+ turn this on for the robot, so as not to help borgs.
+
+Tue May 23 03:05:55 2006 Trent Piepho <xyzzy at speakeasy.org>
+
+ * robotd/assault.c: check for res danger would make the robot
+ cloak when near _any_ home planet, so it would cloak even when
+ bombing it's own core. Fixed this, and made it faster too.
+
+Tue May 23 01:51:17 2006 Trent Piepho <xyzzy at speakeasy.org>
+
+ * robotd/assault.c, robotd/escort.c, robotd/getarmies.c,
+ robotd/robot.c: some calls to req_cloak_off() were missing the
+ function's argument (reason string).
+
+Tue May 23 01:07:02 2006 Trent Piepho <xyzzy at speakeasy.org>
+
+ * robotd/update_players.c: fix a warning about a uninitialized use
+ of pldist in update_players().
+
+Tue May 23 00:57:29 2006 Trent Piepho <xyzzy at speakeasy.org>
+
+ * robotd/dmessage.c: code to generate the RCD message didn't
+ handle the case when there were no visible friendly and/or enemy
+ ships. In this case, _state.closest_{e,f} would be NULL.
+
+Tue May 23 00:52:55 2006 Trent Piepho <xyzzy at speakeasy.org>
+
+ * robotd/update_players.c: function closest_planet() would usually
+ return NULL every other time it was called. For speed, it would
+ check the previous closest planet first, then look for a _closer_
+ planet. If it didn't find one, it returned NULL, rather than the
+ previous (and current) closest planet.
+
+Mon May 22 16:53:42 2006 Trent Piepho <xyzzy at speakeasy.org>
+
+ * robotd/decide.c: fix several bugs with check_take(). It didn't
+ handle the case when no enemy planets were left. It looked at the
+ last enemy planet in the list, rather than the target enemy planet
+ when deciding if it should take neut planets. It would skip
+ looking for neuts when it found an enemy agri and *didn't* have
+ enough armies to take it.
+
+Mon May 22 16:31:58 2006 Trent Piepho <xyzzy at speakeasy.org>
+
+ * robotd/assault.c: have robot check the planet status in assault
+ code, so that if a planet changes teams while it being assaulted
+ the robot will adapt. It will not try to drop on a planet it can
+ not drop on, and not try to bomb a planet it can not bomb.
+
+ Also, the robot will not reinforce a planet past 4 armies after it
+ takes it.
+
+Mon May 22 15:39:35 2006 Trent Piepho <xyzzy at speakeasy.org>
+
+ * robotd/util.c: when mfprintf() was change from varargs to
+ stdarg, it wasn't done correctly. Fix this.
+
+Mon May 22 14:03:38 2006 Trent Piepho <xyzzy at speakeasy.org>
+
+ * res-rsa/configure.in: the check for gmp fails for gmp version 3,
+ fix it by adding a secondary check for the gmp3 symbol names.
+
+Mon May 22 10:53:03 2006 Jimmy Huang <jimmyhua73 at yahoo.com>
+
+ * robotd/assault.c: added extra check not to bomb your own armies.
+ Bots will try to bomb own armies when 2 carriers drop on same
+ planet. And planet ends up with >4 armies.
+
+ * robotd/decide.c: changed some tabbing.
+
+ * robotd/decide.c: corrected logic in check_take function. Robotd
+ now takes neutral planets. Before it had a tendency to ignore
+ neutral planets. Also used to crash out when no more enemy
+ planets. Both are fixed with this.
+
+ * robotd/main.c, shmem.c, socket.c, update_players.c: removed
+ mfprintf function. replaced with fprintf function until such time
+ that mfprintf function is fixed so it doesn't crash. Bandaid.
+
+ * robotd/update_players.c: changed some tabbing, added some
+ missing braces.
+
+ * robotd/update_players.c: changed closest_planet() function to
+ return the current closest planet instead of NULL when it cannot
+ find a closer planet.
+
+ * robotd/util.c: added comments to reflect that mfprintf causes
+ crashes for as yet unknown reasons.
+
+Sun May 21 22:22:41 2006 James Cameron <quozl at us.netrek.org>
+
+ Remove the two second delay experienced by clients that connect to
+ a server on which the daemon is not running. Also fix a cause of
+ initial connection failing, which happens if the daemon does not
+ start up within the hoped-for interval.
+
+ Solution is implemented using the SIGUSR1 signal, but only during
+ the initialisation window between when ntserv forks the daemon and
+ the daemon completes initialisation. The signal is not used at
+ other times.
+
+ * ntserv/daemonII.c (main): send a SIGUSR1 to parent process
+ (ntserv) once initialisation of shared memory is completed and
+ regular SIGALRMs are about to commence.
+
+ * ntserv/openmem.c (openmem): remove two second delay that was
+ used to hope for daemon to initialise.
+
+ * ntserv/openmem.c (startdaemon): add a wait for SIGUSR1.
+
+Sun May 21 21:48:15 2006 James Cameron <quozl at us.netrek.org>
+
+ * tools/setgame.c: add script utility for pausing, resuming, and
+ terminating the game.
+
+ * tools/Makefile.in: add setgame target.
+
+ * ntserv/input.c (input): send bad version packet to terminate
+ client as soon as a GU_GAMEOK termination is requested.
+
+ * ntserv/daemonII.c (udplayers): terminate daemon as soon as
+ possible if a GU_GAMEOK termination is requested. Change nplayers
+ to nfree, to better explain what the variable is.
+
+ * include/struct.h (game_ok): remove unused macro.
+
+Fri May 19 18:06:15 2006 James Cameron <quozl at us.netrek.org>
+
+ * config.h.in, data.h, sysdefaults.h, data.c, findslot.c, main.c:
+ adds a new etc/sysdef option DUPLICATES which is the maximum
+ number of pickup player slots allowed from the same IP address
+ before the next connection is given the Q32 response.
+
+ This is a denial of service filtering feature.
+
+ The default is 3. Set this above 16 to make it ineffective.
+
+ Set this to less than half of the number of players per side,
+ otherwise abusers may not be ejected or banned by majority vote
+ because a majority would be impossible.
+
+ Does not affect robots, unless they join via the pickup queue
+ ... which would be a misconfiguration. Robots normally join via a
+ special queue.
+
+Fri May 19 16:08:34 2006 James Cameron <quozl at us.netrek.org>
+
+ * ntserv/Makefile.in (install-ntserv): addition of a target so
+ that a server operator can do a live update of ntserv during a
+ running game.
+
+ The target moves the existing in-use ntserv binary into an archive
+ tree before installing the new ntserv binary. This makes it
+ possible to manually back out of an installation if the new binary
+ breaks badly.
+
+ Other methods to test a new ntserv binary include running it
+ manually for connection back to the client. See ntserv command
+ line options.
+
+Fri May 19 14:22:48 2006 James Cameron <quozl at us.netrek.org>
+
+ * ntserv/main.c: banned observers are allowed in and can speak,
+ which was a surprise, but the code has always allowed this since
+ observers were added. Change to prevent banned observers from
+ talking. Simplify ban logic further.
+
+Thu May 18 15:57:08 2006 James Cameron <quozl at us.netrek.org>
+
+ * tools/setteam.c, tools/Makefile.in: add utility to view and
+ manipulate starbase reconstruction and surrender timers.
+
+Thu May 18 12:25:36 2006 James Cameron <quozl at us.netrek.org>
+
+ * ntserv/input.c (input): slots may jam in POUTFIT after KWINNER
+ if the user terminates the client ungracefully ... such that the
+ TCP connection is gone but the ntserv lives on.
+
+ During this time, daemon synchronisation still sends SIGALRM to
+ the ntserv, and ntserv's SIGALRM handler still resets the
+ p_ghostbust timer.
+
+ Prototype solution is to move p_ghostbust watchdog timer reset
+ from within the SIGALRM handler to the section of main loop that
+ is executed when input arrives from the client.
+
+ Monitoring the p_ghostbust timer with gdb shows it is now reset
+ for a dormant client on receipt of ping responses.
+
+Thu May 18 07:16:00 2006 Bill Balcerski <williamb at its.caltech.edu>
+
+ * ntserv/transwarp.c: changed the transwarp failure message, in
+ the case of one or both of the ships not being at peace, to
+ something more ambiguous. Reason for change is to take into
+ account the fact that sometimes the base is peaceful but the
+ other ship isn't, making old error message inaccurate.
+
+Thu May 18 01:14:00 2006 Bill Balcerski <williamb at its.caltech.edu>
+
+ * ntserv/getship.c, interface.c: fix to ATT size for matching
+ current bitmap sets, and allowing refit to ATT if the ship is
+ valid as per sysdef file (compared to not ever allowing refit to
+ ATT under old code).
+
+Thu May 18 02:05:53 2006 Stephen Thorne <stephen at thorne.id.au>
+
+ * aclocal.m4: Added aclocal.m4
+
+Thu May 18 01:11:21 2006 Stephen Thorne <stephen at thorne.id.au>
+
+ * tests/build: Set the configure and mktrekon files executable,
+ just in case.
+
+ * configure.in: Add AC_PROG_LIBTOOL macro.
+
+ * ntserv/Makefile.in: Use the @RANLIB@ and @RANLIB_FLAGS@ macros.
+
+Wed May 17 11:12:04 2006 Stephen Thorne <stephen at thorne.id.au>
+
+ * ntserv/Makefile.in (libnetrek.a): Pass @RANLIB_FLAGS@ to the
+ ranlib command.
+
+ * configure.in: Check for if ranlib exits with a non-zero exit
+ when run with a bare '-c' option. On debian, ranlib will exit with
+ a 0 exit code if passed a filename that doesen't exist. On OSX,
+ '-c' is a valid flag, and if passed alone, will exit with an exit
+ code of 1. A better way of detecting this would be nice. If using
+ the OSX version, then we pass -c to all ranlib calls. Fixes build
+ bug on OSX.
+
+Tue May 16 16:59:29 2006 Jimmy Huang <jimmyhua73 at yahoo.com>
+
+ * robots/newbie.c (start_a_robot): add -g option to send the OggV
+ packet to self ID themselves.
+
+ * robots/newbie.c (killrobot): change how robots are detected.
+
+ * robots/newbie.c (main): change merlin ship class to ATT, change
+ to overlooking position, allow ORI and KLI.
+
+ * ntserv/genspkt.c (INVISOMASK): add PFBPROBOT so newbie bots can
+ see each other using OggV packet.
+
+Tue May 16 14:03:30 2006 Bill Balcerski <williamb at its.caltech.edu>
+
+ * robotd/assault.c (risk_res_death): compilation fix gcc 4.0.
+
+Tue May 16 08:29:06 2006 James Cameron <quozl at us.netrek.org>
+
+ * docs/sample_features: enable CONTINUOUS_MOUSE as it is in common
+ use. Enable INFO_MODE1 so that the default configuration ships
+ with all features enabled.
+
Mon May 15 19:01:27 2006 James Cameron <quozl at us.netrek.org>
* netrek-server-vanilla-2.11.0 released
@@ -45,6 +530,7 @@
* include/genspkt.h: add separate prototypes for genspkt.c since
they cannot live in proto.h, due to the packet structures
required.
+
* tools/cambot.c: fix compilation warnings with -Wall.
Wed Apr 26 22:58:34 2006 James Cameron <quozl at us.netrek.org>
Index: BUGS
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/BUGS,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- BUGS 6 May 2006 12:28:20 -0000 1.6
+++ BUGS 1 Jun 2006 03:17:24 -0000 1.7
@@ -3,6 +3,13 @@
List of things that are defects
+ - cambot does not exit when daemon exits.
+
+ - sending SIGSTOP to client for 35 seconds results in ghostbust, which
+ is good, but the client response after SIGCONT is not good ... it
+ presents team selection window and clicking on a team hangs the
+ client.
+
- find causes of jammed slots and expire them sooner.
- Player "^%^" took a planet and it said "Planet taken by ^"
Index: README.releasing
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/README.releasing,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- README.releasing 15 May 2006 09:13:17 -0000 1.14
+++ README.releasing 1 Jun 2006 03:17:24 -0000 1.15
@@ -1,14 +1,11 @@
-
-$Id$
-
Release Procedure
-# be in local copy of the CVS repository
+# be in local copy of the Darcs repository
cd Vanilla
# set variables
-VS=2.11.0
-VL=v_2_11_0
+VS=2.11.1
+VL=v_2_11_1
PN=netrek-server-vanilla
# check version numbers in files
@@ -19,21 +16,23 @@
# rpm/netrek.spec
# README.releasing
# ChangeLog (add release date)
+# NEWS
-# crosscheck updates in CVS against ChangeLog
+# crosscheck updates in Darcs against ChangeLog
# crosscheck updates in ChangeLog against NEWS
# make sure all changes committed
-cvs diff -u > tmp
+darcs diff -u > tmp
# review uncommitted changes
more tmp
# commit changes
-cvs commit -m "prerelease $VS"
-
-# reduce source tree to only CVS files, or fix .cvsignore
-cvs update > tmp
+darcs record --patch-name="prerelease $VS"
+darcs send
# tag the release
+darcs tag $VS
+
+# temporary: propogate changes to CVS and tag in CVS
cvs tag -F $VL
cvs tag -F v_release
@@ -88,32 +87,13 @@
cd ~/public_html/external/mine/netrek/
vi index-brief.html
-# send .tar.gz and .rpm to ftp sites
-ftp://ftp.netrek.org/pub/netrek/incoming/ (note 15 second login timer)
-put Vanilla-2.10pl8.tar.gz
-put Vanilla-2.10pl8.tar.gz.asc
-put Vanilla-2.10pl8.tar.gz.md5sum
-ftp://ftp.real-time.com/pub/Incoming/
-
# notify mirror owners, include URL of incoming copy and md5sum.
-mailto:vanilla-list at us.netrek.org
+mailto:netrek-dev at us.netrek.org
# build differences between this version and previous
# update web page
-http://vanilla.us.netrek.org/index.html
-export CVSROOT=:pserver:cameron at 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 at us.netrek.org
-news:rec.games.netrek
-
-# update version number in files
-# Makefile.in, debian/changelog, rpm/netrek.spec, rpm/tar2rpm, README.releasing
+http://vanilla.netrek.org/
# sourceforge.net upload procedure (brief, yet to be retested)
# - upload to ftp://upload.sourceforge.net/incoming/
Index: NEWS
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/NEWS,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- NEWS 15 May 2006 09:14:16 -0000 1.23
+++ NEWS 1 Jun 2006 03:17:24 -0000 1.24
@@ -1,3 +1,28 @@
+2.11.1: released 2006-06-01
+
+- fix CHAOS torp detonation which was allowing wtemp [Balcerski}
+- add experimental future support for slot number change [Cameron]
+- added toggle switches to new ogging and carrier tracking logic [Huang]
+- remove res-rsa/configure [Piepho]
+- help bot deal with ping-pong plasma [Piepho]
+- help client with plasma war in ping-pong mode [Piepho]
+- deprecate dan quayle in t-mode messages [Balcerski]
+- server sends torp direction, robots dodge better [Piepho]
+- make robots cloak near enemy home planets due res danger [Piepho]
+- make robots take neut planets once there are no enemy planets [Piepho]
+- make robots recognise planet situational change while assaulting [Piepho]
+- various robot fixes that triggered comprehensive work by others [Huang]
+- fix lack of shields shown on practice robots and iggies [Cameron]
+- fix two second delay on client connection if daemon not running [Cameron]
+- add game pause/resume/terminate tool, setgame [Cameron]
+- add max duplicate ip count for pickup play [Cameron]
+- add install-ntserv target for live updates [Cameron]
+- mute banned observers [Cameron]
+- add team configuration tool, setteam [Cameron]
+- prevent hung slots by changing ghostbust timer reset method [Cameron]
+- newbie random games against any non-diagonal team combination [Huang]
+- enable CONTINUOUS_MOUSE by default [Cameron]
+
2.11.0: released 2006-05-15
- fix practice robots to cloak when bombing near home planet [Huang]
Index: PROJECTS
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/PROJECTS,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- PROJECTS 12 May 2006 03:44:47 -0000 1.11
+++ PROJECTS 1 Jun 2006 03:17:24 -0000 1.12
@@ -79,11 +79,6 @@
netrekd forked HTTP responder, or scripts to send stuff to a
web server?
- - If you are observing a friendly player who is t-warping, you
- can lock on to other players, but you will not swap to
- their viewpoint. Only when twarping is over, you can swap
- again [Shadow.Hunter at netrek.org]
-
- tools/update.c sa_sigaction not present on NetBSD. [Hietbrink]
- 'transwarp 0 off' to prevent slot 0 from transwarping. [Swasey]