From quozl at users.sourceforge.net Tue Apr 4 23:42:42 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Wed, 05 Apr 2006 04:42:42 +0000 Subject: [netrek-cvs] server/Vanilla BUGS,1.2,1.3 Message-ID: Update of /cvsroot/netrek/server/Vanilla In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17988 Modified Files: BUGS Log Message: Index: BUGS =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/BUGS,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- BUGS 28 Sep 2005 12:14:04 -0000 1.2 +++ BUGS 5 Apr 2006 04:42:40 -0000 1.3 @@ -3,6 +3,9 @@ List of things that are defects + - Player "^%^" took a planet and it said "Planet taken by ^" + reported by zu22 (Zach Uram) on 2006-04-05 + - god observer should see all teams messages. - practice robots fail to shoot torpedoes if created while server From quozl at users.sourceforge.net Sun Apr 9 23:24:53 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Mon, 10 Apr 2006 04:24:53 +0000 Subject: [netrek-cvs] server/Vanilla/gum Makefile.am, 1.2, 1.3 Makefile.in, 1.2, 1.3 aclocal.m4, 1.1, 1.2 configure, 1.1, 1.2 missing, 1.1, 1.2 Message-ID: Update of /cvsroot/netrek/server/Vanilla/gum In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21188/gum Modified Files: Makefile.am Makefile.in aclocal.m4 configure missing Log Message: misc working updates Index: aclocal.m4 =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/gum/aclocal.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- aclocal.m4 21 Mar 2005 05:23:35 -0000 1.1 +++ aclocal.m4 10 Apr 2006 04:24:50 -0000 1.2 @@ -1,106 +1,15 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4 - -dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without -dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A -dnl PARTICULAR PURPOSE. - -# Do all the work for Automake. This macro actually does too much -- -# some checks are only needed if your package does certain things. -# But this isn't really a big deal. - -# serial 1 - -dnl Usage: -dnl AM_INIT_AUTOMAKE(package,version, [no-define]) - -AC_DEFUN(AM_INIT_AUTOMAKE, -[AC_REQUIRE([AC_PROG_INSTALL]) -PACKAGE=[$1] -AC_SUBST(PACKAGE) -VERSION=[$2] -AC_SUBST(VERSION) -dnl test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -fi -ifelse([$3],, -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])) -AC_REQUIRE([AM_SANITY_CHECK]) -AC_REQUIRE([AC_ARG_PROGRAM]) -dnl FIXME This is truly gross. -missing_dir=`cd $ac_aux_dir && pwd` -AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) -AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) -AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) -AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) -AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) -AC_REQUIRE([AC_PROG_MAKE_SET])]) - -# -# Check to make sure that the build environment is sane. -# - -AC_DEFUN(AM_SANITY_CHECK, -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftestfile -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` - if test "[$]*" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftestfile` - fi - if test "[$]*" != "X $srcdir/configure conftestfile" \ - && test "[$]*" != "X conftestfile $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi +# generated automatically by aclocal 1.9.5 -*- Autoconf -*- - test "[$]2" = conftestfile - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -rm -f conftest* -AC_MSG_RESULT(yes)]) +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005 Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) -dnl The program must properly implement --version. -AC_DEFUN(AM_MISSING_PROG, -[AC_MSG_CHECKING(for working $2) -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if ($2 --version) < /dev/null > /dev/null 2>&1; then - $1=$2 - AC_MSG_RESULT(found) -else - $1="$3/missing $2" - AC_MSG_RESULT(missing) -fi -AC_SUBST($1)]) +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. # Configure paths for GTK+ # Owen Taylor 97-11-3 @@ -297,3 +206,840 @@ rm -f conf.gtktest ]) +# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION so it can be traced. +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], + [AM_AUTOMAKE_VERSION([1.9.5])]) + +# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is `.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` +]) + +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 7 + +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE]) +AC_SUBST([$1_FALSE]) +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) + + +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 8 + +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "GCJ", or "OBJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl + +ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) + + +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) + + +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE(dependency-tracking, +[ --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH]) +]) + +# Generate code to set up dependency tracking. -*- Autoconf -*- + +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +#serial 3 + +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # So let's grep whole file. + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +done +])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each `.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) + +# Do all the work for Automake. -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 12 + +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.58])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +# test to see if srcdir already configured +if test "`cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) + +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_PROG_INSTALL_SH +AM_PROG_INSTALL_STRIP +AC_REQUIRE([AM_PROG_MKDIR_P])dnl +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +]) +]) + + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $1 | $1:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +install_sh=${install_sh-"$am_aux_dir/install-sh"} +AC_SUBST(install_sh)]) + +# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) + +# Check to see how 'make' treats includes. -*- Autoconf -*- + +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 3 + +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo done +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# We grep out `Entering directory' and `Leaving directory' +# messages which can occur if `w' ends up in MAKEFLAGS. +# In particular we don't look at `^make:' because GNU make might +# be invoked under some other name (usually "gmake"), in which +# case it prints its new name instead of `make'. +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then + am__include=include + am__quote= + _am_result=GNU +fi +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then + am__include=.include + am__quote="\"" + _am_result=BSD + fi +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf +]) + +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 4 + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) + + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# If it does, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +else + am_missing_run= + AC_MSG_WARN([`missing' script is too old or missing]) +fi +]) + +# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_MKDIR_P +# --------------- +# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. +# +# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories +# created by `make install' are always world readable, even if the +# installer happens to have an overly restrictive umask (e.g. 077). +# This was a mistake. There are at least two reasons why we must not +# use `-m 0755': +# - it causes special bits like SGID to be ignored, +# - it may be too restrictive (some setups expect 775 directories). +# +# Do not use -m 0755 and let people choose whatever they expect by +# setting umask. +# +# We cannot accept any implementation of `mkdir' that recognizes `-p'. +# Some implementations (such as Solaris 8's) are not thread-safe: if a +# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' +# concurrently, both version can detect that a/ is missing, but only +# one can create it and the other will error out. Consequently we +# restrict ourselves to GNU make (using the --version option ensures +# this.) +AC_DEFUN([AM_PROG_MKDIR_P], +[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in + # $(mkdir_p) $(somedir) + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' +else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + for d in ./-p ./--version; + do + test -d $d && rmdir $d + done + # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. + if test -f "$ac_aux_dir/mkinstalldirs"; then + mkdir_p='$(mkinstalldirs)' + else + mkdir_p='$(install_sh) -d' + fi +fi +AC_SUBST([mkdir_p])]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 3 + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 4 + +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Just in case +sleep 1 +echo timestamp > conftest.file +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t $srcdir/configure conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +alias in your environment]) + fi + + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT(yes)]) + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor `install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi +done +rm -rf conftest.dir + +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + Index: Makefile.in =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/gum/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile.in 21 Mar 2005 10:17:16 -0000 1.2 +++ Makefile.in 10 Apr 2006 04:24:50 -0000 1.3 @@ -1,6 +1,8 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated by automake 1.9.5 from Makefile.am. +# @configure_input@ -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,166 +12,254 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. + at SET_MAKE@ -SHELL = @SHELL@ +SOURCES = $(gum_SOURCES) srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = . - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +bin_PROGRAMS = gum$(EXEEXT) +subdir = . +DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \ + ChangeLog INSTALL NEWS depcomp install-sh missing \ + mkinstalldirs +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno configure.status.lineno +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_CLEAN_FILES = +am__installdirs = "$(DESTDIR)$(bindir)" +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +PROGRAMS = $(bin_PROGRAMS) +am_gum_OBJECTS = support.$(OBJEXT) main.$(OBJEXT) signals.$(OBJEXT) \ + id.$(OBJEXT) xmalloc.$(OBJEXT) +gum_OBJECTS = $(am_gum_OBJECTS) +gum_DEPENDENCIES = ../ntserv/data.o +DEFAULT_INCLUDES = -I. -I$(srcdir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(gum_SOURCES) +DIST_SOURCES = $(gum_SOURCES) +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } +DIST_ARCHIVES = $(distdir).tar.gz +GZIP_ENV = --best +distuninstallcheck_listfiles = find . -type f -print +distcleancheck_listfiles = find . -type f -print +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EXEEXT = @EXEEXT@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ VERSION = @VERSION@ - +ac_ct_CC = @ac_ct_CC@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build_alias = @build_alias@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host_alias = @host_alias@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ SUBDIRS = +INCLUDES = \ + @GTK_CFLAGS@ -I../include -I${srcdir}/../include -INCLUDES = @GTK_CFLAGS@ -I../include -I${srcdir}/../include - - -bin_PROGRAMS = gum - -gum_SOURCES = support.c support.h main.c main.h signals.c signals.h id.c xmalloc.c - +gum_SOURCES = \ + support.c support.h \ + main.c main.h \ + signals.c signals.h \ + id.c xmalloc.c gum_LDADD = @GTK_LIBS@ ../ntserv/data.o +AM_CFLAGS = @AM_CFLAGS@ -DPACKAGE_DATA_DIR=\"@prefix@\" +all: all-recursive -CFLAGS = @CFLAGS@ -DPACKAGE_DATA_DIR=\"@prefix@\" -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_CLEAN_FILES = -PROGRAMS = $(bin_PROGRAMS) - - -DEFS = @DEFS@ -I. -I$(srcdir) -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ -gum_OBJECTS = support.o main.o signals.o id.o xmalloc.o -gum_DEPENDENCIES = ../ntserv/data.o -gum_LDFLAGS = -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ -Makefile.in NEWS aclocal.m4 configure configure.in install-sh missing \ -mkinstalldirs - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -DEP_FILES = .deps/id.P .deps/main.P .deps/signals.P .deps/support.P \ -.deps/xmalloc.P -SOURCES = $(gum_SOURCES) -OBJECTS = $(gum_OBJECTS) - -all: all-redirect .SUFFIXES: -.SUFFIXES: .S .c .o .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status - -$(ACLOCAL_M4): configure.in - cd $(srcdir) && $(ACLOCAL) +.SUFFIXES: .c .o .obj +am--refresh: + @: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ + cd $(srcdir) && $(AUTOMAKE) --gnu \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; -config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) - cd $(srcdir) && $(AUTOCONF) - -mostlyclean-binPROGRAMS: - -clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) - -distclean-binPROGRAMS: - -maintainer-clean-binPROGRAMS: +$(top_srcdir)/configure: $(am__configure_deps) + cd $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) + test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) - list='$(bin_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ done -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< +clean-binPROGRAMS: + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) +gum$(EXEEXT): $(gum_OBJECTS) $(gum_DEPENDENCIES) + @rm -f gum$(EXEEXT) + $(LINK) $(gum_LDFLAGS) $(gum_OBJECTS) $(gum_LDADD) $(LIBS) mostlyclean-compile: - -rm -f *.o core *.core - -clean-compile: + -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c -maintainer-clean-compile: + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/id.Po at am__quote@ + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@ + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/signals.Po at am__quote@ + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/support.Po at am__quote@ + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmalloc.Po at am__quote@ -gum: $(gum_OBJECTS) $(gum_DEPENDENCIES) - @rm -f gum - $(LINK) $(gum_LDFLAGS) $(gum_OBJECTS) $(gum_LDADD) $(LIBS) +.c.o: + at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ + at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: + at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ + at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -177,13 +267,14 @@ # (1) if the variable is set in `config.status', edit `config.status' # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. - - at SET_MAKE@ - -all-recursive install-data-recursive install-exec-recursive \ -installdirs-recursive install-recursive uninstall-recursive \ -check-recursive installcheck-recursive info-recursive dvi-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -195,7 +286,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ @@ -203,13 +294,24 @@ mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ - test "$$subdir" = "." && dot_seen=yes; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ done; \ - test "$$dot_seen" = "no" && rev=". $$rev"; \ + rev="$$rev ."; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ echo "Making $$target in $$subdir"; \ @@ -219,223 +321,323 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) + mkid -fID $$unique +tags: TAGS -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ - fi; \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ done; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) - -mostlyclean-tags: + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique -clean-tags: +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID - -maintainer-clean-tags: - -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - -rm -rf $(distdir) - GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz - mkdir $(distdir)/=build - mkdir $(distdir)/=inst - dc_install_base=`cd $(distdir)/=inst && pwd`; \ - cd $(distdir)/=build \ - && ../configure --srcdir=.. --prefix=$$dc_install_base \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) dist - -rm -rf $(distdir) - @banner="$(distdir).tar.gz is ready for distribution"; \ - dashes=`echo "$$banner" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ - echo "$$dashes" -dist: distdir - -chmod -R a+r $(distdir) - GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) - -rm -rf $(distdir) -dist-all: distdir - -chmod -R a+r $(distdir) - GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) - -rm -rf $(distdir) distdir: $(DISTFILES) - -rm -rf $(distdir) + $(am__remove_distdir) mkdir $(distdir) - -chmod 777 $(distdir) - here=`cd $(top_builddir) && pwd`; \ - top_distdir=`cd $(distdir) && pwd`; \ - distdir=`cd $(distdir) && pwd`; \ - cd $(top_srcdir) \ - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done - for subdir in $(SUBDIRS); do \ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ + test -d "$(distdir)/$$subdir" \ + || $(mkdir_p) "$(distdir)/$$subdir" \ || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + distdir) \ || exit 1; \ fi; \ done - $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook - -DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) - --include $(DEP_FILES) + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r $(distdir) +dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) -mostlyclean-depend: +dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) -clean-depend: +dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) -distclean-depend: - -rm -rf .deps +dist-shar: distdir + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + $(am__remove_distdir) -maintainer-clean-depend: +dist-zip: distdir + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) + $(am__remove_distdir) -%.o: %.c - @echo '$(COMPILE) -c $<'; \ - $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-cp .deps/$(*F).pp .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm .deps/$(*F).pp +dist dist-all: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) -%.lo: %.c - @echo '$(LTCOMPILE) -c $<'; \ - $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ - < .deps/$(*F).pp > .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm -f .deps/$(*F).pp -info-am: -info: info-recursive -dvi-am: -dvi: dvi-recursive +# This target untars the dist file and tries a VPATH configuration. Then +# it guarantees that the distribution is self-contained by making another +# tarfile. +distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac + chmod -R a-w $(distdir); chmod a+w $(distdir) + mkdir $(distdir)/_build + mkdir $(distdir)/_inst + chmod a-w $(distdir) + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && cd $(distdir)/_build \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + $(am__remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' +distuninstallcheck: + @cd $(distuninstallcheck_dir) \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ + fi ; \ + $(distuninstallcheck_listfiles) ; \ + exit 1; } >&2 +distcleancheck: distclean + @if test '$(srcdir)' = . ; then \ + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ + exit 1 ; \ + fi + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left in build directory after distclean:" ; \ + $(distcleancheck_listfiles) ; \ + exit 1; } >&2 check-am: all-am check: check-recursive -installcheck-am: -installcheck: installcheck-recursive -install-exec-am: install-binPROGRAMS +all-am: Makefile $(PROGRAMS) +installdirs: installdirs-recursive +installdirs-am: + for dir in "$(DESTDIR)$(bindir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +install: install-recursive install-exec: install-exec-recursive - -install-data-am: install-data-local install-data: install-data-recursive +uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-recursive -uninstall-am: uninstall-binPROGRAMS -uninstall: uninstall-recursive -all-am: Makefile $(PROGRAMS) -all-redirect: all-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: installdirs-recursive -installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(bindir) - +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: -mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ - mostlyclean-tags mostlyclean-depend mostlyclean-generic + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive -mostlyclean: mostlyclean-recursive +clean-am: clean-binPROGRAMS clean-generic mostlyclean-am -clean-am: clean-binPROGRAMS clean-compile clean-tags clean-depend \ - clean-generic mostlyclean-am +distclean: distclean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags -clean: clean-recursive +dvi: dvi-recursive -distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \ - distclean-depend distclean-generic clean-am +dvi-am: -distclean: distclean-recursive - -rm -f config.status +html: html-recursive -maintainer-clean-am: maintainer-clean-binPROGRAMS \ - maintainer-clean-compile maintainer-clean-tags \ - maintainer-clean-depend maintainer-clean-generic \ - distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +info: info-recursive + +info-am: + +install-data-am: install-data-local + +install-exec-am: install-binPROGRAMS + +install-info: install-info-recursive + +install-man: + +installcheck-am: maintainer-clean: maintainer-clean-recursive - -rm -f config.status + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf $(top_srcdir)/autom4te.cache + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic -.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ -maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ -mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile install-data-recursive \ -uninstall-data-recursive install-exec-recursive \ -uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ -all-recursive check-recursive installcheck-recursive info-recursive \ -dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ -maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir \ -mostlyclean-depend distclean-depend clean-depend \ -maintainer-clean-depend info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-exec-am install-exec \ -install-data-local install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs-am \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: uninstall-binPROGRAMS uninstall-info-am + +uninstall-info: uninstall-info-recursive + +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ + check-am clean clean-binPROGRAMS clean-generic clean-recursive \ + ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ + dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \ + distclean-compile distclean-generic distclean-recursive \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-binPROGRAMS install-data install-data-am \ + install-data-local install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-binPROGRAMS uninstall-info-am install-data-local: @@ -447,7 +649,6 @@ test -d pixmaps \ && mkdir $(distdir)/pixmaps \ && cp -p ${srcdir}/pixmaps/*.xpm $(distdir)/pixmaps - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: Index: Makefile.am =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/gum/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile.am 21 Mar 2005 10:17:16 -0000 1.2 +++ Makefile.am 10 Apr 2006 04:24:50 -0000 1.3 @@ -15,7 +15,7 @@ gum_LDADD = @GTK_LIBS@ ../ntserv/data.o -CFLAGS = @CFLAGS@ -DPACKAGE_DATA_DIR=\"@prefix@\" +AM_CFLAGS = @AM_CFLAGS@ -DPACKAGE_DATA_DIR=\"@prefix@\" install-data-local: test -d ${srcdir}/pixmaps \ Index: configure =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/gum/configure,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- configure 21 Mar 2005 05:23:36 -0000 1.1 +++ configure 10 Apr 2006 04:24:50 -0000 1.2 @@ -1,32 +1,288 @@ #! /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.59. # +# Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. +## --------------------- ## [...4909 lines suppressed...] +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" + exec 5>/dev/null + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || { (exit 1); exit 1; } +fi Index: missing =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/gum/missing,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- missing 21 Mar 2005 05:23:36 -0000 1.1 +++ missing 10 Apr 2006 04:24:50 -0000 1.2 @@ -1,7 +1,11 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997 Free Software Foundation, Inc. -# Franc,ois Pinard , 1996. + +scriptversion=2005-02-08.22 + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,12 +22,44 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + if test $# -eq 0; then echo 1>&2 "Try \`$0 --help' for more information" exit 1 fi +run=: + +# In the cases where this matters, `missing' is being run in the +# srcdir already. +if test -f configure.ac; then + configure_ac=configure.ac +else + configure_ac=configure.in +fi + +msg="missing on your system" + case "$1" in +--run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi + ;; -h|--h|--he|--hel|--help) echo "\ @@ -35,6 +71,7 @@ Options: -h, --help display this help and exit -v, --version output version information and exit + --run try to run the given command, and emulate it if it fails Supported PROGRAM values: aclocal touch file \`aclocal.m4' @@ -43,13 +80,19 @@ automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c + help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file - yacc create \`y.tab.[ch]', if possible, from existing .[ch]" + tar try tar, gnutar, gtar, then tar without non-portable flags + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + +Send bug reports to ." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing - GNU libit 0.0" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -58,10 +101,45 @@ exit 1 ;; - aclocal) +esac + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). +case "$1" in + lex|yacc) + # Not GNU programs, they don't have --version. + ;; + + tar) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 + fi + ;; +esac + +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case "$1" in + aclocal*) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`acinclude.m4' or \`configure.in'. You might want +WARNING: \`$1' is $msg. You should only need it if + you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 @@ -69,8 +147,8 @@ autoconf) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`configure.in'. You might want to install the +WARNING: \`$1' is $msg. You should only need it if + you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." touch configure @@ -78,35 +156,60 @@ autoheader) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`acconfig.h' or \`configure.in'. You might want +WARNING: \`$1' is $msg. You should only need it if + you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER([^):]*:\([^)]*\)).*/\1/p' configure.in` - if test -z "$files"; then - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^):]*\)).*/\1/p' configure.in` - test -z "$files" || files="$files.in" - else - files=`echo "$files" | sed -e 's/:/ /g'` - fi - test -z "$files" && files="config.h.in" - touch $files + files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` + test -z "$files" && files="config.h" + touch_files= + for f in $files; do + case "$f" in + *:*) touch_files="$touch_files "`echo "$f" | + sed -e 's/^[^:]*://' -e 's/:.*//'`;; + *) touch_files="$touch_files $f.in";; + esac + done + touch $touch_files ;; - automake) + automake*) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'. +WARNING: \`$1' is $msg. You should only need it if + you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." - find . -type f -name Makefile.am -print \ - | sed 's/^\(.*\).am$/touch \1.in/' \ - | sh + find . -type f -name Makefile.am -print | + sed 's/\.am$/.in/' | + while read f; do touch "$f"; done + ;; + + autom4te) + echo 1>&2 "\ +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the + proper tools for further handling them. + You can get \`$1' as part of \`Autoconf' from any GNU + archive site." + + file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` + test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo "#! /bin/sh" + echo "# Created by GNU Automake missing as a replacement of" + echo "# $ $@" + echo "exit 0" + chmod +x $file + exit 1 + fi ;; bison|yacc) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." @@ -136,7 +239,7 @@ lex|flex) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." @@ -157,28 +260,87 @@ fi ;; + help2man) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a dependency of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + if test -z "$file"; then + file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` + fi + if [ -f "$file" ]; then + touch $file + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" + exit 1 + fi + ;; + makeinfo) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy \`make' (AIX, DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." + # The file to touch is that specified with -o ... file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` if test -z "$file"; then - file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` + file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi touch $file ;; + tar) + shift + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error + # messages. + if (gnutar --version > /dev/null 2>&1); then + gnutar "$@" && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then + gtar "$@" && exit 0 + fi + firstarg="$1" + if shift; then + case "$firstarg" in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + case "$firstarg" in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + fi + + echo 1>&2 "\ +WARNING: I can't seem to be able to run \`tar' with the given arguments. + You may want to install GNU tar or Free paxutils, or check the + command line arguments." + exit 1 + ;; + *) echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequirements for installing + it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case some other package would contain this missing \`$1' program." exit 1 @@ -186,3 +348,10 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: From quozl at users.sourceforge.net Sun Apr 9 23:24:53 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Mon, 10 Apr 2006 04:24:53 +0000 Subject: [netrek-cvs] server/Vanilla/ntserv main.c, 1.3, 1.4 ntscmds.c, 1.3, 1.4 socket.c, 1.3, 1.4 Message-ID: Update of /cvsroot/netrek/server/Vanilla/ntserv In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21188/ntserv Modified Files: main.c ntscmds.c socket.c Log Message: misc working updates Index: ntscmds.c =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/ntserv/ntscmds.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ntscmds.c 27 Sep 2005 12:26:37 -0000 1.3 +++ ntscmds.c 10 Apr 2006 04:24:51 -0000 1.4 @@ -576,7 +576,7 @@ bounce(from, "%s is %s (%s)", me->p_mapchars, me->p_name, me->p_login); } else { bounce(from, "%s is %s (%s@%s)", me->p_mapchars, me->p_name, me->p_login, me->p_full_hostname); - bounce(from, "%s at %s (ip)", me->p_mapchars, inet_ntoa(remoteaddr)); + bounce(from, "%s at %s (ip)", me->p_mapchars, me->p_ip); } return 1; } Index: main.c =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/ntserv/main.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- main.c 27 Sep 2005 12:26:37 -0000 1.3 +++ main.c 10 Apr 2006 04:24:51 -0000 1.4 @@ -14,6 +14,7 @@ #include #include #include +#include #include "defs.h" #include INC_STRINGS #include INC_UNISTD @@ -264,6 +265,10 @@ for (i = 0; i < MAXPLAYER; i++) ignored[i] = 0; } + /* store client IP address from socket peer obtained by checkSocket() */ + if (remoteaddr != -1) + strcpy(me->p_ip, inet_ntoa(remoteaddr)); + #ifdef REVERSED_HOSTNAMES if (strlen(host) >= NAME_LEN) { STRNCPY(me->p_monitor, host + (strlen(host) - NAME_LEN + 1), NAME_LEN); Index: socket.c =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/ntserv/socket.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- socket.c 27 Sep 2005 12:26:37 -0000 1.3 +++ socket.c 10 Apr 2006 04:24:51 -0000 1.4 @@ -384,8 +384,8 @@ addr.sin_family = AF_INET; addr.sin_port = htons(port); - if (remoteaddr!=-1) { - addr.sin_addr.s_addr=remoteaddr; + if (remoteaddr != -1) { + addr.sin_addr.s_addr = remoteaddr; } else if ((addr.sin_addr.s_addr = inet_addr(machine)) == -1) { if ((hp = gethostbyname(machine)) == NULL) { ERROR(1,("%s: gethostbyname() failed, %s\n", whoami(), @@ -396,7 +396,7 @@ addr.sin_addr.s_addr = *(U_LONG *) hp->h_addr; } } - remoteaddr=addr.sin_addr.s_addr; + remoteaddr = addr.sin_addr.s_addr; /* 18th Feb 1999, cameron at stl.dec.com, suspect this is where the large delay is for a ghostbusted slot, assuming usual PPP dial-in user, this @@ -488,15 +488,11 @@ void checkSocket(void) { struct sockaddr_in sin; - int length; - - length=sizeof(sin); - if (getpeername(sock, (struct sockaddr *) &sin, &length) < 0) { - /* A bad thing. */ + int len = sizeof(sin); + if (getpeername(sock, (struct sockaddr *) &sin, &len) < 0) { return; } - - remoteaddr=sin.sin_addr.s_addr; + remoteaddr = sin.sin_addr.s_addr; } void initClientData(void) From quozl at users.sourceforge.net Sun Apr 9 23:24:53 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Mon, 10 Apr 2006 04:24:53 +0000 Subject: [netrek-cvs] server/Vanilla/include config.h.in, 1.3, 1.4 struct.h, 1.2, 1.3 Message-ID: Update of /cvsroot/netrek/server/Vanilla/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21188/include Modified Files: config.h.in struct.h Log Message: misc working updates Index: config.h.in =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/include/config.h.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- config.h.in 28 Sep 2005 12:14:05 -0000 1.3 +++ config.h.in 10 Apr 2006 04:24:51 -0000 1.4 @@ -352,11 +352,15 @@ /* EJECT_ONLY_IF_QUEUE - refuses to eject unless queue != 0 */ + + /* EJECT_PERSISTENCY - does not let player back + in if same character name or same ip address */ #ifdef VOTING #undef ALLOW_EJECT #ifdef ALLOW_EJECT #define VICIOUS_EJECT #define EJECT_ONLY_IF_QUEUE +#define EJECT_PERSISTENCY #endif #endif Index: struct.h =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/include/struct.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- struct.h 21 Mar 2005 10:17:16 -0000 1.2 +++ struct.h 10 Apr 2006 04:24:51 -0000 1.3 @@ -174,7 +174,7 @@ #endif struct team { - int s_turns; /* turns till another starbase is legal */ + int s_turns; /* turns till another starbase is legal */ int s_surrender; /* minutes until this team surrenders */ int s_plcount; /* how many planets this team owns */ }; @@ -324,6 +324,7 @@ u_int p_flags; /* Player flags */ char p_name[NAME_LEN]; /* Player handle, i.e. "Wreck" */ char p_login[NAME_LEN]; /* Login name of player's account */ + char p_ip[NAME_LEN]; /* IP address of client in text */ char p_monitor[NAME_LEN]; /* Monitor being played on */ char p_longname[NAME_LEN+6];/* Name plus (mapchars); i.e. "Wreck (R0)" */ char p_mapchars[3]; /* Cache for map window image, i.e. "R0" */ From quozl at users.sourceforge.net Sun Apr 9 23:24:53 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Mon, 10 Apr 2006 04:24:53 +0000 Subject: [netrek-cvs] server/Vanilla/tools players.c, 1.3, 1.4 xtkill.c, 1.3, 1.4 Message-ID: Update of /cvsroot/netrek/server/Vanilla/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21188/tools Modified Files: players.c xtkill.c Log Message: misc working updates Index: xtkill.c =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/tools/xtkill.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- xtkill.c 2 Jan 2006 20:10:48 -0000 1.3 +++ xtkill.c 10 Apr 2006 04:24:51 -0000 1.4 @@ -110,10 +110,6 @@ players[player].p_hostile &= ~team; players[player].p_swar &= ~team; players[player].p_war &= ~team; - sprintf(buf, "GOD->ALL Change: %2s is now a %s.", - players[player].p_mapchars, - names[team]); - _pmessage(buf, 0, MALL); sprintf(players[player].p_mapchars, "%c%c", teamlet[players[player].p_team], shipnos[player]); sprintf(players[player].p_longname, "%s (%s)", @@ -200,10 +196,10 @@ players[player].p_swar = 0; players[player].p_war = 0; players[player].p_team = 0; /* indep */ - players[player].p_ship.s_type = STARBASE; + players[player].p_ship.s_type = SCOUT; players[player].p_ship.s_mass = 200; players[player].p_ship.s_repair = 30000; - players[player].p_ship.s_maxspeed = 0; + break; case 'S': /* super ship */ players[player].p_ship.s_maxshield = 750; players[player].p_shield = 750; @@ -217,9 +213,6 @@ 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, but not beyond admiral */ if( players[player].p_stats.st_rank < (NUMRANKS - 1) ) @@ -241,7 +234,42 @@ players[player].p_shield = 0; players[player].p_damage = players[player].p_ship.s_maxdamage/2; break; - case 'u': + case 'H': /* hack */ + { + struct player *me = &players[player]; + /* make independent and hostile to only prior team */ + int team = players[player].p_team; + players[player].p_hostile = team; + players[player].p_swar = team; + players[player].p_war = team; + players[player].p_team = 0; + sprintf(players[player].p_mapchars, "%c%c", + teamlet[players[player].p_team], shipnos[player]); + sprintf(players[player].p_longname, "%s (%s)", + players[player].p_name, players[player].p_mapchars); + /* cripple */ + players[player].p_shield = 0; + players[player].p_damage = players[player].p_ship.s_maxdamage/2; + /* raise shields */ + players[player].p_flags |= PFSHIELD; + players[player].p_flags &= ~(PFBOMB | PFREPAIR | PFBEAMUP | PFBEAMDOWN); + /* break tractors and decloak */ + me->p_flags &= ~(PFTRACT | PFPRESS); + me->p_flags &= ~PFCLOAK; + /* set speed 0 */ + me->p_desspeed = 0; + if (me->p_flags & PFDOCK) { + players[me->p_docked].p_docked--; + players[me->p_docked].p_port[me->p_port[0]] = VACANT; + } + me->p_flags &= ~(PFREPAIR | PFBOMB | PFORBIT | PFDOCK | PFBEAMUP | PFBEAMDOWN); + /* make unable to act */ + players[player].p_flags |= PFTWARP; + /* show as puck */ + players[player].p_ship.s_type = SCOUT; + } + break; + case 'u': /* raise shields */ players[player].p_flags |= PFSHIELD; players[player].p_flags &= ~(PFBOMB | PFREPAIR | PFBEAMUP | PFBEAMDOWN); break; @@ -305,6 +333,7 @@ (no mode == obliterate)\n\ s(hip class change)[abcdosA] (A = ATT)\n\ t(eleport to quadrant)[frkoc] (c = center of galaxy)\n\ + p(uck) (harmless little thing)\n\ S(uper) (big shields/max damage/max etmp)\n\ T(eam change)[frko] (no team == independent)\n\ D(emote) (-1 to rank)\n\ Index: players.c =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/tools/players.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- players.c 22 Feb 2006 09:18:30 -0000 1.3 +++ players.c 10 Apr 2006 04:24:51 -0000 1.4 @@ -11,10 +11,10 @@ extern int openmem(int); -int mode=0; +int mode = 0; static char *ships[] = {"SC", "DD", "CA", "BB", "AS", "SB"}; static char *statnames[] = {"F", "O", "A", "E", "D"}; -static int out = 1; /* stdout for non-socket connections */ +static int fd = 1; /* stdout for non-socket connections */ /* forward function declarations */ static void udp(); @@ -32,8 +32,9 @@ char *fixed_name; if (argc>1) { - mode= *(argv[1]); - out = 0; + mode = *(argv[1]); + /* if stdin is not a tty, assume it is a socket */ + if (!isatty(0)) fd = 0; } if (mode == 'u') { udp(); exit(0); } @@ -313,17 +314,16 @@ static void output(const char *fmt, ...) { - va_list args; - va_start(args, fmt); + va_list args; + va_start(args, fmt); - if(out == 1){ - vfprintf(stdout, fmt, args); - } - else { - char buf[512]; - vsprintf(buf, fmt, args); - write(out, buf, strlen(buf)); - } - va_end(args); + if (fd == 1) { + vfprintf(stdout, fmt, args); + } else { + char buf[512]; + vsnprintf(buf, 511, fmt, args); + write(fd, buf, strlen(buf)); + } + va_end(args); } From quozl at users.sourceforge.net Sun Apr 9 23:24:53 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Mon, 10 Apr 2006 04:24:53 +0000 Subject: [netrek-cvs] server/Vanilla/newstartd newstartd.c,1.6,1.7 Message-ID: Update of /cvsroot/netrek/server/Vanilla/newstartd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21188/newstartd Modified Files: newstartd.c Log Message: misc working updates Index: newstartd.c =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/newstartd/newstartd.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- newstartd.c 22 Feb 2006 09:18:30 -0000 1.6 +++ newstartd.c 10 Apr 2006 04:24:51 -0000 1.7 @@ -567,6 +567,7 @@ client = fdopen (0, "w"); if (client != NULL) { if (!strcmp (peerhostname, "localhost")) { + /* TODO: above check vulnerable to DNS attack, minor impact */ fprintf (client, "port\taccepts\tdenials\tforks\n" ); for (i=0; i Update of /cvsroot/netrek/server/Vanilla In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21188 Modified Files: ChangeLog PROJECTS Log Message: misc working updates Index: PROJECTS =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/PROJECTS,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- PROJECTS 16 Jun 2005 00:16:21 -0000 1.3 +++ PROJECTS 10 Apr 2006 04:24:50 -0000 1.4 @@ -3,6 +3,58 @@ List of things to do in the future + - vote per IP address only, not per slot + + - ban for an hour after eject, or while the players that voted still + have the same slot (ban based on an a mask of slots that voted for + eject) + +quozl's working notes ... { + +expiry by time + check list, remove based on time (time_t) +expiry by departure + check list, remove if any voters have gone (MAXPLAYER x p_no, p_pos) +connect + do expiry + pass if observer + check list of temporary bans, by ip address (p_monitor?) +login + do expiry + pass if guest + pass if observer (but set :ita for all) + check list of temporary bans, by p_name +refit mask wait + do not offer a team they have been banned from? +queue wait + do not accept a slot if they are banned from that team +eject vote + do expiry + insert entry into list + (time_t, p_name, p_monitor, n_voted MAXPLAYER(p_no, p_pos)) + if they are not banned from the other team, offer them a ship there +data + MAXPERSISTENTBANS (time_t, p_name, p_monitor, MAXPLAYER(p_no, p_updates, p_team, p_pos)) + +BFGOD +BFTEAM +struct ban { + u_int b_flags; + time_t b_when; + char p_name[NAME_LEN]; + char p_ip[NAME_LEN]; + struct ban_matrix { + int p_no; + int p_updates; + short p_team; + pid_t p_process; + } b_matrix[MAXPLAYER]; +} bans[MAXBANS]; + +} quozl's working notes + + - prevent eject in initial two-minutes of ship time, if ship active, + - RSS feed for genos, so that people can subscribe and be told when the galactic is recently reset. Jerub expressed an interest in doing it. @@ -46,9 +98,6 @@ - vary observer update rate down when not in use, use lock on player or planet event to increase back. - - method for starbase to disable transwarp but leave docking - enabled. Dave Ahn to implement. - - configure checks for gmp more than once, it should check only once. Perhaps it is configure for res-rsa duplicating effort? @@ -57,12 +106,6 @@ - implement automake - - implement proper configure --prefix usage, so that we install - in %{prefix}/games/netrek not in %{prefix} - - - implement configure's other path options, so that read-write - data will be in %{prefix}/var/somewhere - - web page interface to INL server, including privileged functions such as starting, stopping, or restarting the server, and non-privileged functions such as (a) @@ -96,10 +139,6 @@ that avoids trying to compile xsg or pledit, and perhaps a few other things, suggested by Tom Holub [VANILLA-LIST:2566] - - add command to allow players to change their password. - "password newpassword", followed by "confirm newpassword". - [partially done] - - pledit should be able to edit entries in place online. - god's text client, displays messages to god and all, and allows Index: ChangeLog =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/ChangeLog,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ChangeLog 22 Feb 2006 09:48:30 -0000 1.13 +++ ChangeLog 10 Apr 2006 04:24:50 -0000 1.14 @@ -1,3 +1,17 @@ +Sun Apr 9 21:01:24 2006 James Cameron + + * ntserv/ntscmds.c (bounceWhois): use p_ip instead of remoteaddr. + * ntserv/main.c (main): set p_ip from remoteaddr. + * include/struct.h (struct player): add p_ip for IP address. + +Sun Apr 9 20:04:03 2006 James Cameron + + * tools/players.c (main): if run from a tty, use stdout. + +Sat Mar 4 15:12:10 2006 James Cameron + + * tools/xtkill.c: remove warning messages from team change. + Wed Feb 22 20:44:13 2006 James Cameron * netrek-server-vanilla-2.10.2 released From quozl at users.sourceforge.net Mon Apr 10 05:30:46 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Mon, 10 Apr 2006 10:30:46 +0000 Subject: [netrek-cvs] server/Vanilla ChangeLog,1.14,1.15 Message-ID: Update of /cvsroot/netrek/server/Vanilla In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2338 Modified Files: ChangeLog Log Message: fix compilation warning Index: ChangeLog =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/ChangeLog,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ChangeLog 10 Apr 2006 04:24:50 -0000 1.14 +++ ChangeLog 10 Apr 2006 10:30:44 -0000 1.15 @@ -1,3 +1,8 @@ +Mon Apr 10 20:12:19 2006 James Cameron + + * robots/inl.c (checkmess): fix compilation warning by renaming + log function to logmessage. + Sun Apr 9 21:01:24 2006 James Cameron * ntserv/ntscmds.c (bounceWhois): use p_ip instead of remoteaddr. From quozl at users.sourceforge.net Mon Apr 10 05:30:46 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Mon, 10 Apr 2006 10:30:46 +0000 Subject: [netrek-cvs] server/Vanilla/robots inl.c,1.1,1.2 Message-ID: Update of /cvsroot/netrek/server/Vanilla/robots In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2338/robots Modified Files: inl.c Log Message: fix compilation warning Index: inl.c =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/robots/inl.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- inl.c 21 Mar 2005 05:23:46 -0000 1.1 +++ inl.c 10 Apr 2006 10:30:44 -0000 1.2 @@ -512,7 +512,7 @@ return 1; } -log(m) +logmessage(m) struct message *m; { time_t curtime; @@ -584,12 +584,12 @@ HandleGenDistr(msg.m_data,msg.m_from,msg.m_recpt,&dist); size = makedistress(&dist,buf,distmacro[dist.distype].macro); strncpy(msg.m_data,buf,size+1); - log(&(msg)); + logmessage(&(msg)); } else { - log(&(messages[oldmctl])); + logmessage(&(messages[oldmctl])); } #else - log(&(messages[oldmctl])); + logmessage(&(messages[oldmctl])); #endif } } @@ -1197,7 +1197,7 @@ /* Fix planets */ oldplanets = (struct planet *) malloc(sizeof(struct planet) * MAXPLANETS); MCOPY(planets, oldplanets, sizeof(struct planet) * MAXPLANETS); -#endif nodef +#endif /* Dont change the pickup queues around - just close them. */ #ifdef nodef @@ -1287,7 +1287,7 @@ #ifdef nodef /* restore galaxy */ MCOPY(oldplanets, planets, sizeof(struct planet) * MAXPLANETS); -#endif nodef +#endif /* Dont mess with the queue information - it is set correctly in queue.c */ #ifdef nodef @@ -1451,7 +1451,7 @@ inl_planets = (struct planet *) malloc(sizeof(struct planet) * MAXPLANETS); /* MCOPY(planets, oldplanets, sizeof(struct planet) * MAXPLANETS); */ MCOPY(planets, inl_planets, sizeof(struct planet) * MAXPLANETS); -#endif nodef +#endif inl_stat.flags |= S_TOURNEY; inl_stat.flags &= ~(S_PREGAME | S_COUNTDOWN | S_CONFINE); From quozl at users.sourceforge.net Mon Apr 10 05:38:24 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Mon, 10 Apr 2006 10:38:24 +0000 Subject: [netrek-cvs] server/Vanilla/ntserv main.c,1.4,1.5 Message-ID: Update of /cvsroot/netrek/server/Vanilla/ntserv In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9934/ntserv Modified Files: main.c Log Message: fix compile error Index: main.c =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/ntserv/main.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- main.c 10 Apr 2006 04:24:51 -0000 1.4 +++ main.c 10 Apr 2006 10:38:22 -0000 1.5 @@ -267,7 +267,7 @@ /* store client IP address from socket peer obtained by checkSocket() */ if (remoteaddr != -1) - strcpy(me->p_ip, inet_ntoa(remoteaddr)); + strcpy(me->p_ip, inet_ntoa(*(struct in_addr *)&remoteaddr)); #ifdef REVERSED_HOSTNAMES if (strlen(host) >= NAME_LEN) { From quozl at users.sourceforge.net Mon Apr 10 05:41:11 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Mon, 10 Apr 2006 10:41:11 +0000 Subject: [netrek-cvs] server/Vanilla/ntserv util.c,1.2,1.3 Message-ID: Update of /cvsroot/netrek/server/Vanilla/ntserv In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12717/ntserv Modified Files: util.c Log Message: remove unnecessary includes Index: util.c =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/ntserv/util.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- util.c 21 Mar 2005 10:17:17 -0000 1.2 +++ util.c 10 Apr 2006 10:41:08 -0000 1.3 @@ -3,21 +3,10 @@ */ #include "copyright.h" #include "config.h" - -#include -#include INC_MATH -#include -#include -#include -#include #include "defs.h" -#include INC_STRINGS -#include INC_UNISTD #include "struct.h" #include "data.h" - - /* ** Provide the angular distance between two angles. */ From quozl at users.sourceforge.net Mon Apr 10 05:56:35 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Mon, 10 Apr 2006 10:56:35 +0000 Subject: [netrek-cvs] server/Vanilla/ntserv bay.c, NONE, 1.1 Makefile.in, 1.3, 1.4 daemonII.c, 1.3, 1.4 enter.c, 1.2, 1.3 interface.c, 1.3, 1.4 ntscmds.c, 1.4, 1.5 orbit.c, 1.2, 1.3 redraw.c, 1.1, 1.2 socket.c, 1.4, 1.5 Message-ID: Update of /cvsroot/netrek/server/Vanilla/ntserv In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26876/ntserv Modified Files: Makefile.in daemonII.c enter.c interface.c ntscmds.c orbit.c redraw.c socket.c Added Files: bay.c Log Message: bays Index: redraw.c =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/ntserv/redraw.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- redraw.c 21 Mar 2005 05:23:44 -0000 1.1 +++ redraw.c 10 Apr 2006 10:56:33 -0000 1.2 @@ -213,14 +213,12 @@ #define NOOBSMASK (PFSELFDEST|PFPLOCK|PFPLLOCK|PFOBSERV) me->p_flags = (pl->p_flags & ~NOOBSMASK) | (me->p_flags & NOOBSMASK); - /* always cloaked, state of person watched will be obvious */ - /* me->p_flags |= PFCLOAK; */ me->p_dir = pl->p_dir; me->p_tractor = pl->p_tractor; - me->p_docked = pl->p_docked; + me->p_dock_with = pl->p_dock_with; + me->p_dock_bay = pl->p_dock_bay; me->p_planet = pl->p_planet; me->p_speed = pl->p_speed; - /* me->p_kills = pl->p_kills; Very bad: will confuse enemies */ } return; } /* end if I am locked onto a player */ @@ -439,10 +437,11 @@ planets[me->p_planet].pl_armies); } else if (me->p_flags & PFDOCK) { - if (players[me->p_docked].p_armies == 0) { + struct player *base = bay_owner(me); + if (base->p_armies <= 0) { txt = "Too few armies to beam up"; me->p_flags &= ~PFBEAMUP; - } else if (me->p_armies == troop_capacity) { + } else if (me->p_armies >= troop_capacity) { txt = "No more room on board for armies"; me->p_flags &= ~PFBEAMUP; } else { @@ -452,8 +451,8 @@ txt, me->p_armies, troop_capacity, - players[me->p_docked].p_name, - players[me->p_docked].p_armies); + base->p_name, + base->p_armies); } } @@ -475,13 +474,13 @@ planets[me->p_planet].pl_armies); } else if (me->p_flags & PFDOCK) { - if (me->p_armies == 0) { + struct player *base = bay_owner(me); + if (me->p_armies <= 0) { txt = "No more armies to beam down"; me->p_flags &= ~PFBEAMDOWN; - } else if (players[me->p_docked].p_armies == - players[me->p_docked].p_ship.s_maxarmies) { - txt = "All troop bunkers are full"; - me->p_flags &= ~PFBEAMDOWN; + } else if (base->p_armies >= base->p_ship.s_maxarmies) { + txt = "All troop bunkers are full"; + me->p_flags &= ~PFBEAMDOWN; } else { txt = "Transfering ground units"; } @@ -489,8 +488,8 @@ txt, me->p_armies, troop_capacity, - players[me->p_docked].p_name, - players[me->p_docked].p_armies); + base->p_name, + base->p_armies); } } Index: ntscmds.c =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/ntserv/ntscmds.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ntscmds.c 10 Apr 2006 04:24:51 -0000 1.4 +++ ntscmds.c 10 Apr 2006 10:56:32 -0000 1.5 @@ -297,8 +297,10 @@ j->p_ship.s_type = STARBASE; j->p_whydead=KQUIT; j->p_explode=10; + /* note VICIOUS_EJECT prevents animation of ship explosion */ j->p_status=PEXPLODE; j->p_whodead=me->p_no; + bay_release(j); } #endif /* ALLOW_EJECT */ Index: orbit.c =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/ntserv/orbit.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- orbit.c 21 Mar 2005 10:17:17 -0000 1.2 +++ orbit.c 10 Apr 2006 10:56:32 -0000 1.3 @@ -29,27 +29,10 @@ #define TRUE 1 #endif -/* - * If there are bugs in this docking code and/or possibly other places - * in the code, then conceivably a base my have p_docked < 4 while - * all ports are non-VACANT. That is inconsistent, and this code - * will check for that eventuality on the fly. - */ -#if 1 -#define RETURN_IF_VACANT(base, port) -#else -#define RETURN_IF_VACANT(base, port) \ - if (base->p_port[port] != VACANT) { \ - ERROR(1, ("Starbase %d has no ports vacant but p_docked==%d\n", \ - base->p_id, base->p_docked)); \ - return FALSE; \ - } -#endif - void de_lock(struct player *me) { me->p_flags &= ~(PFPLOCK | PFPLLOCK | PFTRACT | PFPRESS); - #ifdef SB_TRANSWARP +#ifdef SB_TRANSWARP if (me->p_flags & PFTWARP){ me->p_flags &= ~PFTWARP; me->p_flags |= PFREFITTING; @@ -64,14 +47,14 @@ * (If one or more of these is not true, various nasty things happen.) */ -#define DOCK_NO_BASE 0 -#define DOCK_FAILURE 1 -#define DOCK_SUCCESS 2 +#define DOCK_NO_BASE 0 /* no base is close enough */ +#define DOCK_FAILURE 1 /* dock failed due to some condition */ +#define DOCK_SUCCESS 2 /* dock was successful */ static int dock(struct player *base) { LONG dx, dy; - int port_id; + int bay_no; u_char dir_from_base; /* @@ -124,90 +107,28 @@ } /* - * Make sure the base's docking ports are not already full: */ - if (base->p_docked >= NUMPORTS) { + * Make sure the base's docking bays are not already full: */ + bay_no = bay_closest(base, dx, dy); + if (bay_no == -1) { if (send_short) swarning(SBDOCKDENIED_TEXT, base->p_no, 0); else - new_warning(UNDEF, "Starbase %s: Permission to dock denied, all ports currently occupied.", base->p_name); + new_warning(UNDEF, "Starbase %s: Permission to dock denied, all bays currently occupied.", base->p_name); de_lock(me); return DOCK_FAILURE; } /* - * Dock on closest port. - * A starbase's ports are 3 0 - * numbered as in this () - * picture: 2 1 */ - if (dx > 0) { - /* We are to the left of the base: */ - if (dy > 0) { - /* Above and to left of base: */ - if (base->p_port[3] == VACANT) - port_id = 3; - else if (base->p_port[2] == VACANT) - port_id = 2; - else if (base->p_port[0] == VACANT) - port_id = 0; - else { - RETURN_IF_VACANT(base, 1); - port_id = 1; - } - } else { - /* Below and to left of base: */ - if (base->p_port[2] == VACANT) - port_id = 2; - else if (base->p_port[3] == VACANT) - port_id = 3; - else if (base->p_port[1] == VACANT) - port_id = 1; - else { - RETURN_IF_VACANT(base, 0); - port_id = 0; - } - } - } else { - /* We are to the right of the base: */ - if (dy > 0) { - /* Above and to right of base: */ - if (base->p_port[0] == VACANT) - port_id = 0; - else if (base->p_port[1] == VACANT) - port_id = 1; - else if (base->p_port[3] == VACANT) - port_id = 3; - else { - RETURN_IF_VACANT(base, 2); - port_id = 2; - } - } else { - /* Below and to right of base: */ - if (base->p_port[1] == VACANT) - port_id = 1; - else if (base->p_port[2] == VACANT) - port_id = 2; - else if (base->p_port[0] == VACANT) - port_id = 0; - else { - RETURN_IF_VACANT(base, 3); - port_id = 3; - } - } - } - - /* * Adjust player structures of myself and the base. */ - dir_from_base = ((port_id * 90 + 45) * 256) / 360; - me->p_flags &= ~(PFPLOCK | PFPLLOCK | PFTRACT | PFPRESS); - me->p_flags |= PFDOCK; - me->p_dir = 64 + dir_from_base; - me->p_desdir = me->p_dir; - me->p_x = base->p_x + DOCKDIST * Cos[dir_from_base]; - me->p_y = base->p_y + DOCKDIST * Sin[dir_from_base]; - me->p_speed = 0; - me->p_desspeed = 0; - me->p_docked = base->p_no; - me->p_port[0] = port_id; + dir_from_base = ((bay_no * 90 + 45) * 256) / 360; + me->p_flags &= ~(PFPLOCK | PFPLLOCK | PFTRACT | PFPRESS); + me->p_flags |= PFDOCK; + me->p_dir = 64 + dir_from_base; + me->p_desdir = me->p_dir; + me->p_x = base->p_x + DOCKDIST * Cos[dir_from_base]; + me->p_y = base->p_y + DOCKDIST * Sin[dir_from_base]; + me->p_speed = 0; + me->p_desspeed = 0; #ifdef SB_TRANSWARP if (me->p_flags & PFTWARP){ me->p_flags &= ~PFTWARP; @@ -216,15 +137,14 @@ } #endif - base->p_docked++; - base->p_port[port_id] = me->p_no; + bay_claim(base, me, bay_no); /* * Notify player of success. */ if (send_short) - swarning(ONEARG_TEXT, 2, port_id); + swarning(ONEARG_TEXT, 2, bay_no); else - new_warning(UNDEF,"Helmsman: Docking manuever completed Captain. All moorings secured at port %d.", port_id); + new_warning(UNDEF,"Helmsman: Docking manuever completed Captain. All moorings secured at bay %d.", bay_no); return DOCK_SUCCESS; } Index: Makefile.in =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/ntserv/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.in 28 Sep 2005 12:14:05 -0000 1.3 +++ Makefile.in 10 Apr 2006 10:56:31 -0000 1.4 @@ -22,14 +22,14 @@ startrobot.o sysdefaults.o timecheck.o torp.o util.o \ warning.o ping.o $(RANDOMO) getpath.o $(STRDUPO) features.o \ distress.o transwarp.o gencmds.o ntscmds.o openmem.o feature.o \ - queue.o slotmaint.o rsa_key.o ltd_stats.o + queue.o slotmaint.o rsa_key.o ltd_stats.o bay.o # daemonII object files D_OBJS = daemonII.o sintab.o sysdefaults.o data.o slotmaint.o \ util.o $(RANDOMO) getpath.o getship.o smessage.o queue.o \ - wander2.o openmem.o solicit.o ltd_stats.o + wander2.o openmem.o solicit.o ltd_stats.o bay.o # Src files @@ -48,7 +48,8 @@ ${srcdir}/features.c ${srcdir}/distress.c ${srcdir}/transwarp.c \ ${srcdir}/gencmds.c ${srcdir}/ntscmds.c ${srcdir}/openmem.c \ ${srcdir}/feature.c ${srcdir}/queue.c ${srcdir}/slotmaint.c \ - ${srcdir}/wander2.c ${srcdir}/sysdefaults.c ${srcdir}/rsa_key.c + ${srcdir}/wander2.c ${srcdir}/sysdefaults.c ${srcdir}/rsa_key.c \ + ${srcdir}/bay.c SRC = $(R_FILES) data.h defs.h planets.h struct.h \ packets.h copyright.h Index: enter.c =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/ntserv/enter.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- enter.c 21 Mar 2005 10:17:17 -0000 1.2 +++ enter.c 10 Apr 2006 10:56:32 -0000 1.3 @@ -176,12 +176,10 @@ me->p_lastseenby = VACANT; me->p_kills = 0.0; me->p_armies = 0; - me->p_docked = 0; - me->p_port[0] = VACANT; - me->p_port[1] = VACANT; - me->p_port[2] = VACANT; - me->p_port[3] = VACANT; -/* if (!keeppeace) me->p_hostile = (FED|ROM|KLI|ORI);*/ + bay_init(me); + me->p_dock_with = 0; + me->p_dock_bay = 0; +/* if (!keeppeace) me->p_hostile = (FED|ROM|KLI|ORI); */ if( !(me->p_flags & PFROBOT) && (me->p_team == NOBODY) ) { me->p_hostile = NOBODY; me->p_war = NOBODY; --- NEW FILE: bay.c --- #include "copyright.h" #include "config.h" #include #include "defs.h" #include "struct.h" #include "data.h" /* starbase bay functions */ /* convert a player number to a player struct pointer */ static struct player *p_no(int i) { return &players[i]; } /* convert a docked ship player to the base they are docked to */ struct player *bay_owner(struct player *me) { assert(me->p_flags & PFDOCK); return p_no(me->p_dock_with); } /* check all bays for consistency, despite our best efforts it is still possible for the bays to be inconsistent, an example is a SIGKILL of ntserv */ void bay_consistency_check(struct player *base) { int i; struct player *ship; for (i=0; ip_bays[i] == VACANT) continue; ship = p_no(base->p_bays[i]); if (!(ship->p_flags & PFDOCK)) { /* ship isn't docked */ base->p_bays[i] = VACANT; continue; } if (ship->p_dock_with != base->p_no) { /* ship is docked but not with this base */ base->p_bays[i] = VACANT; continue; } if (ship->p_dock_bay != i) { /* ship is docked with this base but not on this bay */ base->p_bays[i] = VACANT; continue; } } } /* claim a specific bay on a base for use by a docking ship */ void bay_claim(struct player *base, struct player *me, int bay_no) { me->p_dock_with = base->p_no; me->p_dock_bay = bay_no; base->p_bays[bay_no] = me->p_no; } /* release of a bay by a docked ship */ void bay_release(struct player *me) { if (me->p_flags & PFDOCK) { struct player *base = p_no(me->p_dock_with); int bay = me->p_dock_bay; if (base->p_bays[bay] != VACANT) { base->p_bays[bay] = VACANT; } me->p_flags &= ~PFDOCK; } } /* release of all bays by a base */ void bay_release_all(struct player *base) { int i; for (i=0; ip_bays[i] != VACANT) { struct player *pl = p_no(base->p_bays[i]); base->p_bays[i] = VACANT; pl->p_flags &= ~PFDOCK; } } /* initialise all bays */ void bay_init(struct player *me) { int i; for(i=0;ip_bays[i] = VACANT; } /* * Return closest bay according to position. * A starbase's bays are 3 0 * numbered as in this () * picture: 2 1 */ int bay_closest(struct player *base, LONG dx, LONG dy) { bay_consistency_check(base); if (dx > 0) { /* We are to the left of the base: */ if (dy > 0) { /* Above and to left of base: */ if (base->p_bays[3] == VACANT) return 3; else if (base->p_bays[2] == VACANT) return 2; else if (base->p_bays[0] == VACANT) return 0; else if (base->p_bays[1] == VACANT) return 1; else return -1; } else { /* Below and to left of base: */ if (base->p_bays[2] == VACANT) return 2; else if (base->p_bays[3] == VACANT) return 3; else if (base->p_bays[1] == VACANT) return 1; else if (base->p_bays[0] == VACANT) return 0; else return -1; } } else { /* We are to the right of the base: */ if (dy > 0) { /* Above and to right of base: */ if (base->p_bays[0] == VACANT) return 0; else if (base->p_bays[1] == VACANT) return 1; else if (base->p_bays[3] == VACANT) return 3; else if (base->p_bays[2] == VACANT) return 2; else return -1; } else { /* Below and to right of base: */ if (base->p_bays[1] == VACANT) return 1; else if (base->p_bays[2] == VACANT) return 2; /* inconsistent order */ else if (base->p_bays[0] == VACANT) return 0; else if (base->p_bays[3] == VACANT) return 3; else return -1; } } } Index: daemonII.c =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/ntserv/daemonII.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- daemonII.c 27 Sep 2005 12:26:37 -0000 1.3 +++ daemonII.c 10 Apr 2006 10:56:32 -0000 1.4 @@ -927,13 +927,9 @@ j->p_explode = 600/PLAYERFUSE; /* set ghost buster */ } - /* At this point, docked ships become removed. */ - if (j->p_flags & PFDOCK) { - players[j->p_docked].p_docked--; - players[j->p_docked].p_port[j->p_port[0]] = VACANT; - j->p_flags &= ~PFDOCK; - } + bay_release(j); if (j->p_ship.s_type == STARBASE) { + bay_release_all(j); if (((j->p_whydead == KSHIP) || (j->p_whydead == KTORP) || (j->p_whydead == KPHASER) || @@ -942,16 +938,9 @@ (j->p_whydead == KGENOCIDE)) && (status->tourn)) teams[j->p_team].s_turns=BUILD_SB_TIME; /* in defs.h */ /* 30 minute reconstruction period for new starbase */ - for (k=0; kp_port[k] != VACANT) { - players[j->p_port[k]].p_flags &= ~PFDOCK; - j->p_port[k] = VACANT; - } - j->p_docked = 0; } /* And he is ejected from orbit. */ - if (j->p_flags & PFORBIT) - j->p_flags &= ~PFORBIT; + j->p_flags &= ~PFORBIT; /* Fall through to alive so explosions move */ @@ -1016,10 +1005,13 @@ /* Charge SB's for mass of docked vessels ... */ if (j->p_ship.s_type == STARBASE) { - for (k=0; kp_port[k] != VACANT) - j->p_fuel -= players[j->p_port[k]].p_ship.s_warpcost * j->p_speed; - j->p_etemp += .7*(j->p_speed * j->p_docked); + int bays = 0; + for (k=0; kp_bays[k] != VACANT) { + j->p_fuel -= players[j->p_bays[k]].p_ship.s_warpcost * j->p_speed; + bays++; + } + j->p_etemp += .7*(j->p_speed * bays); } } #ifdef SB_TRANSWARP @@ -1328,11 +1320,11 @@ j->p_fuel += 6 * j->p_ship.s_recharge; } else if ((j->p_flags & PFDOCK) && (j->p_fuel < j->p_ship.s_maxfuel) && - (players[j->p_docked].p_fuel > SBFUELMIN)) { + (players[j->p_dock_with].p_fuel > SBFUELMIN)) { int fc = MIN(10*j->p_ship.s_recharge, j->p_ship.s_maxfuel - j->p_fuel); j->p_fuel += fc; - players[j->p_docked].p_fuel -= fc; + players[j->p_dock_with].p_fuel -= fc; } #else /* Add fuel */ @@ -1341,9 +1333,9 @@ (!(planets[j->p_planet].pl_owner & j->p_war))) { j->p_fuel += 8 * j->p_ship.s_recharge; } else if ((j->p_flags & PFDOCK) && (j->p_fuel < j->p_ship.s_maxfuel)) { - if (players[j->p_docked].p_fuel > SBFUELMIN) { + if (players[j->p_dock_with].p_fuel > SBFUELMIN) { j->p_fuel += 12*j->p_ship.s_recharge; - players[j->p_docked].p_fuel -= 12*j->p_ship.s_recharge; + players[j->p_dock_with].p_fuel -= 12*j->p_ship.s_recharge; } } else j->p_fuel += 2 * j->p_ship.s_recharge; @@ -1418,8 +1410,8 @@ /* Move Player in dock */ if (j->p_flags & PFDOCK) { - j->p_x = players[j->p_docked].p_x + DOCKDIST*Cos[(j->p_port[0]*90+45)*255/360]; - j->p_y = players[j->p_docked].p_y + DOCKDIST*Sin[(j->p_port[0]*90+45)*255/360]; + j->p_x = players[j->p_dock_with].p_x + DOCKDIST*Cos[(j->p_dock_bay*90+45)*255/360]; + j->p_y = players[j->p_dock_with].p_y + DOCKDIST*Sin[(j->p_dock_bay*90+45)*255/360]; } /* Set player's alert status */ @@ -2939,9 +2931,9 @@ if (l->pl_armies < 5) continue; if (j->p_flags & PFDOCK) - if (players[j->p_docked].p_armies == 0) + if (players[j->p_dock_with].p_armies < 1) continue; - if (j->p_armies == j->p_ship.s_maxarmies) + if (j->p_armies >= j->p_ship.s_maxarmies) continue; /* XXX */ if (j->p_ship.s_type == ASSAULT) { @@ -2969,13 +2961,13 @@ } #endif } else if (j->p_flags & PFDOCK) { - players[j->p_docked].p_armies--; - army_track(AMT_TRANSUP, j, &players[j->p_docked], 1); + struct player *base = bay_owner(j); + base->p_armies--; + army_track(AMT_TRANSUP, j, base, 1); #ifdef LTD_STATS - /* j = player, j->pdocked = friendly SB */ if (status->tourn) { - ltd_update_armies_carried(j, &players[j->p_docked]); + ltd_update_armies_carried(j, base); } #endif @@ -3242,18 +3234,18 @@ } } else if (j->p_flags & PFDOCK) { - if (players[j->p_docked].p_team != j->p_team) + struct player *base = bay_owner(j); + if (base->p_team != j->p_team) continue; - if (players[j->p_docked].p_armies - == players[j->p_docked].p_ship.s_maxarmies) { + if (base->p_armies >= base->p_ship.s_maxarmies) { continue; } else { - army_track(AMT_TRANSDOWN, j, &players[j->p_docked], 1); + army_track(AMT_TRANSDOWN, j, base, 1); j->p_armies--; - players[j->p_docked].p_armies ++; + base->p_armies ++; #ifdef LTD_STATS if (status->tourn) { - ltd_update_armies_ferried(j, &players[j->p_docked]); + ltd_update_armies_ferried(j, base); } #endif /* LTD_STATS */ Index: socket.c =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/ntserv/socket.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- socket.c 10 Apr 2006 04:24:51 -0000 1.4 +++ socket.c 10 Apr 2006 10:56:33 -0000 1.5 @@ -1213,12 +1213,8 @@ if (packet->state) { orbit(); } else { + bay_release(me); me->p_flags &= ~PFORBIT; - if (me->p_flags & PFDOCK) { - players[me->p_docked].p_docked--; - players[me->p_docked].p_port[me->p_port[0]] = VACANT; - me->p_flags &= ~PFDOCK; - } } } @@ -1402,21 +1398,15 @@ return; } if (target<0 || target>=MAXPLAYER || target==me->p_no) return; - player= &players[target]; + player = &players[target]; if (player->p_flags & PFCLOAK) return; if (hypot((double) me->p_x-player->p_x, (double) me->p_y-player->p_y) < ((double) TRACTDIST) * me->p_ship.s_tractrng) { - if (player->p_flags & PFDOCK) { - players[player->p_docked].p_port[player->p_port[0]] = VACANT; - players[player->p_docked].p_docked--; - } - if (me->p_flags & PFDOCK) { - players[me->p_docked].p_docked--; - players[me->p_docked].p_port[me->p_port[0]] = VACANT; - } - player->p_flags &= ~(PFORBIT | PFDOCK); - me->p_flags &= ~(PFORBIT | PFDOCK); + bay_release(player); + bay_release(me); + player->p_flags &= ~PFORBIT; + me->p_flags &= ~PFORBIT; me->p_tractor = target; me->p_flags |= PFTRACT; } else { @@ -1448,16 +1438,10 @@ if (hypot((double) me->p_x-player->p_x, (double) me->p_y-player->p_y) < ((double) TRACTDIST) * me->p_ship.s_tractrng) { - if (player->p_flags & PFDOCK) { - players[player->p_docked].p_port[player->p_port[0]] = VACANT; - players[player->p_docked].p_docked--; - } - if (me->p_flags & PFDOCK) { - players[me->p_docked].p_docked--; - players[me->p_docked].p_port[me->p_port[0]] = VACANT; - } - player->p_flags &= ~(PFORBIT | PFDOCK); - me->p_flags &= ~(PFORBIT | PFDOCK); + bay_release(player); + bay_release(me); + player->p_flags &= ~PFORBIT; + me->p_flags &= ~PFORBIT; me->p_tractor = target; me->p_flags |= (PFTRACT | PFPRESS); } else { @@ -1736,16 +1720,12 @@ int i; if (me->p_ship.s_type == STARBASE) { - me->p_docked = 0; - for (i=0; ip_port[i] != VACANT) - players[me->p_port[i]].p_flags &= ~PFDOCK; - me->p_port[i] = VACANT; - } - if (packet->state) - me->p_flags |= PFDOCKOK; - else - me->p_flags &= ~PFDOCKOK; + if (packet->state) { + me->p_flags |= PFDOCKOK; + } else { + me->p_flags &= ~PFDOCKOK; + bay_release_all(me); + } } } Index: interface.c =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/ntserv/interface.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- interface.c 22 Feb 2006 09:18:30 -0000 1.3 +++ interface.c 10 Apr 2006 10:56:32 -0000 1.4 @@ -29,21 +29,15 @@ speed=0; } me->p_desspeed = speed; - if (me->p_flags & PFDOCK) { - players[me->p_docked].p_docked--; - players[me->p_docked].p_port[me->p_port[0]] = VACANT; - } - me->p_flags &= ~(PFREPAIR | PFBOMB | PFORBIT | PFDOCK | PFBEAMUP | PFBEAMDOWN); + bay_release(me); + me->p_flags &= ~(PFREPAIR | PFBOMB | PFORBIT | PFBEAMUP | PFBEAMDOWN); } void set_course(u_char dir) { me->p_desdir = dir; - if (me->p_flags & PFDOCK) { - players[me->p_docked].p_docked--; - players[me->p_docked].p_port[me->p_port[0]] = VACANT; - } - me->p_flags &= ~(PFBOMB | PFORBIT | PFDOCK | PFBEAMUP | PFBEAMDOWN); + bay_release(me); + me->p_flags &= ~(PFBOMB | PFORBIT | PFBEAMUP | PFBEAMDOWN); } void shield_up(void) @@ -156,7 +150,7 @@ return; } } else if (me->p_flags & PFDOCK) { - if (me->p_team != players[me->p_docked].p_team) { + if (me->p_team != players[me->p_dock_with].p_team) { new_warning(46,"Comm Officer: We're not authorized to beam foriegn troops on board!"); return; } @@ -185,7 +179,7 @@ #endif if (me->p_flags & PFDOCK) { - if (me->p_team != players[me->p_docked].p_team) { + if (me->p_team != players[me->p_dock_with].p_team) { new_warning(48,"Comm Officer: Starbase refuses permission to beam our troops over."); return; } @@ -312,16 +306,10 @@ if (hypot((double) me->p_x-victim->p_x, (double) me->p_y-victim->p_y) < ((double) TRACTDIST) * me->p_ship.s_tractrng) { - if (victim->p_flags & PFDOCK) { - players[victim->p_docked].p_port[victim->p_port[0]] = VACANT; - players[victim->p_docked].p_docked--; - } - if (me->p_flags & PFDOCK) { - players[me->p_docked].p_docked--; - players[me->p_docked].p_port[me->p_port[0]] = VACANT; - } - victim->p_flags &= ~(PFORBIT | PFDOCK); - me->p_flags &= ~(PFORBIT | PFDOCK); + bay_release(victim); + bay_release(me); + victim->p_flags &= ~PFORBIT; + me->p_flags &= ~PFORBIT; me->p_tractor = player; me->p_flags |= PFTRACT; } else { /* out of range */ @@ -357,14 +345,8 @@ if (hypot((double) me->p_x-victim->p_x, (double) me->p_y-victim->p_y) < ((double) TRACTDIST) * me->p_ship.s_tractrng) { - if (victim->p_flags & PFDOCK) { - players[victim->p_docked].p_port[victim->p_port[0]] = VACANT; - players[victim->p_docked].p_docked--; - } - if (me->p_flags & PFDOCK) { - players[me->p_docked].p_docked--; - players[me->p_docked].p_port[me->p_port[0]] = VACANT; - } + bay_release(victim); + bay_release(me); victim->p_flags &= ~(PFORBIT | PFDOCK); me->p_flags &= ~(PFORBIT | PFDOCK); me->p_tractor = target; @@ -408,21 +390,18 @@ sendwarn("Orions", mask & ORI, ORI); } if (me->p_flags & PFDOCK) { - if (players[me->p_docked].p_team & mask) { - players[me->p_docked].p_port[me->p_port[0]] = VACANT; - players[me->p_docked].p_docked--; - me->p_flags &= ~PFDOCK; + if (players[me->p_dock_with].p_team & mask) { + /* release ship from starbase that is now hostile */ + bay_release(me); } - } else if (me->p_ship.s_type == STARBASE) { - if (me->p_docked > 0) { - for(i=0; ip_port[i] == VACANT) /* isae -- Ted's fix */ - continue; - if (mask & players[me->p_port[i]].p_team) { - players[me->p_port[i]].p_flags &= ~PFDOCK; - me->p_docked--; - me->p_port[i] = VACANT; - } + } + if (me->p_ship.s_type == STARBASE) { + for(i=0; ip_bays[i] == VACANT) + continue; + if (mask & players[me->p_bays[i]].p_team) { + /* release docked ships that are now hostile */ + bay_release(&players[me->p_bays[i]]); } } } @@ -486,7 +465,7 @@ new_warning(52,"Can only refit to starbase on your home planet."); return; } - if (players[me->p_docked].p_team != me->p_team) { + if (players[me->p_dock_with].p_team != me->p_team) { new_warning(53,"You must dock YOUR starbase to apply for command reassignment!"); return; } @@ -573,12 +552,7 @@ /* Reset kills to 0.0 */ me->p_kills=0; /* bump all docked ships */ - for (i=0; ip_port[i] != VACANT) { - players[me->p_port[i]].p_flags &= ~PFDOCK; - me->p_docked--; - me->p_port[i] = VACANT; - } + bay_release_all(me); me->p_flags |= PFDOCKOK; } @@ -622,8 +596,7 @@ me->p_etime = 0; me->p_ship.s_type = type; if (type == STARBASE) { - me->p_docked = 0; - for (i=0; i<4; i++) me->p_port[i] = VACANT; + bay_init(me); me->p_flags |= PFDOCKOK; } From quozl at users.sourceforge.net Mon Apr 10 05:56:35 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Mon, 10 Apr 2006 10:56:35 +0000 Subject: [netrek-cvs] server/Vanilla/tools Makefile.in, 1.4, 1.5 xtkill.c, 1.4, 1.5 Message-ID: Update of /cvsroot/netrek/server/Vanilla/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26876/tools Modified Files: Makefile.in xtkill.c Log Message: bays Index: Makefile.in =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/tools/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile.in 22 Feb 2006 09:18:30 -0000 1.4 +++ Makefile.in 10 Apr 2006 10:56:33 -0000 1.5 @@ -21,14 +21,10 @@ TOOLDIR= $(LIBDIR)/tools -GETPATH = ../ntserv/getpath.o ../ntserv/data.o - LINTFLAGS = -habxc $(EXTRAINCS) $(FLAGS) -# Memory Objects - -M_OBJS = ../ntserv/data.o ../ntserv/openmem.o ../ntserv/ltd_stats.o - +OBJS_SHM = ../ntserv/data.o ../ntserv/openmem.o ../ntserv/ltd_stats.o +OBJS_PATH = ../ntserv/getpath.o ../ntserv/data.o SRCS = ${srcdir}/blotpassword.c ${srcdir}/loadchecker.c ${srcdir}/mess.c \ ${srcdir}/mergescores.c \ @@ -43,7 +39,7 @@ ${srcdir}/conq_vert.c ${srcdir}/../ntserv/slotmaint.c $(RANDOMC) \ ${srcdir}/sortdb.c ${srcdir}/../robots/roboshar.c \ ${srcdir}/../ntserv/smessage.c ${srcdir}/ntpasswd.c \ - ${srcdir}/../ntserv/salt.c + ${srcdir}/../ntserv/salt.c ${srcdir}/../ntserv/bay.c EXECS = blotpassword loadchecker mess message newscores planets players \ scores \ @@ -93,85 +89,80 @@ # cb_sock.o: packets.h ../ntserv/socket.c # $(CC) -o ./cb_sock.o -g $(CFLAGS) -DCAMBOT -c ../ntserv/socket.c -cambot: cambot.o $(M_OBJS) $(GETPATH) - $(CC) -o $@ $(CFLAGS) ${LDFLAGS} cambot.o ../ntserv/genspkt.o ../ntserv/sysdefaults.o ../ntserv/getship.o ../ntserv/warning.o ../ntserv/smessage.o ../ntserv/distress.o ../ntserv/util.o $(M_OBJS) ../ntserv/getpath.o $(RSA_LIB) +cambot: cambot.o $(OBJS_SHM) $(OBJS_PATH) + $(CC) -o $@ $(CFLAGS) ${LDFLAGS} cambot.o ../ntserv/genspkt.o ../ntserv/sysdefaults.o ../ntserv/getship.o ../ntserv/warning.o ../ntserv/smessage.o ../ntserv/distress.o ../ntserv/util.o $(OBJS_SHM) ../ntserv/getpath.o $(RSA_LIB) sortdb: sortdb.o $(CC) -o $@ $(CFLAGS) ${LDFLAGS} sortdb.o -ntpasswd: ntpasswd.o $(GETPATH) ../ntserv/salt.o - $(CC) -o $@ $(CFLAGS) ${LDFLAGS} ntpasswd.o $(GETPATH) ../ntserv/salt.o $(LIBCRYPT) +ntpasswd: ntpasswd.o $(OBJS_PATH) ../ntserv/salt.o + $(CC) -o $@ $(CFLAGS) ${LDFLAGS} ntpasswd.o $(OBJS_PATH) ../ntserv/salt.o $(LIBCRYPT) -loadchecker: loadchecker.o $(M_OBJS) - $(CC) -o $@ $(CFLAGS) ${LDFLAGS} loadchecker.o $(M_OBJS) $(LIBS) +loadchecker: loadchecker.o $(OBJS_SHM) + $(CC) -o $@ $(CFLAGS) ${LDFLAGS} loadchecker.o $(OBJS_SHM) $(LIBS) -mess: mess.o $(M_OBJS) - $(CC) -o $@ $(CFLAGS) ${LDFLAGS} mess.o $(M_OBJS) $(LIBS) +mess: mess.o $(OBJS_SHM) + $(CC) -o $@ $(CFLAGS) ${LDFLAGS} mess.o $(OBJS_SHM) $(LIBS) -message: message.o $(M_OBJS) - $(CC) -o $@ $(CFLAGS) ${LDFLAGS} message.o $(M_OBJS) $(LIBS) +message: message.o $(OBJS_SHM) + $(CC) -o $@ $(CFLAGS) ${LDFLAGS} message.o $(OBJS_SHM) $(LIBS) -mergescores: mergescores.o $(GETPATH) - $(CC) -o $@ $(CFLAGS) ${LDFLAGS} mergescores.o $(GETPATH) $(LIBS) +mergescores: mergescores.o $(OBJS_PATH) + $(CC) -o $@ $(CFLAGS) ${LDFLAGS} mergescores.o $(OBJS_PATH) $(LIBS) -newscores: newscores.o $(GETPATH) - $(CC) -o $@ $(CFLAGS) ${LDFLAGS} newscores.o $(GETPATH) $(LIBS) +newscores: newscores.o $(OBJS_PATH) + $(CC) -o $@ $(CFLAGS) ${LDFLAGS} newscores.o $(OBJS_PATH) $(LIBS) -planets: planets.o $(M_OBJS) - $(CC) -o $@ $(CFLAGS) ${LDFLAGS} planets.o $(M_OBJS) $(LIBS) +planets: planets.o $(OBJS_SHM) + $(CC) -o $@ $(CFLAGS) ${LDFLAGS} planets.o $(OBJS_SHM) $(LIBS) -players: players.o $(M_OBJS) $(RANDOMO) - $(CC) -o $@ $(CFLAGS) ${LDFLAGS} players.o $(M_OBJS) $(RANDOMO) $(LIBS) +players: players.o $(OBJS_SHM) $(RANDOMO) + $(CC) -o $@ $(CFLAGS) ${LDFLAGS} players.o $(OBJS_SHM) $(RANDOMO) $(LIBS) -nuke: nuke.o $(M_OBJS) $(RANDOMO) - $(CC) -o $@ $(CFLAGS) ${LDFLAGS} nuke.o $(M_OBJS) $(RANDOMO) $(LIBS) +nuke: nuke.o $(OBJS_SHM) $(RANDOMO) + $(CC) -o $@ $(CFLAGS) ${LDFLAGS} nuke.o $(OBJS_SHM) $(RANDOMO) $(LIBS) -# some weird problem with the MIPS RISC compiler for DECstations... -# gcc seems to compile working executables (TC) -# -scores: scores.o $(GETPATH) - $(CC) -o $@ $(CFLAGS) ${LDFLAGS} scores.o $(GETPATH) $(LIBS) ../ntserv/ltd_stats.o -# gcc -o $@ $(CFLAGS) -g scores.o -L/usr/users/terence/lib -# cp scores /usr/users/terence/bin/trekscores +scores: scores.o $(OBJS_PATH) + $(CC) -o $@ $(CFLAGS) ${LDFLAGS} scores.o $(OBJS_PATH) $(LIBS) ../ntserv/ltd_stats.o -setgalaxy: setgalaxy.o $(RANDOMO) $(M_OBJS) - $(CC) -o $@ $(CFLAGS) ${LDFLAGS} setgalaxy.o $(RANDOMO) $(M_OBJS) $(LIBS) +setgalaxy: setgalaxy.o $(RANDOMO) $(OBJS_SHM) + $(CC) -o $@ $(CFLAGS) ${LDFLAGS} setgalaxy.o $(RANDOMO) $(OBJS_SHM) $(LIBS) -showgalaxy: showgalaxy.o ../ntserv/distress.o $(M_OBJS) - $(CC) -o $@ $(CFLAGS) ${LDFLAGS} showgalaxy.o ../ntserv/distress.o $(M_OBJS) $(LIBS) $(LIBCURSES) $(LIBTERMCAP) +showgalaxy: showgalaxy.o ../ntserv/distress.o $(OBJS_SHM) + $(CC) -o $@ $(CFLAGS) ${LDFLAGS} showgalaxy.o ../ntserv/distress.o $(OBJS_SHM) $(LIBS) $(LIBCURSES) $(LIBTERMCAP) -stat: stat.o $(M_OBJS) - $(CC) -o $@ $(CFLAGS) ${LDFLAGS} stat.o $(M_OBJS) $(LIBS) +stat: stat.o $(OBJS_SHM) + $(CC) -o $@ $(CFLAGS) ${LDFLAGS} stat.o $(OBJS_SHM) $(LIBS) blotpassword: blotpassword.o - $(CC) -o $@ $(CFLAGS) ${LDFLAGS} blotpassword.o $(GETPATH) $(LIBS) + $(CC) -o $@ $(CFLAGS) ${LDFLAGS} blotpassword.o $(OBJS_PATH) $(LIBS) -trimscores: trimscores.o $(GETPATH) - $(CC) -o $@ $(CFLAGS) ${LDFLAGS} trimscores.o $(GETPATH) $(LIBS) +trimscores: trimscores.o $(OBJS_PATH) + $(CC) -o $@ $(CFLAGS) ${LDFLAGS} trimscores.o $(OBJS_PATH) $(LIBS) -watchmes: watchmes.o ../ntserv/distress.o $(M_OBJS) - $(CC) $(CFLAGS) ${LDFLAGS} watchmes.o ../ntserv/distress.o $(M_OBJS) $(LIBS) -o $@ +watchmes: watchmes.o ../ntserv/distress.o $(OBJS_SHM) + $(CC) $(CFLAGS) ${LDFLAGS} watchmes.o ../ntserv/distress.o $(OBJS_SHM) $(LIBS) -o $@ -xtkill: xtkill.o $(GETPATH) ../ntserv/getship.o ../ntserv/openmem.o ../ntserv/slotmaint.o ../ntserv/ltd_stats.o - $(CC) -o $@ $(CFLAGS) ${LDFLAGS} xtkill.o ../ntserv/getship.o ../ntserv/openmem.o ../ntserv/slotmaint.o ../ntserv/ltd_stats.o $(GETPATH) $(LIBS) +xtkill: xtkill.o $(OBJS_SHM) $(OBJS_PATH) ../ntserv/getship.o ../ntserv/slotmaint.o ../ntserv/ltd_stats.o ../ntserv/bay.o + $(CC) -o $@ $(CFLAGS) ${LDFLAGS} xtkill.o ../ntserv/getship.o ../ntserv/openmem.o ../ntserv/slotmaint.o ../ntserv/ltd_stats.o ../ntserv/bay.o $(OBJS_PATH) $(LIBS) -keyman: keyman.o $(GETPATH) - $(CC) -o $@ $(CFLAGS) ${LDFLAGS} keyman.o $(GETPATH) $(LIBS) +keyman: keyman.o $(OBJS_PATH) + $(CC) -o $@ $(CFLAGS) ${LDFLAGS} keyman.o $(OBJS_PATH) $(LIBS) -fun: $(RANDOMO) fun.o $(M_OBJS) - $(CC) -o $@ $(CFLAGS) ${LDFLAGS} fun.o $(RANDOMO) $(M_OBJS) $(LIBS) +fun: $(RANDOMO) fun.o $(OBJS_SHM) + $(CC) -o $@ $(CFLAGS) ${LDFLAGS} fun.o $(RANDOMO) $(OBJS_SHM) $(LIBS) -convert: $(GETPATH) convert.o - $(CC) -o $@ $(CFLAGS) ${LDFLAGS} convert.o $(GETPATH) $(LIBS) +convert: $(OBJS_PATH) convert.o + $(CC) -o $@ $(CFLAGS) ${LDFLAGS} convert.o $(OBJS_PATH) $(LIBS) -updated: update.o $(GETPATH) - $(CC) $(CFLAGS) ${LDFLAGS} -o updated update.o ../ntserv/ltd_stats.o $(GETPATH) $(EXTRALIBS) +updated: update.o $(OBJS_PATH) + $(CC) $(CFLAGS) ${LDFLAGS} -o updated update.o ../ntserv/ltd_stats.o $(OBJS_PATH) $(EXTRALIBS) ltd_dump: ltd_dump.o - $(CC) $(CFLAGS) ${LDFLAGS} -o ltd_dump ltd_dump.o ../ntserv/ltd_stats.o $(GETPATH) + $(CC) $(CFLAGS) ${LDFLAGS} -o ltd_dump ltd_dump.o ../ntserv/ltd_stats.o $(OBJS_PATH) ltd_convert: ltd_convert.o - $(CC) $(CFLAGS) ${LDFLAGS} -o ltd_convert ltd_convert.o ../ntserv/ltd_stats.o $(GETPATH) + $(CC) $(CFLAGS) ${LDFLAGS} -o ltd_convert ltd_convert.o ../ntserv/ltd_stats.o $(OBJS_PATH) conq_vert: conq_vert.o $(CC) -o $@ $(CFLAGS) ${LDFLAGS} conq_vert.o Index: xtkill.c =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/tools/xtkill.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- xtkill.c 10 Apr 2006 04:24:51 -0000 1.4 +++ xtkill.c 10 Apr 2006 10:56:33 -0000 1.5 @@ -34,14 +34,8 @@ me->p_desspeed = me->p_ship.s_maxspeed; /* bump all docked ships */ - for (i=0; ip_port[i] != VACANT) { - players[me->p_port[i]].p_flags &= ~PFDOCK; - me->p_docked--; - me->p_port[i] = VACANT; - me->p_flags |= PFDOCKOK; - } - + bay_release_all(me); + me->p_flags |= PFDOCKOK; } int main(int argc, char **argv) @@ -258,11 +252,8 @@ me->p_flags &= ~PFCLOAK; /* set speed 0 */ me->p_desspeed = 0; - if (me->p_flags & PFDOCK) { - players[me->p_docked].p_docked--; - players[me->p_docked].p_port[me->p_port[0]] = VACANT; - } - me->p_flags &= ~(PFREPAIR | PFBOMB | PFORBIT | PFDOCK | PFBEAMUP | PFBEAMDOWN); + bay_release(me); + me->p_flags &= ~(PFREPAIR | PFBOMB | PFORBIT | PFBEAMUP | PFBEAMDOWN); /* make unable to act */ players[player].p_flags |= PFTWARP; /* show as puck */ From quozl at users.sourceforge.net Mon Apr 10 05:56:35 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Mon, 10 Apr 2006 10:56:35 +0000 Subject: [netrek-cvs] server/Vanilla/robotd defs.h, 1.2, 1.3 struct.h, 1.1, 1.2 Message-ID: Update of /cvsroot/netrek/server/Vanilla/robotd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26876/robotd Modified Files: defs.h struct.h Log Message: bays Index: defs.h =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/robotd/defs.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- defs.h 28 Sep 2005 12:14:05 -0000 1.2 +++ defs.h 10 Apr 2006 10:56:33 -0000 1.3 @@ -40,7 +40,6 @@ #define DOCKDIST 600 #define DOCKSPEED 2 /* If base is moving, there will be some finesse involved to dock */ -#define NUMPORTS 4 #define SBFUELMIN 10000 /* If starbase's fuel is less than this, it will not refuel docked vessels */ #define TRACTDIST 6000 /* maximum effective tractor beam range */ Index: struct.h =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/robotd/struct.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- struct.h 21 Mar 2005 05:23:45 -0000 1.1 +++ struct.h 10 Apr 2006 10:56:33 -0000 1.2 @@ -199,9 +199,6 @@ short p_planets; /* planets taken this game */ short p_armsbomb; /* armies bombed this game */ int p_ghostbuster; - int p_docked; /* If starbase, # docked to, else pno base host */ - int p_port[4]; /* If starbase, pno of ship docked to that port, - else p_port[0] = port # docked to on host. */ short p_tractor; /* What player is in tractor lock */ int p_pos; /* My position in the player file */ }; From quozl at users.sourceforge.net Mon Apr 10 05:56:35 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Mon, 10 Apr 2006 10:56:35 +0000 Subject: [netrek-cvs] server/Vanilla/robots Makefile.in,1.2,1.3 Message-ID: Update of /cvsroot/netrek/server/Vanilla/robots In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26876/robots Modified Files: Makefile.in Log Message: bays Index: Makefile.in =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/robots/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile.in 21 Mar 2005 10:17:18 -0000 1.2 +++ Makefile.in 10 Apr 2006 10:56:33 -0000 1.3 @@ -30,7 +30,8 @@ ../ntserv/orbit.o ../ntserv/phaser.o ../ntserv/sintab.o \ ../ntserv/openmem.o sysdefaults.o ../ntserv/torp.o \ ../ntserv/util.o $(RANDOMO) ../ntserv/getpath.o ../ntserv/smessage.o \ - roboshar.o ../ntserv/slotmaint.o ../ntserv/distress.o ../ntserv/ltd_stats.o + roboshar.o ../ntserv/slotmaint.o ../ntserv/distress.o \ + ../ntserv/ltd_stats.o ../ntserv/bay.o # Puck Objects From quozl at users.sourceforge.net Mon Apr 10 05:56:33 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Mon, 10 Apr 2006 10:56:33 +0000 Subject: [netrek-cvs] server/Vanilla/include defs.h, 1.3, 1.4 proto.h, 1.3, 1.4 struct.h, 1.3, 1.4 Message-ID: Update of /cvsroot/netrek/server/Vanilla/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26876/include Modified Files: defs.h proto.h struct.h Log Message: bays Index: defs.h =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/include/defs.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- defs.h 28 Sep 2005 12:14:05 -0000 1.3 +++ defs.h 10 Apr 2006 10:56:31 -0000 1.4 @@ -134,7 +134,7 @@ #define DOCKDIST 600 #define DOCKSPEED 2 /* If base is moving, there will be some finesse involved to dock */ -#define NUMPORTS 4 +#define NUMBAYS 4 /* number of docking bays a starbase has */ #define SBFUELMIN 10000 /* If starbase's fuel is less than this, it will not refuel docked vessels */ #define TRACTDIST 6000 /* maximum effective tractor beam range */ Index: struct.h =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/include/struct.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- struct.h 10 Apr 2006 04:24:51 -0000 1.3 +++ struct.h 10 Apr 2006 10:56:31 -0000 1.4 @@ -370,9 +370,14 @@ short p_planets; /* planets taken this game */ short p_armsbomb; /* armies bombed this game */ int p_ghostbuster; - int p_docked; /* If starbase, # docked to, else pno base host */ - int p_port[4]; /* If starbase, pno of ship docked to that port, - else p_port[0] = port # docked to on host. */ + + /* for starbases, if PFDOCKOK set */ + int p_bays[NUMBAYS]; /* p_no of each docked ship, or VACANT */ + + /* for ships other than starbases, if p_flags PFDOCK set */ + int p_dock_with; /* p_no of starbase we are docked with */ + int p_dock_bay; /* bay of starbase we are docked with */ + short p_tractor; /* What player is in tractor lock */ int p_pos; /* My position in the player file */ int w_queue; /* Waitqueue of my team */ Index: proto.h =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/include/proto.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- proto.h 15 Jun 2005 22:55:25 -0000 1.3 +++ proto.h 10 Apr 2006 10:56:31 -0000 1.4 @@ -6,6 +6,15 @@ #ifndef __INCLUDED_proto_h__ #define __INCLUDED_proto_h__ +/* bay.c */ +void bay_consistency_check(struct player *base); +struct player *bay_owner(struct player *me); +void bay_claim(struct player *base, struct player *me, int bay_no); +void bay_release(struct player *me); +void bay_release_all(struct player *base); +void bay_init(struct player *me); +int bay_closest(struct player *base, LONG dx, LONG dy); + /* cluecheck.c */ void clue_check(void); From quozl at users.sourceforge.net Mon Apr 10 05:56:33 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Mon, 10 Apr 2006 10:56:33 +0000 Subject: [netrek-cvs] server/Vanilla ChangeLog,1.15,1.16 Message-ID: Update of /cvsroot/netrek/server/Vanilla In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26876 Modified Files: ChangeLog Log Message: bays Index: ChangeLog =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/ChangeLog,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ChangeLog 10 Apr 2006 10:30:44 -0000 1.15 +++ ChangeLog 10 Apr 2006 10:56:30 -0000 1.16 @@ -1,3 +1,32 @@ +Mon Apr 10 20:41:52 2006 James Cameron + + * struct.h: deprecate p_docked and p_ports in favour of + p_dock_with, p_dock_bay, and p_bays, removing overloaded use. + + * proto.h, bay.c: add functions for starbase bay + maintenance and crosscheck. + + * daemon.c: adopt new starbase bay maintenance, calculate etemp + based on number of bays in use rather than using a separate + counter, change some army count checks to prevent abuse. + + * enter.c, interface.c, orbit.c, redraw.c, socket.c: adopt new + starbase bay maintenance. + + * ntscmds.c: release starbase bay on eject ... vicious eject + prevents the explosion from running through the daemon logic, + resulting in inconsistency. Reported by: William Balcerski + + * xtkill.c: release starbase bay on intervention. + +Mon Apr 10 20:40:32 2006 James Cameron + + * util.c: remove unnecessary includes. + +Mon Apr 10 20:38:15 2006 James Cameron + + * main.c: fix compilation error on initialisation of p_ip. + Mon Apr 10 20:12:19 2006 James Cameron * robots/inl.c (checkmess): fix compilation warning by renaming From quozl at users.sourceforge.net Mon Apr 10 06:57:02 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Mon, 10 Apr 2006 11:57:02 +0000 Subject: [netrek-cvs] server/Vanilla/ntserv ntscmds.c,1.5,1.6 Message-ID: Update of /cvsroot/netrek/server/Vanilla/ntserv In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18413/ntserv Modified Files: ntscmds.c Log Message: voting array sizing Index: ntscmds.c =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/ntserv/ntscmds.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ntscmds.c 10 Apr 2006 10:56:32 -0000 1.5 +++ ntscmds.c 10 Apr 2006 11:57:00 -0000 1.6 @@ -189,52 +189,55 @@ C_VC_TEAM | C_GLOG | C_PLAYER | C_PR_INPICKUP, "Eject a player e.g. 'EJECT 0 IDLE'", do_player_eject, /* EJECT */ - 2, 0, 120, 600}, + 2, PV_EJECT, 120, 600}, #endif #if defined(TRIPLE_PLANET_MAYHEM) { "TRIPLE", C_VC_ALL | C_GLOG | C_PR_INPICKUP, "Start triple planet mayhem by vote", do_triple_planet_mayhem, - 2, 22, 0}, + 2, PV_OTHER, 0}, { "BALANCE", C_VC_ALL | C_GLOG | C_PR_INPICKUP, "Request team randomise & balance", do_balance, - 4, 23, 0 }, + 4, PV_OTHER+1, 0 }, #endif #if defined(AUTO_INL) { "INL", C_VC_ALL | C_GLOG | C_PR_INPICKUP, "Start game under INL rules.", do_start_inl, - 1, 20, 0 }, + 1, PV_OTHER+2, 0 }, #endif #if defined(AUTO_PRACTICE) { "PRACTICE", C_VC_ALL | C_PR_INPICKUP, "Start basepractice by majority vote.", do_start_basep, - 1, 20, 0 }, + 1, PV_OTHER+3, 0 }, #endif #if defined(AUTO_HOCKEY) { "HOCKEY", C_VC_ALL | C_GLOG | C_PR_INPICKUP, "Start hockey by majority vote.", do_start_puck, - 1, 20, 0 }, + 1, PV_OTHER+4, 0 }, #endif #if defined(AUTO_DOGFIGHT) { "DOGFIGHT", C_VC_ALL | C_GLOG | C_PR_INPICKUP, "Start dogfight tournament by majority vote.", do_start_mars, - 1, 20, 0 }, + 1, PV_OTHER+5, 0 }, #endif #endif /* VOTING */ + /* crosscheck, last voting array element used (PV_OTHER+n) must + not exceed PV_TOTAL, see include/defs.h */ + { NULL } - }; +}; int check_command(struct message *mess) { @@ -308,9 +311,9 @@ void do_start_basep(void) { if (vfork() == 0) { - (void) SIGNAL(SIGALRM,SIG_DFL); - execl(Basep, "basep", 0); - perror(Basep); + (void) SIGNAL(SIGALRM,SIG_DFL); + execl(Basep, "basep", 0); + perror(Basep); } } #endif From quozl at users.sourceforge.net Mon Apr 10 06:57:02 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Mon, 10 Apr 2006 11:57:02 +0000 Subject: [netrek-cvs] server/Vanilla/include defs.h,1.4,1.5 Message-ID: Update of /cvsroot/netrek/server/Vanilla/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18413/include Modified Files: defs.h Log Message: voting array sizing Index: defs.h =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/include/defs.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- defs.h 10 Apr 2006 10:56:31 -0000 1.4 +++ defs.h 10 Apr 2006 11:57:00 -0000 1.5 @@ -64,7 +64,11 @@ the rest obs slots */ #ifdef VOTING -#define PV_TOTAL MAXPLAYER /* total number of votable slots */ +#define PV_EXTRA 8 /* # of non-eject vote types */ +#define PV_TOTAL MAXPLAYER+PV_EXTRA /* total number of voting slots */ +#define PV_EJECT 0 /* array base for eject votes */ +#define PV_OTHER MAXPLAYER /* array base for non-eject votes */ +/* see ntserv/ntscmds.c for array */ #endif #if defined(NEWBIESERVER) || defined(PRETSERVER) From quozl at users.sourceforge.net Mon Apr 10 06:57:02 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Mon, 10 Apr 2006 11:57:02 +0000 Subject: [netrek-cvs] server/Vanilla ChangeLog,1.16,1.17 Message-ID: Update of /cvsroot/netrek/server/Vanilla In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18413 Modified Files: ChangeLog Log Message: voting array sizing Index: ChangeLog =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/ChangeLog,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- ChangeLog 10 Apr 2006 10:56:30 -0000 1.16 +++ ChangeLog 10 Apr 2006 11:57:00 -0000 1.17 @@ -1,3 +1,8 @@ +Mon Apr 10 21:31:33 2006 James Cameron + + * defs.h, ntscmds.c (nts_commands): reallocate voting array sizes. + Reported by: William Balcerski. + Mon Apr 10 20:41:52 2006 James Cameron * struct.h: deprecate p_docked and p_ports in favour of From modemhero at users.sourceforge.net Tue Apr 11 23:03:43 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 04:03:43 +0000 Subject: [netrek-cvs] client/netrekxp/src/winkey - New directory Message-ID: Update of /cvsroot/netrek/client/netrekxp/src/winkey In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1702/winkey Log Message: Directory /cvsroot/netrek/client/netrekxp/src/winkey added to the repository From modemhero at users.sourceforge.net Tue Apr 11 23:07:06 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 04:07:06 +0000 Subject: [netrek-cvs] client/netrekxp/resources/sounds - New directory Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/sounds In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4574/sounds Log Message: Directory /cvsroot/netrek/client/netrekxp/resources/sounds added to the repository From modemhero at users.sourceforge.net Tue Apr 11 23:06:55 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 04:06:55 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp - New directory Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4384/htmlhelp Log Message: Directory /cvsroot/netrek/client/netrekxp/resources/htmlhelp added to the repository From modemhero at users.sourceforge.net Tue Apr 11 23:20:05 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 04:20:05 +0000 Subject: [netrek-cvs] client/netrekxp build.cmd, 1.1.1.1, 1.2 clientr.dsp, 1.1.1.1, 1.2 compile.txt, 1.1.1.1, 1.2 Message-ID: Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14821 Modified Files: build.cmd clientr.dsp compile.txt Log Message: Update to version 4.4.0.3 Index: clientr.dsp =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.dsp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- clientr.dsp 21 Jan 2003 21:27:53 -0000 1.1.1.1 +++ clientr.dsp 12 Apr 2006 04:20:03 -0000 1.2 @@ -42,7 +42,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "win32" /I "win32\h" /I "include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "RSA" /FR /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "win32" /I "win32\h" /I "include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "RSA" /D "_CONSOLE" /FR /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -50,7 +50,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 libcmt.lib user32.lib gdi32.lib wsock32.lib kernel32.lib winmm.lib mpr.lib msvcrt.lib libgmp.lib /nologo /subsystem:console /machine:I386 /nodefaultlib /out:"\netrek_files\netrek\netrek.exe" /libpath:"win32/lib" +# ADD LINK32 libcmt.lib user32.lib gdi32.lib wsock32.lib kernel32.lib shell32.lib winmm.lib mpr.lib msvcrt.lib libgmp.lib /nologo /subsystem:console /pdb:none /machine:I386 /nodefaultlib /out:"\netrek_files\netrek\netrek.exe" /libpath:"win32/lib" !ELSEIF "$(CFG)" == "clientr - Win32 Debug" @@ -66,7 +66,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /Gm /GX /ZI /Od /I "win32" /I "win32\h" /I "include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DEBUG" /D "RSA" /FR /YX /FD /c +# ADD CPP /nologo /MT /W3 /Gm /GX /ZI /Od /I "win32" /I "win32\h" /I "include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "DEBUG" /D "RSA" /D "_CONSOLE" /FR /YX /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -74,7 +74,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 libcmt.lib user32.lib gdi32.lib wsock32.lib kernel32.lib winmm.lib mpr.lib msvcrt.lib libgmp.lib /nologo /subsystem:console /profile /debug /machine:I386 /nodefaultlib /out:"\netrek_files\netrek\netrek.exe" /libpath:"win32/lib" +# ADD LINK32 libcmt.lib user32.lib gdi32.lib wsock32.lib kernel32.lib shell32.lib winmm.lib mpr.lib msvcrt.lib libgmp.lib /nologo /subsystem:console /profile /debug /machine:I386 /nodefaultlib /out:"\netrek_files\netrek\netrek.exe" /libpath:"win32/lib" /mapinfo:lines /mapinfo:exports !ENDIF @@ -159,6 +159,10 @@ # End Source File # Begin Source File +SOURCE=.\src\hintwin.c +# End Source File +# Begin Source File + SOURCE=.\src\inform.c # End Source File # Begin Source File @@ -391,10 +395,6 @@ # End Source File # Begin Source File -SOURCE=.\include\patchlevel.h -# End Source File -# Begin Source File - SOURCE=.\include\playerlist.h # End Source File # Begin Source File Index: compile.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/compile.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- compile.txt 21 Jan 2003 21:27:53 -0000 1.1.1.1 +++ compile.txt 12 Apr 2006 04:20:03 -0000 1.2 @@ -1,4 +1,4 @@ -This source tree was tested with MS Visual C++ 6.0 and Broland C Builder 5.5 +This source tree was tested with MS Visual C++ 6.0 and Borland C Builder 5.5 - Edit build.cmd to set following variables: Index: build.cmd =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/build.cmd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- build.cmd 21 Jan 2003 21:27:54 -0000 1.1.1.1 +++ build.cmd 12 Apr 2006 04:20:03 -0000 1.2 @@ -72,6 +72,67 @@ %MyCWD%\tools\imagemagick\montage -colors 256 -mode concatenate -tile 8x1 rom_sc.bmp rom_dd.bmp rom_ca.bmp rom_bb.bmp rom_as.bmp rom_sb.bmp rom_ga.bmp rom_at.bmp romship.bmp popd +pushd resources\ships\color1\fed +echo Making resources\ships\color1\fed... +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 fed_as01.bmp fed_as02.bmp fed_as03.bmp fed_as04.bmp fed_as05.bmp fed_as06.bmp fed_as07.bmp fed_as08.bmp fed_as09.bmp fed_as10.bmp fed_as11.bmp fed_as12.bmp fed_as13.bmp fed_as14.bmp fed_as15.bmp fed_as16.bmp fed_as17.bmp fed_as18.bmp fed_as19.bmp fed_as20.bmp fed_as21.bmp fed_as22.bmp fed_as23.bmp fed_as24.bmp fed_as25.bmp fed_as26.bmp fed_as27.bmp fed_as28.bmp fed_as29.bmp fed_as30.bmp fed_as31.bmp fed_as32.bmp fed_as.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 fed_at01.bmp fed_at02.bmp fed_at03.bmp fed_at04.bmp fed_at05.bmp fed_at06.bmp fed_at07.bmp fed_at08.bmp fed_at09.bmp fed_at10.bmp fed_at11.bmp fed_at12.bmp fed_at13.bmp fed_at14.bmp fed_at15.bmp fed_at16.bmp fed_at17.bmp fed_at18.bmp fed_at19.bmp fed_at20.bmp fed_at21.bmp fed_at22.bmp fed_at23.bmp fed_at24.bmp fed_at25.bmp fed_at26.bmp fed_at27.bmp fed_at28.bmp fed_at29.bmp fed_at30.bmp fed_at31.bmp fed_at32.bmp fed_at.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 fed_bb01.bmp fed_bb02.bmp fed_bb03.bmp fed_bb04.bmp fed_bb05.bmp fed_bb06.bmp fed_bb07.bmp fed_bb08.bmp fed_bb09.bmp fed_bb10.bmp fed_bb11.bmp fed_bb12.bmp fed_bb13.bmp fed_bb14.bmp fed_bb15.bmp fed_bb16.bmp fed_bb17.bmp fed_bb18.bmp fed_bb19.bmp fed_bb20.bmp fed_bb21.bmp fed_bb22.bmp fed_bb23.bmp fed_bb24.bmp fed_bb25.bmp fed_bb26.bmp fed_bb27.bmp fed_bb28.bmp fed_bb29.bmp fed_bb30.bmp fed_bb31.bmp fed_bb32.bmp fed_bb.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 fed_ca01.bmp fed_ca02.bmp fed_ca03.bmp fed_ca04.bmp fed_ca05.bmp fed_ca06.bmp fed_ca07.bmp fed_ca08.bmp fed_ca09.bmp fed_ca10.bmp fed_ca11.bmp fed_ca12.bmp fed_ca13.bmp fed_ca14.bmp fed_ca15.bmp fed_ca16.bmp fed_ca17.bmp fed_ca18.bmp fed_ca19.bmp fed_ca20.bmp fed_ca21.bmp fed_ca22.bmp fed_ca23.bmp fed_ca24.bmp fed_ca25.bmp fed_ca26.bmp fed_ca27.bmp fed_ca28.bmp fed_ca29.bmp fed_ca30.bmp fed_ca31.bmp fed_ca32.bmp fed_ca.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 fed_dd01.bmp fed_dd02.bmp fed_dd03.bmp fed_dd04.bmp fed_dd05.bmp fed_dd06.bmp fed_dd07.bmp fed_dd08.bmp fed_dd09.bmp fed_dd10.bmp fed_dd11.bmp fed_dd12.bmp fed_dd13.bmp fed_dd14.bmp fed_dd15.bmp fed_dd16.bmp fed_dd17.bmp fed_dd18.bmp fed_dd19.bmp fed_dd20.bmp fed_dd21.bmp fed_dd22.bmp fed_dd23.bmp fed_dd24.bmp fed_dd25.bmp fed_dd26.bmp fed_dd27.bmp fed_dd28.bmp fed_dd29.bmp fed_dd30.bmp fed_dd31.bmp fed_dd32.bmp fed_dd.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 fed_ga01.bmp fed_ga02.bmp fed_ga03.bmp fed_ga04.bmp fed_ga05.bmp fed_ga06.bmp fed_ga07.bmp fed_ga08.bmp fed_ga09.bmp fed_ga10.bmp fed_ga11.bmp fed_ga12.bmp fed_ga13.bmp fed_ga14.bmp fed_ga15.bmp fed_ga16.bmp fed_ga17.bmp fed_ga18.bmp fed_ga19.bmp fed_ga20.bmp fed_ga21.bmp fed_ga22.bmp fed_ga23.bmp fed_ga24.bmp fed_ga25.bmp fed_ga26.bmp fed_ga27.bmp fed_ga28.bmp fed_ga29.bmp fed_ga30.bmp fed_ga31.bmp fed_ga32.bmp fed_ga.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 fed_sb01.bmp fed_sb02.bmp fed_sb03.bmp fed_sb04.bmp fed_sb05.bmp fed_sb06.bmp fed_sb07.bmp fed_sb08.bmp fed_sb09.bmp fed_sb10.bmp fed_sb11.bmp fed_sb12.bmp fed_sb13.bmp fed_sb14.bmp fed_sb15.bmp fed_sb16.bmp fed_sb17.bmp fed_sb18.bmp fed_sb19.bmp fed_sb20.bmp fed_sb21.bmp fed_sb22.bmp fed_sb23.bmp fed_sb24.bmp fed_sb25.bmp fed_sb26.bmp fed_sb27.bmp fed_sb28.bmp fed_sb29.bmp fed_sb30.bmp fed_sb31.bmp fed_sb32.bmp fed_sb.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 fed_sc01.bmp fed_sc02.bmp fed_sc03.bmp fed_sc04.bmp fed_sc05.bmp fed_sc06.bmp fed_sc07.bmp fed_sc08.bmp fed_sc09.bmp fed_sc10.bmp fed_sc11.bmp fed_sc12.bmp fed_sc13.bmp fed_sc14.bmp fed_sc15.bmp fed_sc16.bmp fed_sc17.bmp fed_sc18.bmp fed_sc19.bmp fed_sc20.bmp fed_sc21.bmp fed_sc22.bmp fed_sc23.bmp fed_sc24.bmp fed_sc25.bmp fed_sc26.bmp fed_sc27.bmp fed_sc28.bmp fed_sc29.bmp fed_sc30.bmp fed_sc31.bmp fed_sc32.bmp fed_sc.bmp +%MyCWD%\tools\imagemagick\montage -colors 256 -mode concatenate -tile 8x1 fed_sc.bmp fed_dd.bmp fed_ca.bmp fed_bb.bmp fed_as.bmp fed_sb.bmp fed_ga.bmp fed_at.bmp fedship1.bmp +popd +pushd resources\ships\color1\ind +echo Making resources\ships\color1\ind... +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ind_as01.bmp ind_as02.bmp ind_as03.bmp ind_as04.bmp ind_as05.bmp ind_as06.bmp ind_as07.bmp ind_as08.bmp ind_as09.bmp ind_as10.bmp ind_as11.bmp ind_as12.bmp ind_as13.bmp ind_as14.bmp ind_as15.bmp ind_as16.bmp ind_as17.bmp ind_as18.bmp ind_as19.bmp ind_as20.bmp ind_as21.bmp ind_as22.bmp ind_as23.bmp ind_as24.bmp ind_as25.bmp ind_as26.bmp ind_as27.bmp ind_as28.bmp ind_as29.bmp ind_as30.bmp ind_as31.bmp ind_as32.bmp ind_as.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ind_at01.bmp ind_at02.bmp ind_at03.bmp ind_at04.bmp ind_at05.bmp ind_at06.bmp ind_at07.bmp ind_at08.bmp ind_at09.bmp ind_at10.bmp ind_at11.bmp ind_at12.bmp ind_at13.bmp ind_at14.bmp ind_at15.bmp ind_at16.bmp ind_at17.bmp ind_at18.bmp ind_at19.bmp ind_at20.bmp ind_at21.bmp ind_at22.bmp ind_at23.bmp ind_at24.bmp ind_at25.bmp ind_at26.bmp ind_at27.bmp ind_at28.bmp ind_at29.bmp ind_at30.bmp ind_at31.bmp ind_at32.bmp ind_at.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ind_bb01.bmp ind_bb02.bmp ind_bb03.bmp ind_bb04.bmp ind_bb05.bmp ind_bb06.bmp ind_bb07.bmp ind_bb08.bmp ind_bb09.bmp ind_bb10.bmp ind_bb11.bmp ind_bb12.bmp ind_bb13.bmp ind_bb14.bmp ind_bb15.bmp ind_bb16.bmp ind_bb17.bmp ind_bb18.bmp ind_bb19.bmp ind_bb20.bmp ind_bb21.bmp ind_bb22.bmp ind_bb23.bmp ind_bb24.bmp ind_bb25.bmp ind_bb26.bmp ind_bb27.bmp ind_bb28.bmp ind_bb29.bmp ind_bb30.bmp ind_bb31.bmp ind_bb32.bmp ind_bb.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ind_ca01.bmp ind_ca02.bmp ind_ca03.bmp ind_ca04.bmp ind_ca05.bmp ind_ca06.bmp ind_ca07.bmp ind_ca08.bmp ind_ca09.bmp ind_ca10.bmp ind_ca11.bmp ind_ca12.bmp ind_ca13.bmp ind_ca14.bmp ind_ca15.bmp ind_ca16.bmp ind_ca17.bmp ind_ca18.bmp ind_ca19.bmp ind_ca20.bmp ind_ca21.bmp ind_ca22.bmp ind_ca23.bmp ind_ca24.bmp ind_ca25.bmp ind_ca26.bmp ind_ca27.bmp ind_ca28.bmp ind_ca29.bmp ind_ca30.bmp ind_ca31.bmp ind_ca32.bmp ind_ca.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ind_dd01.bmp ind_dd02.bmp ind_dd03.bmp ind_dd04.bmp ind_dd05.bmp ind_dd06.bmp ind_dd07.bmp ind_dd08.bmp ind_dd09.bmp ind_dd10.bmp ind_dd11.bmp ind_dd12.bmp ind_dd13.bmp ind_dd14.bmp ind_dd15.bmp ind_dd16.bmp ind_dd17.bmp ind_dd18.bmp ind_dd19.bmp ind_dd20.bmp ind_dd21.bmp ind_dd22.bmp ind_dd23.bmp ind_dd24.bmp ind_dd25.bmp ind_dd26.bmp ind_dd27.bmp ind_dd28.bmp ind_dd29.bmp ind_dd30.bmp ind_dd31.bmp ind_dd32.bmp ind_dd.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ind_ga01.bmp ind_ga02.bmp ind_ga03.bmp ind_ga04.bmp ind_ga05.bmp ind_ga06.bmp ind_ga07.bmp ind_ga08.bmp ind_ga09.bmp ind_ga10.bmp ind_ga11.bmp ind_ga12.bmp ind_ga13.bmp ind_ga14.bmp ind_ga15.bmp ind_ga16.bmp ind_ga17.bmp ind_ga18.bmp ind_ga19.bmp ind_ga20.bmp ind_ga21.bmp ind_ga22.bmp ind_ga23.bmp ind_ga24.bmp ind_ga25.bmp ind_ga26.bmp ind_ga27.bmp ind_ga28.bmp ind_ga29.bmp ind_ga30.bmp ind_ga31.bmp ind_ga32.bmp ind_ga.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ind_sb01.bmp ind_sb02.bmp ind_sb03.bmp ind_sb04.bmp ind_sb05.bmp ind_sb06.bmp ind_sb07.bmp ind_sb08.bmp ind_sb09.bmp ind_sb10.bmp ind_sb11.bmp ind_sb12.bmp ind_sb13.bmp ind_sb14.bmp ind_sb15.bmp ind_sb16.bmp ind_sb17.bmp ind_sb18.bmp ind_sb19.bmp ind_sb20.bmp ind_sb21.bmp ind_sb22.bmp ind_sb23.bmp ind_sb24.bmp ind_sb25.bmp ind_sb26.bmp ind_sb27.bmp ind_sb28.bmp ind_sb29.bmp ind_sb30.bmp ind_sb31.bmp ind_sb32.bmp ind_sb.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ind_sc01.bmp ind_sc02.bmp ind_sc03.bmp ind_sc04.bmp ind_sc05.bmp ind_sc06.bmp ind_sc07.bmp ind_sc08.bmp ind_sc09.bmp ind_sc10.bmp ind_sc11.bmp ind_sc12.bmp ind_sc13.bmp ind_sc14.bmp ind_sc15.bmp ind_sc16.bmp ind_sc17.bmp ind_sc18.bmp ind_sc19.bmp ind_sc20.bmp ind_sc21.bmp ind_sc22.bmp ind_sc23.bmp ind_sc24.bmp ind_sc25.bmp ind_sc26.bmp ind_sc27.bmp ind_sc28.bmp ind_sc29.bmp ind_sc30.bmp ind_sc31.bmp ind_sc32.bmp ind_sc.bmp +%MyCWD%\tools\imagemagick\montage -colors 256 -mode concatenate -tile 8x1 ind_sc.bmp ind_dd.bmp ind_ca.bmp ind_bb.bmp ind_as.bmp ind_sb.bmp ind_ga.bmp ind_at.bmp indship1.bmp +popd +pushd resources\ships\color1\kli +echo Making resources\ships\color1\kli... +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 kli_as01.bmp kli_as02.bmp kli_as03.bmp kli_as04.bmp kli_as05.bmp kli_as06.bmp kli_as07.bmp kli_as08.bmp kli_as09.bmp kli_as10.bmp kli_as11.bmp kli_as12.bmp kli_as13.bmp kli_as14.bmp kli_as15.bmp kli_as16.bmp kli_as17.bmp kli_as18.bmp kli_as19.bmp kli_as20.bmp kli_as21.bmp kli_as22.bmp kli_as23.bmp kli_as24.bmp kli_as25.bmp kli_as26.bmp kli_as27.bmp kli_as28.bmp kli_as29.bmp kli_as30.bmp kli_as31.bmp kli_as32.bmp kli_as.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 kli_at01.bmp kli_at02.bmp kli_at03.bmp kli_at04.bmp kli_at05.bmp kli_at06.bmp kli_at07.bmp kli_at08.bmp kli_at09.bmp kli_at10.bmp kli_at11.bmp kli_at12.bmp kli_at13.bmp kli_at14.bmp kli_at15.bmp kli_at16.bmp kli_at17.bmp kli_at18.bmp kli_at19.bmp kli_at20.bmp kli_at21.bmp kli_at22.bmp kli_at23.bmp kli_at24.bmp kli_at25.bmp kli_at26.bmp kli_at27.bmp kli_at28.bmp kli_at29.bmp kli_at30.bmp kli_at31.bmp kli_at32.bmp kli_at.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 kli_bb01.bmp kli_bb02.bmp kli_bb03.bmp kli_bb04.bmp kli_bb05.bmp kli_bb06.bmp kli_bb07.bmp kli_bb08.bmp kli_bb09.bmp kli_bb10.bmp kli_bb11.bmp kli_bb12.bmp kli_bb13.bmp kli_bb14.bmp kli_bb15.bmp kli_bb16.bmp kli_bb17.bmp kli_bb18.bmp kli_bb19.bmp kli_bb20.bmp kli_bb21.bmp kli_bb22.bmp kli_bb23.bmp kli_bb24.bmp kli_bb25.bmp kli_bb26.bmp kli_bb27.bmp kli_bb28.bmp kli_bb29.bmp kli_bb30.bmp kli_bb31.bmp kli_bb32.bmp kli_bb.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 kli_ca01.bmp kli_ca02.bmp kli_ca03.bmp kli_ca04.bmp kli_ca05.bmp kli_ca06.bmp kli_ca07.bmp kli_ca08.bmp kli_ca09.bmp kli_ca10.bmp kli_ca11.bmp kli_ca12.bmp kli_ca13.bmp kli_ca14.bmp kli_ca15.bmp kli_ca16.bmp kli_ca17.bmp kli_ca18.bmp kli_ca19.bmp kli_ca20.bmp kli_ca21.bmp kli_ca22.bmp kli_ca23.bmp kli_ca24.bmp kli_ca25.bmp kli_ca26.bmp kli_ca27.bmp kli_ca28.bmp kli_ca29.bmp kli_ca30.bmp kli_ca31.bmp kli_ca32.bmp kli_ca.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 kli_dd01.bmp kli_dd02.bmp kli_dd03.bmp kli_dd04.bmp kli_dd05.bmp kli_dd06.bmp kli_dd07.bmp kli_dd08.bmp kli_dd09.bmp kli_dd10.bmp kli_dd11.bmp kli_dd12.bmp kli_dd13.bmp kli_dd14.bmp kli_dd15.bmp kli_dd16.bmp kli_dd17.bmp kli_dd18.bmp kli_dd19.bmp kli_dd20.bmp kli_dd21.bmp kli_dd22.bmp kli_dd23.bmp kli_dd24.bmp kli_dd25.bmp kli_dd26.bmp kli_dd27.bmp kli_dd28.bmp kli_dd29.bmp kli_dd30.bmp kli_dd31.bmp kli_dd32.bmp kli_dd.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 kli_ga01.bmp kli_ga02.bmp kli_ga03.bmp kli_ga04.bmp kli_ga05.bmp kli_ga06.bmp kli_ga07.bmp kli_ga08.bmp kli_ga09.bmp kli_ga10.bmp kli_ga11.bmp kli_ga12.bmp kli_ga13.bmp kli_ga14.bmp kli_ga15.bmp kli_ga16.bmp kli_ga17.bmp kli_ga18.bmp kli_ga19.bmp kli_ga20.bmp kli_ga21.bmp kli_ga22.bmp kli_ga23.bmp kli_ga24.bmp kli_ga25.bmp kli_ga26.bmp kli_ga27.bmp kli_ga28.bmp kli_ga29.bmp kli_ga30.bmp kli_ga31.bmp kli_ga32.bmp kli_ga.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 kli_sb01.bmp kli_sb02.bmp kli_sb03.bmp kli_sb04.bmp kli_sb05.bmp kli_sb06.bmp kli_sb07.bmp kli_sb08.bmp kli_sb09.bmp kli_sb10.bmp kli_sb11.bmp kli_sb12.bmp kli_sb13.bmp kli_sb14.bmp kli_sb15.bmp kli_sb16.bmp kli_sb17.bmp kli_sb18.bmp kli_sb19.bmp kli_sb20.bmp kli_sb21.bmp kli_sb22.bmp kli_sb23.bmp kli_sb24.bmp kli_sb25.bmp kli_sb26.bmp kli_sb27.bmp kli_sb28.bmp kli_sb29.bmp kli_sb30.bmp kli_sb31.bmp kli_sb32.bmp kli_sb.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 kli_sc01.bmp kli_sc02.bmp kli_sc03.bmp kli_sc04.bmp kli_sc05.bmp kli_sc06.bmp kli_sc07.bmp kli_sc08.bmp kli_sc09.bmp kli_sc10.bmp kli_sc11.bmp kli_sc12.bmp kli_sc13.bmp kli_sc14.bmp kli_sc15.bmp kli_sc16.bmp kli_sc17.bmp kli_sc18.bmp kli_sc19.bmp kli_sc20.bmp kli_sc21.bmp kli_sc22.bmp kli_sc23.bmp kli_sc24.bmp kli_sc25.bmp kli_sc26.bmp kli_sc27.bmp kli_sc28.bmp kli_sc29.bmp kli_sc30.bmp kli_sc31.bmp kli_sc32.bmp kli_sc.bmp +%MyCWD%\tools\imagemagick\montage -colors 256 -mode concatenate -tile 8x1 kli_sc.bmp kli_dd.bmp kli_ca.bmp kli_bb.bmp kli_as.bmp kli_sb.bmp kli_ga.bmp kli_at.bmp kliship1.bmp +popd +pushd resources\ships\color1\ori +echo Making resources\ships\color1\ori... +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ori_as01.bmp ori_as02.bmp ori_as03.bmp ori_as04.bmp ori_as05.bmp ori_as06.bmp ori_as07.bmp ori_as08.bmp ori_as09.bmp ori_as10.bmp ori_as11.bmp ori_as12.bmp ori_as13.bmp ori_as14.bmp ori_as15.bmp ori_as16.bmp ori_as17.bmp ori_as18.bmp ori_as19.bmp ori_as20.bmp ori_as21.bmp ori_as22.bmp ori_as23.bmp ori_as24.bmp ori_as25.bmp ori_as26.bmp ori_as27.bmp ori_as28.bmp ori_as29.bmp ori_as30.bmp ori_as31.bmp ori_as32.bmp ori_as.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ori_at01.bmp ori_at02.bmp ori_at03.bmp ori_at04.bmp ori_at05.bmp ori_at06.bmp ori_at07.bmp ori_at08.bmp ori_at09.bmp ori_at10.bmp ori_at11.bmp ori_at12.bmp ori_at13.bmp ori_at14.bmp ori_at15.bmp ori_at16.bmp ori_at17.bmp ori_at18.bmp ori_at19.bmp ori_at20.bmp ori_at21.bmp ori_at22.bmp ori_at23.bmp ori_at24.bmp ori_at25.bmp ori_at26.bmp ori_at27.bmp ori_at28.bmp ori_at29.bmp ori_at30.bmp ori_at31.bmp ori_at32.bmp ori_at.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ori_bb01.bmp ori_bb02.bmp ori_bb03.bmp ori_bb04.bmp ori_bb05.bmp ori_bb06.bmp ori_bb07.bmp ori_bb08.bmp ori_bb09.bmp ori_bb10.bmp ori_bb11.bmp ori_bb12.bmp ori_bb13.bmp ori_bb14.bmp ori_bb15.bmp ori_bb16.bmp ori_bb17.bmp ori_bb18.bmp ori_bb19.bmp ori_bb20.bmp ori_bb21.bmp ori_bb22.bmp ori_bb23.bmp ori_bb24.bmp ori_bb25.bmp ori_bb26.bmp ori_bb27.bmp ori_bb28.bmp ori_bb29.bmp ori_bb30.bmp ori_bb31.bmp ori_bb32.bmp ori_bb.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ori_ca01.bmp ori_ca02.bmp ori_ca03.bmp ori_ca04.bmp ori_ca05.bmp ori_ca06.bmp ori_ca07.bmp ori_ca08.bmp ori_ca09.bmp ori_ca10.bmp ori_ca11.bmp ori_ca12.bmp ori_ca13.bmp ori_ca14.bmp ori_ca15.bmp ori_ca16.bmp ori_ca17.bmp ori_ca18.bmp ori_ca19.bmp ori_ca20.bmp ori_ca21.bmp ori_ca22.bmp ori_ca23.bmp ori_ca24.bmp ori_ca25.bmp ori_ca26.bmp ori_ca27.bmp ori_ca28.bmp ori_ca29.bmp ori_ca30.bmp ori_ca31.bmp ori_ca32.bmp ori_ca.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ori_dd01.bmp ori_dd02.bmp ori_dd03.bmp ori_dd04.bmp ori_dd05.bmp ori_dd06.bmp ori_dd07.bmp ori_dd08.bmp ori_dd09.bmp ori_dd10.bmp ori_dd11.bmp ori_dd12.bmp ori_dd13.bmp ori_dd14.bmp ori_dd15.bmp ori_dd16.bmp ori_dd17.bmp ori_dd18.bmp ori_dd19.bmp ori_dd20.bmp ori_dd21.bmp ori_dd22.bmp ori_dd23.bmp ori_dd24.bmp ori_dd25.bmp ori_dd26.bmp ori_dd27.bmp ori_dd28.bmp ori_dd29.bmp ori_dd30.bmp ori_dd31.bmp ori_dd32.bmp ori_dd.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ori_ga01.bmp ori_ga02.bmp ori_ga03.bmp ori_ga04.bmp ori_ga05.bmp ori_ga06.bmp ori_ga07.bmp ori_ga08.bmp ori_ga09.bmp ori_ga10.bmp ori_ga11.bmp ori_ga12.bmp ori_ga13.bmp ori_ga14.bmp ori_ga15.bmp ori_ga16.bmp ori_ga17.bmp ori_ga18.bmp ori_ga19.bmp ori_ga20.bmp ori_ga21.bmp ori_ga22.bmp ori_ga23.bmp ori_ga24.bmp ori_ga25.bmp ori_ga26.bmp ori_ga27.bmp ori_ga28.bmp ori_ga29.bmp ori_ga30.bmp ori_ga31.bmp ori_ga32.bmp ori_ga.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ori_sb01.bmp ori_sb02.bmp ori_sb03.bmp ori_sb04.bmp ori_sb05.bmp ori_sb06.bmp ori_sb07.bmp ori_sb08.bmp ori_sb09.bmp ori_sb10.bmp ori_sb11.bmp ori_sb12.bmp ori_sb13.bmp ori_sb14.bmp ori_sb15.bmp ori_sb16.bmp ori_sb17.bmp ori_sb18.bmp ori_sb19.bmp ori_sb20.bmp ori_sb21.bmp ori_sb22.bmp ori_sb23.bmp ori_sb24.bmp ori_sb25.bmp ori_sb26.bmp ori_sb27.bmp ori_sb28.bmp ori_sb29.bmp ori_sb30.bmp ori_sb31.bmp ori_sb32.bmp ori_sb.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ori_sc01.bmp ori_sc02.bmp ori_sc03.bmp ori_sc04.bmp ori_sc05.bmp ori_sc06.bmp ori_sc07.bmp ori_sc08.bmp ori_sc09.bmp ori_sc10.bmp ori_sc11.bmp ori_sc12.bmp ori_sc13.bmp ori_sc14.bmp ori_sc15.bmp ori_sc16.bmp ori_sc17.bmp ori_sc18.bmp ori_sc19.bmp ori_sc20.bmp ori_sc21.bmp ori_sc22.bmp ori_sc23.bmp ori_sc24.bmp ori_sc25.bmp ori_sc26.bmp ori_sc27.bmp ori_sc28.bmp ori_sc29.bmp ori_sc30.bmp ori_sc31.bmp ori_sc32.bmp ori_sc.bmp +%MyCWD%\tools\imagemagick\montage -colors 256 -mode concatenate -tile 8x1 ori_sc.bmp ori_dd.bmp ori_ca.bmp ori_bb.bmp ori_as.bmp ori_sb.bmp ori_ga.bmp ori_at.bmp oriship1.bmp +popd +pushd resources\ships\color1\rom +echo Making resources\ships\color1\rom... +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 rom_as01.bmp rom_as02.bmp rom_as03.bmp rom_as04.bmp rom_as05.bmp rom_as06.bmp rom_as07.bmp rom_as08.bmp rom_as09.bmp rom_as10.bmp rom_as11.bmp rom_as12.bmp rom_as13.bmp rom_as14.bmp rom_as15.bmp rom_as16.bmp rom_as17.bmp rom_as18.bmp rom_as19.bmp rom_as20.bmp rom_as21.bmp rom_as22.bmp rom_as23.bmp rom_as24.bmp rom_as25.bmp rom_as26.bmp rom_as27.bmp rom_as28.bmp rom_as29.bmp rom_as30.bmp rom_as31.bmp rom_as32.bmp rom_as.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 rom_at01.bmp rom_at02.bmp rom_at03.bmp rom_at04.bmp rom_at05.bmp rom_at06.bmp rom_at07.bmp rom_at08.bmp rom_at09.bmp rom_at10.bmp rom_at11.bmp rom_at12.bmp rom_at13.bmp rom_at14.bmp rom_at15.bmp rom_at16.bmp rom_at17.bmp rom_at18.bmp rom_at19.bmp rom_at20.bmp rom_at21.bmp rom_at22.bmp rom_at23.bmp rom_at24.bmp rom_at25.bmp rom_at26.bmp rom_at27.bmp rom_at28.bmp rom_at29.bmp rom_at30.bmp rom_at31.bmp rom_at32.bmp rom_at.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 rom_bb01.bmp rom_bb02.bmp rom_bb03.bmp rom_bb04.bmp rom_bb05.bmp rom_bb06.bmp rom_bb07.bmp rom_bb08.bmp rom_bb09.bmp rom_bb10.bmp rom_bb11.bmp rom_bb12.bmp rom_bb13.bmp rom_bb14.bmp rom_bb15.bmp rom_bb16.bmp rom_bb17.bmp rom_bb18.bmp rom_bb19.bmp rom_bb20.bmp rom_bb21.bmp rom_bb22.bmp rom_bb23.bmp rom_bb24.bmp rom_bb25.bmp rom_bb26.bmp rom_bb27.bmp rom_bb28.bmp rom_bb29.bmp rom_bb30.bmp rom_bb31.bmp rom_bb32.bmp rom_bb.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 rom_ca01.bmp rom_ca02.bmp rom_ca03.bmp rom_ca04.bmp rom_ca05.bmp rom_ca06.bmp rom_ca07.bmp rom_ca08.bmp rom_ca09.bmp rom_ca10.bmp rom_ca11.bmp rom_ca12.bmp rom_ca13.bmp rom_ca14.bmp rom_ca15.bmp rom_ca16.bmp rom_ca17.bmp rom_ca18.bmp rom_ca19.bmp rom_ca20.bmp rom_ca21.bmp rom_ca22.bmp rom_ca23.bmp rom_ca24.bmp rom_ca25.bmp rom_ca26.bmp rom_ca27.bmp rom_ca28.bmp rom_ca29.bmp rom_ca30.bmp rom_ca31.bmp rom_ca32.bmp rom_ca.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 rom_dd01.bmp rom_dd02.bmp rom_dd03.bmp rom_dd04.bmp rom_dd05.bmp rom_dd06.bmp rom_dd07.bmp rom_dd08.bmp rom_dd09.bmp rom_dd10.bmp rom_dd11.bmp rom_dd12.bmp rom_dd13.bmp rom_dd14.bmp rom_dd15.bmp rom_dd16.bmp rom_dd17.bmp rom_dd18.bmp rom_dd19.bmp rom_dd20.bmp rom_dd21.bmp rom_dd22.bmp rom_dd23.bmp rom_dd24.bmp rom_dd25.bmp rom_dd26.bmp rom_dd27.bmp rom_dd28.bmp rom_dd29.bmp rom_dd30.bmp rom_dd31.bmp rom_dd32.bmp rom_dd.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 rom_ga01.bmp rom_ga02.bmp rom_ga03.bmp rom_ga04.bmp rom_ga05.bmp rom_ga06.bmp rom_ga07.bmp rom_ga08.bmp rom_ga09.bmp rom_ga10.bmp rom_ga11.bmp rom_ga12.bmp rom_ga13.bmp rom_ga14.bmp rom_ga15.bmp rom_ga16.bmp rom_ga17.bmp rom_ga18.bmp rom_ga19.bmp rom_ga20.bmp rom_ga21.bmp rom_ga22.bmp rom_ga23.bmp rom_ga24.bmp rom_ga25.bmp rom_ga26.bmp rom_ga27.bmp rom_ga28.bmp rom_ga29.bmp rom_ga30.bmp rom_ga31.bmp rom_ga32.bmp rom_ga.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 rom_sb01.bmp rom_sb02.bmp rom_sb03.bmp rom_sb04.bmp rom_sb05.bmp rom_sb06.bmp rom_sb07.bmp rom_sb08.bmp rom_sb09.bmp rom_sb10.bmp rom_sb11.bmp rom_sb12.bmp rom_sb13.bmp rom_sb14.bmp rom_sb15.bmp rom_sb16.bmp rom_sb17.bmp rom_sb18.bmp rom_sb19.bmp rom_sb20.bmp rom_sb21.bmp rom_sb22.bmp rom_sb23.bmp rom_sb24.bmp rom_sb25.bmp rom_sb26.bmp rom_sb27.bmp rom_sb28.bmp rom_sb29.bmp rom_sb30.bmp rom_sb31.bmp rom_sb32.bmp rom_sb.bmp +%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 rom_sc01.bmp rom_sc02.bmp rom_sc03.bmp rom_sc04.bmp rom_sc05.bmp rom_sc06.bmp rom_sc07.bmp rom_sc08.bmp rom_sc09.bmp rom_sc10.bmp rom_sc11.bmp rom_sc12.bmp rom_sc13.bmp rom_sc14.bmp rom_sc15.bmp rom_sc16.bmp rom_sc17.bmp rom_sc18.bmp rom_sc19.bmp rom_sc20.bmp rom_sc21.bmp rom_sc22.bmp rom_sc23.bmp rom_sc24.bmp rom_sc25.bmp rom_sc26.bmp rom_sc27.bmp rom_sc28.bmp rom_sc29.bmp rom_sc30.bmp rom_sc31.bmp rom_sc32.bmp rom_sc.bmp +%MyCWD%\tools\imagemagick\montage -colors 256 -mode concatenate -tile 8x1 rom_sc.bmp rom_dd.bmp rom_ca.bmp rom_bb.bmp rom_as.bmp rom_sb.bmp rom_ga.bmp rom_at.bmp romship1.bmp +popd + pushd resources\ships\mono\fed echo Making resources\ships\mono\fed... %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 1x32 fed_as01.bmp fed_as02.bmp fed_as03.bmp fed_as04.bmp fed_as05.bmp fed_as06.bmp fed_as07.bmp fed_as08.bmp fed_as09.bmp fed_as10.bmp fed_as11.bmp fed_as12.bmp fed_as13.bmp fed_as14.bmp fed_as15.bmp fed_as16.bmp fed_as17.bmp fed_as18.bmp fed_as19.bmp fed_as20.bmp fed_as21.bmp fed_as22.bmp fed_as23.bmp fed_as24.bmp fed_as25.bmp fed_as26.bmp fed_as27.bmp fed_as28.bmp fed_as29.bmp fed_as30.bmp fed_as31.bmp fed_as32.bmp fed_as.bmp @@ -157,7 +218,6 @@ %MyCWD%\tools\imagemagick\montage -colors 256 -mode concatenate -tile 1x5 shexpl0.bmp shexpl1.bmp shexpl2.bmp shexpl3.bmp shexpl4.bmp shexpl.bmp popd - if /I "%Compiler%" == "BCC" goto :CompilerBCC if /I "%Compiler%" == "VCC" goto :CompilerVCC @@ -173,10 +233,14 @@ cscript %MyCWD%\tools\vcmake.vbs curslib.dsw "Win32 Release" popd +pushd src\winkey +cscript %MyCWD%\tools\vcmake.vbs winkey.dsw "Win32 Release" +popd + cscript %MyCWD%\tools\vcmake.vbs clientr.dsw "Win32 Release" pushd %InstCWD%\netrek -%MyCWD%\tools\stampver -v%MyCWD%\src\stampver.inf -i4 -j4 netrek.exe +%MyCWD%\tools\stampver -v%MyCWD%\src\stampver.inf netrek.exe popd goto :dist @@ -186,7 +250,7 @@ make popd make -%MyCWD%\tools\stampver -v%MyCWD%\src\stampver.inf -i4 -j4 netrek.exe +%MyCWD%\tools\stampver -v%MyCWD%\src\stampver.inf netrek.exe popd goto :dist @@ -200,16 +264,22 @@ copy resources\ships\color\ori\oriship.bmp %InstCWD%\netrek\bitmaps\shiplib copy resources\ships\color\rom\romship.bmp %InstCWD%\netrek\bitmaps\shiplib +rem copy resources\ships\color1\fed\fedship1.bmp %InstCWD%\netrek\bitmaps\shiplib +rem copy resources\ships\color1\ind\indship1.bmp %InstCWD%\netrek\bitmaps\shiplib +rem copy resources\ships\color1\kli\kliship1.bmp %InstCWD%\netrek\bitmaps\shiplib +rem copy resources\ships\color1\ori\oriship1.bmp %InstCWD%\netrek\bitmaps\shiplib +rem copy resources\ships\color1\rom\romship1.bmp %InstCWD%\netrek\bitmaps\shiplib + copy resources\ships\mono\fed\fedshipM.bmp %InstCWD%\netrek\bitmaps\shiplib copy resources\ships\mono\ind\indshipM.bmp %InstCWD%\netrek\bitmaps\shiplib copy resources\ships\mono\kli\klishipM.bmp %InstCWD%\netrek\bitmaps\shiplib copy resources\ships\mono\ori\orishipM.bmp %InstCWD%\netrek\bitmaps\shiplib copy resources\ships\mono\rom\romshipM.bmp %InstCWD%\netrek\bitmaps\shiplib -mkdir %InstCWD%\bitmaps\weaplibm +mkdir %InstCWD%\netrek\bitmaps\weaplibm copy resources\weaplibm\*.bmp %InstCWD%\netrek\bitmaps\weaplibm -mkdir %InstCWD%\bitmaps\planlibm +mkdir %InstCWD%\netrek\bitmaps\planlibm copy resources\planlibm\bronco\plan.bmp %InstCWD%\netrek\bitmaps\planlibm copy resources\planlibm\rabbit\planR.bmp %InstCWD%\netrek\bitmaps\planlibm copy resources\planlibm\moo\planM.bmp %InstCWD%\netrek\bitmaps\planlibm @@ -217,14 +287,13 @@ copy resources\planlibm\rabbit\mplanR.bmp %InstCWD%\netrek\bitmaps\planlibm copy resources\planlibm\moo\mplanM.bmp %InstCWD%\netrek\bitmaps\planlibm -mkdir %InstCWD%\bitmaps\misclib +mkdir %InstCWD%\netrek\bitmaps\misclib copy resources\misclib\mono\sbexplM.bmp %InstCWD%\netrek\bitmaps\misclib copy resources\misclib\mono\shexplM.bmp %InstCWD%\netrek\bitmaps\misclib copy resources\misclib\color\sbexpl.bmp %InstCWD%\netrek\bitmaps\misclib copy resources\misclib\color\shexpl.bmp %InstCWD%\netrek\bitmaps\misclib copy resources\misclib\mono\cloak.bmp %InstCWD%\netrek\bitmaps\misclib copy resources\misclib\mono\clock.bmp %InstCWD%\netrek\bitmaps\misclib -copy resources\misclib\mono\icon.bmp %InstCWD%\netrek\bitmaps\misclib copy resources\misclib\mono\shield.bmp %InstCWD%\netrek\bitmaps\misclib copy resources\misclib\mono\stipple.bmp %InstCWD%\netrek\bitmaps\misclib copy resources\misclib\mono\vshield.bmp %InstCWD%\netrek\bitmaps\misclib @@ -232,10 +301,14 @@ copy resources\fonts\ntfonts2.fon %InstCWD%\netrek copy resources\ships\other\*.bmp %InstCWD%\netrek\bitmaps\shiplib -mkdir %InstCWD%\docs +mkdir %InstCWD%\netrek\docs copy resources\docs\*.doc %InstCWD%\netrek\docs +copy resources\docs\*.dat %InstCWD%\netrek\docs copy resources\docs\*.txt %InstCWD%\netrek\docs +mkdir %InstCWD%\netrek\sounds +copy resources\sounds\*.wav %InstCWD%\netrek\sounds + if /I "%Compiler%" == "BCC" copy src\cursors\curslib.dll %InstCWD%\netrek\bitmaps goto end @@ -247,6 +320,12 @@ del resources\ships\color\ori\oriship.bmp resources\ships\color\ori\ori_??.bmp del resources\ships\color\rom\romship.bmp resources\ships\color\rom\rom_??.bmp +del resources\ships\color1\fed\fedship1.bmp resources\ships\color1\fed\fed_??.bmp +del resources\ships\color1\ind\indship1.bmp resources\ships\color1\ind\ind_??.bmp +del resources\ships\color1\kli\kliship1.bmp resources\ships\color1\kli\kli_??.bmp +del resources\ships\color1\ori\oriship1.bmp resources\ships\color1\ori\ori_??.bmp +del resources\ships\color1\rom\romship1.bmp resources\ships\color1\rom\rom_??.bmp + del resources\ships\mono\fed\fedshipM.bmp resources\ships\mono\fed\fed_??.bmp del resources\ships\mono\ind\indshipM.bmp resources\ships\mono\ind\ind_??.bmp del resources\ships\mono\kli\klishipM.bmp resources\ships\mono\kli\kli_??.bmp @@ -278,6 +357,10 @@ del *.ncb del *.opt popd +pushd winkey +del *.ncb +del *.opt +popd popd del *.ncb del *.opt @@ -290,6 +373,9 @@ pushd cursors del curslib.ilf curslib.ilc curslib.ild curslib.ils curslib.tds curslib.dll popd +pushd winkey +del winkey.ilf winkey.ilc winkey.ild winkey.ils winkey.tds winkey.dll +popd popd :end From modemhero at users.sourceforge.net Tue Apr 11 23:20:05 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 04:20:05 +0000 Subject: [netrek-cvs] client/netrekxp/include bitmaps.h, 1.1.1.1, 1.2 data.h, 1.1.1.1, 1.2 defs.h, 1.1.1.1, 1.2 proto.h, 1.1.1.1, 1.2 struct.h, 1.1.1.1, 1.2 version.h, 1.1.1.1, 1.2 wlib.h, 1.1.1.1, 1.2 xclrs.h, 1.1.1.1, 1.2 Message-ID: Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14821/include Modified Files: bitmaps.h data.h defs.h proto.h struct.h version.h wlib.h xclrs.h Log Message: Update to version 4.4.0.3 Index: bitmaps.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/bitmaps.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- bitmaps.h 21 Jan 2003 21:27:54 -0000 1.1.1.1 +++ bitmaps.h 12 Apr 2006 04:20:03 -0000 1.2 @@ -97,7 +97,6 @@ #define BMP_SB_EXPLOSION 1 #define BMP_CLOCK 13 #define BMP_CLOAK 14 -#define BMP_ICON 15 #define BMP_SHIELD 16 #define BMP_VSHIELD 17 #define BMP_STIPPLE 22 @@ -114,8 +113,6 @@ #define BMP_CLOCK_HEIGHT 48 #define BMP_CLOAK_WIDTH 20 #define BMP_CLOAK_HEIGHT 20 -#define BMP_ICON_WIDTH 112 -#define BMP_ICON_HEIGHT 80 #define BMP_SHIELD_WIDTH 20 #define BMP_SHIELD_HEIGHT 20 #define BMP_STIPPLE_WIDTH 16 Index: defs.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/defs.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- defs.h 21 Jan 2003 21:27:54 -0000 1.1.1.1 +++ defs.h 12 Apr 2006 04:20:03 -0000 1.2 @@ -13,7 +13,7 @@ #define ADDRLEN 10 #ifdef NBT -#define MAX_MACRO 75 +#define MAX_MACRO 500 #endif #ifndef MAXPLAYER @@ -235,37 +235,37 @@ #endif #ifndef ROTATERACE -#define sendTorpReq(dir) sendShortPacket(CP_TORP, dir) -#define sendPhaserReq(dir) sendShortPacket(CP_PHASER, dir) -#define sendDirReq(dir) sendShortPacket(CP_DIRECTION, dir) -#define sendPlasmaReq(dir) sendShortPacket(CP_PLASMA, dir) +#define sendTorpReq(dir) sendShortPacket(CP_TORP, (char) dir) +#define sendPhaserReq(dir) sendShortPacket(CP_PHASER, (char) dir) +#define sendDirReq(dir) sendShortPacket(CP_DIRECTION, (char) dir) +#define sendPlasmaReq(dir) sendShortPacket(CP_PLASMA, (char) dir) #else -#define sendTorpReq(dir) sendShortPacket(CP_TORP, RotateDirSend(dir)) -#define sendPhaserReq(dir) sendShortPacket(CP_PHASER, RotateDirSend(dir)) -#define sendDirReq(dir) sendShortPacket(CP_DIRECTION, RotateDirSend(dir)) -#define sendPlasmaReq(dir) sendShortPacket(CP_PLASMA, RotateDirSend(dir)) +#define sendTorpReq(dir) sendShortPacket(CP_TORP, (char) RotateDirSend(dir)) +#define sendPhaserReq(dir) sendShortPacket(CP_PHASER, (char) RotateDirSend(dir)) +#define sendDirReq(dir) sendShortPacket(CP_DIRECTION, (char) RotateDirSend(dir)) +#define sendPlasmaReq(dir) sendShortPacket(CP_PLASMA, (char) RotateDirSend(dir)) #endif /* ROTATERACE */ -#define sendSpeedReq(speed) sendShortPacket(CP_SPEED, speed) -#define sendShieldReq(state) sendShortPacket(CP_SHIELD, state) -#define sendOrbitReq(state) sendShortPacket(CP_ORBIT, state) -#define sendRepairReq(state) sendShortPacket(CP_REPAIR, state) -#define sendBeamReq(state) sendShortPacket(CP_BEAM, state) -#define sendCopilotReq(state) sendShortPacket(CP_COPILOT, state) +#define sendSpeedReq(speed) sendShortPacket(CP_SPEED, (char) speed) +#define sendShieldReq(state) sendShortPacket(CP_SHIELD, (char) state) +#define sendOrbitReq(state) sendShortPacket(CP_ORBIT, (char) state) +#define sendRepairReq(state) sendShortPacket(CP_REPAIR, (char) state) +#define sendBeamReq(state) sendShortPacket(CP_BEAM, (char) state) +#define sendCopilotReq(state) sendShortPacket(CP_COPILOT, (char) state) #define sendDetonateReq() sendShortPacket(CP_DET_TORPS, 0) -#define sendCloakReq(state) sendShortPacket(CP_CLOAK, state) -#define sendBombReq(state) sendShortPacket(CP_BOMB, state) +#define sendCloakReq(state) sendShortPacket(CP_CLOAK, (char) state) +#define sendBombReq(state) sendShortPacket(CP_BOMB, (char) state) #define sendPractrReq() sendShortPacket(CP_PRACTR, 0) -#define sendWarReq(mask) sendShortPacket(CP_WAR, mask) -#define sendRefitReq(ship) {sendShortPacket(CP_REFIT, ship); shipchange(ship);} -#define sendPlaylockReq(pnum) sendShortPacket(CP_PLAYLOCK, pnum) -#define sendPlanlockReq(pnum) sendShortPacket(CP_PLANLOCK, pnum) +#define sendWarReq(mask) sendShortPacket(CP_WAR, (char) mask) +#define sendRefitReq(ship) {sendShortPacket(CP_REFIT, (char) ship); shipchange(ship);} +#define sendPlaylockReq(pnum) sendShortPacket(CP_PLAYLOCK, (char) pnum) +#define sendPlanlockReq(pnum) sendShortPacket(CP_PLANLOCK, (char) pnum) #define sendCoupReq() sendShortPacket(CP_COUP, 0) #define sendQuitReq() sendShortPacket(CP_QUIT, 0) #define sendByeReq() sendShortPacket(CP_BYE, 0) -#define sendDockingReq(state) sendShortPacket(CP_DOCKPERM, state) -#define sendResetStatsReq(verify) sendShortPacket(CP_RESETSTATS, verify) -#define sendScanReq(who) sendShortPacket(CP_SCAN, who) /* ATM */ +#define sendDockingReq(state) sendShortPacket(CP_DOCKPERM, (char) state) +#define sendResetStatsReq(verify) sendShortPacket(CP_RESETSTATS, (char) verify) +#define sendScanReq(who) sendShortPacket(CP_SCAN, (char) who) /* ATM */ #ifdef SHORT_PACKETS /* #define sendShortReq(state) sendShortPacket(CP_S_REQ, state) */ @@ -425,4 +425,21 @@ #define DEADPACKETS 3 #endif +/* Server type definitions */ +#define ST_UNKNOWN 0 +#define ST_PARADISE 1 +#define ST_BRONCO 2 +#define ST_CHAOS 3 +#define ST_INL 4 +#define ST_STURGEON 5 +#define ST_HOCKEY 6 +#define ST_DOGFIGHT 7 + +#define T_NONE 0 /* no timer */ +#define T_DAY 1 /* time of day */ +#define T_SERVER 2 /* time on server */ +#define T_SHIP 3 /* time in ship */ +#define T_USER 4 /* user reset timer */ +#define T_TOTAL 5 /* number of T_ defs */ + #endif /* _h_defs */ Index: version.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/version.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- version.h 21 Jan 2003 21:27:55 -0000 1.1.1.1 +++ version.h 12 Apr 2006 04:20:03 -0000 1.2 @@ -2,22 +2,5 @@ /* store the version info here */ -#ifdef STABLE -static char mvers[] = "2.02"; -static char version[] = "COW 2.02"; - -#define LIBMAJOR 2 -#define LIBMINOR 2 - -#else -static char mvers[] = "3.00"; -static char version[] = "Netrek 2000"; - -#define LIBMAJOR 3 -#define LIBMINOR 0 - -#if 1 -#define ALPHACODER "Caesar" -#define ALPHAREF "0" -#endif -#endif +static char mvers[] = "4.4.0.3"; +static char version[] = "Netrek XP Mod"; \ No newline at end of file Index: xclrs.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/xclrs.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- xclrs.h 21 Jan 2003 21:27:55 -0000 1.1.1.1 +++ xclrs.h 12 Apr 2006 04:20:03 -0000 1.2 @@ -6,7 +6,7 @@ } xclrs[] = { -"snow", 255, 250, 250, + "snow", 255, 250, 250, "GhostWhite", 248, 248, 255, "WhiteSmoke", 245, 245, 245, "gainsboro", 220, 220, 220, @@ -654,7 +654,9 @@ "gray99", 252, 252, 252, "grey99", 252, 252, 252, "gray100", 255, 255, 255, - "grey100", 255, 255, 255, "grey100", 255, 255, 255}; + "grey100", 255, 255, 255, + "grey100", 255, 255, 255 +}; #define XCLRS (sizeof(xclrs) / sizeof(xclrs[0])) Index: struct.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/struct.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- struct.h 21 Jan 2003 21:27:56 -0000 1.1.1.1 +++ struct.h 12 Apr 2006 04:20:03 -0000 1.2 @@ -117,16 +117,17 @@ * for war */ #define PFPRACTR 0x40000 /* practice type robot (no * kills) */ -#define PFDOCK 0x80000 /* true if docked to a +#define PFDOCK 0x80000 /* true if docked to a * starbase */ -#define PFREFIT 0x100000 /* true if about to refit */ +#define PFREFIT 0x100000 /* true if about to refit */ #define PFREFITTING 0x200000 /* true if currently * refitting */ #define PFTRACT 0x400000 /* tractor beam activated */ #define PFPRESS 0x800000 /* pressor beam activated */ #define PFDOCKOK 0x1000000 /* docking permission */ -#define PFSEEN 0x2000000 /* seen by enemy on galactic map? */ +#define PFSEEN 0x2000000 /* seen by enemy on galactic map? */ #define PFOBSERV 0x8000000 /* for observers */ +#define PFTWARP 0x40000000 /* transwarping to base */ #define KQUIT 0x01 /* Player quit */ #define KTORP 0x02 /* killed by torp */ @@ -196,7 +197,7 @@ int st_flags; /* Misc option flags */ #ifdef MOUSE_AS_SHIFT - unsigned char st_keymap[480]; /* keymap for this player */ + unsigned char st_keymap[672]; /* keymap for this player */ #else unsigned char st_keymap[96]; /* keymap for this player */ #endif @@ -596,6 +597,14 @@ }; #endif +/* Window Allowed Messages types */ +#define WAM_NONE 0x00 +#define WAM_INDIV 0x01 +#define WAM_TEAM 0x02 +#define WAM_KILL 0x04 +#define WAM_ALL 0x08 +#define WAM_PHASER 0x10 + typedef struct tagWindow { HWND hwnd; @@ -617,6 +626,13 @@ W_Callback HandleKeyup; W_Callback HandleButton; W_Callback HandleExpose; + struct tagWindow *parent; + char name[32]; + int orig_x; + int orig_y; + int orig_width; + int orig_height; + int wam; /* Window Allowed Messages */ } Window; @@ -633,10 +649,28 @@ char *desc[100]; }; -#endif /* _h_struct */ - struct tractor { int sx, sy, dx, dy, d1x, d1y, d2x, d2y; /* source (x,y) dest (x1,y1) (x2,y2) */ struct tractor *next; -}; \ No newline at end of file +}; + +struct stringlist +{ + char *string; + char *value; + struct stringlist *next; +}; + +/* DoubleBuffering */ +typedef struct _sdbuffer +{ + W_Window window; /* window for current buffer */ + HDC win_dc; /* window device context */ + HDC mem_dc; /* memory device context */ + RECT wr; /* window rectangle */ + HBITMAP mem_bmp; /* memory to handle bitmap */ + HBITMAP old_bmp; /* saved bitmap */ +}SDBUFFER; + +#endif /* _h_struct */ Index: proto.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- proto.h 21 Jan 2003 21:27:56 -0000 1.1.1.1 +++ proto.h 12 Apr 2006 04:20:03 -0000 1.2 @@ -47,6 +47,7 @@ //static void db_box(int x, int y, int w, int h, int f, int color); //static void db_bar(char *lab, int x, int y, int value, int tmpmax, int max, int digits, int color); //static void db_flags(int fr); +void db_timer (int fr, int xloc, int yloc); void db_redraw_krp (int fr); void db_redraw_COW (int fr); void db_redraw (int fr); @@ -72,6 +73,8 @@ void initDefaults (char *deffile); void saveOptions (void); char *getdefault (char *str); +char *getServerNick (char *srvName); +int getServerType (char *srvName); #ifndef __BORLANDC__ strncmpi (char *str1, char *str2, int max); #endif @@ -196,6 +199,16 @@ void fillhelp (void); void update_Help_to_Keymap (char *helpmessage); void pbfillhelp (void); /* Help window for playback */ +void helpaction (W_Event * data); + +/******************************************************************************/ +/*** hintwin.c +/******************************************************************************/ +void fillhint (void); +void inithints (void); +void showhint (int); +void hintaction (W_Event * data); +void hintshow (W_Event * data); /******************************************************************************/ /*** inform.c @@ -385,13 +398,14 @@ /******************************************************************************/ /*** local.c /******************************************************************************/ +void initStars (void); //static void DrawPlanets(void); //static void DrawShips(void); //static void DrawTorps(void); void DrawPlasmaTorps (void); //static void DrawMisc(void); inline void local (void); -inline void clearLocal(void); +inline void clearLocal (void); /******************************************************************************/ /*** macrowin.c @@ -463,6 +477,7 @@ int height, W_Window parent, int border); +void W_ResizeMenuToNumItems (W_Window window, int numitems); void W_ChangeBorder (W_Window window, W_Color color); void W_MapWindow (W_Window window); @@ -484,7 +499,6 @@ int y, int width, int height); -void W_FlushClearAreaCache (W_Window window); void W_ClearAreas (W_Window window, int *xs, int *ys, @@ -522,6 +536,14 @@ int *y1, int num, W_Color color); +void W_MakePoint (W_Window window, + int x0, + int y0, + W_Color color); +void W_CachePoint(W_Window window, + int x0, + int y0, + W_Color color); void W_MakeTractLine (W_Window window, int x0, int y0, @@ -592,8 +614,6 @@ int W_WindowHeight (W_Window window); int W_Socket (); void W_Beep (); -void W_SetIconWindow (W_Window main, - W_Window icon); void W_DestroyWindow (W_Window window); void RedrawMenu (Window * win, HDC hdc); @@ -640,7 +660,6 @@ int height, int outwidth, int outheight); -void W_Flush (); void W_ResizeWindow (W_Window window, int neww, int newh); @@ -662,6 +681,38 @@ char *name); inline void ResetSysColors (void); inline void SetTrekSysColors (void); +void updateWindowsGeometry (W_Window win); +void W_MessageAllowedWindows (int messtype, + int x, + int y, + W_Color color, + char *str, + int len, + W_Font font); +void W_SetWAM (W_Window win); +/* DoubleBuffering */ +SDBUFFER * W_InitSDB (W_Window window); +void W_Win2Mem (SDBUFFER * sdb); +void W_Mem2Win (SDBUFFER * sdb); +void W_ChangeBorderDB (SDBUFFER * sdb, W_Color color); +void W_FillAreaDB (SDBUFFER * sdb, int x, int y, int width, int height, int color); +void W_ClearAreaDB (SDBUFFER * sdb, int x, int y, int width, int height); +void W_CacheClearAreaDB (SDBUFFER * sdb, int x, int y, int width, int height); +void W_ClearAreasDB (SDBUFFER * sdb, int *xs, int *ys, int *widths, int *heights, int num); +void W_ClearWindowDB (SDBUFFER * sdb); +void W_MakeLineDB (SDBUFFER * sdb, int x0, int y0, int x1, int y1, W_Color color); +void W_CacheLineDB (SDBUFFER * sdb, int x0, int y0, int x1, int y1, W_Color color); +void W_MakePointDB (SDBUFFER * sdb, int x0, int y0, W_Color color); +void W_CachePointDB (SDBUFFER * sdb, int x0, int y0, W_Color color); +void W_MakeLinesDB (SDBUFFER * sdb, int *x0, int *y0, int *x1, int *y1, int num, W_Color color); +void W_MakeTractLineDB (SDBUFFER * sdb, int x0, int y0, int x1, int y1, W_Color color); +void W_MakePhaserLineDB (SDBUFFER * sdb, int x0, int y0, int x1, int y1, W_Color color); +void W_WriteTriangleDB (SDBUFFER * sdb, int x, int y, int s, int t, W_Color color); +void W_WriteTextDB (SDBUFFER * sdb, int x, int y, W_Color color, char *str, int len, W_Font font); +void W_MaskTextDB (SDBUFFER * sdb, int x, int y, W_Color color, char *str, int len, W_Font font); +void W_WriteBitmapDB (SDBUFFER * sdb, int x, int y, W_Icon icon, W_Color color); +void W_WriteBitmapGreyDB (SDBUFFER * sdb, int x, int y, W_Icon icon, W_Color color); +void W_OverlayBitmapDB (SDBUFFER * sdb, int x, int y, W_Icon icon, W_Color color); /******************************************************************************/ /*** newwin.c @@ -688,7 +739,6 @@ int teamNo, int *lastnum); redrawQuit (void); -void drawIcon (void); showTimeLeft (time_t time, time_t max); void W_DefineFedCursor (W_Window window); void W_DefineRomCursor (W_Window window); @@ -726,6 +776,9 @@ //static void metadone(void); void metaaction (W_Event * data); void metainput (void); +#ifdef METAPING +DWORD WINAPI metaPing_thread(void); +#endif /******************************************************************************/ /*** ping.c @@ -762,6 +815,7 @@ inline int ckRecordPacket (char packet); int pb_dopacket (char *buf); int readFromFile (); +void pb_framectr(int xloc, int yloc); /* show frame counter on dashboard */ #ifdef REVERSE_PLAYBACK void rpb_init (void); void rpb_insert (int diskpos, @@ -845,13 +899,9 @@ /******************************************************************************/ /*** senddist.c /******************************************************************************/ -struct distress *loaddistress (enum dist_type i, - W_Event * data); -emergency (enum dist_type i, - W_Event * data); -pmacro (int mnum, - char who, - W_Event * data); +struct distress *loaddistress (enum dist_type i, W_Event * data); +void emergency (enum dist_type i, W_Event * data); +pmacro (int mnum, char who, W_Event * data); /******************************************************************************/ /*** short.c @@ -880,10 +930,6 @@ /*** smessage.c /******************************************************************************/ void DisplayMessage (); -void AddChar (char *twochar); -void BlankChar (int HUDoffsetcol, - int len); -void DrawCursor (int col); void smessage (char ichar); pmessage (char *str, short recip, @@ -980,18 +1026,16 @@ #endif recvUdpConn (void); closeUdpConn (void); - void printUdpInfo (void); - void handleSequence (struct sequence_spacket *packet); - void Log_Packet (char type, - int act_size); - void Log_OPacket (int tpe, - int size); +void printUdpInfo (void); +void handleSequence (struct sequence_spacket *packet); +void Log_Packet (char type, int act_size); +void Log_OPacket (int tpe, int size); Dump_Packet_Log_Info (void); - char *strcpyp_return (register char *s1, - register char *s2, - register int length); - char *strcpy_return (register char *s1, - register char *s2); +char *strcpyp_return (register char *s1, + register char *s2, + register int length); +char *strcpy_return (register char *s1, + register char *s2); /******************************************************************************/ /*** sound.c @@ -1068,6 +1112,7 @@ int y, int targtype); troop_capacity (void); +void setObserverMode (int); /******************************************************************************/ /*** war.c @@ -1105,6 +1150,8 @@ struct timeval *timeout); #endif char *GetExeDir (); + void HideConsoleWindow (void); + BOOL CALLBACK EnumWindowsProc (HWND hwnd, LPARAM lparam); /******************************************************************************/ /*** winsndlib.c Index: wlib.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/wlib.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- wlib.h 21 Jan 2003 21:27:55 -0000 1.1.1.1 +++ wlib.h 12 Apr 2006 04:20:03 -0000 1.2 @@ -163,8 +163,6 @@ extern int W_WindowHeight (W_Window window); extern int W_Socket (void); extern void W_ClearWindow (W_Window window); -extern void W_SetIconWindow (W_Window main, - W_Window icon); extern void W_CacheLine (W_Window, int, int, @@ -194,8 +192,6 @@ int, int, int); -extern void W_FlushClearAreaCache (W_Window); -extern void W_FlushLineCaches (W_Window); extern void W_OverlayBitmap (int, int, W_Icon, @@ -223,26 +219,38 @@ #define W_EV_CM_BUTTON 5 #endif -#define W_LBUTTON 1 -#define W_MBUTTON 2 -#define W_RBUTTON 3 +#define W_LBUTTON 1 +#define W_MBUTTON 2 +#define W_RBUTTON 3 + +/* Microsoft XButtons support */ +#define W_XBUTTON1 4 +#define W_XBUTTON2 5 + +/* Wheel Mouse support */ +#define W_WHEELUP 6 +#define W_WHEELDOWN 7 #ifdef SHIFTED_MOUSE -#define W_LBUTTON2 4 -#define W_MBUTTON2 5 -#define W_RBUTTON2 6 +#define W_LBUTTON2 8 +#define W_MBUTTON2 9 +#define W_RBUTTON2 10 +#define W_XBUTTON1_2 11 +#define W_XBUTTON2_2 12 -#define W_LBUTTON3 7 -#define W_MBUTTON3 8 -#define W_RBUTTON3 9 +#define W_LBUTTON3 13 +#define W_MBUTTON3 14 +#define W_RBUTTON3 15 +#define W_XBUTTON1_3 16 +#define W_XBUTTON2_3 17 -#define W_LBUTTON4 10 -#define W_MBUTTON4 11 -#define W_RBUTTON4 12 +#define W_LBUTTON4 18 +#define W_MBUTTON4 19 +#define W_RBUTTON4 20 +#define W_XBUTTON1_4 21 +#define W_XBUTTON2_4 22 #endif #define W_BoldFont W_HighlightFont - - #endif /* _h_Wlib */ Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- data.h 21 Jan 2003 21:27:56 -0000 1.1.1.1 +++ data.h 12 Apr 2006 04:20:03 -0000 1.2 @@ -19,8 +19,6 @@ #define shield_height 20 #define cloak_width 20 #define cloak_height 20 -#define icon_width 112 -#define icon_height 80 #ifndef COLORIZE #define etorp_width 3 @@ -69,6 +67,7 @@ extern int showPlanetNames; extern int warnShields; extern int showStats; +extern int showHints; #ifdef RECORDGAME extern FILE *recordFile; /* recorder */ extern int playback; @@ -108,8 +107,13 @@ #ifdef META extern char *metaServer; +extern char *metaServer1; +extern char *metaServer2; +extern char *metaServer3; extern int metaPort; - +#ifdef METAPING +extern int metaPing; +#endif #endif #define NUM_DIST 27 /* Number of distress macros */ @@ -177,6 +181,7 @@ extern int tournMask; extern int nextSocket; extern char *serverName; +extern char *serverNick; extern char defaultsFile[80]; extern int loggedIn; extern int reinitPlanets; @@ -189,6 +194,7 @@ extern int phaserStats; extern int phaserStatTry; extern int phaserStatHit; +extern unsigned long phaserStatDamage; #endif extern int scanplayer; @@ -217,7 +223,6 @@ extern int showTractorPressor; extern int showAllTractorPressor; extern int showLock; -extern int phaserMsg; extern int planetBitmap; extern int logging; extern int continueTractor; @@ -232,7 +237,7 @@ extern double Sin[], Cos[]; -extern W_Icon stipple, clockpic, icon; +extern W_Icon stipple, clockpic; extern W_Icon base_expview; extern W_Icon expview[BMP_SHIPEXPL_FRAMES]; @@ -293,10 +298,10 @@ extern struct rank ranks[NUMRANKS]; -extern W_Window messagew, w, mapw, statwin, baseWin, infow, iconWin, tstatw, +extern W_Window messagew, w, mapw, statwin, baseWin, infow, tstatw, war, warnw, helpWin, teamWin[4], qwin, messwa, messwt, messwi, messwk, planetw, rankw, playerw, optionWin, reviewWin; -extern W_Window scanw, scanwin, udpWin, phaserwin; +extern W_Window scanw, scanwin, udpWin, phaserwin, hintWin; #ifdef SHORT_PACKETS extern W_Window spWin; @@ -337,6 +342,7 @@ extern int showIND; extern int newPlist; +extern int playerListHack; extern struct dmacro_list *distmacro; @@ -359,6 +365,7 @@ #ifdef MOTION_MOUSE extern int continuousMouse; +extern int continuousMouseFix; extern int motionThresh; extern int motion_mouse_enablable; extern int motion_mouse_steering; @@ -377,6 +384,8 @@ extern int b1_as_shift; extern int b2_as_shift; extern int b3_as_shift; +extern int b4_as_shift; +extern int b5_as_shift; #endif @@ -496,16 +505,55 @@ extern int mungScrollbarColors; extern int showMotd; -extern char *saveFile; -extern int saveBig; -extern int saveMacro; -extern int saveRCD; -extern int saveRCM; +extern char *saveFile; /* file name to save options to */ +extern int saveBig; /* save options with comments */ +extern int saveMacro; /* save options with macros */ +extern int saveRCD; /* save options with RCD */ +extern int saveRCM; /* save options with RCM */ -extern int tpDotDist; +extern int tpDotDist; /* distance between tractor/pressor dots */ extern struct tractor *tractcurrent; extern struct tractor *tractrunner; extern struct tractor *tracthead; +extern int agriCAPS; /* show agri names in caps on map */ +extern int agriColor; /* agri planets font color on map */ + +extern int windowMove; /* allow moving of internal windows */ +extern int mainResizeable; /* allow resize of netrek window */ +extern int playerListMessaging; /* allow message zoom when clicking on player list */ +extern int observerMode; /* set observer mode variable */ +extern int observerPorts[]; /* predefined list of observer ports */ +extern int showHockeyScore; /* show hockey score on map */ + +extern char pigcall[]; /* pigcall string */ +extern char cowid[]; /* cowid string */ + +extern int serverType; /* server type variable */ +extern int beepOnPrivateMessage; /* beep if private message was received */ +extern W_Window wam_windows[]; /* window allowed messages types */ + +extern int showStars; /* show background stars on local */ +extern int warpStreaks; /* show warp streaks */ + +/* time client connected to server */ +extern time_t timeStart; /* time when client connected to server */ + +/* timer data */ +extern int timerType; /* type of dashboard timer */ +extern time_t timeBank[]; /* different kind of times to store for different timer types */ + +extern int omitTeamLetter; /* don't show team letter on map */ + +extern int viewBox; /* show local window box on map */ + +extern struct stringlist *defaults; /* pointer to defaults list */ + +/* DoubleBufering */ +extern SDBUFFER *localSDB; /* double buffer for local window */ +extern SDBUFFER *mapSDB; /* double buffer for map window */ + +extern int disableWinkey; /* disable WinKey + ContextKey during the game */ + #endif /* _h_data */ From modemhero at users.sourceforge.net Tue Apr 11 23:20:07 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 04:20:07 +0000 Subject: [netrek-cvs] client/netrekxp/win32 config.h,1.1.1.1,1.2 Message-ID: Update of /cvsroot/netrek/client/netrekxp/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14821/win32 Modified Files: config.h Log Message: Update to version 4.4.0.3 Index: config.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/win32/config.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- config.h 21 Jan 2003 21:30:16 -0000 1.1.1.1 +++ config.h 12 Apr 2006 04:20:05 -0000 1.2 @@ -20,12 +20,7 @@ ################################################################################ */ -#define ARCH "Intel/Win32" -#define CBUGS "Send bugs/suggestion to:" -#define COWID "Netrek XP Mod, Intel/Win32" -#define CWHO "keyos at keyos.org" -// This is the pig call returned when someone sends five spaces -#define PIGCALL "Netrek XP Mod - the smarter netrek eXPerience!" +#define CBUGS "Send bugs/suggestion to: keyos at keyos.org" /* ################################################################################ @@ -98,6 +93,9 @@ /* META - show active servers via metaserver - NBT */ #define META +/* METAPING - improvements to metaserver window */ +#define METAPING + /* PACKET_LOG - log packets to stdout (for bandwith measurement) */ #define PACKET_LOG From modemhero at users.sourceforge.net Tue Apr 11 23:20:05 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 04:20:05 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs hints.dat, NONE, 1.1 changes.txt, 1.1.1.1, 1.2 sample_xtrekrc.txt, 1.1.1.1, 1.2 xtrekrc_options.txt, 1.1.1.1, 1.2 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14821/resources/docs Modified Files: changes.txt sample_xtrekrc.txt xtrekrc_options.txt Added Files: hints.dat Log Message: Update to version 4.4.0.3 Index: sample_xtrekrc.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/sample_xtrekrc.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- sample_xtrekrc.txt 21 Jan 2003 21:27:57 -0000 1.1.1.1 +++ sample_xtrekrc.txt 12 Apr 2006 04:20:03 -0000 1.2 @@ -172,19 +172,19 @@ #war.geometry: +800 #war.mapped: off -#fed.parent: netrek +#fed.parent: local #fed.mapped: on -#ori.parent: netrek +#ori.parent: local #ori.mapped: on -#rom.parent: netrek +#rom.parent: local #rom.mapped: on -#kli.parent: netrek +#kli.parent: local #kli.mapped: on -#quit.parent: netrek +#quit.parent: local #quit.mapped: on #option.parent: netrek --- NEW FILE: hints.dat --- to disable this window permanently you should add "showHints: off" to your rc file when you are low on planets, you should let the more experienced players pick the armies. Those should not be wasted. when you are in doubt, you should ask a Commodore, Rear Adm. or Admiral for advice. when your team has lots of armies, you should not be afraid to pick them. They'll get bombed anyway. just because you carry armies, that doesn't mean you can't fight. the team that delivers the most armies wins. you should have flexible goals. killing an opponent with a buddy is easier then doing it on your own. you should always go for the open planet when you are carrying. it's dangerous to underestimate opponents or overestimate teammates. sometimes you just have to hope that they miss. you should not cloak in your own backfield; you will only fool your teammates. you should send a single distress call after you pick up armies to let your team know that you carry. escorts should stay between the ogger and the carrier. you should never kill an ogger who is out of fuel or crippled. you should get near their planets. you should use the space people give away when running. you should think globally and act locally. you're not pac-man: do not eat the dots. you should always shoot at cloakers. you should watch the galactic map at all times. you should always tractor enemies off planets. you should never pass up an opportunity to bomb. you can't be everywhere at once. you should not fixate on one target. planning is good, but opportunism is better. if an enemy is annoying you by what he is doing, you should consider adopting his strategy. you should not argue about which planet to take. nobody completely understands the game. Certainly not you. you should not tell others what to do. you should fly at maximum warp to your destination unless you need to turn. "shut up and play" often is a wise tactic. you should not waste your fuel firing torpedos that the enemy will dodge. nobody can dodge phasers. instead of flying in circles, you should stop and repair; you'll save fuel. you should do the easy things first. you should always shoot the escort first. you should try to fight past the enemy's front-line planets. death is only a temporary setback. the lines are better than the dots, but the dots go farther. you should not keep beating your head against the same wall. you can run from multiple oggers almost as easily as from one. you should never go out to third space to escort. you can't make your teammates more clueful, no matter what you type. you should not chase ships. Be content to occupy the space they left you. you should not fly to lost plays. You're too late, do something more useful instead. if you carry armies, you should not go to the same planet another carrier on your team already called. you should not react to their game, but play your own game. plasma is for twinks. you should use the dots to make your lines hit. you can fire torps in the path of your opponent to force them to slow down. if you phaser every second you'll win most dogfights. all the experts fire their next phaser right after the last phaser died away for maximum efficiency. phasers have a constant cycle time. Learn this and phaser faster than your opponent. skill does not equal clue. you should not celebrate dooshes when you are on the team that is cored. cloaking does not make you invincible. fuel is your friend. Treasure it. you can det for a carrier even if you are almost out of fuel. detting only takes 100 fuel. Spending that 100 fuel on a det can make your carrier very happy. dying is the fastest way of repairing and refueling. The best way to defend a starbase is to aggressively attack the enemy oggers. you should attack them. Yes, you. buttorping is stupid, unless you are the carrier. if you want to improve your play, you can observe the better players by joining the observer port (right click on the metaserver). rank does not equal clue. you should 1) Maxwarp to the front. 2) Face forward. 3) Attack. 4) Do not buttorp. 5) Die. 6) Goto 1). practice makes perfect. nobody said this was easy. there is no I in team. it is always a good idea to fly into enemy space. you should never let an enemy CA live in your backfield. you should never chase a SC bomber with 0 kills. You can't catch it. if you feel useless, you can always grab a SC and start SC bombing. People will love you for it. when you are SC bombing, your job is not to engage enemy ships, but solely trying to bomb as many armies as possible. starbases are not toys. Do not fly one if you do not know how to fly one. Ask your team if it's ok for you to try one out. if a starbase dies, it takes 30 minutes to get a new one. Ask your team if it's ok for you to try one out. information is the most valuable commodity in netrek. Use the teamboard. Read it. Write to it. you should not be afraid to admit that you screwed up. Trust us, everyone else knows you did. having a thick skin helps. Saying "sorry, I'm new" if you're being yelled at can work wonders. everyone has a bad day, try not to take things personal. you can ignore messages from individual people by sending them :ita. If people are abusive to you, just ignore them. you should learn to recognize the good players by their login IDs and player handles. They are the best way to get better at this game. Watch them and/or talk to them. people with an offense rating of over 1.50 are to be respected. Can you maintain an offense of over 1.50? dying is a good thing. (In netrek anyway). if you are down to 5 planets or less, you should only bomb the planets outside of your core five. Let the more experienced players decide when to bomb the other ones. a cruiser (CA), can fly up to warp 9, has 10.000 fuel, 100 hull, 100 shields, 40 pt torps and can do up to 100 pt maximum phaser damage. an assault ship (AS), can fly up to warp 8, has 6.000 fuel, 200 hull, 80 shields, 30 pt torps and can do up to 80 pt maximum phaser damage. a battle ship (BB), can fly up to warp 8, has 14.000 fuel, 130 hull, 130 shields, 40 pt torps and can do up to 105 pt maximum phaser damage. a scout (SC), can fly up to warp 12, has 5.000 fuel, 75 hull, 75 shields, 25 pt torps and can do up to 75 pt maximum phaser damage. a destroyer (DD), can fly up to warp 10, has 7.000 fuel, 85 hull, 85 shields, 30 pt torps and can do up to 85 pt maximum phaser damage. a starbase (SB), can fly up to warp 2, has 60.000 fuel, 600 hull, 500 shields, 30 pt torps and can do up to 120 pt maximum phaser damage. assault ships have the best cloaking capabilities in the game and are mainly used for taking heavily guarded planets. battleships have the strongest fire power of non-star bases, but they must operate near a fuel planet to be effective. cruisers are the most well rounded ship, having high firepower and good manoeuvrability. scouts offer the fastest speed and manueverability, but are best used for bombing or taking. They are too brittle to be used for space controlling. starbases are the strongest ships in terms of fire power and can only be killed by a concentrated team effort. "to ogg" means, the process of cloaking and appearing adjacent to an enemy while firing torps and tractoring on to him, with the purpose to kill that player, without caring about dying in the process. "to doosh" means, killing an enemy ship which is carrying armies. People often yell "doosh!" after they kill a huge carrier. a "planet scum" is someone who only cares about taking planets so he gets good ratings. This often hurts the team because the wrong planets are taken, or the planets are taken with little armies and easily captured back. Index: xtrekrc_options.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/xtrekrc_options.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- xtrekrc_options.txt 21 Jan 2003 21:28:05 -0000 1.1.1.1 +++ xtrekrc_options.txt 12 Apr 2006 04:20:03 -0000 1.2 @@ -3,25 +3,57 @@ # Options added since NetrekXP final release +agriCAPS: (on/off) show AGRI planet name in caps on the map + +agriColor: (0-2) select color to display agri planet names on the map +# 0 - owner race color +# 1 - white +# 2 - gray + +b4keymap: (string) keymap for mouse button 4 (mouseAsShift=on) +b5keymap: (string) keymap for mouse button 5 (mouseAsShift=on) +continuousMouseFix: (on/off) fix continuous mouse behavior +disableWinkey (on/off) disable Windows and Context keys +mainResizeable: (on/off) make main window (netrek) resizeable +metaPing: (on/off) show ping stats to all servers in metaserver window +omitTeamLetter: (on/off) omit team letter on galaxy +playerListHack: (on/off) if player's letter is greater than 'f' suppose that + the player is observer. +playerListMessaging: (on/off) allow messages to be sent to players by clicking player + on the player list window phaserShrinkStyle: (0-1) shrink own phasers using specific style # 0 - COW style (fixed length phaser) -# 1 - BRMH style (phaser shrinks during rechange time +# 1 - BRMH style (phaser shrinks during rechange time) saveFile: (path) path to saved options file saveBig: (on/off) save options with remarks saveMacro: (on/off) save macros to saveFile saveRCD: (on/off) save receiver configurable distresses to saveFile saveRCM: (on/off) save receiver configurable messages to saveFile +showAllTractorPressor: (on/off) show each player's tractor/pressor beams (requires server support) +showHints: (on/off) show hints window showHockeyLinesLocal: (on/off) show hockey lines on tactical showHockeyLinesMap: (on/off) show hockey lines on galactic -showAllTractorPressor: (on/off) show each player's tractor/pressor beams (requires server support) +showHockeyScore: (on/off) show hockey score on galactic +showStars: (on/off) show background stars + +timerType: (0-4) type of timer on dashboard window +# 0 - don't show +# 1 - current time +# 2 - server time +# 3 - time in ship +# 4 - user-set time + +viewBox: (on/off) show tactical window boundaries on map +warpStreaks: (on/off) show streaks while warping to starbase +windowMove: (on/off) enable internal windows to be moved with mouse # Options of the NetrekXP final release autoQuit: (int) autoquit time after death b1keymap: (string) keymap for mouse button 1 (mouseAsShift=on) -b2keymap: (string) keymap for mouse button 1 (mouseAsShift=on) -b3keymap: (string) keymap for mouse button 1 (mouseAsShift=on) +b2keymap: (string) keymap for mouse button 2 (mouseAsShift=on) +b3keymap: (string) keymap for mouse button 3 (mouseAsShift=on) baseUdpLocalPort: (port) use this port as base for UDP buttonmap: (string) change mouse button map buttonmap-: (string) use this buttonmap for ship (sc,dd,ca,bb,as,sb,ga,att) @@ -87,6 +119,7 @@ mouseAsShift: (on/off) use mouse buttons to switch keymaps mungScrollbarColors: (on/off) set scrollbar colors to match background colors name: (string) character nick name +netrek.w32caption: (on/off) when off - shows titlebar in netrek window newDashboard: (0-3) dashboard style # 0 - Text @@ -107,14 +140,6 @@ partitionList: (on/off) add blank line between teams in player list password: (string) password for autologin -phaserMsg: (0-5) where to write phaser messages -# 0 - none -# 1 - review all -# 2 - review team -# 3 - review indiv -# 4 - review kill -# 5 - total - phaserShrink: (0-16) shrink own phaser by x/16 of its length # 0-16 for COW style phaser shrink # 0-11 for BRMH style phaser shrink @@ -137,7 +162,7 @@ # 'r' - Ratio # 's' - Speed # 'v' - Deaths per hour -# 'w' - War staus +# 'w' - War status # 'B' - Bombing # 'C' - Curt (short) rank # 'D' - Defense @@ -196,6 +221,7 @@ showStats: (on/off) show ship statistics showTractorPressor: (on/off) show tractors and pressors shrinkPhaserOnMiss: (on/off) don't draw phaser line on miss +singleMacro: (string) macro keys that will trigger macro without macro mode sortMyTeamFirst: (on/off) show my team first in the player list sortPlayers: (on/off) sort players by teams sound: (on/off) enable sound @@ -253,7 +279,6 @@ # help Help Window # UDP UDP Options Window # pingStats Ping Statistics Window -# buttonkeymap Keymap Window # xtrekrc_help The xtrekrc help Window # macro Active Macros Window Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- changes.txt 21 Jan 2003 21:27:57 -0000 1.1.1.1 +++ changes.txt 12 Apr 2006 04:20:03 -0000 1.2 @@ -1,3 +1,187 @@ +Version 4.4.0.3: + +- added "viewBox: (on)/off" to show tactical boundaries on galaxy +- added "omitTeamLetter: on/(off)" to stop drawing team letter on galaxy +- added "showStars: (on)/off" to have paradise-like background stars +- added "warpStreaks: (on)/off" to draw streaks while warping to starbase and having + background stars on +- added "disableWinkey: (on)/off" to allow Windows and Context keyboard keys to be disabled +- added "timerType: 0-4" to be able to switch timer like in paradise. + 0 - don't show + (1) - show current time + 2 - show server time + 3 - show time in ship + 4 - show user-set time +- "\" will now reset timer to 00:00:00 and start counting up +- added "continuousMouseFix: on/(off)" option. If enabled the continuous mouse will follow + any buttons that are pressed at the same time. For example if you are steering and + firing at the same time this fix will allow both events to occur. Without the fix the + behavior was to only allow one button action. +- sound volume can now be changed using keyboard: + 'v' - decrease volume + 'V' - increase volume +- planet bitmaps can now be switched through options menu +- rearranged option menus. moved all show/hide window options to Windows menu +- added metaserver2.us.netrek.org and metaserver.eu.netrek.org to the default list of + servers to try to connect to before falling down to metaCache +- changed some defaults to help newbies +- options menu now automatically resizes when switching from one page to another +- messages can now be up to 1024 characters long. to allow server-side compatibility every + message longer than 69 characters is split to chunks of 69 and sent one-by-one +- planets and players will appear as soon as they enter tactical window bounds. earlier + the bitmaps were painted only when their center was entering tactical window + +Version 4.4.0.2: + +- repack of 4.4.0.1 with some bug fixes + +Version 4.4.0.1: + +- most options in rc file can now have four appearances: + 1. option.observer: string (i.e. "keymap.observer: aabbcc") + 2. option.servernick: string (i.e. "keymap.continuum: aabbcc") + This one will work only if you have "server.servernick: servername" in rc + (i.e. "server.continuum: continuum.us.netrek.org") + 3. option.servertype: string (i.e. "keymap.bronco: aabbcc") + This will work if you either connect from metaserver window (then types are taken from metaserver report) + or if you use option "server.nickname" to map server to nickname and then define "serverType.nickname" to + be one of "paradise, bronco, chaos, inl, sturgeon, hockey, dogfight" (so you will have two lines is rc: + "server.pickled: pickled.psychosis.net" and "serverType.pickled: bronco") + 4. option: string (i.e. "keymap: aabbccdd") + the options are validated in same order (from 1 to 4 where 1 is best match and 4 is worst match) +- added "window.allow" option to message windows (review, review_all, review_team, review_your, review_kill, review_phaser) + The option lets you set type of messages logged into that window. + Message types: + I - individual messages + T - team messages + A - all messages + K - kill messages + P - phaser messages + Default settings: + review.allow: ITAKP + review_all.allow: A + review_team.allow: T + review_your.allow: I + review_kill.allow: K + review_phaser.allow: P +- removed "phaserMsg" rc option, because now you can define where to log phaser messages using "window.allow: P" +- changed player list to not show any information on hidden players instead of returning your own info like + it was before +- player list is now clickable: + LeftClick - send private message to person that was clicked + RightClick - send message to own team + MiddleClick - send message to all +- added "playerListMessaging: on/off" rc option to enable/disable clickable player list (also added to options + window to be able to do that in-game) +- added "beepOnPrivateMessage: on/off" rc option. If enabled the client will beep when you receive private + message from somebody that is not yourself or god. +- added "showHockeyScore: on/off" rc option to show hockey score during the game on map +- changed '-n' command line behavior to opposite. Now the client won't show console window by default + unless you run it with '-n' or you start the program from command line. +- modified help window to show 'Off' for unmapped keys +- now you can remap keys by pointing at the key in the help window and pushing key you want it to be +- xtrekrc.txt and netrekrc.txt are also searched during defaults initialization +- Pig Call will now include binary version number +- 4th and 5th mouse buttons can now be mapped and used (not tested) + button 4 can be mapped as '4' + button 5 can be mapped as '5' +- wheel up and down can be mapped in buttonmap now ('6' for wheelup and '7' for wheeldown) +- added average phaser hit to phaser statistics +- added player number to phaser message (Phaser burst hit guest (R0) for 64 points 10:00:01) +- minor fix in message window. it wasn't refreshed when switching out of netrek with Alt-Tab + and coming back. +- fixed application bitmap that wasn't loaded right. added both big and small bitmaps. So don't panic when + you don't see ugly Windows default application icon on your taskbar. +- pingStats window didn't have base window as parent, so it could float around. Also removed option + to display while not logged in. +- swapped between message windows and dashboard/playerlist. dashboard is now below tactical +- added help line to metaserver window. clickable links to favorite netrek internet resources +- fixed minor bug in saveOptions() where first two macro lines of the first macro were not saved +- added help file to the project (netrek.chm) +- binded F1 to open help file if it exists in executable directory +- added "Save options now" menu to options menu + +Versions pre-4.4.0.1: + +03-Feb-2004: + +- added command line option '-n' to hide console window that is pretty much useless + unless you need to see what is the problem with connection + +05-Jul-2003: + +- added "metaPing: on/off" to show ping statistics in the metaserver window. The feature + was coded by Erik Hietbrink (Shadow Hunter). The feature is enabled by default. + +18-May-2003: + +- macros in macro window can now be scrolled using 'f' - line down, 'b' - line up, + 'F' - page down, 'B' - page up + +16-May-2003: + +- added "mainResizeable: on/off" to enable resizing of main window (not in-game). +- fixed the behavior of main window with "windowMove: off" (it wouldn't move too). + +14-May-2003: + +- added "windowMove: on/off" rc option to disable in-game movement of client windows. +- same for options menu (under Controls menu) + +15-Mar-2003: + +- Ctrl-g will autologin as guest in the login screen + +13-Mar-2003: + +- added randomizer for first hint to be shown in hints window +- added "agriCAPS: on/off" rc option to be able to display AGRI planet names in capital + letters on the map window +- added "agriColor: 0-2" to choose between: 0 - owner race color, 1 - white, 2 - gray +- hints window can now be closed with "unmap special windows" key (space by default) + +12-Mar-2003: + +- agri planet names are written in white on the map +- hints code was rewritten to get rid of hints.dat formatting. +- fixed code that allowed to gather info on cloaked or in-fog-of-war enemy from playerlist + +21-Feb-2003: + +- extended "playerlist" rc option to be able to select amount of decimal places in + float numbers. + Now it is possible to set "playerlist: nTK1 RNr1 S1d0" in order to see: + "R0 CA 0.5 Ensign guest 0.8 2.4 95" + or giving old "playerlist: nTK RNr Sd" will give you: + "R0 CA 0.50 Ensign guest 0.82 2.43 95.07" + Current options that can be followed by numbers 0-2 are: KODSrdBPHkVv + +19-Feb-2003: + +- macros can now be sent using players from the player list as target. Some default + distresses can also be used with playerlist. + +09-Feb-2003: + +- added hints window. If you're newbie player you will be given some hints on the + game. Credits to Charlie ter Horst, Kevin M Bernatz, David Swasey. +- added showHints: on/off rc option to disable hints window. Don't do that if you + still didn't read all of them + +25-Jan-2003: + +- fixed info/lock in the player list window to work right in case of playerListHack: on + +24-Jan-2003: + +- added playerListHack: on/off option to fix the problem with displaying + observers/players in the player list window while playing on server with + old code. If playerListHack is on then every player with letter greater + than 'f' will be shown as observer. + This way you can display only players in the player list. + Use 'L' to rotate player list window between: all players/players only/observers only +- changed maximum number of macro lines to be 500 instead of old 75 + 20-Jan-2003: - fixed colorfulPhasers option to shrink in case that shrinkage is used From modemhero at users.sourceforge.net Tue Apr 11 23:29:05 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 04:29:05 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html/images - New directory Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22433/images Log Message: Directory /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/images added to the repository From modemhero at users.sourceforge.net Tue Apr 11 23:28:36 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 04:28:36 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html - New directory Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21978/html Log Message: Directory /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html added to the repository From modemhero at users.sourceforge.net Tue Apr 11 23:31:06 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 04:31:06 +0000 Subject: [netrek-cvs] client/netrekxp/resources/sounds nt_cloaked.wav, NONE, 1.1 nt_enter_ship.wav, NONE, 1.1 nt_explosion.wav, NONE, 1.1 nt_explosion_other.wav, NONE, 1.1 nt_fire_plasma.wav, NONE, 1.1 nt_fire_plasma_other.wav, NONE, 1.1 nt_fire_torp.wav, NONE, 1.1 nt_fire_torp_other.wav, NONE, 1.1 nt_intro.wav, NONE, 1.1 nt_message.wav, NONE, 1.1 nt_phaser.wav, NONE, 1.1 nt_phaser_other.wav, NONE, 1.1 nt_plasma_hit.wav, NONE, 1.1 nt_red_alert.wav, NONE, 1.1 nt_self_destruct.wav, NONE, 1.1 nt_shield_down.wav, NONE, 1.1 nt_shield_up.wav, NONE, 1.1 nt_torp_hit.wav, NONE, 1.1 nt_uncloak.wav, NONE, 1.1 nt_warning.wav, NONE, 1.1 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/sounds In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23922/resources/sounds Added Files: nt_cloaked.wav nt_enter_ship.wav nt_explosion.wav nt_explosion_other.wav nt_fire_plasma.wav nt_fire_plasma_other.wav nt_fire_torp.wav nt_fire_torp_other.wav nt_intro.wav nt_message.wav nt_phaser.wav nt_phaser_other.wav nt_plasma_hit.wav nt_red_alert.wav nt_self_destruct.wav nt_shield_down.wav nt_shield_up.wav nt_torp_hit.wav nt_uncloak.wav nt_warning.wav Log Message: Update to version 4.4.0.3 --- NEW FILE: nt_plasma_hit.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nt_phaser.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nt_uncloak.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nt_enter_ship.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nt_message.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nt_explosion.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nt_intro.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nt_torp_hit.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nt_phaser_other.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nt_warning.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nt_explosion_other.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nt_red_alert.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nt_shield_up.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nt_shield_down.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nt_fire_torp_other.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nt_fire_plasma_other.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nt_self_destruct.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nt_fire_plasma.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nt_fire_torp.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nt_cloaked.wav --- (This appears to be a binary file; contents omitted.) From modemhero at users.sourceforge.net Tue Apr 11 23:31:06 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 04:31:06 +0000 Subject: [netrek-cvs] client/netrekxp/src/winkey winkey.cpp, NONE, 1.1 winkey.def, NONE, 1.1 winkey.dsp, NONE, 1.1 winkey.dsw, NONE, 1.1 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src/winkey In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23922/src/winkey Added Files: winkey.cpp winkey.def winkey.dsp winkey.dsw Log Message: Update to version 4.4.0.3 --- NEW FILE: winkey.cpp --- #define WIN32_LEAN_AND_MEAN #define STRICT #include #pragma data_seg(".shared") HHOOK g_hMsgHook = NULL; HHOOK g_hKeyHook = NULL; int g_iFlags = NULL; #pragma data_seg() const int KILL_WINKEY = 0x0001; const int KILL_CTRLESC = 0x0002; const int KILL_COMBOS = 0x0004; const int KILL_CONTEXT = 0x0008; LRESULT CALLBACK Msg_HookProc (int iCode, WPARAM wParam, LPARAM lParam); LRESULT CALLBACK Key_HookProc (int iCode, WPARAM wParam, LPARAM lParam); extern "C" __declspec(dllexport) void __fastcall Kill (int iFlags); extern "C" BOOL __stdcall _DllMainCRTStartup (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID /*lpvReserved*/) { if (fdwReason == DLL_PROCESS_ATTACH) { DisableThreadLibraryCalls (hinstDLL); } return TRUE; } LRESULT CALLBACK Msg_HookProc (int iCode, WPARAM wParam, LPARAM lParam) { if (wParam != PM_NOREMOVE && iCode >= 0) { if (((MSG*)lParam)->message == WM_SYSCOMMAND && ((MSG*)lParam)->wParam == SC_TASKLIST) { if ((g_iFlags & KILL_WINKEY) && !(g_iFlags & KILL_CTRLESC) && !((GetAsyncKeyState (VK_CONTROL) & 32768) && (GetAsyncKeyState (VK_ESCAPE) & 32768))) { ((MSG*)lParam)->message = WM_NULL; } else if ((g_iFlags & KILL_WINKEY) && (g_iFlags & KILL_CTRLESC)) { ((MSG*)lParam)->message = WM_NULL; } else if (!(g_iFlags & KILL_WINKEY) && (g_iFlags & KILL_CTRLESC) && GetAsyncKeyState (VK_CONTROL) && GetAsyncKeyState (VK_ESCAPE)) { ((MSG*)lParam)->message = WM_NULL; } } else if (((MSG*)lParam)->message == WM_CONTEXTMENU && GetAsyncKeyState (VK_APPS) && (g_iFlags & KILL_CONTEXT)) { ((MSG*)lParam)->message = WM_NULL; } else if (((MSG*)lParam)->message == WM_HOTKEY && (LOWORD(((MSG*)lParam)->lParam) & MOD_WIN) && (g_iFlags & KILL_COMBOS)) { ((MSG*)lParam)->message = WM_NULL; } } return CallNextHookEx (g_hMsgHook, iCode, wParam, lParam); } LRESULT CALLBACK Key_HookProc (int iCode, WPARAM wParam, LPARAM lParam) { if (iCode != HC_NOREMOVE && iCode >= 0) { if ((wParam == VK_LWIN || wParam == VK_RWIN) && (g_iFlags & KILL_COMBOS)) { return 1; } if (wParam == VK_APPS && (g_iFlags & KILL_CONTEXT)) { return 1; } } return CallNextHookEx (g_hKeyHook, iCode, wParam, lParam); } extern "C" __declspec(dllexport) void __fastcall Kill (int iFlags) { if(iFlags) { g_iFlags = iFlags; HINSTANCE hInst = GetModuleHandle ("winkey.dll"); if ((iFlags & KILL_WINKEY) || (iFlags & KILL_CTRLESC)) { g_hMsgHook = SetWindowsHookEx(WH_GETMESSAGE, (HOOKPROC)Msg_HookProc, hInst, 0); } if ((iFlags & KILL_CONTEXT) || (iFlags & KILL_COMBOS)) { g_hKeyHook = SetWindowsHookEx (WH_KEYBOARD, (HOOKPROC)Key_HookProc, hInst, 0); if (!g_hMsgHook) { g_hMsgHook = SetWindowsHookEx (WH_GETMESSAGE, (HOOKPROC)Msg_HookProc, hInst, 0); } } return; } if (g_hMsgHook) { UnhookWindowsHookEx (g_hMsgHook); } if (g_hKeyHook) { UnhookWindowsHookEx (g_hKeyHook); } } --- NEW FILE: winkey.dsw --- Microsoft Developer Studio Workspace File, Format Version 6.00 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! ############################################################################### Project: "winkey"=.\winkey.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### Global: Package=<5> {{{ }}} Package=<3> {{{ }}} ############################################################################### --- NEW FILE: winkey.def --- EXPORTS Kill @1 NONAME --- NEW FILE: winkey.dsp --- # Microsoft Developer Studio Project File - Name="winkey" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 CFG=winkey - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "winkey.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "winkey.mak" CFG="winkey - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "winkey - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "winkey - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe MTL=midl.exe RSC=rc.exe !IF "$(CFG)" == "winkey - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "Release" # PROP BASE Intermediate_Dir "Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "\netrek_files\tmp\winkey\Release" # PROP Intermediate_Dir "\netrek_files\tmp\winkey\Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /G6 /Gr /W3 /O2 /Ob2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /GF /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /machine:I386 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:none /machine:I386 /nodefaultlib /SECTION:.shared,rws /out:"\netrek_files\netrek\bitmaps\winkey.dll" !ELSEIF "$(CFG)" == "winkey - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "Debug" # PROP BASE Intermediate_Dir "Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "\netrek_files\tmp\winkey\Debug" # PROP Intermediate_Dir "\netrek_files\tmp\winkey\Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /entry:"_DllMainCRTStartup" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib /pdbtype:sept /SECTION:.shared,rws /out:"\netrek_files\netrek\bitmaps\winkey.dll" # SUBTRACT LINK32 /pdb:none !ENDIF # Begin Target # Name "winkey - Win32 Release" # Name "winkey - Win32 Debug" # Begin Source File SOURCE=.\winkey.cpp # End Source File # Begin Source File SOURCE=.\winkey.def # End Source File # End Target # End Project From modemhero at users.sourceforge.net Tue Apr 11 23:31:05 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 04:31:05 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html basics.html, NONE, 1.1 commandline.html, NONE, 1.1 configfile.html, NONE, 1.1 configsyntax.html, NONE, 1.1 controlsintro.html, NONE, 1.1 dashboard.html, NONE, 1.1 defaultmap.html, NONE, 1.1 galaxy.html, NONE, 1.1 gamecontrols.html, NONE, 1.1 generalconfig.html, NONE, 1.1 intro.html, NONE, 1.1 jointhegame.html, NONE, 1.1 loginscreen.html, NONE, 1.1 macrosconfig.html, NONE, 1.1 main.css, NONE, 1.1 mainwindows.html, NONE, 1.1 messages.html, NONE, 1.1 metaserver.html, NONE, 1.1 motdwindow.html, NONE, 1.1 playerlist.html, NONE, 1.1 plistconfig.html, NONE, 1.1 remapping.html, NONE, 1.1 serversettings.html, NONE, 1.1 tactical.html, NONE, 1.1 teamselect.html, NONE, 1.1 windowsconfig.html, NONE, 1.1 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23922/resources/htmlhelp/html Added Files: basics.html commandline.html configfile.html configsyntax.html controlsintro.html dashboard.html defaultmap.html galaxy.html gamecontrols.html generalconfig.html intro.html jointhegame.html loginscreen.html macrosconfig.html main.css mainwindows.html messages.html metaserver.html motdwindow.html playerlist.html plistconfig.html remapping.html serversettings.html tactical.html teamselect.html windowsconfig.html Log Message: Update to version 4.4.0.3 --- NEW FILE: gamecontrols.html --- Game Controls

Game Controls

In this section you will learn how to use mouse and keyboard to fly your ship, change options, etc.

Section topics:

--- NEW FILE: intro.html --- Introduction

Introduction

NetrekXP Mod is a client for Netrek - multiplayer battle simulation game. The program is modification of existing client called NetrekXP (yeah, this is where 'Mod' comes from). All Netrek clients have some similarities and some differences. I would recommend trying each and every one of them before making decision on what client to play with.

This reference will help you to get familiar with the program, its configurations and possible customizations.

Manual Sections:

--- NEW FILE: windowsconfig.html --- Windows Configuration

Windows Configuration

First of all let's list names of NetrekXP Mod windows:

  • netrek - Main window
  • local - Tactical window
  • map - Galaxy window
  • warn - Warning window. Here all warnings are displayed
  • message - Message window. Here you type messages
  • review - Review window
  • review_all - Window that receives All messages
  • review_team - Window that receives Team messages
  • review_your - Window that receives Personal messages
  • review_kill - Window that receives Kill messages
  • review_phaser - Window that receives Phaser messages
  • planet - Planet list window
  • player - Player list window
  • war - War declaration window
  • fed - Federation selection window
  • ori - Orion selection window
  • rom - Romulan selection window
  • kli - Klingon selection window
  • quit - Quit countdown window
  • option - Option menu window
  • rank - Rank window
  • stats - Statistics window
  • help - Help window
  • udp - UDP options window
  • pingstats - Ping statistics window
  • xtrekrc_help - xtrekrc help window
  • macro - Macros window

<window>.map: [on/off] - show window on startup

Example:
pingstats.mapped: on

<window>.parent: <value> - set parent window of <window>

Example:
fed.parent: map - will move Feds selection window from tactical to galaxy

<window>.geometry: <geometry> - set window placement and size

<geometry> parameter can be presented by three different states:

  • <window>.geometry: <width>x<height>+<xpos>+<ypos>
    • <width> - window width
    • <height> - window height
    • <xpos> - window x coordinate
    • <ypos> - window y coordinate
  • <window>.geometry: <width>x<height>
    • <width> - window width
    • <height> - window height
  • <window>.geometry: +<xpos>+<ypos>
    • <xpos> - window x coordinate
    • <ypos> - window y coordinate

Examples:
netrek.geometry: 1024x768+0+0 - default main window geometry
netrek.geometry: 1024x768 - only size parameters
netrek.geometry: +0+0 - only placement parameters

Above options can be used with any window.

Next option can only be used with message windows:

<message window>.allow: [A][T][I][P][K] - choose type of messages printed in message window

  • A - All messages
  • T - Team messages
  • I - Personal (Individual) messages
  • P - Phaser messages
  • K - Kill messages
So if for instance you would like to make bigger review_team, but still don't want to mess it with review_all you can just define 'review_team.allow: TIPK' to watch after any except All messages. --- NEW FILE: dashboard.html --- Dashboard

Dashboard

Dashboard window contains vital ship information and weapons used:

The window is divided roughly in two parts - Flags and Gauges

Let's get familiar with them:

  • Flags from left to right:
    • S - shields on
    • G/Y/R - flag that shows proxymity alert. G for green, Y - yellow, R - red
    • L - you are locked on something (player or planet)
    • R - you are repairing
    • B - you are bombing
    • O - you are orbiting planet
    • D - you are docking startbase (or if you are starbase then docking is enabled)
    • C - you are cloaked
    • W - your weapons are hot
    • E - your engine is hot
    • P/T - you are pressoring or tractoring somebody
    • u/d - you are beaming armies up or down
  • Gauges:
    • Sp - ship speed
    • Sh - shields damage points
    • Da - hull damage points
    • Ar - armies carried
    • Wt - weapons temperature
    • Et - egnine temperature
    • Fu - fuel available
    • Kills - number of kills
--- NEW FILE: loginscreen.html --- Login Screen

Login Screen

After successfull connection to the server you will see the main game window. It is divided to four parts initially, but we will get familiar with each of them in the next topics.

If your client isn't configured to automatically login you to the game you will be asked to supply your username and password to join the game (or observe the game).

The login window is located on the top left of main screen:

There are two types of logins on most servers - guest user and authenticated user.

If you type "guest" as your name or push Ctrl-g you will not be required to supply password. There are some differences between guest users and authenticated users. The major difference is that no information is written to the server players database for guests. So when you disconnect from the game all your statistics are wiped out.

For authenticated users everything is saved to players database, so when you come next time to the server and supply your name and password you will start the game with statistics that were saved for you from the last session. --- NEW FILE: macrosconfig.html --- Macros Configuration

Macros Configuration

Macros can be divided in two main categories:

  • Regular Macros
  • Receiver Configurable Distress Macros
The main difference between two is that you send the first type by yourself while second type is actually how you want other's macros to be showed on your client.

In order to trigger any of these you should enter Macro Mode. Some macros are used by players very frequently, so in order to speedup the process you can use following configuration option:

singleMacro: <keys list for one-push macros>

Example:
singleMacro: FE^q - will allow triggering macros defined for F, E and Ctrl-q by single key push.

Regular Macros

Regular macros can be either single or multiline and their general syntax is:

mac.<key>.<recipient>: <macro string>

  • <key> - key to press in macro mode to send macro

    The key can be in form of:

    • char - press key on keyboard
    • ^char - press Ctrl+key on keyboard

  • <recipient> - recipient of the macro

    Recipient can be one of:

    • (empty) - you will be asked to specify recipient after macro activation
    • A - send to All
    • T - send to your Team
    • F - send to Federation
    • K - send to Klingons
    • O - send ti Orions
    • R - send to Romulans
    • a-z - send to player
    • %I, %i, %c - send to yourself
    • %U, %u, %p - send to player nearest your mouse pointer
    • %Z, %z, %t - send to a team whose player nearest your mouse pointer
    • %g - send to friendly player nearest your mouse pointer
    • %h - send to enemy player nearest your mouse pointer

  • <macro string> - text string

    In addition to regular text, macro string can contain:

    • %a - armies carried by sender
    • %d - sender damage percentage
    • %s - sender shields percentage
    • %f - sender fuel percentage
    • %w - sender wtemp percentage
    • %e - sender etemp percentage
    • %t - team id character of target planet
    • %T - team id character of sender team
    • %c - sender id character
    • %n - armies on target planet
    • %E - 1 if etemped, 0 if not
    • %W - 1 if wtemped, 0 if not
    • %S - sender two character ship type
    • %p - id character of target player
    • %g - id character of target friendly player
    • %h - id character of target enemy player
    • %P - id character of player nearest sender
    • %G - id character of friendly player nearest sender
    • %H - id character of enemy player nearest sender
    • %l - three character name of target planet
    • %L - three character name of target planet in capitals
    • %i - sender full player name
    • %I - sender full player name in capitals
    • %u - full name of target player
    • %U - full name of target player in capitals
    • %z - three letter team id of target planet
    • %Z - three letter team id of target planet in capitals
    • %b - planet nearest sender
    • %B - planet nearest sender in capitals
    • %o - three letter sender team name
    • %O - three letter sender team name in capitals
    • %k - sender number of kills
    • %K - number of kills target player has
    • %(SPACE) - adds space to message
    • %v - average ping round trip time
    • %V - standard deviation of ping round trip time
    • %y - percentage of total packet loss identified by server
    • %m - the last message you sent
    • %M - the last message you sent in capitals

    It is also possible to create complex macros using conditional tests:

    • <condition>%{output if true%!output if false%}
    • %? - introduce test
    • = - equivalence
    • < - less
    • > - greater

Examples: 

      mac.F.T:   Help!  Carrying %a!!
      mac.f:     Help!  Carrying %a!!
      mac.c.T:   %p++ near %l
      mac.b.T:   %?%n>4%{bomb %l at %n%!bomb%}
      mac.d.T:   %E%{%!%W%{%!I'm fine.  How are you? %}%}%E%{ETEMPED!!!  %}
                 %W%{WTEMPED!!!  %}Carrying %?%a>0%{%a armies!%!NO armies.%}
      mac.a.T:   %E%{ETEMPED!!!  %}%W%{WTEMPED!!!  %}Carrying %?%a>0%{%a 
                 armies! %!NO armies.%}
      mac.R.A:   I'm a %?%S=SB%{star base!%!twink!%}
      mac.K.A:   KissMy%S
      mac.t:     thanks
      mac.y:     yes
      mac.n:     no
      mac.B:     bye, getting hungry/sleep/horny
      mac.e.T:   need escort going to %l%?%a>0%{, carrying %a armies!%}
      mac.v.%t   %T%c PING stats: Average: %v ms, Stdv: %V ms, Loss: %y%%

Receiver Configurable Distresses

As we already told RCD is opposite to the macro. You decide what do display instead of something that was received from another player.

There is a limited amount of RCDs because server doesn't actually send any text to you, but instead it tells your client that player 'x' sent RCD number 'y'. The client then looks what should be displayed when receiving RCD 'y' and creates text that is only displayed in your client.

RCD syntax also defines key that will trigger RCD to be sent to others. The distress text will be shown same whether you send specific RCD or you receive it from other player:

dist.<key>.<distress name>: <distress text>

  • <key> - same as in regular macros
  • <distress name> - predefined distress name
    • save_planet - general distress call for help
    • base_ogg - distress to prepare for enemy starbase ogg
    • help1 - general distress call for help
    • help2 - general distress call for help
    • asw - ASW (Anti Scout War) distress
    • asbomb - distress for bomb request
    • doing1 - general distress
    • doing2 - general distress
    • pickup - calls armies pickup of enemy player
    • pop - calls planet pop
    • other1 - general distress
    • other2 - general distress
    • help - distress for help
    • escorting - escorting friendly player distress
    • taking - taking planet distress
    • ogg - ogg distress
    • ogging - ogging distress
    • carrying - carried armies call
    • free_beer - free beer enemy call
    • crippled - crippled enemy call
    • controlling - space controlling distress
    • space_control - space control call
    • bomb - bomb call
    • no_gas - no gas distress
    • bombing - bombing distress

All RCDs are predefined by client and can be changed if needed. --- NEW FILE: messages.html --- Message Windows

Message Windows

There are roughly 5 types of messages in Netrek:

  • All - such message is seen by everyone in game
  • Team - this message is seen only by team (race) that it was sent to
  • Individual - this message is only see by person it was sent to
  • Phaser - this message is sent from GOD (server) to player that used phaser. The message contains statistics information on damage
  • Kill - this message is sent by GOD (server) to everyone. Every message contains data on who was killed by whom, what kind of weapon caused death and how much credits were earned

There are 6 different windows that can be used to see these messages:

  • Review - any message is seen there
  • All - only messages to everyone are seen there
  • Team - only team messages are seen there
  • Individual - only messages sent to you are seen there
  • Phaser - phaser messages are see there
  • Kill - only kill messages are seen there

This is how Review window looks:

The default client setup is to show only Review window, so all messages your client receives are displayed there. It is common to argue about best message window setups. Most veterans tend to play with only one Review window. This way they know exact time flow of messages (with multiple windows it is impossible to find out what message arrived before or after any given one). --- NEW FILE: playerlist.html --- Player List

Player List

Player list window contains information on players in the game.

The window contains both players and observers, but can be configured to display only part of the at a time.

Today servers allow 32 players to exist in game - half playing, half observing. It is easy to see players from observers by looking at their player number (letter). Anyone below hexadecimal 'f' (15) will be player, others are observers.

The list contains useful information on other players, such as their name and login, statistics, hours spent playing, etc. You will get familiar with all details after some time of playing. --- NEW FILE: configfile.html --- Configuration File

Configuration File

Any of program configuration options can be saved in configuration file. This way after finding all valuable settings for you it is easy to automatically load them when you fire up the client to play another game.

NetrekXP Mod searches for following files (in order from top to bottom) in the executable directory:

  • netrekrc
  • netrekrc.txt
  • xtrekrc
  • xtrekrc.txt
So if you have one of these file it will be read at startup and change application defaults to whatever values set in the configuration file.

Section topics:

--- NEW FILE: mainwindows.html --- Main Game Windows

Main Game Windows

Congratulations, Captain. You sucessfully joined Netrek Universe:

Next topics will give you short explanation about windows that compose it:

--- NEW FILE: generalconfig.html --- General Configuration Options

General Configuration Options

Following table contains all possible general configuration options and their defaults: [...1059 lines suppressed...]
Name Action Possible Values
agriCAPS ARGI planet names in capital letters on galaxy
  • on (default)
  • off
windowMove Enable moving internal windows
  • on
  • off (default)
--- NEW FILE: galaxy.html --- Galaxy Window

Galaxy Window

Galaxy or Map is the window where you will collect very useful information on what the hell is happening here.

This is a picture of the whole galaxy. All planets have fixed location (though there is a server setting that allows galaxy to rotate). The only resourse that doesn't change from game to game is the planet name, so try to remember planet names. This will be very useful.

Every planet can be owned by one of four races or can be independent. The ownership of the planet is defined by armies the planet has. If there are Romulan armies on it then it is owned by Romulan Empire. The ownership of the planet can be changed by dropping your armies on enemy planets. 1 army kills 1 enemy army. When you kill all enemy armies the planet becomes not owned by anyone and thus can be taken.

Initially only your team planets are visible (i.e. have resources like fuel/repair/agri visible when you try to get info on planet). Other planets are grayed out and you can't get any information on them. In order for planet to become visibile to your team one of team players should orbit it.

--- NEW FILE: basics.html --- The Basics

The Basics

This section will give you short introduction on client look and feel.
You will also find some useful information on how to use different windows.

Section topics:

--- NEW FILE: metaserver.html --- Meta Server Window

Metaserver Window

This will probably be the first window you will see starting the client. The window appears after successfull connection to metaserver that holds list of available netrek servers.

Here is how it looks:

There are several types of games played in Netrek Universe. It could be Bronco, Hockey, Chaos, Dogfight and some others. Most of servers you'll see these days are either Bronco or Hockey. Bronco is the most popular type of Netrek, so go on and click on some Bronco server to connect to the game.

In order to join the game to play you should point on one of the servers and click left mouse button.
If you wish to observe the game instead of playing - click right mouse button.

Clicking on one of yellow links will open your browser on the link's main site --- NEW FILE: teamselect.html --- Team Selection

Team Selection

Right below MOTD window you have Team (Race) Selection part:

There are four races exist in Netrek - Federation, Romulans, Klingons and Orions

Each of the races has different ship pictures (though the ships have exactly same power and weapons among the races).

In the races selection you will see number of players playing per-race. If there is a T-mode you will only be allowed to join one of the two playing races. Otherwise you are allowed to select at least one of three teams.

In order to select team you should do one of two:

  • click with left mouse button on the team box. This will make you join the team in default ship that is defined for client
  • point with mouse at the team box and press one of the following keys to select one of the ship types:
    • s - Scout (SC)
    • d - Destroyer (DD)
    • c - Cruiser (CA)
    • b - Battleship (BB)
    • a - Assault (AS)
    • o - Starbase (SB)

If you want to quit - click on the clock box.

After death you will be presented same team selection window. If you want to change your team or ship you should use explanation above. However if you want to get back to same team in the same ship you can push 'space' button and you are back. --- NEW FILE: plistconfig.html --- Player List Configuration

Player List Configuration

Player list can be configured to show custom columns

Syntax for playerList option is as follows:

playerList: <string of columns>

<string of columns> can contain any of:

  • (space) - White Space
  • b - Armies Bombed
  • d - Damage Inflicted (DI)
  • k - Max Kills
  • l - Login Name
  • n - Ship Number
  • p - Planets Taken
  • r - Ratio
  • s - Speed
  • v - Deaths per Hour
  • w - War Status
  • B - Bombing
  • C - Curt (Short) Rank
  • D - Defence
  • H - Hours Played
  • K - Kills
  • L - Losses
  • M - Host Machine
  • N - Name
  • O - Offence
  • P - Planets
  • R - Rank
  • S - Stats
  • T - Ship Type
  • V - Kills per Hour
  • W - Wins

Examples:

playerList: nTRNKWLr O D d - Old style
playerList: nTK RNlr Sd - Kill watch style
--- NEW FILE: tactical.html --- Tactical Window

Tactical Window

Tactical or Local is the window where you will have most of fun in Netrek.
It is on the top left of the main screen. Your ship is always centered in it and probably looks tainted by your team color over white.

--- NEW FILE: controlsintro.html --- Introduction to Game Controls

Introduction To Game Controls

You will need both mouse and keyboard to fully control the game.

There are several keys that you probably want to learn in order to control the main window:

  • Alt+Enter - toggle title bar of client window. This gives you an option to quickly see what server you are playing on in case of multiple netrek windows are opened
  • Alt+End - minimize current netrek window
  • Shift+Esc - kill the client really fast. This will not perform any cleanup procedures, so please, don't use this to logout

And now let's discuss main game controls:

Mouse

Let's leave mouse buttons aside for a while and discuss only mouse pointer.
First of all the client will behave absolutely identical in Tactical and Galaxy windows.
No matter where you point in one of the windows your client will take mouse coordinates relative to your ship and depending on command you submitted will process it.

The main purpose of mouse is to add coordinates to every action that you want to perform.

For instance if you want to shoot (left mouse button or 't' on keyboard) the torps will fly to where your mouse pointer is located.

Every mouse has buttons and you can use them to perform whatever action you want. The default settings for 3-button mice are:

  • Left button - fire torpedoes
  • Middle button - fire phaser
  • Right button - change direction

It is possible to change defaults by remapping (reassigning) mouse buttons to different actions. It is also possible to use button clicks in conjunction with Ctrl+Shift, Ctrl or Shift keys. We will discuss all of these in Changing Defaults section.

Keyboard

Well, there is nothing special about keyboard in Netrek. It behaves exactly same as in any other application. You press key and something happens.

The only thing you should remember when dealing with keyboard is that every action (well, almost every one) will use your mouse pointer coordinates to complete. So when you want to kill someone you should use your mouse to point at him and only then press your favorit weapon key to shoot.

Technically there are default bindings for keys in Netrek, but I will not list all of them here. You can check them under Default Bindings section. --- NEW FILE: main.css --- /* Cascading Style Sheet for HTML Help Workshop */ body { font-size: 75%; line-height: 125%; font-family: Verdana, Arial, Helvetica, } a:link { color: #0000FF; } a:active { color: #FF33CC; } a:visited { color: #800080; } a:hover {color: #800080; font-weight: bold; } a:sidebar {color: #339900; } h1 { font-size: 125%; margin-bottom: .5em; line-height: 125%; } h2 { font-size: 115%; margin-top: 1.5em; margin-bottom: .5em; } h3 { font-size: 100%; margin-top: 1.2em; margin-bottom: .5em; } h4 { font-size: 100%; color: darkmagenta; margin-top: 1.2em; margin-bottom: .5em; } p { margin-top:6pt; margin-bottom: 6pt; } p.margin { margin-left: 57pt; margin-top: -47pt; } p.margin2 { margin-left: 57pt; } li p { margin-top: .6em; margin-bottom: 0em; } big { font-weight: bold; font-size: 105%; } ol {margin-top: .5em; margin-bottom: 0em } ul {margin-top: .6em; margin-bottom: 0em; margin-left: 2.75em; } ol ul { list-style: disc; margin-top: 2em; } li {padding-bottom: .3em; margin-left: -1.25em; } dl ul { margin-top: 2em; margin-bottom: 0em; } /*list item inside a def/term*/ dl { margin-top: -1em; } ol dl { margin-top: -1.5em; margin-left: 0em; } /*term/def list inside a numbered list*/ ol dl dl { margin-top: 0em; margin-left: .2em; } /*term/def list inside a term/def list*/ dd { margin-bottom: 0em; /*not currently working*/ margin-left: 1.5em; } dt { padding-top: 2em; font-weight: bold; margin-left: 1.5em; } code {font-family: Courier; } pre { margin-top: 0em; margin-bottom: 1.5em; font-family: Courier; } table { font-size: 100%; text-align: left; margin-top: 1em; } tr { margin: .50em; vertical-align: top; } th { text-align: left; margin: .50em; vertical-align: top; background: #dddddd; } td { margin: .50em; vertical-align: top; } /* Only use this for sidebars that ARE in a list */ DIV.sidebartext { position: relative; left: -22px; height: 72px; width: 300px; margin-top: .6em; margin-right: 3em; margin-left: 0; margin-bottom: .6em; padding-top: .75em; padding-right: 6px; padding-left: .75em; padding-bottom: .75em; cursor: hand; border-left: 4pt solid #339900; background-color: #F0F0F0; } /* Only use this for sidebars that are NOT in a list */ DIV.sidebartbl { height: 72px; width: 300px; margin-top: .6em; margin-right: 3em; margin-left: 0; margin-bottom: .6em; padding-top: .75em; padding-right: 8em; padding-left: .75em; padding-bottom: .75em; cursor: hand; border-left: 4pt solid #339900; background-color: #F0F0F0; } a:visited.sidebar: { color: #339900; text-decoration: none; } a:hover.sidebar: { text-decoration: underline; } .endlink { line-height: 6pt; position: relative; top: 1pt; background-color: transparent; font-weight: bold; font-size: 7pt; font-style: italic; color: black; text-decoration: none; cursor: hand; width: 20px; height: 8pt; padding-top: -2pt; padding-bottom: 1pt; margin: 0pt; border-bottom: 1pt solid #cc0033; border-top: 1pt solid #cc0033; } --- NEW FILE: jointhegame.html --- Joining The Game

Joining The Game

After successfull login you will be presented following window:

Next topics will give you short explanation about windows that compose it:

--- NEW FILE: serversettings.html --- Server Settings

Server Settings

The top right part of the main screen after successfull login will contain server settings. These settings define what type of server it is, whether RSA client is required to play a game there, how much players it is required to start Tournament mode (T-mode), etc.

Here is settings window from pickled.psychosis.net:

Here is a list of options with brief explanations:

  • Binary verification - whether the client binary should support some kind of verification
  • Tournament mode - how much players per side are required to start T-mode
  • Ships allowed - what types of ships are allowed to play on this server
  • Tractor/Pressor beams - whether tractor/pressor beams are allowed on the server
  • Kill required for plasma - how much kills should you have in order to get plasma after refit
  • Rank required for SB - what minimum rank should you have to be able to refit to Starbase
  • Planets required for SB - what minimum number of planets your team owns is required to be able to get Starbase
  • Hidden mode - when server will hide your enemies in the fog of war
  • Multiple Entry Planets - whether ships can be respawned no only around their home planet
  • Chaos mode - whether chaos mode is enabled or not
  • Hunter Killer - whether server will send Hunter Killer bot every half hour to clean galaxy
  • Message to GOD log - whether messages to GOD are saved
  • SB Transwarp - whether players can transwarp to Starbase ship
  • Surrender Counter - how much planets on loosin team are required to start surrender counter
--- NEW FILE: defaultmap.html --- Default Bindings

Default Bindings

Here you will find a list of default keys and buttons bindings

Keyboard Bindings

Ship Controls:

	0 - set speed to 0
	1 - set speed to 1
	2 - set speed to 2
	3 - set speed to 3
	4 - set speed to 4
	5 - set speed to 5
	6 - set speed to 6
	7 - set speed to 7
	8 - set speed to 8
	9 - set speed to 9
	) - set speed to 10
	! - set speed to 11
	@ - set speed to 12
	% - set speed to maximum
	# - set speed to 1/2 maximum
	< - decrease speed by 1
	> - increase speed by 1
	k - set course
	p - fire phaser
	t - fire photon torpedo
	f - fire plasma torpedo
	d - detonate enemy torpedoes
	D - detonate your own torpedoes
	S - toggle ships status graph
	] - put shields up
	[ - put shields down
	{ - cloak
	} - uncloak
	c - toggle cloaking device
	u - toggle shields
	s - toggle shields
	b - bomb planet
	z - beam up armies
	x - beam down armies
	T - toggle tractor beam
	y - toggle pressor beam
	_ - turn on tractor beam
	^ - turn on pressor beam
	$ - turn off tractor/pressor beam
	R - enter repair mode
	o - orbit planet or dock to starbase
	e - starbase docking permission toggle
	r - refit (change ship type)
	l - lock on player/planet
	; - lock on planet/starbase
	* - transwarp to starbase / send practice robot

Other Controls:

	X - enter macro mode
	X? - show macros window
	L - rotate playerlist to show everyone, players only, observers only
	P - show planets list
	i - get information on player/planet
	I - get extended information on player/planet
	Q - quit
	q - fast quit
	? - switch message windows from split to single setup
	h - help window toggle
	H - toggle hockey lines on tactical (local). Only for hockey servers
	G - toggle hockey lines on galaxy (map). Only for hockey servers
	w - show war declaration window
	N - toggle planet names on tactical
	U - show rankings window
	m - message window zoom
	/ - toggle sorted player list
	: - toggle messages recording to log file
	+ - toggle UDP options window
	~ - toggle sound control window
	' - toggle ping statistics window
	` - toggle packets window
	= - send request to update all galaxy data
	- - send request to update weapons, planets and kills data
	| - send request to update everything except player statistics
	M - show shell tools window
	& - reread configration file
	" - save current configuration to netrekrc.sav
	\ - reset dashboard timer to 00:00:00
	v - decrease sound volume by one notch
	V - increase sound volume by one notch
	(space) - hide all windows except tactical/map/messages/playerlist/dashboard

Mouse Bindings

All mouse clicks are translated to keyboard actions. If one of Ctrl, Shift, Ctrl+Shift keys pressed along with mouse click it will also generate keyboard action.

Next table will list all possible mouse buttons and the keyboard actions they generate:
Mouse Button Keyboard Action
Left t
Shift+Left %
Ctrl+Left s
Ctrl+Shift+Left T
Middle p
Shift+Middle D
Ctrl+Middle c
Ctrl+Shift+Middle y
Right k
Shift+Right #
Ctrl+Right i
Ctrl+Shift+Right ;
Fourth f
Shift+Fourth 0
Ctrl+Fourth z
Ctrl+Shift+Fourth l
Fifth b
Shift+Fifth d
Ctrl+Fifth x
Ctrl+Shift+Fifth *

Fourth and Fifth are so called X Buttons that Microsoft added to their IntelliPoint mouses. You can use IntelliPoint drivers to map them to keys, but instead of doing that you can just use regular buttonmap in NetrekXP Mod --- NEW FILE: commandline.html --- Command Line Options

Command Line Options

Most of times you will not use command line to start client. However it is handy to remember -h and -p options, so you will be able to connect to server even when something is wrong with metaserver (which happens from time to time). Or for instance the server you want to connect to doesn't report itself to metaserver (so it won't appear in the metaserver window).

It is good to remember that default ports for most of servers are 2592 for players and 2593 for observers. So if you want to observe game on continuum.us.netrek.org you will use "netrek -h continuum.us.netrek.org -p 2593".

Here is the list of command options for NetrekXP Mod:

  -h <server>               : specify server name to connect to
  -p <port>                 : specify port number to connect to
  -r <configuration file>   : specify configuration file to read
  -s <socket port>          : specify socket port
  -u                        : show usage information
  -A <password>             : specify character password
  -C <name>                 : specify character name
  -U <udp port>             : specify UDP port
  -o                        : use old style binary verification
  -R                        : use RSA binary verification
  -P                        : log server packets
  -c                        : check players on server and return list
  -f <file name>            : record game to file (can be viewed later with -F)
  -F <file name>            : view recorded game
  -l <file name>            : record all messages to log file
  -m                        : connect to metaserver (default)
  -k                        : display known servers
  -n                        : show console window
  -v                        : display client version info

--- NEW FILE: configsyntax.html --- Configuration File Syntax

Configuration File Syntax

Configuration file is regular text file that can contain comments, empty lines and configuration definitions.

Comments

Every line that has hashmark (#) as its first character is comment line and will be ignored.

Configuration Options

The general syntax for any of configuration options is:

keyword: <value>

All configuration option keywords are case incensitive

Most of option keywords can have three additional suffixes to enable fine tuning of options:

  • keyword.observer: <value> - this suffix will enable option only in case you are logged in to server as observer

    Example:
    buttonmap.observer: 1l2I3i - will set different buttonmap when you observe game

  • keyword.<servernick>: <value> - this suffix will set option only if you are connected to server <servernick>

    Note that in order to define <servernick> you should define server.<servernick>: <server host name>

    Example:
    server.continuum: continuum.us.netrek.org - this option sets servernick for continuum.us.netrek.org to be continuum
    keymap.continuum: a2d% - this option defines custom keymap for server with 'continuum' as its servernick

  • keyword.<servertype>: <value> - this suffix will set option only if you are connected to server with <servertype> type.

    Note: the client will automatically set <servertype> only if you connect from Metaserver Window

    If you want to define <servertype> for specific server that is not there or you connect to server from command line you can use servertype.<servernick>: <type of server> where <type of server> can be one of following:

    • paradise
    • bronco
    • chaos
    • inl
    • sturgeon
    • hockey
    • dogfight

    Example:
    server.continuum: continuum.us.netrek.org - this will set servernick for continuum.us.netrek.org to be continuum
    serverType.continuum: bronco - this will set servertype for continuum to be bronco
    keymap.bronco: a2d% - this will set keymap for any bronco server

The precedence for the keywords is as follows:

  • keyword.observer: <value>
    • - best match
  • keyword.<servernick>: <value>
  • keyword.<servertype>: <value>
  • keyword: <value>
    • - worst match

There are three types of values that can appear in the configuration:

  • Boolean
    • on, true, 1 - to enable option
    • off, false, 0 - to disable option
  • Number
    • integer
  • String
    • string of characters

Examples:

  • keepPeace: on - will enable keepPeace option
  • planetBitmap: 2 - will assign value of 2 to planetBitmap option
  • buttonmap: 1t2p3k - will assign string '1t2p3k' to buttonmap option
--- NEW FILE: motdwindow.html --- Message Of The Day

Message Of The Day

Top left part of the Team Selection window is called Message Of The Day or MOTD. This window contains whatever information server administrator (GOD) decided to display.

You can scroll text in the window using 'f', 'b', 'F', 'B' keys to scroll one line forward, one line backward, one page forward, one page backward.

You can also press 'R' to send statistics reset request to server. --- NEW FILE: remapping.html --- Changing Defaults

Changing Defaults

In order to change default buttons and keys bindings you should be familiar with Configuration File and be able to edit it.

It is possible to change keyboard mappings in game by going to help window ('h' in default keymap) and remapping keys by pointing on desired action and pushing key that you want this action to be bound to. The main problem with that is that these remappings are not saved anywhere (unless you save them using "Save options" action) and will be lost after you close the program.

There are three configuration commands that deal with keyboard and mouse buttons rebinding (remapping):

  • keymap - allows to change keyboard default bindings
  • buttonmap - allows to change mouse default bindings
  • ckeymap - allows to change Ctrl+Key keyboard bindings

Syntax

Same syntax is applied for all of the configuration commands above:

command: [<key to bind><action to perform>]+

Examples:

  • keymap: a2d% - will bind warp 2 speed to key 'a' and maxwarp to key 'b'.
  • buttonmap: 1i3l - will bind info action to mouse button 1 (left button) and lock action to mouse button 3 (right button).
  • ckeymap: ^cc^vl - will bind cloak action to Ctrl-c and lock action to Ctrl-v

buttonmap is the tricky one because you should know what button gets what name.
So here is a table that will list all possible buttons that can be bound there:
Mouse Button ButtonMap Representation
Left 1
Middle 2
Right 3
Fourth 4
Fifth 5
Wheel Up 6
Wheel Down 7
Shift+Left 8
Shift+Middle 9
Shift+Right a
Shift+Fourth b
Shift+Fifth c
Ctrl+Left d
Ctrl+Middle e
Ctrl+Right f
Ctrl+Fourth g
Ctrl+Fifth h
Ctrl+Shift+Left i
Ctrl+Shift+Middle j
Ctrl+Shift+Right k
Ctrl+Shift+Fourth l
Ctrl+Shift+Fifth m

For example 'buttonmap: 1p4dhi' - will create following mapping:

  • Left Mouse Button will map to phaser
  • Fourth Mouse Button will map to detonate enemy torps
  • Ctrl+Fifth Mouse Button will map to info

Almost all players at some point will remap (rebind) default keyboard (and probably mouse) actions to keys that satisfy their requirements. Feel free to play with key bindings and try to get most out of it. Just remember that once you got used to some specific layout it will be difficult to switch to something else. From modemhero at users.sourceforge.net Tue Apr 11 23:31:05 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 04:31:05 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html/images dashboard.gif, NONE, 1.1 galaxy.gif, NONE, 1.1 jointhegame.gif, NONE, 1.1 loginscreen.gif, NONE, 1.1 mainwindows.gif, NONE, 1.1 messages.gif, NONE, 1.1 metawindow.gif, NONE, 1.1 motdwindow.gif, NONE, 1.1 playerlist.gif, NONE, 1.1 serversettings.gif, NONE, 1.1 tactical.gif, NONE, 1.1 teamselect.gif, NONE, 1.1 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23922/resources/htmlhelp/html/images Added Files: dashboard.gif galaxy.gif jointhegame.gif loginscreen.gif mainwindows.gif messages.gif metawindow.gif motdwindow.gif playerlist.gif serversettings.gif tactical.gif teamselect.gif Log Message: Update to version 4.4.0.3 --- NEW FILE: loginscreen.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: motdwindow.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: serversettings.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mainwindows.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: teamselect.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: galaxy.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dashboard.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: metawindow.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tactical.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: messages.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: jointhegame.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: playerlist.gif --- (This appears to be a binary file; contents omitted.) From modemhero at users.sourceforge.net Tue Apr 11 23:31:05 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 04:31:05 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp Table of Contents.hhc, NONE, 1.1 netrek.hhp, NONE, 1.1 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23922/resources/htmlhelp Added Files: Table of Contents.hhc netrek.hhp Log Message: Update to version 4.4.0.3 --- NEW FILE: Table of Contents.hhc ---

--- NEW FILE: netrek.hhp --- [OPTIONS] Compatibility=1.1 or later Compiled file=netrek.chm Contents file=Table of Contents.hhc Default topic=html\intro.html Display compile progress=No Language=0x409 English (United States) [INFOTYPES] From modemhero at users.sourceforge.net Tue Apr 11 23:37:27 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 04:37:27 +0000 Subject: [netrek-cvs] client/netrekxp/resources/ships/color1/rom - New directory Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/ships/color1/rom In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29313/rom Log Message: Directory /cvsroot/netrek/client/netrekxp/resources/ships/color1/rom added to the repository From modemhero at users.sourceforge.net Tue Apr 11 23:37:26 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 04:37:26 +0000 Subject: [netrek-cvs] client/netrekxp/resources/ships/color1/kli - New directory Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/ships/color1/kli In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29313/kli Log Message: Directory /cvsroot/netrek/client/netrekxp/resources/ships/color1/kli added to the repository From modemhero at users.sourceforge.net Tue Apr 11 23:37:27 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 04:37:27 +0000 Subject: [netrek-cvs] client/netrekxp/resources/ships/color1/ori - New directory Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/ships/color1/ori In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29313/ori Log Message: Directory /cvsroot/netrek/client/netrekxp/resources/ships/color1/ori added to the repository From modemhero at users.sourceforge.net Tue Apr 11 23:37:26 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 04:37:26 +0000 Subject: [netrek-cvs] client/netrekxp/resources/ships/color1/fed - New directory Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29313/fed Log Message: Directory /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed added to the repository From modemhero at users.sourceforge.net Tue Apr 11 23:37:26 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 04:37:26 +0000 Subject: [netrek-cvs] client/netrekxp/resources/ships/color1/ind - New directory Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/ships/color1/ind In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29313/ind Log Message: Directory /cvsroot/netrek/client/netrekxp/resources/ships/color1/ind added to the repository From modemhero at users.sourceforge.net Tue Apr 11 23:37:08 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 04:37:08 +0000 Subject: [netrek-cvs] client/netrekxp/resources/ships/color1 - New directory Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/ships/color1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29173/color1 Log Message: Directory /cvsroot/netrek/client/netrekxp/resources/ships/color1 added to the repository From modemhero at users.sourceforge.net Tue Apr 11 23:39:54 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 04:39:54 +0000 Subject: [netrek-cvs] client/netrekxp/resources/ships/color1/fed fed_as01.bmp, NONE, 1.1 fed_as02.bmp, NONE, 1.1 fed_as03.bmp, NONE, 1.1 fed_as04.bmp, NONE, 1.1 fed_as05.bmp, NONE, 1.1 fed_as06.bmp, NONE, 1.1 fed_as07.bmp, NONE, 1.1 fed_as08.bmp, NONE, 1.1 fed_as09.bmp, NONE, 1.1 fed_as10.bmp, NONE, 1.1 fed_as11.bmp, NONE, 1.1 fed_as12.bmp, NONE, 1.1 fed_as13.bmp, NONE, 1.1 fed_as14.bmp, NONE, 1.1 fed_as15.bmp, NONE, 1.1 fed_as16.bmp, NONE, 1.1 fed_as17.bmp, NONE, 1.1 fed_as18.bmp, NONE, 1.1 fed_as19.bmp, NONE, 1.1 fed_as20.bmp, NONE, 1.1 fed_as21.bmp, NONE, 1.1 fed_as22.bmp, NONE, 1.1 fed_as23.bmp, NONE, 1.1 fed_as24.bmp, NONE, 1.1 fed_as25.bmp, NONE, 1.1 fed_as26.bmp, NONE, 1.1 fed_as27.bmp, NONE, 1.1 fed_as28.bmp, NONE, 1.1 fed_as29.bmp, NONE, 1.1 fed_as30.bmp, NONE, 1.1 fed_as31.bmp, NONE, 1.1 fed_as32.bmp, NONE, 1.1 fed_at01.bmp, NONE, 1.1 fed_at02.bmp, NONE, 1.1 fed_at03.bmp, NONE, 1.1 fed_at04.bmp, NONE, 1.1 fed_at05.bmp, NONE, 1.1 fed_at06.bmp, NONE, 1.1 fed_at07.bmp, NONE, 1.1 fed_at08.bmp, NONE, 1.1 fed_at09.bmp, NONE, 1.1 fed_at10.bmp, NONE, 1.1 fed_at11.bmp, NONE, 1.1 fed_at12.bmp, NONE, 1.1 fed_at13.bmp, NONE, 1.1 fed_at14.bmp, NONE, 1.1 fed_at15.bmp, NONE, 1.1 fed_at16.bmp, NONE, 1.1 fed_at17.bmp, NONE, 1.1 fed_at18.bmp, NONE, 1.1 fed_at19.bmp, NONE, 1.1 fed_at20.bmp, NONE, 1.1 fed_at21.bmp, NONE, 1.1 fed_at22.bmp, NONE, 1.1 fed_at23.bmp, NONE, 1.1 fed_at24.bmp, NONE, 1.1 fed_at25.bmp, NONE, 1.1 fed_at26.bmp, NONE, 1.1 fed_at27.bmp, NONE, 1.1 fed_at28.bmp, NONE, 1.1 fed_at29.bmp, NONE, 1.1 fed_at30.bmp, NONE, 1.1 fed_at31.bmp, NONE, 1.1 fed_at32.bmp, NONE, 1.1 fed_bb01.bmp, NONE, 1.1 fed_bb02.bmp, NONE, 1.1 fed_bb03.bmp, NONE, 1.1 fed_bb04.bmp, NONE, 1.1 fed_bb05.bmp, NONE, 1.1 fed_bb06.bmp, NONE, 1.1 fed_bb07.bmp, NONE, 1.1 fed_bb08.bmp, NONE, 1.1 fed_bb09.bmp, NONE, 1.1 fed_bb10.bmp, NONE, 1.1 fed_bb11.bmp, NONE, 1.1 fed_bb12.bmp, NONE, 1.1 fed_bb13.bmp, NONE, 1.1 fed_bb14.bmp, NONE, 1.1 fed_bb15.bmp, NONE, 1.1 fed_bb16.bmp, NONE, 1.1 fed_bb17.bmp, NONE, 1.1 fed_bb18.bmp, NONE, 1.1 fed_bb19.bmp, NONE, 1.1 fed_bb20.bmp, NONE, 1.1 fed_bb21.bmp, NONE, 1.1 fed_bb22.bmp, NONE, 1.1 fed_bb23.bmp, NONE, 1.1 fed_bb24.bmp, NONE, 1.1 fed_bb25.bmp, NONE, 1.1 fed_bb26.bmp, NONE, 1.1 fed_bb27.bmp, NONE, 1.1 fed_bb28.bmp, NONE, 1.1 fed_bb29.bmp, NONE, 1.1 fed_bb30.bmp, NONE, 1.1 fed_bb31.bmp, NONE, 1.1 fed_bb32.bmp, NONE, 1.1 fed_ca01.bmp, NONE, 1.1 fed_ca02.bmp, NONE, 1.1 fed_ca03.bmp, NONE, 1.1 fed_ca04.bmp, NONE, 1.1 fed_ca05.bmp, NONE, 1.1 fed_ca06.bmp, NONE, 1.1 fed_ca07.bmp, NONE, 1.1 fed_ca08.bmp, NONE, 1.1 fed_ca09.bmp, NONE, 1.1 fed_ca10.bmp, NONE, 1.1 fed_ca11.bmp, NONE, 1.1 fed_ca12.bmp, NONE, 1.1 fed_ca13.bmp, NONE, 1.1 fed_ca14.bmp, NONE, 1.1 fed_ca15.bmp, NONE, 1.1 fed_ca16.bmp, NONE, 1.1 fed_ca17.bmp, NONE, 1.1 fed_ca18.bmp, NONE, 1.1 fed_ca19.bmp, NONE, 1.1 fed_ca20.bmp, NONE, 1.1 fed_ca21.bmp, NONE, 1.1 fed_ca22.bmp, NONE, 1.1 fed_ca23.bmp, NONE, 1.1 fed_ca24.bmp, NONE, 1.1 fed_ca25.bmp, NONE, 1.1 fed_ca26.bmp, NONE, 1.1 fed_ca27.bmp, NONE, 1.1 fed_ca28.bmp, NONE, 1.1 fed_ca29.bmp, NONE, 1.1 fed_ca30.bmp, NONE, 1.1 fed_ca31.bmp, NONE, 1.1 fed_ca32.bmp, NONE, 1.1 fed_dd01.bmp, NONE, 1.1 fed_dd02.bmp, NONE, 1.1 fed_dd03.bmp, NONE, 1.1 fed_dd04.bmp, NONE, 1.1 fed_dd05.bmp, NONE, 1.1 fed_dd06.bmp, NONE, 1.1 fed_dd07.bmp, NONE, 1.1 fed_dd08.bmp, NONE, 1.1 fed_dd09.bmp, NONE, 1.1 fed_dd10.bmp, NONE, 1.1 fed_dd11.bmp, NONE, 1.1 fed_dd12.bmp, NONE, 1.1 fed_dd13.bmp, NONE, 1.1 fed_dd14.bmp, NONE, 1.1 fed_dd15.bmp, NONE, 1.1 fed_dd16.bmp, NONE, 1.1 fed_dd17.bmp, NONE, 1.1 fed_dd18.bmp, NONE, 1.1 fed_dd19.bmp, NONE, 1.1 fed_dd20.bmp, NONE, 1.1 fed_dd21.bmp, NONE, 1.1 fed_dd22.bmp, NONE, 1.1 fed_dd23.bmp, NONE, 1.1 fed_dd24.bmp, NONE, 1.1 fed_dd25.bmp, NONE, 1.1 fed_dd26.bmp, NONE, 1.1 fed_dd27.bmp, NONE, 1.1 fed_dd28.bmp, NONE, 1.1 fed_dd29.bmp, NONE, 1.1 fed_dd30.bmp, NONE, 1.1 fed_dd31.bmp, NONE, 1.1 fed_dd32.bmp, NONE, 1.1 fed_ga01.bmp, NONE, 1.1 fed_ga02.bmp, NONE, 1.1 fed_ga03.bmp, NONE, 1.1 fed_ga04.bmp, NONE, 1.1 fed_ga05.bmp, NONE, 1.1 fed_ga06.bmp, NONE, 1.1 fed_ga07.bmp, NONE, 1.1 fed_ga08.bmp, NONE, 1.1 fed_ga09.bmp, NONE, 1.1 fed_ga10.bmp, NONE, 1.1 fed_ga11.bmp, NONE, 1.1 fed_ga12.bmp, NONE, 1.1 fed_ga13.bmp, NONE, 1.1 fed_ga14.bmp, NONE, 1.1 fed_ga15.bmp, NONE, 1.1 fed_ga16.bmp, NONE, 1.1 fed_ga17.bmp, NONE, 1.1 fed_ga18.bmp, NONE, 1.1 fed_ga19.bmp, NONE, 1.1 fed_ga20.bmp, NONE, 1.1 fed_ga21.bmp, NONE, 1.1 fed_ga22.bmp, NONE, 1.1 fed_ga23.bmp, NONE, 1.1 fed_ga24.bmp, NONE, 1.1 fed_ga25.bmp, NONE, 1.1 fed_ga26.bmp, NONE, 1.1 fed_ga27.bmp, NONE, 1.1 fed_ga28.bmp, NONE, 1.1 fed_ga29.bmp, NONE, 1.1 fed_ga30.bmp, NONE, 1.1 fed_ga31.bmp, NONE, 1.1 fed_ga32.bmp, NONE, 1.1 fed_sb01.bmp, NONE, 1.1 fed_sb02.bmp, NONE, 1.1 fed_sb03.bmp, NONE, 1.1 fed_sb04.bmp, NONE, 1.1 fed_sb05.bmp, NONE, 1.1 fed_sb06.bmp, NONE, 1.1 fed_sb07.bmp, NONE, 1.1 fed_sb08.bmp, NONE, 1.1 fed_sb09.bmp, NONE, 1.1 fed_sb10.bmp, NONE, 1.1 fed_sb11.bmp, NONE, 1.1 fed_sb12.bmp, NONE, 1.1 fed_sb13.bmp, NONE, 1.1 fed_sb14.bmp, NONE, 1.1 fed_sb15.bmp, NONE, 1.1 fed_sb16.bmp, NONE, 1.1 fed_sb17.bmp, NONE, 1.1 fed_sb18.bmp, NONE, 1.1 fed_sb19.bmp, NONE, 1.1 fed_sb20.bmp, NONE, 1.1 fed_sb21.bmp, NONE, 1.1 fed_sb22.bmp, NONE, 1.1 fed_sb23.bmp, NONE, 1.1 fed_sb24.bmp, NONE, 1.1 fed_sb25.bmp, NONE, 1.1 fed_sb26.bmp, NONE, 1.1 fed_sb27.bmp, NONE, 1.1 fed_sb28.bmp, NONE, 1.1 fed_sb29.bmp, NONE, 1.1 fed_sb30.bmp, NONE, 1.1 fed_sb31.bmp, NONE, 1.1 fed_sb32.bmp, NONE, 1.1 fed_sc01.bmp, NONE, 1.1 fed_sc02.bmp, NONE, 1.1 fed_sc03.bmp, NONE, 1.1 fed_sc04.bmp, NONE, 1.1 fed_sc05.bmp, NONE, 1.1 fed_sc06.bmp, NONE, 1.1 fed_sc07.bmp, NONE, 1.1 fed_sc08.bmp, NONE, 1.1 fed_sc09.bmp, NONE, 1.1 fed_sc10.bmp, NONE, 1.1 fed_sc11.bmp, NONE, 1.1 fed_sc12.bmp, NONE, 1.1 fed_sc13.bmp, NONE, 1.1 fed_sc14.bmp, NONE, 1.1 fed_sc15.bmp, NONE, 1.1 fed_sc16.bmp, NONE, 1.1 fed_sc17.bmp, NONE, 1.1 fed_sc18.bmp, NONE, 1.1 fed_sc19.bmp, NONE, 1.1 fed_sc20.bmp, NONE, 1.1 fed_sc21.bmp, NONE, 1.1 fed_sc22.bmp, NONE, 1.1 fed_sc23.bmp, NONE, 1.1 fed_sc24.bmp, NONE, 1.1 fed_sc25.bmp, NONE, 1.1 fed_sc26.bmp, NONE, 1.1 fed_sc27.bmp, NONE, 1.1 fed_sc28.bmp, NONE, 1.1 fed_sc29.bmp, NONE, 1.1 fed_sc30.bmp, NONE, 1.1 fed_sc31.bmp, NONE, 1.1 fed_sc32.bmp, NONE, 1.1 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31279/resources/ships/color1/fed Added Files: fed_as01.bmp fed_as02.bmp fed_as03.bmp fed_as04.bmp fed_as05.bmp fed_as06.bmp fed_as07.bmp fed_as08.bmp fed_as09.bmp fed_as10.bmp fed_as11.bmp fed_as12.bmp fed_as13.bmp fed_as14.bmp fed_as15.bmp fed_as16.bmp fed_as17.bmp fed_as18.bmp fed_as19.bmp fed_as20.bmp fed_as21.bmp fed_as22.bmp fed_as23.bmp fed_as24.bmp fed_as25.bmp fed_as26.bmp fed_as27.bmp fed_as28.bmp fed_as29.bmp fed_as30.bmp fed_as31.bmp fed_as32.bmp fed_at01.bmp fed_at02.bmp fed_at03.bmp fed_at04.bmp fed_at05.bmp fed_at06.bmp fed_at07.bmp fed_at08.bmp fed_at09.bmp fed_at10.bmp fed_at11.bmp fed_at12.bmp fed_at13.bmp fed_at14.bmp fed_at15.bmp fed_at16.bmp fed_at17.bmp fed_at18.bmp fed_at19.bmp fed_at20.bmp fed_at21.bmp fed_at22.bmp fed_at23.bmp fed_at24.bmp fed_at25.bmp fed_at26.bmp fed_at27.bmp fed_at28.bmp fed_at29.bmp fed_at30.bmp fed_at31.bmp fed_at32.bmp fed_bb01.bmp fed_bb02.bmp fed_bb03.bmp fed_bb04.bmp fed_bb05.bmp fed_bb06.bmp fed_bb07.bmp fed_bb08.bmp fed_bb09.bmp fed_bb10.bmp fed_bb11.bmp fed_bb12.bmp fed_bb13.bmp fed_bb14.bmp fed_bb15.bmp fed_bb16.bmp fed_bb17.bmp fed_bb18.bmp fed_bb19.bmp fed_bb20.bmp fed_bb21.bmp fed_bb22.bmp fed_bb23.bmp fed_bb24.bmp fed_bb25.bmp fed_bb26.bmp fed_bb27.bmp fed_bb28.bmp fed_bb29.bmp fed_bb30.bmp fed_bb31.bmp fed_bb32.bmp fed_ca01.bmp fed_ca02.bmp fed_ca03.bmp fed_ca04.bmp fed_ca05.bmp fed_ca06.bmp fed_ca07.bmp fed_ca08.bmp fed_ca09.bmp fed_ca10.bmp fed_ca11.bmp fed_ca12.bmp fed_ca13.bmp fed_ca14.bmp fed_ca15.bmp fed_ca16.bmp fed_ca17.bmp fed_ca18.bmp fed_ca19.bmp fed_ca20.bmp fed_ca21.bmp fed_ca22.bmp fed_ca23.bmp fed_ca24.bmp fed_ca25.bmp fed_ca26.bmp fed_ca27.bmp fed_ca28.bmp fed_ca29.bmp fed_ca30.bmp fed_ca31.bmp fed_ca32.bmp fed_dd01.bmp fed_dd02.bmp fed_dd03.bmp fed_dd04.bmp fed_dd05.bmp fed_dd06.bmp fed_dd07.bmp fed_dd08.bmp fed_dd09.bmp fed_dd10.bmp fed_dd11.bmp fed_dd12.bmp fed_dd13.bmp fed_dd14.bmp fed_dd15.bmp fed_dd16.bmp fed_dd17.bmp fed_dd18.bmp fed_dd19.bmp fed_dd20.bmp fed_dd21.bmp fed_dd22.bmp fed_dd23.bmp fed_dd24.bmp fed_dd25.bmp fed_dd26.bmp fed_dd27.bmp fed_dd28.bmp fed_dd29.bmp fed_dd30.bmp fed_dd31.bmp fed_dd32.bmp fed_ga01.bmp fed_ga02.bmp fed_ga03.bmp fed_ga04.bmp fed_ga05.bmp fed_ga06.bmp fed_ga07.bmp fed_ga08.bmp fed_ga09.bmp fed_ga10.bmp fed_ga11.bmp fed_ga12.bmp fed_ga13.bmp fed_ga14.bmp fed_ga15.bmp fed_ga16.bmp fed_ga17.bmp fed_ga18.bmp fed_ga19.bmp fed_ga20.bmp fed_ga21.bmp fed_ga22.bmp fed_ga23.bmp fed_ga24.bmp fed_ga25.bmp fed_ga26.bmp fed_ga27.bmp fed_ga28.bmp fed_ga29.bmp fed_ga30.bmp fed_ga31.bmp fed_ga32.bmp fed_sb01.bmp fed_sb02.bmp fed_sb03.bmp fed_sb04.bmp fed_sb05.bmp fed_sb06.bmp fed_sb07.bmp fed_sb08.bmp fed_sb09.bmp fed_sb10.bmp fed_sb11.bmp fed_sb12.bmp fed_sb13.bmp fed_sb14.bmp fed_sb15.bmp fed_sb16.bmp fed_sb17.bmp fed_sb18.bmp fed_sb19.bmp fed_sb20.bmp fed_sb21.bmp fed_sb22.bmp fed_sb23.bmp fed_sb24.bmp fed_sb25.bmp fed_sb26.bmp fed_sb27.bmp fed_sb28.bmp fed_sb29.bmp fed_sb30.bmp fed_sb31.bmp fed_sb32.bmp fed_sc01.bmp fed_sc02.bmp fed_sc03.bmp fed_sc04.bmp fed_sc05.bmp fed_sc06.bmp fed_sc07.bmp fed_sc08.bmp fed_sc09.bmp fed_sc10.bmp fed_sc11.bmp fed_sc12.bmp fed_sc13.bmp fed_sc14.bmp fed_sc15.bmp fed_sc16.bmp fed_sc17.bmp fed_sc18.bmp fed_sc19.bmp fed_sc20.bmp fed_sc21.bmp fed_sc22.bmp fed_sc23.bmp fed_sc24.bmp fed_sc25.bmp fed_sc26.bmp fed_sc27.bmp fed_sc28.bmp fed_sc29.bmp fed_sc30.bmp fed_sc31.bmp fed_sc32.bmp Log Message: Update to version 4.4.0.3 --- NEW FILE: fed_sc01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_bb31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_as32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_dd21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sb09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ca15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_sc03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_ga24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fed_at01.bmp --- (This appears to be a binary file; contents omitted.) From modemhero at users.sourceforge.net Tue Apr 11 23:39:54 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 04:39:54 +0000 Subject: [netrek-cvs] client/netrekxp/resources/ships/color1/kli kli_as01.bmp, NONE, 1.1 kli_as02.bmp, NONE, 1.1 kli_as03.bmp, NONE, 1.1 kli_as04.bmp, NONE, 1.1 kli_as05.bmp, NONE, 1.1 kli_as06.bmp, NONE, 1.1 kli_as07.bmp, NONE, 1.1 kli_as08.bmp, NONE, 1.1 kli_as09.bmp, NONE, 1.1 kli_as10.bmp, NONE, 1.1 kli_as11.bmp, NONE, 1.1 kli_as12.bmp, NONE, 1.1 kli_as13.bmp, NONE, 1.1 kli_as14.bmp, NONE, 1.1 kli_as15.bmp, NONE, 1.1 kli_as16.bmp, NONE, 1.1 kli_as17.bmp, NONE, 1.1 kli_as18.bmp, NONE, 1.1 kli_as19.bmp, NONE, 1.1 kli_as20.bmp, NONE, 1.1 kli_as21.bmp, NONE, 1.1 kli_as22.bmp, NONE, 1.1 kli_as23.bmp, NONE, 1.1 kli_as24.bmp, NONE, 1.1 kli_as25.bmp, NONE, 1.1 kli_as26.bmp, NONE, 1.1 kli_as27.bmp, NONE, 1.1 kli_as28.bmp, NONE, 1.1 kli_as29.bmp, NONE, 1.1 kli_as30.bmp, NONE, 1.1 kli_as31.bmp, NONE, 1.1 kli_as32.bmp, NONE, 1.1 kli_at01.bmp, NONE, 1.1 kli_at02.bmp, NONE, 1.1 kli_at03.bmp, NONE, 1.1 kli_at04.bmp, NONE, 1.1 kli_at05.bmp, NONE, 1.1 kli_at06.bmp, NONE, 1.1 kli_at07.bmp, NONE, 1.1 kli_at08.bmp, NONE, 1.1 kli_at09.bmp, NONE, 1.1 kli_at10.bmp, NONE, 1.1 kli_at11.bmp, NONE, 1.1 kli_at12.bmp, NONE, 1.1 kli_at13.bmp, NONE, 1.1 kli_at14.bmp, NONE, 1.1 kli_at15.bmp, NONE, 1.1 kli_at16.bmp, NONE, 1.1 kli_at17.bmp, NONE, 1.1 kli_at18.bmp, NONE, 1.1 kli_at19.bmp, NONE, 1.1 kli_at20.bmp, NONE, 1.1 kli_at21.bmp, NONE, 1.1 kli_at22.bmp, NONE, 1.1 kli_at23.bmp, NONE, 1.1 kli_at24.bmp, NONE, 1.1 kli_at25.bmp, NONE, 1.1 kli_at26.bmp, NONE, 1.1 kli_at27.bmp, NONE, 1.1 kli_at28.bmp, NONE, 1.1 kli_at29.bmp, NONE, 1.1 kli_at30.bmp, NONE, 1.1 kli_at31.bmp, NONE, 1.1 kli_at32.bmp, NONE, 1.1 kli_bb01.bmp, NONE, 1.1 kli_bb02.bmp, NONE, 1.1 kli_bb03.bmp, NONE, 1.1 kli_bb04.bmp, NONE, 1.1 kli_bb05.bmp, NONE, 1.1 kli_bb06.bmp, NONE, 1.1 kli_bb07.bmp, NONE, 1.1 kli_bb08.bmp, NONE, 1.1 kli_bb09.bmp, NONE, 1.1 kli_bb10.bmp, NONE, 1.1 kli_bb11.bmp, NONE, 1.1 kli_bb12.bmp, NONE, 1.1 kli_bb13.bmp, NONE, 1.1 kli_bb14.bmp, NONE, 1.1 kli_bb15.bmp, NONE, 1.1 kli_bb16.bmp, NONE, 1.1 kli_bb17.bmp, NONE, 1.1 kli_bb18.bmp, NONE, 1.1 kli_bb19.bmp, NONE, 1.1 kli_bb20.bmp, NONE, 1.1 kli_bb21.bmp, NONE, 1.1 kli_bb22.bmp, NONE, 1.1 kli_bb23.bmp, NONE, 1.1 kli_bb24.bmp, NONE, 1.1 kli_bb25.bmp, NONE, 1.1 kli_bb26.bmp, NONE, 1.1 kli_bb27.bmp, NONE, 1.1 kli_bb28.bmp, NONE, 1.1 kli_bb29.bmp, NONE, 1.1 kli_bb30.bmp, NONE, 1.1 kli_bb31.bmp, NONE, 1.1 kli_bb32.bmp, NONE, 1.1 kli_ca01.bmp, NONE, 1.1 kli_ca02.bmp, NONE, 1.1 kli_ca03.bmp, NONE, 1.1 kli_ca04.bmp, NONE, 1.1 kli_ca05.bmp, NONE, 1.1 kli_ca06.bmp, NONE, 1.1 kli_ca07.bmp, NONE, 1.1 kli_ca08.bmp, NONE, 1.1 kli_ca09.bmp, NONE, 1.1 kli_ca10.bmp, NONE, 1.1 kli_ca11.bmp, NONE, 1.1 kli_ca12.bmp, NONE, 1.1 kli_ca13.bmp, NONE, 1.1 kli_ca14.bmp, NONE, 1.1 kli_ca15.bmp, NONE, 1.1 kli_ca16.bmp, NONE, 1.1 kli_ca17.bmp, NONE, 1.1 kli_ca18.bmp, NONE, 1.1 kli_ca19.bmp, NONE, 1.1 kli_ca20.bmp, NONE, 1.1 kli_ca21.bmp, NONE, 1.1 kli_ca22.bmp, NONE, 1.1 kli_ca23.bmp, NONE, 1.1 kli_ca24.bmp, NONE, 1.1 kli_ca25.bmp, NONE, 1.1 kli_ca26.bmp, NONE, 1.1 kli_ca27.bmp, NONE, 1.1 kli_ca28.bmp, NONE, 1.1 kli_ca29.bmp, NONE, 1.1 kli_ca30.bmp, NONE, 1.1 kli_ca31.bmp, NONE, 1.1 kli_ca32.bmp, NONE, 1.1 kli_dd01.bmp, NONE, 1.1 kli_dd02.bmp, NONE, 1.1 kli_dd03.bmp, NONE, 1.1 kli_dd04.bmp, NONE, 1.1 kli_dd05.bmp, NONE, 1.1 kli_dd06.bmp, NONE, 1.1 kli_dd07.bmp, NONE, 1.1 kli_dd08.bmp, NONE, 1.1 kli_dd09.bmp, NONE, 1.1 kli_dd10.bmp, NONE, 1.1 kli_dd11.bmp, NONE, 1.1 kli_dd12.bmp, NONE, 1.1 kli_dd13.bmp, NONE, 1.1 kli_dd14.bmp, NONE, 1.1 kli_dd15.bmp, NONE, 1.1 kli_dd16.bmp, NONE, 1.1 kli_dd17.bmp, NONE, 1.1 kli_dd18.bmp, NONE, 1.1 kli_dd19.bmp, NONE, 1.1 kli_dd20.bmp, NONE, 1.1 kli_dd21.bmp, NONE, 1.1 kli_dd22.bmp, NONE, 1.1 kli_dd23.bmp, NONE, 1.1 kli_dd24.bmp, NONE, 1.1 kli_dd25.bmp, NONE, 1.1 kli_dd26.bmp, NONE, 1.1 kli_dd27.bmp, NONE, 1.1 kli_dd28.bmp, NONE, 1.1 kli_dd29.bmp, NONE, 1.1 kli_dd30.bmp, NONE, 1.1 kli_dd31.bmp, NONE, 1.1 kli_dd32.bmp, NONE, 1.1 kli_ga01.bmp, NONE, 1.1 kli_ga02.bmp, NONE, 1.1 kli_ga03.bmp, NONE, 1.1 kli_ga04.bmp, NONE, 1.1 kli_ga05.bmp, NONE, 1.1 kli_ga06.bmp, NONE, 1.1 kli_ga07.bmp, NONE, 1.1 kli_ga08.bmp, NONE, 1.1 kli_ga09.bmp, NONE, 1.1 kli_ga10.bmp, NONE, 1.1 kli_ga11.bmp, NONE, 1.1 kli_ga12.bmp, NONE, 1.1 kli_ga13.bmp, NONE, 1.1 kli_ga14.bmp, NONE, 1.1 kli_ga15.bmp, NONE, 1.1 kli_ga16.bmp, NONE, 1.1 kli_ga17.bmp, NONE, 1.1 kli_ga18.bmp, NONE, 1.1 kli_ga19.bmp, NONE, 1.1 kli_ga20.bmp, NONE, 1.1 kli_ga21.bmp, NONE, 1.1 kli_ga22.bmp, NONE, 1.1 kli_ga23.bmp, NONE, 1.1 kli_ga24.bmp, NONE, 1.1 kli_ga25.bmp, NONE, 1.1 kli_ga26.bmp, NONE, 1.1 kli_ga27.bmp, NONE, 1.1 kli_ga28.bmp, NONE, 1.1 kli_ga29.bmp, NONE, 1.1 kli_ga30.bmp, NONE, 1.1 kli_ga31.bmp, NONE, 1.1 kli_ga32.bmp, NONE, 1.1 kli_sb01.bmp, NONE, 1.1 kli_sb02.bmp, NONE, 1.1 kli_sb03.bmp, NONE, 1.1 kli_sb04.bmp, NONE, 1.1 kli_sb05.bmp, NONE, 1.1 kli_sb06.bmp, NONE, 1.1 kli_sb07.bmp, NONE, 1.1 kli_sb08.bmp, NONE, 1.1 kli_sb09.bmp, NONE, 1.1 kli_sb10.bmp, NONE, 1.1 kli_sb11.bmp, NONE, 1.1 kli_sb12.bmp, NONE, 1.1 kli_sb13.bmp, NONE, 1.1 kli_sb14.bmp, NONE, 1.1 kli_sb15.bmp, NONE, 1.1 kli_sb16.bmp, NONE, 1.1 kli_sb17.bmp, NONE, 1.1 kli_sb18.bmp, NONE, 1.1 kli_sb19.bmp, NONE, 1.1 kli_sb20.bmp, NONE, 1.1 kli_sb21.bmp, NONE, 1.1 kli_sb22.bmp, NONE, 1.1 kli_sb23.bmp, NONE, 1.1 kli_sb24.bmp, NONE, 1.1 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/ships/color1/kli In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31279/resources/ships/color1/kli Added Files: kli_as01.bmp kli_as02.bmp kli_as03.bmp kli_as04.bmp kli_as05.bmp kli_as06.bmp kli_as07.bmp kli_as08.bmp kli_as09.bmp kli_as10.bmp kli_as11.bmp kli_as12.bmp kli_as13.bmp kli_as14.bmp kli_as15.bmp kli_as16.bmp kli_as17.bmp kli_as18.bmp kli_as19.bmp kli_as20.bmp kli_as21.bmp kli_as22.bmp kli_as23.bmp kli_as24.bmp kli_as25.bmp kli_as26.bmp kli_as27.bmp kli_as28.bmp kli_as29.bmp kli_as30.bmp kli_as31.bmp kli_as32.bmp kli_at01.bmp kli_at02.bmp kli_at03.bmp kli_at04.bmp kli_at05.bmp kli_at06.bmp kli_at07.bmp kli_at08.bmp kli_at09.bmp kli_at10.bmp kli_at11.bmp kli_at12.bmp kli_at13.bmp kli_at14.bmp kli_at15.bmp kli_at16.bmp kli_at17.bmp kli_at18.bmp kli_at19.bmp kli_at20.bmp kli_at21.bmp kli_at22.bmp kli_at23.bmp kli_at24.bmp kli_at25.bmp kli_at26.bmp kli_at27.bmp kli_at28.bmp kli_at29.bmp kli_at30.bmp kli_at31.bmp kli_at32.bmp kli_bb01.bmp kli_bb02.bmp kli_bb03.bmp kli_bb04.bmp kli_bb05.bmp kli_bb06.bmp kli_bb07.bmp kli_bb08.bmp kli_bb09.bmp kli_bb10.bmp kli_bb11.bmp kli_bb12.bmp kli_bb13.bmp kli_bb14.bmp kli_bb15.bmp kli_bb16.bmp kli_bb17.bmp kli_bb18.bmp kli_bb19.bmp kli_bb20.bmp kli_bb21.bmp kli_bb22.bmp kli_bb23.bmp kli_bb24.bmp kli_bb25.bmp kli_bb26.bmp kli_bb27.bmp kli_bb28.bmp kli_bb29.bmp kli_bb30.bmp kli_bb31.bmp kli_bb32.bmp kli_ca01.bmp kli_ca02.bmp kli_ca03.bmp kli_ca04.bmp kli_ca05.bmp kli_ca06.bmp kli_ca07.bmp kli_ca08.bmp kli_ca09.bmp kli_ca10.bmp kli_ca11.bmp kli_ca12.bmp kli_ca13.bmp kli_ca14.bmp kli_ca15.bmp kli_ca16.bmp kli_ca17.bmp kli_ca18.bmp kli_ca19.bmp kli_ca20.bmp kli_ca21.bmp kli_ca22.bmp kli_ca23.bmp kli_ca24.bmp kli_ca25.bmp kli_ca26.bmp kli_ca27.bmp kli_ca28.bmp kli_ca29.bmp kli_ca30.bmp kli_ca31.bmp kli_ca32.bmp kli_dd01.bmp kli_dd02.bmp kli_dd03.bmp kli_dd04.bmp kli_dd05.bmp kli_dd06.bmp kli_dd07.bmp kli_dd08.bmp kli_dd09.bmp kli_dd10.bmp kli_dd11.bmp kli_dd12.bmp kli_dd13.bmp kli_dd14.bmp kli_dd15.bmp kli_dd16.bmp kli_dd17.bmp kli_dd18.bmp kli_dd19.bmp kli_dd20.bmp kli_dd21.bmp kli_dd22.bmp kli_dd23.bmp kli_dd24.bmp kli_dd25.bmp kli_dd26.bmp kli_dd27.bmp kli_dd28.bmp kli_dd29.bmp kli_dd30.bmp kli_dd31.bmp kli_dd32.bmp kli_ga01.bmp kli_ga02.bmp kli_ga03.bmp kli_ga04.bmp kli_ga05.bmp kli_ga06.bmp kli_ga07.bmp kli_ga08.bmp kli_ga09.bmp kli_ga10.bmp kli_ga11.bmp kli_ga12.bmp kli_ga13.bmp kli_ga14.bmp kli_ga15.bmp kli_ga16.bmp kli_ga17.bmp kli_ga18.bmp kli_ga19.bmp kli_ga20.bmp kli_ga21.bmp kli_ga22.bmp kli_ga23.bmp kli_ga24.bmp kli_ga25.bmp kli_ga26.bmp kli_ga27.bmp kli_ga28.bmp kli_ga29.bmp kli_ga30.bmp kli_ga31.bmp kli_ga32.bmp kli_sb01.bmp kli_sb02.bmp kli_sb03.bmp kli_sb04.bmp kli_sb05.bmp kli_sb06.bmp kli_sb07.bmp kli_sb08.bmp kli_sb09.bmp kli_sb10.bmp kli_sb11.bmp kli_sb12.bmp kli_sb13.bmp kli_sb14.bmp kli_sb15.bmp kli_sb16.bmp kli_sb17.bmp kli_sb18.bmp kli_sb19.bmp kli_sb20.bmp kli_sb21.bmp kli_sb22.bmp kli_sb23.bmp kli_sb24.bmp Log Message: Update to version 4.4.0.3 --- NEW FILE: kli_bb32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_as22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_bb22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_dd25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ca30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_ga06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_at19.bmp --- (This appears to be a binary file; contents omitted.) From modemhero at users.sourceforge.net Tue Apr 11 23:39:54 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 04:39:54 +0000 Subject: [netrek-cvs] client/netrekxp/resources/ships/color1/ind ind_as01.bmp, NONE, 1.1 ind_as02.bmp, NONE, 1.1 ind_as03.bmp, NONE, 1.1 ind_as04.bmp, NONE, 1.1 ind_as05.bmp, NONE, 1.1 ind_as06.bmp, NONE, 1.1 ind_as07.bmp, NONE, 1.1 ind_as08.bmp, NONE, 1.1 ind_as09.bmp, NONE, 1.1 ind_as10.bmp, NONE, 1.1 ind_as11.bmp, NONE, 1.1 ind_as12.bmp, NONE, 1.1 ind_as13.bmp, NONE, 1.1 ind_as14.bmp, NONE, 1.1 ind_as15.bmp, NONE, 1.1 ind_as16.bmp, NONE, 1.1 ind_as17.bmp, NONE, 1.1 ind_as18.bmp, NONE, 1.1 ind_as19.bmp, NONE, 1.1 ind_as20.bmp, NONE, 1.1 ind_as21.bmp, NONE, 1.1 ind_as22.bmp, NONE, 1.1 ind_as23.bmp, NONE, 1.1 ind_as24.bmp, NONE, 1.1 ind_as25.bmp, NONE, 1.1 ind_as26.bmp, NONE, 1.1 ind_as27.bmp, NONE, 1.1 ind_as28.bmp, NONE, 1.1 ind_as29.bmp, NONE, 1.1 ind_as30.bmp, NONE, 1.1 ind_as31.bmp, NONE, 1.1 ind_as32.bmp, NONE, 1.1 ind_at01.bmp, NONE, 1.1 ind_at02.bmp, NONE, 1.1 ind_at03.bmp, NONE, 1.1 ind_at04.bmp, NONE, 1.1 ind_at05.bmp, NONE, 1.1 ind_at06.bmp, NONE, 1.1 ind_at07.bmp, NONE, 1.1 ind_at08.bmp, NONE, 1.1 ind_at09.bmp, NONE, 1.1 ind_at10.bmp, NONE, 1.1 ind_at11.bmp, NONE, 1.1 ind_at12.bmp, NONE, 1.1 ind_at13.bmp, NONE, 1.1 ind_at14.bmp, NONE, 1.1 ind_at15.bmp, NONE, 1.1 ind_at16.bmp, NONE, 1.1 ind_at17.bmp, NONE, 1.1 ind_at18.bmp, NONE, 1.1 ind_at19.bmp, NONE, 1.1 ind_at20.bmp, NONE, 1.1 ind_at21.bmp, NONE, 1.1 ind_at22.bmp, NONE, 1.1 ind_at23.bmp, NONE, 1.1 ind_at24.bmp, NONE, 1.1 ind_at25.bmp, NONE, 1.1 ind_at26.bmp, NONE, 1.1 ind_at27.bmp, NONE, 1.1 ind_at28.bmp, NONE, 1.1 ind_at29.bmp, NONE, 1.1 ind_at30.bmp, NONE, 1.1 ind_at31.bmp, NONE, 1.1 ind_at32.bmp, NONE, 1.1 ind_bb01.bmp, NONE, 1.1 ind_bb02.bmp, NONE, 1.1 ind_bb03.bmp, NONE, 1.1 ind_bb04.bmp, NONE, 1.1 ind_bb05.bmp, NONE, 1.1 ind_bb06.bmp, NONE, 1.1 ind_bb07.bmp, NONE, 1.1 ind_bb08.bmp, NONE, 1.1 ind_bb09.bmp, NONE, 1.1 ind_bb10.bmp, NONE, 1.1 ind_bb11.bmp, NONE, 1.1 ind_bb12.bmp, NONE, 1.1 ind_bb13.bmp, NONE, 1.1 ind_bb14.bmp, NONE, 1.1 ind_bb15.bmp, NONE, 1.1 ind_bb16.bmp, NONE, 1.1 ind_bb17.bmp, NONE, 1.1 ind_bb18.bmp, NONE, 1.1 ind_bb19.bmp, NONE, 1.1 ind_bb20.bmp, NONE, 1.1 ind_bb21.bmp, NONE, 1.1 ind_bb22.bmp, NONE, 1.1 ind_bb23.bmp, NONE, 1.1 ind_bb24.bmp, NONE, 1.1 ind_bb25.bmp, NONE, 1.1 ind_bb26.bmp, NONE, 1.1 ind_bb27.bmp, NONE, 1.1 ind_bb28.bmp, NONE, 1.1 ind_bb29.bmp, NONE, 1.1 ind_bb30.bmp, NONE, 1.1 ind_bb31.bmp, NONE, 1.1 ind_bb32.bmp, NONE, 1.1 ind_ca01.bmp, NONE, 1.1 ind_ca02.bmp, NONE, 1.1 ind_ca03.bmp, NONE, 1.1 ind_ca04.bmp, NONE, 1.1 ind_ca05.bmp, NONE, 1.1 ind_ca06.bmp, NONE, 1.1 ind_ca07.bmp, NONE, 1.1 ind_ca08.bmp, NONE, 1.1 ind_ca09.bmp, NONE, 1.1 ind_ca10.bmp, NONE, 1.1 ind_ca11.bmp, NONE, 1.1 ind_ca12.bmp, NONE, 1.1 ind_ca13.bmp, NONE, 1.1 ind_ca14.bmp, NONE, 1.1 ind_ca15.bmp, NONE, 1.1 ind_ca16.bmp, NONE, 1.1 ind_ca17.bmp, NONE, 1.1 ind_ca18.bmp, NONE, 1.1 ind_ca19.bmp, NONE, 1.1 ind_ca20.bmp, NONE, 1.1 ind_ca21.bmp, NONE, 1.1 ind_ca22.bmp, NONE, 1.1 ind_ca23.bmp, NONE, 1.1 ind_ca24.bmp, NONE, 1.1 ind_ca25.bmp, NONE, 1.1 ind_ca26.bmp, NONE, 1.1 ind_ca27.bmp, NONE, 1.1 ind_ca28.bmp, NONE, 1.1 ind_ca29.bmp, NONE, 1.1 ind_ca30.bmp, NONE, 1.1 ind_ca31.bmp, NONE, 1.1 ind_ca32.bmp, NONE, 1.1 ind_dd01.bmp, NONE, 1.1 ind_dd02.bmp, NONE, 1.1 ind_dd03.bmp, NONE, 1.1 ind_dd04.bmp, NONE, 1.1 ind_dd05.bmp, NONE, 1.1 ind_dd06.bmp, NONE, 1.1 ind_dd07.bmp, NONE, 1.1 ind_dd08.bmp, NONE, 1.1 ind_dd09.bmp, NONE, 1.1 ind_dd10.bmp, NONE, 1.1 ind_dd11.bmp, NONE, 1.1 ind_dd12.bmp, NONE, 1.1 ind_dd13.bmp, NONE, 1.1 ind_dd14.bmp, NONE, 1.1 ind_dd15.bmp, NONE, 1.1 ind_dd16.bmp, NONE, 1.1 ind_dd17.bmp, NONE, 1.1 ind_dd18.bmp, NONE, 1.1 ind_dd19.bmp, NONE, 1.1 ind_dd20.bmp, NONE, 1.1 ind_dd21.bmp, NONE, 1.1 ind_dd22.bmp, NONE, 1.1 ind_dd23.bmp, NONE, 1.1 ind_dd24.bmp, NONE, 1.1 ind_dd25.bmp, NONE, 1.1 ind_dd26.bmp, NONE, 1.1 ind_dd27.bmp, NONE, 1.1 ind_dd28.bmp, NONE, 1.1 ind_dd29.bmp, NONE, 1.1 ind_dd30.bmp, NONE, 1.1 ind_dd31.bmp, NONE, 1.1 ind_dd32.bmp, NONE, 1.1 ind_ga01.bmp, NONE, 1.1 ind_ga02.bmp, NONE, 1.1 ind_ga03.bmp, NONE, 1.1 ind_ga04.bmp, NONE, 1.1 ind_ga05.bmp, NONE, 1.1 ind_ga06.bmp, NONE, 1.1 ind_ga07.bmp, NONE, 1.1 ind_ga08.bmp, NONE, 1.1 ind_ga09.bmp, NONE, 1.1 ind_ga10.bmp, NONE, 1.1 ind_ga11.bmp, NONE, 1.1 ind_ga12.bmp, NONE, 1.1 ind_ga13.bmp, NONE, 1.1 ind_ga14.bmp, NONE, 1.1 ind_ga15.bmp, NONE, 1.1 ind_ga16.bmp, NONE, 1.1 ind_ga17.bmp, NONE, 1.1 ind_ga18.bmp, NONE, 1.1 ind_ga19.bmp, NONE, 1.1 ind_ga20.bmp, NONE, 1.1 ind_ga21.bmp, NONE, 1.1 ind_ga22.bmp, NONE, 1.1 ind_ga23.bmp, NONE, 1.1 ind_ga24.bmp, NONE, 1.1 ind_ga25.bmp, NONE, 1.1 ind_ga26.bmp, NONE, 1.1 ind_ga27.bmp, NONE, 1.1 ind_ga28.bmp, NONE, 1.1 ind_ga29.bmp, NONE, 1.1 ind_ga30.bmp, NONE, 1.1 ind_ga31.bmp, NONE, 1.1 ind_ga32.bmp, NONE, 1.1 ind_sb01.bmp, NONE, 1.1 ind_sb02.bmp, NONE, 1.1 ind_sb03.bmp, NONE, 1.1 ind_sb04.bmp, NONE, 1.1 ind_sb05.bmp, NONE, 1.1 ind_sb06.bmp, NONE, 1.1 ind_sb07.bmp, NONE, 1.1 ind_sb08.bmp, NONE, 1.1 ind_sb09.bmp, NONE, 1.1 ind_sb10.bmp, NONE, 1.1 ind_sb11.bmp, NONE, 1.1 ind_sb12.bmp, NONE, 1.1 ind_sb13.bmp, NONE, 1.1 ind_sb14.bmp, NONE, 1.1 ind_sb15.bmp, NONE, 1.1 ind_sb16.bmp, NONE, 1.1 ind_sb17.bmp, NONE, 1.1 ind_sb18.bmp, NONE, 1.1 ind_sb19.bmp, NONE, 1.1 ind_sb20.bmp, NONE, 1.1 ind_sb21.bmp, NONE, 1.1 ind_sb22.bmp, NONE, 1.1 ind_sb23.bmp, NONE, 1.1 ind_sb24.bmp, NONE, 1.1 ind_sb25.bmp, NONE, 1.1 ind_sb26.bmp, NONE, 1.1 ind_sb27.bmp, NONE, 1.1 ind_sb28.bmp, NONE, 1.1 ind_sb29.bmp, NONE, 1.1 ind_sb30.bmp, NONE, 1.1 ind_sb31.bmp, NONE, 1.1 ind_sb32.bmp, NONE, 1.1 ind_sc01.bmp, NONE, 1.1 ind_sc02.bmp, NONE, 1.1 ind_sc03.bmp, NONE, 1.1 ind_sc04.bmp, NONE, 1.1 ind_sc05.bmp, NONE, 1.1 ind_sc06.bmp, NONE, 1.1 ind_sc07.bmp, NONE, 1.1 ind_sc08.bmp, NONE, 1.1 ind_sc09.bmp, NONE, 1.1 ind_sc10.bmp, NONE, 1.1 ind_sc11.bmp, NONE, 1.1 ind_sc12.bmp, NONE, 1.1 ind_sc13.bmp, NONE, 1.1 ind_sc14.bmp, NONE, 1.1 ind_sc15.bmp, NONE, 1.1 ind_sc16.bmp, NONE, 1.1 ind_sc17.bmp, NONE, 1.1 ind_sc18.bmp, NONE, 1.1 ind_sc19.bmp, NONE, 1.1 ind_sc20.bmp, NONE, 1.1 ind_sc21.bmp, NONE, 1.1 ind_sc22.bmp, NONE, 1.1 ind_sc23.bmp, NONE, 1.1 ind_sc24.bmp, NONE, 1.1 ind_sc25.bmp, NONE, 1.1 ind_sc26.bmp, NONE, 1.1 ind_sc27.bmp, NONE, 1.1 ind_sc28.bmp, NONE, 1.1 ind_sc29.bmp, NONE, 1.1 ind_sc30.bmp, NONE, 1.1 ind_sc31.bmp, NONE, 1.1 ind_sc32.bmp, NONE, 1.1 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/ships/color1/ind In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31279/resources/ships/color1/ind Added Files: ind_as01.bmp ind_as02.bmp ind_as03.bmp ind_as04.bmp ind_as05.bmp ind_as06.bmp ind_as07.bmp ind_as08.bmp ind_as09.bmp ind_as10.bmp ind_as11.bmp ind_as12.bmp ind_as13.bmp ind_as14.bmp ind_as15.bmp ind_as16.bmp ind_as17.bmp ind_as18.bmp ind_as19.bmp ind_as20.bmp ind_as21.bmp ind_as22.bmp ind_as23.bmp ind_as24.bmp ind_as25.bmp ind_as26.bmp ind_as27.bmp ind_as28.bmp ind_as29.bmp ind_as30.bmp ind_as31.bmp ind_as32.bmp ind_at01.bmp ind_at02.bmp ind_at03.bmp ind_at04.bmp ind_at05.bmp ind_at06.bmp ind_at07.bmp ind_at08.bmp ind_at09.bmp ind_at10.bmp ind_at11.bmp ind_at12.bmp ind_at13.bmp ind_at14.bmp ind_at15.bmp ind_at16.bmp ind_at17.bmp ind_at18.bmp ind_at19.bmp ind_at20.bmp ind_at21.bmp ind_at22.bmp ind_at23.bmp ind_at24.bmp ind_at25.bmp ind_at26.bmp ind_at27.bmp ind_at28.bmp ind_at29.bmp ind_at30.bmp ind_at31.bmp ind_at32.bmp ind_bb01.bmp ind_bb02.bmp ind_bb03.bmp ind_bb04.bmp ind_bb05.bmp ind_bb06.bmp ind_bb07.bmp ind_bb08.bmp ind_bb09.bmp ind_bb10.bmp ind_bb11.bmp ind_bb12.bmp ind_bb13.bmp ind_bb14.bmp ind_bb15.bmp ind_bb16.bmp ind_bb17.bmp ind_bb18.bmp ind_bb19.bmp ind_bb20.bmp ind_bb21.bmp ind_bb22.bmp ind_bb23.bmp ind_bb24.bmp ind_bb25.bmp ind_bb26.bmp ind_bb27.bmp ind_bb28.bmp ind_bb29.bmp ind_bb30.bmp ind_bb31.bmp ind_bb32.bmp ind_ca01.bmp ind_ca02.bmp ind_ca03.bmp ind_ca04.bmp ind_ca05.bmp ind_ca06.bmp ind_ca07.bmp ind_ca08.bmp ind_ca09.bmp ind_ca10.bmp ind_ca11.bmp ind_ca12.bmp ind_ca13.bmp ind_ca14.bmp ind_ca15.bmp ind_ca16.bmp ind_ca17.bmp ind_ca18.bmp ind_ca19.bmp ind_ca20.bmp ind_ca21.bmp ind_ca22.bmp ind_ca23.bmp ind_ca24.bmp ind_ca25.bmp ind_ca26.bmp ind_ca27.bmp ind_ca28.bmp ind_ca29.bmp ind_ca30.bmp ind_ca31.bmp ind_ca32.bmp ind_dd01.bmp ind_dd02.bmp ind_dd03.bmp ind_dd04.bmp ind_dd05.bmp ind_dd06.bmp ind_dd07.bmp ind_dd08.bmp ind_dd09.bmp ind_dd10.bmp ind_dd11.bmp ind_dd12.bmp ind_dd13.bmp ind_dd14.bmp ind_dd15.bmp ind_dd16.bmp ind_dd17.bmp ind_dd18.bmp ind_dd19.bmp ind_dd20.bmp ind_dd21.bmp ind_dd22.bmp ind_dd23.bmp ind_dd24.bmp ind_dd25.bmp ind_dd26.bmp ind_dd27.bmp ind_dd28.bmp ind_dd29.bmp ind_dd30.bmp ind_dd31.bmp ind_dd32.bmp ind_ga01.bmp ind_ga02.bmp ind_ga03.bmp ind_ga04.bmp ind_ga05.bmp ind_ga06.bmp ind_ga07.bmp ind_ga08.bmp ind_ga09.bmp ind_ga10.bmp ind_ga11.bmp ind_ga12.bmp ind_ga13.bmp ind_ga14.bmp ind_ga15.bmp ind_ga16.bmp ind_ga17.bmp ind_ga18.bmp ind_ga19.bmp ind_ga20.bmp ind_ga21.bmp ind_ga22.bmp ind_ga23.bmp ind_ga24.bmp ind_ga25.bmp ind_ga26.bmp ind_ga27.bmp ind_ga28.bmp ind_ga29.bmp ind_ga30.bmp ind_ga31.bmp ind_ga32.bmp ind_sb01.bmp ind_sb02.bmp ind_sb03.bmp ind_sb04.bmp ind_sb05.bmp ind_sb06.bmp ind_sb07.bmp ind_sb08.bmp ind_sb09.bmp ind_sb10.bmp ind_sb11.bmp ind_sb12.bmp ind_sb13.bmp ind_sb14.bmp ind_sb15.bmp ind_sb16.bmp ind_sb17.bmp ind_sb18.bmp ind_sb19.bmp ind_sb20.bmp ind_sb21.bmp ind_sb22.bmp ind_sb23.bmp ind_sb24.bmp ind_sb25.bmp ind_sb26.bmp ind_sb27.bmp ind_sb28.bmp ind_sb29.bmp ind_sb30.bmp ind_sb31.bmp ind_sb32.bmp ind_sc01.bmp ind_sc02.bmp ind_sc03.bmp ind_sc04.bmp ind_sc05.bmp ind_sc06.bmp ind_sc07.bmp ind_sc08.bmp ind_sc09.bmp ind_sc10.bmp ind_sc11.bmp ind_sc12.bmp ind_sc13.bmp ind_sc14.bmp ind_sc15.bmp ind_sc16.bmp ind_sc17.bmp ind_sc18.bmp ind_sc19.bmp ind_sc20.bmp ind_sc21.bmp ind_sc22.bmp ind_sc23.bmp ind_sc24.bmp ind_sc25.bmp ind_sc26.bmp ind_sc27.bmp ind_sc28.bmp ind_sc29.bmp ind_sc30.bmp ind_sc31.bmp ind_sc32.bmp Log Message: Update to version 4.4.0.3 --- NEW FILE: ind_bb02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ca19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_as01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_ga11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sc11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_sb02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_bb14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_at14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ind_dd25.bmp --- (This appears to be a binary file; contents omitted.) From modemhero at users.sourceforge.net Tue Apr 11 23:40:24 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 04:40:24 +0000 Subject: [netrek-cvs] client/netrekxp/resources/ships/color1/rom rom_as01.bmp, NONE, 1.1 rom_as02.bmp, NONE, 1.1 rom_as03.bmp, NONE, 1.1 rom_as04.bmp, NONE, 1.1 rom_as05.bmp, NONE, 1.1 rom_as06.bmp, NONE, 1.1 rom_as07.bmp, NONE, 1.1 rom_as08.bmp, NONE, 1.1 rom_as09.bmp, NONE, 1.1 rom_as10.bmp, NONE, 1.1 rom_as11.bmp, NONE, 1.1 rom_as12.bmp, NONE, 1.1 rom_as13.bmp, NONE, 1.1 rom_as14.bmp, NONE, 1.1 rom_as15.bmp, NONE, 1.1 rom_as16.bmp, NONE, 1.1 rom_as17.bmp, NONE, 1.1 rom_as18.bmp, NONE, 1.1 rom_as19.bmp, NONE, 1.1 rom_as20.bmp, NONE, 1.1 rom_as21.bmp, NONE, 1.1 rom_as22.bmp, NONE, 1.1 rom_as23.bmp, NONE, 1.1 rom_as24.bmp, NONE, 1.1 rom_as25.bmp, NONE, 1.1 rom_as26.bmp, NONE, 1.1 rom_as27.bmp, NONE, 1.1 rom_as28.bmp, NONE, 1.1 rom_as29.bmp, NONE, 1.1 rom_as30.bmp, NONE, 1.1 rom_as31.bmp, NONE, 1.1 rom_as32.bmp, NONE, 1.1 rom_at01.bmp, NONE, 1.1 rom_at02.bmp, NONE, 1.1 rom_at03.bmp, NONE, 1.1 rom_at04.bmp, NONE, 1.1 rom_at05.bmp, NONE, 1.1 rom_at06.bmp, NONE, 1.1 rom_at07.bmp, NONE, 1.1 rom_at08.bmp, NONE, 1.1 rom_at09.bmp, NONE, 1.1 rom_at10.bmp, NONE, 1.1 rom_at11.bmp, NONE, 1.1 rom_at12.bmp, NONE, 1.1 rom_at13.bmp, NONE, 1.1 rom_at14.bmp, NONE, 1.1 rom_at15.bmp, NONE, 1.1 rom_at16.bmp, NONE, 1.1 rom_at17.bmp, NONE, 1.1 rom_at18.bmp, NONE, 1.1 rom_at19.bmp, NONE, 1.1 rom_at20.bmp, NONE, 1.1 rom_at21.bmp, NONE, 1.1 rom_at22.bmp, NONE, 1.1 rom_at23.bmp, NONE, 1.1 rom_at24.bmp, NONE, 1.1 rom_at25.bmp, NONE, 1.1 rom_at26.bmp, NONE, 1.1 rom_at27.bmp, NONE, 1.1 rom_at28.bmp, NONE, 1.1 rom_at29.bmp, NONE, 1.1 rom_at30.bmp, NONE, 1.1 rom_at31.bmp, NONE, 1.1 rom_at32.bmp, NONE, 1.1 rom_bb01.bmp, NONE, 1.1 rom_bb02.bmp, NONE, 1.1 rom_bb03.bmp, NONE, 1.1 rom_bb04.bmp, NONE, 1.1 rom_bb05.bmp, NONE, 1.1 rom_bb06.bmp, NONE, 1.1 rom_bb07.bmp, NONE, 1.1 rom_bb08.bmp, NONE, 1.1 rom_bb09.bmp, NONE, 1.1 rom_bb10.bmp, NONE, 1.1 rom_bb11.bmp, NONE, 1.1 rom_bb12.bmp, NONE, 1.1 rom_bb13.bmp, NONE, 1.1 rom_bb14.bmp, NONE, 1.1 rom_bb15.bmp, NONE, 1.1 rom_bb16.bmp, NONE, 1.1 rom_bb17.bmp, NONE, 1.1 rom_bb18.bmp, NONE, 1.1 rom_bb19.bmp, NONE, 1.1 rom_bb20.bmp, NONE, 1.1 rom_bb21.bmp, NONE, 1.1 rom_bb22.bmp, NONE, 1.1 rom_bb23.bmp, NONE, 1.1 rom_bb24.bmp, NONE, 1.1 rom_bb25.bmp, NONE, 1.1 rom_bb26.bmp, NONE, 1.1 rom_bb27.bmp, NONE, 1.1 rom_bb28.bmp, NONE, 1.1 rom_bb29.bmp, NONE, 1.1 rom_bb30.bmp, NONE, 1.1 rom_bb31.bmp, NONE, 1.1 rom_bb32.bmp, NONE, 1.1 rom_ca01.bmp, NONE, 1.1 rom_ca02.bmp, NONE, 1.1 rom_ca03.bmp, NONE, 1.1 rom_ca04.bmp, NONE, 1.1 rom_ca05.bmp, NONE, 1.1 rom_ca06.bmp, NONE, 1.1 rom_ca07.bmp, NONE, 1.1 rom_ca08.bmp, NONE, 1.1 rom_ca09.bmp, NONE, 1.1 rom_ca10.bmp, NONE, 1.1 rom_ca11.bmp, NONE, 1.1 rom_ca12.bmp, NONE, 1.1 rom_ca13.bmp, NONE, 1.1 rom_ca14.bmp, NONE, 1.1 rom_ca15.bmp, NONE, 1.1 rom_ca16.bmp, NONE, 1.1 rom_ca17.bmp, NONE, 1.1 rom_ca18.bmp, NONE, 1.1 rom_ca19.bmp, NONE, 1.1 rom_ca20.bmp, NONE, 1.1 rom_ca21.bmp, NONE, 1.1 rom_ca22.bmp, NONE, 1.1 rom_ca23.bmp, NONE, 1.1 rom_ca24.bmp, NONE, 1.1 rom_ca25.bmp, NONE, 1.1 rom_ca26.bmp, NONE, 1.1 rom_ca27.bmp, NONE, 1.1 rom_ca28.bmp, NONE, 1.1 rom_ca29.bmp, NONE, 1.1 rom_ca30.bmp, NONE, 1.1 rom_ca31.bmp, NONE, 1.1 rom_ca32.bmp, NONE, 1.1 rom_dd01.bmp, NONE, 1.1 rom_dd02.bmp, NONE, 1.1 rom_dd03.bmp, NONE, 1.1 rom_dd04.bmp, NONE, 1.1 rom_dd05.bmp, NONE, 1.1 rom_dd06.bmp, NONE, 1.1 rom_dd07.bmp, NONE, 1.1 rom_dd08.bmp, NONE, 1.1 rom_dd09.bmp, NONE, 1.1 rom_dd10.bmp, NONE, 1.1 rom_dd11.bmp, NONE, 1.1 rom_dd12.bmp, NONE, 1.1 rom_dd13.bmp, NONE, 1.1 rom_dd14.bmp, NONE, 1.1 rom_dd15.bmp, NONE, 1.1 rom_dd16.bmp, NONE, 1.1 rom_dd17.bmp, NONE, 1.1 rom_dd18.bmp, NONE, 1.1 rom_dd19.bmp, NONE, 1.1 rom_dd20.bmp, NONE, 1.1 rom_dd21.bmp, NONE, 1.1 rom_dd22.bmp, NONE, 1.1 rom_dd23.bmp, NONE, 1.1 rom_dd24.bmp, NONE, 1.1 rom_dd25.bmp, NONE, 1.1 rom_dd26.bmp, NONE, 1.1 rom_dd27.bmp, NONE, 1.1 rom_dd28.bmp, NONE, 1.1 rom_dd29.bmp, NONE, 1.1 rom_dd30.bmp, NONE, 1.1 rom_dd31.bmp, NONE, 1.1 rom_dd32.bmp, NONE, 1.1 rom_ga01.bmp, NONE, 1.1 rom_ga02.bmp, NONE, 1.1 rom_ga03.bmp, NONE, 1.1 rom_ga04.bmp, NONE, 1.1 rom_ga05.bmp, NONE, 1.1 rom_ga06.bmp, NONE, 1.1 rom_ga07.bmp, NONE, 1.1 rom_ga08.bmp, NONE, 1.1 rom_ga09.bmp, NONE, 1.1 rom_ga10.bmp, NONE, 1.1 rom_ga11.bmp, NONE, 1.1 rom_ga12.bmp, NONE, 1.1 rom_ga13.bmp, NONE, 1.1 rom_ga14.bmp, NONE, 1.1 rom_ga15.bmp, NONE, 1.1 rom_ga16.bmp, NONE, 1.1 rom_ga17.bmp, NONE, 1.1 rom_ga18.bmp, NONE, 1.1 rom_ga19.bmp, NONE, 1.1 rom_ga20.bmp, NONE, 1.1 rom_ga21.bmp, NONE, 1.1 rom_ga22.bmp, NONE, 1.1 rom_ga23.bmp, NONE, 1.1 rom_ga24.bmp, NONE, 1.1 rom_ga25.bmp, NONE, 1.1 rom_ga26.bmp, NONE, 1.1 rom_ga27.bmp, NONE, 1.1 rom_ga28.bmp, NONE, 1.1 rom_ga29.bmp, NONE, 1.1 rom_ga30.bmp, NONE, 1.1 rom_ga31.bmp, NONE, 1.1 rom_ga32.bmp, NONE, 1.1 rom_sb01.bmp, NONE, 1.1 rom_sb02.bmp, NONE, 1.1 rom_sb03.bmp, NONE, 1.1 rom_sb04.bmp, NONE, 1.1 rom_sb05.bmp, NONE, 1.1 rom_sb06.bmp, NONE, 1.1 rom_sb07.bmp, NONE, 1.1 rom_sb08.bmp, NONE, 1.1 rom_sb09.bmp, NONE, 1.1 rom_sb10.bmp, NONE, 1.1 rom_sb11.bmp, NONE, 1.1 rom_sb12.bmp, NONE, 1.1 rom_sb13.bmp, NONE, 1.1 rom_sb14.bmp, NONE, 1.1 rom_sb15.bmp, NONE, 1.1 rom_sb16.bmp, NONE, 1.1 rom_sb17.bmp, NONE, 1.1 rom_sb18.bmp, NONE, 1.1 rom_sb19.bmp, NONE, 1.1 rom_sb20.bmp, NONE, 1.1 rom_sb21.bmp, NONE, 1.1 rom_sb22.bmp, NONE, 1.1 rom_sb23.bmp, NONE, 1.1 rom_sb24.bmp, NONE, 1.1 rom_sb25.bmp, NONE, 1.1 rom_sb26.bmp, NONE, 1.1 rom_sb27.bmp, NONE, 1.1 rom_sb28.bmp, NONE, 1.1 rom_sb29.bmp, NONE, 1.1 rom_sb30.bmp, NONE, 1.1 rom_sb31.bmp, NONE, 1.1 rom_sb32.bmp, NONE, 1.1 rom_sc01.bmp, NONE, 1.1 rom_sc02.bmp, NONE, 1.1 rom_sc03.bmp, NONE, 1.1 rom_sc04.bmp, NONE, 1.1 rom_sc05.bmp, NONE, 1.1 rom_sc06.bmp, NONE, 1.1 rom_sc07.bmp, NONE, 1.1 rom_sc08.bmp, NONE, 1.1 rom_sc09.bmp, NONE, 1.1 rom_sc10.bmp, NONE, 1.1 rom_sc11.bmp, NONE, 1.1 rom_sc12.bmp, NONE, 1.1 rom_sc13.bmp, NONE, 1.1 rom_sc14.bmp, NONE, 1.1 rom_sc15.bmp, NONE, 1.1 rom_sc16.bmp, NONE, 1.1 rom_sc17.bmp, NONE, 1.1 rom_sc18.bmp, NONE, 1.1 rom_sc19.bmp, NONE, 1.1 rom_sc20.bmp, NONE, 1.1 rom_sc21.bmp, NONE, 1.1 rom_sc22.bmp, NONE, 1.1 rom_sc23.bmp, NONE, 1.1 rom_sc24.bmp, NONE, 1.1 rom_sc25.bmp, NONE, 1.1 rom_sc26.bmp, NONE, 1.1 rom_sc27.bmp, NONE, 1.1 rom_sc28.bmp, NONE, 1.1 rom_sc29.bmp, NONE, 1.1 rom_sc30.bmp, NONE, 1.1 rom_sc31.bmp, NONE, 1.1 rom_sc32.bmp, NONE, 1.1 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/ships/color1/rom In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31998/resources/ships/color1/rom Added Files: rom_as01.bmp rom_as02.bmp rom_as03.bmp rom_as04.bmp rom_as05.bmp rom_as06.bmp rom_as07.bmp rom_as08.bmp rom_as09.bmp rom_as10.bmp rom_as11.bmp rom_as12.bmp rom_as13.bmp rom_as14.bmp rom_as15.bmp rom_as16.bmp rom_as17.bmp rom_as18.bmp rom_as19.bmp rom_as20.bmp rom_as21.bmp rom_as22.bmp rom_as23.bmp rom_as24.bmp rom_as25.bmp rom_as26.bmp rom_as27.bmp rom_as28.bmp rom_as29.bmp rom_as30.bmp rom_as31.bmp rom_as32.bmp rom_at01.bmp rom_at02.bmp rom_at03.bmp rom_at04.bmp rom_at05.bmp rom_at06.bmp rom_at07.bmp rom_at08.bmp rom_at09.bmp rom_at10.bmp rom_at11.bmp rom_at12.bmp rom_at13.bmp rom_at14.bmp rom_at15.bmp rom_at16.bmp rom_at17.bmp rom_at18.bmp rom_at19.bmp rom_at20.bmp rom_at21.bmp rom_at22.bmp rom_at23.bmp rom_at24.bmp rom_at25.bmp rom_at26.bmp rom_at27.bmp rom_at28.bmp rom_at29.bmp rom_at30.bmp rom_at31.bmp rom_at32.bmp rom_bb01.bmp rom_bb02.bmp rom_bb03.bmp rom_bb04.bmp rom_bb05.bmp rom_bb06.bmp rom_bb07.bmp rom_bb08.bmp rom_bb09.bmp rom_bb10.bmp rom_bb11.bmp rom_bb12.bmp rom_bb13.bmp rom_bb14.bmp rom_bb15.bmp rom_bb16.bmp rom_bb17.bmp rom_bb18.bmp rom_bb19.bmp rom_bb20.bmp rom_bb21.bmp rom_bb22.bmp rom_bb23.bmp rom_bb24.bmp rom_bb25.bmp rom_bb26.bmp rom_bb27.bmp rom_bb28.bmp rom_bb29.bmp rom_bb30.bmp rom_bb31.bmp rom_bb32.bmp rom_ca01.bmp rom_ca02.bmp rom_ca03.bmp rom_ca04.bmp rom_ca05.bmp rom_ca06.bmp rom_ca07.bmp rom_ca08.bmp rom_ca09.bmp rom_ca10.bmp rom_ca11.bmp rom_ca12.bmp rom_ca13.bmp rom_ca14.bmp rom_ca15.bmp rom_ca16.bmp rom_ca17.bmp rom_ca18.bmp rom_ca19.bmp rom_ca20.bmp rom_ca21.bmp rom_ca22.bmp rom_ca23.bmp rom_ca24.bmp rom_ca25.bmp rom_ca26.bmp rom_ca27.bmp rom_ca28.bmp rom_ca29.bmp rom_ca30.bmp rom_ca31.bmp rom_ca32.bmp rom_dd01.bmp rom_dd02.bmp rom_dd03.bmp rom_dd04.bmp rom_dd05.bmp rom_dd06.bmp rom_dd07.bmp rom_dd08.bmp rom_dd09.bmp rom_dd10.bmp rom_dd11.bmp rom_dd12.bmp rom_dd13.bmp rom_dd14.bmp rom_dd15.bmp rom_dd16.bmp rom_dd17.bmp rom_dd18.bmp rom_dd19.bmp rom_dd20.bmp rom_dd21.bmp rom_dd22.bmp rom_dd23.bmp rom_dd24.bmp rom_dd25.bmp rom_dd26.bmp rom_dd27.bmp rom_dd28.bmp rom_dd29.bmp rom_dd30.bmp rom_dd31.bmp rom_dd32.bmp rom_ga01.bmp rom_ga02.bmp rom_ga03.bmp rom_ga04.bmp rom_ga05.bmp rom_ga06.bmp rom_ga07.bmp rom_ga08.bmp rom_ga09.bmp rom_ga10.bmp rom_ga11.bmp rom_ga12.bmp rom_ga13.bmp rom_ga14.bmp rom_ga15.bmp rom_ga16.bmp rom_ga17.bmp rom_ga18.bmp rom_ga19.bmp rom_ga20.bmp rom_ga21.bmp rom_ga22.bmp rom_ga23.bmp rom_ga24.bmp rom_ga25.bmp rom_ga26.bmp rom_ga27.bmp rom_ga28.bmp rom_ga29.bmp rom_ga30.bmp rom_ga31.bmp rom_ga32.bmp rom_sb01.bmp rom_sb02.bmp rom_sb03.bmp rom_sb04.bmp rom_sb05.bmp rom_sb06.bmp rom_sb07.bmp rom_sb08.bmp rom_sb09.bmp rom_sb10.bmp rom_sb11.bmp rom_sb12.bmp rom_sb13.bmp rom_sb14.bmp rom_sb15.bmp rom_sb16.bmp rom_sb17.bmp rom_sb18.bmp rom_sb19.bmp rom_sb20.bmp rom_sb21.bmp rom_sb22.bmp rom_sb23.bmp rom_sb24.bmp rom_sb25.bmp rom_sb26.bmp rom_sb27.bmp rom_sb28.bmp rom_sb29.bmp rom_sb30.bmp rom_sb31.bmp rom_sb32.bmp rom_sc01.bmp rom_sc02.bmp rom_sc03.bmp rom_sc04.bmp rom_sc05.bmp rom_sc06.bmp rom_sc07.bmp rom_sc08.bmp rom_sc09.bmp rom_sc10.bmp rom_sc11.bmp rom_sc12.bmp rom_sc13.bmp rom_sc14.bmp rom_sc15.bmp rom_sc16.bmp rom_sc17.bmp rom_sc18.bmp rom_sc19.bmp rom_sc20.bmp rom_sc21.bmp rom_sc22.bmp rom_sc23.bmp rom_sc24.bmp rom_sc25.bmp rom_sc26.bmp rom_sc27.bmp rom_sc28.bmp rom_sc29.bmp rom_sc30.bmp rom_sc31.bmp rom_sc32.bmp Log Message: Update to version 4.4.0.3 --- NEW FILE: rom_as11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ga32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_bb23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_at02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sc05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_ca19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_dd11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_sb29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rom_as28.bmp --- (This appears to be a binary file; contents omitted.) From modemhero at users.sourceforge.net Tue Apr 11 23:40:23 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 04:40:23 +0000 Subject: [netrek-cvs] client/netrekxp/resources/ships/color1/ori ori_as01.bmp, NONE, 1.1 ori_as02.bmp, NONE, 1.1 ori_as03.bmp, NONE, 1.1 ori_as04.bmp, NONE, 1.1 ori_as05.bmp, NONE, 1.1 ori_as06.bmp, NONE, 1.1 ori_as07.bmp, NONE, 1.1 ori_as08.bmp, NONE, 1.1 ori_as09.bmp, NONE, 1.1 ori_as10.bmp, NONE, 1.1 ori_as11.bmp, NONE, 1.1 ori_as12.bmp, NONE, 1.1 ori_as13.bmp, NONE, 1.1 ori_as14.bmp, NONE, 1.1 ori_as15.bmp, NONE, 1.1 ori_as16.bmp, NONE, 1.1 ori_as17.bmp, NONE, 1.1 ori_as18.bmp, NONE, 1.1 ori_as19.bmp, NONE, 1.1 ori_as20.bmp, NONE, 1.1 ori_as21.bmp, NONE, 1.1 ori_as22.bmp, NONE, 1.1 ori_as23.bmp, NONE, 1.1 ori_as24.bmp, NONE, 1.1 ori_as25.bmp, NONE, 1.1 ori_as26.bmp, NONE, 1.1 ori_as27.bmp, NONE, 1.1 ori_as28.bmp, NONE, 1.1 ori_as29.bmp, NONE, 1.1 ori_as30.bmp, NONE, 1.1 ori_as31.bmp, NONE, 1.1 ori_as32.bmp, NONE, 1.1 ori_at01.bmp, NONE, 1.1 ori_at02.bmp, NONE, 1.1 ori_at03.bmp, NONE, 1.1 ori_at04.bmp, NONE, 1.1 ori_at05.bmp, NONE, 1.1 ori_at06.bmp, NONE, 1.1 ori_at07.bmp, NONE, 1.1 ori_at08.bmp, NONE, 1.1 ori_at09.bmp, NONE, 1.1 ori_at10.bmp, NONE, 1.1 ori_at11.bmp, NONE, 1.1 ori_at12.bmp, NONE, 1.1 ori_at13.bmp, NONE, 1.1 ori_at14.bmp, NONE, 1.1 ori_at15.bmp, NONE, 1.1 ori_at16.bmp, NONE, 1.1 ori_at17.bmp, NONE, 1.1 ori_at18.bmp, NONE, 1.1 ori_at19.bmp, NONE, 1.1 ori_at20.bmp, NONE, 1.1 ori_at21.bmp, NONE, 1.1 ori_at22.bmp, NONE, 1.1 ori_at23.bmp, NONE, 1.1 ori_at24.bmp, NONE, 1.1 ori_at25.bmp, NONE, 1.1 ori_at26.bmp, NONE, 1.1 ori_at27.bmp, NONE, 1.1 ori_at28.bmp, NONE, 1.1 ori_at29.bmp, NONE, 1.1 ori_at30.bmp, NONE, 1.1 ori_at31.bmp, NONE, 1.1 ori_at32.bmp, NONE, 1.1 ori_bb01.bmp, NONE, 1.1 ori_bb02.bmp, NONE, 1.1 ori_bb03.bmp, NONE, 1.1 ori_bb04.bmp, NONE, 1.1 ori_bb05.bmp, NONE, 1.1 ori_bb06.bmp, NONE, 1.1 ori_bb07.bmp, NONE, 1.1 ori_bb08.bmp, NONE, 1.1 ori_bb09.bmp, NONE, 1.1 ori_bb10.bmp, NONE, 1.1 ori_bb11.bmp, NONE, 1.1 ori_bb12.bmp, NONE, 1.1 ori_bb13.bmp, NONE, 1.1 ori_bb14.bmp, NONE, 1.1 ori_bb15.bmp, NONE, 1.1 ori_bb16.bmp, NONE, 1.1 ori_bb17.bmp, NONE, 1.1 ori_bb18.bmp, NONE, 1.1 ori_bb19.bmp, NONE, 1.1 ori_bb20.bmp, NONE, 1.1 ori_bb21.bmp, NONE, 1.1 ori_bb22.bmp, NONE, 1.1 ori_bb23.bmp, NONE, 1.1 ori_bb24.bmp, NONE, 1.1 ori_bb25.bmp, NONE, 1.1 ori_bb26.bmp, NONE, 1.1 ori_bb27.bmp, NONE, 1.1 ori_bb28.bmp, NONE, 1.1 ori_bb29.bmp, NONE, 1.1 ori_bb30.bmp, NONE, 1.1 ori_bb31.bmp, NONE, 1.1 ori_bb32.bmp, NONE, 1.1 ori_ca01.bmp, NONE, 1.1 ori_ca02.bmp, NONE, 1.1 ori_ca03.bmp, NONE, 1.1 ori_ca04.bmp, NONE, 1.1 ori_ca05.bmp, NONE, 1.1 ori_ca06.bmp, NONE, 1.1 ori_ca07.bmp, NONE, 1.1 ori_ca08.bmp, NONE, 1.1 ori_ca09.bmp, NONE, 1.1 ori_ca10.bmp, NONE, 1.1 ori_ca11.bmp, NONE, 1.1 ori_ca12.bmp, NONE, 1.1 ori_ca13.bmp, NONE, 1.1 ori_ca14.bmp, NONE, 1.1 ori_ca15.bmp, NONE, 1.1 ori_ca16.bmp, NONE, 1.1 ori_ca17.bmp, NONE, 1.1 ori_ca18.bmp, NONE, 1.1 ori_ca19.bmp, NONE, 1.1 ori_ca20.bmp, NONE, 1.1 ori_ca21.bmp, NONE, 1.1 ori_ca22.bmp, NONE, 1.1 ori_ca23.bmp, NONE, 1.1 ori_ca24.bmp, NONE, 1.1 ori_ca25.bmp, NONE, 1.1 ori_ca26.bmp, NONE, 1.1 ori_ca27.bmp, NONE, 1.1 ori_ca28.bmp, NONE, 1.1 ori_ca29.bmp, NONE, 1.1 ori_ca30.bmp, NONE, 1.1 ori_ca31.bmp, NONE, 1.1 ori_ca32.bmp, NONE, 1.1 ori_dd01.bmp, NONE, 1.1 ori_dd02.bmp, NONE, 1.1 ori_dd03.bmp, NONE, 1.1 ori_dd04.bmp, NONE, 1.1 ori_dd05.bmp, NONE, 1.1 ori_dd06.bmp, NONE, 1.1 ori_dd07.bmp, NONE, 1.1 ori_dd08.bmp, NONE, 1.1 ori_dd09.bmp, NONE, 1.1 ori_dd10.bmp, NONE, 1.1 ori_dd11.bmp, NONE, 1.1 ori_dd12.bmp, NONE, 1.1 ori_dd13.bmp, NONE, 1.1 ori_dd14.bmp, NONE, 1.1 ori_dd15.bmp, NONE, 1.1 ori_dd16.bmp, NONE, 1.1 ori_dd17.bmp, NONE, 1.1 ori_dd18.bmp, NONE, 1.1 ori_dd19.bmp, NONE, 1.1 ori_dd20.bmp, NONE, 1.1 ori_dd21.bmp, NONE, 1.1 ori_dd22.bmp, NONE, 1.1 ori_dd23.bmp, NONE, 1.1 ori_dd24.bmp, NONE, 1.1 ori_dd25.bmp, NONE, 1.1 ori_dd26.bmp, NONE, 1.1 ori_dd27.bmp, NONE, 1.1 ori_dd28.bmp, NONE, 1.1 ori_dd29.bmp, NONE, 1.1 ori_dd30.bmp, NONE, 1.1 ori_dd31.bmp, NONE, 1.1 ori_dd32.bmp, NONE, 1.1 ori_ga01.bmp, NONE, 1.1 ori_ga02.bmp, NONE, 1.1 ori_ga03.bmp, NONE, 1.1 ori_ga04.bmp, NONE, 1.1 ori_ga05.bmp, NONE, 1.1 ori_ga06.bmp, NONE, 1.1 ori_ga07.bmp, NONE, 1.1 ori_ga08.bmp, NONE, 1.1 ori_ga09.bmp, NONE, 1.1 ori_ga10.bmp, NONE, 1.1 ori_ga11.bmp, NONE, 1.1 ori_ga12.bmp, NONE, 1.1 ori_ga13.bmp, NONE, 1.1 ori_ga14.bmp, NONE, 1.1 ori_ga15.bmp, NONE, 1.1 ori_ga16.bmp, NONE, 1.1 ori_ga17.bmp, NONE, 1.1 ori_ga18.bmp, NONE, 1.1 ori_ga19.bmp, NONE, 1.1 ori_ga20.bmp, NONE, 1.1 ori_ga21.bmp, NONE, 1.1 ori_ga22.bmp, NONE, 1.1 ori_ga23.bmp, NONE, 1.1 ori_ga24.bmp, NONE, 1.1 ori_ga25.bmp, NONE, 1.1 ori_ga26.bmp, NONE, 1.1 ori_ga27.bmp, NONE, 1.1 ori_ga28.bmp, NONE, 1.1 ori_ga29.bmp, NONE, 1.1 ori_ga30.bmp, NONE, 1.1 ori_ga31.bmp, NONE, 1.1 ori_ga32.bmp, NONE, 1.1 ori_sb01.bmp, NONE, 1.1 ori_sb02.bmp, NONE, 1.1 ori_sb03.bmp, NONE, 1.1 ori_sb04.bmp, NONE, 1.1 ori_sb05.bmp, NONE, 1.1 ori_sb06.bmp, NONE, 1.1 ori_sb07.bmp, NONE, 1.1 ori_sb08.bmp, NONE, 1.1 ori_sb09.bmp, NONE, 1.1 ori_sb10.bmp, NONE, 1.1 ori_sb11.bmp, NONE, 1.1 ori_sb12.bmp, NONE, 1.1 ori_sb13.bmp, NONE, 1.1 ori_sb14.bmp, NONE, 1.1 ori_sb15.bmp, NONE, 1.1 ori_sb16.bmp, NONE, 1.1 ori_sb17.bmp, NONE, 1.1 ori_sb18.bmp, NONE, 1.1 ori_sb19.bmp, NONE, 1.1 ori_sb20.bmp, NONE, 1.1 ori_sb21.bmp, NONE, 1.1 ori_sb22.bmp, NONE, 1.1 ori_sb23.bmp, NONE, 1.1 ori_sb24.bmp, NONE, 1.1 ori_sb25.bmp, NONE, 1.1 ori_sb26.bmp, NONE, 1.1 ori_sb27.bmp, NONE, 1.1 ori_sb28.bmp, NONE, 1.1 ori_sb29.bmp, NONE, 1.1 ori_sb30.bmp, NONE, 1.1 ori_sb31.bmp, NONE, 1.1 ori_sb32.bmp, NONE, 1.1 ori_sc01.bmp, NONE, 1.1 ori_sc02.bmp, NONE, 1.1 ori_sc03.bmp, NONE, 1.1 ori_sc04.bmp, NONE, 1.1 ori_sc05.bmp, NONE, 1.1 ori_sc06.bmp, NONE, 1.1 ori_sc07.bmp, NONE, 1.1 ori_sc08.bmp, NONE, 1.1 ori_sc09.bmp, NONE, 1.1 ori_sc10.bmp, NONE, 1.1 ori_sc11.bmp, NONE, 1.1 ori_sc12.bmp, NONE, 1.1 ori_sc13.bmp, NONE, 1.1 ori_sc14.bmp, NONE, 1.1 ori_sc15.bmp, NONE, 1.1 ori_sc16.bmp, NONE, 1.1 ori_sc17.bmp, NONE, 1.1 ori_sc18.bmp, NONE, 1.1 ori_sc19.bmp, NONE, 1.1 ori_sc20.bmp, NONE, 1.1 ori_sc21.bmp, NONE, 1.1 ori_sc22.bmp, NONE, 1.1 ori_sc23.bmp, NONE, 1.1 ori_sc24.bmp, NONE, 1.1 ori_sc25.bmp, NONE, 1.1 ori_sc26.bmp, NONE, 1.1 ori_sc27.bmp, NONE, 1.1 ori_sc28.bmp, NONE, 1.1 ori_sc29.bmp, NONE, 1.1 ori_sc30.bmp, NONE, 1.1 ori_sc31.bmp, NONE, 1.1 ori_sc32.bmp, NONE, 1.1 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/ships/color1/ori In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31998/resources/ships/color1/ori Added Files: ori_as01.bmp ori_as02.bmp ori_as03.bmp ori_as04.bmp ori_as05.bmp ori_as06.bmp ori_as07.bmp ori_as08.bmp ori_as09.bmp ori_as10.bmp ori_as11.bmp ori_as12.bmp ori_as13.bmp ori_as14.bmp ori_as15.bmp ori_as16.bmp ori_as17.bmp ori_as18.bmp ori_as19.bmp ori_as20.bmp ori_as21.bmp ori_as22.bmp ori_as23.bmp ori_as24.bmp ori_as25.bmp ori_as26.bmp ori_as27.bmp ori_as28.bmp ori_as29.bmp ori_as30.bmp ori_as31.bmp ori_as32.bmp ori_at01.bmp ori_at02.bmp ori_at03.bmp ori_at04.bmp ori_at05.bmp ori_at06.bmp ori_at07.bmp ori_at08.bmp ori_at09.bmp ori_at10.bmp ori_at11.bmp ori_at12.bmp ori_at13.bmp ori_at14.bmp ori_at15.bmp ori_at16.bmp ori_at17.bmp ori_at18.bmp ori_at19.bmp ori_at20.bmp ori_at21.bmp ori_at22.bmp ori_at23.bmp ori_at24.bmp ori_at25.bmp ori_at26.bmp ori_at27.bmp ori_at28.bmp ori_at29.bmp ori_at30.bmp ori_at31.bmp ori_at32.bmp ori_bb01.bmp ori_bb02.bmp ori_bb03.bmp ori_bb04.bmp ori_bb05.bmp ori_bb06.bmp ori_bb07.bmp ori_bb08.bmp ori_bb09.bmp ori_bb10.bmp ori_bb11.bmp ori_bb12.bmp ori_bb13.bmp ori_bb14.bmp ori_bb15.bmp ori_bb16.bmp ori_bb17.bmp ori_bb18.bmp ori_bb19.bmp ori_bb20.bmp ori_bb21.bmp ori_bb22.bmp ori_bb23.bmp ori_bb24.bmp ori_bb25.bmp ori_bb26.bmp ori_bb27.bmp ori_bb28.bmp ori_bb29.bmp ori_bb30.bmp ori_bb31.bmp ori_bb32.bmp ori_ca01.bmp ori_ca02.bmp ori_ca03.bmp ori_ca04.bmp ori_ca05.bmp ori_ca06.bmp ori_ca07.bmp ori_ca08.bmp ori_ca09.bmp ori_ca10.bmp ori_ca11.bmp ori_ca12.bmp ori_ca13.bmp ori_ca14.bmp ori_ca15.bmp ori_ca16.bmp ori_ca17.bmp ori_ca18.bmp ori_ca19.bmp ori_ca20.bmp ori_ca21.bmp ori_ca22.bmp ori_ca23.bmp ori_ca24.bmp ori_ca25.bmp ori_ca26.bmp ori_ca27.bmp ori_ca28.bmp ori_ca29.bmp ori_ca30.bmp ori_ca31.bmp ori_ca32.bmp ori_dd01.bmp ori_dd02.bmp ori_dd03.bmp ori_dd04.bmp ori_dd05.bmp ori_dd06.bmp ori_dd07.bmp ori_dd08.bmp ori_dd09.bmp ori_dd10.bmp ori_dd11.bmp ori_dd12.bmp ori_dd13.bmp ori_dd14.bmp ori_dd15.bmp ori_dd16.bmp ori_dd17.bmp ori_dd18.bmp ori_dd19.bmp ori_dd20.bmp ori_dd21.bmp ori_dd22.bmp ori_dd23.bmp ori_dd24.bmp ori_dd25.bmp ori_dd26.bmp ori_dd27.bmp ori_dd28.bmp ori_dd29.bmp ori_dd30.bmp ori_dd31.bmp ori_dd32.bmp ori_ga01.bmp ori_ga02.bmp ori_ga03.bmp ori_ga04.bmp ori_ga05.bmp ori_ga06.bmp ori_ga07.bmp ori_ga08.bmp ori_ga09.bmp ori_ga10.bmp ori_ga11.bmp ori_ga12.bmp ori_ga13.bmp ori_ga14.bmp ori_ga15.bmp ori_ga16.bmp ori_ga17.bmp ori_ga18.bmp ori_ga19.bmp ori_ga20.bmp ori_ga21.bmp ori_ga22.bmp ori_ga23.bmp ori_ga24.bmp ori_ga25.bmp ori_ga26.bmp ori_ga27.bmp ori_ga28.bmp ori_ga29.bmp ori_ga30.bmp ori_ga31.bmp ori_ga32.bmp ori_sb01.bmp ori_sb02.bmp ori_sb03.bmp ori_sb04.bmp ori_sb05.bmp ori_sb06.bmp ori_sb07.bmp ori_sb08.bmp ori_sb09.bmp ori_sb10.bmp ori_sb11.bmp ori_sb12.bmp ori_sb13.bmp ori_sb14.bmp ori_sb15.bmp ori_sb16.bmp ori_sb17.bmp ori_sb18.bmp ori_sb19.bmp ori_sb20.bmp ori_sb21.bmp ori_sb22.bmp ori_sb23.bmp ori_sb24.bmp ori_sb25.bmp ori_sb26.bmp ori_sb27.bmp ori_sb28.bmp ori_sb29.bmp ori_sb30.bmp ori_sb31.bmp ori_sb32.bmp ori_sc01.bmp ori_sc02.bmp ori_sc03.bmp ori_sc04.bmp ori_sc05.bmp ori_sc06.bmp ori_sc07.bmp ori_sc08.bmp ori_sc09.bmp ori_sc10.bmp ori_sc11.bmp ori_sc12.bmp ori_sc13.bmp ori_sc14.bmp ori_sc15.bmp ori_sc16.bmp ori_sc17.bmp ori_sc18.bmp ori_sc19.bmp ori_sc20.bmp ori_sc21.bmp ori_sc22.bmp ori_sc23.bmp ori_sc24.bmp ori_sc25.bmp ori_sc26.bmp ori_sc27.bmp ori_sc28.bmp ori_sc29.bmp ori_sc30.bmp ori_sc31.bmp ori_sc32.bmp Log Message: Update to version 4.4.0.3 --- NEW FILE: ori_ca32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as16.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_at01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sc23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_sb29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ca22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_as01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_dd05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_ga02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ori_bb29.bmp --- (This appears to be a binary file; contents omitted.) From modemhero at users.sourceforge.net Tue Apr 11 23:40:23 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 04:40:23 +0000 Subject: [netrek-cvs] client/netrekxp/resources/ships/color1/kli kli_sb25.bmp, NONE, 1.1 kli_sb26.bmp, NONE, 1.1 kli_sb27.bmp, NONE, 1.1 kli_sb28.bmp, NONE, 1.1 kli_sb29.bmp, NONE, 1.1 kli_sb30.bmp, NONE, 1.1 kli_sb31.bmp, NONE, 1.1 kli_sb32.bmp, NONE, 1.1 kli_sc01.bmp, NONE, 1.1 kli_sc02.bmp, NONE, 1.1 kli_sc03.bmp, NONE, 1.1 kli_sc04.bmp, NONE, 1.1 kli_sc05.bmp, NONE, 1.1 kli_sc06.bmp, NONE, 1.1 kli_sc07.bmp, NONE, 1.1 kli_sc08.bmp, NONE, 1.1 kli_sc09.bmp, NONE, 1.1 kli_sc10.bmp, NONE, 1.1 kli_sc11.bmp, NONE, 1.1 kli_sc12.bmp, NONE, 1.1 kli_sc13.bmp, NONE, 1.1 kli_sc14.bmp, NONE, 1.1 kli_sc15.bmp, NONE, 1.1 kli_sc16.bmp, NONE, 1.1 kli_sc17.bmp, NONE, 1.1 kli_sc18.bmp, NONE, 1.1 kli_sc19.bmp, NONE, 1.1 kli_sc20.bmp, NONE, 1.1 kli_sc21.bmp, NONE, 1.1 kli_sc22.bmp, NONE, 1.1 kli_sc23.bmp, NONE, 1.1 kli_sc24.bmp, NONE, 1.1 kli_sc25.bmp, NONE, 1.1 kli_sc26.bmp, NONE, 1.1 kli_sc27.bmp, NONE, 1.1 kli_sc28.bmp, NONE, 1.1 kli_sc29.bmp, NONE, 1.1 kli_sc30.bmp, NONE, 1.1 kli_sc31.bmp, NONE, 1.1 kli_sc32.bmp, NONE, 1.1 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/ships/color1/kli In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31998/resources/ships/color1/kli Added Files: kli_sb25.bmp kli_sb26.bmp kli_sb27.bmp kli_sb28.bmp kli_sb29.bmp kli_sb30.bmp kli_sb31.bmp kli_sb32.bmp kli_sc01.bmp kli_sc02.bmp kli_sc03.bmp kli_sc04.bmp kli_sc05.bmp kli_sc06.bmp kli_sc07.bmp kli_sc08.bmp kli_sc09.bmp kli_sc10.bmp kli_sc11.bmp kli_sc12.bmp kli_sc13.bmp kli_sc14.bmp kli_sc15.bmp kli_sc16.bmp kli_sc17.bmp kli_sc18.bmp kli_sc19.bmp kli_sc20.bmp kli_sc21.bmp kli_sc22.bmp kli_sc23.bmp kli_sc24.bmp kli_sc25.bmp kli_sc26.bmp kli_sc27.bmp kli_sc28.bmp kli_sc29.bmp kli_sc30.bmp kli_sc31.bmp kli_sc32.bmp Log Message: Update to version 4.4.0.3 --- NEW FILE: kli_sc22.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc11.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc21.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc06.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc19.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc10.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb32.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc14.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc04.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc28.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc08.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb30.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc01.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc05.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb31.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb26.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc18.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc27.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc02.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc09.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc15.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sb25.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc03.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc13.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc07.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc17.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc23.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc20.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc29.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc12.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc24.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kli_sc16.bmp --- (This appears to be a binary file; contents omitted.) From modemhero at users.sourceforge.net Wed Apr 12 05:07:26 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 10:07:26 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs hints.dat,1.1,1.2 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15894/resources/docs Modified Files: hints.dat Log Message: Fixes to grammar and spelling in some hint messages. Addition of some help messages regarding some lesser known, and usually undocumented, functionality. Index: hints.dat =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/hints.dat,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- hints.dat 12 Apr 2006 04:20:03 -0000 1.1 +++ hints.dat 12 Apr 2006 10:07:24 -0000 1.2 @@ -1,4 +1,9 @@ to disable this window permanently you should add "showHints: off" to your rc file +you can use Alt+Enter to toggle the main title bar on and off. +you can send messages from the player list window. Left click for individual messages, middle mouse button click for all board messages, and right click for team messages. +you can remap keys by pointing at the key in the help window and pushing the key you want that option to be. +you can open the NetrekXP help program with the F1 key. +you can change the dashboard clock to a timer through the Visuals Menu. The \ key is default for reseting the timer. when you are low on planets, you should let the more experienced players pick the armies. Those should not be wasted. when you are in doubt, you should ask a Commodore, Rear Adm. or Admiral for advice. when your team has lots of armies, you should not be afraid to pick them. They'll get bombed anyway. @@ -78,23 +83,25 @@ information is the most valuable commodity in netrek. Use the teamboard. Read it. Write to it. you should not be afraid to admit that you screwed up. Trust us, everyone else knows you did. having a thick skin helps. Saying "sorry, I'm new" if you're being yelled at can work wonders. -everyone has a bad day, try not to take things personal. +everyone has a bad day, try not to take things personally. you can ignore messages from individual people by sending them :ita. If people are abusive to you, just ignore them. you should learn to recognize the good players by their login IDs and player handles. They are the best way to get better at this game. Watch them and/or talk to them. people with an offense rating of over 1.50 are to be respected. Can you maintain an offense of over 1.50? -dying is a good thing. (In netrek anyway). +dying is a good thing (in netrek anyways). if you are down to 5 planets or less, you should only bomb the planets outside of your core five. Let the more experienced players decide when to bomb the other ones. -a cruiser (CA), can fly up to warp 9, has 10.000 fuel, 100 hull, 100 shields, 40 pt torps and can do up to 100 pt maximum phaser damage. -an assault ship (AS), can fly up to warp 8, has 6.000 fuel, 200 hull, 80 shields, 30 pt torps and can do up to 80 pt maximum phaser damage. -a battle ship (BB), can fly up to warp 8, has 14.000 fuel, 130 hull, 130 shields, 40 pt torps and can do up to 105 pt maximum phaser damage. -a scout (SC), can fly up to warp 12, has 5.000 fuel, 75 hull, 75 shields, 25 pt torps and can do up to 75 pt maximum phaser damage. -a destroyer (DD), can fly up to warp 10, has 7.000 fuel, 85 hull, 85 shields, 30 pt torps and can do up to 85 pt maximum phaser damage. -a starbase (SB), can fly up to warp 2, has 60.000 fuel, 600 hull, 500 shields, 30 pt torps and can do up to 120 pt maximum phaser damage. +a cruiser (CA), can fly up to warp 9, has 10,000 fuel, 100 hull, 100 shields, 40 pt torps and can do up to 100 pt maximum phaser damage. +an assault ship (AS), can fly up to warp 8, has 6,000 fuel, 200 hull, 80 shields, 30 pt torps and can do up to 80 pt maximum phaser damage. +a battle ship (BB), can fly up to warp 8, has 14,000 fuel, 130 hull, 130 shields, 40 pt torps and can do up to 105 pt maximum phaser damage. +a scout (SC), can fly up to warp 12, has 5,000 fuel, 75 hull, 75 shields, 25 pt torps and can do up to 75 pt maximum phaser damage. +a destroyer (DD), can fly up to warp 10, has 7,000 fuel, 85 hull, 85 shields, 30 pt torps and can do up to 85 pt maximum phaser damage. +a starbase (SB), can fly up to warp 2, has 60,000 fuel, 600 hull, 500 shields, 30 pt torps and can do up to 120 pt maximum phaser damage. assault ships have the best cloaking capabilities in the game and are mainly used for taking heavily guarded planets. battleships have the strongest fire power of non-star bases, but they must operate near a fuel planet to be effective. -cruisers are the most well rounded ship, having high firepower and good manoeuvrability. -scouts offer the fastest speed and manueverability, but are best used for bombing or taking. They are too brittle to be used for space controlling. +cruisers are the most well rounded ship, having high firepower and good maneuverability. +destroyers are best used only by experienced players. In most situations, a cruiser is the right ship choice. +scouts offer the fastest speed and maneuverability, but are best used for bombing or taking. They are too brittle to be used for space controlling. starbases are the strongest ships in terms of fire power and can only be killed by a concentrated team effort. +starbases can fire phasers twice as fast as any other ship "to ogg" means, the process of cloaking and appearing adjacent to an enemy while firing torps and tractoring on to him, with the purpose to kill that player, without caring about dying in the process. "to doosh" means, killing an enemy ship which is carrying armies. People often yell "doosh!" after they kill a huge carrier. a "planet scum" is someone who only cares about taking planets so he gets good ratings. This often hurts the team because the wrong planets are taken, or the planets are taken with little armies and easily captured back. \ No newline at end of file From quozl at users.sourceforge.net Wed Apr 12 06:57:02 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Wed, 12 Apr 2006 11:57:02 +0000 Subject: [netrek-cvs] server/Vanilla/robotd defaults.c,1.1,1.2 Message-ID: Update of /cvsroot/netrek/server/Vanilla/robotd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1775/robotd Modified Files: defaults.c Log Message: FreeBSD fix Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/robotd/defaults.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- defaults.c 21 Mar 2005 05:23:45 -0000 1.1 +++ defaults.c 12 Apr 2006 11:57:00 -0000 1.2 @@ -4,6 +4,9 @@ */ #include "copyright2.h" #include +#ifdef __FreeBSD__ +#include +#endif struct stringlist { char *string; @@ -13,8 +16,10 @@ struct stringlist *defaults=NULL; +#ifndef __FreeBSD__ char *getenv(); char *strdup(); +#endif initDefaults(deffile) char *deffile; /* As opposed to defile? */ @@ -61,6 +66,7 @@ fclose(fp); } +#ifndef __FreeBSD__ char *strdup(str) char *str; { @@ -70,6 +76,7 @@ strcpy(s,str); return(s); } +#endif char *getdefault(str) char *str; From quozl at users.sourceforge.net Wed Apr 12 06:57:36 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Wed, 12 Apr 2006 11:57:36 +0000 Subject: [netrek-cvs] server/Vanilla PROJECTS,1.4,1.5 Message-ID: Update of /cvsroot/netrek/server/Vanilla In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2283 Modified Files: PROJECTS Log Message: Index: PROJECTS =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/PROJECTS,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- PROJECTS 10 Apr 2006 04:24:50 -0000 1.4 +++ PROJECTS 12 Apr 2006 11:57:34 -0000 1.5 @@ -5,9 +5,10 @@ - vote per IP address only, not per slot - - ban for an hour after eject, or while the players that voted still - have the same slot (ban based on an a mask of slots that voted for - eject) + - separate ban and eject votes, ban to include effect of + eject, ban for an hour, or while the players that voted + still have the same slot (ban based on an a mask of slots + that voted for it) quozl's working notes ... { From quozl at users.sourceforge.net Wed Apr 12 06:57:02 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Wed, 12 Apr 2006 11:57:02 +0000 Subject: [netrek-cvs] server/Vanilla ChangeLog,1.17,1.18 NEWS,1.10,1.11 Message-ID: Update of /cvsroot/netrek/server/Vanilla In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1775 Modified Files: ChangeLog NEWS Log Message: FreeBSD fix Index: NEWS =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/NEWS,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- NEWS 22 Feb 2006 09:48:30 -0000 1.10 +++ NEWS 12 Apr 2006 11:57:00 -0000 1.11 @@ -1,3 +1,5 @@ +- compilation fix for FreeBSD [O'Conner] + 2.10.2: released 2006-02-22 - add documentation to debian packaging [cameron] Index: ChangeLog =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/ChangeLog,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- ChangeLog 10 Apr 2006 11:57:00 -0000 1.17 +++ ChangeLog 12 Apr 2006 11:57:00 -0000 1.18 @@ -1,3 +1,7 @@ +Wed Apr 12 21:54:43 2006 Daniel O'Connor + + * robotd/defaults.c: compilation fix for FreeBSD. + Mon Apr 10 21:31:33 2006 James Cameron * defs.h, ntscmds.c (nts_commands): reallocate voting array sizes. From quozl at users.sourceforge.net Wed Apr 12 07:12:04 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Wed, 12 Apr 2006 12:12:04 +0000 Subject: [netrek-cvs] client/cow key.mk.in,NONE,1.1 Message-ID: Update of /cvsroot/netrek/client/cow In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12644 Added Files: key.mk.in Log Message: --- NEW FILE: key.mk.in --- KEYDEF = @KEYDEF@ From modemhero at users.sourceforge.net Wed Apr 12 07:37:00 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 12:37:00 +0000 Subject: [netrek-cvs] client/netrekxp/src mswindow.c,1.2,1.3 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29882/src Modified Files: mswindow.c Log Message: Addition of maximize button to title bar window. Index: mswindow.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mswindow.c 12 Apr 2006 04:20:03 -0000 1.2 +++ mswindow.c 12 Apr 2006 12:36:58 -0000 1.3 @@ -971,9 +971,9 @@ // WS_THICKFRAME adds resizing frame to window without adding titlebar mainResizeable = booleanDefault ("mainResizeable", mainResizeable); if (mainResizeable) - SpecialStyle |= WS_THICKFRAME | WS_MINIMIZEBOX | WS_SYSMENU; + SpecialStyle |= WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_SYSMENU; else - SpecialStyle |= WS_MINIMIZEBOX | WS_SYSMENU; + SpecialStyle |= WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_SYSMENU; // else // SpecialStyle |= WS_CAPTION | WS_MINIMIZEBOX | WS_SYSMENU; } From modemhero at users.sourceforge.net Wed Apr 12 07:58:13 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 12:58:13 +0000 Subject: [netrek-cvs] server/Vanilla BUGS,1.3,1.4 PROJECTS,1.5,1.6 Message-ID: Update of /cvsroot/netrek/server/Vanilla In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12638 Modified Files: BUGS PROJECTS Log Message: Removal of bugs that no longer exist, and features that have been added. Index: BUGS =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/BUGS,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- BUGS 5 Apr 2006 04:42:40 -0000 1.3 +++ BUGS 12 Apr 2006 12:58:11 -0000 1.4 @@ -4,7 +4,8 @@ List of things that are defects - Player "^%^" took a planet and it said "Planet taken by ^" - reported by zu22 (Zach Uram) on 2006-04-05 + reported by zu22 (Zach Uram) on 2006-04-05. This is also + a client issue. - god observer should see all teams messages. @@ -61,8 +62,3 @@ - change metaserver solicitation to process multiple IP addresses from each DNS host name given, just like new COW metaserver code. [coding in progress by cameron at stl.dec.com] - - - starbase etemp bug, still shows up, engine cooling rate reduced, - warp 2 gives stable etemp, under those conditions it should drop - slowly at warp 2, - Index: PROJECTS =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/PROJECTS,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- PROJECTS 12 Apr 2006 11:57:34 -0000 1.5 +++ PROJECTS 12 Apr 2006 12:58:11 -0000 1.6 @@ -60,7 +60,7 @@ galactic is recently reset. Jerub expressed an interest in doing it. - If you are observing a friendly player who is t-warping, you - can lock on to other players/planets, but will not swap to + 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] @@ -178,9 +178,6 @@ the current head of queue player. May require client changes. [ref findslot() in cow, c/- carlos - quozl] - - observers do not see tractors and pressors ... fault of protocol, - according to Trent Piepho (xyzzy at u.washington.edu) - - Observer system is screwed up. Needs major re-write. Items of note: From quozl at users.sourceforge.net Wed Apr 12 07:59:26 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Wed, 12 Apr 2006 12:59:26 +0000 Subject: [netrek-cvs] server/Vanilla ChangeLog,1.18,1.19 NEWS,1.11,1.12 Message-ID: Update of /cvsroot/netrek/server/Vanilla In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13663 Modified Files: ChangeLog NEWS Log Message: t-mode scum test using ip addresses Index: NEWS =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/NEWS,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- NEWS 12 Apr 2006 11:57:00 -0000 1.11 +++ NEWS 12 Apr 2006 12:59:24 -0000 1.12 @@ -1,3 +1,4 @@ +- use IP addresses only for t-mode scum test [Cameron] - compilation fix for FreeBSD [O'Conner] 2.10.2: released 2006-02-22 Index: ChangeLog =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/ChangeLog,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- ChangeLog 12 Apr 2006 11:57:00 -0000 1.18 +++ ChangeLog 12 Apr 2006 12:59:24 -0000 1.19 @@ -1,3 +1,13 @@ +Wed Apr 12 22:53:17 2006 James Cameron + + * ntserv/daemonII.c (move): place political messages in separate + functions to simplify tournament mode check logic. + + * ntserv/daemonII.c (check_scummers): use only IP address, not DNS + host name, nor username, in determining what constitutes a t-mode + scumming situation, and return the result of the check. Simplify + logic to ease comprehension. + Wed Apr 12 21:54:43 2006 Daniel O'Connor * robotd/defaults.c: compilation fix for FreeBSD. From quozl at users.sourceforge.net Wed Apr 12 07:59:27 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Wed, 12 Apr 2006 12:59:27 +0000 Subject: [netrek-cvs] server/Vanilla/ntserv daemonII.c,1.4,1.5 Message-ID: Update of /cvsroot/netrek/server/Vanilla/ntserv In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13663/ntserv Modified Files: daemonII.c Log Message: t-mode scum test using ip addresses Index: daemonII.c =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/ntserv/daemonII.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- daemonII.c 10 Apr 2006 10:56:32 -0000 1.4 +++ daemonII.c 12 Apr 2006 12:59:24 -0000 1.5 @@ -67,7 +67,7 @@ /* file scope prototypes */ static void check_load(void); static int tournamentMode(void); -static void check_scummers(void); +static int check_scummers(void); static void move(int ignored); static void udplayersight(void); static void udplayers(void); @@ -394,7 +394,7 @@ Nick Trown 12/19/92 */ -static void check_scummers(void) +static int check_scummers(void) { int i, j; int num; @@ -405,42 +405,39 @@ char *jptr, *iptr; for (i=0; ip_status == PFREE) + continue; + if (me->p_flags & PFROBOT) continue; +#ifdef OBSERVERS + if (me->p_status == POBSERV) + continue; +#endif #ifdef LTD_STATS - if (!(players[i].p_status == PFREE || - ltd_ticks(&(players[i]), LTD_TOTAL) == 0)) + if (ltd_ticks(me, LTD_TOTAL) != 0) #else - if (!(players[i].p_status == PFREE || - players[i].p_stats.st_tticks == 0)) + if (me->p_stats.st_tticks != 0) #endif { for (j=i+1; jp_status == PFREE) + continue; + if (them->p_flags & PFROBOT) + continue; #ifdef OBSERVERS - if (players[j].p_status == POBSERV) + if (them->p_status == POBSERV) continue; #endif - - if ((players[j].p_flags & PFROBOT)) - continue; - -#ifndef FULL_HOSTNAMES - jptr = &players[j].p_monitor[strlen(players[j].p_monitor)-5]; - iptr = &players[i].p_monitor[strlen(players[i].p_monitor)-5]; +#ifdef LTD_STATS + if (ltd_ticks(them, LTD_TOTAL) != 0) #else - jptr = &players[j].p_full_hostname[strlen(players[j].p_full_hostname)-5]; - iptr = &players[i].p_full_hostname[strlen(players[i].p_full_hostname)-5]; + if (them->p_stats.st_tticks != 0) #endif - if (strcmp(players[i].p_login,players[j].p_login)==0 && - (strcmp(jptr,iptr)==0)) { + { + if (strcmp(me->p_ip, them->p_ip) == 0) { who=j; num++; } @@ -453,7 +450,7 @@ pmessage(0,MALL,"GOD->ALL", "*****************************************"); if ((fp = fopen (Scum_File,"a"))==NULL) { ERROR(1,("Unable to open scum file.\n")); - return; + return 1; } fprintf(fp,"POSSIBLE T-MODE SCUMMERS FOUND!!! (slots %d and %d) ",i,who); gmtsecs = time(NULL); @@ -483,13 +480,74 @@ } } fclose(fp); - return; + return 1; } } } + return 0; } +static void political_begin(int message) +{ + switch (message) { + case 0: + pmessage(0, MALL, "GOD->ALL","A dark mood settles upon the galaxy"); + break; + case 1: + pmessage(0, MALL, "GOD->ALL","Political pressure to expand is rising"); + break; + case 2: + pmessage(0, MALL, "GOD->ALL","Border disputes break out as political tensions increase!"); + break; + case 3: + pmessage(0, MALL, "GOD->ALL","Galactic superpowers seek to colonize new territory!"); + break; + case 4: + pmessage(0, MALL, "GOD->ALL","'Manifest Destiny' becomes motive in galactic superpower conflict!"); + break; + case 5: + pmessage(0, MALL, "GOD->ALL","Diplomat insults foriegn emperor's mother and fighting breaks out!"); + break; + case 6: + pmessage(0, MALL, "GOD->ALL","Dan Quayle declares self as galactic emperor and chaos breaks out!"); + break; + default: + pmessage(0, MALL, "GOD->ALL","Peace parties have been demobilized, and fighting ensues."); + break; + } +} + +static void political_end(int message) +{ + switch (message) { + case 0: + pmessage(0, MALL, "GOD->ALL","A new day dawns as the oppressive mood lifts"); + break; + case 1: + pmessage(0, MALL, "GOD->ALL","The expansionist pressure subsides"); + break; + case 2: + pmessage(0, MALL, "GOD->ALL","Temporary agreement is reached in local border disputes."); + break; + case 3: + pmessage(0, MALL, "GOD->ALL","Galactic governments reduce colonization efforts."); + break; + case 4: + pmessage(0, MALL, "GOD->ALL","'Manifest Destiny is no longer a fad.' says influential philosopher."); + break; + case 5: + pmessage(0, MALL, "GOD->ALL","Diplomat apologizes to foreign emperor's mother and invasion is stopped!"); + break; + case 6: + pmessage(0, MALL, "GOD->ALL","Dan Quayle is locked up and order returns to the galaxy!"); + break; + default: + pmessage(0, MALL, "GOD->ALL","The peace party has reformed, and is rallying for peace"); + break; + } +} + static void move(int ignored) { static int oldtourn=0; @@ -564,32 +622,8 @@ if (!oldtourn) { if (check_scum) check_scummers(); /* NBT */ - switch(oldmessage=(random() % 8)) { - case 0: - pmessage(0, MALL, "GOD->ALL","A dark mood settles upon the galaxy"); - break; - case 1: - pmessage(0, MALL, "GOD->ALL","Political pressure to expand is rising"); - break; - case 2: - pmessage(0, MALL, "GOD->ALL","Border disputes break out as political tensions increase!"); - break; - case 3: - pmessage(0, MALL, "GOD->ALL","Galactic superpowers seek to colonize new territory!"); - break; - case 4: - pmessage(0, MALL, "GOD->ALL","'Manifest Destiny' becomes motive in galactic superpower conflict!"); - break; - case 5: - pmessage(0, MALL, "GOD->ALL","Diplomat insults foriegn emperor's mother and fighting breaks out!"); - break; - case 6: - pmessage(0, MALL, "GOD->ALL","Dan Quayle declares self as galactic emperor and chaos breaks out!"); - break; - default: - pmessage(0, MALL, "GOD->ALL","Peace parties have been demobilized, and fighting ensues."); - break; - } + oldmessage=(random() % 8); + political_begin(oldmessage); } oldtourn=1; status->tourn=1; @@ -598,32 +632,7 @@ } else { if (oldtourn) { tourntimestamp = ticks; /* record end of Tmode 8/2/91 TC */ - switch(oldmessage) { - case 0: - pmessage(0, MALL, "GOD->ALL","A new day dawns as the oppressive mood lifts"); - break; - case 1: - pmessage(0, MALL, "GOD->ALL","The expansionist pressure subsides"); - break; - case 2: - pmessage(0, MALL, "GOD->ALL","Temporary agreement is reached in local border disputes."); - break; - case 3: - pmessage(0, MALL, "GOD->ALL","Galactic governments reduce colonization efforts."); - break; - case 4: - pmessage(0, MALL, "GOD->ALL","'Manifest Destiny is no longer a fad.' says influential philosopher."); - break; - case 5: - pmessage(0, MALL, "GOD->ALL","Diplomat apologizes to foreign emperor's mother and invasion is stopped!"); - break; - case 6: - pmessage(0, MALL, "GOD->ALL","Dan Quayle is locked up and order returns to the galaxy!"); - break; - default: - pmessage(0, MALL, "GOD->ALL","The peace party has reformed, and is rallying for peace"); - break; - } + political_end(oldmessage); } oldtourn=0; status->tourn=0; From modemhero at users.sourceforge.net Wed Apr 12 08:24:05 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 13:24:05 +0000 Subject: [netrek-cvs] server/Vanilla ChangeLog,1.19,1.20 Message-ID: Update of /cvsroot/netrek/server/Vanilla In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30226 Modified Files: ChangeLog Log Message: BUGS/PROJECTS file updates. Index: ChangeLog =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/ChangeLog,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ChangeLog 12 Apr 2006 12:59:24 -0000 1.19 +++ ChangeLog 12 Apr 2006 13:24:03 -0000 1.20 @@ -1,3 +1,8 @@ +Wed Apr 12 Bill Balcerski + + * BUGS, PROJECTS: Removal of bugs that no longer exist, and + features that have been added. + Wed Apr 12 22:53:17 2006 James Cameron * ntserv/daemonII.c (move): place political messages in separate From modemhero at users.sourceforge.net Tue Apr 11 21:58:51 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 12 Apr 2006 02:58:51 +0000 Subject: [netrek-cvs] client/netrekxp/include audio.h,1.1.1.1,1.2 Message-ID: Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13305/include Modified Files: audio.h Log Message: Update to version 4.4.0.3 Index: audio.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/audio.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- audio.h 21 Jan 2003 21:27:54 -0000 1.1.1.1 +++ audio.h 12 Apr 2006 02:58:48 -0000 1.2 @@ -32,4 +32,7 @@ /* Is a sound currently playing? */ extern int SoundPlaying (); +/* Change sound volume */ +extern void ChangeVolume (int vol); + #endif /* __SNDLIB_H */ From jerub at users.sourceforge.net Wed Apr 12 01:28:45 2006 From: jerub at users.sourceforge.net (Stephen Thorne) Date: Wed, 12 Apr 2006 06:28:45 +0000 Subject: [netrek-cvs] client/netrekxp compile.txt, 1.2, 1.3 copyright.txt, 1.1.1.1, 1.2 Message-ID: Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23772 Modified Files: compile.txt copyright.txt Log Message: fix newlines at the end of textfiles Index: compile.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/compile.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- compile.txt 12 Apr 2006 04:20:03 -0000 1.2 +++ compile.txt 12 Apr 2006 06:28:43 -0000 1.3 @@ -15,4 +15,4 @@ That's pretty all. -Stas Pirogov (keyos at keyos.org) \ No newline at end of file +Stas Pirogov (keyos at keyos.org) Index: copyright.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/copyright.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- copyright.txt 21 Jan 2003 21:27:53 -0000 1.1.1.1 +++ copyright.txt 12 Apr 2006 06:28:43 -0000 1.2 @@ -107,4 +107,4 @@ * Netrek XP Mod * Stas Pirogov (keyos at keyos.org) * - */ \ No newline at end of file + */ From modemhero at users.sourceforge.net Fri Apr 14 05:19:19 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 14 Apr 2006 10:19:19 +0000 Subject: [netrek-cvs] server/Vanilla ChangeLog,1.20,1.21 NEWS,1.12,1.13 Message-ID: Update of /cvsroot/netrek/server/Vanilla In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16900 Modified Files: ChangeLog NEWS Log Message: Fix for army capacity difference between client/server. Index: NEWS =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/NEWS,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- NEWS 12 Apr 2006 12:59:24 -0000 1.12 +++ NEWS 14 Apr 2006 10:19:17 -0000 1.13 @@ -1,3 +1,4 @@ +- fix client/server error over army capacity of AS in certain cases [balcerski] - use IP addresses only for t-mode scum test [Cameron] - compilation fix for FreeBSD [O'Conner] Index: ChangeLog =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/ChangeLog,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- ChangeLog 12 Apr 2006 13:24:03 -0000 1.20 +++ ChangeLog 14 Apr 2006 10:19:17 -0000 1.21 @@ -3,6 +3,10 @@ * BUGS, PROJECTS: Removal of bugs that no longer exist, and features that have been added. + * ntserv/daemonII.c, redraw.c: truncate kills to the 2nd decimal + place for army capacity check - clients only receive two + decimal places in the kill packet. + Wed Apr 12 22:53:17 2006 James Cameron * ntserv/daemonII.c (move): place political messages in separate From modemhero at users.sourceforge.net Fri Apr 14 05:19:19 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 14 Apr 2006 10:19:19 +0000 Subject: [netrek-cvs] server/Vanilla/ntserv daemonII.c, 1.5, 1.6 redraw.c, 1.2, 1.3 Message-ID: Update of /cvsroot/netrek/server/Vanilla/ntserv In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16900/ntserv Modified Files: daemonII.c redraw.c Log Message: Fix for army capacity difference between client/server. Index: redraw.c =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/ntserv/redraw.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- redraw.c 10 Apr 2006 10:56:33 -0000 1.2 +++ redraw.c 14 Apr 2006 10:19:17 -0000 1.3 @@ -412,7 +412,7 @@ #endif pl = me; /* Not observer, just use my kills */ - troop_capacity = pl->p_kills * (myship->s_type == ASSAULT?3:2); + troop_capacity = (int)((float)((int)(pl->p_kills*100)/100.0) * (myship->s_type == ASSAULT?3:2)); if (myship->s_type == STARBASE || troop_capacity > myship->s_maxarmies) troop_capacity = myship->s_maxarmies; Index: daemonII.c =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/ntserv/daemonII.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- daemonII.c 12 Apr 2006 12:59:24 -0000 1.5 +++ daemonII.c 14 Apr 2006 10:19:17 -0000 1.6 @@ -2944,12 +2944,11 @@ continue; if (j->p_armies >= j->p_ship.s_maxarmies) continue; - /* XXX */ if (j->p_ship.s_type == ASSAULT) { - if (j->p_armies == (int)(j->p_kills * 3.0)) + if (j->p_armies >= (int)((float)((int)(j->p_kills*100)/100.0) * 3.0)) continue; } else if (j->p_ship.s_type != STARBASE) - if (j->p_armies == (int)(j->p_kills * 2.0)) + if (j->p_armies >= (int)((float)(int)(j->p_kills*100)/100.0) * 2.0)) continue; if (j->p_flags & PFORBIT) { if (j->p_team != l->pl_owner) From quozl at users.sourceforge.net Fri Apr 14 05:29:42 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Fri, 14 Apr 2006 10:29:42 +0000 Subject: [netrek-cvs] client/cow ChangeLog,1.25,1.26 parsemeta.c,1.9,1.10 Message-ID: Update of /cvsroot/netrek/client/cow In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25514 Modified Files: ChangeLog parsemeta.c Log Message: fix segfault Index: parsemeta.c =================================================================== RCS file: /cvsroot/netrek/client/cow/parsemeta.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- parsemeta.c 22 Feb 2006 22:55:22 -0000 1.9 +++ parsemeta.c 14 Apr 2006 10:29:40 -0000 1.10 @@ -1,6 +1,9 @@ /* meta.c * * $Log$ + * Revision 1.10 2006/04/14 10:29:40 quozl + * fix segfault + * * Revision 1.9 2006/02/22 22:55:22 quozl * fix ReadMetasRecv regression * @@ -420,7 +423,7 @@ static void version_r(struct sockaddr_in *address) { char *p; - int servers, i, j; + int servers, i; time_t now = time(NULL); /* number of servers */ @@ -440,8 +443,6 @@ if (servers == 0) return; - grow(servers); - /* for each server listed by this metaserver packet */ for(i=0;iaddress,host,LINE); sp->port = port; sp->age = age; sp->when = now; sp->lifetime = 4; - num_servers++; } sp->refresh = 1; Index: ChangeLog =================================================================== RCS file: /cvsroot/netrek/client/cow/ChangeLog,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- ChangeLog 1 Mar 2006 07:16:03 -0000 1.25 +++ ChangeLog 14 Apr 2006 10:29:40 -0000 1.26 @@ -1,3 +1,8 @@ +Fri Apr 14 20:26:45 2006 James Cameron + + * parsemeta.c (version_r): fix growth of server list. + Reported by: Stephen Thorne. + Wed Mar 1 18:08:33 2006 James Cameron * netrek-client-cow-3.2.0: released. From quozl at users.sourceforge.net Fri Apr 14 05:35:39 2006 From: quozl at users.sourceforge.net (James Cameron) Date: Fri, 14 Apr 2006 10:35:39 +0000 Subject: [netrek-cvs] client/cow ChangeLog,1.26,1.27 parsemeta.c,1.10,1.11 Message-ID: Update of /cvsroot/netrek/client/cow In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30085 Modified Files: ChangeLog parsemeta.c Log Message: fix sscanf compiler warning Index: parsemeta.c =================================================================== RCS file: /cvsroot/netrek/client/cow/parsemeta.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- parsemeta.c 14 Apr 2006 10:29:40 -0000 1.10 +++ parsemeta.c 14 Apr 2006 10:35:37 -0000 1.11 @@ -1,6 +1,9 @@ /* meta.c * * $Log$ + * Revision 1.11 2006/04/14 10:35:37 quozl + * fix sscanf compiler warning + * * Revision 1.10 2006/04/14 10:29:40 quozl * fix segfault * @@ -241,7 +244,7 @@ /* Is this a line we want? */ - if (sscanf(line, "-h %s -p %d %d %d", + if (sscanf(line, "-h %s -p %d %d %*d", slist->address, &(slist->port), &(slist->age)) != 3) { continue; Index: ChangeLog =================================================================== RCS file: /cvsroot/netrek/client/cow/ChangeLog,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- ChangeLog 14 Apr 2006 10:29:40 -0000 1.26 +++ ChangeLog 14 Apr 2006 10:35:37 -0000 1.27 @@ -1,3 +1,10 @@ +Fri Apr 14 20:33:28 2006 James Cameron + + * parsemeta.c (parseInput): fix format string for sscanf, more + conversion specifiers were present than pointer arguments, + suggesting that the code was trying to check for non-numeric in + place of last specifier. Reported by: Stephen Thorne. + Fri Apr 14 20:26:45 2006 James Cameron * parsemeta.c (version_r): fix growth of server list. From modemhero at users.sourceforge.net Fri Apr 14 07:10:07 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 14 Apr 2006 12:10:07 +0000 Subject: [netrek-cvs] client/netrekxp buildexe.cmd,NONE,1.1 Message-ID: Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6854 Added Files: buildexe.cmd Log Message: Shortened build file that only builds the netrek executable. --- NEW FILE: buildexe.cmd --- SET RSAKey=\netrek_files\rsa\NetrekXP-Mod-RSA-Key-Win32.secret Set Compiler=BCC Set InstCWD=\netrek_files rem Set Compiler=VCC @echo off Set MyCWD=%cd% if /I "%1" == "clean" goto :clean if /I "%1" == "dist" goto :dist mkdir %InstCWD% mkdir %InstCWD%\netrek if /I "%Compiler%" == "BCC" goto :CompilerBCC if /I "%Compiler%" == "VCC" goto :CompilerVCC echo You must set which compiler you have at the top of this batch file. goto :end :CompilerVCC pushd src %MyCWD%\tools\mkkey -k %RSAKEY% popd pushd src\cursors cscript %MyCWD%\tools\vcmake.vbs curslib.dsw "Win32 Release" popd pushd src\winkey cscript %MyCWD%\tools\vcmake.vbs winkey.dsw "Win32 Release" popd cscript %MyCWD%\tools\vcmake.vbs clientr.dsw "Win32 Release" pushd %InstCWD%\netrek %MyCWD%\tools\stampver -v%MyCWD%\src\stampver.inf netrek.exe popd goto :dist :CompilerBCC pushd src pushd cursors make popd make %MyCWD%\tools\stampver -v%MyCWD%\src\stampver.inf netrek.exe popd goto :dist :dist if /I "%Compiler%" == "BCC" copy src\cursors\curslib.dll %InstCWD%\netrek\bitmaps goto end :clean del resources\ships\color\fed\fedship.bmp resources\ships\color\fed\fed_??.bmp del resources\ships\color\ind\indship.bmp resources\ships\color\ind\ind_??.bmp del resources\ships\color\kli\kliship.bmp resources\ships\color\kli\kli_??.bmp del resources\ships\color\ori\oriship.bmp resources\ships\color\ori\ori_??.bmp del resources\ships\color\rom\romship.bmp resources\ships\color\rom\rom_??.bmp del resources\ships\color1\fed\fedship1.bmp resources\ships\color1\fed\fed_??.bmp del resources\ships\color1\ind\indship1.bmp resources\ships\color1\ind\ind_??.bmp del resources\ships\color1\kli\kliship1.bmp resources\ships\color1\kli\kli_??.bmp del resources\ships\color1\ori\oriship1.bmp resources\ships\color1\ori\ori_??.bmp del resources\ships\color1\rom\romship1.bmp resources\ships\color1\rom\rom_??.bmp del resources\ships\mono\fed\fedshipM.bmp resources\ships\mono\fed\fed_??.bmp del resources\ships\mono\ind\indshipM.bmp resources\ships\mono\ind\ind_??.bmp del resources\ships\mono\kli\klishipM.bmp resources\ships\mono\kli\kli_??.bmp del resources\ships\mono\ori\orishipM.bmp resources\ships\mono\ori\ori_??.bmp del resources\ships\mono\rom\romshipM.bmp resources\ships\mono\rom\rom_??.bmp del resources\planlibm\bronco\plan.bmp del resources\planlibm\rabbit\planR.bmp del resources\planlibm\moo\planM.bmp del resources\planlibm\bronco\mplan.bmp del resources\planlibm\rabbit\mplanR.bmp del resources\planlibm\moo\mplanM.bmp del resources\misclib\mono\sbexplM.bmp del resources\misclib\mono\shexplM.bmp del resources\misclib\mono\vshield.bmp del resources\misclib\color\sbexpl.bmp del resources\misclib\color\shexpl.bmp if /I "%Compiler%" == "BCC" goto :CleanBCC if /I "%Compiler%" == "VCC" goto :CleanVCC echo You must set which compiler you have at the top of this batch file. goto :end :CleanVCC pushd src del rsa*.c pushd cursors del *.ncb del *.opt popd pushd winkey del *.ncb del *.opt popd popd del *.ncb del *.opt goto :end :CleanBCC pushd src del *.obj *.res netrek.exe netrek.tds netrek.map pushd cursors del curslib.ilf curslib.ilc curslib.ild curslib.ils curslib.tds curslib.dll popd pushd winkey del winkey.ilf winkey.ilc winkey.ild winkey.ils winkey.tds winkey.dll popd popd :end From modemhero at users.sourceforge.net Fri Apr 14 07:24:02 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 14 Apr 2006 12:24:02 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.2, 1.3 hints.dat, 1.2, 1.3 netrekxp.doc, 1.1.1.1, 1.2 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18583/resources/docs Modified Files: changes.txt hints.dat netrekxp.doc Log Message: - fixed hightlightFriendlyPhaser option to work again: on for white phasers on hits, off for flicker between team color and white - added some more hints to the hint database - fixed hint messages so they properly loop - added Maximize button to title bar - made BCC default compiler and disabled RSA mkkey check (-nt) until it can be fixed Index: hints.dat =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/hints.dat,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- hints.dat 12 Apr 2006 10:07:24 -0000 1.2 +++ hints.dat 14 Apr 2006 12:24:00 -0000 1.3 @@ -3,6 +3,8 @@ you can send messages from the player list window. Left click for individual messages, middle mouse button click for all board messages, and right click for team messages. you can remap keys by pointing at the key in the help window and pushing the key you want that option to be. you can open the NetrekXP help program with the F1 key. +you can use the mouse wheel to scroll inside message windows. +an observer can lock onto a cloaked teammate from the player list. you can change the dashboard clock to a timer through the Visuals Menu. The \ key is default for reseting the timer. when you are low on planets, you should let the more experienced players pick the armies. Those should not be wasted. when you are in doubt, you should ask a Commodore, Rear Adm. or Admiral for advice. @@ -101,7 +103,7 @@ destroyers are best used only by experienced players. In most situations, a cruiser is the right ship choice. scouts offer the fastest speed and maneuverability, but are best used for bombing or taking. They are too brittle to be used for space controlling. starbases are the strongest ships in terms of fire power and can only be killed by a concentrated team effort. -starbases can fire phasers twice as fast as any other ship +starbases can fire phasers twice as fast as any other ship. "to ogg" means, the process of cloaking and appearing adjacent to an enemy while firing torps and tractoring on to him, with the purpose to kill that player, without caring about dying in the process. "to doosh" means, killing an enemy ship which is carrying armies. People often yell "doosh!" after they kill a huge carrier. -a "planet scum" is someone who only cares about taking planets so he gets good ratings. This often hurts the team because the wrong planets are taken, or the planets are taken with little armies and easily captured back. \ No newline at end of file +a "planet scum" is someone who only cares about taking planets so he gets good ratings. This often hurts the team because the wrong planets are taken, or the planets are taken with little armies and easily captured back. Index: netrekxp.doc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekxp.doc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- netrekxp.doc 21 Jan 2003 21:28:05 -0000 1.1.1.1 +++ netrekxp.doc 14 Apr 2006 12:24:00 -0000 1.2 @@ -128,7 +128,9 @@ showArmiesCount:(on/off) show armies count on galactic map. -showHockeyLines:(on/off) show hockey lines on tactical +showHockeyLinesLocal: (on/off) show hockey lines on tactical +showHockeyLinesMap: (on/off) show hockey lines on the galactic map +showHockeyScore: (on/off) show hockey score in the galaxy top left corner rank.mapped: (on/off) rank.parent: (window name) ie root, review_all, netrek, etc @@ -264,7 +266,9 @@ port.pickled: 2592 default port that gets called for the server abbreviation. -showTractorPressor: (on/off) toggle showing tractor/pressor beams +showTractorPressor: (on/off) toggle showing tractor/pressor beams +showAllTractorPressor: (on/off) show tractor/pressor for all players. Server + god decides whether to enable it on server. continueTractors:(on/off) show tractors after lock @@ -927,4 +931,5 @@ team ends. If the "partitionPlist" option is "on", white space will be added to the player list to separate your teams from the other teams and the players entering the game. In color, this option is not -usually required because the teams are distinct anyway. \ No newline at end of file +usually required because the teams are distinct anyway. + Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- changes.txt 12 Apr 2006 04:20:03 -0000 1.2 +++ changes.txt 14 Apr 2006 12:24:00 -0000 1.3 @@ -1,3 +1,13 @@ +Version TBA: +- +- fixed hightlightFriendlyPhaser option to work again: on for white phasers on hits, + off for flicker between team color and white +- added some more hints to the hint database +- fixed hint messages so they properly loop +- added Maximize button to title bar +- added buildexe script for compiling solely the source code and not the bitmaps +- made BCC default compiler and disabled RSA mkkey check (-nt) until it can be fixed + Version 4.4.0.3: - added "viewBox: (on)/off" to show tactical boundaries on galaxy From modemhero at users.sourceforge.net Fri Apr 14 07:24:02 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 14 Apr 2006 12:24:02 +0000 Subject: [netrek-cvs] client/netrekxp build.cmd,1.2,1.3 Message-ID: Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18583 Modified Files: build.cmd Log Message: - fixed hightlightFriendlyPhaser option to work again: on for white phasers on hits, off for flicker between team color and white - added some more hints to the hint database - fixed hint messages so they properly loop - added Maximize button to title bar - made BCC default compiler and disabled RSA mkkey check (-nt) until it can be fixed Index: build.cmd =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/build.cmd,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- build.cmd 12 Apr 2006 04:20:03 -0000 1.2 +++ build.cmd 14 Apr 2006 12:24:00 -0000 1.3 @@ -1,7 +1,7 @@ SET RSAKey=\netrek_files\rsa\NetrekXP-Mod-RSA-Key-Win32.secret -Set Compiler=VCC +Set Compiler=BCC Set InstCWD=\netrek_files -rem Set Compiler=BCC +rem Set Compiler=VCC @echo off Set MyCWD=%cd% From modemhero at users.sourceforge.net Fri Apr 14 07:24:02 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 14 Apr 2006 12:24:02 +0000 Subject: [netrek-cvs] client/netrekxp/src hintwin.c, 1.1, 1.2 local.c, 1.2, 1.3 makefile, 1.2, 1.3 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18583/src Modified Files: hintwin.c local.c makefile Log Message: - fixed hightlightFriendlyPhaser option to work again: on for white phasers on hits, off for flicker between team color and white - added some more hints to the hint database - fixed hint messages so they properly loop - added Maximize button to title bar - made BCC default compiler and disabled RSA mkkey check (-nt) until it can be fixed Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- local.c 12 Apr 2006 04:20:03 -0000 1.2 +++ local.c 14 Apr 2006 12:24:00 -0000 1.3 @@ -971,19 +971,11 @@ php->ph_fuse, php->ph_maxfuse); px = new_dx; py = new_dy; - W_CacheLine (w, px, py, tx, ty, col); - //W_CacheLineDB (localSDB, px, py, tx, ty, col); } - else - W_CacheLine (w, px, py, tx, ty, col); - //W_CacheLineDB (localSDB, px, py, tx, ty, col); - + W_CacheLine (w, px, py, tx, ty, col); } else { - /* I prefer them to just be solid white, I think most others will too - So I take this line out and replace it */ - /* if ((php->ph_fuse % 2) == 1) */ if (php->ph_status != PHMISS) { if (phaserShrinkStyle == 1 && j == me) @@ -993,18 +985,21 @@ php->ph_fuse, php->ph_maxfuse); px = new_dx; py = new_dy; - W_CacheLine (w, px, py, tx, ty, foreColor); - //W_CacheLineDB (localSDB, px, py, tx, ty, foreColor); } + if (highlightFriendlyPhasers) + W_CacheLine (w, px, py, tx, ty, foreColor); else - W_CacheLine (w, px, py, tx, ty, foreColor); - //W_CacheLineDB (localSDB, px, py, tx, ty, foreColor); + { + if ((php->ph_fuse % 2) == 1) + W_CacheLine (w, px, py, tx, ty, foreColor); + else + W_CacheLine (w, px, py, tx, ty, + shipCol[remap[j->p_team]]); + } } else W_CacheLine (w, px, py, tx, ty, shipCol[remap[j->p_team]]); - /*W_CacheLineDB (localSDB, px, py, tx, ty, - shipCol[remap[j->p_team]]);*/ } #else if (highlightFriendlyPhasers && (php->ph_status == PHHIT)) Index: makefile =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- makefile 12 Apr 2006 04:20:03 -0000 1.2 +++ makefile 14 Apr 2006 12:24:00 -0000 1.3 @@ -145,7 +145,7 @@ $(rc) bccnetrek.rc rsa_box.c: - ..\tools\mkkey -k $(RSAKEY) + ..\tools\mkkey -nt -k $(RSAKEY) netrek.exe: $(OBJS) $(RESOURCES) main.ico $(link) $(ldebug) $(LIBOPTS) $(OBJS) C0x32.OBJ, netrek.exe,, $(LIBS), , $(RESOURCES) Index: hintwin.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/hintwin.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- hintwin.c 12 Apr 2006 04:20:05 -0000 1.1 +++ hintwin.c 14 Apr 2006 12:24:00 -0000 1.2 @@ -173,8 +173,8 @@ { case W_LBUTTON: curhint++; - if (curhint >= numhints) - curhint = numhints; + if (curhint > numhints) + curhint = 0; showhint (curhint); return; case W_MBUTTON: @@ -186,7 +186,7 @@ case W_RBUTTON: curhint--; if (curhint < 0) - curhint = 0; + curhint = numhints; showhint (curhint); return; } From modemhero at users.sourceforge.net Fri Apr 14 20:04:36 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 15 Apr 2006 01:04:36 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.3, 1.4 hints.dat, 1.3, 1.4 netrekxp.doc, 1.2, 1.3 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15356/resources/docs Modified Files: changes.txt hints.dat netrekxp.doc Log Message: - all ship bitmap libraries now load into memory. Can be modified at a later date if this proves to be a bad idea. - added "dynamicBitmap: (on)/off". Enables dynamic bitmap switching from the options menu - renumbered the ship bitmap sets for the colorClient option. Choices are 0=mono, 1=new color graphics, 2=single color graphics, and 3=shaded single color graphics. Default setting is still 1. Settings 2 and 3 have the bonus effect of turning your ship color to white (similar to COW) due to there being a greyscale bitmap library with matching ship designs. - updated NetrekXP manual (in docs folder) Index: hints.dat =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/hints.dat,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- hints.dat 14 Apr 2006 12:24:00 -0000 1.3 +++ hints.dat 15 Apr 2006 01:04:33 -0000 1.4 @@ -5,6 +5,7 @@ you can open the NetrekXP help program with the F1 key. you can use the mouse wheel to scroll inside message windows. an observer can lock onto a cloaked teammate from the player list. +macros can be sent using players from the player list as the target. Some default distresses can be sent this way too. you can change the dashboard clock to a timer through the Visuals Menu. The \ key is default for reseting the timer. when you are low on planets, you should let the more experienced players pick the armies. Those should not be wasted. when you are in doubt, you should ask a Commodore, Rear Adm. or Admiral for advice. Index: netrekxp.doc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekxp.doc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- netrekxp.doc 14 Apr 2006 12:24:00 -0000 1.2 +++ netrekxp.doc 15 Apr 2006 01:04:33 -0000 1.3 @@ -112,7 +112,13 @@ For other options, see MACROs and Receiver Configurable Distress Calls. -colorClient: (on/off) use color or monochrome bitmaps +colorClient: (0-3) ship bitmaps that are used + 0 ? Monochrome + 1 ? New color bitmaps (default) + 2 ? Old color bitmaps + 3 ? Shaded old color bitmaps + +dynamicBitmaps: (on/off) allow switching of ship bitmaps in game. fullScreen: (on/off) draw borders for main window (default is off) @@ -160,6 +166,12 @@ continuousMouse:(on/off) change direction while holding right mouse button and moving the mouse +continuousMouseFix: (on/off) If enabled the continuous mouse will follow any + buttons that are pressed at the same time. For example if you + are steering and firing at the same time this fix will allow + both events to occur. Without the fix the behavior is to only + allow one button action. + newDistress: (on/off) right justified distress call or not, default value is to right justify (on) @@ -170,9 +182,35 @@ varyHull: (on/off) graphical indication of your hull condition. kinda like varyShields +windowMove: (on/off) option to disable in-game movement of client windows. + +mainResizeable: (on/off) make the main netrek window resizeable + +metaPing: (on/off) show ping statistics in the metaserver window + cloakChars: (string of one or two chars) what to use for cloakers on galactic instead of '??'. +omitTeamLetter: (on/off) to stop drawing the team letter on the galactic + +showStars: (on/off) to have paradise-like background stars + +warpStreaks: (on/off) to draw streaks while warping to the starbase if + background stars are on + +viewBox: (on/off) to show your tactical boundaries on the galactic + +disableWinkey: (on/off) to allow Windows and Context keyboard keys to be + disabled + +timerType: Range of 0-4. Use to be able to switch the dashboard clock + into a timer. + 0 - don't show + (1) - show current time + 2 - show time on server + 3 - show time in ship + 4 - show user-set time + enemyPhasers: (integer 0-10) enemy phasers thickness at starting point. phaserShrink: (integer 0-16) Don't draw the first "phaserShrink"/16 th of @@ -182,7 +220,18 @@ shrinkPhaserOnMiss: (on/off) Use "phaserShrink" and "theirPhaserShrink" even if a phaser misses. - + +highlightFriendlyPhasers: (on/off) When on, friendly phaser hits appear white. + When off, phasers rotate between white and team color. + +colorfulPhasers: (on/off) Makes your phaser hits become multicolored. + +playerListMessaging: (on/off) option to enable/disable clickable player list + +beepOnPrivateMessage: (on/off) if enabled, the client will beep when you receive + a private message from somebody that is not yourself or + god. + showStats: (on/off) show stats window reportKills: (on/off) display kill messages or ignore these @@ -284,7 +333,14 @@ extraAlertBorder: (on/off) Draws border over tactical window -forcemono: (on/off) client windows are set to be monochrome +forceDisplay: (0-3) Number of colors the client will display + 0 - find best available color option + 1 - 16 colors + 2 - 256 colors + 3 - true color (default) + +forcemono: Outdated option. Will force display to 16 colors, + (but only works if forceDisplay = 0) redrawDelay: (0-10) synchron screen refresh every n/10 sec @@ -296,6 +352,34 @@ 2 = tactical 3 = both +Extra NetrekXP features: + +Most options in the rc file can have four appearances: + 1. option.observer: string (i.e. "keymap.observer: aabbcc") + 2. option.servernick: string (i.e. "keymap.continuum: aabbcc") + This one will work only if you have "server.servernick: servername" in +the rc (i.e. "server.continuum: continuum.us.netrek.org") + 3. option.servertype: string (i.e. "keymap.bronco: aabbcc") + This will work if you either connect from the metaserver window (then servertypes are taken from metaserver report) or if you use option the "server.nickname" to map the server to a nickname and then define "serverType.nickname" to be one of "paradise, bronco, chaos, inl, sturgeon, hockey, dogfight" (so you will have two lines is the rc): + "server.pickled: pickled.psychosis.net" and + "serverType.pickled: bronco" + 4. option: string (i.e. "keymap: aabbccdd") +The options are validated in the same order (from 1 to 4 where 1 is best match and 4 is worst match). + +The "window.allow" option lets you set the type of messages logged into each message window (review, review_all, review_team, review_your, review_kill, review_phaser) + Message types: + I - individual messages + T - team messages + A - all messages + K - kill messages + P - phaser messages + Default settings: + review.allow: ITAKP + review_all.allow: A + review_team.allow: T + review_your.allow: I + review_kill.allow: K + review_phaser.allow: P iConnection Types: UDP and TCP explained @@ -919,6 +1003,13 @@ between the old style playerlist (off) and the COW style playerlist (on) if the "playerListStyle" option does not appear in your xtrekrc. +It is also possible to select the amount of decimal places in playerlist float numbers. + Example: + "playerlist: nTK1 RNr1 S1d0" in order to see: + "R0 CA 0.5 Ensign guest 0.8 2.4 95" + or giving old "playerlist: nTK RNr Sd" will give you: + "R0 CA 0.50 Ensign guest 0.82 2.43 95.07" +Current options that can be followed by numbers 0-2 are: KODSrdBPHkVv i3) The "partitionPlist" option: Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- changes.txt 14 Apr 2006 12:24:00 -0000 1.3 +++ changes.txt 15 Apr 2006 01:04:32 -0000 1.4 @@ -1,5 +1,13 @@ Version TBA: -- +- all ship bitmap libraries now load into memory. Can be modified at a later date + if this proves to be a bad idea. +- added "dynamicBitmap: (on)/off". Enables dynamic bitmap switching from the options menu +- renumbered the ship bitmap sets for the colorClient option. Choices are 0=mono, + 1=new color graphics, 2=single color graphics, and 3=shaded single color graphics. + Default setting is still 1. Settings 2 and 3 have the bonus effect of turning your + ship color to white (similar to COW) due to there being a greyscale bitmap library + with matching ship designs. +- updated NetrekXP manual (in docs folder) - fixed hightlightFriendlyPhaser option to work again: on for white phasers on hits, off for flicker between team color and white - added some more hints to the hint database From modemhero at users.sourceforge.net Fri Apr 14 20:04:34 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 15 Apr 2006 01:04:34 +0000 Subject: [netrek-cvs] client/netrekxp/include data.h,1.2,1.3 Message-ID: Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15356/include Modified Files: data.h Log Message: - all ship bitmap libraries now load into memory. Can be modified at a later date if this proves to be a bad idea. - added "dynamicBitmap: (on)/off". Enables dynamic bitmap switching from the options menu - renumbered the ship bitmap sets for the colorClient option. Choices are 0=mono, 1=new color graphics, 2=single color graphics, and 3=shaded single color graphics. Default setting is still 1. Settings 2 and 3 have the bonus effect of turning your ship color to white (similar to COW) due to there being a greyscale bitmap library with matching ship designs. - updated NetrekXP manual (in docs folder) Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- data.h 12 Apr 2006 04:20:03 -0000 1.2 +++ data.h 15 Apr 2006 01:04:32 -0000 1.3 @@ -165,6 +165,7 @@ extern int theirPhaserShrink; extern int shrinkPhaserOnMiss; extern int colorClient; +extern int dynamicBitmaps; extern int newDashboard, old_db; extern int niftyNewMessages; extern int fastQuit; @@ -274,11 +275,26 @@ kli_bitmaps[NUM_TYPES][SHIP_VIEWS], rom_bitmaps[NUM_TYPES][SHIP_VIEWS], ori_bitmaps[NUM_TYPES][SHIP_VIEWS], ind_bitmaps[NUM_TYPES][SHIP_VIEWS]; +extern W_Icon ship_bitmaps1[5]; +extern W_Icon fed_bitmaps1[NUM_TYPES][SHIP_VIEWS], + kli_bitmaps1[NUM_TYPES][SHIP_VIEWS], rom_bitmaps1[NUM_TYPES][SHIP_VIEWS], + ori_bitmaps1[NUM_TYPES][SHIP_VIEWS], ind_bitmaps1[NUM_TYPES][SHIP_VIEWS]; + extern W_Icon ship_bitmapsG[5]; extern W_Icon fed_bitmapsG[NUM_TYPES][SHIP_VIEWS], kli_bitmapsG[NUM_TYPES][SHIP_VIEWS], rom_bitmapsG[NUM_TYPES][SHIP_VIEWS], ori_bitmapsG[NUM_TYPES][SHIP_VIEWS], ind_bitmapsG[NUM_TYPES][SHIP_VIEWS]; +extern W_Icon ship_bitmapsM[5]; +extern W_Icon fed_bitmapsM[NUM_TYPES][SHIP_VIEWS], + kli_bitmapsM[NUM_TYPES][SHIP_VIEWS], rom_bitmapsM[NUM_TYPES][SHIP_VIEWS], + ori_bitmapsM[NUM_TYPES][SHIP_VIEWS], ind_bitmapsM[NUM_TYPES][SHIP_VIEWS]; + +extern W_Icon ship_bitmapsT[5]; +extern W_Icon fed_bitmapsT[NUM_TYPES][SHIP_VIEWS], + kli_bitmapsT[NUM_TYPES][SHIP_VIEWS], rom_bitmapsT[NUM_TYPES][SHIP_VIEWS], + ori_bitmapsT[NUM_TYPES][SHIP_VIEWS], ind_bitmapsT[NUM_TYPES][SHIP_VIEWS]; + extern W_Icon base_planets; extern W_Icon base_mplanets; extern W_Icon bplanets[PLANET_VIEWS]; @@ -475,6 +491,11 @@ extern char *kli_ship_bmp; extern char *ori_ship_bmp; extern char *ind_ship_bmp; +extern char *fed_ship_bmp_1; +extern char *rom_ship_bmp_1; +extern char *kli_ship_bmp_1; +extern char *ori_ship_bmp_1; +extern char *ind_ship_bmp_1; extern char *fed_ship_bmp_G; extern char *rom_ship_bmp_G; extern char *kli_ship_bmp_G; From modemhero at users.sourceforge.net Fri Apr 14 20:04:36 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 15 Apr 2006 01:04:36 +0000 Subject: [netrek-cvs] client/netrekxp/src cowmain.c, 1.2, 1.3 data.c, 1.2, 1.3 defaults.c, 1.2, 1.3 local.c, 1.3, 1.4 mswindow.c, 1.3, 1.4 newwin.c, 1.2, 1.3 option.c, 1.2, 1.3 playback.c, 1.2, 1.3 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15356/src Modified Files: cowmain.c data.c defaults.c local.c mswindow.c newwin.c option.c playback.c Log Message: - all ship bitmap libraries now load into memory. Can be modified at a later date if this proves to be a bad idea. - added "dynamicBitmap: (on)/off". Enables dynamic bitmap switching from the options menu - renumbered the ship bitmap sets for the colorClient option. Choices are 0=mono, 1=new color graphics, 2=single color graphics, and 3=shaded single color graphics. Default setting is still 1. Settings 2 and 3 have the bonus effect of turning your ship color to white (similar to COW) due to there being a greyscale bitmap library with matching ship designs. - updated NetrekXP manual (in docs folder) Index: mswindow.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- mswindow.c 12 Apr 2006 12:36:58 -0000 1.3 +++ mswindow.c 15 Apr 2006 01:04:34 -0000 1.4 @@ -407,15 +407,30 @@ for (j = 0; j < NUM_TYPES; j++) for (k = 0; k < SHIP_VIEWS; k++) { + free (fed_bitmapsT[j][k]); + free (fed_bitmapsM[j][k]); free (fed_bitmapsG[j][k]); + free (fed_bitmaps1[j][k]); free (fed_bitmaps[j][k]); + free (ind_bitmapsT[j][k]); + free (ind_bitmapsM[j][k]); free (ind_bitmapsG[j][k]); + free (ind_bitmaps1[j][k]); free (ind_bitmaps[j][k]); + free (kli_bitmapsT[j][k]); + free (kli_bitmapsM[j][k]); free (kli_bitmapsG[j][k]); + free (kli_bitmaps1[j][k]); free (kli_bitmaps[j][k]); + free (ori_bitmapsT[j][k]); + free (ori_bitmapsM[j][k]); free (ori_bitmapsG[j][k]); + free (ori_bitmaps1[j][k]); free (ori_bitmaps[j][k]); + free (rom_bitmapsT[j][k]); + free (rom_bitmapsM[j][k]); free (rom_bitmapsG[j][k]); + free (rom_bitmaps1[j][k]); free (rom_bitmaps[j][k]); } Index: newwin.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- newwin.c 12 Apr 2006 04:20:04 -0000 1.2 +++ newwin.c 15 Apr 2006 01:04:34 -0000 1.3 @@ -349,160 +349,199 @@ break; } - if (colorClient > 0) - { - ship_bitmaps[0] = - W_StoreBitmap3 (fed_ship_bmp, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmaps[1] = - W_StoreBitmap3 (ind_ship_bmp, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmaps[2] = - W_StoreBitmap3 (kli_ship_bmp, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmaps[3] = - W_StoreBitmap3 (ori_ship_bmp, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmaps[4] = - W_StoreBitmap3 (rom_ship_bmp, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, - LR_DEFAULTCOLOR); +/* Load all the bitmaps in. Let the user be able to toggle between + any type if dynamicBitmaps is set. */ + + ship_bitmaps[0] = + W_StoreBitmap3 (fed_ship_bmp, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmaps[1] = + W_StoreBitmap3 (ind_ship_bmp, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmaps[2] = + W_StoreBitmap3 (kli_ship_bmp, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmaps[3] = + W_StoreBitmap3 (ori_ship_bmp, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmaps[4] = + W_StoreBitmap3 (rom_ship_bmp, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, + LR_DEFAULTCOLOR); - if (colorClient == 1) - { - ship_bitmapsG[0] = - W_StoreBitmap3 (fed_ship_bmp_T, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmapsG[1] = - W_StoreBitmap3 (ind_ship_bmp_T, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmapsG[2] = - W_StoreBitmap3 (kli_ship_bmp_T, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmapsG[3] = - W_StoreBitmap3 (ori_ship_bmp_T, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmapsG[4] = - W_StoreBitmap3 (rom_ship_bmp_T, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, - LR_DEFAULTCOLOR); - } - else - { - ship_bitmapsG[0] = - W_StoreBitmap3 (fed_ship_bmp_G, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmapsG[1] = - W_StoreBitmap3 (ind_ship_bmp_G, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmapsG[2] = - W_StoreBitmap3 (kli_ship_bmp_G, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmapsG[3] = - W_StoreBitmap3 (ori_ship_bmp_G, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmapsG[4] = - W_StoreBitmap3 (rom_ship_bmp_G, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, - LR_DEFAULTCOLOR); - } + ship_bitmaps1[0] = + W_StoreBitmap3 (fed_ship_bmp_1, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmaps1[1] = + W_StoreBitmap3 (ind_ship_bmp_1, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmaps1[2] = + W_StoreBitmap3 (kli_ship_bmp_1, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmaps1[3] = + W_StoreBitmap3 (ori_ship_bmp_1, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmaps1[4] = + W_StoreBitmap3 (rom_ship_bmp_1, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, + LR_DEFAULTCOLOR); + + ship_bitmapsT[0] = + W_StoreBitmap3 (fed_ship_bmp_T, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmapsT[1] = + W_StoreBitmap3 (ind_ship_bmp_T, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmapsT[2] = + W_StoreBitmap3 (kli_ship_bmp_T, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmapsT[3] = + W_StoreBitmap3 (ori_ship_bmp_T, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmapsT[4] = + W_StoreBitmap3 (rom_ship_bmp_T, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, + LR_DEFAULTCOLOR); - for (j = 0; j < NUM_TYPES; j++) - { - for (k = 0; k < SHIP_VIEWS; k++) - { - fed_bitmapsG[j][k] = - W_PointBitmap2 (ship_bitmapsG[0], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - fed_bitmaps[j][k] = - W_PointBitmap2 (ship_bitmaps[0], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - ind_bitmapsG[j][k] = - W_PointBitmap2 (ship_bitmapsG[1], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - ind_bitmaps[j][k] = - W_PointBitmap2 (ship_bitmaps[1], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - kli_bitmapsG[j][k] = - W_PointBitmap2 (ship_bitmapsG[2], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - kli_bitmaps[j][k] = - W_PointBitmap2 (ship_bitmaps[2], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - ori_bitmapsG[j][k] = - W_PointBitmap2 (ship_bitmapsG[3], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - ori_bitmaps[j][k] = - W_PointBitmap2 (ship_bitmaps[3], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - rom_bitmapsG[j][k] = - W_PointBitmap2 (ship_bitmapsG[4], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - rom_bitmaps[j][k] = - W_PointBitmap2 (ship_bitmaps[4], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - } - } - } - else - { - ship_bitmaps[0] = - W_StoreBitmap3 (fed_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, - LR_MONOCHROME); - ship_bitmaps[1] = - W_StoreBitmap3 (ind_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, - LR_MONOCHROME); - ship_bitmaps[2] = - W_StoreBitmap3 (kli_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, - LR_MONOCHROME); - ship_bitmaps[3] = - W_StoreBitmap3 (ori_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, - LR_MONOCHROME); - ship_bitmaps[4] = - W_StoreBitmap3 (rom_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, - LR_MONOCHROME); + ship_bitmapsM[0] = + W_StoreBitmap3 (fed_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, + LR_MONOCHROME); + ship_bitmapsM[1] = + W_StoreBitmap3 (ind_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, + LR_MONOCHROME); + ship_bitmapsM[2] = + W_StoreBitmap3 (kli_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, + LR_MONOCHROME); + ship_bitmapsM[3] = + W_StoreBitmap3 (ori_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, + LR_MONOCHROME); + ship_bitmapsM[4] = + W_StoreBitmap3 (rom_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, + LR_MONOCHROME); + + ship_bitmapsG[0] = + W_StoreBitmap3 (fed_ship_bmp_G, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmapsG[1] = + W_StoreBitmap3 (ind_ship_bmp_G, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmapsG[2] = + W_StoreBitmap3 (kli_ship_bmp_G, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmapsG[3] = + W_StoreBitmap3 (ori_ship_bmp_G, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmapsG[4] = + W_StoreBitmap3 (rom_ship_bmp_G, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, + LR_DEFAULTCOLOR); - for (j = 0; j < NUM_TYPES; j++) + for (j = 0; j < NUM_TYPES; j++) + { + for (k = 0; k < SHIP_VIEWS; k++) { - for (k = 0; k < SHIP_VIEWS; k++) - { - fed_bitmaps[j][k] = - W_PointBitmap2 (ship_bitmaps[0], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - ind_bitmaps[j][k] = - W_PointBitmap2 (ship_bitmaps[1], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - kli_bitmaps[j][k] = - W_PointBitmap2 (ship_bitmaps[2], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - ori_bitmaps[j][k] = - W_PointBitmap2 (ship_bitmaps[3], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - rom_bitmaps[j][k] = - W_PointBitmap2 (ship_bitmaps[4], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - } + fed_bitmapsT[j][k] = + W_PointBitmap2 (ship_bitmapsT[0], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + fed_bitmapsM[j][k] = + W_PointBitmap2 (ship_bitmapsM[0], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + fed_bitmapsG[j][k] = + W_PointBitmap2 (ship_bitmapsG[0], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + fed_bitmaps1[j][k] = + W_PointBitmap2 (ship_bitmaps1[0], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + fed_bitmaps[j][k] = + W_PointBitmap2 (ship_bitmaps[0], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + ind_bitmapsT[j][k] = + W_PointBitmap2 (ship_bitmapsT[1], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + ind_bitmapsM[j][k] = + W_PointBitmap2 (ship_bitmapsM[1], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + ind_bitmapsG[j][k] = + W_PointBitmap2 (ship_bitmapsG[1], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + ind_bitmaps1[j][k] = + W_PointBitmap2 (ship_bitmaps1[1], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + ind_bitmaps[j][k] = + W_PointBitmap2 (ship_bitmaps[1], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + ind_bitmapsT[j][k] = + W_PointBitmap2 (ship_bitmapsT[1], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + kli_bitmapsT[j][k] = + W_PointBitmap2 (ship_bitmapsT[2], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + kli_bitmapsM[j][k] = + W_PointBitmap2 (ship_bitmapsM[2], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + kli_bitmapsG[j][k] = + W_PointBitmap2 (ship_bitmapsG[2], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + kli_bitmaps1[j][k] = + W_PointBitmap2 (ship_bitmaps1[2], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + kli_bitmaps[j][k] = + W_PointBitmap2 (ship_bitmaps[2], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + ori_bitmapsT[j][k] = + W_PointBitmap2 (ship_bitmapsT[3], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + ori_bitmapsM[j][k] = + W_PointBitmap2 (ship_bitmapsM[3], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + ori_bitmapsG[j][k] = + W_PointBitmap2 (ship_bitmapsG[3], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + ori_bitmaps1[j][k] = + W_PointBitmap2 (ship_bitmaps1[3], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + ori_bitmaps[j][k] = + W_PointBitmap2 (ship_bitmaps[3], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + rom_bitmapsT[j][k] = + W_PointBitmap2 (ship_bitmapsT[4], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + rom_bitmapsM[j][k] = + W_PointBitmap2 (ship_bitmapsM[4], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + rom_bitmapsG[j][k] = + W_PointBitmap2 (ship_bitmapsG[4], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + rom_bitmaps1[j][k] = + W_PointBitmap2 (ship_bitmaps1[4], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + rom_bitmaps[j][k] = + W_PointBitmap2 (ship_bitmaps[4], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); } } - /* Experimental weapons */ #ifdef COLORIZEWEAPON /* Not implemented... have to redo code with StoreBitmap3 Index: cowmain.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/cowmain.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cowmain.c 12 Apr 2006 04:20:03 -0000 1.2 +++ cowmain.c 15 Apr 2006 01:04:34 -0000 1.3 @@ -654,23 +654,15 @@ if (usemeta) parsemeta (usemeta); #endif - -/* Check to see if we should load color bitmaps SRS 1/11/99 */ -/* 0 = mono - * 1 = color with tinted bitmaps in center representing your ship - * 2 = color with greyscale bitmaps in center representing your ship - */ - - /* This is here for backwards compatibility with old bool default */ - colorClient = booleanDefault ("colorClient", 0); - /* If it's already 0, it can't hurt to check for int default */ - if (colorClient == 0) - colorClient = intDefault ("colorClient", 1); - + fed_ship_bmp = "bitmaps/shiplib/fedship.bmp"; if ((stringDefault ("fedshipbmpfile")) != NULL) fed_ship_bmp = stringDefault ("fedshipbmpfile"); + fed_ship_bmp_1 = "bitmaps/shiplib/fedship1.bmp"; + if ((stringDefault ("fedshipbmp1file")) != NULL) + fed_ship_bmp_1 = stringDefault ("fedshipbmp1file"); + fed_ship_bmp_G = "bitmaps/shiplib/fedshipG.bmp"; if ((stringDefault ("fedshipGbmpfile")) != NULL) fed_ship_bmp_G = stringDefault ("fedshipGbmpfile"); @@ -687,6 +679,10 @@ if ((stringDefault ("romshipbmpfile")) != NULL) rom_ship_bmp = stringDefault ("romshipbmpfile"); + rom_ship_bmp_1 = "bitmaps/shiplib/romship1.bmp"; + if ((stringDefault ("romshipbmp1file")) != NULL) + rom_ship_bmp_1 = stringDefault ("romshipbmp1file"); + rom_ship_bmp_G = "bitmaps/shiplib/romshipG.bmp"; if ((stringDefault ("romshipGbmpfile")) != NULL) rom_ship_bmp_G = stringDefault ("romshipGbmpfile"); @@ -702,7 +698,11 @@ kli_ship_bmp = "bitmaps/shiplib/kliship.bmp"; if ((stringDefault ("klishipbmpfile")) != NULL) kli_ship_bmp = stringDefault ("klishipbmpfile"); - + + kli_ship_bmp_1 = "bitmaps/shiplib/kliship1.bmp"; + if ((stringDefault ("klishipbmp1file")) != NULL) + kli_ship_bmp_1 = stringDefault ("klishipbmp1file"); + kli_ship_bmp_G = "bitmaps/shiplib/klishipG.bmp"; if ((stringDefault ("klishipGbmpfile")) != NULL) kli_ship_bmp_G = stringDefault ("klishipGbmpfile"); @@ -719,6 +719,10 @@ if ((stringDefault ("orishipbmpfile")) != NULL) ori_ship_bmp = stringDefault ("orishipbmpfile"); + ori_ship_bmp_1 = "bitmaps/shiplib/oriship1.bmp"; + if ((stringDefault ("orishipbmp1file")) != NULL) + ori_ship_bmp_1 = stringDefault ("orishipbmp1file"); + ori_ship_bmp_G = "bitmaps/shiplib/orishipG.bmp"; if ((stringDefault ("orishipGbmpfile")) != NULL) ori_ship_bmp_G = stringDefault ("orishipGbmpfile"); @@ -734,6 +738,10 @@ ind_ship_bmp = "bitmaps/shiplib/indship.bmp"; if ((stringDefault ("indshipbmpfile")) != NULL) ind_ship_bmp = stringDefault ("indshipbmpfile"); + + ind_ship_bmp_1 = "bitmaps/shiplib/indship1.bmp"; + if ((stringDefault ("indshipbmp1file")) != NULL) + ind_ship_bmp_1 = stringDefault ("indshipbmp1file"); ind_ship_bmp_G = "bitmaps/shiplib/indshipG.bmp"; if ((stringDefault ("indshipGbmpfile")) != NULL) Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- local.c 14 Apr 2006 12:24:00 -0000 1.3 +++ local.c 15 Apr 2006 01:04:34 -0000 1.4 @@ -445,11 +445,7 @@ int dx, dy, px, py, wx, wy, tx, ty, lx, ly; int new_dx, new_dy; -#ifndef DYNAMIC_BITMAPS W_Icon (*ship_bits)[SHIP_VIEWS]; -#endif - - /* Kludge to try to fix missing ID chars on tactical (short range) display. */ @@ -541,35 +537,63 @@ } if (j->p_status == PALIVE) { - -#ifndef DYNAMIC_BITMAPS - switch (j->p_team) - { - case FED: - ship_bits = fed_bitmaps; - break; - case ROM: - ship_bits = rom_bitmaps; - break; - case KLI: - ship_bits = kli_bitmaps; - break; - case ORI: - ship_bits = ori_bitmaps; - break; - default: - ship_bits = ind_bitmaps; - break; - } -#endif - clearzone[0][clearcount] = dx - (shield_width / 2); clearzone[1][clearcount] = dy - (shield_height / 2); clearzone[2][clearcount] = shield_width; clearzone[3][clearcount] = shield_height; clearcount++; - if (!myPlayer (j) || (!(colorClient > 0))) + /* Logic of color scheme is as follows: + 1) Mono bitmaps (colorClient 0) and new bitmaps (colorClient 1) + are the same for both player and everyone else. + 2) Single color bitmaps (colorClient 2) and shaded single color + bitmaps (colorClient 3) have a monochrome version (bitmap set + G) that will be used for the player's ship, to set it apart in + color from the rest of the team + */ + if (colorClient <= 0 || colorClient > 3) + { + switch (j->p_team) + { + case FED: + ship_bits = fed_bitmapsM; + break; + case ROM: + ship_bits = rom_bitmapsM; + break; + case KLI: + ship_bits = kli_bitmapsM; + break; + case ORI: + ship_bits = ori_bitmapsM; + break; + default: + ship_bits = ind_bitmapsM; + break; + } + } + else if (colorClient == 1) + { + switch (j->p_team) + { + case FED: + ship_bits = fed_bitmaps1; + break; + case ROM: + ship_bits = rom_bitmaps1; + break; + case KLI: + ship_bits = kli_bitmaps1; + break; + case ORI: + ship_bits = ori_bitmaps1; + break; + default: + ship_bits = ind_bitmaps1; + break; + } + } + else if (colorClient == 2 && !myPlayer(j)) { switch (j->p_team) { @@ -589,24 +613,33 @@ ship_bits = ind_bitmaps; break; } - W_WriteBitmap (dx - (j->p_ship.s_width / 2), - dy - (j->p_ship.s_height / 2), - /*W_WriteBitmapDB (localSDB, dx - (j->p_ship.s_width / 2), - dy - (j->p_ship.s_height / 2),*/ -#ifndef DYNAMIC_BITMAPS - ship_bits[j->p_ship. - s_type][rosette (j->p_dir)], -#else - ship_bitmaps[PlayerBitmap (j)][rosette - (j->p_dir)], -#endif - playerColor (j)); } - else + else if (colorClient == 3 && !myPlayer(j)) { switch (j->p_team) { case FED: + ship_bits = fed_bitmapsT; + break; + case ROM: + ship_bits = rom_bitmapsT; + break; + case KLI: + ship_bits = kli_bitmapsT; + break; + case ORI: + ship_bits = ori_bitmapsT; + break; + default: + ship_bits = ind_bitmapsT; + break; + } + } + else /* Default to bitmap set G (greyscale) for player's ship */ + { + switch (j->p_team) + { + case FED: ship_bits = fed_bitmapsG; break; case ROM: @@ -622,21 +655,15 @@ ship_bits = ind_bitmapsG; break; } - W_WriteBitmap (dx - (j->p_ship.s_width / 2), - dy - (j->p_ship.s_height / 2), - /*W_WriteBitmapDB (localSDB, dx - (j->p_ship.s_width / 2), - dy - (j->p_ship.s_height / 2),*/ -#ifndef DYNAMIC_BITMAPS - ship_bits[j->p_ship. - s_type][rosette (j->p_dir)], -#else - ship_bitmaps[PlayerBitmap (j)][rosette - (j->p_dir)], -#endif - playerColor (j)); } + W_WriteBitmap (dx - (j->p_ship.s_width / 2), + dy - (j->p_ship.s_height / 2), + ship_bits[j->p_ship. + s_type][rosette (j->p_dir)], + playerColor (j)); + if (j->p_cloakphase > 0) { W_WriteBitmap (dx - (cloak_width / 2), Index: playback.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/playback.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- playback.c 12 Apr 2006 04:20:04 -0000 1.2 +++ playback.c 15 Apr 2006 01:04:34 -0000 1.3 @@ -75,13 +75,14 @@ SRANDOM (getpid () * time ((LONG *) 0)); - /* Check to see if we should load color bitmaps SRS 1/11/99 */ - colorClient = intDefault ("colorClient", colorClient); - fed_ship_bmp = "bitmaps/shiplib/fedship.bmp"; if ((stringDefault ("fedshipbmpfile")) != NULL) fed_ship_bmp = stringDefault ("fedshipbmpfile"); + fed_ship_bmp_1 = "bitmaps/shiplib/fedship1.bmp"; + if ((stringDefault ("fedshipbmp1file")) != NULL) + fed_ship_bmp_1 = stringDefault ("fedshipbmp1file"); + fed_ship_bmp_G = "bitmaps/shiplib/fedshipG.bmp"; if ((stringDefault ("fedshipGbmpfile")) != NULL) fed_ship_bmp_G = stringDefault ("fedshipGbmpfile"); @@ -98,6 +99,10 @@ if ((stringDefault ("romshipbmpfile")) != NULL) rom_ship_bmp = stringDefault ("romshipbmpfile"); + rom_ship_bmp_1 = "bitmaps/shiplib/romship1.bmp"; + if ((stringDefault ("romshipbmp1file")) != NULL) + rom_ship_bmp_1 = stringDefault ("romshipbmp1file"); + rom_ship_bmp_G = "bitmaps/shiplib/romshipG.bmp"; if ((stringDefault ("romshipGbmpfile")) != NULL) rom_ship_bmp_G = stringDefault ("romshipGbmpfile"); @@ -113,7 +118,11 @@ kli_ship_bmp = "bitmaps/shiplib/kliship.bmp"; if ((stringDefault ("klishipbmpfile")) != NULL) kli_ship_bmp = stringDefault ("klishipbmpfile"); - + + kli_ship_bmp_1 = "bitmaps/shiplib/kliship1.bmp"; + if ((stringDefault ("klishipbmp1file")) != NULL) + kli_ship_bmp_1 = stringDefault ("klishipbmp1file"); + kli_ship_bmp_G = "bitmaps/shiplib/klishipG.bmp"; if ((stringDefault ("klishipGbmpfile")) != NULL) kli_ship_bmp_G = stringDefault ("klishipGbmpfile"); @@ -130,6 +139,10 @@ if ((stringDefault ("orishipbmpfile")) != NULL) ori_ship_bmp = stringDefault ("orishipbmpfile"); + ori_ship_bmp_1 = "bitmaps/shiplib/oriship1.bmp"; + if ((stringDefault ("orishipbmp1file")) != NULL) + ori_ship_bmp_1 = stringDefault ("orishipbmp1file"); + ori_ship_bmp_G = "bitmaps/shiplib/orishipG.bmp"; if ((stringDefault ("orishipGbmpfile")) != NULL) ori_ship_bmp_G = stringDefault ("orishipGbmpfile"); @@ -145,6 +158,10 @@ ind_ship_bmp = "bitmaps/shiplib/indship.bmp"; if ((stringDefault ("indshipbmpfile")) != NULL) ind_ship_bmp = stringDefault ("indshipbmpfile"); + + ind_ship_bmp_1 = "bitmaps/shiplib/indship1.bmp"; + if ((stringDefault ("indshipbmp1file")) != NULL) + ind_ship_bmp_1 = stringDefault ("indshipbmp1file"); ind_ship_bmp_G = "bitmaps/shiplib/indshipG.bmp"; if ((stringDefault ("indshipGbmpfile")) != NULL) Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- defaults.c 12 Apr 2006 04:20:03 -0000 1.2 +++ defaults.c 15 Apr 2006 01:04:34 -0000 1.3 @@ -76,10 +76,18 @@ { "What type of ship bitmaps to load", "0 - mono", - "1 - color (default)", + "1 - new color bitmaps (default)", + "2 - old color bitmaps", + "3 - shaded old color bitmaps", NULL } }, + {"dynamicBitmaps", &dynamicBitmaps, RC_BOOL, + { + "Allow switching of ship bitmaps in game", + NULL + } + }, #ifdef JUBILEE_PHASERS {"colorfulPhasers", &colorfulPhasers, RC_BOOL, { @@ -131,7 +139,7 @@ {"forceDisplay", &forceDisplay, RC_INT, { "Number of colors the client will display", - "0 - mono", + "0 - find best available color option", "1 - 16 colors", "2 - 256 colors", "3 - true color (default)", @@ -140,7 +148,8 @@ }, {"forceMono", &forceMono, RC_BOOL, { - "Force old bitmaps", + "Outdated option. Will force display to 16 colors", + "(but only works if forceDisplay = 0).", NULL } }, @@ -1383,6 +1392,8 @@ showStats = booleanDefault ("showStats", showStats); showHints = booleanDefault ("showHints", showHints); keepPeace = booleanDefault ("keepPeace", keepPeace); + colorClient = intDefault ("colorClient", colorClient); + dynamicBitmaps = booleanDefault ("dynamicBitmaps", dynamicBitmaps); continueTractor = booleanDefault ("continueTractor", continueTractor); showTractorPressor = booleanDefault ("showTractorPressor", showTractorPressor); showAllTractorPressor = booleanDefault ("showAllTractorPressor", showAllTractorPressor); Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- data.c 12 Apr 2006 04:20:03 -0000 1.2 +++ data.c 15 Apr 2006 01:04:34 -0000 1.3 @@ -46,7 +46,7 @@ int shrinkPhaserOnMiss = 0; int colorClient = 1; /* Use new colorized bitmaps SRS 11/12/99 */ - +int dynamicBitmaps = 1; /* in game switching of ship bitmaps, default to on */ int newDashboard = 2; /* use new graphic * dashboard, 6/2/93 LAB */ int old_db = 0; /* should be same as @@ -274,11 +274,25 @@ rom_bitmaps[NUM_TYPES][SHIP_VIEWS], ori_bitmaps[NUM_TYPES][SHIP_VIEWS], ind_bitmaps[NUM_TYPES][SHIP_VIEWS]; +W_Icon ship_bitmaps1[5]; +W_Icon fed_bitmaps1[NUM_TYPES][SHIP_VIEWS], kli_bitmaps1[NUM_TYPES][SHIP_VIEWS], + rom_bitmaps1[NUM_TYPES][SHIP_VIEWS], ori_bitmaps1[NUM_TYPES][SHIP_VIEWS], + ind_bitmaps1[NUM_TYPES][SHIP_VIEWS]; + W_Icon ship_bitmapsG[5]; W_Icon fed_bitmapsG[NUM_TYPES][SHIP_VIEWS], kli_bitmapsG[NUM_TYPES][SHIP_VIEWS], rom_bitmapsG[NUM_TYPES][SHIP_VIEWS], ori_bitmapsG[NUM_TYPES][SHIP_VIEWS], ind_bitmapsG[NUM_TYPES][SHIP_VIEWS]; +W_Icon ship_bitmapsM[5]; +W_Icon fed_bitmapsM[NUM_TYPES][SHIP_VIEWS], + kli_bitmapsM[NUM_TYPES][SHIP_VIEWS], rom_bitmapsM[NUM_TYPES][SHIP_VIEWS], + ori_bitmapsM[NUM_TYPES][SHIP_VIEWS], ind_bitmapsM[NUM_TYPES][SHIP_VIEWS]; + +W_Icon ship_bitmapsT[5]; +W_Icon fed_bitmapsT[NUM_TYPES][SHIP_VIEWS], + kli_bitmapsT[NUM_TYPES][SHIP_VIEWS], rom_bitmapsT[NUM_TYPES][SHIP_VIEWS], + ori_bitmapsT[NUM_TYPES][SHIP_VIEWS], ind_bitmapsT[NUM_TYPES][SHIP_VIEWS]; // Planets W_Icon base_planets; @@ -577,6 +591,11 @@ char *kli_ship_bmp; char *ori_ship_bmp; char *ind_ship_bmp; +char *fed_ship_bmp_1; +char *rom_ship_bmp_1; +char *kli_ship_bmp_1; +char *ori_ship_bmp_1; +char *ind_ship_bmp_1; char *fed_ship_bmp_G; char *rom_ship_bmp_G; char *kli_ship_bmp_G; Index: option.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- option.c 12 Apr 2006 04:20:04 -0000 1.2 +++ option.c 15 Apr 2006 01:04:34 -0000 1.3 @@ -32,11 +32,6 @@ static int lastUpdateSpeed = 5; static char newkeys[14]; -#if (defined( DEBUG) || defined (BITMAP_DEBUG)) && defined(DYNAMIC_BITMAPS) -extern int OwnBitmapNum; - -#endif - char *localmes[] = { "Show owner on local planets", "Show resources on local planets", "Show nothing on local planets", @@ -132,6 +127,13 @@ "" }; +static char *bitmaptypemess[] = { "Mono bitmaps", + "New color bitmaps", + "Old color bitmaps", + "Shaded old color bitmaps", + "" +}; + static char *windowmovemess[] = { "Disable moving of internal windows", "Enable moving of internal windows", "" @@ -214,9 +216,7 @@ /* range of menus. Will be updated when menu list is assembled */ struct int_range Menus_Range = { 0, 1, 1 }; -#if (defined( DEBUG) || defined (BITMAP_DEBUG)) && defined(DYNAMIC_BITMAPS) -struct int_range bitmap_range = { 0, 50, 1 }; -#endif +struct int_range bitmap_range = { 0, 3, 1 }; struct int_range keepInfo_range = { 0, 100, 1 }; @@ -237,9 +237,7 @@ struct option Ship_Menu[] = { {0, "Ship Menu", &MenuPage, 0, 0, 0, NULL, &Menus_Range}, {1, "Page %d (click to change)", &MenuPage, 0, 0, 0, NULL, &Menus_Range}, -#if (defined( DEBUG) || defined (BITMAP_DEBUG)) && defined(DYNAMIC_BITMAPS) - {1, "Own bitmap number: %d", &OwnBitmapNum, 0, 0, 0, NULL, &bitmap_range}, -#endif + {1, "", &colorClient, 0, 0, 0, bitmaptypemess, &bitmap_range}, #ifdef VSHIELD_BITMAPS {1, "vary shields bitmap", &varyShields, 0, 0, 0, NULL, NULL}, #endif @@ -631,6 +629,13 @@ /* Toggle int, if it exists */ if (op->op_array) { + /* Actions to be taken when certain options are selected. (Yes, this is + * a hack). */ + if (op->op_option == &colorClient) + { + if (!dynamicBitmaps) + return; + } if (data->key == W_RBUTTON) { (*op->op_option)++; From modemhero at users.sourceforge.net Fri Apr 14 20:04:34 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 15 Apr 2006 01:04:34 +0000 Subject: [netrek-cvs] client/netrekxp build.cmd,1.3,1.4 Message-ID: Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15356 Modified Files: build.cmd Log Message: - all ship bitmap libraries now load into memory. Can be modified at a later date if this proves to be a bad idea. - added "dynamicBitmap: (on)/off". Enables dynamic bitmap switching from the options menu - renumbered the ship bitmap sets for the colorClient option. Choices are 0=mono, 1=new color graphics, 2=single color graphics, and 3=shaded single color graphics. Default setting is still 1. Settings 2 and 3 have the bonus effect of turning your ship color to white (similar to COW) due to there being a greyscale bitmap library with matching ship designs. - updated NetrekXP manual (in docs folder) Index: build.cmd =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/build.cmd,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- build.cmd 14 Apr 2006 12:24:00 -0000 1.3 +++ build.cmd 15 Apr 2006 01:04:32 -0000 1.4 @@ -264,11 +264,11 @@ copy resources\ships\color\ori\oriship.bmp %InstCWD%\netrek\bitmaps\shiplib copy resources\ships\color\rom\romship.bmp %InstCWD%\netrek\bitmaps\shiplib -rem copy resources\ships\color1\fed\fedship1.bmp %InstCWD%\netrek\bitmaps\shiplib -rem copy resources\ships\color1\ind\indship1.bmp %InstCWD%\netrek\bitmaps\shiplib -rem copy resources\ships\color1\kli\kliship1.bmp %InstCWD%\netrek\bitmaps\shiplib -rem copy resources\ships\color1\ori\oriship1.bmp %InstCWD%\netrek\bitmaps\shiplib -rem copy resources\ships\color1\rom\romship1.bmp %InstCWD%\netrek\bitmaps\shiplib +copy resources\ships\color1\fed\fedship1.bmp %InstCWD%\netrek\bitmaps\shiplib +copy resources\ships\color1\ind\indship1.bmp %InstCWD%\netrek\bitmaps\shiplib +copy resources\ships\color1\kli\kliship1.bmp %InstCWD%\netrek\bitmaps\shiplib +copy resources\ships\color1\ori\oriship1.bmp %InstCWD%\netrek\bitmaps\shiplib +copy resources\ships\color1\rom\romship1.bmp %InstCWD%\netrek\bitmaps\shiplib copy resources\ships\mono\fed\fedshipM.bmp %InstCWD%\netrek\bitmaps\shiplib copy resources\ships\mono\ind\indshipM.bmp %InstCWD%\netrek\bitmaps\shiplib From modemhero at users.sourceforge.net Sat Apr 15 04:58:27 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 15 Apr 2006 09:58:27 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.4,1.5 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3530/resources/docs Modified Files: changes.txt Log Message: - fixed bug with phaser messages going blank due to improper buffering (not sure where this bug came from, in the downloadable version off playnetrek this bug does not exist) - removed defunct netrek forum link from metaserver window Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- changes.txt 15 Apr 2006 01:04:32 -0000 1.4 +++ changes.txt 15 Apr 2006 09:58:24 -0000 1.5 @@ -1,4 +1,7 @@ Version TBA: +- fixed bug with phaser messages going blank due to improper buffering (not sure where + this bug came from, in the downloadable version off playnetrek this bug does not exist) +- removed defunct netrek forum link from metaserver window - all ship bitmap libraries now load into memory. Can be modified at a later date if this proves to be a bad idea. - added "dynamicBitmap: (on)/off". Enables dynamic bitmap switching from the options menu From modemhero at users.sourceforge.net Sat Apr 15 04:58:27 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 15 Apr 2006 09:58:27 +0000 Subject: [netrek-cvs] client/netrekxp/src input.c, 1.2, 1.3 parsemeta.c, 1.2, 1.3 warning.c, 1.2, 1.3 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3530/src Modified Files: input.c parsemeta.c warning.c Log Message: - fixed bug with phaser messages going blank due to improper buffering (not sure where this bug came from, in the downloadable version off playnetrek this bug does not exist) - removed defunct netrek forum link from metaserver window Index: parsemeta.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/parsemeta.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- parsemeta.c 12 Apr 2006 04:20:04 -0000 1.2 +++ parsemeta.c 15 Apr 2006 09:58:25 -0000 1.3 @@ -701,7 +701,7 @@ /* Additional Help Options */ W_WriteText (metaWin, 0, num_servers + 1, W_Yellow, - " Netrek Homepage | Newbie Manual | Forum | FAQ | Dogfight Manual", 67, 0); + " Netrek Homepage | Newbie Manual | FAQ | Dogfight Manual", 63, 0); /* Map window */ W_MapWindow (metaWin); @@ -784,15 +784,13 @@ else if (data->y == num_servers + 1) /* Help Line */ { x = data->x / W_Textwidth; - if (x >= 0 && x <= 19) /* Netrek Home Page */ + if (x >= 0 && x <= 23) /* Netrek Home Page */ ShellExecute (NULL, "open", "http://www.netrek.org", NULL, NULL, SW_SHOWNORMAL); - else if (x >= 21 && x <= 35) /* Newbie Manual */ + else if (x >= 25 && x <= 39) /* Newbie Manual */ ShellExecute (NULL, "open", "http://www.netrek.org/cow/current/newbie.html", NULL, NULL, SW_SHOWNORMAL); - else if (x >= 37 && x <= 43) /* Forums */ - ShellExecute (NULL, "open", "http://netrek.game-host.org", NULL, NULL, SW_SHOWNORMAL); - else if (x >= 45 && x <= 49) /* FAQ */ + else if (x >= 41 && x <= 45) /* FAQ */ ShellExecute (NULL, "open", "http://www.inl.org/netrek/netrekFAQ.html", NULL, NULL, SW_SHOWNORMAL); - else if (x >= 51 && x <= 67) /* Dogfight Manual */ + else if (x >= 47 && x <= 63) /* Dogfight Manual */ ShellExecute (NULL, "open", "http://cha.rlie.nl/dfmanual/", NULL, NULL, SW_SHOWNORMAL); } } Index: input.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/input.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- input.c 12 Apr 2006 04:20:03 -0000 1.2 +++ input.c 15 Apr 2006 09:58:25 -0000 1.3 @@ -1489,9 +1489,9 @@ { int x, y; - if (findMouseInWin (&x, &y, playerw)) - { - data->Window = playerw; + if (findMouseInWin (&x, &y, playerw)) + { + data->Window = playerw; data->x = x; data->y = y; } Index: warning.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/warning.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- warning.c 12 Apr 2006 04:20:04 -0000 1.2 +++ warning.c 15 Apr 2006 09:58:25 -0000 1.3 @@ -30,7 +30,7 @@ LONG curtime; struct tm *tm; char newtext[128]; - + char newtext2[128]; if (warncount > 0) { /* XFIX */ @@ -62,10 +62,10 @@ time (&curtime); tm = localtime (&curtime); #ifdef PHASER_STATS - sprintf (newtext, "%.100s %02d:%02d:%02d", + sprintf (newtext2, "%.100s %02d:%02d:%02d", (doPhaser && phaserStats) ? newtext : text, tm->tm_hour, #else - sprintf (newtext, "%.100s %02d:%02d:%02d", text, tm->tm_hour, + sprintf (newtext2, "%.100s %02d:%02d:%02d", text, tm->tm_hour, #endif tm->tm_min, tm->tm_sec); warncount = (warncount > 100) ? 109 : warncount + 9; @@ -74,14 +74,14 @@ { if (logFile != NULL) { - fprintf (logFile, "%s\n", newtext); + fprintf (logFile, "%s\n", newtext2); fflush (logFile); } else - puts (newtext); + puts (newtext2); } if (doPhaser) - W_MessageAllowedWindows (WAM_PHASER, 0, 0, textColor, newtext, warncount, 0); + W_MessageAllowedWindows (WAM_PHASER, 0, 0, textColor, newtext2, warncount, 0); } } From modemhero at users.sourceforge.net Sat Apr 15 06:55:16 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 15 Apr 2006 11:55:16 +0000 Subject: [netrek-cvs] client/netrekxp/src option.c,1.3,1.4 short.c,1.2,1.3 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17864/src Modified Files: option.c short.c Log Message: - fixed a bug in the options menu that incorrectly reported whether the phaser window was mapped or not - phasering plasma now has less of an effect on phaser average damage statistics, it is counted as your average damage hit, rather than the previous way of counting it as a 38 point phaser hit. Index: short.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/short.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- short.c 12 Apr 2006 04:20:04 -0000 1.2 +++ short.c 15 Apr 2006 11:55:14 -0000 1.3 @@ -1290,7 +1290,8 @@ { phaserStatTry++; phaserStatHit++; - phaserStatDamage += damage; + /* Record as an average damage hit so as not to skew overall average */ + phaserStatDamage += phaserStatDamage / phaserStatTry; } if (damage == 37) /* Miss */ phaserStatTry++; Index: option.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- option.c 15 Apr 2006 01:04:34 -0000 1.3 +++ option.c 15 Apr 2006 11:55:13 -0000 1.4 @@ -310,7 +310,7 @@ {1, "show \"your\" message window", 0, &messwi, 0, 0, NULL, NULL}, {1, "show \"kill\" message window", 0, &messwk, 0, 0, NULL, NULL}, {1, "show \"total\" message window", 0, &reviewWin, 0, 0, NULL, NULL}, - {1, "show phaser log window", &phaserWindow, &phaserwin, 0, 0, NULL}, + {1, "show phaser log window", 0, &phaserwin, 0, 0, NULL}, {1, "show statistic window", 0, &statwin, 0, 0, NULL, NULL}, {1, "show help window", 0, &helpWin, 0, 0, NULL, NULL}, {1, "show hints window", &showHints, &hintWin, 0, 0, NULL, NULL}, From modemhero at users.sourceforge.net Sat Apr 15 06:55:15 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 15 Apr 2006 11:55:15 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.5,1.6 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17864/resources/docs Modified Files: changes.txt Log Message: - fixed a bug in the options menu that incorrectly reported whether the phaser window was mapped or not - phasering plasma now has less of an effect on phaser average damage statistics, it is counted as your average damage hit, rather than the previous way of counting it as a 38 point phaser hit. Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- changes.txt 15 Apr 2006 09:58:24 -0000 1.5 +++ changes.txt 15 Apr 2006 11:55:13 -0000 1.6 @@ -1,4 +1,9 @@ Version TBA: +- fixed a bug in the options menu that incorrectly reported whether the phaser window + was mapped or not +- phasering plasma now has less of an effect on phaser average damage statistics, it + is counted as your average damage hit, rather than the previous way of counting it + as a 38 point phaser hit. - fixed bug with phaser messages going blank due to improper buffering (not sure where this bug came from, in the downloadable version off playnetrek this bug does not exist) - removed defunct netrek forum link from metaserver window From modemhero at users.sourceforge.net Sat Apr 15 07:10:59 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 15 Apr 2006 12:10:59 +0000 Subject: [netrek-cvs] server/Vanilla/ntserv daemonII.c,1.6,1.7 Message-ID: Update of /cvsroot/netrek/server/Vanilla/ntserv In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28172/ntserv Modified Files: daemonII.c Log Message: Typo fix in new army capacity code. Index: daemonII.c =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/ntserv/daemonII.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- daemonII.c 14 Apr 2006 10:19:17 -0000 1.6 +++ daemonII.c 15 Apr 2006 12:10:57 -0000 1.7 @@ -2948,7 +2948,7 @@ if (j->p_armies >= (int)((float)((int)(j->p_kills*100)/100.0) * 3.0)) continue; } else if (j->p_ship.s_type != STARBASE) - if (j->p_armies >= (int)((float)(int)(j->p_kills*100)/100.0) * 2.0)) + if (j->p_armies >= (int)((float)((int)(j->p_kills*100)/100.0) * 2.0)) continue; if (j->p_flags & PFORBIT) { if (j->p_team != l->pl_owner) From modemhero at users.sourceforge.net Sat Apr 15 07:10:59 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 15 Apr 2006 12:10:59 +0000 Subject: [netrek-cvs] server/Vanilla ChangeLog,1.21,1.22 Message-ID: Update of /cvsroot/netrek/server/Vanilla In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28172 Modified Files: ChangeLog Log Message: Typo fix in new army capacity code. Index: ChangeLog =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/ChangeLog,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- ChangeLog 14 Apr 2006 10:19:17 -0000 1.21 +++ ChangeLog 15 Apr 2006 12:10:57 -0000 1.22 @@ -1,3 +1,7 @@ +Fri Apr 14 Bill Balcerski * BUGS, PROJECTS: Removal of bugs that no longer exist, and From modemhero at users.sourceforge.net Sun Apr 16 02:58:39 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 16 Apr 2006 07:58:39 +0000 Subject: [netrek-cvs] client/netrekxp build.cmd, 1.4, 1.5 buildexe.cmd, 1.1, 1.2 compile.txt, 1.3, 1.4 Message-ID: Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23938 Modified Files: build.cmd buildexe.cmd compile.txt Log Message: Fixed build and buildexe files to correctly copy the netrek executable under BCC compiler. Updated compile instructions. Using Creative WaveStudio, truncated lots of dead space at the end of sound files. Index: compile.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/compile.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- compile.txt 12 Apr 2006 06:28:43 -0000 1.3 +++ compile.txt 16 Apr 2006 07:58:37 -0000 1.4 @@ -3,16 +3,16 @@ - Edit build.cmd to set following variables: RSAKey = path to your RSA-KEY.secret file -Compiler = VCC or BCC (default VCC) +Compiler = VCC or BCC (default BCC) InstCWD = path to folder to copy files to (default \netrek_files) -- Edit clientr.dsp and change \netrek_files to be same as InstCWD +- Edit clientr.dsp and change \netrek_files to be same as InstCWD (only if using VCC) - Edit src\cursors\curslib.dsp and change \netrek_files to be same as InstCWD + (again only necessary if using VCC) -After compilation there will be two folders under InstCWD - netrek and tmp -netrek contains ready to distribution netrek client tree -tmp contains temporary compiler files and can be removed - -That's pretty all. +After compilation there will be one folder under InstCWD - netrek. +Netrek contains the ready to distribute netrek client tree. Stas Pirogov (keyos at keyos.org) + +Instructions modified by Bill Balcerski Index: buildexe.cmd =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/buildexe.cmd,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- buildexe.cmd 14 Apr 2006 12:10:05 -0000 1.1 +++ buildexe.cmd 16 Apr 2006 07:58:37 -0000 1.2 @@ -51,6 +51,7 @@ :dist +if /I "%Compiler%" == "BCC" copy src\netrek.exe %InstCWD%\netrek if /I "%Compiler%" == "BCC" copy src\cursors\curslib.dll %InstCWD%\netrek\bitmaps goto end Index: build.cmd =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/build.cmd,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- build.cmd 15 Apr 2006 01:04:32 -0000 1.4 +++ build.cmd 16 Apr 2006 07:58:37 -0000 1.5 @@ -309,6 +309,7 @@ mkdir %InstCWD%\netrek\sounds copy resources\sounds\*.wav %InstCWD%\netrek\sounds +if /I "%Compiler%" == "BCC" copy src\netrek.exe %InstCWD%\netrek if /I "%Compiler%" == "BCC" copy src\cursors\curslib.dll %InstCWD%\netrek\bitmaps goto end From modemhero at users.sourceforge.net Sun Apr 16 02:58:39 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 16 Apr 2006 07:58:39 +0000 Subject: [netrek-cvs] client/netrekxp/resources/sounds nt_cloaked.wav, 1.1, 1.2 nt_enter_ship.wav, 1.1, 1.2 nt_fire_plasma.wav, 1.1, 1.2 nt_fire_plasma_other.wav, 1.1, 1.2 nt_fire_torp.wav, 1.1, 1.2 nt_fire_torp_other.wav, 1.1, 1.2 nt_message.wav, 1.1, 1.2 nt_phaser.wav, 1.1, 1.2 nt_phaser_other.wav, 1.1, 1.2 nt_plasma_hit.wav, 1.1, 1.2 nt_uncloak.wav, 1.1, 1.2 nt_warning.wav, 1.1, 1.2 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/sounds In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23938/resources/sounds Modified Files: nt_cloaked.wav nt_enter_ship.wav nt_fire_plasma.wav nt_fire_plasma_other.wav nt_fire_torp.wav nt_fire_torp_other.wav nt_message.wav nt_phaser.wav nt_phaser_other.wav nt_plasma_hit.wav nt_uncloak.wav nt_warning.wav Log Message: Fixed build and buildexe files to correctly copy the netrek executable under BCC compiler. Updated compile instructions. Using Creative WaveStudio, truncated lots of dead space at the end of sound files. Index: nt_plasma_hit.wav =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/sounds/nt_plasma_hit.wav,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsxpGqF0 and /tmp/cvsvhAol4 differ Index: nt_phaser.wav =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/sounds/nt_phaser.wav,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsrnlEwb and /tmp/cvsuWOBJf differ Index: nt_uncloak.wav =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/sounds/nt_uncloak.wav,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsczGGHd and /tmp/cvsbwM10h differ Index: nt_message.wav =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/sounds/nt_message.wav,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvs76Tlng and /tmp/cvsGk4lMk differ Index: nt_phaser_other.wav =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/sounds/nt_phaser_other.wav,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsZ604pi and /tmp/cvs9tKoUm differ Index: nt_warning.wav =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/sounds/nt_warning.wav,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsO9eOYk and /tmp/cvsZbgEzp differ Index: nt_fire_torp.wav =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/sounds/nt_fire_torp.wav,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsn5X1np and /tmp/cvs1l5w4t differ Index: nt_enter_ship.wav =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/sounds/nt_enter_ship.wav,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsiyY4Uf and /tmp/cvsZ1VYHk differ Index: nt_fire_plasma_other.wav =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/sounds/nt_fire_plasma_other.wav,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsMigdwi and /tmp/cvs2jMVon differ Index: nt_fire_torp_other.wav =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/sounds/nt_fire_torp_other.wav,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsvI41Uk and /tmp/cvsNy6jUp differ Index: nt_fire_plasma.wav =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/sounds/nt_fire_plasma.wav,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvs0qA9gu and /tmp/cvsqvuLDz differ Index: nt_cloaked.wav =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/sounds/nt_cloaked.wav,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsnKLJlw and /tmp/cvsFwNNOB differ From modemhero at users.sourceforge.net Sun Apr 16 05:39:40 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 16 Apr 2006 10:39:40 +0000 Subject: [netrek-cvs] client/netrekxp/src cowmain.c, 1.3, 1.4 newwin.c, 1.3, 1.4 playback.c, 1.3, 1.4 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7081/src Modified Files: cowmain.c newwin.c playback.c Log Message: Change to bitmap loading procedure as follows: If any bitmap files in a set are missing, default to the monoscale bitmaps for that set. If the monoscale bitmaps are missing, it's the users fault for deleting his/her bitmap files. This purpose of this code is preventative, as older versions of the client had different bitmap directories names and different bitmap sets. If someone were to use a newer netrek executable without updating the bitmap libraries, this should keep the client working. Index: newwin.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- newwin.c 15 Apr 2006 01:04:34 -0000 1.3 +++ newwin.c 16 Apr 2006 10:39:38 -0000 1.4 @@ -13,7 +13,7 @@ #include #include #include - +#include #include #include @@ -47,6 +47,25 @@ #define STATSIZE (MESSAGESIZE * 2 + BORDER) #define YOFF -25 +/******************************************************************************/ +/*** bitmapExists() +/*** Called by savebitmaps() to verify bitmap files exist. */ +/******************************************************************************/ +int bitmapExists (char * fileName) +{ + struct stat buf; + char * dir; + int i; + + sprintf(dir, "bitmaps/shiplib/"); + strcat(dir, fileName); + i = stat ( dir, &buf ); + + if ( i == 0 ) + return 1; + else + return 0; +} /******************************************************************************/ /*** handleMessageWindowKeyDown() @@ -349,72 +368,223 @@ break; } -/* Load all the bitmaps in. Let the user be able to toggle between - any type if dynamicBitmaps is set. */ +/* + Load all the bitmaps in, so the user can toggle between any type if + dynamicBitmaps is set. + If any bitmap files in a set are missing, default to the monoscale bitmaps + for that set. + If the monoscale bitmaps are missing, it's the users fault for deleting his/her + bitmap files. + This purpose of this code is preventative, as older versions of the client had + different bitmap directories names and different bitmap sets. If someone were + to use a newer netrek executable without updating the bitmap libraries, this + should keep the client working. +*/ - ship_bitmaps[0] = - W_StoreBitmap3 (fed_ship_bmp, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmaps[1] = - W_StoreBitmap3 (ind_ship_bmp, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmaps[2] = - W_StoreBitmap3 (kli_ship_bmp, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmaps[3] = - W_StoreBitmap3 (ori_ship_bmp, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmaps[4] = - W_StoreBitmap3 (rom_ship_bmp, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, - LR_DEFAULTCOLOR); - - ship_bitmaps1[0] = - W_StoreBitmap3 (fed_ship_bmp_1, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmaps1[1] = - W_StoreBitmap3 (ind_ship_bmp_1, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmaps1[2] = - W_StoreBitmap3 (kli_ship_bmp_1, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmaps1[3] = - W_StoreBitmap3 (ori_ship_bmp_1, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmaps1[4] = - W_StoreBitmap3 (rom_ship_bmp_1, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, - LR_DEFAULTCOLOR); - - ship_bitmapsT[0] = - W_StoreBitmap3 (fed_ship_bmp_T, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmapsT[1] = - W_StoreBitmap3 (ind_ship_bmp_T, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmapsT[2] = - W_StoreBitmap3 (kli_ship_bmp_T, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmapsT[3] = - W_StoreBitmap3 (ori_ship_bmp_T, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmapsT[4] = - W_StoreBitmap3 (rom_ship_bmp_T, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, - LR_DEFAULTCOLOR); - + if (bitmapExists("fedship.bmp") + && bitmapExists("indship.bmp") + && bitmapExists("kliship.bmp") + && bitmapExists("oriship.bmp") + && bitmapExists("romship.bmp")) + { + ship_bitmaps[0] = + W_StoreBitmap3 (fed_ship_bmp, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmaps[1] = + W_StoreBitmap3 (ind_ship_bmp, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmaps[2] = + W_StoreBitmap3 (kli_ship_bmp, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmaps[3] = + W_StoreBitmap3 (ori_ship_bmp, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmaps[4] = + W_StoreBitmap3 (rom_ship_bmp, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, + LR_DEFAULTCOLOR); + } + else /* default to mono */ + { + ship_bitmaps[0] = + W_StoreBitmap3 (fed_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, + LR_MONOCHROME); + ship_bitmaps[1] = + W_StoreBitmap3 (ind_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, + LR_MONOCHROME); + ship_bitmaps[2] = + W_StoreBitmap3 (kli_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, + LR_MONOCHROME); + ship_bitmaps[3] = + W_StoreBitmap3 (ori_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, + LR_MONOCHROME); + ship_bitmaps[4] = + W_StoreBitmap3 (rom_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, + LR_MONOCHROME); + } + + if (bitmapExists("fedship1.bmp") + && bitmapExists("indship1.bmp") + && bitmapExists("kliship1.bmp") + && bitmapExists("oriship1.bmp") + && bitmapExists("romship1.bmp")) + { + ship_bitmaps1[0] = + W_StoreBitmap3 (fed_ship_bmp_1, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmaps1[1] = + W_StoreBitmap3 (ind_ship_bmp_1, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmaps1[2] = + W_StoreBitmap3 (kli_ship_bmp_1, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmaps1[3] = + W_StoreBitmap3 (ori_ship_bmp_1, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmaps1[4] = + W_StoreBitmap3 (rom_ship_bmp_1, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, + LR_DEFAULTCOLOR); + } + else /* default to mono */ + { + ship_bitmaps1[0] = + W_StoreBitmap3 (fed_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, + LR_MONOCHROME); + ship_bitmaps1[1] = + W_StoreBitmap3 (ind_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, + LR_MONOCHROME); + ship_bitmaps1[2] = + W_StoreBitmap3 (kli_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, + LR_MONOCHROME); + ship_bitmaps1[3] = + W_StoreBitmap3 (ori_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, + LR_MONOCHROME); + ship_bitmaps1[4] = + W_StoreBitmap3 (rom_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, + LR_MONOCHROME); + } + + if (bitmapExists("fedshipT.bmp") + && bitmapExists("indshipT.bmp") + && bitmapExists("klishipT.bmp") + && bitmapExists("orishipT.bmp") + && bitmapExists("romshipT.bmp")) + { + ship_bitmapsT[0] = + W_StoreBitmap3 (fed_ship_bmp_T, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmapsT[1] = + W_StoreBitmap3 (ind_ship_bmp_T, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmapsT[2] = + W_StoreBitmap3 (kli_ship_bmp_T, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmapsT[3] = + W_StoreBitmap3 (ori_ship_bmp_T, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmapsT[4] = + W_StoreBitmap3 (rom_ship_bmp_T, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, + LR_DEFAULTCOLOR); + } + else /* default to mono */ + { + ship_bitmapsT[0] = + W_StoreBitmap3 (fed_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, + LR_MONOCHROME); + ship_bitmapsT[1] = + W_StoreBitmap3 (ind_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, + LR_MONOCHROME); + ship_bitmapsT[2] = + W_StoreBitmap3 (kli_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, + LR_MONOCHROME); + ship_bitmapsT[3] = + W_StoreBitmap3 (ori_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, + LR_MONOCHROME); + ship_bitmapsT[4] = + W_StoreBitmap3 (rom_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, + LR_MONOCHROME); + } + + if (bitmapExists("fedshipG.bmp") + && bitmapExists("indshipG.bmp") + && bitmapExists("klishipG.bmp") + && bitmapExists("orishipG.bmp") + && bitmapExists("romshipG.bmp")) + { + ship_bitmapsG[0] = + W_StoreBitmap3 (fed_ship_bmp_G, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmapsG[1] = + W_StoreBitmap3 (ind_ship_bmp_G, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmapsG[2] = + W_StoreBitmap3 (kli_ship_bmp_G, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmapsG[3] = + W_StoreBitmap3 (ori_ship_bmp_G, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmapsG[4] = + W_StoreBitmap3 (rom_ship_bmp_G, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, + LR_DEFAULTCOLOR); + } + else /* default to mono */ + { + ship_bitmapsG[0] = + W_StoreBitmap3 (fed_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, + LR_MONOCHROME); + ship_bitmapsG[1] = + W_StoreBitmap3 (ind_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, + LR_MONOCHROME); + ship_bitmapsG[2] = + W_StoreBitmap3 (kli_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, + LR_MONOCHROME); + ship_bitmapsG[3] = + W_StoreBitmap3 (ori_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, + LR_MONOCHROME); + ship_bitmapsG[4] = + W_StoreBitmap3 (rom_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, + LR_MONOCHROME); + } + ship_bitmapsM[0] = W_StoreBitmap3 (fed_ship_bmp_M, BMP_SHIP_WIDTH * 8, BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, @@ -435,27 +605,6 @@ W_StoreBitmap3 (rom_ship_bmp_M, BMP_SHIP_WIDTH * 8, BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, LR_MONOCHROME); - - ship_bitmapsG[0] = - W_StoreBitmap3 (fed_ship_bmp_G, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmapsG[1] = - W_StoreBitmap3 (ind_ship_bmp_G, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmapsG[2] = - W_StoreBitmap3 (kli_ship_bmp_G, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmapsG[3] = - W_StoreBitmap3 (ori_ship_bmp_G, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmapsG[4] = - W_StoreBitmap3 (rom_ship_bmp_G, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, - LR_DEFAULTCOLOR); for (j = 0; j < NUM_TYPES; j++) { Index: cowmain.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/cowmain.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- cowmain.c 15 Apr 2006 01:04:34 -0000 1.3 +++ cowmain.c 16 Apr 2006 10:39:38 -0000 1.4 @@ -44,7 +44,6 @@ extern int log_packets; #endif - #ifdef GATEWAY /*-----------------------------------------------------------*/ @@ -658,10 +657,10 @@ fed_ship_bmp = "bitmaps/shiplib/fedship.bmp"; if ((stringDefault ("fedshipbmpfile")) != NULL) fed_ship_bmp = stringDefault ("fedshipbmpfile"); - + fed_ship_bmp_1 = "bitmaps/shiplib/fedship1.bmp"; - if ((stringDefault ("fedshipbmp1file")) != NULL) - fed_ship_bmp_1 = stringDefault ("fedshipbmp1file"); + if ((stringDefault ("fedship1bmpfile")) != NULL) + fed_ship_bmp_1 = stringDefault ("fedship1bmpfile"); fed_ship_bmp_G = "bitmaps/shiplib/fedshipG.bmp"; if ((stringDefault ("fedshipGbmpfile")) != NULL) @@ -680,8 +679,8 @@ rom_ship_bmp = stringDefault ("romshipbmpfile"); rom_ship_bmp_1 = "bitmaps/shiplib/romship1.bmp"; - if ((stringDefault ("romshipbmp1file")) != NULL) - rom_ship_bmp_1 = stringDefault ("romshipbmp1file"); + if ((stringDefault ("romship1bmpfile")) != NULL) + rom_ship_bmp_1 = stringDefault ("romship1bmpfile"); rom_ship_bmp_G = "bitmaps/shiplib/romshipG.bmp"; if ((stringDefault ("romshipGbmpfile")) != NULL) @@ -700,8 +699,8 @@ kli_ship_bmp = stringDefault ("klishipbmpfile"); kli_ship_bmp_1 = "bitmaps/shiplib/kliship1.bmp"; - if ((stringDefault ("klishipbmp1file")) != NULL) - kli_ship_bmp_1 = stringDefault ("klishipbmp1file"); + if ((stringDefault ("kliship1bmpfile")) != NULL) + kli_ship_bmp_1 = stringDefault ("kliship1bmpfile"); kli_ship_bmp_G = "bitmaps/shiplib/klishipG.bmp"; if ((stringDefault ("klishipGbmpfile")) != NULL) @@ -720,8 +719,8 @@ ori_ship_bmp = stringDefault ("orishipbmpfile"); ori_ship_bmp_1 = "bitmaps/shiplib/oriship1.bmp"; - if ((stringDefault ("orishipbmp1file")) != NULL) - ori_ship_bmp_1 = stringDefault ("orishipbmp1file"); + if ((stringDefault ("oriship1bmpfile")) != NULL) + ori_ship_bmp_1 = stringDefault ("oriship1bmpfile"); ori_ship_bmp_G = "bitmaps/shiplib/orishipG.bmp"; if ((stringDefault ("orishipGbmpfile")) != NULL) @@ -740,8 +739,8 @@ ind_ship_bmp = stringDefault ("indshipbmpfile"); ind_ship_bmp_1 = "bitmaps/shiplib/indship1.bmp"; - if ((stringDefault ("indshipbmp1file")) != NULL) - ind_ship_bmp_1 = stringDefault ("indshipbmp1file"); + if ((stringDefault ("indship1bmpfile")) != NULL) + ind_ship_bmp_1 = stringDefault ("indship1bmpfile"); ind_ship_bmp_G = "bitmaps/shiplib/indshipG.bmp"; if ((stringDefault ("indshipGbmpfile")) != NULL) Index: playback.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/playback.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- playback.c 15 Apr 2006 01:04:34 -0000 1.3 +++ playback.c 16 Apr 2006 10:39:38 -0000 1.4 @@ -80,8 +80,8 @@ fed_ship_bmp = stringDefault ("fedshipbmpfile"); fed_ship_bmp_1 = "bitmaps/shiplib/fedship1.bmp"; - if ((stringDefault ("fedshipbmp1file")) != NULL) - fed_ship_bmp_1 = stringDefault ("fedshipbmp1file"); + if ((stringDefault ("fedship1bmpfile")) != NULL) + fed_ship_bmp_1 = stringDefault ("fedship1bmpfile"); fed_ship_bmp_G = "bitmaps/shiplib/fedshipG.bmp"; if ((stringDefault ("fedshipGbmpfile")) != NULL) @@ -100,8 +100,8 @@ rom_ship_bmp = stringDefault ("romshipbmpfile"); rom_ship_bmp_1 = "bitmaps/shiplib/romship1.bmp"; - if ((stringDefault ("romshipbmp1file")) != NULL) - rom_ship_bmp_1 = stringDefault ("romshipbmp1file"); + if ((stringDefault ("romship1bmpfile")) != NULL) + rom_ship_bmp_1 = stringDefault ("romship1bmpfile"); rom_ship_bmp_G = "bitmaps/shiplib/romshipG.bmp"; if ((stringDefault ("romshipGbmpfile")) != NULL) @@ -120,8 +120,8 @@ kli_ship_bmp = stringDefault ("klishipbmpfile"); kli_ship_bmp_1 = "bitmaps/shiplib/kliship1.bmp"; - if ((stringDefault ("klishipbmp1file")) != NULL) - kli_ship_bmp_1 = stringDefault ("klishipbmp1file"); + if ((stringDefault ("kliship1bmpfile")) != NULL) + kli_ship_bmp_1 = stringDefault ("kliship1bmpfile"); kli_ship_bmp_G = "bitmaps/shiplib/klishipG.bmp"; if ((stringDefault ("klishipGbmpfile")) != NULL) @@ -140,8 +140,8 @@ ori_ship_bmp = stringDefault ("orishipbmpfile"); ori_ship_bmp_1 = "bitmaps/shiplib/oriship1.bmp"; - if ((stringDefault ("orishipbmp1file")) != NULL) - ori_ship_bmp_1 = stringDefault ("orishipbmp1file"); + if ((stringDefault ("oriship1bmpfile")) != NULL) + ori_ship_bmp_1 = stringDefault ("oriship1bmpfile"); ori_ship_bmp_G = "bitmaps/shiplib/orishipG.bmp"; if ((stringDefault ("orishipGbmpfile")) != NULL) @@ -160,8 +160,8 @@ ind_ship_bmp = stringDefault ("indshipbmpfile"); ind_ship_bmp_1 = "bitmaps/shiplib/indship1.bmp"; - if ((stringDefault ("indshipbmp1file")) != NULL) - ind_ship_bmp_1 = stringDefault ("indshipbmp1file"); + if ((stringDefault ("indship1bmpfile")) != NULL) + ind_ship_bmp_1 = stringDefault ("indship1bmpfile"); ind_ship_bmp_G = "bitmaps/shiplib/indshipG.bmp"; if ((stringDefault ("indshipGbmpfile")) != NULL) From modemhero at users.sourceforge.net Sun Apr 16 05:39:40 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 16 Apr 2006 10:39:40 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.6,1.7 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7081/resources/docs Modified Files: changes.txt Log Message: Change to bitmap loading procedure as follows: If any bitmap files in a set are missing, default to the monoscale bitmaps for that set. If the monoscale bitmaps are missing, it's the users fault for deleting his/her bitmap files. This purpose of this code is preventative, as older versions of the client had different bitmap directories names and different bitmap sets. If someone were to use a newer netrek executable without updating the bitmap libraries, this should keep the client working. Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- changes.txt 15 Apr 2006 11:55:13 -0000 1.6 +++ changes.txt 16 Apr 2006 10:39:38 -0000 1.7 @@ -1,4 +1,8 @@ Version TBA: +- added preventative measures against loading bitmap files that might not exist - if + bitmaps are missing, it defaults to the mono bitmaps +- cleaned up a lot of dead space sound at the end of sound files, most noticeably, the + phaser sound - fixed a bug in the options menu that incorrectly reported whether the phaser window was mapped or not - phasering plasma now has less of an effect on phaser average damage statistics, it From modemhero at users.sourceforge.net Sun Apr 16 09:18:21 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 16 Apr 2006 14:18:21 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.7,1.8 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2053/resources/docs Modified Files: changes.txt Log Message: Changed it so that if dynamicBitmap is set to off, only the necessary bitmap files will load into memory. This required modifying the load order of the main client function, so that the reset_defaults is called before newwin. Reset_defaults loads the .netrekrc values, which is necessary for reading in what bitmaps the user wants to load. Newwin, among other things, saves the bitmaps into memory. To the best I can tell, changing the order has no unintended side effects. Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- changes.txt 16 Apr 2006 10:39:38 -0000 1.7 +++ changes.txt 16 Apr 2006 14:18:19 -0000 1.8 @@ -1,6 +1,8 @@ Version TBA: - added preventative measures against loading bitmap files that might not exist - if bitmaps are missing, it defaults to the mono bitmaps +- if dynamicBitmap is set to off, only the necessary bitmap files will load into + memory - cleaned up a lot of dead space sound at the end of sound files, most noticeably, the phaser sound - fixed a bug in the options menu that incorrectly reported whether the phaser window @@ -11,8 +13,6 @@ - fixed bug with phaser messages going blank due to improper buffering (not sure where this bug came from, in the downloadable version off playnetrek this bug does not exist) - removed defunct netrek forum link from metaserver window -- all ship bitmap libraries now load into memory. Can be modified at a later date - if this proves to be a bad idea. - added "dynamicBitmap: (on)/off". Enables dynamic bitmap switching from the options menu - renumbered the ship bitmap sets for the colorClient option. Choices are 0=mono, 1=new color graphics, 2=single color graphics, and 3=shaded single color graphics. From modemhero at users.sourceforge.net Sun Apr 16 09:18:21 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 16 Apr 2006 14:18:21 +0000 Subject: [netrek-cvs] client/netrekxp/include proto.h,1.2,1.3 Message-ID: Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2053/include Modified Files: proto.h Log Message: Changed it so that if dynamicBitmap is set to off, only the necessary bitmap files will load into memory. This required modifying the load order of the main client function, so that the reset_defaults is called before newwin. Reset_defaults loads the .netrekrc values, which is necessary for reading in what bitmaps the user wants to load. Newwin, among other things, saves the bitmaps into memory. To the best I can tell, changing the order has no unintended side effects. Index: proto.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- proto.h 12 Apr 2006 04:20:03 -0000 1.2 +++ proto.h 16 Apr 2006 14:18:19 -0000 1.3 @@ -719,6 +719,11 @@ /******************************************************************************/ //static void handleMessageWindowKeyDown(W_Event * event); //static void handleMessageWindowButton(W_Event * event); +void loadbitmaps (void); +void loadbitmaps1 (void); +void loadbitmapsT (void); +void loadbitmapsM (void); +void loadbitmapsG (void); newwin (char *hostmon, char *progname); mapAll (void); From modemhero at users.sourceforge.net Sun Apr 16 09:18:21 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 16 Apr 2006 14:18:21 +0000 Subject: [netrek-cvs] client/netrekxp/src cowmain.c, 1.4, 1.5 newwin.c, 1.4, 1.5 playback.c, 1.4, 1.5 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2053/src Modified Files: cowmain.c newwin.c playback.c Log Message: Changed it so that if dynamicBitmap is set to off, only the necessary bitmap files will load into memory. This required modifying the load order of the main client function, so that the reset_defaults is called before newwin. Reset_defaults loads the .netrekrc values, which is necessary for reading in what bitmaps the user wants to load. Newwin, among other things, saves the bitmaps into memory. To the best I can tell, changing the order has no unintended side effects. Index: newwin.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- newwin.c 16 Apr 2006 10:39:38 -0000 1.4 +++ newwin.c 16 Apr 2006 14:18:19 -0000 1.5 @@ -49,18 +49,18 @@ /******************************************************************************/ /*** bitmapExists() -/*** Called by savebitmaps() to verify bitmap files exist. */ +/*** Called by loadbitmaps() to verify bitmap files exist. */ /******************************************************************************/ int bitmapExists (char * fileName) { struct stat buf; - char * dir; + char dir[30]; int i; sprintf(dir, "bitmaps/shiplib/"); strcat(dir, fileName); i = stat ( dir, &buf ); - + if ( i == 0 ) return 1; else @@ -68,6 +68,377 @@ } /******************************************************************************/ +/*** loadbitmaps(), loadbitmaps1(), loadbitmapsT(), loadbitmapsG(), + loadbitmapsM() +/*** Called by savebitmaps(). */ +/*** + If any bitmap files in a set are missing, default to the monoscale bitmaps + for that set. + If the monoscale bitmaps are missing, it's the users fault for deleting his/her + bitmap files. + This purpose of this code is preventative, as older versions of the client had + different bitmap directories names and different bitmap sets. If someone were + to use a newer netrek executable without updating the bitmap libraries, this + should keep the client working. +***/ +/******************************************************************************/ +void loadbitmaps() +{ + int j,k; + + if (bitmapExists("fedship.bmp") + && bitmapExists("indship.bmp") + && bitmapExists("kliship.bmp") + && bitmapExists("oriship.bmp") + && bitmapExists("romship.bmp")) + { + ship_bitmaps[0] = + W_StoreBitmap3 (fed_ship_bmp, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmaps[1] = + W_StoreBitmap3 (ind_ship_bmp, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmaps[2] = + W_StoreBitmap3 (kli_ship_bmp, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmaps[3] = + W_StoreBitmap3 (ori_ship_bmp, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmaps[4] = + W_StoreBitmap3 (rom_ship_bmp, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, + LR_DEFAULTCOLOR); + } + else /* default to mono */ + { + ship_bitmaps[0] = + W_StoreBitmap3 (fed_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, + LR_MONOCHROME); + ship_bitmaps[1] = + W_StoreBitmap3 (ind_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, + LR_MONOCHROME); + ship_bitmaps[2] = + W_StoreBitmap3 (kli_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, + LR_MONOCHROME); + ship_bitmaps[3] = + W_StoreBitmap3 (ori_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, + LR_MONOCHROME); + ship_bitmaps[4] = + W_StoreBitmap3 (rom_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, + LR_MONOCHROME); + } + + for (j = 0; j < NUM_TYPES; j++) + { + for (k = 0; k < SHIP_VIEWS; k++) + { + fed_bitmaps[j][k] = + W_PointBitmap2 (ship_bitmaps[0], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + ind_bitmaps[j][k] = + W_PointBitmap2 (ship_bitmaps[1], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + kli_bitmaps[j][k] = + W_PointBitmap2 (ship_bitmaps[2], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + ori_bitmaps[j][k] = + W_PointBitmap2 (ship_bitmaps[3], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + rom_bitmaps[j][k] = + W_PointBitmap2 (ship_bitmaps[4], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + } + } +} + +void loadbitmaps1() +{ + int j,k; + + if (bitmapExists("fedship1.bmp") + && bitmapExists("indship1.bmp") + && bitmapExists("kliship1.bmp") + && bitmapExists("oriship1.bmp") + && bitmapExists("romship1.bmp")) + { + ship_bitmaps1[0] = + W_StoreBitmap3 (fed_ship_bmp_1, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmaps1[1] = + W_StoreBitmap3 (ind_ship_bmp_1, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmaps1[2] = + W_StoreBitmap3 (kli_ship_bmp_1, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmaps1[3] = + W_StoreBitmap3 (ori_ship_bmp_1, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmaps1[4] = + W_StoreBitmap3 (rom_ship_bmp_1, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, + LR_DEFAULTCOLOR); + } + else /* default to mono */ + { + ship_bitmaps1[0] = + W_StoreBitmap3 (fed_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, + LR_MONOCHROME); + ship_bitmaps1[1] = + W_StoreBitmap3 (ind_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, + LR_MONOCHROME); + ship_bitmaps1[2] = + W_StoreBitmap3 (kli_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, + LR_MONOCHROME); + ship_bitmaps1[3] = + W_StoreBitmap3 (ori_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, + LR_MONOCHROME); + ship_bitmaps1[4] = + W_StoreBitmap3 (rom_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, + LR_MONOCHROME); + } + for (j = 0; j < NUM_TYPES; j++) + { + for (k = 0; k < SHIP_VIEWS; k++) + { + fed_bitmaps1[j][k] = + W_PointBitmap2 (ship_bitmaps1[0], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + ind_bitmaps1[j][k] = + W_PointBitmap2 (ship_bitmaps1[1], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + kli_bitmaps1[j][k] = + W_PointBitmap2 (ship_bitmaps1[2], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + ori_bitmaps1[j][k] = + W_PointBitmap2 (ship_bitmaps1[3], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + rom_bitmaps1[j][k] = + W_PointBitmap2 (ship_bitmaps1[4], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + } + } +} + +void loadbitmapsT() +{ + int j,k; + + if (bitmapExists("fedshipT.bmp") + && bitmapExists("indshipT.bmp") + && bitmapExists("klishipT.bmp") + && bitmapExists("orishipT.bmp") + && bitmapExists("romshipT.bmp")) + { + ship_bitmapsT[0] = + W_StoreBitmap3 (fed_ship_bmp_T, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmapsT[1] = + W_StoreBitmap3 (ind_ship_bmp_T, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmapsT[2] = + W_StoreBitmap3 (kli_ship_bmp_T, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmapsT[3] = + W_StoreBitmap3 (ori_ship_bmp_T, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmapsT[4] = + W_StoreBitmap3 (rom_ship_bmp_T, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, + LR_DEFAULTCOLOR); + } + else /* default to mono */ + { + ship_bitmapsT[0] = + W_StoreBitmap3 (fed_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, + LR_MONOCHROME); + ship_bitmapsT[1] = + W_StoreBitmap3 (ind_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, + LR_MONOCHROME); + ship_bitmapsT[2] = + W_StoreBitmap3 (kli_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, + LR_MONOCHROME); + ship_bitmapsT[3] = + W_StoreBitmap3 (ori_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, + LR_MONOCHROME); + ship_bitmapsT[4] = + W_StoreBitmap3 (rom_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, + LR_MONOCHROME); + } + for (j = 0; j < NUM_TYPES; j++) + { + for (k = 0; k < SHIP_VIEWS; k++) + { + fed_bitmapsT[j][k] = + W_PointBitmap2 (ship_bitmapsT[0], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + ind_bitmapsT[j][k] = + W_PointBitmap2 (ship_bitmapsT[1], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + kli_bitmapsT[j][k] = + W_PointBitmap2 (ship_bitmapsT[2], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + ori_bitmapsT[j][k] = + W_PointBitmap2 (ship_bitmapsT[3], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + rom_bitmapsT[j][k] = + W_PointBitmap2 (ship_bitmapsT[4], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + } + } +} + +void loadbitmapsG() +{ + int j,k; + + if (bitmapExists("fedshipG.bmp") + && bitmapExists("indshipG.bmp") + && bitmapExists("klishipG.bmp") + && bitmapExists("orishipG.bmp") + && bitmapExists("romshipG.bmp")) + { + ship_bitmapsG[0] = + W_StoreBitmap3 (fed_ship_bmp_G, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmapsG[1] = + W_StoreBitmap3 (ind_ship_bmp_G, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmapsG[2] = + W_StoreBitmap3 (kli_ship_bmp_G, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmapsG[3] = + W_StoreBitmap3 (ori_ship_bmp_G, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, + LR_DEFAULTCOLOR); + ship_bitmapsG[4] = + W_StoreBitmap3 (rom_ship_bmp_G, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, + LR_DEFAULTCOLOR); + } + else /* default to mono */ + { + ship_bitmapsG[0] = + W_StoreBitmap3 (fed_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, + LR_MONOCHROME); + ship_bitmapsG[1] = + W_StoreBitmap3 (ind_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, + LR_MONOCHROME); + ship_bitmapsG[2] = + W_StoreBitmap3 (kli_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, + LR_MONOCHROME); + ship_bitmapsG[3] = + W_StoreBitmap3 (ori_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, + LR_MONOCHROME); + ship_bitmapsG[4] = + W_StoreBitmap3 (rom_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, + LR_MONOCHROME); + } + for (j = 0; j < NUM_TYPES; j++) + { + for (k = 0; k < SHIP_VIEWS; k++) + { + fed_bitmapsG[j][k] = + W_PointBitmap2 (ship_bitmapsG[0], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + ind_bitmapsG[j][k] = + W_PointBitmap2 (ship_bitmapsG[1], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + kli_bitmapsG[j][k] = + W_PointBitmap2 (ship_bitmapsG[2], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + ori_bitmapsG[j][k] = + W_PointBitmap2 (ship_bitmapsG[3], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + rom_bitmapsG[j][k] = + W_PointBitmap2 (ship_bitmapsG[4], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + } + } +} + +void loadbitmapsM() +{ + int j,k; + + ship_bitmapsM[0] = + W_StoreBitmap3 (fed_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, + LR_MONOCHROME); + ship_bitmapsM[1] = + W_StoreBitmap3 (ind_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, + LR_MONOCHROME); + ship_bitmapsM[2] = + W_StoreBitmap3 (kli_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, + LR_MONOCHROME); + ship_bitmapsM[3] = + W_StoreBitmap3 (ori_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, + LR_MONOCHROME); + ship_bitmapsM[4] = + W_StoreBitmap3 (rom_ship_bmp_M, BMP_SHIP_WIDTH * 8, + BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, + LR_MONOCHROME); + + for (j = 0; j < NUM_TYPES; j++) + { + for (k = 0; k < SHIP_VIEWS; k++) + { + fed_bitmapsM[j][k] = + W_PointBitmap2 (ship_bitmapsM[0], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + ind_bitmapsM[j][k] = + W_PointBitmap2 (ship_bitmapsM[1], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + kli_bitmapsM[j][k] = + W_PointBitmap2 (ship_bitmapsM[2], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + ori_bitmapsM[j][k] = + W_PointBitmap2 (ship_bitmapsM[3], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + rom_bitmapsM[j][k] = + W_PointBitmap2 (ship_bitmapsM[4], j, k, BMP_SHIP_WIDTH, + BMP_SHIP_HEIGHT); + } + } +} +/******************************************************************************/ /*** handleMessageWindowKeyDown() /******************************************************************************/ static void @@ -367,328 +738,34 @@ MPlanlib = "bitmaps/planlibm/mplan.bmp"; break; } - -/* - Load all the bitmaps in, so the user can toggle between any type if - dynamicBitmaps is set. - If any bitmap files in a set are missing, default to the monoscale bitmaps - for that set. - If the monoscale bitmaps are missing, it's the users fault for deleting his/her - bitmap files. - This purpose of this code is preventative, as older versions of the client had - different bitmap directories names and different bitmap sets. If someone were - to use a newer netrek executable without updating the bitmap libraries, this - should keep the client working. -*/ - - if (bitmapExists("fedship.bmp") - && bitmapExists("indship.bmp") - && bitmapExists("kliship.bmp") - && bitmapExists("oriship.bmp") - && bitmapExists("romship.bmp")) - { - ship_bitmaps[0] = - W_StoreBitmap3 (fed_ship_bmp, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmaps[1] = - W_StoreBitmap3 (ind_ship_bmp, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmaps[2] = - W_StoreBitmap3 (kli_ship_bmp, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmaps[3] = - W_StoreBitmap3 (ori_ship_bmp, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmaps[4] = - W_StoreBitmap3 (rom_ship_bmp, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, - LR_DEFAULTCOLOR); - } - else /* default to mono */ - { - ship_bitmaps[0] = - W_StoreBitmap3 (fed_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, - LR_MONOCHROME); - ship_bitmaps[1] = - W_StoreBitmap3 (ind_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, - LR_MONOCHROME); - ship_bitmaps[2] = - W_StoreBitmap3 (kli_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, - LR_MONOCHROME); - ship_bitmaps[3] = - W_StoreBitmap3 (ori_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, - LR_MONOCHROME); - ship_bitmaps[4] = - W_StoreBitmap3 (rom_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, - LR_MONOCHROME); - } - - if (bitmapExists("fedship1.bmp") - && bitmapExists("indship1.bmp") - && bitmapExists("kliship1.bmp") - && bitmapExists("oriship1.bmp") - && bitmapExists("romship1.bmp")) - { - ship_bitmaps1[0] = - W_StoreBitmap3 (fed_ship_bmp_1, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmaps1[1] = - W_StoreBitmap3 (ind_ship_bmp_1, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmaps1[2] = - W_StoreBitmap3 (kli_ship_bmp_1, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmaps1[3] = - W_StoreBitmap3 (ori_ship_bmp_1, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmaps1[4] = - W_StoreBitmap3 (rom_ship_bmp_1, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, - LR_DEFAULTCOLOR); - } - else /* default to mono */ - { - ship_bitmaps1[0] = - W_StoreBitmap3 (fed_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, - LR_MONOCHROME); - ship_bitmaps1[1] = - W_StoreBitmap3 (ind_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, - LR_MONOCHROME); - ship_bitmaps1[2] = - W_StoreBitmap3 (kli_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, - LR_MONOCHROME); - ship_bitmaps1[3] = - W_StoreBitmap3 (ori_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, - LR_MONOCHROME); - ship_bitmaps1[4] = - W_StoreBitmap3 (rom_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, - LR_MONOCHROME); - } - if (bitmapExists("fedshipT.bmp") - && bitmapExists("indshipT.bmp") - && bitmapExists("klishipT.bmp") - && bitmapExists("orishipT.bmp") - && bitmapExists("romshipT.bmp")) - { - ship_bitmapsT[0] = - W_StoreBitmap3 (fed_ship_bmp_T, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmapsT[1] = - W_StoreBitmap3 (ind_ship_bmp_T, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmapsT[2] = - W_StoreBitmap3 (kli_ship_bmp_T, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmapsT[3] = - W_StoreBitmap3 (ori_ship_bmp_T, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmapsT[4] = - W_StoreBitmap3 (rom_ship_bmp_T, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, - LR_DEFAULTCOLOR); - } - else /* default to mono */ - { - ship_bitmapsT[0] = - W_StoreBitmap3 (fed_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, - LR_MONOCHROME); - ship_bitmapsT[1] = - W_StoreBitmap3 (ind_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, - LR_MONOCHROME); - ship_bitmapsT[2] = - W_StoreBitmap3 (kli_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, - LR_MONOCHROME); - ship_bitmapsT[3] = - W_StoreBitmap3 (ori_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, - LR_MONOCHROME); - ship_bitmapsT[4] = - W_StoreBitmap3 (rom_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, - LR_MONOCHROME); - } - - if (bitmapExists("fedshipG.bmp") - && bitmapExists("indshipG.bmp") - && bitmapExists("klishipG.bmp") - && bitmapExists("orishipG.bmp") - && bitmapExists("romshipG.bmp")) - { - ship_bitmapsG[0] = - W_StoreBitmap3 (fed_ship_bmp_G, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmapsG[1] = - W_StoreBitmap3 (ind_ship_bmp_G, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmapsG[2] = - W_StoreBitmap3 (kli_ship_bmp_G, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmapsG[3] = - W_StoreBitmap3 (ori_ship_bmp_G, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, - LR_DEFAULTCOLOR); - ship_bitmapsG[4] = - W_StoreBitmap3 (rom_ship_bmp_G, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, - LR_DEFAULTCOLOR); - } - else /* default to mono */ + if (!dynamicBitmaps) /* Only load needed bitmaps */ { - ship_bitmapsG[0] = - W_StoreBitmap3 (fed_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, - LR_MONOCHROME); - ship_bitmapsG[1] = - W_StoreBitmap3 (ind_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, - LR_MONOCHROME); - ship_bitmapsG[2] = - W_StoreBitmap3 (kli_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, - LR_MONOCHROME); - ship_bitmapsG[3] = - W_StoreBitmap3 (ori_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, - LR_MONOCHROME); - ship_bitmapsG[4] = - W_StoreBitmap3 (rom_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, - LR_MONOCHROME); + switch (colorClient) + { + case 1: /* New color bitmaps */ + loadbitmaps1(); + break; + case 2: /* Old color bitmaps + greyscale for player's ship */ + loadbitmaps(); + loadbitmapsG(); + break; + case 3: /* Shaded color bitmaps + greyscale for player's ship */ + loadbitmapsT(); + loadbitmapsG(); + break; + default: /* mono */ + loadbitmapsM(); + break; + } } - - ship_bitmapsM[0] = - W_StoreBitmap3 (fed_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w, - LR_MONOCHROME); - ship_bitmapsM[1] = - W_StoreBitmap3 (ind_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w, - LR_MONOCHROME); - ship_bitmapsM[2] = - W_StoreBitmap3 (kli_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w, - LR_MONOCHROME); - ship_bitmapsM[3] = - W_StoreBitmap3 (ori_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w, - LR_MONOCHROME); - ship_bitmapsM[4] = - W_StoreBitmap3 (rom_ship_bmp_M, BMP_SHIP_WIDTH * 8, - BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w, - LR_MONOCHROME); - - for (j = 0; j < NUM_TYPES; j++) + else /* Load all bitmaps */ { - for (k = 0; k < SHIP_VIEWS; k++) - { - fed_bitmapsT[j][k] = - W_PointBitmap2 (ship_bitmapsT[0], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - fed_bitmapsM[j][k] = - W_PointBitmap2 (ship_bitmapsM[0], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - fed_bitmapsG[j][k] = - W_PointBitmap2 (ship_bitmapsG[0], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - fed_bitmaps1[j][k] = - W_PointBitmap2 (ship_bitmaps1[0], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - fed_bitmaps[j][k] = - W_PointBitmap2 (ship_bitmaps[0], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - ind_bitmapsT[j][k] = - W_PointBitmap2 (ship_bitmapsT[1], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - ind_bitmapsM[j][k] = - W_PointBitmap2 (ship_bitmapsM[1], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - ind_bitmapsG[j][k] = - W_PointBitmap2 (ship_bitmapsG[1], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - ind_bitmaps1[j][k] = - W_PointBitmap2 (ship_bitmaps1[1], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - ind_bitmaps[j][k] = - W_PointBitmap2 (ship_bitmaps[1], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - ind_bitmapsT[j][k] = - W_PointBitmap2 (ship_bitmapsT[1], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - kli_bitmapsT[j][k] = - W_PointBitmap2 (ship_bitmapsT[2], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - kli_bitmapsM[j][k] = - W_PointBitmap2 (ship_bitmapsM[2], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - kli_bitmapsG[j][k] = - W_PointBitmap2 (ship_bitmapsG[2], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - kli_bitmaps1[j][k] = - W_PointBitmap2 (ship_bitmaps1[2], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - kli_bitmaps[j][k] = - W_PointBitmap2 (ship_bitmaps[2], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - ori_bitmapsT[j][k] = - W_PointBitmap2 (ship_bitmapsT[3], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - ori_bitmapsM[j][k] = - W_PointBitmap2 (ship_bitmapsM[3], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - ori_bitmapsG[j][k] = - W_PointBitmap2 (ship_bitmapsG[3], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - ori_bitmaps1[j][k] = - W_PointBitmap2 (ship_bitmaps1[3], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - ori_bitmaps[j][k] = - W_PointBitmap2 (ship_bitmaps[3], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - rom_bitmapsT[j][k] = - W_PointBitmap2 (ship_bitmapsT[4], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - rom_bitmapsM[j][k] = - W_PointBitmap2 (ship_bitmapsM[4], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - rom_bitmapsG[j][k] = - W_PointBitmap2 (ship_bitmapsG[4], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - rom_bitmaps1[j][k] = - W_PointBitmap2 (ship_bitmaps1[4], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - rom_bitmaps[j][k] = - W_PointBitmap2 (ship_bitmaps[4], j, k, BMP_SHIP_WIDTH, - BMP_SHIP_HEIGHT); - } + loadbitmaps(); + loadbitmaps1(); + loadbitmapsG(); + loadbitmapsT(); + loadbitmapsM(); } /* Experimental weapons */ Index: cowmain.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/cowmain.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- cowmain.c 16 Apr 2006 10:39:38 -0000 1.4 +++ cowmain.c 16 Apr 2006 14:18:19 -0000 1.5 @@ -754,6 +754,8 @@ if ((stringDefault ("indshipMbmpfile")) != NULL) ind_ship_bmp_M = stringDefault ("indshipMbmpfile"); + + resetdefaults (); newwin (display_host, name); #ifdef META @@ -775,8 +777,6 @@ /* Set observer flag as soon as we know port number */ setObserverMode (xtrekPort); - resetdefaults (); - /* open memory...? */ openmem (); Index: playback.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/playback.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- playback.c 16 Apr 2006 10:39:38 -0000 1.4 +++ playback.c 16 Apr 2006 14:18:19 -0000 1.5 @@ -175,9 +175,8 @@ if ((stringDefault ("indshipMbmpfile")) != NULL) ind_ship_bmp_M = stringDefault ("indshipMbmpfile"); - newwin (display_host, name); - resetdefaults (); + newwin (display_host, name); /* open memory...? */ openmem (); From modemhero at users.sourceforge.net Mon Apr 17 04:44:11 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 17 Apr 2006 09:44:11 +0000 Subject: [netrek-cvs] client/netrekxp/src cowmain.c, 1.5, 1.6 newwin.c, 1.5, 1.6 playback.c, 1.5, 1.6 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3215/src Modified Files: cowmain.c newwin.c playback.c Log Message: Reverted change regarding swapping order of newwin and reset_defaults (turns out it broke message windows). Instead removed the bitmap loading function from the newwin initialization function, and placed it after the reset_defaults call in both cowmain and the playback main function. Index: playback.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/playback.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- playback.c 16 Apr 2006 14:18:19 -0000 1.5 +++ playback.c 17 Apr 2006 09:44:09 -0000 1.6 @@ -175,9 +175,10 @@ if ((stringDefault ("indshipMbmpfile")) != NULL) ind_ship_bmp_M = stringDefault ("indshipMbmpfile"); - resetdefaults (); newwin (display_host, name); + resetdefaults (); + /* open memory...? */ openmem (); Index: cowmain.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/cowmain.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- cowmain.c 16 Apr 2006 14:18:19 -0000 1.5 +++ cowmain.c 17 Apr 2006 09:44:08 -0000 1.6 @@ -754,8 +754,6 @@ if ((stringDefault ("indshipMbmpfile")) != NULL) ind_ship_bmp_M = stringDefault ("indshipMbmpfile"); - - resetdefaults (); newwin (display_host, name); #ifdef META @@ -777,6 +775,9 @@ /* Set observer flag as soon as we know port number */ setObserverMode (xtrekPort); + resetdefaults (); + savebitmaps (); + /* open memory...? */ openmem (); Index: newwin.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- newwin.c 16 Apr 2006 14:18:19 -0000 1.5 +++ newwin.c 17 Apr 2006 09:44:08 -0000 1.6 @@ -648,7 +648,6 @@ fillhint (); getResources (progname); - savebitmaps (); } From modemhero at users.sourceforge.net Mon Apr 17 04:49:47 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 17 Apr 2006 09:49:47 +0000 Subject: [netrek-cvs] client/netrekxp/src playback.c,1.6,1.7 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7225/src Modified Files: playback.c Log Message: Fix to playback.c, see previous patch note. Index: playback.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/playback.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- playback.c 17 Apr 2006 09:44:09 -0000 1.6 +++ playback.c 17 Apr 2006 09:49:45 -0000 1.7 @@ -178,7 +178,8 @@ newwin (display_host, name); resetdefaults (); - + savebitmaps (); + /* open memory...? */ openmem (); From modemhero at users.sourceforge.net Tue Apr 18 08:41:50 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 18 Apr 2006 13:41:50 +0000 Subject: [netrek-cvs] client/netrekxp/include bitmaps.h, 1.2, 1.3 data.h, 1.3, 1.4 defs.h, 1.2, 1.3 proto.h, 1.3, 1.4 Message-ID: Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9238/include Modified Files: bitmaps.h data.h defs.h proto.h Log Message: First attempt at reimport of beeplite into NetrekXP. Unresolved issue: improper text clearing on TTS beeplite messages. Still to add: saving of beeplite settings in save_options. Index: defs.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/defs.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- defs.h 12 Apr 2006 04:20:03 -0000 1.2 +++ defs.h 18 Apr 2006 13:41:48 -0000 1.3 @@ -421,6 +421,16 @@ #define S_LINE_VERTICAL 2 #endif +#ifdef BEEPLITE +#define LITE_PLAYERS_MAP 0x01 +#define LITE_PLAYERS_LOCAL 0x02 +#define LITE_SELF 0x04 +#define LITE_PLANETS 0x08 +#define LITE_SOUNDS 0x10 +#define LITE_COLOR 0x20 +#define LITE_TTS 0x40 +#endif + #ifdef WARP_DEAD #define DEADPACKETS 3 #endif Index: bitmaps.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/bitmaps.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- bitmaps.h 12 Apr 2006 04:20:03 -0000 1.2 +++ bitmaps.h 18 Apr 2006 13:41:48 -0000 1.3 @@ -1,4 +1,5 @@ #include "config.h" + // Ships // ----- Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- data.h 15 Apr 2006 01:04:32 -0000 1.3 +++ data.h 18 Apr 2006 13:41:48 -0000 1.4 @@ -366,6 +366,40 @@ extern struct dmacro_list dist_prefered[]; extern int sizedist; +#ifdef BEEPLITE +extern char *distlite[]; +extern int useLite; +extern int defLite; +extern int emph_planet_seq_n[]; +extern int emph_player_seq_n[]; +extern W_Icon emph_planet_seq[]; +extern W_Icon emph_player_seq[]; +extern W_Icon emph_player_seql[]; + +#define emph_planet_seq_frames 5 +#define emph_planet_seq_width 24 +#define emph_planet_seq_height 24 +#define emph_player_seq_frames 3 +#define emph_player_seq_width 24 +#define emph_player_seq_height 24 +#define emph_player_seql_frames 3 +#define emph_player_seql_width 30 +#define emph_player_seql_height 30 +extern int beep_lite_cycle_time_player; +extern int beep_lite_cycle_time_planet; +extern int liteflag; +extern char F_beeplite_flags; + +extern int tts_len; +extern int tts_max_len; +extern int tts_width; +extern int tts_timer; +extern int tts_time; +extern int tts_pos; +extern char lastIn[100]; + +#endif /* BEEPLITE */ + #ifdef RCM extern struct dmacro_list rcm_msg[]; Index: proto.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- proto.h 16 Apr 2006 14:18:19 -0000 1.3 +++ proto.h 18 Apr 2006 13:41:48 -0000 1.4 @@ -21,6 +21,15 @@ #include /******************************************************************************/ +/*** beeplite.c ***/ +/******************************************************************************/ +rcdlite (struct distress *dist); +litedefaults (void); +liteplanet (struct planet *l); +liteplayer (struct player *j); +makelite (struct distress * dist, char *pm); + +/******************************************************************************/ /*** check.c ***/ /******************************************************************************/ void check (void); @@ -677,6 +686,18 @@ int y, W_Icon icon, W_Color color); +void W_EraseTTSText (W_Window window, + int max_width, + int y, + int width); +void W_WriteTTSText (W_Window window, + int max_width, + int y, + int width, + char *str, + int len); +int W_TTSTextWidth (char *s, + int len); void W_SetWindowName (W_Window window, char *name); inline void ResetSysColors (void); From modemhero at users.sourceforge.net Tue Apr 18 08:41:51 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 18 Apr 2006 13:41:51 +0000 Subject: [netrek-cvs] client/netrekxp/win32 config.h,1.2,1.3 Message-ID: Update of /cvsroot/netrek/client/netrekxp/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9238/win32 Modified Files: config.h Log Message: First attempt at reimport of beeplite into NetrekXP. Unresolved issue: improper text clearing on TTS beeplite messages. Still to add: saving of beeplite settings in save_options. Index: config.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/win32/config.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- config.h 12 Apr 2006 04:20:05 -0000 1.2 +++ config.h 18 Apr 2006 13:41:49 -0000 1.3 @@ -123,6 +123,9 @@ /* SMALL_SCREEN - for 800x600 resolution screens */ /* #define SMALL_SCREEN */ +/* BEEPLITE - player and planets highlighting */ +#define BEEPLITE + /* VSHIELD_BITMAPS - damage dependent shields (hull) */ #define VSHIELD_BITMAPS From modemhero at users.sourceforge.net Tue Apr 18 08:41:50 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 18 Apr 2006 13:41:50 +0000 Subject: [netrek-cvs] client/netrekxp clientr.dsp, 1.2, 1.3 compile.txt, 1.4, 1.5 Message-ID: Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9238 Modified Files: clientr.dsp compile.txt Log Message: First attempt at reimport of beeplite into NetrekXP. Unresolved issue: improper text clearing on TTS beeplite messages. Still to add: saving of beeplite settings in save_options. Index: clientr.dsp =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- clientr.dsp 12 Apr 2006 04:20:03 -0000 1.2 +++ clientr.dsp 18 Apr 2006 13:41:48 -0000 1.3 @@ -87,6 +87,10 @@ # PROP Default_Filter "c" # Begin Source File +SOURCE=.\src\beeplite.c +# End Source File +# Begin Source File + SOURCE=.\src\check.c # End Source File # Begin Source File Index: compile.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/compile.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- compile.txt 16 Apr 2006 07:58:37 -0000 1.4 +++ compile.txt 18 Apr 2006 13:41:48 -0000 1.5 @@ -10,7 +10,7 @@ - Edit src\cursors\curslib.dsp and change \netrek_files to be same as InstCWD (again only necessary if using VCC) -After compilation there will be one folder under InstCWD - netrek. +After compilation under BCC, there will be one folder under InstCWD - netrek. Netrek contains the ready to distribute netrek client tree. Stas Pirogov (keyos at keyos.org) From modemhero at users.sourceforge.net Tue Apr 18 08:41:50 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 18 Apr 2006 13:41:50 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.8,1.9 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9238/resources/docs Modified Files: changes.txt Log Message: First attempt at reimport of beeplite into NetrekXP. Unresolved issue: improper text clearing on TTS beeplite messages. Still to add: saving of beeplite settings in save_options. Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- changes.txt 16 Apr 2006 14:18:19 -0000 1.8 +++ changes.txt 18 Apr 2006 13:41:48 -0000 1.9 @@ -1,4 +1,8 @@ Version TBA: +- readded beeplite functionality. Configuration options described in cow manual. + Basic rc options are useLite: on/off to turn beeplite on and off, and defLite: on/off + to use the default settings. The beeplite option is highly configurable, see manual + for details. Can also be turned on via "Use RCD highlighting" on the Visual Menu. - added preventative measures against loading bitmap files that might not exist - if bitmaps are missing, it defaults to the mono bitmaps - if dynamicBitmap is set to off, only the necessary bitmap files will load into From modemhero at users.sourceforge.net Tue Apr 18 08:41:51 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 18 Apr 2006 13:41:51 +0000 Subject: [netrek-cvs] client/netrekxp/src data.c, 1.3, 1.4 defaults.c, 1.3, 1.4 dmessage.c, 1.2, 1.3 feature.c, 1.1.1.1, 1.2 local.c, 1.4, 1.5 makefile, 1.3, 1.4 map.c, 1.2, 1.3 mswindow.c, 1.4, 1.5 newwin.c, 1.6, 1.7 option.c, 1.4, 1.5 redraw.c, 1.2, 1.3 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9238/src Modified Files: data.c defaults.c dmessage.c feature.c local.c makefile map.c mswindow.c newwin.c option.c redraw.c Log Message: First attempt at reimport of beeplite into NetrekXP. Unresolved issue: improper text clearing on TTS beeplite messages. Still to add: saving of beeplite settings in save_options. Index: redraw.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/redraw.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- redraw.c 12 Apr 2006 04:20:04 -0000 1.2 +++ redraw.c 18 Apr 2006 13:41:48 -0000 1.3 @@ -98,6 +98,36 @@ W_ClearArea (warnw, 5, 5, W_Textwidth * warncount, W_Textheight); warncount = 0; } + +#ifdef BEEPLITE + if (tts_timer) + { + static int last_width; + + tts_timer--; + if (!tts_timer) + { + /* timed out */ + W_EraseTTSText(w, WINSIDE, tts_pos, last_width); + last_width = 0; + } + else if (tts_timer == tts_time - 1 && last_width) + { + /* first draw -- erase previous */ + W_EraseTTSText(w, WINSIDE, tts_pos, last_width); + /* draw new */ + W_WriteTTSText(w, WINSIDE, tts_pos, tts_width, lastIn, + tts_len); + last_width = tts_width; + } + else + { + /* regular draw */ + W_WriteTTSText(w, WINSIDE, tts_pos, tts_width, lastIn, tts_len); + last_width = tts_width; + } + } +#endif local (); /* redraw local window */ Index: mswindow.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- mswindow.c 15 Apr 2006 01:04:34 -0000 1.4 +++ mswindow.c 18 Apr 2006 13:41:48 -0000 1.5 @@ -4579,6 +4579,49 @@ ReleaseDC (bitmap->hwnd, hdc); } +#ifdef BEEPLITE +void W_EraseTTSText(W_Window window, int max_width, int y, int width) +{ + register int x = (max_width - width) / 2; + + if (x < 0) + x = 4; + y -= W_Textheight; + + W_ClearArea(window, x, y, width, W_Textheight); +} + +void W_WriteTTSText(W_Window window, int max_width, int y, int width, char *str, int len) +{ + register int x = (max_width - width) / 2; + HDC hdc; + FNHEADER_VOID; + + if (x < 0) + x = 4; + + y -= W_Textheight; + + hdc = GetDC(win->hwnd); + + if (NetrekPalette) + { + SelectPalette(hdc, NetrekPalette, FALSE); + RealizePalette(hdc); + } + + SetTextColor(hdc, colortable[GREY].rgb); + SetBkMode(hdc, TRANSPARENT); + TextOut(hdc, x, y, str, len); + ReleaseDC(win->hwnd, hdc); +} + +int W_TTSTextWidth(char *s, int len) +{ + return len*W_Textwidth; +} +#endif + void W_SetWindowName (W_Window window, char *name) Index: dmessage.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/dmessage.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- dmessage.c 12 Apr 2006 04:20:03 -0000 1.2 +++ dmessage.c 18 Apr 2006 13:41:48 -0000 1.3 @@ -157,6 +157,10 @@ HandleGenDistr (message, from, to, &dist); len = makedistress (&dist, message, distmacro[dist.distype].macro); +#ifdef BEEPLITE + if (useLite) + rcdlite(&dist); +#endif if (len <= 0) return; flags ^= MDISTR; Index: newwin.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- newwin.c 17 Apr 2006 09:44:08 -0000 1.6 +++ newwin.c 18 Apr 2006 13:41:48 -0000 1.7 @@ -25,6 +25,7 @@ #include "data.h" #include "playerlist.h" #include "bitmaps.h" +#include "litebitmaps.h" #include "parsemeta.h" #include "packets.h" #include "spopt.h" @@ -766,6 +767,29 @@ loadbitmapsT(); loadbitmapsM(); } + +#ifdef BEEPLITE + for (i = 0; i < emph_player_seq_frames; i++) + { + emph_player_seq[emph_player_seq_frames - (i + 1)] = + W_StoreBitmap(emph_player_seq_width, emph_player_seq_height, + emph_player_seq_bits[i], mapw); + } + + for (i = 0; i < emph_player_seql_frames; i++) + { + emph_player_seql[emph_player_seql_frames - (i + 1)] = + W_StoreBitmap(emph_player_seql_width, emph_player_seql_height, + emph_player_seql_bits[i], w); + } + + for (i = 0; i < emph_planet_seq_frames; i++) + { + emph_planet_seq[emph_planet_seq_frames - (i + 1)] = + W_StoreBitmap(emph_planet_seq_width, emph_planet_seq_height, + emph_planet_seq_bits[i], mapw); + } +#endif /* Experimental weapons */ #ifdef COLORIZEWEAPON Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- local.c 15 Apr 2006 01:04:34 -0000 1.4 +++ local.c 18 Apr 2006 13:41:48 -0000 1.5 @@ -537,11 +537,19 @@ } if (j->p_status == PALIVE) { - clearzone[0][clearcount] = dx - (shield_width / 2); - clearzone[1][clearcount] = dy - (shield_height / 2); - clearzone[2][clearcount] = shield_width; - clearzone[3][clearcount] = shield_height; - clearcount++; +#if defined (BEEPLITE) + clearzone[0][clearcount] = dx - (shield_width / 2 + 6); + clearzone[1][clearcount] = dy - (shield_height / 2 + 6); + clearzone[2][clearcount] = shield_width + 12; + clearzone[3][clearcount] = shield_height + 12; + clearcount++; +#else + clearzone[0][clearcount] = dx - (shield_width / 2); + clearzone[1][clearcount] = dy - (shield_height / 2); + clearzone[2][clearcount] = shield_width; + clearzone[3][clearcount] = shield_height; + clearcount++; +#endif /* Logic of color scheme is as follows: 1) Mono bitmaps (colorClient 0) and new bitmaps (colorClient 1) @@ -679,6 +687,19 @@ shieldlabel: +#ifdef BEEPLITE + if ((useLite && emph_player_seq_n[j->p_no] > 0) + && (liteflag & LITE_PLAYERS_LOCAL)) + { + int seq_n = emph_player_seq_n[j->p_no] % emph_player_seql_frames; + + W_WriteBitmap (dx - (emph_player_seql_width / 2), + dy - (emph_player_seql_height / 2), + emph_player_seql[seq_n], + W_White); + } +#endif + #ifdef SOUND if (j->p_no == me->p_no) { Index: makefile =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- makefile 14 Apr 2006 12:24:00 -0000 1.3 +++ makefile 18 Apr 2006 13:41:48 -0000 1.4 @@ -88,7 +88,7 @@ DEBUGDEFS = -DDEBUG !endif -ROBJ = check.obj colors.obj data.obj death.obj defaults.obj dmessage.obj\ +ROBJ = beeplite.obj check.obj colors.obj data.obj death.obj defaults.obj dmessage.obj\ enter.obj findslot.obj getname.obj getship.obj helpwin.obj hintwin.obj inform.obj\ interface.obj newwin.obj option.obj planetlist.obj macrowin.obj\ map.obj playerlist.obj ranklist.obj reserved.obj sintab.obj\ @@ -99,7 +99,7 @@ docwin.obj feature.obj\ string_util.obj local.obj cowmain.obj playback.obj -RSRC = check.c colors.c data.c death.c defaults.c dmessage.c\ +RSRC = beeplite.c check.c colors.c data.c death.c defaults.c dmessage.c\ enter.c findslot.c getname.c getship.c helpwin.c hintwin.c inform.c\ input.c interface.c newwin.c option.c planetlist.c\ macrowin.c map.c playerlist.c ranklist.c redraw.c\ Index: option.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- option.c 15 Apr 2006 11:55:13 -0000 1.4 +++ option.c 18 Apr 2006 13:41:48 -0000 1.5 @@ -349,6 +349,9 @@ {1, "", &newDashboard, 0, 0, 0, dashboardoptions, NULL}, {1, "", &timerType, 0, 0, 0, timermess, NULL}, {1, "keep info %d upds (0=don't remove)", &keepInfo, 0, 0, 0, 0, &keepInfo_range}, +#ifdef BEEPLITE + {1, "use RCD highlighting", &useLite, 0, 0, 0, NULL, NULL}, +#endif {1, "omit team letter on map", &omitTeamLetter, 0, 0, 0, NULL, NULL}, {1, "draw view box on map", &viewBox, 0, 0, 0, NULL, NULL}, {1, "draw stars on local", &showStars, 0, 0, 0, NULL, NULL}, Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- data.c 15 Apr 2006 01:04:34 -0000 1.3 +++ data.c 18 Apr 2006 13:41:48 -0000 1.4 @@ -458,6 +458,46 @@ int sizedist = sizeof (dist_defaults); +#ifdef BEEPLITE +char *distlite[NUM_DIST] = +{ + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL +}; + +int defLite = 0; +int useLite = 0; + +int emph_planet_seq_n[MAXPLANETS] = +{0,}; +int emph_player_seq_n[MAXPLAYER] = +{0,}; +W_Icon emph_planet_seq[10]; +W_Icon emph_player_seq[10]; +W_Icon emph_player_seql[10]; +int beep_lite_cycle_time_player = 10; +int beep_lite_cycle_time_planet = 10; +int liteflag = 0; +char F_beeplite_flags = LITE_PLAYERS_MAP | +LITE_PLAYERS_LOCAL | +LITE_SELF | +LITE_PLANETS | +LITE_SOUNDS | +LITE_TTS; + +int tts_len = 0; +int tts_max_len = 40; +int tts_width = 0; +int tts_timer = 0; +int tts_time = 25; +int tts_pos = WINSIDE / 2 - 16; /* as found in redraw.c * + + * + * * originally */ +char lastIn[100]; + +#endif /* BEEPLITE */ #ifdef RCM /* Receiver configurable * Server messages */ Index: feature.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/feature.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- feature.c 21 Jan 2003 21:28:29 -0000 1.1.1.1 +++ feature.c 18 Apr 2006 13:41:48 -0000 1.2 @@ -81,6 +81,10 @@ {"DEAD_WARP", &F_dead_warp, 'S', 1, 0, 0}, #endif +#ifdef BEEPLITE + {"BEEPLITE", &_dummy, 'C', 1, &F_beeplite_flags, 0}, +#endif + #ifdef RECORDGAME {"MANY_SELF", &F_many_self, 'S', 0, 0, 0}, #endif @@ -166,6 +170,81 @@ reportFeatures (); if ((strcmpi (packet->name, "RC_DISTRESS") == 0) && gen_distress) distmacro = dist_prefered; + +#ifdef BEEPLITE + if ((strcmpi(packet->name, "BEEPLITE") == 0)) + { + switch (value) + { + case -1: /* Unknown, we can use all * + * + * * of the features! */ + +#ifdef STABLE + /* Stable release is absolutely non borgish */ + F_beeplite_flags = + LITE_SOUNDS | + LITE_TTS; +#else + F_beeplite_flags = LITE_PLAYERS_MAP | + LITE_PLAYERS_LOCAL | + LITE_SELF | + LITE_PLANETS | + LITE_SOUNDS | + LITE_COLOR | + LITE_TTS; +#endif + + break; + case 1: + if (F_beeplite_flags == 0) + { /* Server says we can have * + * + * * beeplite, but no * * + * options??? must be * * + * configured wrong. */ + F_beeplite_flags = LITE_PLAYERS_MAP | + LITE_PLAYERS_LOCAL | + LITE_SELF | + LITE_PLANETS | + LITE_SOUNDS | + LITE_COLOR | + LITE_TTS; + } + strcpy(buf, " disabled:"); + if (!(F_beeplite_flags & LITE_PLAYERS_MAP)) + strcat(buf, " LITE_PLAYERS_MAP"); + if (!(F_beeplite_flags & LITE_PLAYERS_LOCAL)) + strcat(buf, " LITE_PLAYERS_LOCAL"); + if (!(F_beeplite_flags & LITE_SELF)) + strcat(buf, " LITE_SELF"); + if (!(F_beeplite_flags & LITE_PLANETS)) + strcat(buf, " LITE_PLANETS"); + if (!(F_beeplite_flags & LITE_SOUNDS)) + strcat(buf, " LITE_SOUNDS\n"); + if (!(F_beeplite_flags & LITE_COLOR)) + strcat(buf, " LITE_COLOR"); + if (!(F_beeplite_flags & LITE_TTS)) + strcat(buf, " LITE_TTS"); + + if (strcmp(buf, " disabled:")) + { + +#ifdef TOOLS + W_WriteText(toolsWin, 0, 0, textColor, buf, strlen(buf), W_RegularFont); +#else + printf("%s\n", buf); +#endif + } + break; + case 0: + F_beeplite_flags = 0; + break; + default: + break; + } + } +#endif /* BEEPLITE */ } /******************************************************************************/ Index: map.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- map.c 12 Apr 2006 04:20:03 -0000 1.2 +++ map.c 18 Apr 2006 13:41:48 -0000 1.3 @@ -331,12 +331,38 @@ /* Draw the new planet */ + +#ifdef BEEPLITE + if (useLite && emph_planet_seq_n[l->pl_no] > 0) + { + int seq_n = emph_planet_seq_n[l->pl_no] % emph_planet_seq_frames; + + W_OverlayBitmap(dx - (emph_planet_seq_width / 2 + 1), + dy - (emph_planet_seq_height / 2), + emph_planet_seq[seq_n], + W_White); + + W_WriteBitmap(dx - (BMP_MPLANET_WIDTH / 2), dy - (BMP_MPLANET_HEIGHT / 2), + planetmBitmap(l), planetColor(l)); + + emph_planet_seq_n[l->pl_no] -= 1; + l->pl_flags |= PLREDRAW; /* Leave redraw on until * * + * done highlighting */ + l->pl_flags |= PLCLEAR; /* Leave redraw on until * * + * done highlighting */ + } + else + { +#endif W_OverlayBitmap (dx - (BMP_MPLANET_WIDTH / 2), dy - (BMP_MPLANET_HEIGHT / 2), planetmBitmap (l), planetColor (l)); /*W_OverlayBitmapDB (mapSDB, dx - (BMP_MPLANET_WIDTH / 2), dy - (BMP_MPLANET_HEIGHT / 2), planetmBitmap (l), planetColor (l));*/ +#ifdef BEEPLITE + } +#endif if (l->pl_flags & PLAGRI) { @@ -743,17 +769,43 @@ j->p_mapchars, 2, shipFont (j));*/ } +#ifdef BEEPLITE + if ((useLite && emph_player_seq_n[i] > 0) + && (liteflag & LITE_PLAYERS_MAP)) + { + int seq_n = emph_player_seq_n[i] % emph_player_seq_frames; - mclearzone[0][i] = dx - W_Textwidth; - mclearzone[1][i] = dy - W_Textheight / 2; - mclearzone[2][i] = W_Textwidth * 2; - mclearzone[3][i] = W_Textheight; + W_WriteBitmap(dx - (emph_player_seq_width / 2 - 1), + dy - (emph_player_seq_height / 2 + 1), + emph_player_seq[seq_n], + W_White); + emph_player_seq_n[i] -= 1; + mclearzone[0][i] = dx - (emph_player_seq_width / 2 - 1); + mclearzone[1][i] = dy - (emph_player_seq_height / 2 + 1); + mclearzone[2][i] = emph_player_seq_width; + mclearzone[3][i] = emph_player_seq_height; + mclearzone[4][i] = j->p_x; + mclearzone[5][i] = j->p_y; - /* Set these so we can checkRedraw() next time */ - mclearzone[4][i] = j->p_x; - mclearzone[5][i] = j->p_y; - redrawPlayer[i] = 0; + /* Leave redraw on until done highlighting */ + redrawPlayer[i] = 1; + } + else + { +#endif + mclearzone[0][i] = dx - W_Textwidth; + mclearzone[1][i] = dy - W_Textheight / 2; + mclearzone[2][i] = W_Textwidth * 2; + mclearzone[3][i] = W_Textheight; + /* Set these so we can checkRedraw() next time */ + mclearzone[4][i] = j->p_x; + mclearzone[5][i] = j->p_y; + redrawPlayer[i] = 0; + +#ifdef BEEPLITE + } +#endif } /* Draw the lock symbol (if needed) */ Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- defaults.c 15 Apr 2006 01:04:34 -0000 1.3 +++ defaults.c 18 Apr 2006 13:41:48 -0000 1.4 @@ -82,12 +82,6 @@ NULL } }, - {"dynamicBitmaps", &dynamicBitmaps, RC_BOOL, - { - "Allow switching of ship bitmaps in game", - NULL - } - }, #ifdef JUBILEE_PHASERS {"colorfulPhasers", &colorfulPhasers, RC_BOOL, { @@ -123,6 +117,12 @@ NULL } }, + {"dynamicBitmaps", &dynamicBitmaps, RC_BOOL, + { + "Allow switching of ship bitmaps in game", + NULL + } + }, {"enemyPhasers", &enemyPhasers, RC_INT, { "Angle between enemy phaser lines", @@ -624,6 +624,20 @@ NULL } }, +#ifdef BEEPLITE + {"useLite", &useLite, RC_BOOL, + { + "Use beeplite", + NULL + } + }, + {"defLite", &defLite, RC_BOOL, + { + "Use default beeplite settings", + NULL + } + }, +#endif #ifdef RSA {"useRsa", &useRsa, RC_BOOL, { @@ -927,6 +941,29 @@ } } +#ifdef BEEPLITE + else if (strncasecmp(file, "lite.", 5) == 0) + { + int offset = 5; + char **lt; + + if (file[6] == '.') + offset = 7; + + notdone = 1; + + for (lt = &distlite[take], dm = &dist_prefered[take], + dm_def = &dist_defaults[take]; + dm->name && notdone; dm++, dm_def++, lt++) + { + if (strcmpi(file + offset, dm->name) == 0) + { + *lt = strdup(v); + notdone = 0; + } + } + } +#endif /* BEEPLITE */ #ifdef RCM else if (strncmpi (file, "msg.", 4) == 0) @@ -1468,6 +1505,23 @@ portSwap = booleanDefault ("portSwap", TRUE); #endif +#ifdef BEEPLITE + defLite = booleanDefault("defLite", defLite); + useLite = booleanDefault("useLite", useLite); + + if (defLite) + litedefaults(); + + beep_lite_cycle_time_planet = + intDefault("planetCycleTime", beep_lite_cycle_time_planet); + beep_lite_cycle_time_player = + intDefault("playerCycleTime", beep_lite_cycle_time_player); + + tts_time = intDefault("tts_time", tts_time); + tts_max_len = intDefault("tts_max_len", tts_max_len); + tts_pos = intDefault("tts_pos", tts_pos); +#endif /* BEEPLITE */ + shipdefaults[DEFAULTSHIP].keymap = (unsigned char *) stringDefault ("keymap"); shipdefaults[DEFAULTSHIP].buttonmap = (unsigned char *) stringDefault ("buttonmap"); shipdefaults[DEFAULTSHIP].ckeymap = (unsigned char *) stringDefault ("ckeymap"); From modemhero at users.sourceforge.net Tue Apr 18 08:47:26 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 18 Apr 2006 13:47:26 +0000 Subject: [netrek-cvs] client/netrekxp/src beeplite.c, NONE, 1.1 litebitmaps.h, NONE, 1.1 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14006/src Added Files: beeplite.c litebitmaps.h Log Message: First attempt at reimport of beeplite into NetrekXP. Unresolved issue: improper text clearing on TTS beeplite messages. Still to add: saving of beeplite settings in save_options. --- NEW FILE: beeplite.c --- /* beeplite.c * * $Log: beeplite.c,v $ * Revision 1.1 2006/04/18 13:47:24 modemhero * First attempt at reimport of beeplite into NetrekXP. Unresolved issue: improper text clearing on TTS beeplite messages. Still to add: saving of beeplite settings in save_options. * * Revision 1.1.1.1 1998/11/01 17:24:08 siegl * COW 3.0 initial revision * Added back to NetrekXP 2006/04/17 balcerski * */ #include "config.h" #ifdef BEEPLITE #include "copyright.h" #include #include #include #include #ifndef SERVER #include "Wlib.h" #endif #include "defs.h" #include "struct.h" #include "data.h" #include "map.h" #include "proto.h" rcdlite(struct distress *dist) /* the info */ { char message[100]; int len = 0; if ((dist == NULL) || /* (dist->sender == me->p_no) || */ (distlite[dist->distype] == NULL)) return; len = makedistress(dist, message, distlite[dist->distype]); if (len <= 0) return; makelite(dist, message); } litedefaults(void) { if (distlite[take] == NULL) distlite[take] = "/c/l"; if (distlite[base_ogg] == NULL) distlite[base_ogg] = "/g/m"; if (distlite[pickup] == NULL) distlite[pickup] = "/p"; if (distlite[generic] == NULL) distlite[generic] = "%?%S=SB%{/c%}"; } liteplanet(struct planet *l) { emph_planet_seq_n[l->pl_no] = beep_lite_cycle_time_planet; l->pl_flags |= PLREDRAW; /* Leave redraw on until * * * done highlighting */ l->pl_flags |= PLCLEAR; /* Leave redraw on until * * * done highlighting */ } liteplayer(struct player *j) { if (!j || (j->p_flags & PFCLOAK)) return; redrawPlayer[j->p_no] = 1; emph_player_seq_n[j->p_no] = beep_lite_cycle_time_player; } /* small permutation on makedistress. Searches for the highliting * * arguments, ignores everything else. */ makelite(struct distress * dist, char *pm) /* the info */ /* macro to parse, used for distress and macro */ { struct player *sender; struct player *j; struct planet *l; char *strcap(char *s); char c; sender = &players[dist->sender]; if (!(*pm)) { return (0); } /* first step is to substitute variables */ while (*pm) { if (*pm == '/') { pm++; if (!pm) continue; switch (c = *(pm++)) { case 'P': /* push player id into buf */ case 'G': /* push friendly player id * * * * into buf */ case 'H': /* push enemy target player * * * id into buf */ case 'p': /* push player id into buf */ case 'g': /* push friendly player id * * * * into buf */ case 'h': /* push enemy target player * * * id into buf */ switch (c) { case 'p': j = &players[dist->tclose_j]; break; case 'g': j = &players[dist->tclose_fr]; break; case 'h': j = &players[dist->tclose_en]; break; case 'P': j = &players[dist->close_j]; break; case 'G': j = &players[dist->close_fr]; break; default: j = &players[dist->close_en]; break; } liteflag = (F_beeplite_flags & (LITE_PLAYERS_MAP | LITE_PLAYERS_LOCAL)); liteplayer(j); break; case 'B': /* highlites planet nearest * * * sender */ case 'b': l = &planets[dist->close_pl]; if (F_beeplite_flags & LITE_PLANETS) liteplanet(l); break; case 'L': /* highlites planet nearest * * * pointer */ case 'l': l = &planets[dist->tclose_pl]; if (F_beeplite_flags & LITE_PLANETS) liteplanet(l); break; case 'U': /* highlites enemy nearest * * * * pointer */ case 'u': j = &players[dist->tclose_en]; liteflag = (F_beeplite_flags & (LITE_PLAYERS_MAP | LITE_PLAYERS_LOCAL)); liteplayer(j); break; case 'c': /* highlites sender */ case 'I': case 'i': liteflag = (F_beeplite_flags & (LITE_PLAYERS_MAP | LITE_PLAYERS_LOCAL)); liteplayer(sender); break; case 'M': /* highlites me */ case 'm': if (F_beeplite_flags & LITE_SELF) { liteflag = (LITE_PLAYERS_MAP | LITE_PLAYERS_LOCAL); liteplayer(me); } break; case '0': if (F_beeplite_flags & LITE_SOUNDS) { #ifdef SOUND if (sound_toggle) Play_Sound(MESSAGE_SOUND); else #endif W_Beep(); } break; #ifdef SOUND case '1': if (F_beeplite_flags & LITE_SOUNDS) Play_Sound(MESSAGE1_SOUND); break; case '2': if (F_beeplite_flags & LITE_SOUNDS) Play_Sound(MESSAGE2_SOUND); break; case '3': if (F_beeplite_flags & LITE_SOUNDS) Play_Sound(MESSAGE3_SOUND); break; case '4': if (F_beeplite_flags & LITE_SOUNDS) Play_Sound(MESSAGE4_SOUND); break; case '5': if (F_beeplite_flags & LITE_SOUNDS) Play_Sound(MESSAGE5_SOUND); break; case '6': if (F_beeplite_flags & LITE_SOUNDS) Play_Sound(MESSAGE6_SOUND); break; case '7': if (F_beeplite_flags & LITE_SOUNDS) Play_Sound(MESSAGE7_SOUND); break; case '8': if (F_beeplite_flags & LITE_SOUNDS) Play_Sound(MESSAGE8_SOUND); break; case '9': if (F_beeplite_flags & LITE_SOUNDS) Play_Sound(MESSAGE9_SOUND); break; #endif /* Text between: /| | will be displayed with TTS */ case '|': if (F_beeplite_flags & LITE_TTS) { for (tts_len = 0; (*pm != '|' && tts_len < tts_max_len); tts_len++) lastIn[tts_len] = *pm++; lastIn[tts_len] = '\0'; tts_width = W_TTSTextWidth(lastIn, tts_len); tts_timer = tts_time; } break; default: /* try to continue * bad macro character is skipped entirely, * * * * the message will be parsed without whatever argument has * * * occurred. - jn */ warning("Bad Macro character in distress!"); fprintf(stderr, "Unrecognizable special character in distress pass 1: %c\n", *(pm - 1)); break; } } else { pm++; } } return (1); } #endif /* BEEPLITE */ --- NEW FILE: litebitmaps.h --- #define emph_planet_seq_width 24 #define emph_planet_seq_height 24 #define emph_planet_seq_frames 5 static char emph_planet_seq_bits[emph_planet_seq_frames][72] = { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x83, 0x01, 0xc0, 0x00, 0x06, 0x40, 0x00, 0x04, 0x20, 0x00, 0x08, 0x20, 0x00, 0x08, 0x10, 0x00, 0x10, 0x10, 0x00, 0x10, 0x10, 0x00, 0x10, 0x10, 0x00, 0x10, 0x10, 0x00, 0x10, 0x20, 0x00, 0x08, 0x20, 0x00, 0x08, 0x40, 0x00, 0x04, 0xc0, 0x00, 0x06, 0x00, 0x83, 0x01, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x80, 0x01, 0x03, 0x40, 0x00, 0x04, 0x20, 0x00, 0x08, 0x10, 0x00, 0x10, 0x10, 0x00, 0x10, 0x08, 0x00, 0x20, 0x08, 0x00, 0x20, 0x08, 0x00, 0x20, 0x08, 0x00, 0x20, 0x08, 0x00, 0x20, 0x08, 0x00, 0x20, 0x08, 0x00, 0x20, 0x10, 0x00, 0x10, 0x10, 0x00, 0x10, 0x20, 0x00, 0x08, 0x40, 0x00, 0x04, 0x80, 0x01, 0x03, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, { 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x80, 0x01, 0x03, 0x40, 0x00, 0x04, 0x20, 0x00, 0x08, 0x10, 0x00, 0x10, 0x08, 0x00, 0x20, 0x08, 0x00, 0x20, 0x04, 0x00, 0x40, 0x04, 0x00, 0x40, 0x04, 0x00, 0x40, 0x04, 0x00, 0x40, 0x04, 0x00, 0x40, 0x04, 0x00, 0x40, 0x04, 0x00, 0x40, 0x08, 0x00, 0x20, 0x08, 0x00, 0x20, 0x10, 0x00, 0x10, 0x20, 0x00, 0x08, 0x40, 0x00, 0x04, 0x80, 0x01, 0x03, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, { 0x00, 0xfe, 0x00, 0x80, 0x01, 0x03, 0x60, 0x00, 0x0c, 0x10, 0x00, 0x10, 0x08, 0x00, 0x20, 0x08, 0x00, 0x20, 0x04, 0x00, 0x40, 0x04, 0x00, 0x40, 0x02, 0x00, 0x80, 0x02, 0x00, 0x80, 0x02, 0x00, 0x80, 0x02, 0x00, 0x80, 0x02, 0x00, 0x80, 0x02, 0x00, 0x80, 0x02, 0x00, 0x80, 0x04, 0x00, 0x40, 0x04, 0x00, 0x40, 0x08, 0x00, 0x20, 0x08, 0x00, 0x20, 0x10, 0x00, 0x10, 0x60, 0x00, 0x0c, 0x80, 0x01, 0x03, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00}, { 0x00, 0xff, 0x01, 0xc0, 0x00, 0x06, 0x30, 0x00, 0x18, 0x08, 0x00, 0x20, 0x08, 0x00, 0x20, 0x04, 0x00, 0x40, 0x04, 0x00, 0x40, 0x02, 0x00, 0x80, 0x02, 0x00, 0x80, 0x02, 0x00, 0x80, 0x02, 0x00, 0x80, 0x02, 0x00, 0x80, 0x02, 0x00, 0x80, 0x02, 0x00, 0x80, 0x02, 0x00, 0x80, 0x02, 0x00, 0x80, 0x04, 0x00, 0x40, 0x04, 0x00, 0x40, 0x08, 0x00, 0x20, 0x08, 0x00, 0x20, 0x30, 0x00, 0x18, 0xc0, 0x00, 0x06, 0x00, 0xff, 0x01, 0x00, 0x00, 0x00}}; #define emph_player_seq_width 24 #define emph_player_seq_height 24 #define emph_player_seq_frames 3 static char emph_player_seq_bits[emph_player_seq_frames][72] = { { 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x08, 0x00, 0x80, 0x9c, 0x00, 0x80, 0xff, 0x00, 0xc0, 0xc1, 0x01, 0x60, 0x00, 0x03, 0x38, 0x00, 0x0e, 0x30, 0x00, 0x06, 0x10, 0x00, 0x04, 0x18, 0x00, 0x0c, 0x1e, 0x00, 0x3c, 0x18, 0x00, 0x0c, 0x10, 0x00, 0x04, 0x30, 0x00, 0x06, 0x38, 0x00, 0x0e, 0x60, 0x00, 0x03, 0xc0, 0xc1, 0x01, 0x80, 0xff, 0x00, 0x80, 0x9c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, { 0x00, 0x08, 0x00, 0x00, 0x08, 0x00, 0x40, 0x1c, 0x01, 0xc0, 0xff, 0x01, 0xc0, 0xff, 0x01, 0xe0, 0x80, 0x03, 0x7c, 0x00, 0x1f, 0x38, 0x00, 0x0e, 0x18, 0x00, 0x0c, 0x18, 0x00, 0x0c, 0x1c, 0x00, 0x1c, 0x1f, 0x00, 0x7c, 0x1c, 0x00, 0x1c, 0x18, 0x00, 0x0c, 0x18, 0x00, 0x0c, 0x38, 0x00, 0x0e, 0x7c, 0x00, 0x1f, 0xe0, 0x80, 0x03, 0xc0, 0xff, 0x01, 0xc0, 0xff, 0x01, 0x40, 0x1c, 0x01, 0x00, 0x08, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00}, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}; #define emph_player_seql_width 30 #define emph_player_seql_height 30 #define emph_player_seql_frames 3 static char emph_player_seql_bits[emph_player_seql_frames][120] = { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x00, 0x00, 0x18, 0x06, 0x00, 0x80, 0xfc, 0x4f, 0x00, 0x80, 0x0f, 0x7c, 0x00, 0xc0, 0x01, 0xe0, 0x00, 0x60, 0x00, 0x80, 0x01, 0x38, 0x00, 0x00, 0x07, 0x30, 0x00, 0x00, 0x03, 0x10, 0x00, 0x00, 0x02, 0x18, 0x00, 0x00, 0x06, 0x1e, 0x00, 0x00, 0x1e, 0x0c, 0x00, 0x00, 0x0c, 0x08, 0x00, 0x00, 0x04, 0x08, 0x00, 0x00, 0x04, 0x08, 0x00, 0x00, 0x04, 0x08, 0x00, 0x00, 0x04, 0x0c, 0x00, 0x00, 0x0c, 0x1e, 0x00, 0x00, 0x1e, 0x18, 0x00, 0x00, 0x06, 0x10, 0x00, 0x00, 0x02, 0x30, 0x00, 0x00, 0x03, 0x38, 0x00, 0x00, 0x07, 0x60, 0x00, 0x80, 0x01, 0xc0, 0x01, 0xe0, 0x00, 0x80, 0x0f, 0x7c, 0x00, 0x80, 0xfc, 0x4f, 0x00, 0x00, 0x18, 0x06, 0x00, 0x00, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00}, { 0x00, 0x08, 0x04, 0x00, 0x00, 0x18, 0x06, 0x00, 0x40, 0xfc, 0x8f, 0x00, 0xc0, 0xff, 0xff, 0x00, 0xc0, 0x0f, 0xfc, 0x00, 0xe0, 0x00, 0xc0, 0x01, 0x7c, 0x00, 0x80, 0x0f, 0x38, 0x00, 0x00, 0x07, 0x18, 0x00, 0x00, 0x06, 0x18, 0x00, 0x00, 0x06, 0x1c, 0x00, 0x00, 0x0e, 0x1f, 0x00, 0x00, 0x3e, 0x0e, 0x00, 0x00, 0x1c, 0x0c, 0x00, 0x00, 0x0c, 0x0c, 0x00, 0x00, 0x0c, 0x0c, 0x00, 0x00, 0x0c, 0x0c, 0x00, 0x00, 0x0c, 0x0e, 0x00, 0x00, 0x1c, 0x1f, 0x00, 0x00, 0x3e, 0x1c, 0x00, 0x00, 0x0e, 0x18, 0x00, 0x00, 0x06, 0x18, 0x00, 0x00, 0x06, 0x38, 0x00, 0x00, 0x07, 0x7c, 0x00, 0x80, 0x0f, 0xe0, 0x00, 0xc0, 0x01, 0xc0, 0x0f, 0xfc, 0x00, 0xc0, 0xff, 0xff, 0x00, 0x40, 0xfc, 0x8f, 0x00, 0x00, 0x18, 0x06, 0x00, 0x00, 0x08, 0x04, 0x00}, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}; From jerub at users.sourceforge.net Tue Apr 18 04:42:53 2006 From: jerub at users.sourceforge.net (Stephen Thorne) Date: Tue, 18 Apr 2006 09:42:53 +0000 Subject: [netrek-cvs] server/Vanilla README.OSX,NONE,1.1 Message-ID: Update of /cvsroot/netrek/server/Vanilla In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11206 Added Files: README.OSX Log Message: Add a readme for OSX --- NEW FILE: README.OSX --- To build this project using darwinports, use the following ./configure line: ./configure --with-gmp-incdir=/opt/local/include --with-gmp-libdir=/opt/local/lib From modemhero at users.sourceforge.net Wed Apr 19 08:02:35 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 19 Apr 2006 13:02:35 +0000 Subject: [netrek-cvs] client/netrekxp/include data.h, 1.4, 1.5 proto.h, 1.4, 1.5 Message-ID: Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19533/include Modified Files: data.h proto.h Log Message: Rewrote TTS centering/refresh code so that text is properly centered and clears properly when the message expires. The old code used an average text width that was not so good, resulting in poor centering for long messages. The new code measures the length of the message directly. Also, the W_ClearArea function was not catching the 3 left-most pixels for whatever reason, so the call to this function slightly extends the area to clear. Updated COW manual to reflect change of tts_pos variable to tts_ypos. This patch could be applied to other windows clients as well. Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- data.h 18 Apr 2006 13:41:48 -0000 1.4 +++ data.h 19 Apr 2006 13:02:33 -0000 1.5 @@ -392,10 +392,11 @@ extern int tts_len; extern int tts_max_len; -extern int tts_width; +extern int last_tts_xpos; +extern int last_tts_width; extern int tts_timer; extern int tts_time; -extern int tts_pos; +extern int tts_ypos; extern char lastIn[100]; #endif /* BEEPLITE */ Index: proto.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- proto.h 18 Apr 2006 13:41:48 -0000 1.4 +++ proto.h 19 Apr 2006 13:02:33 -0000 1.5 @@ -687,17 +687,14 @@ W_Icon icon, W_Color color); void W_EraseTTSText (W_Window window, - int max_width, - int y, - int width); + int last_tts_xpos, + int tts_ypos, + int last_tts_width); void W_WriteTTSText (W_Window window, int max_width, - int y, - int width, + int tts_ypos, char *str, int len); -int W_TTSTextWidth (char *s, - int len); void W_SetWindowName (W_Window window, char *name); inline void ResetSysColors (void); From modemhero at users.sourceforge.net Wed Apr 19 08:02:35 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 19 Apr 2006 13:02:35 +0000 Subject: [netrek-cvs] client/netrekxp/src beeplite.c, 1.1, 1.2 data.c, 1.4, 1.5 defaults.c, 1.4, 1.5 mswindow.c, 1.5, 1.6 redraw.c, 1.3, 1.4 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19533/src Modified Files: beeplite.c data.c defaults.c mswindow.c redraw.c Log Message: Rewrote TTS centering/refresh code so that text is properly centered and clears properly when the message expires. The old code used an average text width that was not so good, resulting in poor centering for long messages. The new code measures the length of the message directly. Also, the W_ClearArea function was not catching the 3 left-most pixels for whatever reason, so the call to this function slightly extends the area to clear. Updated COW manual to reflect change of tts_pos variable to tts_ypos. This patch could be applied to other windows clients as well. Index: redraw.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/redraw.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- redraw.c 18 Apr 2006 13:41:48 -0000 1.3 +++ redraw.c 19 Apr 2006 13:02:33 -0000 1.4 @@ -102,29 +102,24 @@ #ifdef BEEPLITE if (tts_timer) { - static int last_width; - tts_timer--; if (!tts_timer) { /* timed out */ - W_EraseTTSText(w, WINSIDE, tts_pos, last_width); - last_width = 0; + W_EraseTTSText(w, last_tts_xpos, tts_ypos, last_tts_width); + last_tts_width = 0; } - else if (tts_timer == tts_time - 1 && last_width) + else if (tts_timer == tts_time - 1 && last_tts_width) { /* first draw -- erase previous */ - W_EraseTTSText(w, WINSIDE, tts_pos, last_width); + W_EraseTTSText(w, last_tts_xpos, tts_ypos, last_tts_width); /* draw new */ - W_WriteTTSText(w, WINSIDE, tts_pos, tts_width, lastIn, - tts_len); - last_width = tts_width; + W_WriteTTSText(w, WINSIDE, tts_ypos, lastIn, tts_len); } else { /* regular draw */ - W_WriteTTSText(w, WINSIDE, tts_pos, tts_width, lastIn, tts_len); - last_width = tts_width; + W_WriteTTSText(w, WINSIDE, tts_ypos, lastIn, tts_len); } } #endif Index: mswindow.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- mswindow.c 18 Apr 2006 13:41:48 -0000 1.5 +++ mswindow.c 19 Apr 2006 13:02:33 -0000 1.6 @@ -27,6 +27,7 @@ #include #include + #include "copyright2.h" #include "config.h" #include "Wlib.h" @@ -4580,30 +4581,26 @@ } #ifdef BEEPLITE -void W_EraseTTSText(W_Window window, int max_width, int y, int width) +void W_EraseTTSText(W_Window window, int last_tts_xpos, int tts_ypos, int last_tts_width) { - register int x = (max_width - width) / 2; + tts_ypos -= W_Textheight; - if (x < 0) - x = 4; - y -= W_Textheight; + last_tts_xpos -= 3; + last_tts_width += 3; - W_ClearArea(window, x, y, width, W_Textheight); + W_ClearArea(window, last_tts_xpos, tts_ypos, last_tts_width, W_Textheight); } -void W_WriteTTSText(W_Window window, int max_width, int y, int width, char *str, int len) +void W_WriteTTSText(W_Window window, int max_width, int tts_ypos, char *str, int len) { - register int x = (max_width - width) / 2; + register int x; HDC hdc; + SIZE ext; FNHEADER_VOID; - if (x < 0) - x = 4; - - y -= W_Textheight; + tts_ypos -= W_Textheight; hdc = GetDC(win->hwnd); - if (NetrekPalette) { SelectPalette(hdc, NetrekPalette, FALSE); @@ -4612,13 +4609,14 @@ SetTextColor(hdc, colortable[GREY].rgb); SetBkMode(hdc, TRANSPARENT); - TextOut(hdc, x, y, str, len); + GetTextExtentPoint32 (hdc, str, len, &ext); + x = (max_width - ext.cx)/2; + if (x < 0) + x = 4; + TextOut(hdc, x, tts_ypos, str, len); ReleaseDC(win->hwnd, hdc); -} - -int W_TTSTextWidth(char *s, int len) -{ - return len*W_Textwidth; + last_tts_xpos = x; + last_tts_width = ext.cx; } #endif Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- defaults.c 18 Apr 2006 13:41:48 -0000 1.4 +++ defaults.c 19 Apr 2006 13:02:33 -0000 1.5 @@ -1519,7 +1519,7 @@ tts_time = intDefault("tts_time", tts_time); tts_max_len = intDefault("tts_max_len", tts_max_len); - tts_pos = intDefault("tts_pos", tts_pos); + tts_ypos = intDefault("tts_ypos", tts_ypos); #endif /* BEEPLITE */ shipdefaults[DEFAULTSHIP].keymap = (unsigned char *) stringDefault ("keymap"); @@ -1725,7 +1725,7 @@ saveFile = stringDefault ("saveFile"); if (!saveFile) { - saveFile = (char *) malloc (sizeof (char) * 12); + saveFile = (char *) malloc (sizeof (char) * 13); sprintf (saveFile, "%s", "netrekrc.sav"); } Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- data.c 18 Apr 2006 13:41:48 -0000 1.4 +++ data.c 19 Apr 2006 13:02:33 -0000 1.5 @@ -488,10 +488,11 @@ int tts_len = 0; int tts_max_len = 40; -int tts_width = 0; +int last_tts_xpos = 0; +int last_tts_width = 0; int tts_timer = 0; int tts_time = 25; -int tts_pos = WINSIDE / 2 - 16; /* as found in redraw.c * +int tts_ypos = WINSIDE / 2 - 16; /* as found in redraw.c * * * * originally */ Index: beeplite.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/beeplite.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- beeplite.c 18 Apr 2006 13:47:24 -0000 1.1 +++ beeplite.c 19 Apr 2006 13:02:33 -0000 1.2 @@ -1,6 +1,13 @@ /* beeplite.c * * $Log$ + * Revision 1.2 2006/04/19 13:02:33 modemhero + * Rewrote TTS centering/refresh code so that text is properly centered and clears properly when the message expires. + * The old code used an average text width that was not so good, resulting in poor centering for long messages. The new code measures the length of the message directly. + * Also, the W_ClearArea function was not catching the 3 left-most pixels for whatever reason, so the call to this function slightly extends the area to clear. + * Updated COW manual to reflect change of tts_pos variable to tts_ypos. + * This patch could be applied to other windows clients as well. + * * Revision 1.1 2006/04/18 13:47:24 modemhero * First attempt at reimport of beeplite into NetrekXP. Unresolved issue: improper text clearing on TTS beeplite messages. Still to add: saving of beeplite settings in save_options. * @@ -253,7 +260,6 @@ for (tts_len = 0; (*pm != '|' && tts_len < tts_max_len); tts_len++) lastIn[tts_len] = *pm++; lastIn[tts_len] = '\0'; - tts_width = W_TTSTextWidth(lastIn, tts_len); tts_timer = tts_time; } break; From modemhero at users.sourceforge.net Wed Apr 19 08:02:35 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 19 Apr 2006 13:02:35 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.9, 1.10 cow.doc, 1.1.1.1, 1.2 cow.txt, 1.1.1.1, 1.2 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19533/resources/docs Modified Files: changes.txt cow.doc cow.txt Log Message: Rewrote TTS centering/refresh code so that text is properly centered and clears properly when the message expires. The old code used an average text width that was not so good, resulting in poor centering for long messages. The new code measures the length of the message directly. Also, the W_ClearArea function was not catching the 3 left-most pixels for whatever reason, so the call to this function slightly extends the area to clear. Updated COW manual to reflect change of tts_pos variable to tts_ypos. This patch could be applied to other windows clients as well. Index: cow.doc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/cow.doc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- cow.doc 21 Jan 2003 21:27:59 -0000 1.1.1.1 +++ cow.doc 19 Apr 2006 13:02:33 -0000 1.2 @@ -13,7 +13,8 @@ * Dave Gosselin, Heiko Wengler, Kurt Siegl and many others. * * * ******************************************************************************** - + + Table of Contents @@ -23,7 +24,8 @@ 4.0 Xtrekrc 8.0 Compiling 9.0 Guide to Related Valuable information - + + 1.0 Overview @@ -39,7 +41,8 @@ regularly. This alleviates the client's caretakers from having to support ancient clients. Generally, a client will expire 60 days after its compile date. - + + 2.0 Acknowledgements Many people have contributed to COW and many many others contributed @@ -70,7 +73,8 @@ Kevin Powell seurat Alec Habig Entropy - + + 3.0 Features The COW client has many features that make it stand out from earlier @@ -2233,7 +2237,7 @@ tts_color: color of TTS message (should be dark) tts_font: Font (large prefered) -tts_max_len: Max length of a message +tts_max_len: Max length of a message tts_time: Time a TTS message is displayed -tts_pos: y location of the TTS message +tts_ypos: y location of the TTS message Index: cow.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/cow.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- cow.txt 21 Jan 2003 21:28:01 -0000 1.1.1.1 +++ cow.txt 19 Apr 2006 13:02:33 -0000 1.2 @@ -754,12 +754,11 @@ planetCycleTime: highlighting time for planets playerCycleTime: highlighting time for players -[ Note: while TTS works, thefollowing are Not Yet Implemented in WinCOW ] tts_color: color of TTS message (should be dark) tts_font: Font (large prefered) tts_max_len: Max length of a message tts_time: Time a TTS message is displayed -tts_pos: y location of the TTS message +tts_ypos: y location of the TTS message 4.2.3. WarnHull Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- changes.txt 18 Apr 2006 13:41:48 -0000 1.9 +++ changes.txt 19 Apr 2006 13:02:33 -0000 1.10 @@ -1,4 +1,9 @@ Version TBA: +- rewrote TTS centering/refresh code so that text is properly centered and clears + properly when the message expires. Updated COW manual to reflect change of tts_pos + variable to tts_ypos. +- fixed crash bug in save options due to renaming of .sav file from xtrekrc to netrekrc. + This bug is not in the downloadable version. - readded beeplite functionality. Configuration options described in cow manual. Basic rc options are useLite: on/off to turn beeplite on and off, and defLite: on/off to use the default settings. The beeplite option is highly configurable, see manual From modemhero at users.sourceforge.net Wed Apr 19 10:18:29 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 19 Apr 2006 15:18:29 +0000 Subject: [netrek-cvs] client/netrekxp/src beeplite.c, 1.2, 1.3 data.c, 1.5, 1.6 defaults.c, 1.5, 1.6 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3637/src Modified Files: beeplite.c data.c defaults.c Log Message: Tidied up the save_options function, fixing some spacing errors, and puttting the keymap/buttonmap on the top of the list due to its importance. Also added the sounddir option. The eventual goal is to make save_options generate a file that contains everything from your netrekrc file, so the options menus act as an in-game netrekrc editor. Once everything is in place, save_options could write over your current netrekrc (the default will be to write to a separate file, but there will be a menu option to save over your netrekrc). Currently it writes to a separate file (netrek.sav) because it still doesn't save everything that is needed. Default windows placements need to be saved, uselite options need to be saved, review window mapping needs to be saved, option server/servernick/servertype needs to be saved, and lastly, the save keymap routine is broken. Fixed mainResizeable loading from rc/saving. Also made default setting = on. Index: beeplite.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/beeplite.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- beeplite.c 19 Apr 2006 13:02:33 -0000 1.2 +++ beeplite.c 19 Apr 2006 15:18:27 -0000 1.3 @@ -1,6 +1,20 @@ /* beeplite.c * * $Log$ + * Revision 1.3 2006/04/19 15:18:27 modemhero + * Tidied up the save_options function, fixing some spacing errors, and puttting the + * keymap/buttonmap on the top of the list due to its importance. Also added the + * sounddir option. The eventual goal is to make save_options generate a file that contains + * everything from your netrekrc file, so the options menus act as an in-game netrekrc editor. + * Once everything is in place, save_options could write over your current netrekrc (the default + * will be to write to a separate file, but there will be a menu option to save over your netrekrc). + * Currently it writes to a separate file (netrek.sav) because it still doesn't save everything that is needed. + * Default windows placements need to be saved, uselite options need to be saved, review window mapping + * needs to be saved, option server/servernick/servertype needs to be saved, and lastly, the save + * keymap routine is broken. + * + * Fixed mainResizeable loading from rc/saving. Also made default setting = on. + * * Revision 1.2 2006/04/19 13:02:33 modemhero * Rewrote TTS centering/refresh code so that text is properly centered and clears properly when the message expires. * The old code used an average text width that was not so good, resulting in poor centering for long messages. The new code measures the length of the message directly. @@ -13,7 +27,6 @@ * * Revision 1.1.1.1 1998/11/01 17:24:08 siegl * COW 3.0 initial revision - * Added back to NetrekXP 2006/04/17 balcerski * */ Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- defaults.c 19 Apr 2006 13:02:33 -0000 1.5 +++ defaults.c 19 Apr 2006 15:18:27 -0000 1.6 @@ -183,7 +183,7 @@ NULL } }, - {"mainResizeable", &logging, RC_BOOL, + {"mainResizeable", &mainResizeable, RC_BOOL, { "Make main window resizeable", NULL @@ -1745,39 +1745,7 @@ sprintf (str, "Saving options to: %s", save_file); warning (str); - - so = save_options; - while (so->name != NULL) - { - switch (so->type) - { - case RC_INT: - sprintf (str, "%s: %d\n", so->name, *so->int_value); - break; - case RC_BOOL: - if (*so->int_value) - sprintf (str, "%s: on\n", so->name); - else - sprintf (str, "%s: off\n", so->name); - break; - } - if (saveBig) - { - i = 0; - while (so->desc[i] != NULL) - { - sprintf (str1, "# %s\n", so->desc[i]); - fputs (str1, fp); - i++; - } - } - fputs (str, fp); - if (saveBig) - fputs ("\n", fp); - so++; - } - - + // Let's print buttonmap str[0] = '\0'; str1[0] = '\0'; @@ -1810,15 +1778,7 @@ } if (saveBig && strlen (str1) != 0) fputs ("\n", fp); - - // cloak chars - if (saveBig) - fputs ("# Two characters to show cloaked player on map window\n", fp); - sprintf (str, "cloakChars: %c%c\n", cloakChars[0], cloakChars[1]); - fputs (str, fp); - if (saveBig) - fputs ("\n", fp); - + // keymap part // we're going to print only keymap that differs from standard one // we have to start from second key, because first one is space @@ -1869,6 +1829,57 @@ fputs ("\n", fp); } + // Large list of save options + so = save_options; + while (so->name != NULL) + { + switch (so->type) + { + case RC_INT: + sprintf (str, "%s: %d\n", so->name, *so->int_value); + break; + case RC_BOOL: + if (*so->int_value) + sprintf (str, "%s: on\n", so->name); + else + sprintf (str, "%s: off\n", so->name); + break; + } + if (saveBig) + { + i = 0; + while (so->desc[i] != NULL) + { + sprintf (str1, "# %s\n", so->desc[i]); + fputs (str1, fp); + i++; + } + } + fputs (str, fp); + if (saveBig) + fputs ("\n", fp); + so++; + } + + // cloak chars + if (saveBig) + fputs ("# Two characters to show cloaked player on map window\n", fp); + sprintf (str, "cloakChars: %c%c\n", cloakChars[0], cloakChars[1]); + fputs (str, fp); + if (saveBig) + fputs ("\n", fp); + + // sound directory + if (sounddir != NULL) + { + if (saveBig) + fputs ("# Sound directory\n", fp); + sprintf (str, "sounddir: %s\n", sounddir); + fputs (str, fp); + if (saveBig) + fputs ("\n", fp); + } + // player list if (strlen (plistLayout) != 0) { @@ -2085,12 +2096,12 @@ if (macro[i].key != 0) { if (macro[i].key > 127) - sprintf (str, "macro.^%c.%c:%s\n", + sprintf (str, "macro.^%c.%c: %s\n", getkeyfromctrl (macro[i].key), macro[i].who, macro[i].string); else - sprintf (str, "macro.%c.%c:%s\n", + sprintf (str, "macro.%c.%c: %s\n", getkeyfromctrl (macro[i].key), macro[i].who, macro[i].string); @@ -2105,11 +2116,11 @@ if (macro[i].key != 0) { if (macro[i].key > 127) - sprintf (str, "mac.^%c:%s\n", + sprintf (str, "mac.^%c: %s\n", getkeyfromctrl (macro[i].key), macro[i].string); else - sprintf (str, "mac.%c:%s\n", + sprintf (str, "mac.%c: %s\n", getkeyfromctrl (macro[i].key), macro[i].string); @@ -2123,12 +2134,12 @@ if (macro[i].key != 0) { if (macro[i].key > 127) - sprintf (str, "mac.^%c.%c:%s\n", + sprintf (str, "mac.^%c.%c: %s\n", getkeyfromctrl (macro[i].key), macro[i].who, macro[i].string); else - sprintf (str, "mac.%c.%c:%s\n", + sprintf (str, "mac.%c.%c: %s\n", getkeyfromctrl (macro[i].key), macro[i].who, macro[i].string); @@ -2150,27 +2161,26 @@ switch (macro[i].who) { case MACRO_PLAYER: - strcat (str, "%p:"); + strcat (str, "%p: "); break; case MACRO_TEAM: - strcat (str, "%t:"); + strcat (str, "%t: "); break; case MACRO_FRIEND: - strcat (str, "%g:"); + strcat (str, "%g: "); break; case MACRO_ENEMY: - strcat (str, "%h:"); + strcat (str, "%h: "); break; case MACRO_ME: - strcat (str, "%i:"); + strcat (str, "%i: "); break; } strcat (str, macro[i].string); strcat (str, "\n"); + fputs (str, fp); if (macro[i+1].type != NEWMMOUSE) fputs ("\n", fp); - - fputs (str, fp); } break; #ifdef NBT @@ -2220,7 +2230,7 @@ strcpy (str, "dist."); strcat (str, dm->name); - strcat (str, ":"); + strcat (str, ": "); strcat (str, dm->macro); strcat (str, "\n"); @@ -2242,14 +2252,9 @@ for (dm = &rcm_msg[1]; dm->name; dm++) { - sprintf (str, "msg.%s:%s\n", dm->name, dm->macro); + sprintf (str, "msg.%s: %s\n", dm->name, dm->macro); fputs (str, fp); } - - fputs ("\n", fp); - - if (saveBig) - fputs ("\n", fp); } #endif Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- data.c 19 Apr 2006 13:02:33 -0000 1.5 +++ data.c 19 Apr 2006 15:18:27 -0000 1.6 @@ -677,7 +677,7 @@ int agriColor = 2; int windowMove = 0; -int mainResizeable = 0; +int mainResizeable = 1; int observerMode = 0; int showHockeyScore = 1; From modemhero at users.sourceforge.net Wed Apr 19 10:18:29 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 19 Apr 2006 15:18:29 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.10,1.11 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3637/resources/docs Modified Files: changes.txt Log Message: Tidied up the save_options function, fixing some spacing errors, and puttting the keymap/buttonmap on the top of the list due to its importance. Also added the sounddir option. The eventual goal is to make save_options generate a file that contains everything from your netrekrc file, so the options menus act as an in-game netrekrc editor. Once everything is in place, save_options could write over your current netrekrc (the default will be to write to a separate file, but there will be a menu option to save over your netrekrc). Currently it writes to a separate file (netrek.sav) because it still doesn't save everything that is needed. Default windows placements need to be saved, uselite options need to be saved, review window mapping needs to be saved, option server/servernick/servertype needs to be saved, and lastly, the save keymap routine is broken. Fixed mainResizeable loading from rc/saving. Also made default setting = on. Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- changes.txt 19 Apr 2006 13:02:33 -0000 1.10 +++ changes.txt 19 Apr 2006 15:18:26 -0000 1.11 @@ -1,4 +1,8 @@ Version TBA: +- tidied up the save_options function, fixing some spacing errors, and puttting the + keymap/buttonmap on the top of the list due to its importance. Also added the + sounddir option. +- fixed mainResizeable loading from rc/saving. Also made default setting = on. - rewrote TTS centering/refresh code so that text is properly centered and clears properly when the message expires. Updated COW manual to reflect change of tts_pos variable to tts_ypos. From modemhero at users.sourceforge.net Thu Apr 20 01:13:52 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 20 Apr 2006 06:13:52 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.11,1.12 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7669a/resources/docs Modified Files: changes.txt Log Message: Fix to resource file header so icon displays properly. Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- changes.txt 19 Apr 2006 15:18:26 -0000 1.11 +++ changes.txt 20 Apr 2006 06:13:50 -0000 1.12 @@ -1,4 +1,5 @@ Version TBA: +- fixed bccnetrek.rc to have proper header so icon works - tidied up the save_options function, fixing some spacing errors, and puttting the keymap/buttonmap on the top of the list due to its importance. Also added the sounddir option. From modemhero at users.sourceforge.net Thu Apr 20 01:13:52 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 20 Apr 2006 06:13:52 +0000 Subject: [netrek-cvs] client/netrekxp/src bccnetrek.rc,1.2,1.3 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7669a/src Modified Files: bccnetrek.rc Log Message: Fix to resource file header so icon displays properly. Index: bccnetrek.rc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/bccnetrek.rc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- bccnetrek.rc 12 Apr 2006 04:20:03 -0000 1.2 +++ bccnetrek.rc 20 Apr 2006 06:13:50 -0000 1.3 @@ -1,3 +1,5 @@ +#include "resource.h" + 1 VERSIONINFO FILEVERSION 4, 4, 0, 1 PRODUCTVERSION 4, 4, 0, 1 From modemhero at users.sourceforge.net Thu Apr 20 01:48:22 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 20 Apr 2006 06:48:22 +0000 Subject: [netrek-cvs] client/netrekxp/src newwin.c,1.7,1.8 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1856/src Modified Files: newwin.c Log Message: Fix to bitmap finding routine. Index: newwin.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- newwin.c 18 Apr 2006 13:41:48 -0000 1.7 +++ newwin.c 20 Apr 2006 06:48:20 -0000 1.8 @@ -49,26 +49,6 @@ #define YOFF -25 /******************************************************************************/ -/*** bitmapExists() -/*** Called by loadbitmaps() to verify bitmap files exist. */ -/******************************************************************************/ -int bitmapExists (char * fileName) -{ - struct stat buf; - char dir[30]; - int i; - - sprintf(dir, "bitmaps/shiplib/"); - strcat(dir, fileName); - i = stat ( dir, &buf ); - - if ( i == 0 ) - return 1; - else - return 0; -} - -/******************************************************************************/ /*** loadbitmaps(), loadbitmaps1(), loadbitmapsT(), loadbitmapsG(), loadbitmapsM() /*** Called by savebitmaps(). */ @@ -87,11 +67,11 @@ { int j,k; - if (bitmapExists("fedship.bmp") - && bitmapExists("indship.bmp") - && bitmapExists("kliship.bmp") - && bitmapExists("oriship.bmp") - && bitmapExists("romship.bmp")) + if ( access("bitmaps/shiplib/fedship.bmp", R_OK) == 0 + && access("bitmaps/shiplib/indship.bmp", R_OK) == 0 + && access("bitmaps/shiplib/kliship.bmp", R_OK) == 0 + && access("bitmaps/shiplib/oriship.bmp", R_OK) == 0 + && access("bitmaps/shiplib/romship.bmp", R_OK) == 0 ) { ship_bitmaps[0] = W_StoreBitmap3 (fed_ship_bmp, BMP_SHIP_WIDTH * 8, @@ -165,11 +145,11 @@ { int j,k; - if (bitmapExists("fedship1.bmp") - && bitmapExists("indship1.bmp") - && bitmapExists("kliship1.bmp") - && bitmapExists("oriship1.bmp") - && bitmapExists("romship1.bmp")) + if ( access("bitmaps/shiplib/fedship1.bmp", R_OK) == 0 + && access("bitmaps/shiplib/indship1.bmp", R_OK) == 0 + && access("bitmaps/shiplib/kliship1.bmp", R_OK) == 0 + && access("bitmaps/shiplib/oriship1.bmp", R_OK) == 0 + && access("bitmaps/shiplib/romship1.bmp", R_OK) == 0 ) { ship_bitmaps1[0] = W_StoreBitmap3 (fed_ship_bmp_1, BMP_SHIP_WIDTH * 8, @@ -242,11 +222,11 @@ { int j,k; - if (bitmapExists("fedshipT.bmp") - && bitmapExists("indshipT.bmp") - && bitmapExists("klishipT.bmp") - && bitmapExists("orishipT.bmp") - && bitmapExists("romshipT.bmp")) + if ( access("bitmaps/shiplib/fedshipT.bmp", R_OK) == 0 + && access("bitmaps/shiplib/indshipT.bmp", R_OK) == 0 + && access("bitmaps/shiplib/klishipT.bmp", R_OK) == 0 + && access("bitmaps/shiplib/orishipT.bmp", R_OK) == 0 + && access("bitmaps/shiplib/romshipT.bmp", R_OK) == 0 ) { ship_bitmapsT[0] = W_StoreBitmap3 (fed_ship_bmp_T, BMP_SHIP_WIDTH * 8, @@ -319,11 +299,11 @@ { int j,k; - if (bitmapExists("fedshipG.bmp") - && bitmapExists("indshipG.bmp") - && bitmapExists("klishipG.bmp") - && bitmapExists("orishipG.bmp") - && bitmapExists("romshipG.bmp")) + if ( access("bitmaps/shiplib/fedshipG.bmp", R_OK) == 0 + && access("bitmaps/shiplib/indshipG.bmp", R_OK) == 0 + && access("bitmaps/shiplib/klishipG.bmp", R_OK) == 0 + && access("bitmaps/shiplib/orishipG.bmp", R_OK) == 0 + && access("bitmaps/shiplib/romshipG.bmp", R_OK) == 0 ) { ship_bitmapsG[0] = W_StoreBitmap3 (fed_ship_bmp_G, BMP_SHIP_WIDTH * 8, From modemhero at users.sourceforge.net Thu Apr 20 01:48:22 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 20 Apr 2006 06:48:22 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.12,1.13 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1856/resources/docs Modified Files: changes.txt Log Message: Fix to bitmap finding routine. Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- changes.txt 20 Apr 2006 06:13:50 -0000 1.12 +++ changes.txt 20 Apr 2006 06:48:20 -0000 1.13 @@ -1,4 +1,5 @@ Version TBA: +- rewrote find bitmap routine in a smarter way (thanks Quozl) - fixed bccnetrek.rc to have proper header so icon works - tidied up the save_options function, fixing some spacing errors, and puttting the keymap/buttonmap on the top of the list due to its importance. Also added the From modemhero at users.sourceforge.net Thu Apr 20 03:58:50 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 20 Apr 2006 08:58:50 +0000 Subject: [netrek-cvs] client/netrekxp/resources/misclib/mono icon.bmp, 1.1.1.1, NONE Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/misclib/mono In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10029/resources/misclib/mono Removed Files: icon.bmp Log Message: Removed outdate icon. --- icon.bmp DELETED --- From modemhero at users.sourceforge.net Fri Apr 21 06:37:07 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 21 Apr 2006 11:37:07 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp Table of Contents.hhc, 1.1, 1.2 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21896/resources/htmlhelp Modified Files: Table of Contents.hhc Log Message: Vastly updated the html help, fixing grammar/spelling errors, updating info that needed updating, etc. Index: Table of Contents.hhc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/Table of Contents.hhc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Table of Contents.hhc 12 Apr 2006 04:31:03 -0000 1.1 +++ Table of Contents.hhc 21 Apr 2006 11:37:05 -0000 1.2 @@ -14,6 +14,11 @@
  • + + + + +
  • From modemhero at users.sourceforge.net Fri Apr 21 06:37:08 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 21 Apr 2006 11:37:08 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html basics.html, 1.1, 1.2 commandline.html, 1.1, 1.2 configfile.html, 1.1, 1.2 configsyntax.html, 1.1, 1.2 controlsintro.html, 1.1, 1.2 dashboard.html, 1.1, 1.2 defaultmap.html, 1.1, 1.2 galaxy.html, 1.1, 1.2 gamecontrols.html, 1.1, 1.2 generalconfig.html, 1.1, 1.2 intro.html, 1.1, 1.2 jointhegame.html, 1.1, 1.2 loginscreen.html, 1.1, 1.2 macrosconfig.html, 1.1, 1.2 mainwindows.html, 1.1, 1.2 messages.html, 1.1, 1.2 metaserver.html, 1.1, 1.2 motdwindow.html, 1.1, 1.2 playerlist.html, 1.1, 1.2 plistconfig.html, 1.1, 1.2 remapping.html, 1.1, 1.2 serversettings.html, 1.1, 1.2 tactical.html, 1.1, 1.2 teamselect.html, 1.1, 1.2 windowsconfig.html, 1.1, 1.2 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21896/resources/htmlhelp/html Modified Files: basics.html commandline.html configfile.html configsyntax.html controlsintro.html dashboard.html defaultmap.html galaxy.html gamecontrols.html generalconfig.html intro.html jointhegame.html loginscreen.html macrosconfig.html mainwindows.html messages.html metaserver.html motdwindow.html playerlist.html plistconfig.html remapping.html serversettings.html tactical.html teamselect.html windowsconfig.html Log Message: Vastly updated the html help, fixing grammar/spelling errors, updating info that needed updating, etc. Index: gamecontrols.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/gamecontrols.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gamecontrols.html 12 Apr 2006 04:31:03 -0000 1.1 +++ gamecontrols.html 21 Apr 2006 11:37:05 -0000 1.2 @@ -7,7 +7,7 @@

    Game Controls

    -In this section you will learn how to use mouse and keyboard to fly your ship, +In this section you will learn how to use the mouse and keyboard to fly your ship, change options, etc.

    Section topics: Index: intro.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/intro.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- intro.html 12 Apr 2006 04:31:03 -0000 1.1 +++ intro.html 21 Apr 2006 11:37:05 -0000 1.2 @@ -7,15 +7,13 @@

    Introduction

    -NetrekXP Mod is a client for Netrek - multiplayer battle simulation game. +NetrekXP is a client for Netrek, an online multiplayer space combat game. -The program is modification of existing client called NetrekXP (yeah, this is -where 'Mod' comes from). All Netrek clients have some similarities and some +The current version of NetrekXP was originally based on an existing client called COW. Work on the NetrekXP client has been done by Steve Sheldon, Stas Pirogov, and Bill Balcerski. All Netrek clients have some similarities and some differences. I would recommend trying each and every one of them before -making decision on what client to play with. +making a decision on what client to play with.

    -This reference will help you to get familiar with the program, its configurations -and possible customizations. +This help file will let you get familiar with the program and its possible customizations. Help file originally written by Stas Pirogov, modified by Bill Balcerski.

    Manual Sections:

      Index: windowsconfig.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/windowsconfig.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- windowsconfig.html 12 Apr 2006 04:31:03 -0000 1.1 +++ windowsconfig.html 21 Apr 2006 11:37:05 -0000 1.2 @@ -7,7 +7,7 @@

      Windows Configuration

      -First of all let's list names of NetrekXP Mod windows: +First of all let's list the names of the NetrekXP windows:

      • netrek - Main window
      • local - Tactical window
        • @@ -22,6 +22,7 @@
      • review_phaser - Window that receives Phaser messages
      • planet - Planet list window
      • player - Player list window
        • +
      • player2 - Alternate player list window
      • war - War declaration window
      • fed - Federation selection window
      • ori - Orion selection window
        • @@ -79,11 +80,11 @@ netrek.geometry: 1024x768 - only size parameters
        netrek.geometry: +0+0 - only placement parameters

        -Above options can be used with any window. +The above options can be used with any window.

        -Next option can only be used with message windows: +The next option can only be used with message windows:

        -<message window>.allow: [A][T][I][P][K] - choose type of messages printed in message window +<message window>.allow: [A][T][I][P][K] - choose what type of messages that are printed in the message window

        • A - All messages
        • T - Team messages
          • Index: dashboard.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/dashboard.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- dashboard.html 12 Apr 2006 04:31:03 -0000 1.1 +++ dashboard.html 21 Apr 2006 11:37:05 -0000 1.2 @@ -7,28 +7,28 @@

          Dashboard

          -Dashboard window contains vital ship information and weapons used: +The dashboard window contains vital ship information:

          -The window is divided roughly in two parts - Flags and Gauges +The window is divided roughly into two parts - Flags and Gauges

          Let's get familiar with them:

          • Flags from left to right:
              • -
            • S - shields on
              • -
            • G/Y/R - flag that shows proxymity alert. G for green, Y - yellow, R - red
              • -
            • L - you are locked on something (player or planet)
              • -
            • R - you are repairing
              • -
            • B - you are bombing
              • -
            • O - you are orbiting planet
              • -
            • D - you are docking startbase (or if you are starbase then docking is enabled)
              • -
            • C - you are cloaked
              • -
            • W - your weapons are hot
              • -
            • E - your engine is hot
              • -
            • P/T - you are pressoring or tractoring somebody
              • -
            • u/d - you are beaming armies up or down
              • +
            • S - shows if your shields are on
              • +
            • G/Y/R - flag that shows proximity alert. G for green, Y - yellow, R - red
              • +
            • L - shows if you are locked on something (player or planet)
              • +
            • R - shows if you are repairing
              • +
            • B - shows if you are bombing
              • +
            • O - shows if you are orbiting a planet
              • +
            • D - shows if you are docking at a starbase (or if you are a starbase, then if docking is enabled)
              • +
            • C - shows if you are cloaked
              • +
            • W - shows if your weapons are hot
              • +
            • E - shows if your engine is hot
              • +
            • P/T - shows if you are pressoring or tractoring somebody
              • +
            • u/d - shows if you are beaming armies up or down
          • Gauges:
              • @@ -36,8 +36,8 @@
            • Sh - shields damage points
            • Da - hull damage points
            • Ar - armies carried
              • -
            • Wt - weapons temperature
              • -
            • Et - egnine temperature
              • +
            • Wt - weapon temperature
              • +
            • Et - engine temperature
            • Fu - fuel available
            • Kills - number of kills
            Index: loginscreen.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/loginscreen.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- loginscreen.html 12 Apr 2006 04:31:03 -0000 1.1 +++ loginscreen.html 21 Apr 2006 11:37:05 -0000 1.2 @@ -8,25 +8,25 @@

            Login Screen

            After successfull connection to the server you will see the main game window. It is -divided to four parts initially, but we will get familiar with each of them in the -next topics. +divided into four parts initially, but we will get familiar with each of them in the +next topic.

            -If your client isn't configured to automatically login you to the game you will be +If your client isn't configured to automatically login to the game, you will be asked to supply your username and password to join the game (or observe the game).

            -The login window is located on the top left of main screen: +The login window is located on the top left of the main screen:

            There are two types of logins on most servers - guest user and authenticated user.

            -If you type "guest" as your name or push Ctrl-g you will not be required to supply password. There are +If you type "guest" as your name or push Ctrl-g you will not be required to supply a password. There are some differences between guest users and authenticated users. The major difference is -that no information is written to the server players database for guests. So when you +that no information is written to the server's player database for guests. So when you disconnect from the game all your statistics are wiped out.

            -For authenticated users everything is saved to players database, so when you come next -time to the server and supply your name and password you will start the game with statistics +For authenticated users everything is saved to the player database, so when you next come +to the server and supply your name and password, you will start the game with statistics that were saved for you from the last session. \ No newline at end of file Index: macrosconfig.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/macrosconfig.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- macrosconfig.html 12 Apr 2006 04:31:03 -0000 1.1 +++ macrosconfig.html 21 Apr 2006 11:37:05 -0000 1.2 @@ -12,18 +12,18 @@

          • Regular Macros
          • Receiver Configurable Distress Macros
          -The main difference between two is that you send the first type by yourself while second -type is actually how you want other's macros to be showed on your client. +The main difference between the two is that you send the first type by yourself while the second +type is actually how you want other's macros to be shown on your client.

          In order to trigger any of these you should enter Macro Mode. Some macros are used -by players very frequently, so in order to speedup the process you can use +by players very frequently, so in order to speedup the process you can use the following configuration option:

          singleMacro: <keys list for one-push macros>

          Example:
          singleMacro: FE^q - will allow triggering macros defined for F, E and Ctrl-q -by single key push. +by a single key push.

          Regular Macros

          Regular macros can be either single or multiline and their general syntax is: @@ -34,7 +34,7 @@
        • <key> - key to press in macro mode to send macro

          -The key can be in form of: +The key can be in the form of:

          • char - press key on keyboard
          • ^char - press Ctrl+key on keyboard
            • @@ -51,12 +51,12 @@
          • T - send to your Team
          • F - send to Federation
          • K - send to Klingons
            • -
          • O - send ti Orions
            • +
          • O - send to Orions
          • R - send to Romulans
          • a-z - send to player
          • %I, %i, %c - send to yourself
          • %U, %u, %p - send to player nearest your mouse pointer
            • -
          • %Z, %z, %t - send to a team whose player nearest your mouse pointer
            • +
          • %Z, %z, %t - send to a team whose player is nearest your mouse pointer
          • %g - send to friendly player nearest your mouse pointer
          • %h - send to enemy player nearest your mouse pointer
          @@ -65,7 +65,7 @@
        • <macro string> - text string

          -In addition to regular text, macro string can contain: +In addition to regular text, the macro string can contain:

          • %a - armies carried by sender
          • %d - sender damage percentage
            • @@ -141,15 +141,14 @@

            Receiver Configurable Distresses

            -As we already told RCD is opposite to the macro. You decide what do display instead of something that was received -from another player. +As we already said, the RCD is the opposite to the macro. You decide what to display instead of something that was received from another player.

            -There is a limited amount of RCDs because server doesn't actually send any text to you, but instead it tells +There is a limited amount of RCDs because the server doesn't actually send any text to you, but instead it tells your client that player 'x' sent RCD number 'y'. The client then looks what should be displayed when receiving RCD 'y' and creates text that is only displayed in your client.

            -RCD syntax also defines key that will trigger RCD to be sent to others. The distress text will be shown same -whether you send specific RCD or you receive it from other player: +RCD syntax also defines the key that will trigger a RCD to be sent to others. The distress text will be shown the same +whether you send a specific RCD or you receive it from another player:

            dist.<key>.<distress name>: <distress text>

              @@ -185,6 +184,6 @@

            -All RCDs are predefined by client and can be changed if needed. +All RCDs are predefined by the client and can be changed if needed. \ No newline at end of file Index: messages.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/messages.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- messages.html 12 Apr 2006 04:31:03 -0000 1.1 +++ messages.html 21 Apr 2006 11:37:05 -0000 1.2 @@ -9,21 +9,21 @@

            There are roughly 5 types of messages in Netrek:

              -
            • All - such message is seen by everyone in game
              • -
            • Team - this message is seen only by team (race) that it was sent to
              • -
            • Individual - this message is only see by person it was sent to
              • -
            • Phaser - this message is sent from GOD (server) to player that used phaser. The message contains statistics information on damage
              • -
            • Kill - this message is sent by GOD (server) to everyone. Every message contains data on who was killed by whom, what kind of weapon caused death and how much credits were earned
              • +
            • All - this message is seen by everyone in game
              • +
            • Team - this message is seen only by the team (race) that it was sent to
              • +
            • Individual - this message is only seen by the person it was sent to
              • +
            • Phaser - this message is sent from GOD (server) to a player that used a phaser. The message contains statistics information on damage
              • +
            • Kill - this message is sent by GOD (server) to everyone. Every message contains data on who was killed by whom, what kind of weapon caused death, and how many kill credits were earned

            There are 6 different windows that can be used to see these messages:

              -
            • Review - any message is seen there
              • -
            • All - only messages to everyone are seen there
              • +
            • Review - all message are seen there
              • +
            • All - only messages to 'all' are seen there
            • Team - only team messages are seen there
            • Individual - only messages sent to you are seen there
              • -
            • Phaser - phaser messages are see there
              • +
            • Phaser - phaser messages are seen there
            • Kill - only kill messages are seen there

            @@ -31,9 +31,9 @@

            -The default client setup is to show only Review window, so all messages your client receives are displayed there. -It is common to argue about best message window setups. Most veterans tend to play with only one Review -window. This way they know exact time flow of messages (with multiple windows it is impossible to find out what message -arrived before or after any given one). +The default client setup may only show the Review window, so all messages your client receives are displayed there. +It is common to hear people argue about the best message window setups. Most veterans tend to play with only one Review window. This way they know the exact time flow of messages (with multiple windows it is impossible to find out what message arrived before or after any given one). +For advanced users, there is a way to modify which sort of messages are sent to which window. +See Windows Configuration for more details. \ No newline at end of file Index: playerlist.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/playerlist.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- playerlist.html 12 Apr 2006 04:31:03 -0000 1.1 +++ playerlist.html 21 Apr 2006 11:37:05 -0000 1.2 @@ -7,17 +7,17 @@

            Player List

            -Player list window contains information on players in the game. +The player list window contains information on players in the game.

            -The window contains both players and observers, but can be configured to display only part of the at a time. +The window can contain both players and observers, but it can be configured in many ways to fit your choosing.

            -Today servers allow 32 players to exist in game - half playing, half observing. It is easy to see players from -observers by looking at their player number (letter). Anyone below hexadecimal 'f' (15) will be player, others are +Todays servers allow 32 players maximum to exist in game - half playing, half observing. It is easy to tell players from +observers by looking at their player number (letter). Anyone below hexadecimal 'f' (15) will be a player, the others are observers.

            The list contains useful information on other players, such as their name and login, statistics, hours spent playing, etc. -You will get familiar with all details after some time of playing. +You will get familiar with all the details after some time of playing. \ No newline at end of file Index: configfile.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/configfile.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- configfile.html 12 Apr 2006 04:31:03 -0000 1.1 +++ configfile.html 21 Apr 2006 11:37:05 -0000 1.2 @@ -7,11 +7,11 @@

            Configuration File

            -Any of program configuration options can be saved in configuration file. This -way after finding all valuable settings for you it is easy to automatically load -them when you fire up the client to play another game. +Any of your program configuration options can be saved in a configuration file. This +way, after taking the time to choose your favorite settings, they are automatically loaded +when you fire up the client to play another game.

            -NetrekXP Mod searches for following files (in order from top to bottom) in the +NetrekXP searches for following files (in order from top to bottom) in the executable directory:

              @@ -20,7 +20,7 @@
            • xtrekrc
            • xtrekrc.txt
            -So if you have one of these file it will be read at startup and change application +So if you have one of these files it will be read at startup and the change application defaults to whatever values set in the configuration file.

            Section topics: Index: mainwindows.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/mainwindows.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- mainwindows.html 12 Apr 2006 04:31:03 -0000 1.1 +++ mainwindows.html 21 Apr 2006 11:37:05 -0000 1.2 @@ -7,11 +7,11 @@

            Main Game Windows

            -Congratulations, Captain. You sucessfully joined Netrek Universe: +Congratulations, Captain. You have successfully joined the Netrek Universe:

            -Next topics will give you short explanation about windows that compose it: +The next topics will give you a short explanation about the windows that compose the game:

            • Tactical (Local) Window
            • Galaxy (Map) Window
              • Index: generalconfig.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/generalconfig.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- generalconfig.html 12 Apr 2006 04:31:03 -0000 1.1 +++ generalconfig.html 21 Apr 2006 11:37:05 -0000 1.2 @@ -7,7 +7,7 @@

              General Configuration Options

              -Following table contains all possible general configuration options and their defaults: +The following table contains all possible general configuration options and their defaults: @@ -36,6 +36,16 @@ + + + + @@ -112,18 +122,26 @@ + + + + + + - + - + - + + + + + + Index: galaxy.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/galaxy.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- galaxy.html 12 Apr 2006 04:31:03 -0000 1.1 +++ galaxy.html 21 Apr 2006 11:37:05 -0000 1.2 @@ -7,27 +7,27 @@

              Galaxy Window

              -Galaxy or Map is the window where you will collect very useful information on -what the hell is happening here. +The Galaxy, or Map, window is where you will collect very useful information on +what the hell is happening across the entire map.

              -This is a picture of the whole galaxy. All planets have fixed location -(though there is a server setting that allows galaxy to rotate). The only resourse -that doesn't change from game to game is the planet name, so try to remember planet +This is a picture of the whole galaxy. All planets have a fixed location +(though there is a server setting that allows the galaxy to rotate). The only resource +that doesn't change from game to game is the planet name, so try to remember the planet names. This will be very useful.

              -Every planet can be owned by one of four races or can be independent. -The ownership of the planet is defined by armies the planet has. If there are -Romulan armies on it then it is owned by Romulan Empire. The ownership of the planet +Every planet can be owned by one of the four races, or it can be independent. +The ownership of the planet is defined by the armies the planet has. If there are +Romulan armies on it then it is owned by the Romulan Empire. The ownership of the planet can be changed by dropping your armies on enemy planets. 1 army kills 1 enemy army. -When you kill all enemy armies the planet becomes not owned by anyone and thus can +When you kill all enemy armies, the planet becomes not owned by anyone (independent) and thus can be taken.

              Initially only your team planets are visible (i.e. have resources like fuel/repair/agri visible when you try to get info on planet). Other planets are grayed out and you can't -get any information on them. In order for planet to become visibile to your team one -of team players should orbit it. +get any information on them. In order for a planet to become visibile to your team, one +of your team's players should orbit it.

              \ No newline at end of file Index: basics.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/basics.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- basics.html 12 Apr 2006 04:31:03 -0000 1.1 +++ basics.html 21 Apr 2006 11:37:05 -0000 1.2 @@ -7,7 +7,7 @@

              The Basics

              -This section will give you short introduction on client look and feel.
              +This section will give you a short introduction on client look and feel.
              You will also find some useful information on how to use different windows.

              Section topics: Index: metaserver.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/metaserver.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- metaserver.html 12 Apr 2006 04:31:03 -0000 1.1 +++ metaserver.html 21 Apr 2006 11:37:05 -0000 1.2 @@ -7,23 +7,23 @@

              Metaserver Window

              -This will probably be the first window you will see starting the client. -The window appears after successfull connection to metaserver that -holds list of available netrek servers. +This will probably be the first window you will see after starting the client. +The window appears after successful connection to a metaserver that +holds the list of available netrek servers.

              Here is how it looks:

              -There are several types of games played in Netrek Universe. It could be Bronco, -Hockey, Chaos, Dogfight and some others. Most of servers you'll see these days +There are several types of server settings, such as Bronco, +Hockey, and Chaos. Most of the servers you'll see these days are either Bronco or Hockey. Bronco is the most popular type of Netrek, so go on and click on some Bronco server to connect to the game.

              In order to join the game to play you should point on one of the servers and click -left mouse button.
              -If you wish to observe the game instead of playing - click right mouse button. +the left mouse button.
              +If you wish to observe the game instead of playing - click the right mouse button.

              -Clicking on one of yellow links will open your browser on the link's main site +Clicking on one of the yellow links will open your browser to the specified website. \ No newline at end of file Index: teamselect.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/teamselect.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- teamselect.html 12 Apr 2006 04:31:03 -0000 1.1 +++ teamselect.html 21 Apr 2006 11:37:05 -0000 1.2 @@ -7,24 +7,24 @@

              Team Selection

              -Right below MOTD window you have Team (Race) Selection part: +Right below the MOTD window you have the Team (Race) Selection part:

              -There are four races exist in Netrek - Federation, Romulans, Klingons and Orions +There are four races in Netrek - Federation, Romulan, Klingon and Orion.

              -Each of the races has different ship pictures (though the ships have exactly same +Each of the races has different ship pictures (though the ships have exactly the same power and weapons among the races).

              -In the races selection you will see number of players playing per-race. If there is -a T-mode you will only be allowed to join one of the two playing races. Otherwise you +In the race selection boxes you will see the number of players playing per race. If there is +T-mode you will only be allowed to join one of the two main playing races. Otherwise you are allowed to select at least one of three teams.

              -In order to select team you should do one of two: +In order to select team you should do one of two things:

                -
              • click with left mouse button on the team box. This will make you join the team in default ship -that is defined for client
                • -
              • point with mouse at the team box and press one of the following keys to select one of the ship +
              • click with the left mouse button on the team box. This will make you join the team in the default ship +that is defined for your client (cruiser unless you change it)
                • +
              • point with the mouse at the team box and press one of the following keys to select one of the ship types:
                • s - Scout (SC)
                  • @@ -38,8 +38,8 @@

                  If you want to quit - click on the clock box.

                  -After death you will be presented same team selection window. If you want to change your -team or ship you should use explanation above. However if you want to get back to same team -in the same ship you can push 'space' button and you are back. +After death you will be presented the same team selection window. If you want to change your +team or ship you should use the explanation above. However if you want to get back to same team +in the same ship you can push the 'spacebar' and you are back. \ No newline at end of file Index: plistconfig.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/plistconfig.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- plistconfig.html 12 Apr 2006 04:31:03 -0000 1.1 +++ plistconfig.html 21 Apr 2006 11:37:05 -0000 1.2 @@ -7,9 +7,9 @@

                  Player List Configuration

                  -Player list can be configured to show custom columns +The player list can be configured to show custom columns

                  -Syntax for playerList option is as follows: +Syntax for playerList options is as follows:

                  playerList: <string of columns>

                  @@ -48,5 +48,10 @@

                  playerList: nTRNKWLr O D d - Old style
                  playerList: nTK RNlr Sd - Kill watch style
                  +

                  +In addition it is possible to configure an alternate player list to be able to +view more data than the default player list allows.
                  +The option to configure the alternate player list is playerList2
                  +The syntax is the same as for playerList
                  \ No newline at end of file Index: tactical.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/tactical.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- tactical.html 12 Apr 2006 04:31:03 -0000 1.1 +++ tactical.html 21 Apr 2006 11:37:05 -0000 1.2 @@ -7,9 +7,9 @@

                  Tactical Window

                  -Tactical or Local is the window where you will have most of fun in Netrek.
                  -It is on the top left of the main screen. Your ship is always centered in it and probably looks tainted by your team color over -white. +The Tactical, or Local, window is where all the action takes place.
                  +It is on the top left of the main screen. Your ship is always centered in it, and probably looks white - though depending +on what bitmaps you are using, it can appear colored as well.

                  Index: controlsintro.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/controlsintro.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- controlsintro.html 12 Apr 2006 04:31:03 -0000 1.1 +++ controlsintro.html 21 Apr 2006 11:37:05 -0000 1.2 @@ -7,30 +7,28 @@

                  Introduction To Game Controls

                  -You will need both mouse and keyboard to fully control the game. +You will need both the mouse and keyboard to fully master control of your ship and the game.

                  There are several keys that you probably want to learn in order to control the main window:

                    -
                  • Alt+Enter - toggle title bar of client window. This gives you an option to -quickly see what server you are playing on in case of multiple netrek windows are -opened
                    • -
                  • Alt+End - minimize current netrek window
                    • -
                  • Shift+Esc - kill the client really fast. This will not perform any cleanup -procedures, so please, don't use this to logout
                    • +
                  • Alt+Enter - toggles the title bar of client window. This gives you an option to +quickly see what server you are playing on in case multiple netrek windows are +open. It also allows one to quickly minimize the client window
                    • +
                  • Alt+End - another way to minimize the client window

                  -And now let's discuss main game controls: +And now let's discuss the main game controls:

                  Mouse

                  -Let's leave mouse buttons aside for a while and discuss only mouse pointer.
                  -First of all the client will behave absolutely identical in -Tactical and Galaxy windows.
                  -No matter where you point in one of the windows your client will take mouse -coordinates relative to your ship and depending on command you submitted will process it. +Let's leave mouse buttons aside for awhile and discuss only the mouse pointer.
                  +First of all the client will behave absolutely the same in either the +Tactical or Galaxy windows.
                  +No matter where you point in one of the windows, your client will take mouse +coordinates relative to your ship and depending on the command you submitted, will process it.

                  -The main purpose of mouse is to add coordinates to every action that you want to +The main purpose of the mouse is to add coordinates to every action that you want to perform.

                  For instance if you want to shoot (left mouse button or 't' on keyboard) the torps @@ -46,20 +44,20 @@

                  It is possible to change defaults by remapping (reassigning) mouse buttons to different actions. It is also possible to use button clicks in conjunction with Ctrl+Shift, Ctrl or Shift keys. -We will discuss all of these in Changing Defaults section. +We will discuss all of these in the Changing Defaults section.

                  Keyboard

                  -Well, there is nothing special about keyboard in Netrek. It behaves exactly same as -in any other application. You press key and something happens. +Well, there is nothing special about keyboard in Netrek. It behaves exactly the same as +in any other application. You press a key and something happens.

                  -The only thing you should remember when dealing with keyboard is that every action +The only thing you should remember when dealing with the keyboard is that every action (well, almost every one) will use your mouse pointer coordinates to complete. So when you want to kill someone you should use your mouse to point at him and only then press -your favorit weapon key to shoot. +your favorite weapon key to shoot.

                  Technically there are default bindings for keys in Netrek, but I will not list all -of them here. You can check them under Default Bindings +of them here. You can check them under the Default Bindings section. \ No newline at end of file Index: jointhegame.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/jointhegame.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- jointhegame.html 12 Apr 2006 04:31:03 -0000 1.1 +++ jointhegame.html 21 Apr 2006 11:37:05 -0000 1.2 @@ -7,11 +7,11 @@

                  Joining The Game

                  -After successfull login you will be presented following window: +After successful login, you will be presented with the following window:

                  -Next topics will give you short explanation about windows that compose it: +The next topics will give you a short explanation about the windows that compose it:

                  • Message Of The Day
                  • Server Settings
                    • Index: serversettings.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/serversettings.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- serversettings.html 12 Apr 2006 04:31:03 -0000 1.1 +++ serversettings.html 21 Apr 2006 11:37:05 -0000 1.2 @@ -7,31 +7,31 @@

                    Server Settings

                    -The top right part of the main screen after successfull login will contain -server settings. These settings define what type of server it is, whether RSA -client is required to play a game there, how much players it is required to +The top right part of the main screen after successful login will contain the +server settings. These settings define what type of server it is, whether a RSA +client is required to play a game there, how many players are required to start Tournament mode (T-mode), etc.

                    -Here is settings window from pickled.psychosis.net: +Here is the settings window from pickled.psychosis.net:

                    Here is a list of options with brief explanations:

                    • Binary verification - whether the client binary should support some kind of verification
                      • -
                    • Tournament mode - how much players per side are required to start T-mode
                      • +
                    • Tournament mode - how many players per side are required to start T-mode
                    • Ships allowed - what types of ships are allowed to play on this server
                    • Tractor/Pressor beams - whether tractor/pressor beams are allowed on the server
                      • -
                    • Kill required for plasma - how much kills should you have in order to get plasma after refit
                      • -
                    • Rank required for SB - what minimum rank should you have to be able to refit to Starbase
                      • -
                    • Planets required for SB - what minimum number of planets your team owns is required to be able to get Starbase
                      • -
                    • Hidden mode - when server will hide your enemies in the fog of war
                      • -
                    • Multiple Entry Planets - whether ships can be respawned no only around their home planet
                      • +
                    • Kill required for plasma - how many kills you need in order to get plasma after refit
                      • +
                    • Rank required for SB - what the minimum rank is to be able to refit to a Starbase
                      • +
                    • Planets required for SB - what your team's minimum number of planets is to build a Starbase
                      • +
                    • Hidden mode - when the server will hide your enemies in the fog of war
                      • +
                    • Multiple Entry Planets - whether ships can be respawned only around their home planet
                    • Chaos mode - whether chaos mode is enabled or not
                      • -
                    • Hunter Killer - whether server will send Hunter Killer bot every half hour to clean galaxy
                      • +
                    • Hunter Killer - whether server will send a Hunter Killer bot every half hour to clean the galaxy
                    • Message to GOD log - whether messages to GOD are saved
                      • -
                    • SB Transwarp - whether players can transwarp to Starbase ship
                      • -
                    • Surrender Counter - how much planets on loosin team are required to start surrender counter
                      • +
                    • SB Transwarp - whether players can transwarp to Starbases
                      • +
                    • Surrender Counter - how few planets the losing team must have to trigger the surrender counter
                    \ No newline at end of file Index: defaultmap.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/defaultmap.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- defaultmap.html 12 Apr 2006 04:31:03 -0000 1.1 +++ defaultmap.html 21 Apr 2006 11:37:05 -0000 1.2 @@ -80,6 +80,7 @@ U - show rankings window m - message window zoom / - toggle sorted player list + A - toggle alternate player list window : - toggle messages recording to log file + - toggle UDP options window ~ - toggle sound control window @@ -99,10 +100,10 @@

                    Mouse Bindings

                    -All mouse clicks are translated to keyboard actions. If one of Ctrl, Shift, Ctrl+Shift keys -pressed along with mouse click it will also generate keyboard action. +All mouse clicks are translated to keyboard actions. If one of Ctrl, Shift, or Ctrl+Shift keys +are pressed along with a mouse click, it will also generate a keyboard action.

                    -Next table will list all possible mouse buttons and the keyboard actions they generate: +The next table will list all possible mouse buttons and the keyboard actions they generate:

              Name
              allowWheelActions +Enable mouse wheel in non-scrolling window +
                +
              • on (default) - owner race color
                • +
              • off - white
                • +
              +
              autoQuit Autoquit timer integer
              default: 60              		color name
              color.<race>Replace <race> with valuecolor name
              colorClienttype of bitmaps to load on startuptype of bitmaps to use on startup
              • 0 - monochrome bitmaps
                • -
              • 1 (default) - color bitmaps
                • +
              • 1 (default) - new color bitmaps
                • +
              • 2 - old color bitmaps
                • +
              • 3 - shaded old color bitmaps
              colorfulPhasersDisplay Jubilee phasersmake your phasers multicolored
              • on
                • @@ -570,7 +588,12 @@
              playerListPlayer list manual stylePlayer list custom layoutstring
              playerList2Alternate Player list custom layout string
              @@ -190,8 +191,8 @@
              Mouse Button

              -Fourth and Fifth are so called X Buttons that Microsoft added to their +The Fourth and Fifth are so called X Buttons that Microsoft added to their IntelliPoint mouses. You can use IntelliPoint drivers to map them to keys, but instead -of doing that you can just use regular buttonmap in NetrekXP Mod +of doing that you can just use the regular buttonmap in NetrekXP \ No newline at end of file Index: commandline.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/commandline.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- commandline.html 12 Apr 2006 04:31:03 -0000 1.1 +++ commandline.html 21 Apr 2006 11:37:05 -0000 1.2 @@ -7,17 +7,17 @@

              Command Line Options

              -Most of times you will not use command line to start client. +Most of the time you will not use the command line to start the client. However it is handy to remember -h and -p options, so you will be able -to connect to server even when something is wrong with metaserver (which happens -from time to time). Or for instance the server you want to connect to +to connect to a server even when something is wrong with the metaserver (which happens +from time to time). Or, for instance, if the server you want to connect to doesn't report itself to metaserver (so it won't appear in the metaserver window).

              It is good to remember that default ports for most of servers are 2592 for players and 2593 for observers. So if you want to observe game on continuum.us.netrek.org you will use "netrek -h continuum.us.netrek.org -p 2593".

              -Here is the list of command options for NetrekXP Mod:
              +Here is the list of command options for NetrekXP:

                 -h <server>               : specify server name to connect to

Index: configsyntax.html
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/configsyntax.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- configsyntax.html	12 Apr 2006 04:31:03 -0000	1.1
+++ configsyntax.html	21 Apr 2006 11:37:05 -0000	1.2
@@ -7,21 +7,21 @@
 
 
              Configuration File Syntax
              
 
              
-Configuration file is regular text file that can contain comments, empty lines and
+The configuration file (often refered to as the netrekrc) is a regular text file that can contain comments, empty lines and
 configuration definitions.
 
              
 
              Comments
              
 
              
-Every line that has hashmark (#) as its first character is comment line and
+Every line that has hashmark (#) as its first character is a comment line and
 will be ignored.
 
              
 
              Configuration Options
              
 
              
-The general syntax for any of configuration options is:
+The general syntax for any of the configuration options is:
 
              
 keyword: <value>
 
              
-All configuration option keywords are case incensitive
+All configuration option keywords are case insensitive
 
              
 Most of option keywords can have three additional suffixes to enable fine tuning
 of options:
@@ -29,36 +29,36 @@
 
                
 
              • 
 keyword.observer: <value> - this suffix will enable
-option only in case you are logged in to server as observer
+the option only when you are logged in as an observer
 
                
 Example:
 
                
-buttonmap.observer: 1l2I3i - will set different buttonmap when you
+buttonmap.observer: 1l2I3i - will set a different buttonmap when you
 observe game
 
                • 
 
                
 
              • keyword.<servernick>: <value> - this suffix will
-set option only if you are connected to server <servernick>
+set the option only if you are connected to server <servernick>
 
                
 Note that in order to define <servernick> you should define
 server.<servernick>: <server host name>
 
                
 Example:
 
                
-server.continuum: continuum.us.netrek.org - this option sets
-servernick for continuum.us.netrek.org to be continuum
+server.continuum: continuum.us.netrek.org - this option sets the servernick
+for continuum.us.netrek.org to be continuum
 
                
-keymap.continuum: a2d% - this option defines custom keymap for
-server with 'continuum' as its servernick
+keymap.continuum: a2d% - this option defines a custom keymap for
+a server with 'continuum' as its servernick
 
                • 
 
                
 
              • keyword.<servertype>: <value> - this suffix will
-set option only if you are connected to server with <servertype> type.
+set the option only if you are connected to server with <servertype> type.
 
                
-Note: the client will automatically set <servertype> only if you connect from Metaserver Window
+Note: the client will automatically set <servertype> only if you connect from the Metaserver Window
 
                
-If you want to define <servertype> for specific server that is not there or
-you connect to server from command line you can use servertype.<servernick>: <type of server> where
+If you want to define <servertype> for a specific server that is not there or
+you connect to a server from the command line, you can use servertype.<servernick>: <type of server> where
 <type of server> can be one of following:
 	
                  
 	
                • paradise
                  • 
@@ -72,13 +72,13 @@
 
                  
 Example:
 
                  
-server.continuum: continuum.us.netrek.org - this will set servernick
+server.continuum: continuum.us.netrek.org - this will set the servernick
 for continuum.us.netrek.org to be continuum
 
                  
-serverType.continuum: bronco - this will set servertype for continuum
+serverType.continuum: bronco - this will set the servertype for continuum
 to be bronco
 
                  
-keymap.bronco: a2d% - this will set keymap for any bronco server
+keymap.bronco: a2d% - this will set the keymap for any bronco server
 
 
                
 
                
@@ -111,9 +111,9 @@
 Examples:
 
                
 
                  
-
                • keepPeace: on - will enable keepPeace option
                  • 
-
                • planetBitmap: 2 - will assign value of 2 to planetBitmap option
                  • 
-
                • buttonmap: 1t2p3k - will assign string '1t2p3k' to buttonmap option
                  • 
+
                • keepPeace: on - will enable the keepPeace option
                  • 
+
                • planetBitmap: 2 - will assign value of 2 to the planetBitmap option
                  • 
+
                • buttonmap: 1t2p3k - will assign string '1t2p3k' to the buttonmap option
                  • 
 
                
 
 
\ No newline at end of file

Index: motdwindow.html
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/motdwindow.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- motdwindow.html	12 Apr 2006 04:31:03 -0000	1.1
+++ motdwindow.html	21 Apr 2006 11:37:05 -0000	1.2
@@ -7,15 +7,15 @@
 
 
                Message Of The Day
                
 
                
-Top left part of the Team Selection window is called Message Of The Day
-or MOTD. This window contains whatever information server administrator (GOD)
-decided to display.
+The top left part of the Team Selection window is called the Message Of The Day,
+or MOTD. This window contains whatever information the server administrator (GOD)
+has decided to display.
 
                
 
 
                
-You can scroll text in the window using 'f', 'b', 'F', 'B' keys to scroll
-one line forward, one line backward, one page forward, one page backward.
+You can scroll the text in the window using 'f', 'b', 'F', 'B' keys to scroll
+one line forward, one line backward, one page forward, or one page backward.
 
                
-You can also press 'R' to send statistics reset request to server.
+You can also press 'R' to send a statistics reset request to server.
 
 
\ No newline at end of file

Index: remapping.html
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/remapping.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- remapping.html	12 Apr 2006 04:31:03 -0000	1.1
+++ remapping.html	21 Apr 2006 11:37:05 -0000	1.2
@@ -7,40 +7,40 @@
 
 
                Changing Defaults
                
 
                
-In order to change default buttons and keys bindings you should be familiar
-with Configuration File and be able to edit
+In order to change the default buttons and keys bindings you should be familiar
+with the Configuration File and be able to edit
 it.
 
                
-It is possible to change keyboard mappings in game by going to help window ('h' in
-default keymap) and remapping keys by pointing on desired action and pushing key that
+It is possible to change keyboard mappings in game by going to the help window ('h' in
+default keymap) and remapping keys by pointing on a desired action and pushing the key that
 you want this action to be bound to. The main problem with that is that these remappings
-are not saved anywhere (unless you save them using "Save options" action) and will be
+are not saved anywhere (unless you save them using the "Save options" menu option) and will be
 lost after you close the program.
 
                
-There are three configuration commands that deal with keyboard and mouse buttons
+There are three configuration commands that deal with keyboard and mouse button
 rebinding (remapping):
 
                  
-
                • keymap - allows to change keyboard default bindings
                  • 
-
                • buttonmap - allows to change mouse default bindings
                  • 
-
                • ckeymap - allows to change Ctrl+Key keyboard bindings
                  • 
+
                • keymap - allows one to change keyboard default bindings
                  • 
+
                • buttonmap - allows one to change mouse default bindings
                  • 
+
                • ckeymap - allows one to change Ctrl+Key keyboard bindings
                  • 
 
                
 
                
 
                Syntax
                
 
                
 Same syntax is applied for all of the configuration commands above:
 
                
-command: [<key to bind><action to perform>]+
+command: [<key to bind><action to perform>]
 
                
 Examples:
 
                
 
                  
-
                • keymap: a2d% - will bind warp 2 speed to key 'a' and maxwarp to key 'b'.
                  • 
-
                • buttonmap: 1i3l - will bind info action to mouse button 1 (left button) and
-lock action to mouse button 3 (right button).
                  • 
-
                • ckeymap: ^cc^vl - will bind cloak action to Ctrl-c and lock action to Ctrl-v
                  • 
+
                • keymap: a2b% - will bind warp 2 speed to key 'a' and maxwarp to key 'b'.
                  • 
+
                • buttonmap: 1i3l - will bind the info key to mouse button 1 (left button) and
+the lock key to mouse button 3 (right button).
                  • 
+
                • ckeymap: ^cc^vl - will bind the cloak key to Ctrl-c and the lock key to Ctrl-v
                  • 
 
                
 
                
-buttonmap is the tricky one because you should know what button gets what name.
+The buttonmap is the tricky one because you should know what button gets what name.
 
                
 So here is a table that will list all possible buttons that can be bound there:
 
@@ -139,7 +139,7 @@
 
                
 
                
 
                
-For example 'buttonmap: 1p4dhi' - will create following mapping:
+For example 'buttonmap: 1p4dhi' - will create the following mapping:
 
                
 
                  
 
                • Left Mouse Button will map to phaser
                  • 
@@ -147,8 +147,8 @@
 
                • Ctrl+Fifth Mouse Button will map to info
                  • 
 
                
 
                
-Almost all players at some point will remap (rebind) default keyboard (and probably mouse) actions
-to keys that satisfy their requirements. Feel free to play with key bindings and try to get most
+Almost all players at some point will remap (rebind) the default keyboard (and probably mouse) actions
+to keys that satisfy their requirements. Feel free to play with key bindings and try to get the most
 out of it. Just remember that once you got used to some specific layout it will be difficult to
 switch to something else.
 



From modemhero at users.sourceforge.net  Fri Apr 21 06:35:05 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 11:35:05 +0000
Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.13,
	1.14 hints.dat, 1.4, 1.5 netrekxp.doc, 1.3,
	1.4 sample_xtrekrc.txt, 1.2, 1.3 xtrekrc_options.txt, 1.2,
	1.3 cow.doc, 1.2, NONE cow.txt, 1.2, NONE
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20856/resources/docs

Modified Files:
	changes.txt hints.dat netrekxp.doc sample_xtrekrc.txt 
	xtrekrc_options.txt 
Removed Files:
	cow.doc cow.txt 
Log Message:
Removed the two COW manuals and combined the relevant info into the netrekxp manual.

--- cow.txt DELETED ---

--- cow.doc DELETED ---

Index: sample_xtrekrc.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/sample_xtrekrc.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sample_xtrekrc.txt	12 Apr 2006 04:20:03 -0000	1.2
+++ sample_xtrekrc.txt	21 Apr 2006 11:35:02 -0000	1.3
@@ -464,8 +464,8 @@
 dist.^8.doing2: %T%c->%O (%i)%?%a>0%{ has %a arm%?%a=1%{y%!ies%}%} at %b. %d%% dam, %s%% shd, %f%% fuel
 dist.^9.pickup: %T%c->%O %p++ @ %l
 dist.^0.pop: %T%c->%O %l%?%n>-1%{ @ %n%}!
-dist.^@.other1: %T%c->%O (%i)%?%a>0%{ has %a arm%?%a=1%{y%!ies%}%} at  lal. (%d%%D, %s%%S, %f%%F)
-dist.^#.other2: %T%c->%O (%i)%?%a>0%{ has %a arm%?%a=1%{y%!ies%}%} at  lal. (%d%%D, %s%%S, %f%%F)
+dist.^@.other1: %T%c->%O (%i)%?%a>0%{ has %a arm%?%a=1%{y%!ies%}%} at  %l. (%d%%D, %s%%S, %f%%F)
+dist.^#.other2: %T%c->%O (%i)%?%a>0%{ has %a arm%?%a=1%{y%!ies%}%} at  %l. (%d%%D, %s%%S, %f%%F)
 dist.E.help: %T%c->%O Help(%S)! %s%% shd, %d%% dmg, %f%% fuel, %?%S=SB%{ %w%% wtmp,%!%}%E%{ ETEMP!%}%W%{ WTEMP!%} %a armies!
 dist.^e.escorting: %T%c->%O ESCORTING %g (%d%%D %s%%S %f%%F)
 dist.^t.taking: %T%c->%O (%S) Carrying %a to %l%?%n>-1%{ @ %n%}

Index: xtrekrc_options.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/xtrekrc_options.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xtrekrc_options.txt	12 Apr 2006 04:20:03 -0000	1.2
+++ xtrekrc_options.txt	21 Apr 2006 11:35:02 -0000	1.3
@@ -1,69 +1,39 @@
 # This document lists all available options that could be changed
 # in xtrekrc file
 
-# Options added since NetrekXP final release
-
 agriCAPS:                 (on/off) show AGRI planet name in caps on the map
-
 agriColor:                (0-2) select color to display agri planet names on the map
 # 0 - owner race color
 # 1 - white
 # 2 - gray
 
-b4keymap:                 (string) keymap for mouse button 4 (mouseAsShift=on)
-b5keymap:                 (string) keymap for mouse button 5 (mouseAsShift=on)
-continuousMouseFix:       (on/off) fix continuous mouse behavior
-disableWinkey             (on/off) disable Windows and Context keys
-mainResizeable:           (on/off) make main window (netrek) resizeable
-metaPing:                 (on/off) show ping stats to all servers in metaserver window
-omitTeamLetter:           (on/off) omit team letter on galaxy
-playerListHack:           (on/off) if player's letter is greater than 'f' suppose that
-                                   the player is observer.
-playerListMessaging:      (on/off) allow messages to be sent to players by clicking player
-                                   on the player list window
-phaserShrinkStyle:        (0-1) shrink own phasers using specific style
-# 0 - COW style (fixed length phaser)
-# 1 - BRMH style (phaser shrinks during rechange time)
-
-saveFile:                 (path) path to saved options file
-saveBig:                  (on/off) save options with remarks
-saveMacro:                (on/off) save macros to saveFile
-saveRCD:                  (on/off) save receiver configurable distresses to saveFile
-saveRCM:                  (on/off) save receiver configurable messages to saveFile
-showAllTractorPressor:    (on/off) show each player's tractor/pressor beams (requires server support)
-showHints:                (on/off) show hints window
-showHockeyLinesLocal:     (on/off) show hockey lines on tactical
-showHockeyLinesMap:       (on/off) show hockey lines on galactic
-showHockeyScore:          (on/off) show hockey score on galactic
-showStars:                (on/off) show background stars
-
-timerType:                (0-4) type of timer on dashboard window
-# 0 - don't show
-# 1 - current time
-# 2 - server time
-# 3 - time in ship
-# 4 - user-set time
-
-viewBox:                  (on/off) show tactical window boundaries on map
-warpStreaks:              (on/off) show streaks while warping to starbase
-windowMove:               (on/off) enable internal windows to be moved with mouse
-
-# Options of the NetrekXP final release
-
+allowWheelActions:        (on/off) allow mouse wheel to work in non-scrolling windows
 autoQuit:                 (int) autoquit time after death
 b1keymap:                 (string) keymap for mouse button 1 (mouseAsShift=on)
 b2keymap:                 (string) keymap for mouse button 2 (mouseAsShift=on)
 b3keymap:                 (string) keymap for mouse button 3 (mouseAsShift=on)
+b4keymap:                 (string) keymap for mouse button 4 (mouseAsShift=on)
+b5keymap:                 (string) keymap for mouse button 5 (mouseAsShift=on)
 baseUdpLocalPort:         (port) use this port as base for UDP
+beepOnPrivateMessage:	  (on/off) beep if received private message
 buttonmap:                (string) change mouse button map
 buttonmap-:         (string) use this buttonmap for ship (sc,dd,ca,bb,as,sb,ga,att)
 ckeymap:                  (string) change control keymap
 ckeymap-:           (string) use this ckeymap for ship (sc,dd,ca,bb,as,sb,ga,att)
 cloakChars:               (two chars) how to display cloaker on galactic
 color.:            (color) replace first  with (color)
-colorfulPhasers:          (on/off) use team color for phasers
+color.:             (color) replace that race color with (color)
+colorClient:              (0-3) what type of ship bitmaps to use
+# 0 - mono
+# 1 - new color bitmaps
+# 2 - old color bitmaps
+# 3 - shaded old color bitmaps
+
+colorfulPhasers:          (on/off) make your phasers multicolored
 continueTractor:          (on/off) show tractors after lock
 continuousMouse:          (on/off) use continuous mouse mode
+continuousMouseFix:       (on/off) fix continuous mouse behavior
+disableWinkey             (on/off) disable Windows and Context keys
 documentation:            (path) path to documentation file
 enemyPhasers:             (1-10) enemy phaser line width
 extraAlertBorder:         (on/off) change window border on enemy approach
@@ -97,6 +67,7 @@
 logging:                  (on/off) enable logging
 login:                    (string) character login
 macroKey:                 (char, ESC, TAB) key to toggle macro mode
+mainResizeable:           (on/off) make main window (netrek) resizeable
 messageHoldThresh:        (integer) put message on hold after mouse move (Adds # to the end of message)
 
 messageHUD:               (0-2) where to duplicate message that is written in message window
@@ -105,6 +76,7 @@
 # 2 - tactical bottom
 
 metaCache:                (path) path to metacache file
+metaPing:                 (on/off) show ping stats to all servers in metaserver window
 metaPort:                 (port) metaserver port
 metaServer:               (address) metaserver address
 
@@ -133,6 +105,7 @@
 # on - COW style
 # off - old style
 
+omitTeamLetter:           (on/off) omit team letter on galaxy
 orishipbmpfile:           (path) - players bitmaps
 orishipGbmpfile:          (path) - own grayscale bitmap
 orishipTbmpfile:          (path) - own tainted color bitmap
@@ -144,6 +117,10 @@
 # 0-16 for COW style phaser shrink
 # 0-11 for BRMH style phaser shrink
 
+phaserShrinkStyle:        (0-1) shrink own phasers using specific style
+# 0 - COW style (fixed length phaser)
+# 1 - BRMH style (phaser shrinks during rechange time)
+
 phaserStats:              (on/off) show phaser statistics
 
 planetBitmap:             (0-2) what bitmaps to use for planets
@@ -179,6 +156,12 @@
 # 'V' - Kills per hour
 # 'W' - Wins
 
+playerList2:              (string) custom layout for alternate player list window (same as playerlist)
+playerListHack:           (on/off) if player's letter is greater than 'f' suppose that
+                                   the player is observer.
+playerListMessaging:      (on/off) allow messages to be sent to players by clicking player
+                                   on the player list window
+
 playerlistObserver:       (0-2) what kind of players to show
 # 0 - all (default)
 # 1 - players
@@ -202,10 +185,19 @@
 romshipGbmpfile:          (path) - own grayscale bitmap
 romshipTbmpfile:          (path) - own tainted color bitmap
 romshipMbmpfile:          (path) - monospace bitmap if colorclient=0
+saveFile:                 (path) path to saved options file
+saveBig:                  (on/off) save options with remarks
+saveMacro:                (on/off) save macros to saveFile
+saveRCD:                  (on/off) save receiver configurable distresses to saveFile
+saveRCM:                  (on/off) save receiver configurable messages to saveFile
 server:                   (address) default server
 server.:          (address)  is a nickname for (address)
 shiftedMouse:             (on/off) shift+mouse buttons will work as commands
-shellTools:               (on/off) enable shell tools
+showAllTractorPressor:    (on/off) show each player's tractor/pressor beams (requires server support)
+showHints:                (on/off) show hints window
+showHockeyLinesLocal:     (on/off) show hockey lines on tactical
+showHockeyLinesMap:       (on/off) show hockey lines on galactic
+showHockeyScore:          (on/off) show hockey score on galactic
 showIND:                  (on/off) show neutral planets with X over them
 
 showLock:                 (0-3) where to show lock triangle
@@ -218,6 +210,7 @@
 showMotd:                 (on/off) show Motd on login
 showPlanetNames:          (on/off) show planet names on tactical
 showPlanetOwner:          (on/off) show planet owner on galaxy
+showStars:                (on/off) show background stars
 showStats:                (on/off) show ship statistics
 showTractorPressor:       (on/off) show tractors and pressors
 shrinkPhaserOnMiss:       (on/off) don't draw phaser line on miss
@@ -227,6 +220,14 @@
 sound:                    (on/off) enable sound
 soundDir:                 (path) path to directory containing sound files
 theirPhaserShrink:        (0-16) shrink enemy phaser by x/16 of its length
+
+timerType:                (0-4) type of timer on dashboard window
+# 0 - don't show
+# 1 - current time
+# 2 - server time
+# 3 - time in ship
+# 4 - user-set time
+
 tpDotDist:                (int) distance between tractor/pressor dots (default 10)
 tryShort:                 (on/off) enable short packets
 tryUdp:                   (on/off) try using UDP
@@ -248,7 +249,19 @@
 useRSA:                   (on/off) use RSA client verification
 useRSA.           (on/off) user RSA for 
 varyShields:              (on/off) change shields color on shields damage
+viewBox:                  (on/off) show tactical window boundaries on map
 warnShields:              (on/off) change shields color on enemy approach
+warpStreaks:              (on/off) show streaks while warping to starbase
+windowMove:               (on/off) enable internal windows to be moved with mouse
+
+.allow:           [A][T][I][P][K]
+# Allow specific messages to be shown in window
+# Only valid for message windows (i.e. review_* and review)
+# A - show messages sent to all
+# T - show messages sent to the team
+# I - show messages sent to yourself
+# P - show phaser messages
+# K - show kill messages
 
 .mapped:          (on/off) show window 
 # List of possible window names
@@ -266,6 +279,7 @@
 # review_phaser   Phaser hits Window
 # planet          Planet List Window
 # player          Player List Window
+# player2         Alternate Player List Window
 # war             War Declarations Window
 # fed             Federation Selection Window
 # ori             Orion Selection Window
@@ -295,3 +309,4 @@
 # .geometry:x
 
 .parent:          (window)  is a child of (window)
+

Index: changes.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- changes.txt	20 Apr 2006 06:48:20 -0000	1.13
+++ changes.txt	21 Apr 2006 11:35:02 -0000	1.14
@@ -1,4 +1,7 @@
 Version TBA:
+- updated NetrekXP manual (in docs folder), removed old cow manuals.
+- the new color fed starbase bitmaps now rotate.
+- Keeppeace default is now "on".
 - rewrote find bitmap routine in a smarter way (thanks Quozl)
 - fixed bccnetrek.rc to have proper header so icon works
 - tidied up the save_options function, fixing some spacing errors, and puttting the
@@ -6,10 +9,9 @@
   sounddir option.
 - fixed mainResizeable loading from rc/saving.  Also made default setting = on.
 - rewrote TTS centering/refresh code so that text is properly centered and clears
-  properly when the message expires.  Updated COW manual to reflect change of tts_pos
+  properly when the message expires.  Updated manual to reflect change of tts_pos
   variable to tts_ypos.
 - fixed crash bug in save options due to renaming of .sav file from xtrekrc to netrekrc.
-  This bug is not in the downloadable version.
 - readded beeplite functionality.  Configuration options described in cow manual.
   Basic rc options are useLite: on/off to turn beeplite on and off, and defLite: on/off
   to use the default settings.  The beeplite option is highly configurable, see manual
@@ -25,25 +27,39 @@
 - phasering plasma now has less of an effect on phaser average damage statistics, it
   is counted as your average damage hit, rather than the previous way of counting it
   as a 38 point phaser hit.
-- fixed bug with phaser messages going blank due to improper buffering (not sure where
-  this bug came from, in the downloadable version off playnetrek this bug does not exist)
-- removed defunct netrek forum link from metaserver window
-- added "dynamicBitmap: (on)/off".  Enables dynamic bitmap switching from the options menu
+- fixed bug with phaser messages going blank due to improper buffering
+- added "dynamicBitmap: (on)/off".  Enables dynamic bitmap switching from the options
+  menu
 - renumbered the ship bitmap sets for the colorClient option.  Choices are 0=mono,
   1=new color graphics, 2=single color graphics, and 3=shaded single color graphics.
   Default setting is still 1.  Settings 2 and 3 have the bonus effect of turning your
   ship color to white (similar to COW) due to there being a greyscale bitmap library
   with matching ship designs.
-- updated NetrekXP manual (in docs folder)
 - fixed hightlightFriendlyPhaser option to work again: on for white phasers on hits,
   off for flicker between team color and white
 - added some more hints to the hint database
 - fixed hint messages so they properly loop
 - added Maximize button to title bar
 - added buildexe script for compiling solely the source code and not the bitmaps
-- made BCC default compiler and disabled RSA mkkey check (-nt) until it can be fixed
+- made BCC default compiler and disabled RSA mkkey check (-nt) until I get a valid one
 
-Version 4.4.0.3:
+Version 4.4.0.4: (changes by stas, added 18-Apr-2006 )
+- added "allowWheelActions: (on)/off" to be able to disable wheel in non-scrolling windows
+- added new window "player2" that behaves exactly as player list window, but allows to
+  select alternate custom layout and could be toggled with 'A' key
+- added "playerList2: (string)" option that allows to select different player list layout
+  for alternate player list window, by default it will be "n T R N l M K W L r O D d "
+- fixed bug that caused main thread to continue in case player died while scrolling
+  message window using scrollbar (which forced him close client window and reconnect)
+- fixed incorrect behavior of 'windowMove: off' feature. Previously window would snap
+  back to wrong place if the main window top-left corner was not (0,0) coordinates
+- long lines are now wrapped by words instead of by chars. Maximum message length was
+  reduced to 4 full message lines (4 * 69 characters)
+- message input window will now show Sender->Recipient even when the input line is longer
+  than 69 characters
+- changed 'Forum' URL on metaserver window to open Google's r.g.n location
+
+Version 4.4.0.3: (Released on 11-Jul-2004)
 
 - added "viewBox: (on)/off" to show tactical boundaries on galaxy
 - added "omitTeamLetter: on/(off)" to stop drawing team letter on galaxy
@@ -76,7 +92,7 @@
 - planets and players will appear as soon as they enter tactical window bounds. earlier
   the bitmaps were painted only when their center was entering tactical window
 
-Version 4.4.0.2:
+Version 4.4.0.2: (Released on 04-Mar-2004)
 
 - repack of 4.4.0.1 with some bug fixes
 

Index: hints.dat
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/hints.dat,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- hints.dat	15 Apr 2006 01:04:33 -0000	1.4
+++ hints.dat	21 Apr 2006 11:35:02 -0000	1.5
@@ -107,4 +107,4 @@
 starbases can fire phasers twice as fast as any other ship.
 "to ogg" means, the process of cloaking and appearing adjacent to an enemy while firing torps and tractoring on to him, with the purpose to kill that player, without caring about dying in the process.
 "to doosh" means, killing an enemy ship which is carrying armies. People often yell "doosh!" after they kill a huge carrier. 
-a "planet scum" is someone who only cares about taking planets so he gets good ratings. This often hurts the team because the wrong planets are taken, or the planets are taken with little armies and easily captured back.
+a "planet scum" is someone who only cares about taking planets so he gets good ratings. This often hurts the team because the wrong planets are taken, or the planets are taken with little armies and easily captured back.
\ No newline at end of file

Index: netrekxp.doc
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekxp.doc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- netrekxp.doc	15 Apr 2006 01:04:33 -0000	1.3
+++ netrekxp.doc	21 Apr 2006 11:35:02 -0000	1.4
@@ -1,358 +1,350 @@
-************************************************************
-*                                                          *
-*      General Documentation for the NetrekXP Client       *
-*                                                          *
-*  Comments, sugestion and bug reports to keyos at keyos.org  *
-*                                                          *
-*  This is modified version of COW.DOC distributed with    *
-*  2.02pl2 release of Client Of Win (COW) netrek client.   *
-*  The point of this version was to change the original    *
-*  document to match current configuration options of      *
-*  NetrekXP                                                *
[...1469 lines suppressed...]
+     The following are the arguments for sounds:
+
+/0      Standard window beep (incoming message sound if sound is on) 
+/1 - /9 Play nt_message1 - nt_message9 sound.
+
+     Tactical Text Solution for the Tactical Tunnel Syndrome (TTS):
+
+/| .. | displays Text in between via TTS. 
+ 
+     Additional defaults:
+
+planetCycleTime:        highlighting time for planets
+playerCycleTime:        highlighting time for players
+
+tts_color:              color of TTS message (should be dark)
+tts_font:               Font (large prefered)
+tts_max_len:            Max length of a message
+tts_time:               Time a TTS message is displayed
+tts_ypos:               y location of the TTS message
 



From modemhero at users.sourceforge.net  Fri Apr 21 06:36:15 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 11:36:15 +0000
Subject: [netrek-cvs] client/netrekxp/resources/fonts ntfonts2.fon, 1.1.1.1,
	1.2
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/fonts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21548/resources/fonts

Modified Files:
	ntfonts2.fon 
Log Message:
New font file made by stas, with the proper headers.  Font remains the same though.

Index: ntfonts2.fon
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/fonts/ntfonts2.fon,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsqyJ87p and /tmp/cvs2VGnVF differ



From modemhero at users.sourceforge.net  Fri Apr 21 06:38:00 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 11:38:00 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/color1/fed
	fed_sb01.bmp, 1.1, 1.2 fed_sb02.bmp, 1.1, 1.2 fed_sb03.bmp,
	1.1, 1.2 fed_sb04.bmp, 1.1, 1.2 fed_sb05.bmp, 1.1,
	1.2 fed_sb06.bmp, 1.1, 1.2 fed_sb07.bmp, 1.1, 1.2 fed_sb08.bmp,
	1.1, 1.2 fed_sb09.bmp, 1.1, 1.2 fed_sb10.bmp, 1.1,
	1.2 fed_sb11.bmp, 1.1, 1.2 fed_sb12.bmp, 1.1, 1.2 fed_sb13.bmp,
	1.1, 1.2 fed_sb14.bmp, 1.1, 1.2 fed_sb15.bmp, 1.1,
	1.2 fed_sb16.bmp, 1.1, 1.2 fed_sb17.bmp, 1.1, 1.2 fed_sb18.bmp,
	1.1, 1.2 fed_sb19.bmp, 1.1, 1.2 fed_sb20.bmp, 1.1,
	1.2 fed_sb21.bmp, 1.1, 1.2 fed_sb22.bmp, 1.1, 1.2 fed_sb23.bmp,
	1.1, 1.2 fed_sb24.bmp, 1.1, 1.2 fed_sb25.bmp, 1.1,
	1.2 fed_sb26.bmp, 1.1, 1.2 fed_sb27.bmp, 1.1, 1.2 fed_sb28.bmp,
	1.1, 1.2 fed_sb29.bmp, 1.1, 1.2 fed_sb30.bmp, 1.1,
	1.2 fed_sb31.bmp, 1.1, 1.2 fed_sb32.bmp, 1.1, 1.2
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22463/resources/ships/color1/fed

Modified Files:
	fed_sb01.bmp fed_sb02.bmp fed_sb03.bmp fed_sb04.bmp 
	fed_sb05.bmp fed_sb06.bmp fed_sb07.bmp fed_sb08.bmp 
	fed_sb09.bmp fed_sb10.bmp fed_sb11.bmp fed_sb12.bmp 
	fed_sb13.bmp fed_sb14.bmp fed_sb15.bmp fed_sb16.bmp 
	fed_sb17.bmp fed_sb18.bmp fed_sb19.bmp fed_sb20.bmp 
	fed_sb21.bmp fed_sb22.bmp fed_sb23.bmp fed_sb24.bmp 
	fed_sb25.bmp fed_sb26.bmp fed_sb27.bmp fed_sb28.bmp 
	fed_sb29.bmp fed_sb30.bmp fed_sb31.bmp fed_sb32.bmp 
Log Message:
Added rotation to the fed starbase in the new color bitmaps.

Index: fed_sb08.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb08.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsuiEws3 and /tmp/cvstdgXdv differ

Index: fed_sb12.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb12.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsUDjNs5 and /tmp/cvsmLfIjx differ

Index: fed_sb05.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb05.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsdX8ey4 and /tmp/cvs00tNsw differ

Index: fed_sb22.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb22.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsOW77Ia and /tmp/cvshh42MC differ

Index: fed_sb32.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb32.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsCHqqw9 and /tmp/cvs8nPeDB differ

Index: fed_sb31.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb31.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsfVdAcd and /tmp/cvsKnyNmF differ

Index: fed_sb30.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb30.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsM7YlIc and /tmp/cvsj2VEXE differ

Index: fed_sb02.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb02.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsFPgPyi and /tmp/cvsQuMCWK differ

Index: fed_sb15.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb15.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsGFVuTk and /tmp/cvsUV5BnN differ

Index: fed_sb19.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb19.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvs4rswvj and /tmp/cvspSh31L differ

Index: fed_sb10.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb10.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsCtRDsn and /tmp/cvsWugT2P differ

Index: fed_sb07.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb07.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsFBQNSp and /tmp/cvsAQQDzS differ

Index: fed_sb04.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb04.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsJpx7Gr and /tmp/cvspuG8rU differ

Index: fed_sb28.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb28.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvs2O740t and /tmp/cvsiB0ZRW differ

Index: fed_sb23.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb23.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsQTAfSu and /tmp/cvsVtwOLX differ

Index: fed_sb20.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb20.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvswEADJw and /tmp/cvskPGsHZ differ

Index: fed_sb29.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb29.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvspqLi0v and /tmp/cvs8PRa3Y differ

Index: fed_sb01.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb01.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsuEuJEx and /tmp/cvsvIkRK0 differ

Index: fed_sb24.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb24.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsXfHnWB and /tmp/cvsCw7r74 differ

Index: fed_sb16.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb16.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvseoIDHA and /tmp/cvswnhvV3 differ

Index: fed_sb25.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb25.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvs7oupfE and /tmp/cvs9sfiw7 differ

Index: fed_sb26.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb26.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsp8RTQC and /tmp/cvs93Bda6 differ

Index: fed_sb18.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb18.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsAhHLdG and /tmp/cvsa4EFz9 differ

Index: fed_sb27.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb27.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvs6bgWuF and /tmp/cvsABHkV8 differ

Index: fed_sb11.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb11.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvs4PKE40 and /tmp/cvs5pH9Fv differ

Index: fed_sb21.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb21.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvshHVu6p and /tmp/cvsRWpzJV differ

Index: fed_sb09.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb09.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsGiTGtx and /tmp/cvs7aevp3 differ

Index: fed_sb06.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb06.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvszQxNAG and /tmp/cvseR8JTc differ

Index: fed_sb03.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb03.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsjMiSLJ and /tmp/cvsb5txcg differ

Index: fed_sb13.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb13.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvstJ9OsT and /tmp/cvs9OgiMq differ

Index: fed_sb14.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb14.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvs8JdRW3 and /tmp/cvshnNkHB differ

Index: fed_sb17.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/color1/fed/fed_sb17.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsUkMSH7 and /tmp/cvsqtazvF differ



From quozl at users.sourceforge.net  Fri Apr 21 06:38:59 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Fri, 21 Apr 2006 11:38:59 +0000
Subject: [netrek-cvs] server/Vanilla ChangeLog,1.22,1.23
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23019

Modified Files:
	ChangeLog 
Log Message:


Index: ChangeLog
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- ChangeLog	15 Apr 2006 12:10:57 -0000	1.22
+++ ChangeLog	21 Apr 2006 11:38:57 -0000	1.23
@@ -1,15 +1,20 @@
-Fri Apr 14 Bill Balcerski  
 
-        * Typo fix in daemonII.c
+	* ntserv/daemonII.c (move): prevent tournament mode from starting
+	if there are scummers.  New tournament state machine.
 
-Wed Apr 12  Bill Balcerski  
+Fri Apr 14 12:10:57 2006  Bill Balcerski  
 
-        * BUGS, PROJECTS: Removal of bugs that no longer exist, and
-        features that have been added.
+	* ntserv/daemonII.c: typo fix
 
-        * ntserv/daemonII.c, redraw.c: truncate kills to the 2nd decimal
-          place for army capacity check - clients only receive two
-          decimal places in the kill packet.
+Wed Apr 12 10:19:17 2006  Bill Balcerski  
+
+	* BUGS, PROJECTS: removal of bugs that no longer exist, and
+	features that have been added.
+
+	* ntserv/daemonII.c, redraw.c: truncate kills to the 2nd decimal
+	place for army capacity check - clients only receive two decimal
+	places in the kill packet.
 
 Wed Apr 12 22:53:17 2006  James Cameron  
 



From modemhero at users.sourceforge.net  Fri Apr 21 07:00:08 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 12:00:08 +0000
Subject: [netrek-cvs] client/netrekxp/include bitmaps.h, 1.3, 1.4 data.h, 1.5,
	1.6 defs.h, 1.3, 1.4 playerlist.h, 1.1.1.1, 1.2 proto.h, 1.5,
	1.6 struct.h, 1.2, 1.3 version.h, 1.2, 1.3
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2251/include

Modified Files:
	bitmaps.h data.h defs.h playerlist.h proto.h struct.h 
	version.h 
Log Message:
This large patch brings the client up to Stas's version 4.4.0.4.  The visible changes to the user are:
- added "allowWheelActions: (on)/off" to be able to disable wheel in non-scrolling windows
- added new window "player2" that behaves exactly as player list window, but allows to
  select alternate custom layout and could be toggled with 'A' key
- added "playerList2: (string)" option that allows to select different player list layout
  for alternate player list window, by default it will be "n T R N l M K W L r O D d "
- fixed bug that caused main thread to continue in case player died while scrolling
  message window using scrollbar (which forced him close client window and reconnect)
- fixed incorrect behavior of 'windowMove: off' feature. Previously window would snap
  back to wrong place if the main window top-left corner was not (0,0) coordinates
- long lines are now wrapped by words instead of by chars. Maximum message length was
  reduced to 4 full message lines (4 * 69 characters)
- message input window will now show Sender->Recipient even when the input line is longer
  than 69 characters
- changed 'Forum' URL on metaserver window to open Google's r.g.n location

There are also several internal changes, such as a new format for error messages.

Index: bitmaps.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/bitmaps.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- bitmaps.h	18 Apr 2006 13:41:48 -0000	1.3
+++ bitmaps.h	21 Apr 2006 12:00:06 -0000	1.4
@@ -1,5 +1,4 @@
 #include "config.h"
-
 // Ships
 // -----
 

Index: defs.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/defs.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- defs.h	18 Apr 2006 13:41:48 -0000	1.3
+++ defs.h	21 Apr 2006 12:00:06 -0000	1.4
@@ -219,7 +219,7 @@
 #define INVISIBLE(j)        (((j)->p_flags & PFCLOAK) && \
         ((j)->p_cloakphase == (CLOAK_PHASES-1)))
 
-#define ANNOUNCESOCKET      if (me!=NULL)printf("***  socket %d, player %d  ***\n",nextSocket,me->p_no); else
+#define ANNOUNCESOCKET      if (me!=NULL)LineToConsole("***  socket %d, player %d  ***\n",nextSocket,me->p_no); else
 
 
 #if !defined(_IBMR2)
@@ -320,7 +320,7 @@
 #define UDP_UPDATE_WAIT	5
 
 /* client version of UDPDIAG */
-#define UDPDIAG(x)      { if (udpDebug) { printf("UDP: "); printf x; }}
+#define UDPDIAG(x)      { if (udpDebug) { LineToConsole("UDP: "); LineToConsole x; }}
 #define V_UDPDIAG(x)    UDPDIAG(x)
 
 #ifdef ROTATERACE
@@ -452,4 +452,7 @@
 #define T_USER      4   /* user reset timer */
 #define T_TOTAL     5   /* number of T_ defs */
 
+/* The maximum length of message in buffer */
+#define MAX_MLENGTH 286
+
 #endif /* _h_defs */

Index: version.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/version.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- version.h	12 Apr 2006 04:20:03 -0000	1.2
+++ version.h	21 Apr 2006 12:00:06 -0000	1.3
@@ -2,5 +2,5 @@
 
 /* store the version info here */
 
-static char mvers[] = "4.4.0.3";
+static char mvers[] = "4.4.0.4";
 static char version[] = "Netrek XP Mod";
\ No newline at end of file

Index: struct.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/struct.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- struct.h	12 Apr 2006 04:20:03 -0000	1.2
+++ struct.h	21 Apr 2006 12:00:06 -0000	1.3
@@ -129,6 +129,7 @@
 #define PFOBSERV	0x8000000       /* for observers */
 #define PFTWARP     0x40000000      /* transwarping to base */
 
+#define KLOGIN      0x00    /* initial state */
 #define KQUIT		0x01    /* Player quit */
 #define KTORP		0x02    /* killed by torp */
 #define KPHASER		0x03    /* killed by phaser */
@@ -139,12 +140,14 @@
 #define KGHOST		0x08    /* killed because a ghost */
 #define KGENOCIDE	0x09    /* killed by genocide */
 #define KPROVIDENCE	0x0a    /* killed by a hacker */
-#define KPLASMA         0x0b    /* killed by a plasma
-                                 * torpedo */
+#define KPLASMA     0x0b    /* killed by a plasma torpedo */
 #define TOURNEND	0x0c    /* tournament game ended */
 #define KOVER		0x0d    /* game over  */
 #define TOURNSTART	0x0e    /* tournament game starting */
 #define KBADBIN		0x0f    /* bad binary */
+#define KTORP2      0x10    /* killed by detted torps */
+#define KSHIP2      0x11    /* chain-reaction explosions */
+#define KPLASMA2    0x12    /* killed by zapped plasma */
 
 #define NUM_TYPES 8
 #define SCOUT 0
@@ -673,4 +676,11 @@
     HBITMAP old_bmp;    /* saved bitmap */
 }SDBUFFER;
 
+// Linked list for console buffer
+struct cons_buffer
+{
+    char * string;
+    struct cons_buffer * next;
+};
+
 #endif /* _h_struct */

Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- proto.h	19 Apr 2006 13:02:33 -0000	1.5
+++ proto.h	21 Apr 2006 12:00:06 -0000	1.6
@@ -39,6 +39,13 @@
 /******************************************************************************/
 void getColorDefs (void);
 
+/******************************************************************************/
+/***  console.c                                                             ***/
+/******************************************************************************/
+int IsConsoleVisible (void);
+void ShowConsole (void);
+void LineToConsole (char * format, ...);
+void BufferToConsole (void);
 
 /******************************************************************************/
 /***  cowmain.c                                                             ***/
@@ -479,6 +486,13 @@
                                 int height,
                                 W_Window parent,
                                 int border);
+W_Window W_MakeScrollingRichTextWindow (char *name,
+                                        int x,
+                                        int y,
+                                        int width,
+                                        int height,
+                                        W_Window parent,
+                                        int border);
 W_Window W_MakeMenu (char *name,
                      int x,
                      int y,
@@ -635,6 +649,10 @@
                      W_Color color,
                      char *str,
                      int len);
+void AddToRichText (Window * win,
+                    W_Color color,
+                    char *str,
+                    int len);
 void RedrawScrolling (Window * win,
                       HDC hdc);
 void W_FlushScrollingWindow (W_Window window);
@@ -708,6 +726,11 @@
                               int len,
                               W_Font font);
 void W_SetWAM (W_Window win);
+/* RichText */
+LRESULT CALLBACK RichTextWndProc (HWND hwnd,
+                                  UINT msg,
+                                  WPARAM wParam,
+                                  LPARAM lParam);
 /* DoubleBuffering */
 SDBUFFER * W_InitSDB (W_Window window);
 void W_Win2Mem (SDBUFFER * sdb);
@@ -855,13 +878,10 @@
 /******************************************************************************/
 void InitPlayerList ();
 int PlistMaxWidth ();
+int PlistMaxWidth2 ();
 void RedrawPlayerList ();
 void UpdatePlistFn ();
 int GetPlayerFromPlist (int x, int y);
-//static void WriteSortedPlist();
-//static void WriteUnsortedPlist(void);
-//static int PlistHeader(char *layout, int doWrite);
-//static void PlistLine(struct player *j, int pos);
 
 /******************************************************************************/
 /***  ranklist.c
@@ -954,19 +974,19 @@
 /******************************************************************************/
 void DisplayMessage ();
 void smessage (char ichar);
-pmessage (char *str,
-          short recip,
-          short group);
+void pmessage (char *str, 
+               short recip, 
+               short group);
 char *getaddr2 (int flags,
                 int recip);
-message_on (void);
-message_off (void);
+void message_on (void);
+void message_off (void);
 #ifdef XTRA_MESSAGE_UI
-message_hold (void);
+void message_hold (void);
 #endif
 int getgroup (char addr,
               int *recip);
-pnbtmacro (int c);
+void pnbtmacro (int c);
 
 /******************************************************************************/
 /***  socket.c

Index: playerlist.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/playerlist.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- playerlist.h	21 Jan 2003 21:27:55 -0000	1.1.1.1
+++ playerlist.h	21 Apr 2006 12:00:06 -0000	1.2
@@ -152,5 +152,4 @@
 void UpdatePlistFn (void);
 #define UpdatePlayerList()	if (plistUpdated) UpdatePlistFn()
 
-
 #endif /* defined h_playerlist */

Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- data.h	19 Apr 2006 13:02:33 -0000	1.5
+++ data.h	21 Apr 2006 12:00:06 -0000	1.6
@@ -80,7 +80,6 @@
 extern int warncount;
 extern int warntimer;
 extern int infomapped;
-extern int scanmapped;          /* ATM - scanner stuff */
 extern int mustexit;
 extern int messtime;
 extern int keepPeace;
@@ -106,10 +105,7 @@
 #endif
 
 #ifdef META
-extern char *metaServer;
-extern char *metaServer1;
-extern char *metaServer2;
-extern char *metaServer3;
+extern char *metaServer[];
 extern int metaPort;
 #ifdef METAPING
 extern int metaPing;
@@ -169,7 +165,6 @@
 extern int newDashboard, old_db;
 extern int niftyNewMessages;
 extern int fastQuit;
-extern int babes;
 extern char *shipnos;
 extern int sock;
 extern int xtrekPort;
@@ -316,8 +311,9 @@
 
 extern W_Window messagew, w, mapw, statwin, baseWin, infow, tstatw,
     war, warnw, helpWin, teamWin[4], qwin, messwa, messwt, messwi,
-    messwk, planetw, rankw, playerw, optionWin, reviewWin;
-extern W_Window scanw, scanwin, udpWin, phaserwin, hintWin;
+    messwk, planetw, rankw, playerw, playerw2, optionWin, reviewWin;
+extern W_Window udpWin, phaserwin, hintWin;
+extern W_Window waitWin, qwin, countWin, motdButtonWin, motdWin;
 
 #ifdef SHORT_PACKETS
 extern W_Window spWin;
@@ -548,8 +544,10 @@
 extern char *ind_ship_bmp_M;
 
 // Added to fix thread creation issue
-HANDLE ThreadCreated;
-DWORD ThreadCreatedID;
+HANDLE MainThread;
+DWORD MainThreadID;
+HANDLE InputThread;
+DWORD InputThreadID;
 
 // Missing global variables
 #include 
@@ -561,7 +559,7 @@
 extern int mungScrollbarColors;
 extern int showMotd;
 
-extern char *saveFile;  /* file name to save options to */
+extern char * saveFile;  /* file name to save options to */
 extern int saveBig;     /* save options with comments */
 extern int saveMacro;   /* save options with macros */
 extern int saveRCD;     /* save options with RCD */
@@ -604,12 +602,23 @@
 
 extern int viewBox;     /* show local window box on map */
 
-extern struct stringlist *defaults; /* pointer to defaults list */
+extern struct stringlist * defaults; /* pointer to defaults list */
 
 /* DoubleBufering */
-extern SDBUFFER *localSDB;    /* double buffer for local window */
-extern SDBUFFER *mapSDB;      /* double buffer for map window */
+extern SDBUFFER * localSDB;    /* double buffer for local window */
+extern SDBUFFER * mapSDB;      /* double buffer for map window */
 
 extern int disableWinkey;   /* disable WinKey + ContextKey during the game */
 
+extern int exitFlag;        /* indicates exit state for W_WaitForEvent() */
+
+extern struct cons_buffer * consHead;    /* head of the linked list for console buffer */
+extern struct cons_buffer * consTail;    /* tail of the linked list for console buffer */
+
+extern int allowWheelActions;    /* allow mouse wheel actions */
+
+extern WNDPROC lpfnDefRichEditWndProc;  /* default window procedure for our richedit controls */
+
+extern int richText;    /* temporary variable to enable/disable rich text windows */
+
 #endif /* _h_data */



From modemhero at users.sourceforge.net  Fri Apr 21 07:00:09 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 12:00:09 +0000
Subject: [netrek-cvs] client/netrekxp/win32 config.h,1.3,1.4
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2251/win32

Modified Files:
	config.h 
Log Message:
This large patch brings the client up to Stas's version 4.4.0.4.  The visible changes to the user are:
- added "allowWheelActions: (on)/off" to be able to disable wheel in non-scrolling windows
- added new window "player2" that behaves exactly as player list window, but allows to
  select alternate custom layout and could be toggled with 'A' key
- added "playerList2: (string)" option that allows to select different player list layout
  for alternate player list window, by default it will be "n T R N l M K W L r O D d "
- fixed bug that caused main thread to continue in case player died while scrolling
  message window using scrollbar (which forced him close client window and reconnect)
- fixed incorrect behavior of 'windowMove: off' feature. Previously window would snap
  back to wrong place if the main window top-left corner was not (0,0) coordinates
- long lines are now wrapped by words instead of by chars. Maximum message length was
  reduced to 4 full message lines (4 * 69 characters)
- message input window will now show Sender->Recipient even when the input line is longer
  than 69 characters
- changed 'Forum' URL on metaserver window to open Google's r.g.n location

There are also several internal changes, such as a new format for error messages.

Index: config.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/win32/config.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- config.h	18 Apr 2006 13:41:49 -0000	1.3
+++ config.h	21 Apr 2006 12:00:07 -0000	1.4
@@ -40,30 +40,19 @@
    ------------------------------------------------------------
 */
 
-
-/*      RSA                     - New RSA reserved packets stuff                */
-/* #define RSA                  - Defined in the Makefile                       */
-
-#define RCD                     /* RCD             - Support Reciever variable
-                                                     distresses */
-
-                                /* PING            - Ping statistics */
+/*      RCD             - Support Reciever variable distresses */
+#define RCD                     
+                                                     
+/*      PING            - Ping statistics */
 #define PING
 
-                                /* SHORT_PACKETS   - Reduce Network load */
+/*      SHORT_PACKETS   - Reduce Network load */
 #define SHORT_PACKETS
 
-                                /* SPEEDUP         - Misc improvements to make
-                                                     the code faster */
-#define SPEEDUP
 
-                                /* FEATURE_PACKETS - feature packets */
+/*      FEATURE_PACKETS - feature packets */
 #define FEATURE_PACKETS
 
-                                /* DEBUG           - Various useful debugging 
-                                                     stuff.  No signal trap */
-/*#undef  DEBUG*/
-
 /* 
    ------------------------------------------------------------
                 COW only defines
@@ -83,10 +72,6 @@
 /*      CORRUPTED_PACKETS       - prevents some seg faults but verbose output   */
 #define CORRUPTED_PACKETS
 
-/*      EXPIRE=#                - number of days this version will work for     */
-/*#define EXPIRE 365*/
-#define EXPIRE 30
-
 /*      ARMY_SLIDER             - some sort of funky status window thing        */
 #define ARMY_SLIDER
 
@@ -109,10 +94,10 @@
 #define MULTILINE_MACROS
 
 /*      XTREKRC_HELP            - Hadley's xtrekrc window (stolden by KP)       */
-#define XTREKRC_HELP
+#undef XTREKRC_HELP
 
 /*      TOOLS                   - Various tools, like shell escape, ...         */
-#define TOOLS
+#undef TOOLS
 
 /*      SOUND                   - support of external sound players             */
 #define SOUND
@@ -121,9 +106,9 @@
 #define HOCKEY_LINES
 
 /*      SMALL_SCREEN            - for 800x600 resolution screens                */
-/* #define SMALL_SCREEN */
+#undef SMALL_SCREEN
 
-/*	BEEPLITE		- player and planets highlighting		*/
+/*	    BEEPLITE		        - player and planets highlighting		*/
 #define BEEPLITE
 
 /*      VSHIELD_BITMAPS         - damage dependent shields (hull)               */
@@ -132,11 +117,10 @@
 /*      JUBILEE_PHASERS         - Cycle phaser color when it's a hit            */
 #define JUBILEE_PHASERS
 
-/*      WARP_DEAD               - Use death detection
-*/
+/*      WARP_DEAD               - Use death detection                           */
 #undef  WARP_DEAD
 
-/*    RCM                       - Receiver configurable Server messages         */
+/*      RCM                     - Receiver configurable Server messages         */
 #define RCM
 
 /*      RACE_COLORS             - additional bitplane for race colors           */
@@ -181,185 +165,150 @@
 */
 #ifdef SERVER
 
-                                /*  AUTOMOTD       - Updates your MOTD every
-                                                     12 hours */
+/*     AUTOMOTD                 - Updates your MOTD every 12 hours */
 #undef AUTOMOTD
 
-                                /*  CHAIN_REACTION - Don't give credit for
-                                                     chain reactions */
+/*      CHAIN_REACTION          - Don't give credit for chain reactions */
 #define CHAIN_REACTION
 
-                                /*  CHECKMESG      - Check for god messages
-                                                     and/or log all messages */
+/*      CHECKMESG               - Check for god messages and/or log all messages */
 #define CHECKMESG
 
-                                /*  ERIKPLAGUE     - Define for Erik's
-                                                     Plagueing */
+/*      ERIKPLAGUE              - Define for Erik's Plagueing */
 #define ERIKPLAGUE
 
-                                /*  FEATURES       - Server/client
-                                                     communication */
+/*      FEATURES                - Server/client communication */
 #define FEATURES
 
-                                /*  FULL_HOSTNAMES - Show entire player
-                                                     location (domain) */
+/*      FULL_HOSTNAMES          - Show entire player location (domain) */
 #define FULL_HOSTNAMES
 
-                                /*  INL_RESOURCES  - Use INL resources */
+/*      INL_RESOURCES           - Use INL resources */
 #define INL_RESOURCES
 
-                                /*  INL_POP        - Use INL style planet
-                                                     popping scheme */
+/*      INL_POP                 - Use INL style planet popping scheme */
 #define INL_POP
 
-                                /*  NO_PLANET_PLAGUE -Define for plagueing
-                                                     (Don't use with
-                                                     ERIKPLAGUE) */
+/*      NO_PLANET_PLAGUE        - Define for plagueing (Don't use with ERIKPLAGUE) */
 #undef  NO_PLANET_PLAGUE
 
-                                /* NO_UNWARRING_BOMBING -No 3rd space bombing */
+/*      NO_UNWARRING_BOMBING    - No 3rd space bombing */
 #define NO_UNWARRING_BOMBING
 
-                                /* SHOW_RSA        - Display the client type
-                                                     at login */
+/*      SHOW_RSA                - Display the client type at login */
 #define SHOW_RSA
 
-                                /* RESETGALAXY     - Reset the galaxy after
-                                                     each conquer */
+/*      RESETGALAXY             - Reset the galaxy after each conquer */
 #define RESETGALAXY
 
-                                /* RESTRICT_BOMB   - No bombing out of t-mode */
+/*      RESTRICT_BOMB           - No bombing out of t-mode */
 #define RESTRICT_BOMB
 
-                                /* SELF_RESET      - Galaxy will reset if the
-                                                     daemon dies */
+/*      SELF_RESET              - Galaxy will reset if the daemon dies */
 #define SELF_RESET
 
-                                /* SHORT_THRESHOLD - For Short Packets */
+/*      SHORT_THRESHOLD         - For Short Packets */
 #define SHORT_THRESHOLD
 
-                                /* SURRENDER_SHORT - Cut surrender time in
-                                                     half */
+/*      SURRENDER_SHORT         - Cut surrender time in half */
 #undef  SURRENDER_SHORT
 
-                                /* TWO_RACE        - Conquer only a 1/4 of the
-                                                     galaxy for reset */
+/*      TWO_RACE                - Conquer only a 1/4 of the galaxy for reset */
 #define TWO_RACE
 
-                                /* SENDFLAGS       - Print flags set in MOTD */
+/*      SENDFLAGS               - Print flags set in MOTD */
 #undef  SENDFLAGS
 
-                                /* CHECK_ENV       - Check environment variable                                                     NTSERV_PATH for location
-                                                     of system files */
+/*      CHECK_ENV               - Check environment variable NTSERV_PATH for location of system files */
 #undef  CHECK_ENV
 
-                                /* GPPRINT         - Print which path is being
-                                                     used to find the system
-                                                     files */
+/*      GPPRINT                 - Print which path is being used to find the system files */
 #undef  GPPRINT
 
-                                /* ONCHECK         - support for trekon player
-                                                     check */
+/*       ONCHECK                - support for trekon player check */
 #define  ONCHECK
 
-                                /* NBR             - Leave in for server. It
-                                                     tells programs like xsg
-                                                     that it is this code. */
+/*      NBR                     - Leave in for server. It tells programs like xsg that it is this code. */
 #define NBR
 
-                                /* DS              - Daemon Sychronization -
-                                                     Tedd Hadley */
+/*      DS                      - Daemon Sychronization - Tedd Hadley */
 #define DS
 
 
-                                /* NEED_EXIT       - For systems that need exit                                                     defined */
+/*      NEED_EXIT               - For systems that need exit defined */
 #define NEED_EXIT
-                                /* NEWMASK         - New tournament selection
-                                                     code. Less rigid than
-                                                     older code. */
+
+/*      NEWMASK                 - New tournament selection code. Less rigid than older code. */
 #define NEWMASK
 
-                                /* SB_TRANSWARP    - starbase transwarp */
+/*      SB_TRANSWARP            - starbase transwarp */
 #define SB_TRANSWARP
 
-                                /* FLAT_BONUS      - 3x bonus for killing last
-                                                     army on a planet */
+/*     FLAT_BONUS               - 3x bonus for killing last army on a planet */
 #undef FLAT_BONUS
 
-                                /* BASEPRACTICE    - trainingserver support */
+/*      BASEPRACTICE            - trainingserver support */
 #define BASEPRACTICE
 
-                                /* NEW_CREDIT      - give 1 planet for
-                                                     destroying, two planets
-                                                     for taking */
+/*     NEW_CREDIT               - give 1 planet for destroying, two planets for taking */
 #undef NEW_CREDIT
 
-                                /* FASTER_SB_MAXUPDATES - allow 10 ups/sec for
-                                                           SB's */
+/*      FASTER_SB_MAXUPDATES    - allow 10 ups/sec for SB's */
 #define FASTER_SB_MAXUPDATES
 
-                                /* SBFUEL_FIX      - fix starbase re-fueling */
+/*      SBFUEL_FIX              - fix starbase re-fueling */
 #define SBFUEL_FIX
 
-                                /* NEW_ETEMP       - Wreck's etemp fix */
+/*     NEW_ETEMP                - Wreck's etemp fix */
 #undef NEW_ETEMP
 
-                                /* DOGFIGHT        - .sysdef interface
-                                                   for dogfight robot */
+/*      DOGFIGHT                - .sysdef interface for dogfight robot */
 #define DOGFIGHT
 
-                                /* OBSERVERS       - allow players to watch */
+/*      OBSERVERS               - allow players to watch */
 #define OBSERVERS
 
-                                /* VOTING          - allow voting mode */
+/*      VOTING                  - allow voting mode */
 #define VOTING
 
-                                /* ALLOW_EJECT     - define to allow players to                                                     eject others*/
+/*     ALLOW_EJECT              - define to allow players to eject others */
 #ifdef VOTING
 #undef ALLOW_EJECT
 #endif
 
-                                /* NO_BRUTALITY    - disallow fighting between
-                                                     waiting players in the
-                                                     dogfighting mode */
+/*      NO_BRUTALITY            - disallow fighting between waiting players in the dogfighting mode */
 #ifdef DOGFIGHT
 #define NO_BRUTALITY
 #endif
 
-                                /* AS_CLOAK        - gives cloaked AS's more
-                                                     randomness in their
-                                                     apparent positions */
+/*     AS_CLOAK                 - gives cloaked AS's more randomness in their apparent positions */
 #undef AS_CLOAK
 
-                                /* GENO_COUNT      - keep track of a player's
-                                                     winning genocides */
+/*     GENO_COUNT               - keep track of a player's winning genocides */
 #undef GENO_COUNT
 
 #ifdef VOTING
-                                /* AUTO_INL        - starts up INL robot
-                                                     by majority vote   */
+/*      AUTO_INL                - starts up INL robot by majority vote   */
 #define AUTO_INL
-                                /* AUTO_PRACTICE   - starts up PRACTICE robot
-                                                     by majority vote   */
+
+/*      AUTO_PRACTICE           - starts up PRACTICE robot by majority vote   */
 #ifdef BASEPRACTICE
 #define AUTO_PRACTICE
 #endif
-                                /* AUTO_HOCKEY     - starts up HOCKEY robot
-                                                     by majority vote   */
+
+/*      AUTO_HOCKEY             - starts up HOCKEY robot by majority vote   */
 #define AUTO_HOCKEY
-                                /* AUTO_DOGFIGHT   - starts up DOGFIGHT robot
-                                                     by majority vote   */
+
+/*      AUTO_DOGFIGHT           - starts up DOGFIGHT robot by majority vote   */
 #ifdef DOGFIGHT
 #define AUTO_DOGFIGHT
 #endif
 
-                                /* TRIPLE_PLANET_MAYHEM - enable voting
-                                for the three planet cool server idea
-                                by felix at coop.com */
+/*      TRIPLE_PLANET_MAYHEM    - enable voting for the three planet cool server idea by felix at coop.com */
 #define TRIPLE_PLANET_MAYHEM
 #endif
-                                /* MESSAGES_ALL_TIME - allow messaging during
-                                freezes like twarp, refit, and war decl.  */
+                                
+/*     MESSAGES_ALL_TIME        - allow messaging during freezes like twarp, refit, and war decl.  */
 #undef MESSAGES_ALL_TIME
 
 
@@ -449,8 +398,6 @@
 typedef unsigned short int ushort;
 #define strncasecmp strncmp
 #ifdef THREADED
-#define THREAD(fn) {ThreadCreated = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)fn, 0, 0, &ThreadCreatedID); }
-#define ENDTHREAD ExitThread(0);
 typedef unsigned long int SEMAPHORE;
 #define CREATE_SEMAPHORE(initstate) CreateEvent(NULL, 1, initstate, NULL)
 #define SET_SEMAPHORE(sem) SetEvent((HANDLE)sem)



From modemhero at users.sourceforge.net  Fri Apr 21 07:00:08 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 12:00:08 +0000
Subject: [netrek-cvs] client/netrekxp clientr.dsp, 1.3, 1.4 copyright.txt,
	1.2, 1.3
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2251

Modified Files:
	clientr.dsp copyright.txt 
Log Message:
This large patch brings the client up to Stas's version 4.4.0.4.  The visible changes to the user are:
- added "allowWheelActions: (on)/off" to be able to disable wheel in non-scrolling windows
- added new window "player2" that behaves exactly as player list window, but allows to
  select alternate custom layout and could be toggled with 'A' key
- added "playerList2: (string)" option that allows to select different player list layout
  for alternate player list window, by default it will be "n T R N l M K W L r O D d "
- fixed bug that caused main thread to continue in case player died while scrolling
  message window using scrollbar (which forced him close client window and reconnect)
- fixed incorrect behavior of 'windowMove: off' feature. Previously window would snap
  back to wrong place if the main window top-left corner was not (0,0) coordinates
- long lines are now wrapped by words instead of by chars. Maximum message length was
  reduced to 4 full message lines (4 * 69 characters)
- message input window will now show Sender->Recipient even when the input line is longer
  than 69 characters
- changed 'Forum' URL on metaserver window to open Google's r.g.n location

There are also several internal changes, such as a new format for error messages.

Index: clientr.dsp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/clientr.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- clientr.dsp	18 Apr 2006 13:41:48 -0000	1.3
+++ clientr.dsp	21 Apr 2006 12:00:06 -0000	1.4
@@ -99,6 +99,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\console.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\cowmain.c
 # End Source File
 # Begin Source File

Index: copyright.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/copyright.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- copyright.txt	12 Apr 2006 06:28:43 -0000	1.2
+++ copyright.txt	21 Apr 2006 12:00:06 -0000	1.3
@@ -107,4 +107,11 @@
  * Netrek XP Mod
  * Stas Pirogov (keyos at keyos.org)
  *
- */
+ * ----------------------------------------------------------- Copyright 2006
+ *
+ * As above.
+ *
+ * Netrek XP
+ * Bill Balcerski
+ *
+ */
\ No newline at end of file



From modemhero at users.sourceforge.net  Fri Apr 21 07:00:09 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 12:00:09 +0000
Subject: [netrek-cvs] client/netrekxp/src bccnetrek.rc, 1.3, 1.4 check.c, 1.2,
	1.3 cowmain.c, 1.6, 1.7 data.c, 1.6, 1.7 death.c, 1.2,
	1.3 defaults.c, 1.6, 1.7 defwin.c, 1.2, 1.3 distress.c,
	1.1.1.1, 1.2 dmessage.c, 1.3, 1.4 docwin.c, 1.1.1.1,
	1.2 feature.c, 1.2, 1.3 findslot.c, 1.1.1.1, 1.2 getname.c,
	1.2, 1.3 helpwin.c, 1.2, 1.3 hintwin.c, 1.2, 1.3 input.c, 1.3,
	1.4 local.c, 1.5, 1.6 main.c, 1.2, 1.3 makefile, 1.4,
	1.5 map.c, 1.3, 1.4 mswindow.c, 1.6, 1.7 newwin.c, 1.8,
	1.9 option.c, 1.5, 1.6 parsemeta.c, 1.3, 1.4 ping.c, 1.1.1.1,
	1.2 playback.c, 1.7, 1.8 playerlist.c, 1.2, 1.3 redraw.c, 1.4,
	1.5 reserved.c, 1.1.1.1, 1.2 senddist.c, 1.2, 1.3 short.c, 1.3,
	1.4 smessage.c, 1.2, 1.3 socket.c, 1.2, 1.3 sound.c, 1.1.1.1,
	1.2 stampver.inf, 1.2, 1.3 udpopt.c, 1.1.1.1, 1.2 winmain.c,
	1.2, 1.3 winsndlib.c, 1.2, 1.3
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2251/src

Modified Files:
	bccnetrek.rc check.c cowmain.c data.c death.c defaults.c 
	defwin.c distress.c dmessage.c docwin.c feature.c findslot.c 
	getname.c helpwin.c hintwin.c input.c local.c main.c makefile 
	map.c mswindow.c newwin.c option.c parsemeta.c ping.c 
	playback.c playerlist.c redraw.c reserved.c senddist.c short.c 
	smessage.c socket.c sound.c stampver.inf udpopt.c winmain.c 
	winsndlib.c 
Log Message:
This large patch brings the client up to Stas's version 4.4.0.4.  The visible changes to the user are:
- added "allowWheelActions: (on)/off" to be able to disable wheel in non-scrolling windows
- added new window "player2" that behaves exactly as player list window, but allows to
  select alternate custom layout and could be toggled with 'A' key
- added "playerList2: (string)" option that allows to select different player list layout
  for alternate player list window, by default it will be "n T R N l M K W L r O D d "
- fixed bug that caused main thread to continue in case player died while scrolling
  message window using scrollbar (which forced him close client window and reconnect)
- fixed incorrect behavior of 'windowMove: off' feature. Previously window would snap
  back to wrong place if the main window top-left corner was not (0,0) coordinates
- long lines are now wrapped by words instead of by chars. Maximum message length was
  reduced to 4 full message lines (4 * 69 characters)
- message input window will now show Sender->Recipient even when the input line is longer
  than 69 characters
- changed 'Forum' URL on metaserver window to open Google's r.g.n location

There are also several internal changes, such as a new format for error messages.

Index: findslot.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/findslot.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- findslot.c	21 Jan 2003 21:28:41 -0000	1.1.1.1
+++ findslot.c	21 Apr 2006 12:00:06 -0000	1.2
@@ -99,9 +99,6 @@
 findslot (void)
 {
     int oldcount = -1;
-    W_Window waitWin, qwin, countWin, motdButtonWin;
-
-    W_Window motdWin;
     extern int MaxMotdLine;
     int WaitMotdLine = 0;
     int showMotd = booleanDefault ("showMotd", 1);
@@ -119,7 +116,7 @@
             Exit_Sound ();
 #endif
 
-            printf ("Shit!  Ghostbusted!\n");
+            LineToConsole ("Shit!  Ghostbusted!\n");
             terminate (0);
         }
         readFromServer (NULL);
@@ -165,7 +162,7 @@
             Exit_Sound ();
 #endif
 
-            printf ("Damn, We've been ghostbusted!\n");
+            LineToConsole ("Damn, We've been ghostbusted!\n");
             terminate (0);
         }
         while (W_EventsPending ())
@@ -224,7 +221,7 @@
                     Exit_Sound ();
 #endif
 
-                    printf ("OK, bye!\n");
+                    LineToConsole ("OK, bye!\n");
                     terminate (0);
                 }
                 break;

Index: smessage.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/smessage.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- smessage.c	12 Apr 2006 04:20:04 -0000	1.2
+++ smessage.c	21 Apr 2006 12:00:07 -0000	1.3
@@ -22,16 +22,17 @@
 
 static int lcount;
 static int HUDoffset;
-static char buf[1024];
+static char buf[MAX_MLENGTH];
 static char cursor = '_';
 static char mbuf[80];
 
+
 /* Routines to handle multi-window messaging */
 void
 DisplayMessage ()
 {
     int length;
-    int offset = 0;
+    char tmp[1024];
 
     length = strlen (outmessage);
 
@@ -42,21 +43,22 @@
 
     if (length > 80)
     {
-        offset = length - 80;
+        strncpy (tmp, outmessage, 10);
+        tmp[10] = '\0';         // have to null terminate, because strncpy doesn't
+        strncat (tmp, outmessage + length - 70, 80);
         length = 80;
     }
+    else
+        strcpy (tmp, outmessage);
 
 #ifdef XTRA_MESSAGE_UI
     if (HUDoffset)
-        W_WriteText (w, 5, HUDoffset, textColor,
-                     outmessage + offset, length, W_RegularFont);
+        W_WriteText (w, 5, HUDoffset, textColor, tmp, length, W_RegularFont);
 #endif
-    W_WriteText (messagew, 5, 5, textColor,
-                 outmessage + offset, length, W_RegularFont);
-
-    printf ("length: %d, offset %d\n", length, offset);
+    W_WriteText (messagew, 5, 5, textColor, tmp, length, W_RegularFont);
 }
 
+
 void
 AddChar (char *twochar)
 {
@@ -74,6 +76,7 @@
                  twochar, 2, W_RegularFont);
 }
 
+
 void
 BlankChar (int HUDoffsetcol,
            int len)
@@ -90,6 +93,7 @@
                  W_Textwidth * (len), W_Textheight);
 }
 
+
 void
 DrawCursor (int col)
 {
@@ -202,7 +206,7 @@
         mdisplayed = 0;
         messpend = 0;
         message_off ();
-        for (i = 0; i < 1024; i++)
+        for (i = 0; i < MAX_MLENGTH; i++)
         {
             outmessage[i] = '\0';
         }
@@ -224,7 +228,7 @@
         if (strlen (clipString) == 0)
             break;
 
-        if (lcount + strlen (clipString) >= 1024)
+        if (lcount + strlen (clipString) >= MAX_MLENGTH)
         {
             W_Beep ();
             warning ("Clipboard text is too long to fit");
@@ -254,7 +258,7 @@
     case '\r':                 /* send message */
         buf[lcount - ADDRLEN] = '\0';
         messpend = 0;
-        for (i = 0; i < 1024; i++)
+        for (i = 0; i < MAX_MLENGTH; i++)
         {
             outmessage[i] = '\0';
         }
@@ -347,7 +351,7 @@
         break;
 
     default:                   /* add character */
-        if (lcount >= 1024)
+        if (lcount >= MAX_MLENGTH)
         {
             W_Beep ();
             break;
@@ -364,55 +368,112 @@
     }
 }
 
-// SRS - should look at using proper variable types here
+
+void
+send_pmessage (char *str,
+               short recip,
+               short group)
+{
+    char newbuf[100];
+    char * cstr;
+
+    /* message length failsafe and last message saving - jn 6/17/93 */
+    lastMessage[0] = '\0';
+    strncat (lastMessage, str, 69);
+    cstr = lastMessage;
+
+    switch (group)
+    {
+
+#ifdef TOOLS
+    case MTOOLS:
+        sendTools (cstr);
+        break;
+#endif
+
+    case MMOO:
+        strcpy (defaultsFile, cstr);
+        sprintf (mbuf, "changing defaultsFile to %s", cstr);
+        warning (mbuf);
+        break;
+    default:
+        sendMessage (cstr, group, recip);
+    }
+
+    if ((group == MTEAM && recip != me->p_team) ||
+        (group == MINDIV && recip != me->p_no))
+    {
+        sprintf (newbuf, "%s  %s", getaddr2 (group, recip), cstr);
+        newbuf[79] = 0;
+        dmessage (newbuf, (unsigned char) group, (unsigned char) me->p_no,
+                 (unsigned char) recip);
+    }
+}
+
+
+void
 pmessage (char *str,
           short recip,
           short group)
 {
-    char newbuf[100];
-    char * cstr;
-    int length;
+    char * str1;    /* temporary string 1 */
+    char * str2;    /* temporary string 2 */
+    char buf[100];  /* temporary buffer */
     int i = 0;
 
-    length = strlen (str);
+    str1 = str;     /* save original string pointer */
 
-    do
+    while (strlen (str1) > 0)
     {
-        /* message length failsafe and last message saving - jn 6/17/93 */
-        lastMessage[0] = '\0';
-        strncat (lastMessage, str + i, 69);
-        cstr = lastMessage;
-
-        switch (group)
+        if (strlen (str1) > 69)
         {
+            if (str1[69] == ' ')
+            {
+                /* We're lucky to fall on space as next character */
+                strncpy (buf, str1, 69);
+                buf[69] = 0;
+                send_pmessage (buf, recip, group);
+                str1 += 69 + 1; /* skip the space */
+            }
+            else
+            {
+                /* Have to search for first occurence of ' ' from the end
+                   of the string */
 
-#ifdef TOOLS
-        case MTOOLS:
-            sendTools (cstr);
-            break;
-#endif
+                str2 = str1 + 69;
 
-        case MMOO:
-            strcpy (defaultsFile, cstr);
-            sprintf (mbuf, "changing defaultsFile to %s", cstr);
-            warning (mbuf);
-            break;
-        default:
-            sendMessage (cstr, group, recip);
-        }
+                while (str2[0] != ' ' && str2 != str1)
+                    str2--;
 
-        if ((group == MTEAM && recip != me->p_team) ||
-            (group == MINDIV && recip != me->p_no))
+                if (str2 == str1)
+                {
+                    /* Well, we should send the whole string because
+                       we have no spaces here */
+                    strncpy (buf, str1, 69);
+                    buf[69] = 0;
+                    send_pmessage (buf, recip, group);
+                    str1 += 69;
+                }
+                else
+                {
+                    /* Let's send just the part until space */
+                    strncpy (buf, str1, str2 - str1);
+                    buf[str2 - str1] = 0;
+                    send_pmessage (buf, recip, group);
+                    str1 += (str2 - str1) + 1;  /* skip space */
+                }
+            }
+        }
+        else
         {
-            sprintf (newbuf, "%s  %s", getaddr2 (group, recip), cstr);
-            newbuf[79] = 0;
-            dmessage (newbuf, (unsigned char) group, (unsigned char) me->p_no,
-                     (unsigned char) recip);
+            /* Just output everything as is */
+            strcpy (buf, str1);
+            buf[strlen (str1)] = 0;
+            send_pmessage (buf, recip, group);
+            str1 += strlen (str1);
         }
 
-        i += 69;
-
-    } while (i < length);
+    }
 
     message_off ();
 }
@@ -530,7 +591,7 @@
         }
         else
         {
-            /* printf("smessage:getaddr2 recip=%d\n",recip); */
+            /* LineToConsole ("smessage:getaddr2 recip=%d\n",recip); */
             (void) sprintf (&addrmesg[5], "%c%c ",
                             teamlet[players[recip].p_team], shipnos[recip]);
         }
@@ -553,6 +614,8 @@
     return (addrmesg);
 }
 
+
+void
 message_on (void)
 {
     messageon = 1;
@@ -565,6 +628,8 @@
 #endif
 }
 
+
+void
 message_off (void)
 {
     messageon = 0;
@@ -572,7 +637,9 @@
     W_DefineMapcursor (mapw);
 }
 
+
 #ifdef XTRA_MESSAGE_UI
+void
 message_hold (void)
 {
     //char twochar[2] = { '#', ' ' };
@@ -581,6 +648,7 @@
 }
 #endif
 
+
 /* Used in NEWMACRO, useful elsewhere also */
 int
 getgroup (char addr,
@@ -685,6 +753,7 @@
 }
 
 
+void
 pnbtmacro (int c)
 {
     switch (macro[c].who)

Index: bccnetrek.rc
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/bccnetrek.rc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- bccnetrek.rc	20 Apr 2006 06:13:50 -0000	1.3
+++ bccnetrek.rc	21 Apr 2006 12:00:06 -0000	1.4
@@ -1,8 +1,8 @@
 #include "resource.h"
 
 1 VERSIONINFO
-FILEVERSION 4, 4, 0, 1
-PRODUCTVERSION 4, 4, 0, 1
+FILEVERSION 4, 4, 0, 4
+PRODUCTVERSION 4, 4, 0, 4
 FILEOS VOS_DOS_WINDOWS32
 FILETYPE VFT_APP
 { BLOCK "StringFileInfo" 

Index: hintwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/hintwin.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hintwin.c	14 Apr 2006 12:24:00 -0000	1.2
+++ hintwin.c	21 Apr 2006 12:00:07 -0000	1.3
@@ -1,15 +1,10 @@
 /******************************************************************************/
 /***  File:  hintwin.c                                                      ***/
 /***                                                                        ***/
-/***  Function:                                                             ***/
-/***  hintwin.c copyright 2003 Stas Pirogov Free to use, hack, etc. Just keep
-/***  these credits here. Use of this code may be dangerous to your health
-/***  and/or system. Its use is at your own risk. I assume no responsibility for
-/***  damages, real, potential, or imagined, resulting  from the use of it.
-/***  
+/***  Function: set of hint window manipulation functions                   ***/
+/***                                                                        ***/
 /******************************************************************************/
 
-
 #include 
 #include 
 #include 

Index: winmain.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/winmain.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- winmain.c	12 Apr 2006 04:20:04 -0000	1.2
+++ winmain.c	21 Apr 2006 12:00:07 -0000	1.3
@@ -152,13 +152,12 @@
     //Kick winsock into gear
     if (WSAStartup (MAKEWORD (1, 1), &data) != 0)
     {
-        fprintf (stderr,
-                 "Could not find WINSOCK.DLL / WINSOCK initializtion failed\n");
+        LineToConsole ("Could not find WINSOCK.DLL / WINSOCK initializtion failed\n");
         return -1;
     }
     if (data.wVersion < MAKEWORD (1, 1))
     {
-        fprintf (stderr, "Bad WINSOCK.DLL version (need at least v1.1).\n");
+        LineToConsole ("Bad WINSOCK.DLL version (need at least v1.1).\n");
         WSACleanup ();
         return -1;
     }
@@ -264,7 +263,7 @@
 void
 perror (const char *str)
 {
-    printf ("%s: errno = %d, WSALast = %d\n", str, errno, WSAGetLastError ());
+    LineToConsole ("%s: errno = %d, WSALast = %d\n", str, errno, WSAGetLastError ());
 }
 
 
@@ -289,27 +288,27 @@
     if (timeout)
     {
         ms = (timeout->tv_sec << 10) + (timeout->tv_usec >> 10);
-        printf ("sec = %d, usec = %d\n", timeout->tv_sec, timeout->tv_usec);
+        LineToConsole ("sec = %d, usec = %d\n", timeout->tv_sec, timeout->tv_usec);
     }
     else
         ms = INFINITE;
 
-    printf ("ms=%d, ", ms);
+    LineToConsole ("ms=%d, ", ms);
 
     /* Scan through the array, copying and looking for W_Socket */
     for (i = j = 0; i < readfds->fd_count; i++)
     {
         if (readfds->fd_array[i] != W_SOCKET)
         {
-            printf ("handle %d, sock=%d\n", readfds->fd_array[i], sock);
+            LineToConsole ("handle %d, sock=%d\n", readfds->fd_array[i], sock);
             handles[j++] = readfds->fd_array[i];
         }
         else
             wsocket_present = 1;
     }
 
-    printf ("handles=%d, handle[0]=%d, wsocket=%d\n", j, handles[0],
-            wsocket_present);
+    LineToConsole ("handles=%d, handle[0]=%d, wsocket=%d\n", j, handles[0],
+                    wsocket_present);
 
     readfds->fd_count = 1;
 
@@ -335,7 +334,7 @@
 
     if (got == WAIT_TIMEOUT)
     {
-        printf ("Timeout\n");
+        LineToConsole ("Timeout\n");
         readfds->fd_count = 0;  // clear
         return 0;
     }
@@ -343,7 +342,7 @@
     readfds->fd_array[0] = handles[got - WAIT_OBJECT_0];
     return 1;
 
-    printf ("Success! Returned %d\n", got);
+    LineToConsole ("Success! Returned %d\n", got);
 }
 #endif
 

Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- defaults.c	19 Apr 2006 15:18:27 -0000	1.6
+++ defaults.c	21 Apr 2006 12:00:06 -0000	1.7
@@ -54,6 +54,12 @@
             NULL
         }
     },
+    {"allowWheelActions", &allowWheelActions, RC_BOOL,
+        {
+            "allow mouse wheel to produce action in non-scrollable windows",
+            NULL
+        }
+    },
     {"autoQuit", &autoQuit, RC_INT,
         {
             "Autoquit timer (default 60)",
@@ -74,7 +80,7 @@
     },
     {"colorClient", &colorClient, RC_INT,
         {
-            "What type of ship bitmaps to load",
+            "What type of ship bitmaps to use",
             "0 - mono",
             "1 - new color bitmaps (default)",
             "2 - old color bitmaps",
@@ -723,7 +729,7 @@
     DefaultsLoaded = 1;
 
 #ifdef DEBUG
-    printf ("Initdefaults\n");
+    LineToConsole ("Initdefaults\n");
 #endif
 
     /* Clear defaults if they exist */
@@ -750,7 +756,8 @@
     fp = fopen (deffile, "r");
     if (!fp)
         return;
-    printf ("Reading defaults file %s\n", deffile);
+
+    LineToConsole ("Reading defaults file %s\n", deffile);
 
 #ifdef NBT
     macrocnt = 0;               /* reset macros */
@@ -784,15 +791,16 @@
         {
             if (macrocnt == MAX_MACRO)
             {
-                fprintf (stderr, "Maximum number of macros is %d\n",
-                         MAX_MACRO);
+                LineToConsole ("Maximum number of macros is %d\n", MAX_MACRO);
             }
             else
             {
                 str = file + 6;
                 c = getctrlkey ((unsigned char **) &str);
                 if (c == '?')
-                    fprintf (stderr, "Cannot use '?' for a macro\n");
+                {
+                    LineToConsole ("Cannot use '?' for a macro\n");
+                }
                 else
                 {
                     macro[macrocnt].type = NBTM;
@@ -824,15 +832,16 @@
         {
             if (macrocnt == MAX_MACRO)
             {
-                fprintf (stderr, "Maximum number of macros is %d\n",
-                         MAX_MACRO);
+                LineToConsole ("Maximum number of macros is %d\n", MAX_MACRO);
             }
             else
             {
                 str = file + 4;
                 c = getctrlkey ((unsigned char **) &str);
                 if (c == '?')
-                    fprintf (stderr, "Cannot use '?' for a macro\n");
+                {
+                    LineToConsole ("Cannot use '?' for a macro\n");
+                }
                 else
                 {
                     macro[macrocnt].key = c;
@@ -879,12 +888,9 @@
 #ifdef MULTILINE_MACROS
                         if (keysused[macro[macrocnt].key])
                         {
-                            printf
-                                ("Multiline macros of nonstandard types are not recommended.\n");
-                            printf
-                                ("You might experience strange behaviour of macros.\n");
-                            printf ("Type: unspecified macro, key: %c.\n",
-                                    macro[macrocnt].key);
+                            LineToConsole ("Multiline macros of nonstandard types are not recommended.\n");
+                            LineToConsole ("You might experience strange behaviour of macros.\n");
+                            LineToConsole ("Type: unspecified macro, key: %c.\n", macro[macrocnt].key);
                         }
 #endif /* MULTILINE_MACROS */
                     }
@@ -989,8 +995,7 @@
 
             if ((keycnt = strlen (keys)) == MAX_KEY - 1)
             {
-                fprintf (stderr, "Maximum number of keys is %d\n",
-                         MAX_KEY - 1);
+                LineToConsole ("Maximum number of keys is %d\n", MAX_KEY - 1);
             }
             else
             {
@@ -1342,6 +1347,8 @@
     if (timerType < T_NONE || timerType >= T_TOTAL)
         timerType = T_SHIP;
 
+    allowWheelActions = booleanDefault ("allowWheelActions", allowWheelActions);
+
     tpDotDist = intDefault ("tpDotDist", tpDotDist);
     omitTeamLetter = booleanDefault ("omitTeamLetter", omitTeamLetter);
 	beepOnPrivateMessage = booleanDefault ("beepOnPrivateMessage", beepOnPrivateMessage);
@@ -1598,7 +1605,6 @@
 
 	updateWindowsGeometry (qwin);
 	updateWindowsGeometry (statwin);
-	updateWindowsGeometry (scanwin);
 	updateWindowsGeometry (war);
 */
 }
@@ -1628,7 +1634,7 @@
 
 #ifdef DEBUG
 #define CHECK_FILE \
-      printf("Checking for file %s...\n", found); \
+      LineToConsole ("Checking for file %s...\n", found); \
       accessible = access(found, R_OK); \
       if (accessible == 0)\
         return 1;
@@ -1650,7 +1656,7 @@
 
     /* check current directory first */
 #ifdef DEBUG
-    printf ("Checking for file %s\n", fname);
+    LineToConsole ("Checking for file %s\n", fname);
 #endif
     accessible = access (fname, R_OK);
     if (accessible == 0)

Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- data.c	19 Apr 2006 15:18:27 -0000	1.6
+++ data.c	21 Apr 2006 12:00:06 -0000	1.7
@@ -46,7 +46,7 @@
 int shrinkPhaserOnMiss = 0;
 
 int colorClient = 1;            /* Use new colorized bitmaps SRS 11/12/99 */
-int dynamicBitmaps = 1;		/* in game switching of ship bitmaps, default to on */
+int dynamicBitmaps = 1;         /* in game switching of ship bitmaps, default to on */
 int newDashboard = 2;           /* use new graphic
                                  * dashboard, 6/2/93 LAB */
 int old_db = 0;                 /* should be same as
@@ -90,7 +90,7 @@
 int infomapped = 0;
 int mustexit = 0;
 int messtime = 5;
-int keepPeace = 0;
+int keepPeace = 1;
 
 #ifdef GATEWAY
 unsigned LONG netaddr = 0;      /* for blessing */
@@ -98,7 +98,6 @@
 #endif
 
 int msgBeep = 1;                /* ATM - msg beep */
-int scanmapped = 0;             /* ATM - scanners */
 
 int planetBitmap = 0;
 
@@ -216,12 +215,10 @@
 int updatesPerSec = 10;
 
 #ifdef META
-char *metaServer = "metaserver.netrek.org";      /* Default Metaserver */
-char *metaServer1 = "metaserver.us.netrek.org";  /* First Metaserver */
-char *metaServer2 = "metaserver2.us.netrek.org"; /* Second Metaserver */
-char *metaServer3 = "metaserver.eu.netrek.org";  /* Third Metaserver */
-int metaPort = 3521;            /* HAVE to use nicely
-                                 * formated version */
+/* Metaservers list */
+char *metaServer[] = {"metaserver.us.netrek.org",
+                      "metaserever2.us.netrek.org"};
+int metaPort = 3521;
 #ifdef METAPING
 int metaPing = 1;				/*  ICMP ping the metaserverlist */
 #endif
@@ -335,8 +332,9 @@
 
 W_Window messagew, w, mapw, statwin, baseWin = 0, infow, tstatw, war,
     warnw, helpWin, teamWin[4], qwin, messwa, messwt, messwi, messwk,
-    playerw, planetw, rankw, optionWin = 0, reviewWin;
-W_Window scanw, scanwin, udpWin, phaserwin, hintWin;
+    playerw, playerw2, planetw, rankw, optionWin = 0, reviewWin;
+W_Window udpWin, phaserwin, hintWin;
+W_Window waitWin, qwin, countWin, motdButtonWin, motdWin;
 
 #ifdef SHORT_PACKETS
 W_Window spWin = NULL;
@@ -360,7 +358,7 @@
 W_Window pStats = NULL;
 
 char deathmessage[80];
-char outmessage[1024];          /* maximum message length */
+char outmessage[MAX_MLENGTH];          /* maximum message length */
 
 char *xdisplay_name = NULL;
 
@@ -505,7 +503,7 @@
 struct dmacro_list rcm_msg[] = {
     {'0', "none", "Unknown RCM message"},
     {'1', "kill", "GOD->ALL %i (%S) (%T%c%?%a>0%{+%a armies%!%}) was kill %?%d>0%{%k%!(NO CREDIT)%} for %u (%r%p) %?%w>0%{%W%!%}"},
-    {'2', "planet", "GOD->ALL %i (%S) (%T%c%?%a>0%{+%a armies%!%} killed by %l (%z) %?%w>0%{%W%!%}"},
+    {'2', "planet", "GOD->ALL %i (%S) (%T%c%?%a>0%{+%a armies%!%}) killed by %l (%z) %?%w>0%{%W%!%}"},
     {'3', "bomb", "%N->%Z We are being attacked by %i (%T%c) who is %d%% damaged."},
     {'4', "destroy", "%N->%Z %N destroyed by %i (%T%c)"},
     {'5', "take", "%N->%O %N taken by %i (%T%c)"},
@@ -654,7 +652,8 @@
 char *ind_ship_bmp_M;
 
 // Added to fix thread creation issue
-HANDLE ThreadCreated = NULL;
+HANDLE MainThread = NULL;
+HANDLE InputThread = NULL;
 
 // missing variables
 int forceDisplay = 0;
@@ -711,3 +710,14 @@
 SDBUFFER * mapSDB = NULL;
 
 int disableWinkey = 1;  /* disable WinKey + ContextKey by default */
+
+int exitFlag = 0;       /* no exit by default */
+
+struct cons_buffer * consHead = NULL;    // head of the linked list for console buffer
+struct cons_buffer * consTail = NULL;    // tail of the linked list for console buffer
+
+int allowWheelActions = 1;   /* allow wheel actions */
+
+WNDPROC lpfnDefRichEditWndProc;     /* default window proc */
+
+int richText = 0;   /* temporary variable to select rich text message windows */
\ No newline at end of file

Index: defwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defwin.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- defwin.c	12 Apr 2006 04:20:03 -0000	1.2
+++ defwin.c	21 Apr 2006 12:00:06 -0000	1.3
@@ -18,6 +18,25 @@
  * the use of it.)
  * 
  * $Log$
+ * Revision 1.3  2006/04/21 12:00:06  modemhero
+ * This large patch brings the client up to Stas's version 4.4.0.4.  The visible changes to the user are:
+ * - added "allowWheelActions: (on)/off" to be able to disable wheel in non-scrolling windows
+ * - added new window "player2" that behaves exactly as player list window, but allows to
+ *   select alternate custom layout and could be toggled with 'A' key
+ * - added "playerList2: (string)" option that allows to select different player list layout
+ *   for alternate player list window, by default it will be "n T R N l M K W L r O D d "
+ * - fixed bug that caused main thread to continue in case player died while scrolling
+ *   message window using scrollbar (which forced him close client window and reconnect)
+ * - fixed incorrect behavior of 'windowMove: off' feature. Previously window would snap
+ *   back to wrong place if the main window top-left corner was not (0,0) coordinates
+ * - long lines are now wrapped by words instead of by chars. Maximum message length was
+ *   reduced to 4 full message lines (4 * 69 characters)
+ * - message input window will now show Sender->Recipient even when the input line is longer
+ *   than 69 characters
+ * - changed 'Forum' URL on metaserver window to open Google's r.g.n location
+ *
+ * There are also several internal changes, such as a new format for error messages.
+ *
  * Revision 1.2  2006/04/12 04:20:03  modemhero
  * Update to version 4.4.0.3
  *
@@ -504,7 +523,7 @@
                     x = xo + INDENT;
                     break;
                 default:
-                    fprintf (stderr, "Unknown type.\n");
+                    LineToConsole ("Unknown type.\n");
                     break;
                 }
             }

Index: feature.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/feature.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- feature.c	18 Apr 2006 13:41:48 -0000	1.2
+++ feature.c	21 Apr 2006 12:00:06 -0000	1.3
@@ -112,7 +112,7 @@
                          (char) (f->arg2 ? *f->arg2 : 0));
 
 #ifdef DEBUG
-        printf ("(C->S) %s (%c): %d\n", f->name, f->feature_type, f->value);
+        LineToConsole ("(C->S) %s (%c): %d\n", f->name, f->feature_type, f->value);
 #endif
     }
 }
@@ -131,7 +131,7 @@
 #ifdef DEBUG
     if (packet->type != SP_FEATURE)
     {
-        printf ("Packet type %d sent to checkFeature!\n", packet->type);
+        LineToConsole ("Packet type %d sent to checkFeature!\n", packet->type);
         return;
     }
 #endif
@@ -142,7 +142,7 @@
 #ifdef TOOLS
     W_WriteText (toolsWin, 0, 0, textColor, buf, strlen (buf), W_RegularFont);
 #else
-    printf ("%s\n", buf);
+    LineToConsole ("%s\n", buf);
 #endif
 
     for (i = 0; features[i].name != 0; i++)
@@ -163,7 +163,7 @@
     }
     if (features[i].name == 0)
     {
-        printf ("Feature %s from server unknown to client!\n", packet->name);
+        LineToConsole ("Feature %s from server unknown to client!\n", packet->name);
     }
     /* special cases: */
     if (strcmpi (packet->name, "FEATURE_PACKETS") == 0)

Index: parsemeta.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/parsemeta.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- parsemeta.c	15 Apr 2006 09:58:25 -0000	1.3
+++ parsemeta.c	21 Apr 2006 12:00:07 -0000	1.4
@@ -140,7 +140,9 @@
         if ((hp = gethostbyname (host)) == NULL)
         {
             if (verbose)
-                fprintf (stderr, "unknown host '%s'\n", host);
+            {
+                LineToConsole ("unknown host '%s'\n", host);
+            }
             return (-1);
         }
         else
@@ -182,7 +184,7 @@
 #endif
 
 #ifdef DEBUG
-    printf ("In parseInput\n");
+    LineToConsole ("In parseInput\n");
 #endif
 
     /* Create some space to hold the entries that will be read.  More space can
@@ -302,13 +304,13 @@
         {
 
 #ifdef DEBUG
-            printf ("HOST:%-30s PORT:%-6d %12s %-5d %d %c\n",
-                    serverlist[num_servers].address,
-                    serverlist[num_servers].port,
-                    statusStrings[serverlist[num_servers].status],
-                    serverlist[num_servers].players,
-                    serverlist[num_servers].RSA_client,
-                    serverlist[num_servers].typeflag);
+            LineToConsole ("HOST:%-30s PORT:%-6d %12s %-5d %d %c\n",
+                            serverlist[num_servers].address,
+                            serverlist[num_servers].port,
+                            statusStrings[serverlist[num_servers].status],
+                            serverlist[num_servers].players,
+                            serverlist[num_servers].RSA_client,
+                            serverlist[num_servers].typeflag);
 #endif
 
             ++num_servers;
@@ -328,37 +330,34 @@
     char *sockbuf, *buf;
     int bufleft = BUF - 1;
     int len;
-    int sock;
+    int sock = 0;
+    int i = 0;
 
-    if ((stringDefault ("metaServer")) != NULL)
-        metaServer = stringDefault ("metaServer");
+    if (stringDefault ("metaServer") != NULL)
+        metaServer[0] = stringDefault ("metaServer");
 
     metaPort = intDefault ("metaPort", metaPort);
 
-    if ((sock = open_port (metaServer, metaPort, 1)) <= 0)
+    /* Attempt connecting to all servers one by one */
+    do
     {
-        fprintf (stderr, "Cannot connect to MetaServer (%s , %d)\n",
-                 metaServer, metaPort);
+        LineToConsole ("Calling %s on port %d\n", metaServer[i], metaPort);
 
-        /* Okie, let's just try default servers */
-        if ((sock = open_port (metaServer1, metaPort, 1)) <= 0)
+        sock = open_port (metaServer[i], metaPort, 0);
+
+        if (sock <= 0)
         {
-            fprintf (stderr, "Cannot connect to MetaServer (%s , %d)\n",
-                             metaServer1, metaPort);
-            if ((sock = open_port (metaServer2, metaPort, 1)) <= 0)
-            {
-                fprintf (stderr, "Cannot connect to MetaServer (%s , %d)\n",
-                                    metaServer2, metaPort);
-                if ((sock = open_port (metaServer3, metaPort, 1)) <= 0)
-                {
-                    fprintf (stderr, "Cannot connect to MetaServer (%s , %d)\n",
-                                        metaServer3, metaPort);
-                    return 0;
-                }
-            }
+            LineToConsole ("Cannot connect to MetaServer (%s port %d)\n",
+                            metaServer[i], metaPort);
         }
-    }
 
+        i++;
+
+    } while (sock <= 0 && i <= 1);  /* i shouldn't be bigger than number of servers */
+
+    /* Still no connection -> return */
+    if (sock <= 0)
+        return 0;
 
     /* Allocate a buffer and read until full */
     buf = sockbuf = (char *) malloc (BUF);
@@ -367,7 +366,7 @@
         bufleft -= len;
         buf += len;
 #ifdef DEBUG
-        printf ("Read %d bytes from Metaserver\n", len);
+        LineToConsole ("Read %d bytes from Metaserver\n", len);
 #endif
     }
     closesocket (sock);
@@ -401,10 +400,10 @@
 
         if (out == NULL)
         {
-            fprintf (stderr,
+            LineToConsole (
                      "Can not write to the metaCache temporary file `%s'.\n",
                      tmpFileName);
-            fprintf (stderr, "Meta-server read will not be cached.\n");
+            LineToConsole ("Meta-server read will not be cached.\n");
         }
     }
     else
@@ -451,15 +450,14 @@
 
     if (!cacheName)
     {
-        fprintf (stderr,
-                 "You must define the .xtrekrc variable `metaCache' in\n");
-        fprintf (stderr, "order to use the `show known servers' option.\n");
+        LineToConsole ("You must define the .xtrekrc variable `metaCache' in\n");
+        LineToConsole ("order to use the `show known servers' option.\n");
         return 0;
     }
     else if (!findfile (cacheName, cacheFileName)
              || !(in = fopen (cacheFileName, "r")))
     {
-        fprintf (stderr,
+        LineToConsole (
                  "The metaCache file `%s' is empty or not accessable.\n",
                  cacheName);
         return 0;
@@ -476,7 +474,7 @@
         bufleft -= len;
         buf += len;
 #ifdef DEBUG
-        printf ("Read %d bytes from Metaserver cache file\n", len);
+        LineToConsole ("Read %d bytes from Metaserver cache file\n", len);
 #endif
     }
     *buf = 0;                   /* End of buffer marker */
@@ -701,7 +699,7 @@
 
 	/* Additional Help Options */
 	W_WriteText (metaWin, 0, num_servers + 1, W_Yellow, 
-		        "        Netrek Homepage | Newbie Manual | FAQ | Dogfight Manual", 63, 0);
+		        "    Netrek Homepage | Newbie Manual | Forum | FAQ | Dogfight Manual", 67, 0);
 
     /* Map window */
     W_MapWindow (metaWin);
@@ -742,7 +740,7 @@
 	int x;
 
 #ifdef DEBUG
-    printf ("Got meta window action, y=%d\n", data->y);
+    LineToConsole ("Got meta window action, y=%d\n", data->y);
 #endif
     if ((data->y >= 0) && (data->y < num_servers))
     {
@@ -751,7 +749,7 @@
         if (data->key == W_RBUTTON)     /* Guess at an observer port */
         {
             xtrekPort++;
-            printf ("Attempting to observe on port %d...\n", xtrekPort);
+            LineToConsole ("Attempting to observe on port %d...\n", xtrekPort);
         }
         serverName = strdup (slist->address);
 		serverType = metaGetServerType (slist->typeflag);
@@ -762,6 +760,8 @@
 		slist->status = statusConnecting;
         metarefresh (data->y);
 
+        LineToConsole ("Checking %s on port %d\n", serverName, xtrekPort);
+
         if ((sock = open_port (serverName, xtrekPort, 0)) <= 0)
         {
             slist->status = statusCantConnect;
@@ -784,13 +784,15 @@
 	else if (data->y == num_servers + 1) /* Help Line */
 	{
 		x = data->x / W_Textwidth;
-		if (x >= 0 && x <= 23)			/* Netrek Home Page */
+		if (x >= 0 && x <= 19)			/* Netrek Home Page */
 			ShellExecute (NULL, "open", "http://www.netrek.org", NULL, NULL, SW_SHOWNORMAL);
-		else if (x >= 25 && x <= 39)	/* Newbie Manual */
+		else if (x >= 21 && x <= 35)	/* Newbie Manual */
 			ShellExecute (NULL, "open", "http://www.netrek.org/cow/current/newbie.html", NULL, NULL, SW_SHOWNORMAL);
-		else if (x >= 41 && x <= 45)	/* FAQ */
+		else if (x >= 37 && x <= 43)	/* Forums */
+			ShellExecute (NULL, "open", "http://groups-beta.google.com/group/rec.games.netrek", NULL, NULL, SW_SHOWNORMAL);
+		else if (x >= 45 && x <= 49)	/* FAQ */
 			ShellExecute (NULL, "open", "http://www.inl.org/netrek/netrekFAQ.html", NULL, NULL, SW_SHOWNORMAL);
-		else if (x >= 47 && x <= 63)	/* Dogfight Manual */
+		else if (x >= 51 && x <= 67)	/* Dogfight Manual */
 			ShellExecute (NULL, "open", "http://cha.rlie.nl/dfmanual/", NULL, NULL, SW_SHOWNORMAL);
 	}
 }
@@ -825,7 +827,8 @@
 			&IDThread);							// returns thread identifier 
  
 		// Check the return value for success. 
-		if (hThread == NULL) printf("CreateThread error\n");
+		if (hThread == NULL)
+            LineToConsole ("CreateThread error\n");
 	}
 #endif
 
@@ -912,8 +915,7 @@
 // What happened?
 void metaPing_ReportError(char *pWhere)
 {
-	fprintf(stderr,"\n%s error: %d\n", pWhere,
-		WSAGetLastError());
+	LineToConsole ("\n%s error: %d\n", pWhere, WSAGetLastError());
 }
 
 

Index: helpwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/helpwin.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- helpwin.c	12 Apr 2006 04:20:03 -0000	1.2
+++ helpwin.c	21 Apr 2006 12:00:07 -0000	1.3
@@ -127,6 +127,7 @@
     "U     Show rankings window",
     "m     Message Window Zoom",
     "/     Toggle sorted player list",
+    "A     Toggle alternate player list",
     ":     Toggle message logging",
     "+     Show UDP options window",
     "=     Update all",

Index: dmessage.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/dmessage.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dmessage.c	18 Apr 2006 13:41:48 -0000	1.3
+++ dmessage.c	21 Apr 2006 12:00:06 -0000	1.4
@@ -102,12 +102,10 @@
 
     buf[79] = '\0';
 
-    /* printf("%s\n", buf); */
-
 #ifdef TOOLS
     W_WriteText (toolsWin, 0, 0, textColor, buf, strlen (buf), W_RegularFont);
 #else
-    W_MessageAllowedWindows (WAM_INDIV, 0, 0, W_White, buf, stlen (buf), 0);
+    W_MessageAllowedWindows (WAM_INDIV, 0, 0, W_White, buf, strlen (buf), 0);
 #endif
 }
 
@@ -178,19 +176,17 @@
             }
             else
             {
-                printf ("%s: %s\n", timebuf, message);
+                LineToConsole ("%s: %s\n", timebuf, message);
             }
         }
         if (!(logging && logFile == NULL) && flags == conq)
         {
             /* output conquer stuff to stdout in addition to message window */
-            fprintf (stdout, "%s\n", message);
+            LineToConsole ("%s\n", message);
             if (instr (message, "kill"))
             {
-                fprintf (stdout,
-                         "NOTE: The server here does not properly set message flags\n");
-                fprintf (stdout,
-                         "You should probably pester the server god to update....\n");
+                LineToConsole ("NOTE: The server here does not properly set message flags\n");
+                LineToConsole ("You should probably pester the server god to update....\n");
             }
         }
         if (flags == (MCONFIG + MINDIV + MVALID))
@@ -205,7 +201,7 @@
             if ((flags == team) &&
                 !strncmp (message + 10, "     ", 5) && (message[15] == 0))
             {
-                printf ("dmessage:flags==team PIG call from=%d\n", from);
+                LineToConsole ("dmessage:flags==team PIG call from=%d\n", from);
                 pmessage (pigcall, from, MINDIV);
             }
         }
@@ -226,13 +222,13 @@
             W_MessageAllowedWindows (WAM_INDIV, 0, 0, color, message, len, 0);
             if (!strncmp (message + 10, "     ", 5) && (message[15] == 0))
             {
-                printf ("dmessage:MINDIV PIG call from=%d\n", from);
+                LineToConsole ("dmessage:MINDIV PIG call from=%d\n", from);
                 pmessage (pigcall, from, MINDIV);
             }
 #ifdef CLUECHECKBORG
             if (from == 255)
             {
-                printf ("dmessage: Message from God %s\n", message);
+                LineToConsole ("dmessage: Message from God %s\n", message);
                 ClueRespond (message);
             }
 #endif
@@ -275,8 +271,8 @@
                 }
                 else
                 {
-                    printf ("%s ", message);
-                    printf ("%s\n", timebuf);
+                    LineToConsole ("%s ", message);
+                    LineToConsole ("%s\n", timebuf);
                 }
             }
             return;
@@ -299,8 +295,8 @@
                 }
                 else
                 {
-                    printf ("%s ", message);
-                    printf ("%s\n", timebuf);
+                    LineToConsole ("%s ", message);
+                    LineToConsole ("%s\n", timebuf);
                 }
             }
             break;
@@ -326,8 +322,8 @@
                 }
                 else
                 {
-                    printf ("%s ", message);
-                    printf ("%s\n", timebuf);
+                    LineToConsole ("%s ", message);
+                    LineToConsole ("%s\n", timebuf);
                 }
             }
             break;
@@ -347,8 +343,8 @@
                 }
                 else
                 {
-                    printf ("%s", message);
-                    printf ("%s\n", timebuf);
+                    LineToConsole ("%s", message);
+                    LineToConsole ("%s\n", timebuf);
                 }
             }
             break;

Index: udpopt.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/udpopt.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- udpopt.c	21 Jan 2003 21:28:43 -0000	1.1.1.1
+++ udpopt.c	21 Apr 2006 12:00:07 -0000	1.2
@@ -61,8 +61,8 @@
             strcat (buf, "Verifying UDP connection");
             break;
         default:
-            fprintf (stderr, "netrek: UDP error: bad commStatus (%d)\n",
-                     commStatus);
+            LineToConsole ("netrek: UDP error: bad commStatus (%d)\n",
+                             commStatus);
         }
         break;
     case UDP_DROPPED:
@@ -145,7 +145,7 @@
         strcpy (buf, "Done");
         break;
     default:
-        fprintf (stderr, "netrek: UDP error: bad udprefresh(%d) call\n", i);
+        LineToConsole ("netrek: UDP error: bad udprefresh(%d) call\n", i);
     }
 
     W_WriteText (udpWin, 0, i, textColor, buf, strlen (buf), 0);

Index: input.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/input.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- input.c	15 Apr 2006 09:58:25 -0000	1.3
+++ input.c	21 Apr 2006 12:00:07 -0000	1.4
@@ -632,7 +632,7 @@
 #endif /* SHIFTED_MOUSE */
                 
             default:
-                fprintf (stderr, "%c ignored in buttonmap\n", *(str - 1));
+                LineToConsole ("%c ignored in buttonmap\n", *(str - 1));
                 break;
             }
         }
@@ -673,9 +673,12 @@
        event detection and handling into the select() mechanism.
        It probably also increases performance */
     // Close HANDLE from previously created thread.
-    if (ThreadCreated != NULL)
-        CloseHandle (ThreadCreated);
-    THREAD (input2);
+    if (InputThread != NULL)
+    {
+        WaitForSingleObject (InputThread, INFINITE);
+        CloseHandle (InputThread);
+    }
+    InputThread = CreateThread (NULL, 0, (LPTHREAD_START_ROUTINE) input2, 0, 0, &InputThreadID);
 
     while (1)
     {
@@ -684,6 +687,9 @@
         process_event ();
     }
 
+    /* clear exitFlag */
+    exitFlag = 0;
+
     while (W_EventsPending ())
         W_NextEvent (&event);
 
@@ -745,8 +751,8 @@
 
                 if (isServerDead ())
                 {
-                    printf ("Whoops!  We've been ghostbusted!\n");
-                    printf ("Pray for a miracle!\n");
+                    LineToConsole ("Whoops!  We've been ghostbusted!\n");
+                    LineToConsole ("Pray for a miracle!\n");
                     /* UDP fail-safe */
                     commMode = commModeReq = COMM_TCP;
                     commSwitchTimeout = 0;
@@ -758,7 +764,7 @@
                         udprefresh (UDP_STATUS);
                     }
                     connectToServer (nextSocket);
-                    printf ("Yea!  We've been resurrected!\n");
+                    LineToConsole ("Yea!  We've been resurrected!\n");
                 }
             }
 
@@ -968,8 +974,8 @@
                 intrupt ();
                 if (isServerDead ())
                 {
-                    printf ("Shit, We've been ghostbusted\n");
-                    printf ("hope you're not in a base\n");
+                    LineToConsole ("Shit, We've been ghostbusted\n");
+                    LineToConsole ("hope you're not in a base\n");
                     /* UDP fail-safe */
                     commMode = commModeReq = COMM_TCP;
                     commSwitchTimeout = 0;
@@ -981,7 +987,7 @@
                         udprefresh (UDP_STATUS);
                     }
                     connectToServer (nextSocket);
-                    printf ("We've been resurrected!\n");
+                    LineToConsole ("We've been resurrected!\n");
                     map ();
                 }
             }
@@ -1010,7 +1016,7 @@
         case W_EV_KEY:
 
 #ifdef DEBUG
-            printf ("W_EV_KEY\n");
+            LineToConsole ("W_EV_KEY\n");
 #endif
 
             if ((handler = W_GetWindowKeyDownHandler (data.Window)) != NULL)
@@ -1109,7 +1115,7 @@
         case W_EV_KEY_OFF:
 
 #ifdef DEBUG
-            printf ("W_EV_KEY_OFF\n");
+            LineToConsole ("W_EV_KEY_OFF\n");
 #endif
 
             if ((handler = W_GetWindowKeyUpHandler (data.Window)) != NULL)
@@ -1122,7 +1128,7 @@
         case W_EV_BUTTON:
 
 #ifdef DEBUG
-            printf ("W_EV_BUTTON\n");
+            LineToConsole ("W_EV_BUTTON\n");
 #endif
 
             if ((handler = W_GetWindowButtonHandler (data.Window)) != NULL)
@@ -1134,7 +1140,7 @@
         case W_EV_EXPOSE:
 
 #ifdef DEBUG
-            printf ("W_EV_EXPOSE\n");
+            LineToConsole ("W_EV_EXPOSE\n");
 #endif
 
             if ((handler = W_GetWindowExposeHandler (data.Window)) != NULL)
@@ -1178,7 +1184,7 @@
                                  * fastquit! */
 
     if (data->Window != mapw && data->Window != w && data->Window != infow
-        && data->Window != scanw && data->Window != playerw)
+        && data->Window != playerw)
         return;
 
     key = data->key;
@@ -1481,7 +1487,7 @@
 
 
     if (data->Window != w && data->Window != mapw
-        && data->Window != infow && data->Window != scanwin
+        && data->Window != infow
 		&& data->Window != playerw)
         return;
 
@@ -1489,9 +1495,9 @@
 	{
 		int x, y;
 
-        	if (findMouseInWin (&x, &y, playerw))
-	   	{
-		    	data->Window = playerw;
+        if (findMouseInWin (&x, &y, playerw))
+	    {
+		    data->Window = playerw;
 			data->x = x;
 			data->y = y;
 		}
@@ -1819,15 +1825,6 @@
                                        / 3.14159 * 128.) + 0.5));
 }
 
-/******************************************************************************/
-/***  scan.c  - Why do you have a func that does nothing?                   ***/
-/******************************************************************************/
-void
-scan (W_Window w,
-      int x,
-      int y)
-{
-}
 
 /******************************************************************************/
 /***  detmine()                                                             ***/
@@ -1915,8 +1912,9 @@
         if (MacroNum > -1)
         {                       /* macro identified, who to? */
             if (MacroNum >= MAX_MACRO)
-                fprintf (stderr,
-                         "Unknown Macro Num!  There is a macro bug!!\n");
+            {
+                LineToConsole ("Unknown Macro Num!  There is a macro bug!!\n");
+            }
 
             if (!pmacro (MacroNum, data->key, data))
                 W_Beep ();
@@ -2050,7 +2048,7 @@
 
 
             default:
-                fprintf (stderr, "Unknown Macro Type!  Jeff's a twink!!\n");
+                LineToConsole ("Unknown Macro Type!  Jeff's a twink!!\n");
                 warning ("Unknown macro type (eg There is a macro bug)");
                 return;
                 break;
@@ -2095,6 +2093,7 @@
     if (infomapped)
         destroyInfo ();
     W_UnmapWindow (helpWin);
+    W_UnmapWindow (playerw2);
 
 #ifdef NBT
     W_UnmapWindow (macroWin);
@@ -2108,11 +2107,7 @@
     W_UnmapWindow (war);
     if (optionWin)
         optiondone ();
-    if (scanmapped)
-    {
-        W_UnmapWindow (scanwin);
-        scanmapped = 0;
-    }
+
     if (udpWin)
         udpdone ();
 
@@ -2488,8 +2483,10 @@
 void
 Key65 (W_Event * data)
 {
-    /*  W_ShowBitmaps(); */
-    emptyKey ();
+    if (W_IsMapped (playerw2))
+        W_UnmapWindow (playerw2);
+    else
+        W_MapWindow (playerw2);
 }
 
 /******************************************************************************/
@@ -2919,16 +2916,7 @@
 void
 Key97 (W_Event * data)
 {
-    if (!W_IsMapped (scanwin))
-    {
-        scan (data->Window, data->x, data->y);
-    }
-    else
-    {
-        if (scanmapped)
-            W_UnmapWindow (scanwin);
-        scanmapped = 0;
-    }
+    emptyKey ();
 }
 
 /******************************************************************************/

Index: makefile
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- makefile	18 Apr 2006 13:41:48 -0000	1.4
+++ makefile	21 Apr 2006 12:00:07 -0000	1.5
@@ -88,7 +88,7 @@
 DEBUGDEFS = -DDEBUG
 !endif
 
-ROBJ            = beeplite.obj check.obj colors.obj data.obj death.obj defaults.obj dmessage.obj\
+ROBJ            = beeplite.obj check.obj colors.obj console.obj data.obj death.obj defaults.obj dmessage.obj\
                   enter.obj findslot.obj getname.obj getship.obj helpwin.obj hintwin.obj inform.obj\
                   interface.obj newwin.obj option.obj planetlist.obj macrowin.obj\
                   map.obj playerlist.obj ranklist.obj reserved.obj sintab.obj\
@@ -99,7 +99,7 @@
                   docwin.obj feature.obj\
                   string_util.obj local.obj cowmain.obj playback.obj
 
-RSRC            = beeplite.c check.c colors.c data.c death.c defaults.c dmessage.c\
+RSRC            = beeplite.c check.c colors.c console.c data.c death.c defaults.c dmessage.c\
                   enter.c findslot.c getname.c getship.c helpwin.c hintwin.c inform.c\
                   input.c interface.c newwin.c option.c planetlist.c\
                   macrowin.c map.c playerlist.c ranklist.c redraw.c\

Index: distress.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/distress.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- distress.c	21 Jan 2003 21:28:40 -0000	1.1.1.1
+++ distress.c	21 Apr 2006 12:00:06 -0000	1.2
@@ -137,14 +137,12 @@
     if (bufa[*inda])
         (*inda)--;
 
-    if (!operation)             /* incomplete is truth, just
-                                 * ask Godel */
+    if (!operation)             /* incomplete is truth, just ask Godel */
         return (1);
 
     switch (operation)
     {
-    case '=':                  /* character by character
-                                 * equality */
+    case '=':                  /* character by character equality */
         if (indc != indh)
             return (0);
         for (i = 0; i < indc; i++)
@@ -171,11 +169,9 @@
 
     default:
         warning ("Bad operation in Macro!");
-        printf
-            ("Unrecognizable operation in macro pass3: %c  Trying to continue.\n",
-             operation);
-        return (1);             /* don't know what happened,
-                                 * pretend we do */
+        LineToConsole ("Unrecognizable operation in macro pass3: %c  Trying to continue.\n",
+                        operation);
+        return (1);             /* don't know what happened, pretend we do */
         break;
     }
 }
@@ -219,14 +215,12 @@
                         bufb[(*indb)++] = bufa[(*inda)++];
                 }
                 else
-                    return;     /* we are full, so we are
-                                 * done */
+                    return;     /* we are full, so we are done */
                 state = 0;
                 continue;
                 break;
 
-            case '?':          /* the dreaded conditional,
-                                 * evaluate it */
+            case '?':          /* the dreaded conditional, evaluate it */
                 bufb[*indb] = '0' + solvetest (bufa, inda);
                 (*indb)++;
                 state = 0;
@@ -235,10 +229,10 @@
 
             default:
                 warning ("Bad character in Macro!");
-                printf
-                    ("Unrecognizable special character in macro pass2: %c  Trying to continue.\n",
+                LineToConsole (
+                    "Unrecognizable special character in macro pass2: %c  Trying to continue.\n",
                      bufa[(*inda) - 1]);
-                fprintf (stderr, "macro: %s\n", bufa);
+                LineToConsole ("macro: %s\n", bufa);
                 state = 0;
                 continue;
                 break;
@@ -302,8 +296,8 @@
                 break;
             default:
                 warning ("Bad character in Macro!");
-                printf
-                    ("Unrecognizable special character in macro pass5: %c  Trying to continue.\n",
+                LineToConsole (
+                    "Unrecognizable special character in macro pass5: %c  Trying to continue.\n",
                      buf[index - 1]);
             }
         }
@@ -347,31 +341,28 @@
         {
             switch (bufa[(*inda)++])
             {
-            case '}':          /* done with this
-                                 * conditional, return */
+            case '}':          /* done with this conditional, return */
                 return (0);
                 break;
 
             case '{':          /* handle new conditional */
-                if (*indb > 0)
+                if ((bufa[*inda - 3] == '0') && ((*inda - 3) >= 0))
                 {
-                    (*indb)--;
-                    if (bufb[*indb] == '0')
-                        newflag = 0;
-                    else
-                        newflag = 1;
+                    if (*indb > 0 && include)
+                        (*indb)--;
+                    newflag = 0;
                 }
-                else            /* moron starting with cond,
-                                 * assume true */
+                else
+                {
+                    if (*indb > 0 && include)
+                        (*indb)--;
                     newflag = 1;
+                }
 
                 if (include)
                     condmacro (bufa, bufb, inda, indb, newflag);
                 else
-                {
-                    (*indb)++;
                     *inda = skipmacro (bufa, *inda);
-                }
 
                 state = 0;
                 continue;
@@ -427,8 +418,8 @@
 
             default:
                 warning ("Bad character in Macro!");
-                printf
-                    ("Unrecognizable special character in macro pass4: %c  Trying to continue.\n",
+                LineToConsole (
+                    "Unrecognizable special character in macro pass4: %c  Trying to continue.\n",
                      bufa[(*inda) - 1]);
             }
         }
@@ -480,7 +471,7 @@
     *t = 0;
     if (buf[255])
     {
-        fprintf (stderr, "ERROR: String constant overwritten\n");
+        LineToConsole ("ERROR: String constant overwritten\n");
         return NULL;
     }
     return buf;
@@ -629,10 +620,8 @@
     char *strcap (char *s);
 
 #ifndef SERVER
-    extern int ping_tloss_sc;   /* total % loss 0--100,
-                                 * server to client */
-    extern int ping_tloss_cs;   /* total % loss 0--100,
-                                 * client to server */
+    extern int ping_tloss_sc;   /* total % loss 0--100, server to client */
+    extern int ping_tloss_cs;   /* total % loss 0--100, client to server */
     extern int ping_av;         /* average rt */
     extern int ping_sd;         /* standard deviation */
 
@@ -666,11 +655,9 @@
             case ' ':
                 *pbuf1++ = ' ';
                 break;
-            case 'O':          /* push a 3 character team
-                                 * name into buf */
+            case 'O':          /* push a 3 character team name into buf */
                 cap = 1;
-            case 'o':          /* push a 3 character team
-                                 * name into buf */
+            case 'o':          /* push a 3 character team name into buf */
                 APPEND_CAP (pbuf1, cap, teamshort[sender->p_team]);
                 cap = 0;
                 break;
@@ -694,16 +681,12 @@
                 break;
 
             case 'P':          /* push player id into buf */
-            case 'G':          /* push friendly player id
-                                 * into buf */
-            case 'H':          /* push enemy target player
-                                 * id into buf */
+            case 'G':          /* push friendly player id into buf */
+            case 'H':          /* push enemy target player id into buf */
 
             case 'p':          /* push player id into buf */
-            case 'g':          /* push friendly player id
-                                 * into buf */
-            case 'h':          /* push enemy target player
-                                 * id into buf */
+            case 'g':          /* push friendly player id into buf */
+            case 'h':          /* push enemy target player id into buf */
 
                 switch (c)
                 {
@@ -729,8 +712,7 @@
                 *pbuf1++ = j->p_mapchars[1];
                 break;
 
-            case 'n':          /* push planet armies into
-                                 * buf */
+            case 'n':          /* push planet armies into buf */
                 l = &planets[dist->tclose_pl];
                 APPEND_INT (pbuf1,
                             ((l->pl_info & sender->p_team) ? l->
@@ -762,17 +744,14 @@
                 l = &planets[dist->tclose_pl];
                 APPEND (pbuf1, l->pl_name);
                 break;
-            case 'Z':          /* push a 3 character team
-                                 * name into buf */
+            case 'Z':          /* push a 3 character team name into buf */
                 cap = 1;
-            case 'z':          /* push a 3 character team
-                                 * name into buf */
+            case 'z':          /* push a 3 character team name into buf */
                 l = &planets[dist->tclose_pl];
                 APPEND_CAP (pbuf1, cap, teamshort[l->pl_owner]);
                 cap = 0;
                 break;
-            case 't':          /* push a team character
-                                 * into buf */
+            case 't':          /* push a team character into buf */
                 l = &planets[dist->tclose_pl];
                 *pbuf1++ = teamlet[l->pl_owner];
                 break;
@@ -861,26 +840,22 @@
                 break;
 
 #ifdef SERVER
-            case 'v':          /* push average ping round
-                                 * trip time into buf */
+            case 'v':          /* push average ping round trip time into buf */
             case 'V':          /* push ping stdev into buf */
             case 'y':          /* push packet loss into buf */
                 *pbuf1++ = '0';
-            case 'M':          /* push capitalized
-                                 * lastMessage into buf */
+            case 'M':          /* push capitalized lastMessage into buf */
             case 'm':          /* push lastMessage into buf */
                 break;
 #else
-            case 'M':          /* push capitalized
-                                 * lastMessage into buf */
+            case 'M':          /* push capitalized lastMessage into buf */
                 cap = 1;
             case 'm':          /* push lastMessage into buf */
                 APPEND_CAP (pbuf1, cap, lastMessage);
                 cap = 0;
                 break;
 
-            case 'v':          /* push average ping round
-                                 * trip time into buf */
+            case 'v':          /* push average ping round trip time into buf */
                 APPEND_INT (pbuf1, ping_av);
                 break;
 
@@ -921,7 +896,7 @@
                  * message will be parsed without whatever %. has occurred. -
                  * jn */
                 warning ("Bad Macro character in distress!");
-                fprintf (stderr,
+                LineToConsole (
                          "Unrecognizable special character in distress pass 1: %c\n",
                          *(pm - 1));
                 break;

Index: short.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/short.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- short.c	15 Apr 2006 11:55:14 -0000	1.3
+++ short.c	21 Apr 2006 12:00:07 -0000	1.4
@@ -861,8 +861,10 @@
     char addrbuf[9];
 
     if (debug)
-        printf ("Length of Message is: %d  total Size %d \n",
-                strlen (&packet->mesg), (int) packet->length);
+    {
+        LineToConsole ("Length of Message is: %d  total Size %d \n",
+                        strlen (&packet->mesg), (int) packet->length);
+    }
     if (packet->m_from >= MAXPLAYER)
         packet->m_from = 255;
 
@@ -905,7 +907,7 @@
         /* S_P2 */
         if (shortversion == SHORTVERSION && recv_short == 0)
         {                       /* retry for S_P 1 */
-            printf ("Using Short Packet Version 1.\n");
+            LineToConsole ("Using Short Packet Version 1.\n");
             shortversion = OLDSHORTVERSION;
             sendShortReq (SPK_VON);
         }
@@ -927,7 +929,7 @@
         sprefresh (SPK_VFIELD);
         spwinside = ntohs (packet->winside);
         spgwidth = ntohl (packet->gwidth);
-        printf ("Receiving Short Packet Version %d\n", shortversion);
+        LineToConsole ("Receiving Short Packet Version %d\n", shortversion);
         /*
          * Get a `-' style update to fix the kills shown on the playerlist
          * when you first enter and to fix other loss if short packets
@@ -965,8 +967,8 @@
     case SPK_THRESHOLD:
         break;
     default:
-        fprintf (stderr, "%s: unknown response packet value short-req: %d\n",
-                 "netrek", packet->repl);
+        LineToConsole ("%s: unknown response packet value short-req: %d\n",
+                        "netrek", packet->repl);
     }
 }
 
@@ -1253,12 +1255,29 @@
 }
 
 char *whydeadmess[] =
-    { "", "[quit]", "[photon]", "[phaser]", "[planet]", "[explosion]",
-    "[daemon]", "[winner]", "[ghostbust]", "[genocide]", "[hacker]",
-    "[plasma]",
-    "[tournend]", "[gameover]", "[gamestart]", "[bad binary]",
-    "[detted photon]", "[chain explosion]",
-    "[zapped plasma]", "", "[team det]", "[team explosion]"
+{ 
+    "", 
+    "[quit]",               /* KQUIT        */
+    "[photon]",             /* KTORP        */
+    "[phaser]",             /* KPHASER      */
+    "[planet]",             /* KPLANET      */
+    "[explosion]",          /* KSHIP        */
+    "[daemon]",             /* KDAEMON      */
+    "[winner]",             /* KWINNER      */
+    "[ghostbust]",          /* KGHOST       */
+    "[genocide]",           /* KGENOCIDE    */
+    "[hacker]",             /* KPROVIDENCE  */
+    "[plasma]",             /* KPLASMA      */
+    "[tournend]",           /* TOURNEND     */
+    "[gameover]",           /* KOVER        */
+    "[gamestart]",          /* TOURNSTART   */
+    "[bad binary]",         /* KBADBIN      */
+    "[detted photon]",      /* KTORP2       */
+    "[chain explosion]",    /* KSHIP2       */
+    "[zapped plasma]",      /* KPLASMA2     */
+    "",
+    "[team det]",
+    "[team explosion]"
 };
 
 void
@@ -1913,7 +1932,7 @@
 #ifdef CORRUPTED_PACKETS
         if (pnum < 0 || pnum >= MAXPLAYER)
         {
-            fprintf (stderr, "handleKills: bad index %d\n", pnum);
+            LineToConsole ("handleKills: bad index %d\n", pnum);
             return;
         }
 #endif
@@ -2002,7 +2021,7 @@
 #ifdef CORRUPTED_PACKETS
     if (packet->pnum < 0 || packet->pnum >= MAXPLAYER)
     {
-        fprintf (stderr, "handleStats: bad index %d\n", packet->pnum);
+        LineToConsole ("handleStats: bad index %d\n", packet->pnum);
         return;
     }
 #endif

Index: getname.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/getname.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- getname.c	12 Apr 2006 04:20:03 -0000	1.2
+++ getname.c	21 Apr 2006 12:00:07 -0000	1.3
@@ -120,13 +120,13 @@
             readFromServer (NULL);
             if (isServerDead ())
             {
-                printf ("Server is dead!\n");
+                LineToConsole ("Server is dead!\n");
                 exit (0);
             }
         }
         if (loginAccept == 0)
         {
-            printf ("Hmmm... The SOB server won't let me log in as guest!\n");
+            LineToConsole ("Hmmm... The SOB server won't let me log in as guest!\n");
             exit (0);
         }
         return;
@@ -140,7 +140,7 @@
         readFromServer (NULL);
         if (isServerDead ())
         {
-            printf ("Server is dead!\n");
+            LineToConsole ("Server is dead!\n");
             exit (0);
         }
     }
@@ -174,7 +174,7 @@
         readFromServer (NULL);
         if (isServerDead ())
         {
-            printf ("Server is dead!\n");
+            LineToConsole ("Server is dead!\n");
             exit (0);
         }
     }
@@ -474,7 +474,7 @@
                 if (secondsLeft == 0)
                 {
                     me->p_status = PFREE;
-                    printf ("Auto-Quit\n");
+                    LineToConsole ("Auto-Quit\n");
                     exit (0);
                 }
             }
@@ -485,7 +485,7 @@
 
                 if (isServerDead ())
                 {
-                    printf ("Ack!  We've been ghostbusted!\n");
+                    LineToConsole ("Ack!  We've been ghostbusted!\n");
                     exit (0);
                 }
             }
@@ -593,8 +593,7 @@
 void
 noserver (void)
 {
-    printf ("No server name was given. Please put a default server in\n");
-    printf
-        ("your .xtrekrc file or specify the server in the command line.\n");
+    LineToConsole ("No server name was given. Please put a default server in\n");
+    LineToConsole ("your netrekrc.txt file or specify the server in the command line.\n");
     terminate (1);
 }

Index: playback.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/playback.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- playback.c	17 Apr 2006 09:49:45 -0000	1.7
+++ playback.c	21 Apr 2006 12:00:07 -0000	1.8
@@ -512,7 +512,9 @@
     if (size > count)
         count += fread (buf + count, 1, size - count, recordFile);
     if (debug)
-        printf ("Reading packet %d\n", buf[0]);
+    {
+        LineToConsole ("Reading packet %d\n", buf[0]);
+    }
     if (count < size)
     {
         return 1;
@@ -977,7 +979,7 @@
         break;
 #ifdef nodef
     default:
-        printf ("packet type %d", *(unsigned char *) packet);
+        LineToConsole ("packet type %d", *(unsigned char *) packet);
 #endif
     }
 }

Index: option.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- option.c	18 Apr 2006 13:41:48 -0000	1.5
+++ option.c	21 Apr 2006 12:00:07 -0000	1.6
@@ -288,6 +288,7 @@
     {1, "use continuous mouse", &continuousMouse, 0, 0, 0, NULL, NULL},
     {1, "fix continuous mouse", &continuousMouseFix, 0, 0, 0, NULL, NULL},
 #endif
+    {1, "allow wheel actions", &allowWheelActions, 0, 0, 0, NULL, NULL},
     {1, "new keymap entries: %s", 0, 0, newkeys, 13, NULL, NULL},
     {1, "ignore the capslock key", &ignoreCaps, 0, 0, 0, NULL, NULL},
     {1, "%d updates per second", &updatesPerSec, 0, 0, 0, 0, &updates_range},
@@ -312,6 +313,7 @@
     {1, "show \"total\" message window", 0, &reviewWin, 0, 0, NULL, NULL},
     {1, "show phaser log window", 0, &phaserwin, 0, 0, NULL},
     {1, "show statistic window", 0, &statwin, 0, 0, NULL, NULL},
+    {1, "show alternate player list", 0, &playerw2, 0, 0, NULL, NULL},
     {1, "show help window", 0, &helpWin, 0, 0, NULL, NULL},
     {1, "show hints window", &showHints, &hintWin, 0, 0, NULL, NULL},
 #ifdef XTREKRC_HELP
@@ -330,7 +332,7 @@
     {1, "show UDP control window", 0, &udpWin, 0, 0, NULL, NULL},
     {1, "show ping stats window", 0, &pStats, 0, 0, NULL},
 #ifdef SHORT_PACKETS
-    {1, "show Short Packets window", 0, &spWin, 0, 0, NULL, NULL},
+    {1, "show short packets window", 0, &spWin, 0, 0, NULL, NULL},
 #endif
     {1, "done", ¬done, 0, 0, 0, NULL, NULL},
     {-1, NULL, 0, 0, 0, 0, NULL, NULL}
@@ -407,7 +409,7 @@
         MaxOptions = InitOptionMenus ();
         if (MaxOptions < 0)
         {
-            fprintf (stderr, "InitOptionMenus() error %s!\n", MaxOptions);
+            LineToConsole ("InitOptionMenus() error %s!\n", MaxOptions);
             notdone = 0;
             return;
         }
@@ -677,12 +679,12 @@
             if (plistCustomLayout == 0 && playerListStyle == 0)
                 playerListStyle = (data->key == W_LBUTTON) ? PLISTLASTSTYLE : 1;
 
-            if (W_IsMapped (playerw))
+            if (W_IsMapped (playerw) || W_IsMapped (playerw2))
                 RedrawPlayerList ();
         }
         else if (op->op_option == &playerListObserver)
         {
-            if (W_IsMapped (playerw))
+            if (W_IsMapped (playerw) || W_IsMapped (playerw2))
                 RedrawPlayerList ();
         }
         /* Let's see if this is our option changed */
@@ -838,6 +840,12 @@
             if (showHockeyLinesLocal && !hockey_mode ())
                 showHockeyLinesLocal = 0;
         }
+        else if (op->op_option == &showHockeyScore)
+        {
+            // same as above
+            if (showHockeyScore && !hockey_mode ())
+                showHockeyScore = 0;
+        }
 #endif
         else if (op->op_option == &partitionPlist)
             RedrawPlayerList ();

Index: mswindow.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mswindow.c	19 Apr 2006 13:02:33 -0000	1.6
+++ mswindow.c	21 Apr 2006 12:00:07 -0000	1.7
@@ -26,7 +26,7 @@
 #include 
 #include 
 #include 
-
+#include 
 
 #include "copyright2.h"
 #include "config.h"
@@ -79,12 +79,13 @@
 #define WIN_TEXT        2
 #define WIN_MENU        3
 #define WIN_SCROLL      4
+#define WIN_RICHTEXT    5
 
 #define MoveTo(dc, x, y) MoveToEx(dc, x, y, NULL);
 
 // Custom window messages, used for communicating between threads
-#define WM_TERMINATE_WAIT WM_USER
-#define WM_CROSS_THREAD_DESTROY (WM_USER+1)
+#define WM_TERMINATE_WAIT 0x8000
+#define WM_CROSS_THREAD_DESTROY 0x8001
 
 #ifdef DEBUG
 #define MAX_SCROLLWINDOW_LINES 300
@@ -159,7 +160,6 @@
 char FontFileName[] = "\\ntfonts2.fon";
 extern int DefaultsLoaded;
 HWND AnyWindow;
-DWORD MainThreadID;
 
 int W_FastClear = 0;
 W_Font W_BigFont, W_RegularFont;
@@ -525,6 +525,16 @@
         pfnFastCallKill(0);
         FreeLibrary(hWinkeyLibrary);
     }
+
+    /* empty console buffer */
+    while (consHead)
+    {
+        struct cons_buffer * tmp;
+        tmp = consHead->next;
+        free (consHead->string);
+        free (consHead);
+        consHead = tmp;
+    }
 }
 
 #define MakeTeamCursor(upper, team) \
@@ -553,7 +563,8 @@
     char FileName[100];
     WNDCLASSEX wc;
     static int InitDone = 0;
-    HINSTANCE hCursorLibrary;
+    HMODULE hCursorLibrary;
+    HMODULE hRichTextLibrary;
 
     GetColors ();
 
@@ -562,7 +573,7 @@
     InitDone = -1;
 
 #ifdef DEBUG
-    printf ("Initializing windowing system\n");
+    LineToConsole ("Initializing windowing system\n");
 #endif
 
     //Register our class
@@ -582,7 +593,13 @@
     RegisterClassEx (&wc);
     if ((hCursorLibrary = LoadLibrary ("bitmaps/CURSLIB.DLL")) == NULL)
     {
-        fprintf (stderr, "Could not open curslib.dll\n");
+        LineToConsole ("Could not load curslib.dll\n");
+        exit (1);
+    }
+
+    if ((hRichTextLibrary = LoadLibrary ("riched20.dll")) == NULL)
+    {
+        LineToConsole ("Could not load riched20.dll\n");
         exit (1);
     }
 
@@ -613,7 +630,7 @@
                    32, 32, LR_MONOCHROME);
 
     if (RomCursor == NULL)
-        printf ("Whhops, there it is!\n");
+        LineToConsole ("Whoops, there it is!\n");
 
     FreeLibrary (hCursorLibrary);
 
@@ -708,6 +725,7 @@
     VKShiftMap[VK_ESCAPE] = 27; // Map shift+escape-> escape
 
     MainThreadID = GetCurrentThreadId ();       // Save main thread ID so we can tell
+    MainThread = GetCurrentThread;              // Also save main thread handle
     // which thread we're in later
 
     // Get the current system colors
@@ -724,7 +742,7 @@
         if (hWinkeyLibrary < (HINSTANCE) 32)
         {
             //Just continue if there is a problem
-            fprintf (stderr, "Unable to load __fastcall DLL");
+            LineToConsole ("Unable to load __fastcall DLL");
         }
         else 
         {
@@ -733,7 +751,7 @@
             if (!pfnFastCallKill)
             {
                 //Just continue if there is a problem
-                fprintf (stderr, "Unable to initialize __fastcall");
+                LineToConsole ("Unable to initialize __fastcall");
             }
             else
             {
@@ -784,7 +802,7 @@
                 i = GetDeviceCaps (hdc, BITSPIXEL) * GetDeviceCaps (hdc,
                                                                     PLANES);
 #ifdef DEBUG
-                printf ("Bits per pixel detected: %d\n", i);
+                LineToConsole ("Bits per pixel detected: %d\n", i);
 #endif
 
                 if ((i <= 4)
@@ -833,7 +851,9 @@
                         colortable[i].rgb =
                             RGB (xclrs[j].r, xclrs[j].g, xclrs[j].b);
                     else
-                        fprintf (stderr, "Color '%s' unknown\n", def);
+                    {
+                        LineToConsole ("Color '%s' unknown\n", def);
+                    }
                 }
         }
 
@@ -841,7 +861,7 @@
         {
         case 1:
 #ifdef DEBUG
-            printf ("16 color display detected.\n");
+            LineToConsole ("16 color display detected.\n");
 #endif
             break;
 
@@ -868,7 +888,7 @@
                 NetrekPalette = CreatePalette (pal);
 
 #ifdef DEBUG
-                printf ("Paletted color display detected.\n");
+                LineToConsole ("Paletted color display detected.\n");
 #endif
             }
             break;
@@ -934,7 +954,7 @@
 
     /* find the window with the name specified */
     if (found = FindWindow (ClassName, adefault))
-        *parent = (W_Window) GetWindowLong (found, 0);  //Return struct ptr
+        *parent = (W_Window) GetWindowLongPtr (found, GWLP_USERDATA);  //Return struct ptr
 
     return;
 }
@@ -963,7 +983,7 @@
 
     if (!(window = (Window *) malloc (sizeof (Window))))
     {
-        printf ("Not enough memory to create a new window.");
+        LineToConsole ("Not enough memory to create a new window.");
         return 0;
     }
     memset (window, 0, sizeof (Window));
@@ -1053,17 +1073,28 @@
 
     //Actually create the window
     //Hacked to allow negative create locations -SAC
-    window->hwnd = CreateWindow (ClassName, s, WS_CLIPSIBLINGS | WS_CLIPCHILDREN | SpecialStyle, 
-                                x + parentwin->border, y + parentwin->border, width + border * 2, 
-                                height + border * 2 + 
-                                ((SpecialStyle & WS_CAPTION) ? GetSystemMetrics (SM_CYCAPTION) : 0), 
-                                parentwin->hwnd, NULL, MyInstance, (void *) window);      
-                                //Pass Window struct * as user param
-
+    if (window->type == WIN_RICHTEXT)
+    {
+        window->hwnd = CreateWindowEx (0, RICHEDIT_CLASS, "",
+                                       WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CHILD |
+                                       WS_VSCROLL | WS_BORDER | ES_READONLY | ES_MULTILINE,
+                                       x + parentwin->border, y + parentwin->border,
+                                       width + border * 2, height + border * 2,
+                                       parentwin->hwnd, NULL, MyInstance, (void *) window);
+    }
+    else
+    {
+        window->hwnd = CreateWindow (ClassName, s, WS_CLIPSIBLINGS | WS_CLIPCHILDREN | SpecialStyle, 
+                                    x + parentwin->border, y + parentwin->border, 
+                                    width + border * 2, height + border * 2 + 
+                                    ((SpecialStyle & WS_CAPTION) ? GetSystemMetrics (SM_CYCAPTION) : 0), 
+                                    parentwin->hwnd, NULL, MyInstance, (void *) window);      
+                                    //Pass Window struct * as user param
+    }
 
     if (!window->hwnd)
     {
-        printf ("CreateWindow() for %s failed...", name);
+        LineToConsole ("CreateWindow() for %s failed...", name);
         return (0);
     }
 
@@ -1221,8 +1252,8 @@
 	newwin->orig_height = orig_height;
 
     //Give it a scroll bar, and set the range (to zero, initially)
-    SetWindowLong (newwin->hwnd, GWL_STYLE,
-                   GetWindowLong (newwin->hwnd, GWL_STYLE) | WS_VSCROLL);
+    SetWindowLongPtr (newwin->hwnd, GWL_STYLE,
+                      GetWindowLongPtr (newwin->hwnd, GWL_STYLE) | WS_VSCROLL);
     SetScrollRange (newwin->hwnd, SB_VERT, 0, 0, FALSE);
 
     //Map (show) the window if the user spec'd it
@@ -1272,7 +1303,7 @@
     if (!
         (items =
          (struct menuItem *) malloc (height * sizeof (struct menuItem))))
-        fprintf (stderr, "Could not allocate storage for menu window");
+        LineToConsole ("Could not allocate storage for menu window");
     else
         for (i = 0; i < height; i++)
         {
@@ -1581,7 +1612,7 @@
 }
 
 // Wait for an event to become available; it returns zero if it recieves a
-// WM_TERMAINTE_WAIT (defined as WM_USER) message,
+// WM_TERMINATE_WAIT (defined as 0x8000) message,
 // which we use to reset the game (it's issued by another thread)
 int
 W_WaitForEvent ()
@@ -1590,9 +1621,8 @@
 
     while (EventHead == EventTail)      // Get an event
     {
-
         GetMessage (&msg, NULL, 0, 0);
-        if (msg.message == WM_TERMINATE_WAIT)   // Quit message recieved
+        if (msg.message == WM_TERMINATE_WAIT || exitFlag)   // Quit message recieved
             return 0;
 
         //TranslateMessage(&msg);          //translate keyboard messages,
@@ -1606,7 +1636,8 @@
 void
 W_TerminateWait ()
 {
-    PostMessage (AnyWindow, WM_TERMINATE_WAIT, 0, 0);
+    while (PostMessage (AnyWindow, WM_TERMINATE_WAIT, 0, 0) == 0)
+        ;
 }
 
 //Get the next event (message). Simply copies the event *, and advances the pointer
@@ -1643,7 +1674,7 @@
 //processing of the zillion other messages that go through the loop.
 
 #define GET_STRUCT_PTR\
-   win=(Window *)GetWindowLong(hwnd, 0)
+   win = (Window *) GetWindowLongPtr (hwnd, GWLP_USERDATA)
 
 #define STORE_EVENT\
    i = (EventTail + 1) % EVENT_Q_SIZE;\
@@ -1718,9 +1749,8 @@
     {
     case WM_CREATE:
         //Store our structure pointer - passed from newWindow() as final CreateWindow() param
-        SetWindowLong (hwnd, 0,
-                       (LONG) (Window *) ((CREATESTRUCT *) lParam)->
-                       lpCreateParams);
+        SetWindowLongPtr (hwnd, GWLP_USERDATA,
+                         (LONG) (Window *) ((CREATESTRUCT *) lParam)->lpCreateParams);
         return (0);
 
     case WM_SIZE:
@@ -1735,20 +1765,63 @@
 
     case WM_ENTERSIZEMOVE:
         //Disable possibility to move internal windows
+        {   // have to add bracket to be able to declare variables
+        RECT baseRect;  // baseWin rectangle
+        RECT winRect;   // current window rectangle       
+
         GET_STRUCT_PTR;
 
-        if (windowMove || (win->hwnd == ((Window *) baseWin)->hwnd))
+        /* this has to be the same as for WM_EXITSIZEMOVE */
+        if (windowMove || 
+            (win->hwnd == ((Window *) baseWin)->hwnd) ||
+            (((Window *) metaWin != NULL && win->hwnd == ((Window *) metaWin)->hwnd)) ||
+            (((Window *) waitWin != NULL && win->hwnd == ((Window *) waitWin)->hwnd)) ||
+            (((Window *) countWin != NULL && win->hwnd == ((Window *) countWin)->hwnd)) ||
+            (((Window *) motdButtonWin != NULL && win->hwnd == ((Window *) motdButtonWin)->hwnd)) ||
+            (((Window *) motdWin != NULL && win->hwnd == ((Window *) motdWin)->hwnd)))
             break;
 
-        //Save window position to RECT
-        GetWindowRect (win->hwnd, &movingr);
+        GetWindowRect (win->hwnd, &winRect);
+        GetWindowRect (((Window *) baseWin)->hwnd, &baseRect);
+
+        movingr.left = winRect.left - baseRect.left;
+        movingr.top = winRect.top - baseRect.top;
+        movingr.right = winRect.right - baseRect.left;
+        movingr.bottom = winRect.bottom - baseRect.top;
+
+        /* In case of WS_CAPTION (titlebar on) we have to subtract caption size and
+           additional borders to get screen coordinates */
+        if (GetWindowLongPtr (((Window *) baseWin)->hwnd, GWL_STYLE) & WS_CAPTION)
+        {
+            movingr.left -= GetSystemMetrics (SM_CXFIXEDFRAME);
+            movingr.top -= (GetSystemMetrics (SM_CYFIXEDFRAME) + GetSystemMetrics (SM_CYCAPTION));
+            movingr.right -= GetSystemMetrics (SM_CXFIXEDFRAME);
+            movingr.bottom -= (GetSystemMetrics (SM_CYFIXEDFRAME) + GetSystemMetrics (SM_CYCAPTION));
+        }
+
+        /* If our window has parent we have to subtract parent's border as well */
+        if (win->parent != (Window *) baseWin)
+        {
+            movingr.left -= win->parent->border / 2;
+            movingr.top -= win->parent->border / 2;
+            movingr.right -= win->parent->border / 2;
+            movingr.bottom -= win->parent->border / 2;
+        }
+        }
         break;
 
     case WM_EXITSIZEMOVE:
         //Disable possibility to move internal windows
         GET_STRUCT_PTR;
 
-        if (windowMove || (win->hwnd == ((Window *) baseWin)->hwnd))
+        /* this has to be the same as for WM_ENTERSIZEMOVE */
+        if (windowMove || 
+            (win->hwnd == ((Window *) baseWin)->hwnd) ||
+            (((Window *) metaWin != NULL && win->hwnd == ((Window *) metaWin)->hwnd)) ||
+            (((Window *) waitWin != NULL && win->hwnd == ((Window *) waitWin)->hwnd)) ||
+            (((Window *) countWin != NULL && win->hwnd == ((Window *) countWin)->hwnd)) ||
+            (((Window *) motdButtonWin != NULL && win->hwnd == ((Window *) motdButtonWin)->hwnd)) ||
+            (((Window *) motdWin != NULL && win->hwnd == ((Window *) motdWin)->hwnd)))
             break;
 
         //Get window position from RECT to restore original location
@@ -1791,7 +1864,7 @@
             if (i != EventHead)
                 EventTail = i;
             EventQueue[EventTail].type = W_EV_EXPOSE;
-            EventQueue[EventTail].Window = (W_Window) GetWindowLong (hwnd, 0);
+            EventQueue[EventTail].Window = (W_Window) GetWindowLongPtr (hwnd, GWLP_USERDATA);
             EventQueue[EventTail].x = ps.rcPaint.left;  //- win->border;
             EventQueue[EventTail].y = ps.rcPaint.top;   //- win->border;
 /*            EventQueue[EventTail].width = ps.rcPaint.right - ps.rcPaint.left;
@@ -1959,14 +2032,6 @@
         {
             LONG wl;
             RECT r;
-            int cx, cy;
-
-            cx = GetSystemMetrics (SM_CXEDGE);
-            if (!cx)
-                cx = GetSystemMetrics (SM_CXBORDER);
-            cy = GetSystemMetrics (SM_CYEDGE);
-            if (!cy)
-                GetSystemMetrics (SM_CYBORDER);
 
             wl = GetWindowLong (((Window *) baseWin)->hwnd, GWL_STYLE);
             GetWindowRect (((Window *) baseWin)->hwnd, &r);
@@ -1982,7 +2047,7 @@
                 r.left -= GetSystemMetrics (SM_CXBORDER);
                 r.top -= GetSystemMetrics (SM_CYBORDER);
             }
-            SetWindowLong (((Window *) baseWin)->hwnd, GWL_STYLE, wl);
+            SetWindowLongPtr (((Window *) baseWin)->hwnd, GWL_STYLE, wl);
             // Update the window since the height has changed
             MoveWindow (((Window *) baseWin)->hwnd, r.left, r.top,
                         r.right - r.left, r.bottom - r.top, TRUE);
@@ -2039,7 +2104,7 @@
         //the mouse is in.
 
         hwnd = WindowFromPoint (pos);
-        if (GetWindowLong (hwnd, GWL_WNDPROC) != (LONG) NetrekWndProc)
+        if (GetWindowLongPtr (hwnd, GWLP_WNDPROC) != (LONG) NetrekWndProc)
             return 0;           //Mouse is not in one of our windows
 
         if (!hwnd || hwnd == ((Window *) baseWin)->hwnd)
@@ -2078,6 +2143,8 @@
 
     case WM_MOUSEMOVE:
         GET_STRUCT_PTR;
+        /*if (win->hwnd != GetFocus ())
+            SetFocus (win->hwnd);*/
         SetCursor (win->cursor);
 
 #if defined(MOTION_MOUSE) || defined(XTRA_MESSAGE_UI)
@@ -2516,10 +2583,14 @@
 
         // If we're not in message windows then we'll map wheel up and
 		// wheel down events as regular mouse events
-        if (win->type != WIN_SCROLL)
+        if (win->type == WIN_GRAPH || win->type == WIN_TEXT || win->type == WIN_MENU)
 		{
 	        //BringWindowToTop (hwnd);
-			GET_STRUCT_PTR;
+			//GET_STRUCT_PTR;
+
+            /* Let's see whether we should process wheel messages */
+            if (!allowWheelActions)
+                return (1);
 
 			STORE_EVENT_MOUSE;
 			LastPressHwnd = hwnd;
@@ -2536,25 +2607,62 @@
 			}
             return (0);
 		}
-
-        i = GetScrollPos (hwnd, SB_VERT);
-        
-        switch (wheel)
+        else if (win->type == WIN_SCROLL)
         {
-        case -1:
-            i += 1;
-            break;
-        case 1:
-            i -= 1;
-            break;
-        default:
+            i = GetScrollPos (hwnd, SB_VERT);
+        
+            switch (wheel)
+            {
+            case -1:
+                i += 1;
+                break;
+            case 1:
+                i -= 1;
+                break;
+            default:
+                return (0);
+            }
+
+            SetScrollPos (hwnd, SB_VERT, i, TRUE);  //Move scroll
+            InvalidateRect (hwnd, &win->ClipRect, TRUE);    //Redraw text in window
+            UpdateWindow (hwnd);
             return (0);
         }
+        else if (win->type == WIN_RICHTEXT)
+        {
+            POINT p;
+            RECT r;
+            int lines, visline, maxscroll;
 
-        SetScrollPos (hwnd, SB_VERT, i, TRUE);  //Move scroll
-        InvalidateRect (hwnd, &win->ClipRect, TRUE);    //Redraw text in window
-        UpdateWindow (hwnd);
-        return (0);
+            SendMessage (win->hwnd, EM_GETSCROLLPOS, 0, (LPARAM) &p);
+            SendMessage (win->hwnd, EM_GETRECT, 0, (LPARAM) &r);
+            visline = SendMessage (win->hwnd, EM_GETFIRSTVISIBLELINE, 0, 0);
+            lines = SendMessage (win->hwnd, EM_GETLINECOUNT, 0, 0);
+
+            maxscroll = ((lines - visline) - (r.bottom / W_Textheight)) * W_Textheight;
+
+            switch (wheel)
+            {
+            case -1:
+                p.y += W_Textheight;
+                break;
+            case 1:
+                p.y -= W_Textheight;
+                break;
+            default:
+                return (0);
+            }
+
+            if (p.y > maxscroll)
+                return (0);
+
+            SendMessage (win->hwnd, EM_SETSCROLLPOS, 0, (LPARAM) &p);
+            //InvalidateRect (hwnd, &win->ClipRect, TRUE);    //Redraw text in window
+            //UpdateWindow (hwnd);
+            return (0);
+        }
+        else
+            return (1);
 
         //Trap WM_ERASEBKGRND, to handle windows with tiled backgrounds
     case WM_ERASEBKGND:
@@ -2610,6 +2718,14 @@
         else
             return i;
 
+        // When PostMessage sends us WM_TERMINATE_WAIT it isn't always reaching the right
+        // thread (somehow ;), so to fix the die while scrolling bug I had to add this stupid
+        // flag
+    case WM_TERMINATE_WAIT:
+        exitFlag = 1;
+        WaitForSingleObject (InputThread, INFINITE);
+        return 0;
+
         //This message sent from another thread to indicate a window should be destroyed,
         // which only the main thread can do
     case WM_CROSS_THREAD_DESTROY:
@@ -2667,6 +2783,25 @@
         }
         break;
 
+    case WM_NOTIFY:
+        if (((NMHDR *) lParam)->code == EN_LINK)
+        {
+            ENLINK *link = (ENLINK *) lParam;
+            CHARRANGE cr;
+            char str[250];
+            HWND hwndFrom = link->nmhdr.hwndFrom;
+
+            if (link->msg == WM_LBUTTONDOWN || link->msg == WM_LBUTTONDBLCLK)
+            {
+                SendMessage (hwndFrom, EM_EXGETSEL, 0, (LPARAM) &cr);
+                SendMessage (hwndFrom, EM_EXSETSEL, (WPARAM) 0, (LPARAM) &(link->chrg));
+                SendMessage (hwndFrom, EM_GETSELTEXT, 0, (LPARAM) str);
+                SendMessage (hwndFrom, EM_EXSETSEL, 0, (LPARAM) &cr);
+                ShellExecute (NULL, "open", str, NULL, NULL, SW_SHOWNORMAL);
+            }
+        }
+        break;
+
     }
 
     return DefWindowProc (hwnd, msg, wParam, lParam);
@@ -3097,13 +3232,18 @@
         AddToScrolling (win, color, str, len);
         break;
 
+    case WIN_RICHTEXT:
+//         str[len]=0;
+        AddToRichText (win, color, str, len);
+        break;
+
     case WIN_MENU:
 //         str[len]=0;
         ChangeMenuItem (win, y, str, len, color);
         break;
 
     default:
-        printf ("Unknown window type in W_WriteText");
+        LineToConsole ("Unknown window type in W_WriteText");
     }
 }
 
@@ -3149,13 +3289,18 @@
         AddToScrolling (win, color, str, len);
         break;
 
+    case WIN_RICHTEXT:
+        str[len]=0;
+        AddToRichText (win, color, str, len);
+        break;
+
     case WIN_MENU:
         str[len] = 0;
         ChangeMenuItem (win, y, str, len, color);
         break;
 
     default:
-        printf ("Unknown window type in W_WriteText");
+        LineToConsole ("Unknown window type in W_WriteText");
     }
 }
 
@@ -3170,7 +3315,7 @@
     HDC hdc;
     int t;
 
-    printf ("pBM: %p\nbmlCount: %d", pBM, bmlCount);
+    LineToConsole ("pBM: %p\nbmlCount: %d", pBM, bmlCount);
 
     if (!pBM)
     {
@@ -3189,7 +3334,8 @@
 
     if (pBM && tmp)
     {
-        printf ("tmp: %p\n", tmp);
+        LineToConsole ("tmp: %p\n", tmp);
+
         if (!SelectObject (GlobalMemDC, pBM->bm))
             goto fail;
         if (!(hdc = GetDC (((Window *) tmp)->hwnd)))
@@ -3270,7 +3416,7 @@
         if (!(temp2 = CreateBitmap (width, height, 1, 1, NULL)))
             goto memfail;
 
-        printf (".");
+        LineToConsole (".");
         bmlCount++;
 
         //Mirror bitmap
@@ -3291,7 +3437,7 @@
         }
         else
         {
-            printf
+            LineToConsole
                 ("Got impossible internal error in W_StoreBitmap(). Please report to author.\n");
             exit (-1);
         }
@@ -3350,9 +3496,9 @@
 
         //Copy the bits to their new location, mirroring as we go
         if (!SelectObject (GlobalMemDC, temp))
-            printf ("SelectObject(DC, temp) bombed");
+            LineToConsole ("SelectObject(DC, temp) bombed");
         if (!SelectObject (GlobalMemDC2, CurrentBitmap->bm))
-            printf ("SelectObject(DC2,CurrentBitmap->tm) bombed");
+            LineToConsole ("SelectObject(DC2,CurrentBitmap->tm) bombed");
 
         StretchBlt (GlobalMemDC2, CurX, CurY, width, height, GlobalMemDC,
                     newwidth - 1, 0, -width, height, SRCCOPY);
@@ -3373,7 +3519,7 @@
     return (W_Icon) bitmap;
 
   memfail:
-    printf ("Memory allocation or CreateBitmap() failure in StoreBitmap\n");
+    LineToConsole ("Memory allocation or CreateBitmap() failure in StoreBitmap\n");
     if (bits2)
         free (bits2);
     if (bitmap)
@@ -3439,9 +3585,9 @@
     return (W_Icon) bitmap;
 
   memfail:
-    printf
-        ("Memory allocation or CreateBitmap() failure in StoreBitmap2()\n");
-    printf ("Id: %d %d %d\n", height, width, bits);
+    LineToConsole ("Memory allocation or CreateBitmap() failure in StoreBitmap2()\n");
+    LineToConsole ("Id: %d %d %d\n", height, width, bits);
+
     if (bitmap)
         free (bitmap);
     if (temp)
@@ -3497,9 +3643,9 @@
     return (W_Icon) bitmap;
 
   memfail:
-    printf
-        ("Memory allocation or CreateBitmap() failure in StoreBitmap3()\n");
-    printf ("Id: %d %d %s\n", height, width, BMPfile);
+    LineToConsole ("Memory allocation or CreateBitmap() failure in StoreBitmap3()\n");
+    LineToConsole ("Id: %d %d %s\n", height, width, BMPfile);
+
     if (bitmap)
         free (bitmap);
     if (temp)
@@ -3534,8 +3680,9 @@
     return (W_Icon) bitmap;
 
   memfail:
-    printf ("Memory allocation or malloc() failure in PointBitmap2()\n");
-    printf ("Id: %d %d %d %d \n", col, row, height, width);
+    LineToConsole ("Memory allocation or malloc() failure in PointBitmap2()\n");
+    LineToConsole ("Id: %d %d %d %d \n", col, row, height, width);
+
     if (bitmap)
         free (bitmap);
     return NULL;
@@ -3866,8 +4013,7 @@
         p2 = (struct stringList *) malloc (sizeof (struct stringList));
         if (!p2)
         {
-            fprintf (stderr,
-                     "Not enough memory to allocate a new listbox string.\n");
+            LineToConsole ("Not enough memory to allocate a new listbox string.\n");
             return;
         }
 
@@ -3891,7 +4037,7 @@
     p->string = (char *) malloc (win->TextWidth + 1);
     if (!p->string)
     {
-        printf ("Not enough memory to allocate a new listbox string.");
+        LineToConsole ("Not enough memory to allocate a new listbox string.");
         return;
     }
 
@@ -3912,6 +4058,7 @@
     win->AddedStrings++;
 }
 
+
 //Redraw a scrolling window
 void
 RedrawScrolling (Window * win,
@@ -4283,7 +4430,7 @@
 
     GetCursorPos (&p);
     hwnd = ChildWindowFromPoint (((Window *) baseWin)->hwnd, p);
-    if (!hwnd || (W_Window) GetWindowLong (hwnd, 0) != window)
+    if (!hwnd || (W_Window) GetWindowLongPtr (hwnd, GWLP_USERDATA) != window)
     {
         *x = 0;
         *y = 0;
@@ -4330,8 +4477,7 @@
 {
     if (width > 32 || height > 32)
     {
-        fprintf (stderr,
-                 "Attempt to define cursor > 32x32. Cursor will be garbled!");
+        LineToConsole ("Attempt to define cursor > 32x32. Cursor will be garbled!");
         width = min (32, width);
         height = min (32, height);
     }
@@ -5422,7 +5568,7 @@
         break;
 
     default:
-        printf ("Unknown window type in W_WriteText");
+        LineToConsole ("Unknown window type in W_WriteText");
     }
 }
 
@@ -5454,7 +5600,7 @@
         break;
 
     default:
-        printf ("Unknown window type in W_WriteText");
+        LineToConsole ("Unknown window type in W_WriteText");
     }
 }
 
@@ -5612,3 +5758,205 @@
     BitBlt (sdb->mem_dc, x, y,          //Copy the bitmap
             width, height, GlobalMemDC, srcx, srcy, SRCPAINT);  // <-- using OR mode
 }
+
+
+// Make a WIN_SCROLL type window.
+// We use a scrollbar so we can look through the text, something the X version
+// didn't have. Nyah, nyah.
+W_Window
+W_MakeScrollingRichTextWindow (char *name,
+                               int x,
+                               int y,
+                               int width,
+                               int height,
+                               W_Window parent,
+                               int border)
+{
+    Window *newwin;
+	int orig_x, orig_y, orig_width, orig_height;
+
+    orig_x = x;
+	orig_y = y;
+	orig_width = width;
+	orig_height = height;
+
+    //Get the default position, etc.
+    checkGeometry (name, &x, &y, &width, &height);
+
+    //Get the default parent..
+    checkParent (name, &parent);
+
+    if (!(newwin = newWindow (name, x, y,
+                              width * W_Textwidth + WIN_EDGE * 2 +
+                              GetSystemMetrics (SM_CXVSCROLL),
+                              height * W_Textheight + MENU_PAD * 2, parent,
+                              border, W_White, WIN_RICHTEXT)))
+        return (0);
+
+    SetWindowLongPtr (newwin->hwnd, GWLP_USERDATA, (LONG_PTR) newwin);
+    lpfnDefRichEditWndProc = (WNDPROC) SetWindowLongPtr (newwin->hwnd, GWLP_WNDPROC, 
+                                                        (DWORD) RichTextWndProc);
+    SendMessage (newwin->hwnd, EM_AUTOURLDETECT, TRUE, 0);
+    SendMessage (newwin->hwnd, EM_SETEVENTMASK, 0, ENM_LINK);
+    SendMessage (newwin->hwnd, EM_SETBKGNDCOLOR, 0, W_Black);
+    SendMessage (newwin->hwnd, WM_SETFONT, (WPARAM) W_RegularFont, TRUE);
+
+    //Store the original textheight, width
+    newwin->TextHeight = height;
+    newwin->TextWidth = width;
+
+	/* Set original coordinates, so we will be able to restore to them */
+	newwin->orig_x = orig_x;
+	newwin->orig_y = orig_y;
+	newwin->orig_width = orig_width;
+	newwin->orig_height = orig_height;
+
+    //Map (show) the window if the user spec'd it
+    if (checkMapped (name))
+        W_MapWindow ((W_Window) newwin);
+
+    return (W_Window) newwin;
+}
+
+
+void
+AddToRichText (Window * win,
+               W_Color color,
+               char *str,
+               int len)
+{
+    struct stringList *p = win->strings;
+    struct stringList *end, *p2;
+    int NumStrings = win->NumItems;
+    char str1[256];
+    CHARFORMAT2 cf;
+    POINT point;
+    RECT rect;
+    HWND hwnd;
+    CHARRANGE cr;
+    int numLines, visibleLines;
+
+    //Find the end of the linked-list of strings...
+    if (p)                      // ...if the list has been created
+    {
+        end = p;
+        while (end->next)
+            end = end->next;
+    }
+    else
+    {
+        end = 0;
+        NumStrings = 0;
+    }
+
+    if (NumStrings < MAX_SCROLLWINDOW_LINES)    //Create a new stringList item
+    {
+        p2 = (struct stringList *) malloc (sizeof (struct stringList));
+        if (!p2)
+        {
+            LineToConsole ("Not enough memory to allocate a new listbox string.\n");
+            return;
+        }
+
+        if (!p)
+            win->strings = p2;  //Store the new start of list
+
+        p = p2;                 //Point p to the new string
+
+        win->NumItems = ++NumStrings;   //Inc the string number
+    }
+    else                        //Re-use the first string, place it at the end of the list
+    {
+        if (p->string)
+            free (p->string);
+        win->strings = p->next; //Store the new start of list
+    }
+
+    if (str[len - 1] == '\n')   //Remove trailing newlines
+        str[--len] = 0;
+
+    p->string = (char *) malloc (win->TextWidth + 1);
+    if (!p->string)
+    {
+        LineToConsole ("Not enough memory to allocate a new listbox string.");
+        return;
+    }
+
+    p->color = color;
+    strncpy (p->string, str, win->TextWidth);
+
+    /* we pad out the string with spaces so we don't have to clear
+       the window */
+    if (len < win->TextWidth - 1)
+        memset (p->string + len, ' ', win->TextWidth - len - 1);
+    p->string[win->TextWidth - 1] = 0;
+
+    if (end)
+        end->next = p;
+    p->next = 0;
+
+    //Mark as out of date...
+    win->AddedStrings++;
+
+    hwnd = GetFocus ();
+    SendMessage (win->hwnd, EM_EXGETSEL, 0, (LPARAM) &cr);
+    //SendMessage (win->hwnd, EM_HIDESELECTION, TRUE, 0);
+
+    cf.cbSize = sizeof (CHARFORMAT2);
+    cf.dwEffects = 0;
+    cf.dwMask = CFM_COLOR;
+    cf.crTextColor = colortable[color].rgb;
+
+    strcpy (str1, str);
+    strcat (str1, "\n");
+
+    SendMessage (win->hwnd, EM_GETSCROLLPOS, 0, (LPARAM) &point);
+    numLines = SendMessage (win->hwnd, EM_GETLINECOUNT, 0, 0);
+    SendMessage (win->hwnd, EM_GETRECT, 0, (LPARAM) &rect);
+    visibleLines = rect.bottom / W_Textheight;
+    SendMessage (win->hwnd, EM_SETSEL, -1, -1);
+    SendMessage (win->hwnd, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf);
+    SendMessage (win->hwnd, EM_REPLACESEL, FALSE, (LPARAM) str1);
+    if (numLines - point.y / W_Textheight > visibleLines + 1)
+    {
+        SendMessage (win->hwnd, EM_SETSCROLLPOS, 0, (LPARAM) &point);
+    }
+    else if (numLines - point.y / W_Textheight == visibleLines + 1)
+    {
+        point.y += W_Textheight;
+        SendMessage (win->hwnd, EM_SETSCROLLPOS, 0, (LPARAM) &point);
+    }
+    //SendMessage (win->hwnd, EM_HIDESELECTION, FALSE, 0);
+    SendMessage (win->hwnd, EM_SCROLLCARET, 0, 0);
+
+    if (cr.cpMin != cr.cpMax)
+        SendMessage (win->hwnd, EM_SETSEL, 0, (LPARAM) &cr);
+
+    if (hwnd)
+        SetFocus (hwnd);
+}
+
+
+LRESULT CALLBACK RichTextWndProc (HWND hwnd,
+                                  UINT msg,
+                                  WPARAM wParam,
+                                  LPARAM lParam)
+{
+//    Window * win;
+
+    switch (msg)
+    {
+/*    case WM_PAINT:
+        GET_STRUCT_PTR;
+        W_ChangeBorder ((W_Window) win, W_White);
+        break;*/
+
+/*    case WM_KEYDOWN:
+        LineToConsole ("key down\n");
+        return (0);*/
+    case WM_LBUTTONDOWN:
+        BringWindowToTop (hwnd);
+        break;
+    }
+    return CallWindowProc (lpfnDefRichEditWndProc, hwnd, msg, wParam, lParam);
+}

Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- newwin.c	20 Apr 2006 06:48:20 -0000	1.8
+++ newwin.c	21 Apr 2006 12:00:07 -0000	1.9
@@ -13,7 +13,7 @@
 #include 
 #include 
 #include 
-#include 
+
 #include 
 #include 
 
@@ -478,10 +478,12 @@
     rankw = W_MakeTextWindow ("rank", 50, 300, 65, NUMRANKS + 9, w, 2);
     W_SetWindowExposeHandler (rankw, ranklist);
 
-    playerw = W_MakeTextWindow ("player", 0, WINSIDE + 50,
-                                PlistMaxWidth (), 21, baseWin, 2);
+    playerw = W_MakeTextWindow ("player", 0, WINSIDE + 50, PlistMaxWidth (), 21, baseWin, 2);
     W_SetWindowExposeHandler (playerw, RedrawPlayerList);
 
+    playerw2 = W_MakeTextWindow ("player2", 140, 100, PlistMaxWidth2 (), 32, baseWin, 2);
+    W_SetWindowExposeHandler (playerw2, RedrawPlayerList);
+
 #ifdef RECORDGAME
     if (playback)
         helpWin = W_MakeTextWindow ("help", 286,
@@ -509,29 +511,58 @@
 #endif
 
     /* Message windows */
-    messwa = W_MakeScrollingWindow ("review_all", 506, 668, 81, 5, baseWin, BORDER);
-    wam_windows[0] = messwa;
-    W_SetWindowKeyDownHandler (messwa, handleMessageWindowKeyDown);
+    if (richText)
+    {
+        messwa = W_MakeScrollingRichTextWindow ("review_all", 506, 668, 81, 5, baseWin, BORDER);
+        wam_windows[0] = messwa;
+        W_SetWindowKeyDownHandler (messwa, handleMessageWindowKeyDown);
 
-    messwt = W_MakeScrollingWindow ("review_team", 506, 579, 81, 8, baseWin, BORDER);
-    wam_windows[1] = messwt;
-    W_SetWindowKeyDownHandler (messwt, handleMessageWindowKeyDown);
+        messwt = W_MakeScrollingRichTextWindow ("review_team", 506, 579, 81, 8, baseWin, BORDER);
+        wam_windows[1] = messwt;
+        W_SetWindowKeyDownHandler (messwt, handleMessageWindowKeyDown);
    
-    messwi = W_MakeScrollingWindow ("review_your", 506, 540, 81, 3, baseWin, BORDER);
-    wam_windows[2] = messwi;
-    W_SetWindowKeyDownHandler (messwi, handleMessageWindowKeyDown);
+        messwi = W_MakeScrollingRichTextWindow ("review_your", 506, 540, 81, 3, baseWin, BORDER);
+        wam_windows[2] = messwi;
+        W_SetWindowKeyDownHandler (messwi, handleMessageWindowKeyDown);
     
-    messwk = W_MakeScrollingWindow ("review_kill", 506, 727, 81, 3, baseWin, BORDER);
-    wam_windows[3] = messwk;
+        messwk = W_MakeScrollingRichTextWindow ("review_kill", 506, 727, 81, 3, baseWin, BORDER);
+        wam_windows[3] = messwk;
 
-    phaserwin = W_MakeScrollingWindow ("review_phaser", WINSIDE + BORDER + 6, YOFF + 
-                                        WINSIDE + 3 * BORDER + 2 * MESSAGESIZE +
-                                        15 * W_Textheight + 16, 80, 4, baseWin, BORDER);
-    wam_windows[4] = phaserwin;
+        phaserwin = W_MakeScrollingRichTextWindow ("review_phaser", WINSIDE + BORDER + 6, YOFF + 
+                                                    WINSIDE + 3 * BORDER + 2 * MESSAGESIZE +
+                                                    15 * W_Textheight + 16, 80, 4, baseWin, BORDER);
+        wam_windows[4] = phaserwin;
 
-    reviewWin = W_MakeScrollingWindow ("review", 506, 540, 81, 22, baseWin, BORDER);
-    wam_windows[5] = reviewWin;
-    W_SetWindowKeyDownHandler (reviewWin, handleMessageWindowKeyDown);
+        reviewWin = W_MakeScrollingRichTextWindow ("review", 506, 540, 81, 22, baseWin, BORDER);
+        wam_windows[5] = reviewWin;
+        W_SetWindowKeyDownHandler (reviewWin, handleMessageWindowKeyDown);
+    }
+    else
+    {
+        messwa = W_MakeScrollingWindow ("review_all", 506, 668, 81, 5, baseWin, BORDER);
+        wam_windows[0] = messwa;
+        W_SetWindowKeyDownHandler (messwa, handleMessageWindowKeyDown);
+
+        messwt = W_MakeScrollingWindow ("review_team", 506, 579, 81, 8, baseWin, BORDER);
+        wam_windows[1] = messwt;
+        W_SetWindowKeyDownHandler (messwt, handleMessageWindowKeyDown);
+   
+        messwi = W_MakeScrollingWindow ("review_your", 506, 540, 81, 3, baseWin, BORDER);
+        wam_windows[2] = messwi;
+        W_SetWindowKeyDownHandler (messwi, handleMessageWindowKeyDown);
+    
+        messwk = W_MakeScrollingWindow ("review_kill", 506, 727, 81, 3, baseWin, BORDER);
+        wam_windows[3] = messwk;
+
+        phaserwin = W_MakeScrollingWindow ("review_phaser", WINSIDE + BORDER + 6, YOFF + 
+                                           WINSIDE + 3 * BORDER + 2 * MESSAGESIZE +
+                                           15 * W_Textheight + 16, 80, 4, baseWin, BORDER);
+        wam_windows[4] = phaserwin;
+
+        reviewWin = W_MakeScrollingWindow ("review", 506, 540, 81, 22, baseWin, BORDER);
+        wam_windows[5] = reviewWin;
+        W_SetWindowKeyDownHandler (reviewWin, handleMessageWindowKeyDown);
+    }
     /* End of Message windows */
 
     pStats = W_MakeWindow ("pingStats", 500, 4, pStatsWidth (), pStatsHeight (),
@@ -580,31 +611,30 @@
     statwin = W_MakeWindow ("stats", 405, 506, 100, 80, baseWin, BORDER, foreColor);
     W_SetWindowExposeHandler (statwin, redrawStats);
 
-    scanwin = W_MakeWindow ("scanner", 422, 13, 160, 120, baseWin, 5, foreColor);
-
     W_DefineTrekCursor (baseWin);
     W_DefineLocalcursor (w);
     W_DefineMapcursor (mapw);
     W_DefineTrekCursor (pStats);
     W_DefineTextCursor (warnw);
+    W_DefineTextCursor (messagew);
+    W_DefineTrekCursor (messwa);
     W_DefineTrekCursor (messwt);
     W_DefineTrekCursor (messwi);
+    W_DefineTrekCursor (messwk);
+    W_DefineTrekCursor (reviewWin);
+    W_DefineTrekCursor (phaserwin);
     W_DefineTrekCursor (helpWin);
 
 #ifdef META
     W_DefineArrowCursor (metaWin);
 #endif
 
-    W_DefineTrekCursor (reviewWin);
-    W_DefineTrekCursor (messwk);
-    W_DefineTrekCursor (phaserwin);
     W_DefineTrekCursor (playerw);
+    W_DefineTrekCursor (playerw2);
     W_DefineTrekCursor (rankw);
     W_DefineTrekCursor (statwin);
-    W_DefineTextCursor (messagew);
     W_DefineTrekCursor (tstatw);
     W_DefineWarningCursor (qwin);
-    W_DefineTrekCursor (scanwin);
     W_DefineArrowCursor (udpWin);
 
 #ifdef SHORT_PACKETS
@@ -677,6 +707,8 @@
         W_MapWindow (phaserwin);
         phaserWindow = 1;
     }
+    if (checkMapped ("player2"))
+        W_MapWindow (playerw2);
     if (checkMappedPref ("player", 1))
         W_MapWindow (playerw);
     if (checkMappedPref ("review", 1))
@@ -1049,7 +1081,7 @@
             elapsed = time (0) - startTime;
             if (elapsed > autoQuit)
             {
-                printf ("Auto-Quit.\n");
+                LineToConsole ("Auto-Quit.\n");
                 *team = 4;
                 break;
             }
@@ -1249,7 +1281,9 @@
                 redrawQuit ();
             }
             else if (event.Window == tstatw)
+            {
                 redrawTstats ();
+            }
             else if (event.Window == w)
             {
                 showMotdWin (w, line);
@@ -1319,8 +1353,8 @@
         readFromServer (NULL);
         if (isServerDead ())
         {
-            printf ("Oh SHIT,  We've been ghostbusted!\n");
-            printf ("hope you weren't in a base\n");
+            LineToConsole ("Oh SHIT,  We've been ghostbusted!\n");
+            LineToConsole ("hope you weren't in a base\n");
             /* UDP fail-safe */
             commMode = commModeReq = COMM_TCP;
             commSwitchTimeout = 0;
@@ -1332,7 +1366,7 @@
                 udprefresh (UDP_STATUS);
             }
             connectToServer (nextSocket);
-            printf (" We've been resurrected!\n");
+            LineToConsole (" We've been resurrected!\n");
             pickOk = 0;
             break;
         }
@@ -1594,7 +1628,7 @@
     if ((*temp) == NULL)
     {                           /* malloc error checking --
                                  * 10/30/92 EM */
-        printf ("Warning:  Couldn't malloc space for a new motd line!");
+        LineToConsole ("Warning:  Couldn't malloc space for a new motd line!");
         return;
     }
     /* Motd clearing code */

Index: ping.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/ping.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- ping.c	21 Jan 2003 21:28:42 -0000	1.1.1.1
+++ ping.c	21 Apr 2006 12:00:07 -0000	1.2
@@ -45,7 +45,7 @@
 {
     ping = 1;                   /* we got a ping */
 
-    /* printf("ping received at %d (lag: %d)\n", msetime(), (int)packet->lag); */
+    /* LineToConsole ("ping received at %d (lag: %d)\n", msetime(), (int)packet->lag); */
     sendServerPingResponse ((int) packet->number);
     ping_lag = ntohs (packet->lag);
     ping_iloss_sc = (int) packet->iloss_sc;
@@ -70,7 +70,7 @@
     if (gwrite (sock, (char *) &packet, sizeof (struct ping_cpacket)) !=
         sizeof (struct ping_cpacket))
     {
-        printf ("gwrite failed.\n");
+        LineToConsole ("gwrite failed.\n");
         serverDead = 1;
     }
 }
@@ -86,7 +86,7 @@
     if (gwrite (sock, (char *) &packet, sizeof (struct ping_cpacket)) !=
         sizeof (struct ping_cpacket))
     {
-        printf ("gwrite failed.\n");
+        LineToConsole ("gwrite failed.\n");
         serverDead = 1;
     }
 }
@@ -113,12 +113,12 @@
     packet.cp_sent = htonl (packets_sent);
     packet.cp_recv = htonl (packets_received);
 
-    /* printf("ping response sent at %d\n", msetime()); */
+    /* LineToConsole ("ping response sent at %d\n", msetime()); */
 
     if (gwrite (s, (char *) &packet, sizeof (struct ping_cpacket)) !=
         sizeof (struct ping_cpacket))
     {
-        printf ("gwrite failed.\n");
+        LineToConsole ("gwrite failed.\n");
         serverDead = 1;
     }
 }

Index: stampver.inf
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/stampver.inf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- stampver.inf	12 Apr 2006 04:20:04 -0000	1.2
+++ stampver.inf	21 Apr 2006 12:00:07 -0000	1.3
@@ -1,5 +1,5 @@
 ;StampVer information file
-FileVersion=4.4.0.3
-ProductVersion=4.4.0.3
+FileVersion=4.4.0.4
+ProductVersion=4.4.0.4
 ;FileFormat=%a.%b.%c Build %04d (%td %tb %tY)
 ;ProductFormat=%a.%b.%c Build %04d

Index: check.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/check.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- check.c	12 Apr 2006 04:20:03 -0000	1.2
+++ check.c	21 Apr 2006 12:00:06 -0000	1.3
@@ -58,7 +58,7 @@
     {
         if ((hp = gethostbyname (serverName)) == NULL)
         {
-            fprintf (stderr, "unknown host '%s'\n", serverName);
+            LineToConsole ("unknown host '%s'\n", serverName);
             terminate (0);
         }
         else
@@ -73,7 +73,7 @@
         perror ("socket");
         terminate (0);
     }
-    printf ("checking %s on port %d\n", serverName, xtrekPort);
+    LineToConsole ("checking %s on port %d\n", serverName, xtrekPort);
     if (connect (sock, (struct sockaddr *) &addr, sizeof (addr)) < 0)
     {
         perror ("connect");
@@ -81,7 +81,7 @@
         terminate (0);
     }
 
-    while ((cc = read (sock, buf, BUF_SIZE)) > 0)
+    while ((cc = recv (sock, buf, BUF_SIZE, 0)) > 0)
     {
         fwrite (buf, cc, 1, stdout);
     }

Index: main.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- main.c	12 Apr 2006 04:20:03 -0000	1.2
+++ main.c	21 Apr 2006 12:00:07 -0000	1.3
@@ -20,6 +20,7 @@
 #include "Wlib.h"
 #include "struct.h"
 #include "proto.h"
+#include "data.h"
 
 char *servertmp = NULL;
 
@@ -30,48 +31,48 @@
 static void
 printUsage (char *prog)
 {
-    printf ("%s %s\n", version, mvers);
-    printf ("Usage: %s [options] [display-name]\n", prog);
-    printf ("Options:\n");
-    printf (" [-h servername]     Specify a server\n");
-    printf (" [-p port number]     Specify a port to connect to\n");
-    printf (" [-r defaultsfile]   Specify defaults file\n");
-    printf
-        (" [-s socketnum]      Specify listen socket port for manual start\n");
-    printf (" [-u]   show usage\n");
-    printf (" [-A]   character password\n");
-    printf (" [-C]   character name\n");
+    LineToConsole ("%s %s\n", version, mvers);
+    LineToConsole ("Usage: %s [options] [display-name]\n", prog);
 
-#ifdef GATEWAY
-    printf (" [-H]   specify host (via gateway)\n");
+    LineToConsole ("Options:\n");
+    LineToConsole (" [-h servername]     specify a server\n");
+    LineToConsole (" [-p port number]    specify a port to connect to\n");
+    LineToConsole (" [-r defaultsfile]   specify defaults file\n");
+    LineToConsole (" [-s socketnum]      specify listen socket port for manual start\n");
+    LineToConsole (" [-U udp_port]       specify client UDP port (useful for some firewalls)\n");
+#ifdef RECORDGAME
+    LineToConsole (" [-F filename]       view recorded game from 'filename'\n");
+    LineToConsole (" [-f filename]       record game into 'filename'\n");
 #endif
+    LineToConsole (" [-l filename]       record messages into 'filename'\n");
 
-    printf
-        (" [-U udp_port]       Specify client UDP port (useful for some firewalls)\n");
+    LineToConsole (" [-A]   character password\n");
+    LineToConsole (" [-C]   character name\n");
+
+#ifdef GATEWAY
+    LineToConsole (" [-H]   specify host (via gateway)\n");
+#endif
 
 #ifdef RSA
-    printf (" [-o]   use old-style binary verification)\n");
-    printf (" [-R]   use RSA binary verification\n");
+    LineToConsole (" [-o]   use old style binary verification\n");
+    LineToConsole (" [-R]   use RSA binary verification\n");
 #endif
 
 #ifdef PACKET_LOG
-    printf (" [-P]   Log server packets, repeat for increased information\n");
+    LineToConsole (" [-P]   log server packets, repeat for increased information\n");
 #endif
 
-    printf (" [-c]   to just do ck_players on the server\n");
-#ifdef RECORDGAME
-    printf (" [-F filename]   View recorded game from 'filename'\n");
-    printf (" [-f filename]   Record game into 'filename'\n");
-#endif
-    printf (" [-l filename]   Record messages into 'filename'\n");
+    LineToConsole (" [-c]   run players check on the server\n");
 
 #ifdef META
-    printf (" [-m]   check metaserver for active servers\n");
-    printf (" [-k]   display known servers\n");
+    LineToConsole (" [-m]   check metaserver for active servers\n");
+    LineToConsole (" [-k]   display known servers\n");
 #endif
 
-	printf (" [-n]   show console window\n");
-    printf (" [-v]   display client version info\n");
+    LineToConsole (" [-D]   output debug info\n");
+    LineToConsole (" [-n]   show console window\n");
+    LineToConsole (" [-u]   show usage\n");
+    LineToConsole (" [-v]   display client version info\n");
 
 }
 
@@ -97,8 +98,6 @@
     int xtrekPort = -1;
 
     name = argv[0];
-//  if ((ptr = RINDEX(name, "/")) != NULL)
-//    name = ptr + 1;
 
 #ifdef GATEWAY
     netaddr = 0;
@@ -143,13 +142,15 @@
 
             case 'u':           /* program usage */
                 usage++;
+                hideConsole = 0;
                 break;
 
             case 'c':           /* run ck_players */
                 checking = 1;
+                hideConsole = 0;
                 break;
 
-            case 's':
+            case 's':           /* listen socket number */
                 if (i < argc)
                 {
                     xtrekPort = atoi (argv[i + 1]);
@@ -160,11 +161,11 @@
                     usage++;
                 break;
 #ifdef RECORDGAME
-            case 'F':
+            case 'F':           /* playback recorded cambot */
                 inplayback = 1;
                 /* No break */
 
-            case 'f':
+            case 'f':           /* record to cambot file */
                 if (i < argc)
                 {
                     recordFileName = argv[i + 1];
@@ -174,7 +175,7 @@
                     usage++;
                 break;
 #endif
-            case 'l':
+            case 'l':           /* log to file */
                 if (i < argc)
                 {
                     logFileName = argv[i + 1];
@@ -184,7 +185,7 @@
                     usage++;
                 break;
 
-            case 'p':
+            case 'p':           /* port to connect to */
                 if (i < argc)
                 {
                     xtrekPort = atoi (argv[i + 1]);
@@ -193,6 +194,7 @@
                 else
                     usage++;
                 break;
+
             case 'd':
                 if (i < argc)
                 {
@@ -204,17 +206,17 @@
                 break;
 
 #ifdef META
-            case 'm':
+            case 'm':           /* show metaserver window */
                 if (usemeta && usemeta != 1)
                 {
-                    fputs ("The options -k and -m are mutuall exclusive\n",
+                    fputs ("The options -k and -m are mutually exclusive\n",
                            stderr);
                     err++;
                 }
                 usemeta = 1;
                 break;
 
-            case 'k':
+            case 'k':           /* show metacache window */
                 if (usemeta && usemeta != 2)
                 {
                     fputs ("The options -k and -m are mutually exclusive\n",
@@ -226,31 +228,31 @@
 #endif
 
 #ifdef RSA
-            case 'o':
+            case 'o':               /* try old binary verification */
                 useRsa = -1;        /* will be reset leter, set
-                                         * negative here * to flag
-                                         * that it should override
-                                         * xtrekrc */
-                printf ("Using standard binary verification\n");
+                                     * negative here * to flag
+                                     * that it should override
+                                     * xtrekrc */
+                LineToConsole ("Using standard binary verification\n");
                 break;
 
-            case 'R':
+            case 'R':               /* try RSA verification */
                 useRsa = -2;        /* will be reset leter, set
-                                         * negative here * to flag
-                                         * that it should override
-                                         * xtrekrc */
-                printf ("Using RSA verification\n");
+                                     * negative here * to flag
+                                     * that it should override
+                                     * xtrekrc */
+                LineToConsole ("Using RSA verification\n");
                 break;
 #else
             case 'R':
-                printf ("This client does not support RSA verification\n");
+                LineToConsole ("This client does not support RSA verification\n");
 
             case 'o':
-                printf ("Using standard binary verification\n");
+                LineToConsole ("Using standard binary verification\n");
                 break;
 #endif
 
-            case 'h':
+            case 'h':           /* server to connect to */
                 if (i < argc)
                 {
                     servertmp = argv[i + 1];
@@ -267,7 +269,7 @@
                 break;
 
 #ifdef GATEWAY
-            case 'H':
+            case 'H':           /* gateway to connect through */
                 hset++;
                 if (i < argc)
                 {
@@ -278,12 +280,12 @@
                     usage++;
                 break;
 #endif
-            case 'U':
+            case 'U':           /* local UDP port */
                 if (i < argc)
                 {
                     if ((baseUdpLocalPort = atoi (argv[i + 1])) == 0)
                     {
-                        fprintf (stderr, "Error: -U requires a port number\n");
+                        LineToConsole ("Error: -U requires a port number\n");
                         exit (1);
                     }
                     i++;
@@ -293,23 +295,23 @@
                 break;
 
 #ifdef PACKET_LOG
-            case 'P':
+            case 'P':           /* log packets */
                 log_packets++;
                 break;
 #endif
-            case 'G':
+            case 'G':           /* try restarting previous session */
                 if (i < argc)
                 {
                     ghoststart++;
                     ghost_pno = atoi (argv[i + 1]);
-                    printf ("Emergency restart being attempted...\n");
+                    LineToConsole ("Emergency restart being attempted...\n");
                     i++;
                 }
                 else
                     usage++;
                 break;
             
-            case 't':
+            case 't':           /* window title */
                 if (i < argc)
                 {
                     title = argv[i + 1];
@@ -319,7 +321,7 @@
                     usage++;
                 break;
             
-            case 'r':
+            case 'r':           /* defaults file */
                 if (i < argc)
                 {
                     deffile = argv[i + 1];
@@ -329,29 +331,31 @@
                     usage++;
                 break;
             
-            case 'D':
+            case 'D':           /* add debug info */
                 debug++;
+                hideConsole = 0;
                 break;
             
-			case 'n':
-				hideConsole = 0;
-				break;
+            case 'n':           /* don't hide console window */
+		hideConsole = 0;
+		break;
 
-            case 'v':
-				printf ("%s %s\n", version, mvers);
-				printf ("%s\n", CBUGS);
+            case 'v':           /* output version info */
+                hideConsole = 0;
+		LineToConsole ("%s %s\n", version, mvers);
+		LineToConsole ("%s\n", CBUGS);
 #ifdef RSA
-                printf ("RSA key installed: %s --- Created by: %s\n", key_name, client_creator);
-                printf ("Client type: %s\n", client_type);
-                printf ("Client arch: %s\n", client_arch);
-                printf ("Key permutation date: %s\n", client_key_date);
-                printf ("Comments: %s\n", client_comments);
+                LineToConsole ("RSA key installed: %s --- Created by: %s\n", key_name, client_creator);
+                LineToConsole ("Client type: %s\n", client_type);
+                LineToConsole ("Client arch: %s\n", client_arch);
+                LineToConsole ("Key permutation date: %s\n", client_key_date);
+                LineToConsole ("Comments: %s\n", client_comments);
 #endif
                 exit (0);
                 break;
             
             default:
-                fprintf (stderr, "%s: unknown option '%c'\n", name, *ptr);
+                LineToConsole ("%s: unknown option '%c'\n", name, *ptr);
                 err++; 
                 break;
             }   /* end switch */
@@ -360,21 +364,25 @@
         }       /* end while */
     }           /* end for */
 
+    if (!usemeta && !servertmp)  /* no meta type was selected, pick metaserver */
+        usemeta = 1;
+
+	if (hideConsole)
+		FreeConsole ();
+
     if (usage || err)
     {
         printUsage (name);
         exit (err);
     }
 
-	if (hideConsole)
-		FreeConsole ();
-
 #ifdef GATEWAY
-    if (!hset) use_trekhopd = 0;        /* allow use via normal
-                                         * connections */
+    if (!hset) use_trekhopd = 0;        /* allow use via normal connections */
     if (netaddr == 0)
-        fprintf (stderr, "netrek: no remote address set (-H).  
+    {
+        LineToConsole ("netrek: no remote address set (-H).  
                           Restricted server will not work.\n");
+    }
 #endif
 
 #ifdef RECORDGAME

Index: map.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- map.c	18 Apr 2006 13:41:48 -0000	1.3
+++ map.c	21 Apr 2006 12:00:07 -0000	1.4
@@ -364,7 +364,7 @@
 	}
 #endif
 
-        if (l->pl_flags & PLAGRI)
+        if ((l->pl_flags & PLAGRI) && (l->pl_info & me->p_team))
         {
             if (agriCAPS)
             {
@@ -466,6 +466,8 @@
 	int ori_light = FED;
 	char kli_score_line[5];
 	char ori_score_line[5];
+    int ori_offset, kli_offset;
+
 	int i;
 
 	/* Let's check KLI scores */
@@ -493,21 +495,33 @@
 			break;
 
 	/* Now we have scores, so let's draw them */
-	sprintf (kli_score_line, "%-2d", kli_score);
 	sprintf (ori_score_line, "%2d", ori_score);
+	sprintf (kli_score_line, "%-2d", kli_score);
 
-	W_WriteText (mapw, 3 * W_Textwidth, 1 * W_Textheight, W_Kli, 
-				kli_score_line, strlen (kli_score_line), W_RegularFont);
-	/*W_WriteTextDB (mapSDB, 3 * W_Textwidth, 1 * W_Textheight, W_Kli, 
-				   kli_score_line, strlen (kli_score_line), W_RegularFont);*/
+    /* If we rotate galaxy 180 degrees the scoreboard flips */
+    if (rotate == 2)
+    {
+        ori_offset = 8;
+        kli_offset = 3;
+    }
+    else
+    {
+        ori_offset = 3;
+        kli_offset = 8;
+    }
+
+	W_WriteText (mapw, ori_offset * W_Textwidth, 1 * W_Textheight, W_Ori, 
+				ori_score_line, strlen (ori_score_line), W_RegularFont);
+	/*W_WriteTextDB (mapSDB, ori_offset * W_Textwidth, 1 * W_Textheight, W_Ori, 
+				   ori_score_line, strlen (ori_score_line), W_RegularFont);*/
 	W_WriteText (mapw, 6 * W_Textwidth, 1 * W_Textheight, W_White, 
 				":", 1, W_RegularFont);
 	/*W_WriteTextDB (mapSDB, 6 * W_Textwidth, 1 * W_Textheight, W_White, 
 				   ":", 1, W_RegularFont);*/
-	W_WriteText (mapw, 8 * W_Textwidth, 1 * W_Textheight, W_Ori, 
-				ori_score_line, strlen (ori_score_line), W_RegularFont);
-	/*W_WriteTextDB (mapSDB, 8 * W_Textwidth, 1 * W_Textheight, W_Ori, 
-				   ori_score_line, strlen (ori_score_line), W_RegularFont);*/
+	W_WriteText (mapw, kli_offset * W_Textwidth, 1 * W_Textheight, W_Kli, 
+				kli_score_line, strlen (kli_score_line), W_RegularFont);
+	/*W_WriteTextDB (mapSDB, kli_offset * W_Textwidth, 1 * W_Textheight, W_Kli, 
+				   kli_score_line, strlen (kli_score_line), W_RegularFont);*/
 
 }
 #endif /* HOCKEY_LINES */
@@ -744,20 +758,28 @@
 
         if (j->p_flags & PFCLOAK)
         {
-            W_WriteText (mapw, dx - W_Textwidth,
-                         dy - W_Textheight / 2, unColor, cloakChars,
-                         (cloakChars[1] == '\0' ? 1 : 2), W_RegularFont);
-            /*W_WriteTextDB (mapSDB, dx - W_Textwidth,
-                           dy - W_Textheight / 2, unColor, cloakChars,
-                           (cloakChars[1] == '\0' ? 1 : 2), W_RegularFont);*/
+            if (omitTeamLetter)
+                W_WriteText (mapw, dx - (W_Textwidth / 2),
+                             dy - W_Textheight / 2, unColor, cloakChars,
+                             1, W_RegularFont);
+                /*W_WriteTextDB (mapSDB, dx - (W_Textwidth / 2),
+                               dy - W_Textheight / 2, unColor, cloakChars,
+                               (cloakChars[1] == '\0' ? 1 : 2), W_RegularFont);*/
+            else
+                W_WriteText (mapw, dx - W_Textwidth,
+                             dy - W_Textheight / 2, unColor, cloakChars,
+                             (cloakChars[1] == '\0' ? 1 : 2), W_RegularFont);
+                /*W_WriteTextDB (mapSDB, dx - W_Textwidth,
+                               dy - W_Textheight / 2, unColor, cloakChars,
+                               (cloakChars[1] == '\0' ? 1 : 2), W_RegularFont);*/
         }
         else
         {
             if (omitTeamLetter)
-                W_WriteText (mapw, dx - W_Textwidth,
+                W_WriteText (mapw, dx - (W_Textwidth / 2),
                              dy - W_Textheight / 2, playerColor (j),
                              (j->p_mapchars)+1, 1, shipFont (j));
-                /*W_WriteTextDB (mapSDB, dx - W_Textwidth,
+                /*W_WriteTextDB (mapSDB, dx - (W_Textwidth / 2),
                                dy - W_Textheight / 2, playerColor (j),
                                (j->p_mapchars)+1, 1, shipFont (j));*/
             else
@@ -816,10 +838,7 @@
 
         if (j->p_status == PALIVE && !(j->p_flags & PFCLOAK))
         {
-            if (omitTeamLetter) /* we want to draw triangle in the middle */
-                dx = j->p_x * WINSIDE / GWIDTH - (W_Textwidth / 2);
-            else
-                dx = j->p_x * WINSIDE / GWIDTH;
+            dx = j->p_x * WINSIDE / GWIDTH;
             dy = j->p_y * WINSIDE / GWIDTH;
             W_WriteTriangle (mapw, dx, dy + 6, 4, 1, foreColor);
             //W_WriteTriangleDB (mapSDB, dx, dy + 6, 4, 1, foreColor);

Index: redraw.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/redraw.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- redraw.c	19 Apr 2006 13:02:33 -0000	1.4
+++ redraw.c	21 Apr 2006 12:00:07 -0000	1.5
@@ -67,12 +67,15 @@
 
         updateMaxStats (0);     /* Update the max stats
                                  *  */
-        W_FlushScrollingWindow (messwa);
-        W_FlushScrollingWindow (messwt);
-        W_FlushScrollingWindow (messwi);
-        W_FlushScrollingWindow (messwk);
-        W_FlushScrollingWindow (reviewWin);
-        W_FlushScrollingWindow (phaserwin);
+        if (!richText)
+        {
+            W_FlushScrollingWindow (messwa);
+            W_FlushScrollingWindow (messwt);
+            W_FlushScrollingWindow (messwi);
+            W_FlushScrollingWindow (messwk);
+            W_FlushScrollingWindow (reviewWin);
+            W_FlushScrollingWindow (phaserwin);
+        }
 
         UpdatePlayerList ();
     }

Index: sound.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/sound.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- sound.c	21 Jan 2003 21:28:42 -0000	1.1.1.1
+++ sound.c	21 Apr 2006 12:00:07 -0000	1.2
@@ -88,7 +88,7 @@
     char buf[PATH_MAX];
 
 #ifdef DEBUG
-    printf ("Init_Sound\n");
+    LineToConsole ("Init_Sound\n");
 #endif
     if (sound_init)
     {
@@ -260,7 +260,7 @@
     }
     else
     {
-        fprintf (stderr, "Uh oh, bogus refresh number in soundrefresh\n");
+        LineToConsole ("Uh oh, bogus refresh number in soundrefresh\n");
     }
 
     W_WriteText (soundWin, 0, i, textColor, buf, strlen (buf), 0);

Index: cowmain.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/cowmain.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- cowmain.c	17 Apr 2006 09:44:08 -0000	1.6
+++ cowmain.c	21 Apr 2006 12:00:06 -0000	1.7
@@ -74,10 +74,8 @@
 unsigned LONG mkaddr ();
 
 
-unsigned LONG netaddr;          /* used for blessedness
-                                 * checking */
-int serv_port;                  /* used for blessedness
-                                 * checking */
+unsigned LONG netaddr;          /* used for blessedness checking */
+int serv_port;                  /* used for blessedness checking */
 
 static char *gateway = DEFAULT_GATEWAY;
 
@@ -123,7 +121,7 @@
 
     if (!server_count)
     {
-        fprintf (stderr, "No server list, cannot resolve id\n");
+        LineToConsole ("No server list, cannot resolve id\n");
         return (-1);
     }
 
@@ -132,8 +130,8 @@
     {
         if (!strcmp (str, slp->id))
         {
-            printf ("%s is %s(%d) (%s)\n", slp->id, slp->full_name,
-                    slp->remote_port, slp->comment);
+            LineToConsole ("%s is %s(%d) (%s)\n", slp->id, slp->full_name,
+                            slp->remote_port, slp->comment);
             xtrekPort = slp->gw_port;
             str = slp->inet_addr;
             break;
@@ -141,7 +139,7 @@
     }
     if (i == server_count)
     {
-        fprintf (stderr, "Specified server not found.\n");
+        LineToConsole ("Specified server not found.\n");
         return (-1);
     }
 
@@ -162,18 +160,18 @@
     /* do things slightly different */
     if (slp->id == NULL)
     {
-        fprintf (stderr, "ERROR: host ID '%s' unknown\n", str);
+        LineToConsole ("ERROR: host ID '%s' unknown\n", str);
         return (-1);
     }
     xtrekPort = trekhopd_port;  /* ought to have an arg to
                                  * specify this */
     port_req = slp->remote_port;
     host_req = slp->full_name;
-    printf ("Connecting to %s (%d) via trekhopd (%s %d)\n", host_req,
-            port_req, serverName, xtrekPort);
+    LineToConsole ("Connecting to %s (%d) via trekhopd (%s %d)\n", host_req,
+                    port_req, serverName, xtrekPort);
 #else
-    printf ("Connecting to %s through %s port %d\n", str, serverName,
-            xtrekPort);
+    LineToConsole ("Connecting to %s through %s port %d\n", str, serverName,
+                    xtrekPort);
 #endif
 
     return (answer);
@@ -226,7 +224,7 @@
             return;
         }
     }
-    printf ("unable to get ports for your uid\n");      /* debug */
+    LineToConsole ("unable to get ports for your uid\n");      /* debug */
 
     gw_p = getenv ("GW_PORT");
     gw_sp = getenv ("GW_SPORT");
@@ -237,8 +235,7 @@
         gw_port = strtol (gw_p, &err, 10);
         if (err == gw_p)
         {
-            fprintf (stderr, "netrek: malformed integer for GW_PORT: %s\n",
-                     gw_p);
+            LineToConsole ("netrek: malformed integer for GW_PORT: %s\n", gw_p);
             /* let something else complain about port 0 */
         }
     }
@@ -249,8 +246,7 @@
         gw_serv_port = strtol (gw_sp, &err, 10);
         if (err == gw_sp)
         {
-            fprintf (stderr, "netrek: malformed integer for GW_SPORT: %s\n",
-                     gw_sp);
+            LineToConsole ("netrek: malformed integer for GW_SPORT: %s\n", gw_sp);
             /* let something else complain about port 0 */
         }
     }
@@ -262,8 +258,7 @@
         gw_local_port = strtol (gw_lp, &err, 10);
         if (err == gw_lp)
         {
-            fprintf (stderr, "netrek: malformed integer for GW_LPORT: %s\n",
-                     gw_lp);
+            LineToConsole ("netrek: malformed integer for GW_LPORT: %s\n", gw_lp);
             /* let something else complain about port 0 */
         }
     }
@@ -293,7 +288,7 @@
         ad.s_addr = inet_addr (m);
         if (ad.s_addr == -1)
         {
-            fprintf (stderr, "netrek: unknown host \'%s\'\n", m);
+            LineToConsole ("netrek: unknown host \'%s\'\n", m);
             terminate (1);
         }
     }
@@ -343,8 +338,8 @@
     {
         /* failed, give up */
         perror ("warning: Unable to open server list");
-        fprintf (stderr, "Tried to open '%s', '%s', and './%s'\n",
-                 homedot, buf, SERVER_FILE);
+        LineToConsole ("Tried to open '%s', '%s', and './%s'\n",
+                        homedot, buf, SERVER_FILE);
         return;
     }
 
@@ -393,8 +388,7 @@
             }
             if (map_count >= MAX_UDPMAP)
             {
-                fprintf (stderr, "UDP map too large; max is %d entries\n",
-                         MAX_UDPMAP);
+                LineToConsole ("UDP map too large; max is %d entries\n", MAX_UDPMAP);
                 break;
             }
             ump = &udpmap[map_count];
@@ -409,8 +403,8 @@
             ump->local_port = atoi (cp);
 
 #ifdef DEBUG
-            printf ("%2d: %-8d %-8d %-8d %-8d\n", map_count,
-                    ump->uid, ump->serv_port, ump->port, ump->local_port);
+            LineToConsole ("%2d: %-8d %-8d %-8d %-8d\n", map_count,
+                            ump->uid, ump->serv_port, ump->port, ump->local_port);
 #endif
 
             map_count++;
@@ -424,8 +418,7 @@
             }
             if (server_count >= MAX_SERVER)
             {
-                fprintf (stderr, "server list too large; max is %d entries\n",
-                         MAX_SERVER);
+                LineToConsole ("server list too large; max is %d entries\n", MAX_SERVER);
                 break;
             }
             slp = &servers[server_count];
@@ -443,9 +436,9 @@
             STRNCPY (slp->comment, cp, sizeof (slp->comment));
 
 #ifdef DEBUG
-            printf ("%2d: %-9s %-15s %-5d %-5d %-25s \"%s\"\n", server_count,
-                    slp->id, slp->inet_addr, slp->remote_port, slp->gw_port,
-                    slp->full_name, slp->comment);
+            LineToConsole ("%2d: %-9s %-15s %-5d %-5d %-25s \"%s\"\n", server_count,
+                            slp->id, slp->inet_addr, slp->remote_port, slp->gw_port,
+                            slp->full_name, slp->comment);
 #endif
 
             server_count++;
@@ -453,7 +446,7 @@
         case 5:                /* all done! */
             break;
         default:
-            fprintf (stderr, "Whoops!\n");
+            LineToConsole ("Whoops!\n");
             terminate (2);
         }
     }
@@ -472,8 +465,7 @@
 static RETSIGTYPE
 handle_exception (int _dummy)
 {
-    printf
-        ("floating point exception error detected; attempting to continue\n");
+    LineToConsole ("floating point exception error detected; attempting to continue\n");
     /* Under Watcom C++, after a signal handler is called the signal reverts
        to SIG_DFL so has to be reset... is this standard? */
     (void) SIGNAL (SIGFPE, handle_exception);
@@ -501,7 +493,7 @@
 int checking = 0;
 
 #ifdef META
-int usemeta = 1;
+int usemeta = 0;
 #endif
 
 /******************************************************************************/
@@ -541,17 +533,16 @@
         {
             if ((hp = gethostbyname (myname)) == NULL)
             {
-                fprintf (stderr, "unable to get addr for local host\n");
+                LineToConsole ("unable to get addr for local host\n");
                 return (1);
             }
             myaddr = *(LONG *) hp->h_addr;
         }
 
-        /* printf("myname = '%s', myaddr = 0x%.8lx\n", myname, myaddr); */
+        /* LineToConsole ("myname = '%s', myaddr = 0x%.8lx\n", myname, myaddr); */
         if ((myaddr & MYADDR_MASK) != MYADDR)
         {
-            fprintf (stderr,
-                     "Sorry, you may not run this client on this host\n");
+            LineToConsole ("Sorry, you may not run this client on this host\n");
             return (1);
         }
     }
@@ -966,7 +957,7 @@
         sleep (1);
         if (logFile != NULL)
             fclose (logFile);
-        printf ("OK, bye!\n");
+        LineToConsole ("OK, bye!\n");
 
 #ifdef PACKET_LOG
         if (log_packets)

Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- local.c	18 Apr 2006 13:41:48 -0000	1.5
+++ local.c	21 Apr 2006 12:00:07 -0000	1.6
@@ -1037,7 +1037,7 @@
                             if (highlightFriendlyPhasers)
                             	W_CacheLine (w, px, py, tx, ty, foreColor);
                             else
-	                    {
+                            {
 	                        if ((php->ph_fuse % 2) == 1)
 	                            W_CacheLine (w, px, py, tx, ty, foreColor);
 	                        else
@@ -1895,7 +1895,6 @@
                     tri_y = dy + 20;    /* below ship */
                     facing = 1;
                 }
-                /* printf("Drawing local triangle at %d %d\n", tri_x, tri_y); */
             }
         }
         else if (me->p_flags & PFPLLOCK)
@@ -1913,7 +1912,6 @@
                 tri_y = dy - 20;        /* below planet */
                 facing = 0;
             }
-            /* printf("Drawing local triangle at %d %d\n", tri_x, tri_y); */
         }
         if (tri_x != -1)
         {

Index: death.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/death.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- death.c	12 Apr 2006 04:20:03 -0000	1.2
+++ death.c	21 Apr 2006 12:00:06 -0000	1.3
@@ -94,6 +94,10 @@
 
     deathFont = W_RegularFont;
 
+#ifdef DEBUG
+    LineToConsole ("Death cause: %d\n", me->p_whydead);
+#endif
+
     switch (me->p_whydead)
     {
     case KQUIT:
@@ -106,13 +110,6 @@
                  teamlet[players[me->p_whodead].p_team],
                  shipnos[me->p_whodead]);
         break;
-    case KPLASMA:
-        sprintf (deathmessage,
-                 "You were SMACKed by a plasma torpedo from %s (%c%c) ",
-                 players[me->p_whodead].p_name,
-                 teamlet[players[me->p_whodead].p_team],
-                 shipnos[me->p_whodead]);
-        break;
     case KPHASER:
         sprintf (deathmessage,
                  "You were phasered to death by %s (%c%c)",
@@ -159,22 +156,36 @@
     case KPROVIDENCE:
         strcpy (deathmessage, "You were nuked by GOD.");
         break;
+    case KPLASMA:
+        sprintf (deathmessage,
+                 "You were SMACKed by a plasma torpedo from %s (%c%c) ",
+                 players[me->p_whodead].p_name,
+                 teamlet[players[me->p_whodead].p_team],
+                 shipnos[me->p_whodead]);
+        break;
+    case TOURNEND:
+        strcpy (deathmessage, "The tournament game has ended.");
+        break;
     case KOVER:
-        strcpy (deathmessage, "The game is  over!");
+        strcpy (deathmessage, "The game is over!");
         break;
     case TOURNSTART:
         strcpy (deathmessage, "The tournament game has begun!");
         break;
-    case TOURNEND:
-        strcpy (deathmessage, "The tournament game has ended.");
-        break;
     case KBADBIN:
-        strcpy (deathmessage,
-                "Your netrek executable didn't verify correctly.");
+        strcpy (deathmessage, "Your netrek executable didn't verify correctly.");
+        break;
+    case KTORP2:
+        strcpy (deathmessage, "You were killed by detonated torpedo");
+        break;
+    case KSHIP2:
+        strcpy (deathmessage, "You were killed by chain reaction explosion");
+        break;
+    case KPLASMA2:
+        strcpy (deathmessage, "You were killed by zapped plasma");
         break;
     default:
-        strcpy (deathmessage,
-                "You were killed by something unknown to this game?");
+        strcpy (deathmessage, "You were killed by something unknown to this game?");
         break;
     }
 
@@ -201,7 +212,7 @@
     if (!playback)
     {                           /* If we are not playing back a recorded game, do this */
         W_TerminateWait ();
-        ENDTHREAD;
+        ExitThread(0);
     }
     else
     {                           /* Otherwise we aren't within a thread, so... */

Index: playerlist.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/playerlist.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- playerlist.c	12 Apr 2006 04:20:04 -0000	1.2
+++ playerlist.c	21 Apr 2006 12:00:07 -0000	1.3
@@ -77,6 +77,7 @@
 
 int partitionPlist = FALSE;
 char *plistCustomLayout;
+char *plist2CustomLayout;
 int plistReorder = FALSE;
 int playerListStyle = 0;
 int playerListObserver = 0;
@@ -101,16 +102,20 @@
 */
 
 char *plistLayout = "";
+char *plist2Layout = "";
 static int plistPos[MAXPLAYER];
 static int plistWidth = 0;
+static int plist2Width = 0;
 static char *my_classes[NUM_TYPES] =
     { "SC", "DD", "CA", "BB", "AS", "SB", "GA", "??" };
 
 /* Local Functions */
 
-static int PlistHeader (char *layout,
+static int PlistHeader (W_Window win,
+                        char *layout,
                         int doWrite);
-static void PlistLine (struct player *j,
+static void PlistLine (W_Window win,
+                       struct player *j,
                        int pos);
 static void WriteSortedPlist (void);
 static void WriteUnsortedPlist (void);
@@ -125,9 +130,8 @@
 {
     /* Find the default style number for the player list. */
 
-    plistCustomLayout = stringDefault ("playerlist");
-
-
+    plistCustomLayout = stringDefault ("playerList");
+    plist2CustomLayout = stringDefault ("playerList2");
 
     /* Select a style number base on the information in the defaults
      * (.xtrekrc) file. */
@@ -208,7 +212,7 @@
     plistCustomLayout = stringDefault ("playerlist");
 
     if (IsNotEmpty (plistCustomLayout))
-        plistWidth = PlistHeader (plistCustomLayout, FALSE);
+        plistWidth = PlistHeader (playerw, plistCustomLayout, FALSE);
     else
         plistWidth = 0;
 
@@ -219,6 +223,22 @@
 }
 
 
+int
+PlistMaxWidth2 ()
+/* Calculate the maximum width of all the defined player lists so that the
+ * width of the player list window can be defined. */
+{
+    plist2CustomLayout = stringDefault ("playerList2");
+
+    if (IsNotEmpty (plist2CustomLayout))
+        plist2Width = PlistHeader (playerw2, plist2CustomLayout, FALSE);
+    else
+        plist2Width = PlistHeader (playerw2, "n T R N l M K W L r O D d ", FALSE);
+
+    return plist2Width;
+}
+
+
 void
 RedrawPlayerList ()
 /* Completly redraw the player list, rather than incrementally updating the
@@ -231,7 +251,7 @@
 {
     int i;
 
-    if (IsEmpty (me) || !W_IsMapped (playerw))
+    if (IsEmpty (me))
         return;
 
 
@@ -263,7 +283,7 @@
         break;
 
     default:
-        fprintf (stderr, "Unknown playerListStyle in ChangedPlistStyle().\n");
+        LineToConsole ("Unknown playerListStyle\n");
         break;
     }
 
@@ -272,10 +292,18 @@
     if (playerListObserver == 2)
         plistLayout = "n N l M";
 
+    if (IsEmpty (plist2CustomLayout))
+        plist2Layout = "n T R N l M K W L r O D d ";
+    else
+        plist2Layout = plist2CustomLayout;
+
     /* Redraw the player list. */
 
     W_ClearWindow (playerw);
-    (void) PlistHeader (plistLayout, TRUE);
+    PlistHeader (playerw, plistLayout, TRUE);
+
+    W_ClearWindow (playerw2);
+    PlistHeader (playerw2, plist2Layout, TRUE);
 
     plistReorder = TRUE;
     plistUpdated = TRUE;
@@ -303,7 +331,7 @@
 
     plistUpdated = FALSE;
 
-    if (!W_IsMapped (playerw))
+    if (!W_IsMapped (playerw) && !W_IsMapped (playerw2))
         return;
 
     if (!plistReorder)
@@ -339,13 +367,22 @@
                 if (players[count].p_status != PFREE)
                 {
                     if (playerListObserver == 0)
-                        PlistLine (players + count, plistPos[count]);
+                    {
+                        PlistLine (playerw, players + count, plistPos[count]);
+                        PlistLine (playerw2, players + count, plistPos[count]);
+                    }
                     else if (playerListObserver == 1 &&
                              players[count].p_mapchars[1] <= 'f')
-                        PlistLine (players + count, plistPos[count]);
+                    {
+                        PlistLine (playerw, players + count, plistPos[count]);
+                        PlistLine (playerw2, players + count, plistPos[count]);
+                    }
                     else if (playerListObserver == 2 &&
                             !(players[count].p_mapchars[1] <= 'f'))
-                        PlistLine (players + count, plistPos[count]);
+                    {
+                        PlistLine (playerw, players + count, plistPos[count]);
+                        PlistLine (playerw2, players + count, plistPos[count]);
+                    }
                 }
             }
             else
@@ -356,7 +393,10 @@
                     !(players[count].p_flags & PFOBSERV)) ||
                     ((playerListObserver == 2) &&
                     (players[count].p_flags & PFOBSERV))))
-                    PlistLine (players + count, plistPos[count]);
+                {
+                    PlistLine (playerw, players + count, plistPos[count]);
+                    PlistLine (playerw2, players + count, plistPos[count]);
+                }
             }
         }
     }
@@ -458,6 +498,7 @@
             {
                 blankLine = last;
                 W_ClearArea (playerw, 0, last, plistWidth, 1);
+                W_ClearArea (playerw2, 0, last, plist2Width, 1);
             }
 
             ++last;
@@ -481,6 +522,7 @@
             {
                 blankLine = last;
                 W_ClearArea (playerw, 0, last, plistWidth, 1);
+                W_ClearArea (playerw2, 0, last, plist2Width, 1);
             }
 
             ++last;
@@ -500,6 +542,7 @@
             {
                 blankLine2 = last;
                 W_ClearArea (playerw, 0, last, plistWidth, 1);
+                W_ClearArea (playerw2, 0, last, plist2Width, 1);
             }
 
             ++last;
@@ -513,7 +556,10 @@
     /* Clear some lines if people have left. */
 
     for (row = last; row < plistLastRow; ++row)
+    {
         W_ClearArea (playerw, 0, row, plistWidth, 1);
+        W_ClearArea (playerw2, 0, row, plist2Width, 1);
+    }
 
     plistLastRow = last;
 
@@ -541,7 +587,8 @@
                 plistPos[i] = row;
                 updatePlayer[i] = FALSE;
 
-                PlistLine (current, row);
+                PlistLine (playerw, current, row);
+                PlistLine (playerw2, current, row);
             }
             else if (playerListObserver == 1 &&
                      current->p_mapchars[1] <= 'f')
@@ -553,7 +600,8 @@
                 plistPos[i] = row;
                 updatePlayer[i] = FALSE;
 
-                PlistLine (current, row);
+                PlistLine (playerw, current, row);
+                PlistLine (playerw2, current, row);
             }
             else if (playerListObserver == 2 &&
                     !(current->p_mapchars[1] <= 'f'))
@@ -565,7 +613,8 @@
                 plistPos[i] = row;
                 updatePlayer[i] = FALSE;
 
-                PlistLine (current, row);
+                PlistLine (playerw, current, row);
+                PlistLine (playerw2, current, row);
             }
         }            
         else
@@ -581,7 +630,8 @@
                 plistPos[i] = row;
                 updatePlayer[i] = FALSE;
 
-                PlistLine (current, row);
+                PlistLine (playerw, current, row);
+                PlistLine (playerw2, current, row);
             }
         }
     }
@@ -645,16 +695,23 @@
         plistPos[count] = pos;
 
         if (players[count].p_status != PFREE)
-            PlistLine (players + count, pos);
+        {
+            PlistLine (playerw, players + count, pos);
+            PlistLine (playerw2, players + count, pos);
+        }
         else
+        {
             W_ClearArea (playerw, 0, pos, plistWidth, 1);
+            W_ClearArea (playerw2, 0, pos, plistWidth, 1);
+        }
     }
 }
 
 
 
 static int
-PlistHeader (char *layout,
+PlistHeader (W_Window win,
+             char *layout,
              int doWrite)
 /* Analyse the heading (field names) for a player list, and set the
  * plistHasSpeed and plistHasHostile flags.
@@ -682,7 +739,7 @@
              * code will dump core here because of an attempt to write over a
              * constant string. */
 
-            fprintf (stderr, "Playerlist truncated to fit buffer.\n");
+            LineToConsole ("Playerlist truncated to fit buffer.\n");
             layout = '\0';
             break;
         }
@@ -911,8 +968,7 @@
 #endif
 
         default:
-            fprintf (stderr,
-                     "%c is not an option for the playerlist\n", *layout);
+            LineToConsole ("%c is not an option for the playerlist\n", *layout);
             break;
         }
     }
@@ -920,25 +976,31 @@
     header[num] = '\0';
 
     if (doWrite)
-        W_WriteText (playerw, 0, 0, textColor, header, num, W_RegularFont);
+        if (W_IsMapped (win))
+            W_WriteText (win, 0, 0, textColor, header, num, W_RegularFont);
 
     return num;
 }
 
 
 static void
-PlistLine (struct player *j,
+PlistLine (W_Window win,
+           struct player *j,
            int pos)
 /* Write the player list entry for player `j' on line `pos'. */
 {
     char buf[BUFSIZ];
     char *ptr;
     char *buffPoint;
+    char *tmpLayout;
     int kills, losses, my_ticks;
     float pRating, oRating, dRating, bRating, Ratings;
     float KillsPerHour, LossesPerHour;  /* Added 12/27/93 ATH */
     double ratio, max_kills;
 
+    if (!W_IsMapped (win))
+        return;
+
     /* Fill pl_row to get right player placement in the list */
     pl_row[j->p_no] = pos;
 
@@ -999,7 +1061,12 @@
 
     buffPoint = buf;
 
-    for (ptr = plistLayout; IsNotZero (*ptr); ++ptr)
+    if (win == playerw)
+        tmpLayout = plistLayout;
+    else
+        tmpLayout = plist2Layout;
+
+    for (ptr = tmpLayout; IsNotZero (*ptr); ++ptr)
     {
         *(buffPoint++) = ' ';
 
@@ -1289,7 +1356,7 @@
     *buffPoint = '\0';
     // Don't draw the line if pos has been set to -1
     if (pos > -1)
-        W_WriteText (playerw, 0, pos, playerColor (j),
+        W_WriteText (win, 0, pos, playerColor (j),
                      buf, buffPoint - buf, shipFont (j));
 }
 

Index: winsndlib.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/winsndlib.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- winsndlib.c	12 Apr 2006 04:20:04 -0000	1.2
+++ winsndlib.c	21 Apr 2006 12:00:07 -0000	1.3
@@ -82,17 +82,17 @@
     in = fopen (fname, "rb");
     if (!in)
     {
-        fprintf (stderr, "Could not open wave file %s\n", fname);
+        LineToConsole ("Could not open wave file %s\n", fname);
         return 0;
     }
 
     fread (chunk, 8, 1, in);    /* read signature, and file length  (which we discard) */
 #ifdef DEBUG
-    printf ("Chunk: %c%c%c%c\n", chunk[0], chunk[1], chunk[2], chunk[3]);
+    LineToConsole ("Chunk: %c%c%c%c\n", chunk[0], chunk[1], chunk[2], chunk[3]);
 #endif
     if (strncmp (chunk, "RIFF", 4))
     {
-        fprintf (stderr, "%s is not a valid wave file\n", fname);
+        LineToConsole ("%s is not a valid wave file\n", fname);
         return 0;
     }
 
@@ -103,7 +103,7 @@
         if (feof (in))
             goto NoGood;
 #ifdef DEBUG
-        printf ("Chunk: %c%c%c%c\n", chunk[0], chunk[1], chunk[2], chunk[3]);
+        LineToConsole ("Chunk: %c%c%c%c\n", chunk[0], chunk[1], chunk[2], chunk[3]);
 #endif
         if (!strncmp (chunk, "WAVE", 4))
             do
@@ -113,8 +113,8 @@
                 if (feof (in))
                     goto NoGood;
 #ifdef DEBUG
-                printf ("Chunk: %c%c%c%c\n", chunk[0], chunk[1], chunk[2],
-                        chunk[3]);
+                LineToConsole ("Chunk: %c%c%c%c\n", chunk[0], chunk[1], chunk[2],
+                                chunk[3]);
 #endif
                 if (!strncmp (chunk, "fmt ", 4))        /* found fmt chunk, read header */
                 {
@@ -124,7 +124,7 @@
                         != 1)
                         goto NoGood;
 #ifdef DEBUG
-                    printf ("Yup gosh read the header\n");
+                    LineToConsole ("Yup gosh read the header\n");
 #endif
                     chunksread++;
                 }
@@ -135,7 +135,7 @@
                     if (fread (*data, len, 1, in) != 1)
                         goto NoGood;
 #ifdef DEBUG
-                    printf ("Read %d bytes of data\n", *datalen);
+                    LineToConsole ("Read %d bytes of data\n", *datalen);
 #endif
                     chunksread++;
                 }
@@ -150,7 +150,7 @@
     return 1;
 
   NoGood:
-    fprintf (stderr, "%s is not a valid wave file\n", fname);
+    LineToConsole ("%s is not a valid wave file\n", fname);
     fclose (in);
     return 0;
 }
@@ -166,7 +166,7 @@
     struct sound *itr = newest, *newsnd;
 
 #ifdef DEBUG
-    printf ("Searching for sound %s in cache\n", name);
+    LineToConsole ("Searching for sound %s in cache\n", name);
 #endif
 
     while (itr)
@@ -174,17 +174,17 @@
 #ifdef DEBUG
         if (loopcount > 0 && itr == newest)
         {
-            printf ("Sound list is circular with %d items!\n", loopcount);
+            LineToConsole ("Sound list is circular with %d items!\n", loopcount);
             return 0;
         }
 
         if (loopcount++ > 100)
         {
-            printf ("Stuck in GetSound loop!\n");
+            LineToConsole ("Stuck in GetSound loop!\n");
             return 0;
         }
 
-        printf ("Found %s in cache\n", itr->name);
+        LineToConsole ("Found %s in cache\n", itr->name);
 #endif
 
         if (!strcmp (name, itr->name))
@@ -212,7 +212,7 @@
 
     /* Sound not in cache, must load */
 #ifdef DEBUG
-    printf ("Sound %s not in cache, loading\n", name);
+    LineToConsole ("Sound %s not in cache, loading\n", name);
 #endif
 
     newsnd = (struct sound *) malloc (sizeof (struct sound));
@@ -231,8 +231,8 @@
             struct sound *next = itr->newer;
             bytesused -= itr->hdr.dwBufferLength;
 #ifdef DEBUG
-            printf ("Trimming sound cache, file %s, %d bytes\n", itr->name,
-                    itr->hdr.dwBufferLength);
+            LineToConsole ("Trimming sound cache, file %s, %d bytes\n", itr->name,
+                            itr->hdr.dwBufferLength);
 #endif
             if (next)           /* Remove from list, simple as always at end */
             {
@@ -301,7 +301,7 @@
     if (SoundPlaying ())
     {
 #ifdef DEBUG
-        printf ("Interuppting sound\n");
+        LineToConsole ("Interuppting sound\n");
 #endif
         waveOutReset (hw);
         waveOutUnprepareHeader (hw, ¤t->hdr, sizeof (WAVEHDR));
@@ -318,7 +318,7 @@
     WAVEOUTCAPS caps;
 
 #ifdef DEBUG
-    printf ("Request to play sound %s\n", name);
+    LineToConsole ("Request to play sound %s\n", name);
 #endif
     StopSound ();
 
@@ -329,33 +329,34 @@
         if (!hw)
         {
 #ifdef DEBUG
-            printf ("Initial open of wave device\n");
+            LineToConsole ("Initial open of wave device\n");
 #endif
             if (err =
                 waveOutOpen (&hw, WAVE_MAPPER, (LPWAVEFORMATEX) & snd->fmt, 0,
                              0, 0))
-                fprintf (stderr, "Could not open wave device, error %d\n",
-                         err);
+            {
+                LineToConsole ("Could not open wave device, error %d\n", err);
+            }
             memcpy (&lastfmt, &snd->fmt, sizeof (PCMWAVEFORMAT));
         }
         else if (memcmp (&snd->fmt, &lastfmt, sizeof (PCMWAVEFORMAT)))
             /* Re-use the currently open sound handle of the formats are the same */
         {
 #ifdef DEBUG
-            printf ("Re-open of wave device\n");
+            LineToConsole ("Re-open of wave device\n");
 #endif
             waveOutClose (hw);
             memcpy (&lastfmt, &snd->fmt, sizeof (PCMWAVEFORMAT));
             if (err =
                 waveOutOpen (&hw, WAVE_MAPPER, (LPWAVEFORMATEX) & snd->fmt, 0,
                              0, 0))
-                fprintf (stderr, "Could not open wave device, error %d\n",
-                         err);
-
+            {
+                LineToConsole ("Could not open wave device, error %d\n", err);
+            }
         }
 #ifdef DEBUG
         else
-            printf ("Re-using open sound handle\n");
+            LineToConsole ("Re-using open sound handle\n");
 #endif
         waveOutPrepareHeader (hw, &snd->hdr, sizeof (WAVEHDR));
         waveOutWrite (hw, &snd->hdr, sizeof (WAVEHDR));
@@ -389,7 +390,7 @@
     int playing;
 
 #ifdef DEBUG
-    printf ("playing = ...");
+    LineToConsole ("playing = ...");
 #endif
     if (!hw || !current)
         return 0;
@@ -401,7 +402,7 @@
         current = NULL;
     }
 #ifdef DEBUG
-    printf ("%d\n", playing);
+    LineToConsole ("%d\n", playing);
 #endif
     return playing;
 }

Index: reserved.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/reserved.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- reserved.c	21 Jan 2003 21:28:42 -0000	1.1.1.1
+++ reserved.c	21 Apr 2006 12:00:07 -0000	1.2
@@ -80,7 +80,7 @@
         netaddr = saddr.sin_addr.s_addr;
     }
 
-    /* printf("Verifying with netaddr %x\n", netaddr); */
+    /* LineToConsole ("Verifying with netaddr %x\n", netaddr); */
     mixin1 = (unsigned char) ((netaddr >> 24) & 0xff);
     mixin2 = pno;
     mixin3 = (unsigned char) ((netaddr >> 16) & 0xff);

Index: docwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/docwin.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- docwin.c	21 Jan 2003 21:28:34 -0000	1.1.1.1
+++ docwin.c	21 Apr 2006 12:00:06 -0000	1.2
@@ -153,7 +153,7 @@
     if (temp == NULL)
     {                           /* malloc error checking --
                                  * 10/30/92 EM */
-        printf ("Warning:  Couldn't malloc space for a new doc line!");
+        LineToConsole ("Warning:  Couldn't malloc space for a new doc line!");
         return;
     }
 
@@ -202,7 +202,7 @@
         if (temp->next == NULL)
         {                       /* malloc error checking --
                                  * 10/30/92 EM */
-            printf ("Warning:  Couldn't malloc space for a new doc line!");
+            LineToConsole ("Warning:  Couldn't malloc space for a new doc line!");
             return;
         }
 
@@ -329,7 +329,7 @@
     if (temp == NULL)
     {                           /* malloc error checking --
                                  * 10/30/92 EM */
-        printf ("Warning:  Couldn't malloc space for a new doc line!");
+        LineToConsole ("Warning:  Couldn't malloc space for a new doc line!");
         return;
     }
 
@@ -361,7 +361,7 @@
         if (temp->next == NULL)
         {                       /* malloc error checking --
                                  * 10/30/92 EM */
-            printf ("Warning:  Couldn't malloc space for a new doc line!");
+            LineToConsole ("Warning:  Couldn't malloc space for a new doc line!");
             return;
         }
 

Index: senddist.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/senddist.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- senddist.c	12 Apr 2006 04:20:04 -0000	1.2
+++ senddist.c	21 Apr 2006 12:00:07 -0000	1.3
@@ -184,7 +184,7 @@
 
     if (!group)
     {
-        printf ("Bad group! %c %d %d\n", addr, recip, group);
+        LineToConsole ("Bad group! %c %d %d\n", addr, recip, group);
         return (0);
     }
 

Index: socket.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/socket.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- socket.c	12 Apr 2006 04:20:04 -0000	1.2
+++ socket.c	21 Apr 2006 12:00:07 -0000	1.3
@@ -423,7 +423,7 @@
                          (char *) &option_value, sizeof (option_value));
     if (status < 0)
     {
-        fprintf (stderr, ("setsockopt() failed, %s\n", strerror (errno)));
+        LineToConsole ("setsockopt() failed, %s\n", strerror (errno));
         /* can still play without this, proceed */
     }
 }
@@ -447,11 +447,11 @@
         sock = -1;
     }
 
-    printf ("Waiting for connection (port %d). \n", port);
+    LineToConsole ("Waiting for connection (port %d). \n", port);
 
     if ((s = socket (AF_INET, SOCK_STREAM, 0)) < 0)
     {
-        printf ("I can't create a socket\n");
+        LineToConsole ("I can't create a socket\n");
         terminate (2);
     }
 
@@ -489,7 +489,7 @@
 
     if (select (max_fd, &readfds, NULL, NULL, &timeout) == 0)
     {
-        printf ("Well, I think the server died!\n");
+        LineToConsole ("Well, I think the server died!\n");
         terminate (0);
     }
 
@@ -503,7 +503,7 @@
     if (sock >= max_fd)
         max_fd = sock + 1;
 
-    printf ("Got connection.\n");
+    LineToConsole ("Got connection.\n");
 
     closesocket (s);
     setNoDelay (sock);
@@ -536,7 +536,7 @@
             strcpy (serverName, inet_ntoa (addr.sin_addr));
         }
     }
-    printf ("Connection from server %s (0x%x)\n", serverName, serveraddr);
+    LineToConsole ("Connection from server %s (0x%x)\n", serverName, serveraddr);
 
 }
 
@@ -550,11 +550,11 @@
 
     serverDead = 0;
 
-    printf ("Calling %s on port %d.\n", server, port);
+    LineToConsole ("Calling %s on port %d\n", server, port);
 
     if ((s = socket (AF_INET, SOCK_STREAM, 0)) < 0)
     {
-        printf ("I can't create a socket\n");
+        LineToConsole ("I can't create a socket\n");
         terminate (0);
     }
     addr.sin_family = AF_INET;
@@ -564,7 +564,7 @@
     {
         if ((hp = gethostbyname (server)) == NULL)
         {
-            printf ("Who is %s?\n", server);
+            LineToConsole ("Who is %s?\n", server);
             terminate (0);
         }
         else
@@ -576,10 +576,10 @@
 
     if (connect (s, (struct sockaddr *) &addr, sizeof (addr)) < 0)
     {
-        printf ("Server not listening!\n");
+        LineToConsole ("Server not listening!\n");
         terminate (0);
     }
-    printf ("Got connection.\n");
+    LineToConsole ("Got connection.\n");
 
     sock = s;
 
@@ -611,10 +611,10 @@
             strcpy (msg.mesg + 16, host_req);
             if (gwrite (s, &msg, sizeof (struct mesg_cpacket)) < 0)
             {
-                fprintf (stderr, "trekhopd init failure\n");
+                LineToConsole ("trekhopd init failure\n");
                 terminate (1);
             }
-            printf ("--- trekhopd request sent, awaiting reply\n");
+            LineToConsole ("--- trekhopd request sent, awaiting reply\n");
             /* now block waiting for reply */
             count = sizeof (struct mesg_spacket);
 
@@ -629,7 +629,7 @@
 
             if (reply.type != SP_MESSAGE)
             {
-                fprintf (stderr, "Got bogus reply from trekhopd (%d)\n",
+                LineToConsole ("Got bogus reply from trekhopd (%d)\n",
                          reply.type);
                 terminate (1);
             }
@@ -637,9 +637,9 @@
             gw_serv_port = ntohl (*ip++);
             gw_port = ntohl (*ip++);
             serv_port = ntohl (*ip++);
-            printf ("--- trekhopd reply received\n");
+            LineToConsole ("--- trekhopd reply received\n");
 
-            /* printf("ports = %d/%d, %d\n", gw_serv_port, gw_port, serv_port); */
+            /* LineToConsole ("ports = %d/%d, %d\n", gw_serv_port, gw_port, serv_port); */
         }
     }
 #endif /* TREKHOPD */
@@ -836,7 +836,7 @@
         size = ((unsigned char) bufptr[1] * 2) + 2;
         break;
     default:
-        fprintf (stderr, "Unknown variable packet\n");
+        LineToConsole ("Unknown variable packet\n");
         /* terminate(1); */
         return -1;
         break;
@@ -871,8 +871,10 @@
               0);
 
     if (debug)
-        printf ("read %d bytes from %s socket\n",
+    {
+        LineToConsole ("read %d bytes from %s socket\n",
                 count, asock == udpSock ? "UDP" : "TCP");
+    }
 
     if (count <= 0)
     {
@@ -916,7 +918,7 @@
             }
             return (0);
         }
-        printf ("1) Got read() of %d. Server dead\n", count);
+        LineToConsole ("1) Got read() of %d. Server dead\n", count);
         perror ("1) read()");
         serverDead = 1;
         return (0);
@@ -933,14 +935,14 @@
             int i;
 #endif
 
-            fprintf (stderr, "Unknown packet type: %d\n", *bufptr);
+            LineToConsole ("Unknown packet type: %d\n", *bufptr);
 
 #ifndef CORRUPTED_PACKETS
-            printf ("count: %d, bufptr at %d,  Content:\n", count,
-                    bufptr - buf);
+            LineToConsole ("count: %d, bufptr at %d,  Content:\n", count,
+                            bufptr - buf);
             for (i = 0; i < count; i++)
             {
-                printf ("0x%x, ", (unsigned int) buf[i]);
+                LineToConsole ("0x%x, ", (unsigned int) buf[i]);
             }
 #endif
 
@@ -954,20 +956,23 @@
             size = getvpsize (bufptr);
             if (size <= 0)
             {
-                fprintf (stderr, "Bad short-packet size value (%d)\n", size);
+                LineToConsole ("Bad short-packet size value (%d)\n", size);
                 return 0;
             }
 
             if (debug)
-                printf ("read variable packet size %d, type %d\n",
-                        size, *bufptr);
+            {
+                LineToConsole ("read variable packet size %d, type %d\n",
+                                size, *bufptr);
+            }
         }
 #endif /* SHORT_PACKETS */
 
         if (size == 0)
-            fprintf (stderr,
-                     "Variable packet has 0 length! type=%d Trying to read more!\n",
-                     *bufptr);
+        {
+            LineToConsole ("Variable packet has 0 length! type=%d Trying to read more!\n",
+                          *bufptr);
+        }
         /* read broke in the middle of a packet, wait until we get the rest */
         while (size > count + (buf - bufptr) || size == 0)
         {
@@ -981,7 +986,7 @@
             /* readfds=1<tnum) >= MAXPLAYER * MAXTORP)
     {
-        fprintf (stderr, "handleTorp: bad index %d\n", ntohs (packet->tnum));
+        LineToConsole ("handleTorp: bad index %d\n", ntohs (packet->tnum));
         return;
     }
 #endif
@@ -1103,8 +1112,7 @@
 #ifdef CORRUPTED_PACKETS
     if (ntohs (packet->tnum) >= MAXPLAYER * MAXTORP)
     {
-        fprintf (stderr, "handleTorpInfo: bad index %d\n",
-                 ntohs (packet->tnum));
+        LineToConsole ("handleTorpInfo: bad index %d\n", ntohs (packet->tnum));
         return;
     }
 #endif
@@ -1116,7 +1124,7 @@
     if (packet->status == TEXPLODE && thetorp->t_status == TFREE)
     {
         /* FAT: redundant explosion; don't update p_ntorp */
-        /* printf("texplode ignored\n"); */
+        /* LineToConsole ("texplode ignored\n"); */
         return;
     }
 
@@ -1161,12 +1169,12 @@
 
     if (debug)
     {
-        printf ("SERVER STATS:\n");
-        printf ("time: %d\n", status->time / (60 * 60 * 10));
-        printf ("kills: %d\n", status->kills);
-        printf ("losses: %d\n", status->losses);
-        printf ("planets: %d\n", status->planets);
-        printf ("armsbomb: %d\n", status->armsbomb);
+        LineToConsole ("SERVER STATS:\n");
+        LineToConsole ("time: %d\n", status->time / (60 * 60 * 10));
+        LineToConsole ("kills: %d\n", status->kills);
+        LineToConsole ("losses: %d\n", status->losses);
+        LineToConsole ("planets: %d\n", status->planets);
+        LineToConsole ("armsbomb: %d\n", status->armsbomb);
     }
 }
 
@@ -1177,7 +1185,7 @@
 #ifdef CORRUPTED_PACKETS
     if (packet->pnum >= MAXPLAYER)
     {
-        fprintf (stderr, "handleSelf: bad index %d\n", packet->pnum);
+        LineToConsole ("handleSelf: bad index %d\n", packet->pnum);
         return;
     }
 #endif
@@ -1233,7 +1241,7 @@
 #ifdef CORRUPTED_PACKETS
     if (packet->pnum >= MAXPLAYER)
     {
-        fprintf (stderr, "handlePlayer: bad index %d\n", packet->pnum);
+        LineToConsole ("handlePlayer: bad index %d\n", packet->pnum);
         return;
     }
 #endif
@@ -1382,7 +1390,7 @@
     if (packet->type < 1 || packet->type > NUM_SIZES
         || sizes[packet->type] == 0)
     {
-        printf ("Attempt to send strange packet %d!\n", packet->type);
+        LineToConsole ("Attempt to send strange packet %d!\n", packet->type);
         return;
     }
     size = sizes[packet->type];
@@ -1407,7 +1415,7 @@
         /* business as usual (or player has turned off UDP transmission) */
         if (gwrite (sock, (char *) packet, size) != size)
         {
-            printf ("gwrite failed.  Server must be dead\n");
+            LineToConsole ("gwrite failed.  Server must be dead\n");
             serverDead = 1;
         }
     }
@@ -1471,7 +1479,7 @@
             /* critical stuff, use TCP */
             if (gwrite (sock, (char *) packet, size) != size)
             {
-                printf ("gwrite failed.  Server must be dead\n");
+                LineToConsole ("gwrite failed.  Server must be dead\n");
                 serverDead = 1;
             }
         }
@@ -1489,7 +1497,7 @@
 #ifdef CORRUPTED_PACKETS
     if (packet->pnum >= MAXPLANETS)
     {
-        fprintf (stderr, "handlePlanet: bad index %d\n", packet->pnum);
+        LineToConsole ("handlePlanet: bad index %d\n", packet->pnum);
         return;
     }
 #endif
@@ -1543,14 +1551,13 @@
 #ifdef CORRUPTED_PACKETS
     if (packet->pnum >= MAXPLAYER)
     {
-        fprintf (stderr, "handlePhaser: bad index %d\n", packet->pnum);
+        LineToConsole ("handlePhaser: bad index %d\n", packet->pnum);
         return;
     }
     if (packet->status == PHHIT &&
         (ntohl (packet->target) < 0 || ntohl (packet->target) >= MAXPLAYER))
     {
-        fprintf (stderr, "handlePhaser: bad target %d\n",
-                 ntohl (packet->target));
+        LineToConsole ("handlePhaser: bad target %d\n", ntohl (packet->target));
         return;
     }
 #endif
@@ -1587,9 +1594,10 @@
     packet->mesg[sizeof (packet->mesg) - 1] = '\0';
 #endif
 
-    /* printf("flags: 0x%x\n", packet->m_flags); printf("from: %d\n",
-     * packet->m_from); printf("recpt: %d\n", packet->m_recpt); printf("mesg:
-     * %s\n", packet->mesg); */
+    /* LineToConsole ("flags: 0x%x\n", packet->m_flags);
+     * LineToConsole ("from: %d\n", * packet->m_from);
+     * LineToConsole ("recpt: %d\n", packet->m_recpt);
+     * LineToConsole ("mesg: * %s\n", packet->mesg); */
 
 
     dmessage (packet->mesg, packet->m_flags, packet->m_from, packet->m_recpt);
@@ -1697,7 +1705,7 @@
 #ifdef CORRUPTED_PACKETS
     if (ntohs (packet->pnum) >= MAXPLAYER * MAXPLASMA)
     {
-        fprintf (stderr, "handlePlasmaInfo: bad index %d\n", packet->pnum);
+        LineToConsole ("handlePlasmaInfo: bad index %d\n", packet->pnum);
         return;
     }
 #endif
@@ -1738,7 +1746,7 @@
 #ifdef CORRUPTED_PACKETS
     if (ntohs (packet->pnum) >= MAXPLAYER * MAXPLASMA)
     {
-        fprintf (stderr, "handlePlasma: bad index %d\n", packet->pnum);
+        LineToConsole ("handlePlasma: bad index %d\n", packet->pnum);
         return;
     }
 #endif
@@ -1765,7 +1773,7 @@
 #ifdef CORRUPTED_PACKETS
     if (packet->pnum >= MAXPLAYER)
     {
-        fprintf (stderr, "handleFlags: bad index %d\n", packet->pnum);
+        LineToConsole ("handleFlags: bad index %d\n", packet->pnum);
         return;
     }
 #endif
@@ -1802,7 +1810,7 @@
 #ifdef CORRUPTED_PACKETS
     if (packet->pnum >= MAXPLAYER)
     {
-        fprintf (stderr, "handleKills: bad index %d\n", packet->pnum);
+        LineToConsole ("handleKills: bad index %d\n", packet->pnum);
         return;
     }
 #endif
@@ -1831,7 +1839,7 @@
 #ifdef CORRUPTED_PACKETS
     if (packet->pnum >= MAXPLAYER)
     {
-        fprintf (stderr, "handlePStatus: bad index %d\n", packet->pnum);
+        LineToConsole ("handlePStatus: bad index %d\n", packet->pnum);
         return;
     }
 #endif
@@ -1954,8 +1962,8 @@
     switch (packet->why)
     {
     case 0:
-        printf ("Sorry, this is an invalid client version.\n");
-        printf ("You need a new version of the client code.\n");
+        LineToConsole ("Sorry, this is an invalid client version.\n");
+        LineToConsole ("You need a new version of the client code.\n");
         break;
     case 1:
     case 2:
@@ -1963,11 +1971,11 @@
     case 4:
     case 5:
     case 6:
-        printf ("Sorry, but you cannot play xtrek now.\n");
-        printf ("Try again later.\n");
+        LineToConsole ("Sorry, but you cannot play xtrek now.\n");
+        LineToConsole ("Try again later.\n");
         break;
     default:
-        printf ("Unknown message from handleBadVersion.\n");
+        LineToConsole ("Unknown message from handleBadVersion.\n");
         return;
     }
     terminate (1);
@@ -1985,8 +1993,7 @@
         {
             if (fd == udpSock)
             {
-                fprintf (stderr, "Tried to write %d, 0x%x, %d\n",
-                         fd, buf, bytes);
+                LineToConsole ("Tried to write %d, 0x%x, %d\n", fd, buf, bytes);
                 perror ("write");
                 printUdpInfo ();
             }
@@ -2006,7 +2013,7 @@
 #ifdef CORRUPTED_PACKETS
     if (packet->pnum >= MAXPLAYER)
     {
-        fprintf (stderr, "handleHostile: bad index %d\n", packet->pnum);
+        LineToConsole ("handleHostile: bad index %d\n", packet->pnum);
         return;
     }
 #endif
@@ -2031,7 +2038,7 @@
 #ifdef CORRUPTED_PACKETS
     if (sock == udpSock)
     {
-        fprintf (stderr, "garbage packet discarded.\n");
+        LineToConsole ("garbage packet discarded.\n");
         return;
     }
 #endif
@@ -2039,12 +2046,12 @@
 #ifdef CORRUPTED_PACKETS
     if (packet->pnum >= MAXPLAYER)
     {
-        fprintf (stderr, "handlePlyrLogin: bad index %d\n", packet->pnum);
+        LineToConsole ("handlePlyrLogin: bad index %d\n", packet->pnum);
         return;
     }
     if (packet->rank >= NUMRANKS)
     {
-        fprintf (stderr, "handlePlyrLogin: bad rank %d\n", packet->rank);
+        LineToConsole ("handlePlyrLogin: bad rank %d\n", packet->rank);
         return;
     }
     packet->name[sizeof (packet->name) - 1] = '\0';
@@ -2059,7 +2066,7 @@
     strcpy (pl->p_login, packet->login);
     pl->p_stats.st_rank = packet->rank;
 
-    /* printf("read player login %s, %s, %s\n", pl->p_name, pl->p_monitor,
+    /* LineToConsole ("read player login %s, %s, %s\n", pl->p_name, pl->p_monitor,
      * pl->p_login); */
 
     if (packet->pnum == me->p_no)
@@ -2094,7 +2101,7 @@
 #ifdef CORRUPTED_PACKETS
     if (packet->pnum >= MAXPLAYER)
     {
-        fprintf (stderr, "handleStats: bad index %d\n", packet->pnum);
+        LineToConsole ("handleStats: bad index %d\n", packet->pnum);
         return;
     }
 #endif
@@ -2139,12 +2146,12 @@
 #ifdef CORRUPTED_PACKETS
     if (packet->pnum >= MAXPLAYER)
     {
-        fprintf (stderr, "handlePlyrInfo: bad index %d\n", packet->pnum);
+        LineToConsole ("handlePlyrInfo: bad index %d\n", packet->pnum);
         return;
     }
     if (packet->team > ALLTEAM)
     {
-        fprintf (stderr, "handlePlyrInfo: bad team %d\n", packet->team);
+        LineToConsole ("handlePlyrInfo: bad team %d\n", packet->team);
         return;
     }
 #endif
@@ -2195,7 +2202,7 @@
 #ifdef CORRUPTED_PACKETS
     if (packet->pnum >= MAXPLANETS)
     {
-        fprintf (stderr, "handlePlanetLoc: bad index\n");
+        LineToConsole ("handlePlanetLoc: bad index\n");
         return;
     }
 #endif
@@ -2207,7 +2214,7 @@
     if (pl_update[packet->pnum].plu_update != -1)
     {
         pl_update[packet->pnum].plu_update = 1;
-        /* printf("update: %s, old (%d,%d) new (%d,%d)\n", pl->pl_name,
+        /* LineToConsole ("update: %s, old (%d,%d) new (%d,%d)\n", pl->pl_name,
          * pl->pl_x, pl->pl_y, ntohl(packet->x),ntohl(packet->y)); */
     }
     else
@@ -2239,7 +2246,7 @@
 #ifdef CORRUPTED_PACKETS
     if (sock == udpSock)
     {
-        fprintf (stderr, "garbage Reserved packet discarded.\n");
+        LineToConsole ("garbage Reserved packet discarded.\n");
         return;
     }
 #endif
@@ -2263,7 +2270,7 @@
         response.type = CP_RESERVED;
 
 #ifdef DEBUG
-        printf ("Sending RSA reserved response\n");
+        LineToConsole ("Sending RSA reserved response\n");
 #endif
     }
     else
@@ -2358,7 +2365,7 @@
 
     sendServerPacket ((struct player_spacket *) &response);
     /* #ifdef DEBUG */
-    printf ("RSA verification requested.\n");
+    LineToConsole ("RSA verification requested.\n");
     /* #endif */
 }
 
@@ -2374,7 +2381,7 @@
 #ifdef CORRUPTED_PACKETS
     if (packet->pnum >= MAXPLAYER)
     {
-        fprintf (stderr, "handleScan: bad index\n");
+        LineToConsole ("handleScan: bad index\n");
         return;
     }
 #endif
@@ -2622,8 +2629,8 @@
         UDPDIAG (("Received UDP verification\n"));
         break;
     default:
-        fprintf (stderr, "netrek: Got funny reply (%d) in UDP_REPLY packet\n",
-                 packet->reply);
+        LineToConsole ("netrek: Got funny reply (%d) in UDP_REPLY packet\n",
+                         packet->reply);
         break;
     }
 }
@@ -2637,7 +2644,7 @@
 
     if (udpSock >= 0)
     {
-        fprintf (stderr, "netrek: tried to open udpSock twice\n");
+        LineToConsole ("netrek: tried to open udpSock twice\n");
         return (0);             /* pretend we succeeded
                                  * (this could be bad) */
     }
@@ -2708,7 +2715,7 @@
         {
             if ((hp = gethostbyname (serverName)) == NULL)
             {
-                printf ("Who is %s?\n", serverName);
+                LineToConsole ("Who is %s?\n", serverName);
                 terminate (0);
             }
             else
@@ -2735,7 +2742,7 @@
               udpServerPort));
     if (connect (udpSock, (const struct sockaddr *) &addr, sizeof (addr)) < 0)
     {
-        fprintf (stderr, "Error %d: ");
+        LineToConsole ("Error %d: ", WSAGetLastError ());
         perror ("netrek: unable to connect UDP socket");
         printUdpInfo ();        /* debug */
         return (-1);
@@ -2828,7 +2835,7 @@
     V_UDPDIAG (("Closing UDP socket\n"));
     if (udpSock < 0)
     {
-        fprintf (stderr, "netrek: tried to close a closed UDP socket\n");
+        LineToConsole ("netrek: tried to close a closed UDP socket\n");
         return (-1);
     }
     shutdown (udpSock, 2);
@@ -2880,7 +2887,7 @@
             udprefresh (UDP_DROPPED);
 
     newseq = (LONG) ntohs (packet->sequence);
-    /* printf("read %d - ", newseq); */
+    /* LineToConsole ("read %d - ", newseq); */
 
     if (((unsigned short) sequence) > 65000 &&
         ((unsigned short) newseq) < 1000)
@@ -2957,7 +2964,7 @@
             drop_flag = 1;
         }
     }
-    /* printf("newseq %d, sequence %d\n", newseq, sequence); */
+    /* LineToConsole ("newseq %d, sequence %d\n", newseq, sequence); */
     if (recent_count > UDP_RECENT_INTR)
     {
         /* once a minute (at 5 upd/sec), report on how many were dropped */
@@ -2999,7 +3006,7 @@
 
     if (type <= 0 && type > NUM_PACKETS)
     {
-        fprintf (stderr, "Attempted to log a bad packet? \n");
+        LineToConsole ("Attempted to log a bad packet? \n");
         return;
     }
     packet_log[type]++;
@@ -3016,8 +3023,8 @@
         lasttime = this_sec;
         if (log_packets > 1)
         {
-            fprintf (stdout, "%d %d %d\n", this_sec - Start_Time,
-                     data_this_sec, outdata_this_sec);
+            LineToConsole ("%d %d %d\n", this_sec - Start_Time,
+                          data_this_sec, outdata_this_sec);
         }
         if (Start_Time == 0)
         {
@@ -3069,19 +3076,19 @@
 
     Now = time (NULL);
 
-    printf ("Packet Logging Summary:\n");
-    printf ("Start time: %s ", ctime (&Start_Time));
-    printf (" End time: %s Elapsed play time: %3.2f min\n",
-            ctime (&Now), (float) ((Now - Start_Time) / 60));
-    printf ("Maximum CPS in during normal play: %d bytes per sec\n", Max_CPS);
-    printf ("Standard deviation in: %d\n",
-            (int) sqrt ((numpl * s2 - sumpl * sumpl) /
-                        (numpl * (numpl - 1))));
-    printf ("Maximum CPS out during normal play: %d bytes per sec\n",
-            Max_CPSout);
-    printf ("Standard deviation out: %d\n",
-            (int) sqrt ((numpl * sout2 - sumout * sumout) /
-                        (numpl * (numpl - 1))));
+    LineToConsole ("Packet Logging Summary:\n");
+    LineToConsole ("Start time: %s ", ctime (&Start_Time));
+    LineToConsole (" End time: %s Elapsed play time: %3.2f min\n",
+                    ctime (&Now), (float) ((Now - Start_Time) / 60));
+    LineToConsole ("Maximum CPS in during normal play: %d bytes per sec\n", Max_CPS);
+    LineToConsole ("Standard deviation in: %d\n",
+                    (int) sqrt ((numpl * s2 - sumpl * sumpl) /
+                    (numpl * (numpl - 1))));
+    LineToConsole ("Maximum CPS out during normal play: %d bytes per sec\n",
+                    Max_CPSout);
+    LineToConsole ("Standard deviation out: %d\n",
+                    (int) sqrt ((numpl * sout2 - sumout * sumout) /
+                    (numpl * (numpl - 1))));
 
 #ifdef SHORT_PACKETS
     /* total_bytes = ALL_BYTES; *//* Hope this works  HW */
@@ -3113,10 +3120,10 @@
 #endif
     }
 
-    printf ("Total bytes received %d, average CPS: %4.1f\n",
-            total_bytes, (float) (total_bytes / (Now - Start_Time)));
-    printf ("Server Packets Summary:\n");
-    printf ("Num #Rcvd    Size   TotlBytes   %%Total\n");
+    LineToConsole ("Total bytes received %d, average CPS: %4.1f\n",
+                    total_bytes, (float) (total_bytes / (Now - Start_Time)));
+    LineToConsole ("Server Packets Summary:\n");
+    LineToConsole ("Num #Rcvd    Size   TotlBytes   %%Total\n");
     for (i = 0; i <= NUM_PACKETS; i++)
     {
 
@@ -3126,20 +3133,20 @@
         else
             calc_temp = vari_sizes[i];
 
-        printf ("%3d %5d    %4d   %9d   %3.2f\n",
-                i, packet_log[i], handlers[i].size, calc_temp,
-                (float) (calc_temp * 100 / total_bytes));
+        LineToConsole ("%3d %5d    %4d   %9d   %3.2f\n",
+                        i, packet_log[i], handlers[i].size, calc_temp,
+                        (float) (calc_temp * 100 / total_bytes));
 #else
         calc_temp = handlers[i].size * packet_log[i];
-        printf ("%3d %5d    %4d   %9d   %3.2f\n",
-                i, packet_log[i], handlers[i].size, calc_temp,
-                (float) (calc_temp * 100 / total_bytes));
+        LineToConsole ("%3d %5d    %4d   %9d   %3.2f\n",
+                        i, packet_log[i], handlers[i].size, calc_temp,
+                        (float) (calc_temp * 100 / total_bytes));
 #endif
     }
-    printf ("Total bytes sent %d, average CPS: %4.1f\n",
-            outtotal_bytes, (float) (outtotal_bytes / (Now - Start_Time)));
-    printf ("Client Packets Summary:\n");
-    printf ("Num #Sent    Size   TotlBytes   %%Total\n");
+    LineToConsole ("Total bytes sent %d, average CPS: %4.1f\n",
+                    outtotal_bytes, (float) (outtotal_bytes / (Now - Start_Time)));
+    LineToConsole ("Client Packets Summary:\n");
+    LineToConsole ("Num #Sent    Size   TotlBytes   %%Total\n");
     for (i = 0; i <= NUM_SIZES; i++)
     {
 
@@ -3148,15 +3155,15 @@
             calc_temp = cp_msg_size;
         else
             calc_temp = sizes[i] * outpacket_log[i];
-        printf ("%3d %5d    %4d   %9d   %3.2f\n",
-                i, outpacket_log[i], sizes[i], calc_temp,
-                (float) (calc_temp * 100 / outtotal_bytes));
+        LineToConsole ("%3d %5d    %4d   %9d   %3.2f\n",
+                        i, outpacket_log[i], sizes[i], calc_temp,
+                        (float) (calc_temp * 100 / outtotal_bytes));
     }
 #else
         calc_temp = sizes[i] * outpacket_log[i];
-        printf ("%3d %5d    %4d   %9d   %3.2f\n",
-                i, outpacket_log[i], sizes[i], calc_temp,
-                (float) (calc_temp * 100 / outtotal_bytes));
+        LineToConsole ("%3d %5d    %4d   %9d   %3.2f\n",
+                        i, outpacket_log[i], sizes[i], calc_temp,
+                        (float) (calc_temp * 100 / outtotal_bytes));
     }
 #endif
 }



From modemhero at users.sourceforge.net  Fri Apr 21 07:03:25 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 12:03:25 +0000
Subject: [netrek-cvs] client/netrekxp/src console.c, NONE, 1.1 richedit.c,
	NONE, 1.1
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4463/src

Added Files:
	console.c richedit.c 
Log Message:
2 new source files with version 4.4.0.4

--- NEW FILE: richedit.c ---
/******************************************************************************/
/***  File:  richedit.c
/******************************************************************************/

/* WINVER and _WIN32_WINNT are for wheel mouse and 5 mouse button support */
#ifndef WINVER
#define WINVER 0x5000
#endif
#define _WIN32_WINNT 0x0500

#include 
#include 
#include             // Had to include to support wheel mouse
#include 
#include 
#include 
#include 

#include "copyright2.h"
#include "config.h"
#include "Wlib.h"
#include "defs.h"
#include "struct.h"
#include "data.h"
#include "xclrs.h"
#include "cursors.h"
#include "proto.h"
#include "resource.h"



--- NEW FILE: console.c ---
/******************************************************************************/
/***  File:  console.c                                                      ***/
/***                                                                        ***/
/***  Function: set of functions to manupulate text output to console       ***/
/***            window                                                      ***/
/******************************************************************************/

#include 
#include 
#include 
#include 
#include 
#include 
#include 

#include "config.h"
#include "Wlib.h"
#include "defs.h"
#include "struct.h"
#include "data.h"
#include "proto.h"

/******************************************************************************/
/***  IsConsoleVisible ()                                                   ***/
/******************************************************************************/
int
IsConsoleVisible (void)
{
    char ConsoleTitle[256];
    return GetConsoleTitle (ConsoleTitle, sizeof (ConsoleTitle));
}

/******************************************************************************/
/***  ShowConsole ()                                                        ***/
/******************************************************************************/
void
ShowConsole (void)
{
    if (IsConsoleVisible ())
        return;

    /* If the console is not visible it means that we freed it, so we'll have
       to allocate it once again and write everything there */
    AllocConsole ();

    BufferToConsole ();
}

/******************************************************************************/
/***  LineToConsole ()                                                      ***/
/******************************************************************************/
void
LineToConsole (char * format, ...)
{
    struct cons_buffer * tmp;     // temporary pointer to our linked list;
    char str[256];
    DWORD numChars;
    va_list args;

    va_start (args, format);
    vsprintf (str, format, args);
    va_end (args);
    
    /* First of all let's put the string into our linked list */
    tmp = consTail;
    if (tmp == NULL)
    {
        consHead = (struct cons_buffer *) malloc (sizeof (struct cons_buffer));
        consTail = consHead;
        consHead->string = (char *) malloc (sizeof (char) * strlen (str) + 1);
        consHead->next = NULL;

        strcpy (consHead->string, str);
    }
    else
    {
    	tmp = (struct cons_buffer *) malloc (sizeof (struct cons_buffer));
        consTail = consTail->next;
        consTail = tmp;
        consTail->string = (char *) malloc (sizeof (char) * strlen (str) + 1);
        consTail->next = NULL;

        strcpy (consTail->string, str);
    }

    /* Now if console is visible we can also output the string to the console */
    if (IsConsoleVisible ())
        WriteConsole (GetStdHandle (STD_OUTPUT_HANDLE), str, strlen (str), &numChars, NULL);
}

/******************************************************************************/
/***  BufferToConsole ()                                                    ***/
/******************************************************************************/
void
BufferToConsole (void)
{
    struct cons_buffer * tmp;
    DWORD numChars;

    if (!IsConsoleVisible ())
        return;

    tmp = consHead;

    while (tmp)
    {
        WriteConsole (GetStdHandle (STD_OUTPUT_HANDLE), tmp->string, strlen (tmp->string), 
                      &numChars, NULL);
        tmp = tmp->next;
    }
}


From modemhero at users.sourceforge.net  Fri Apr 21 07:30:25 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 12:30:25 +0000
Subject: [netrek-cvs] client/netrekxp/src data.c,1.7,1.8 option.c,1.6,1.7
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19327/src

Modified Files:
	data.c option.c 
Log Message:
Beeplite/deflite default to on.  Renamed options menu to be less confusing.

Index: option.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- option.c	21 Apr 2006 12:00:07 -0000	1.6
+++ option.c	21 Apr 2006 12:30:22 -0000	1.7
@@ -352,7 +352,7 @@
     {1, "", &timerType, 0, 0, 0, timermess, NULL},
     {1, "keep info %d upds (0=don't remove)", &keepInfo, 0, 0, 0, 0, &keepInfo_range},
 #ifdef BEEPLITE
-    {1, "use RCD highlighting", &useLite, 0, 0, 0, NULL, NULL},
+    {1, "use beeplite", &useLite, 0, 0, 0, NULL, NULL},
 #endif
     {1, "omit team letter on map", &omitTeamLetter, 0, 0, 0, NULL, NULL},
     {1, "draw view box on map", &viewBox, 0, 0, 0, NULL, NULL},

Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- data.c	21 Apr 2006 12:00:06 -0000	1.7
+++ data.c	21 Apr 2006 12:30:22 -0000	1.8
@@ -464,8 +464,8 @@
   NULL, NULL, NULL, NULL, NULL, NULL, NULL
 };
 
-int     defLite = 0;
-int     useLite = 0;
+int     defLite = 1;
+int     useLite = 1;
 
 int     emph_planet_seq_n[MAXPLANETS] =
 {0,};



From modemhero at users.sourceforge.net  Fri Apr 21 07:30:24 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 12:30:24 +0000
Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.14,1.15
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19327/resources/docs

Modified Files:
	changes.txt 
Log Message:
Beeplite/deflite default to on.  Renamed options menu to be less confusing.

Index: changes.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- changes.txt	21 Apr 2006 11:35:02 -0000	1.14
+++ changes.txt	21 Apr 2006 12:30:22 -0000	1.15
@@ -4,7 +4,7 @@
 - Keeppeace default is now "on".
 - rewrote find bitmap routine in a smarter way (thanks Quozl)
 - fixed bccnetrek.rc to have proper header so icon works
-- tidied up the save_options function, fixing some spacing errors, and puttting the
+- tidied up the save_options function, fixing some spacing errors, and putting the
   keymap/buttonmap on the top of the list due to its importance.  Also added the
   sounddir option.
 - fixed mainResizeable loading from rc/saving.  Also made default setting = on.
@@ -16,6 +16,7 @@
   Basic rc options are useLite: on/off to turn beeplite on and off, and defLite: on/off
   to use the default settings.  The beeplite option is highly configurable, see manual
   for details.  Can also be turned on via "Use RCD highlighting" on the Visual Menu.
+  Default is "on" for both useLite and defLite;
 - added preventative measures against loading bitmap files that might not exist - if
   bitmaps are missing, it defaults to the mono bitmaps
 - if dynamicBitmap is set to off, only the necessary bitmap files will load into



From modemhero at users.sourceforge.net  Fri Apr 21 11:30:07 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:30:07 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/grayscale/kli - New
	directory
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/grayscale/kli
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27630/kli

Log Message:
Directory /cvsroot/netrek/client/netrekxp/resources/ships/grayscale/kli added to the repository




From modemhero at users.sourceforge.net  Fri Apr 21 11:30:07 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:30:07 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/grayscale/fed - New
	directory
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/grayscale/fed
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27630/fed

Log Message:
Directory /cvsroot/netrek/client/netrekxp/resources/ships/grayscale/fed added to the repository




From modemhero at users.sourceforge.net  Fri Apr 21 11:30:07 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:30:07 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/grayscale/ori - New
	directory
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/grayscale/ori
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27630/ori

Log Message:
Directory /cvsroot/netrek/client/netrekxp/resources/ships/grayscale/ori added to the repository




From modemhero at users.sourceforge.net  Fri Apr 21 11:29:43 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:29:43 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/tinted - New directory
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/tinted
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27392/tinted

Log Message:
Directory /cvsroot/netrek/client/netrekxp/resources/ships/tinted added to the repository




From modemhero at users.sourceforge.net  Fri Apr 21 11:29:43 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:29:43 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/grayscale - New
	directory
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/grayscale
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27392/grayscale

Log Message:
Directory /cvsroot/netrek/client/netrekxp/resources/ships/grayscale added to the repository




From modemhero at users.sourceforge.net  Fri Apr 21 11:30:39 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:30:39 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/tinted/ori - New
	directory
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/tinted/ori
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28078/ori

Log Message:
Directory /cvsroot/netrek/client/netrekxp/resources/ships/tinted/ori added to the repository




From modemhero at users.sourceforge.net  Fri Apr 21 11:30:39 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:30:39 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/tinted/ind - New
	directory
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/tinted/ind
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28078/ind

Log Message:
Directory /cvsroot/netrek/client/netrekxp/resources/ships/tinted/ind added to the repository




From modemhero at users.sourceforge.net  Fri Apr 21 11:30:39 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:30:39 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/tinted/fed - New
	directory
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/tinted/fed
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28078/fed

Log Message:
Directory /cvsroot/netrek/client/netrekxp/resources/ships/tinted/fed added to the repository




From modemhero at users.sourceforge.net  Fri Apr 21 11:30:39 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:30:39 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/tinted/rom - New
	directory
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/tinted/rom
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28078/rom

Log Message:
Directory /cvsroot/netrek/client/netrekxp/resources/ships/tinted/rom added to the repository




From modemhero at users.sourceforge.net  Fri Apr 21 11:30:39 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:30:39 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/tinted/kli - New
	directory
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/tinted/kli
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28078/kli

Log Message:
Directory /cvsroot/netrek/client/netrekxp/resources/ships/tinted/kli added to the repository




From modemhero at users.sourceforge.net  Fri Apr 21 11:30:07 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:30:07 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/grayscale/rom - New
	directory
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/grayscale/rom
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27630/rom

Log Message:
Directory /cvsroot/netrek/client/netrekxp/resources/ships/grayscale/rom added to the repository




From modemhero at users.sourceforge.net  Fri Apr 21 11:30:07 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:30:07 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/grayscale/ind - New
	directory
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/grayscale/ind
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27630/ind

Log Message:
Directory /cvsroot/netrek/client/netrekxp/resources/ships/grayscale/ind added to the repository




From modemhero at users.sourceforge.net  Fri Apr 21 11:36:12 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:36:12 +0000
Subject: [netrek-cvs] client/netrekxp build.cmd,1.5,1.6
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31443

Modified Files:
	build.cmd 
Log Message:
Addition of greyscale and shaded old color full bitmaps to repository.  Along the way, fixed all the base bitmaps so they rotate.

Index: build.cmd
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/build.cmd,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- build.cmd	16 Apr 2006 07:58:37 -0000	1.5
+++ build.cmd	21 Apr 2006 16:36:09 -0000	1.6
@@ -193,6 +193,129 @@
 %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 1x32 rom_sc01.bmp rom_sc02.bmp rom_sc03.bmp rom_sc04.bmp rom_sc05.bmp rom_sc06.bmp rom_sc07.bmp rom_sc08.bmp rom_sc09.bmp rom_sc10.bmp rom_sc11.bmp rom_sc12.bmp rom_sc13.bmp rom_sc14.bmp rom_sc15.bmp rom_sc16.bmp rom_sc17.bmp rom_sc18.bmp rom_sc19.bmp rom_sc20.bmp rom_sc21.bmp rom_sc22.bmp rom_sc23.bmp rom_sc24.bmp rom_sc25.bmp rom_sc26.bmp rom_sc27.bmp rom_sc28.bmp rom_sc29.bmp rom_sc30.bmp rom_sc31.bmp rom_sc32.bmp rom_sc.bmp
 %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 8x1 rom_sc.bmp rom_dd.bmp rom_ca.bmp rom_bb.bmp rom_as.bmp  rom_sb.bmp   rom_ga.bmp  rom_at.bmp romshipM.bmp
 popd
+
+pushd resources\ships\tinted\fed
+echo Making resources\ships\tinted\fed...
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 fed_as01.bmp fed_as02.bmp fed_as03.bmp fed_as04.bmp fed_as05.bmp fed_as06.bmp fed_as07.bmp fed_as08.bmp fed_as09.bmp fed_as10.bmp fed_as11.bmp fed_as12.bmp fed_as13.bmp fed_as14.bmp fed_as15.bmp fed_as16.bmp fed_as17.bmp fed_as18.bmp fed_as19.bmp fed_as20.bmp fed_as21.bmp fed_as22.bmp fed_as23.bmp fed_as24.bmp fed_as25.bmp fed_as26.bmp fed_as27.bmp fed_as28.bmp fed_as29.bmp fed_as30.bmp fed_as31.bmp fed_as32.bmp fed_as.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 fed_at01.bmp fed_at02.bmp fed_at03.bmp fed_at04.bmp fed_at05.bmp fed_at06.bmp fed_at07.bmp fed_at08.bmp fed_at09.bmp fed_at10.bmp fed_at11.bmp fed_at12.bmp fed_at13.bmp fed_at14.bmp fed_at15.bmp fed_at16.bmp fed_at17.bmp fed_at18.bmp fed_at19.bmp fed_at20.bmp fed_at21.bmp fed_at22.bmp fed_at23.bmp fed_at24.bmp fed_at25.bmp fed_at26.bmp fed_at27.bmp fed_at28.bmp fed_at29.bmp fed_at30.bmp fed_at31.bmp fed_at32.bmp fed_at.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 fed_bb01.bmp fed_bb02.bmp fed_bb03.bmp fed_bb04.bmp fed_bb05.bmp fed_bb06.bmp fed_bb07.bmp fed_bb08.bmp fed_bb09.bmp fed_bb10.bmp fed_bb11.bmp fed_bb12.bmp fed_bb13.bmp fed_bb14.bmp fed_bb15.bmp fed_bb16.bmp fed_bb17.bmp fed_bb18.bmp fed_bb19.bmp fed_bb20.bmp fed_bb21.bmp fed_bb22.bmp fed_bb23.bmp fed_bb24.bmp fed_bb25.bmp fed_bb26.bmp fed_bb27.bmp fed_bb28.bmp fed_bb29.bmp fed_bb30.bmp fed_bb31.bmp fed_bb32.bmp fed_bb.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 fed_ca01.bmp fed_ca02.bmp fed_ca03.bmp fed_ca04.bmp fed_ca05.bmp fed_ca06.bmp fed_ca07.bmp fed_ca08.bmp fed_ca09.bmp fed_ca10.bmp fed_ca11.bmp fed_ca12.bmp fed_ca13.bmp fed_ca14.bmp fed_ca15.bmp fed_ca16.bmp fed_ca17.bmp fed_ca18.bmp fed_ca19.bmp fed_ca20.bmp fed_ca21.bmp fed_ca22.bmp fed_ca23.bmp fed_ca24.bmp fed_ca25.bmp fed_ca26.bmp fed_ca27.bmp fed_ca28.bmp fed_ca29.bmp fed_ca30.bmp fed_ca31.bmp fed_ca32.bmp fed_ca.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 fed_dd01.bmp fed_dd02.bmp fed_dd03.bmp fed_dd04.bmp fed_dd05.bmp fed_dd06.bmp fed_dd07.bmp fed_dd08.bmp fed_dd09.bmp fed_dd10.bmp fed_dd11.bmp fed_dd12.bmp fed_dd13.bmp fed_dd14.bmp fed_dd15.bmp fed_dd16.bmp fed_dd17.bmp fed_dd18.bmp fed_dd19.bmp fed_dd20.bmp fed_dd21.bmp fed_dd22.bmp fed_dd23.bmp fed_dd24.bmp fed_dd25.bmp fed_dd26.bmp fed_dd27.bmp fed_dd28.bmp fed_dd29.bmp fed_dd30.bmp fed_dd31.bmp fed_dd32.bmp fed_dd.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 fed_ga01.bmp fed_ga02.bmp fed_ga03.bmp fed_ga04.bmp fed_ga05.bmp fed_ga06.bmp fed_ga07.bmp fed_ga08.bmp fed_ga09.bmp fed_ga10.bmp fed_ga11.bmp fed_ga12.bmp fed_ga13.bmp fed_ga14.bmp fed_ga15.bmp fed_ga16.bmp fed_ga17.bmp fed_ga18.bmp fed_ga19.bmp fed_ga20.bmp fed_ga21.bmp fed_ga22.bmp fed_ga23.bmp fed_ga24.bmp fed_ga25.bmp fed_ga26.bmp fed_ga27.bmp fed_ga28.bmp fed_ga29.bmp fed_ga30.bmp fed_ga31.bmp fed_ga32.bmp fed_ga.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 fed_sb01.bmp fed_sb02.bmp fed_sb03.bmp fed_sb04.bmp fed_sb05.bmp fed_sb06.bmp fed_sb07.bmp fed_sb08.bmp fed_sb09.bmp fed_sb10.bmp fed_sb11.bmp fed_sb12.bmp fed_sb13.bmp fed_sb14.bmp fed_sb15.bmp fed_sb16.bmp fed_sb17.bmp fed_sb18.bmp fed_sb19.bmp fed_sb20.bmp fed_sb21.bmp fed_sb22.bmp fed_sb23.bmp fed_sb24.bmp fed_sb25.bmp fed_sb26.bmp fed_sb27.bmp fed_sb28.bmp fed_sb29.bmp fed_sb30.bmp fed_sb31.bmp fed_sb32.bmp fed_sb.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 fed_sc01.bmp fed_sc02.bmp fed_sc03.bmp fed_sc04.bmp fed_sc05.bmp fed_sc06.bmp fed_sc07.bmp fed_sc08.bmp fed_sc09.bmp fed_sc10.bmp fed_sc11.bmp fed_sc12.bmp fed_sc13.bmp fed_sc14.bmp fed_sc15.bmp fed_sc16.bmp fed_sc17.bmp fed_sc18.bmp fed_sc19.bmp fed_sc20.bmp fed_sc21.bmp fed_sc22.bmp fed_sc23.bmp fed_sc24.bmp fed_sc25.bmp fed_sc26.bmp fed_sc27.bmp fed_sc28.bmp fed_sc29.bmp fed_sc30.bmp fed_sc31.bmp fed_sc32.bmp fed_sc.bmp
+%MyCWD%\tools\imagemagick\montage -colors 256 -mode concatenate -tile 8x1 fed_sc.bmp fed_dd.bmp fed_ca.bmp fed_bb.bmp fed_as.bmp  fed_sb.bmp   fed_ga.bmp  fed_at.bmp fedshipT.bmp
+popd
+pushd resources\ships\tinted\ind
+echo Making resources\ships\tinted\ind...
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ind_as01.bmp ind_as02.bmp ind_as03.bmp ind_as04.bmp ind_as05.bmp ind_as06.bmp ind_as07.bmp ind_as08.bmp ind_as09.bmp ind_as10.bmp ind_as11.bmp ind_as12.bmp ind_as13.bmp ind_as14.bmp ind_as15.bmp ind_as16.bmp ind_as17.bmp ind_as18.bmp ind_as19.bmp ind_as20.bmp ind_as21.bmp ind_as22.bmp ind_as23.bmp ind_as24.bmp ind_as25.bmp ind_as26.bmp ind_as27.bmp ind_as28.bmp ind_as29.bmp ind_as30.bmp ind_as31.bmp ind_as32.bmp ind_as.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ind_at01.bmp ind_at02.bmp ind_at03.bmp ind_at04.bmp ind_at05.bmp ind_at06.bmp ind_at07.bmp ind_at08.bmp ind_at09.bmp ind_at10.bmp ind_at11.bmp ind_at12.bmp ind_at13.bmp ind_at14.bmp ind_at15.bmp ind_at16.bmp ind_at17.bmp ind_at18.bmp ind_at19.bmp ind_at20.bmp ind_at21.bmp ind_at22.bmp ind_at23.bmp ind_at24.bmp ind_at25.bmp ind_at26.bmp ind_at27.bmp ind_at28.bmp ind_at29.bmp ind_at30.bmp ind_at31.bmp ind_at32.bmp ind_at.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ind_bb01.bmp ind_bb02.bmp ind_bb03.bmp ind_bb04.bmp ind_bb05.bmp ind_bb06.bmp ind_bb07.bmp ind_bb08.bmp ind_bb09.bmp ind_bb10.bmp ind_bb11.bmp ind_bb12.bmp ind_bb13.bmp ind_bb14.bmp ind_bb15.bmp ind_bb16.bmp ind_bb17.bmp ind_bb18.bmp ind_bb19.bmp ind_bb20.bmp ind_bb21.bmp ind_bb22.bmp ind_bb23.bmp ind_bb24.bmp ind_bb25.bmp ind_bb26.bmp ind_bb27.bmp ind_bb28.bmp ind_bb29.bmp ind_bb30.bmp ind_bb31.bmp ind_bb32.bmp ind_bb.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ind_ca01.bmp ind_ca02.bmp ind_ca03.bmp ind_ca04.bmp ind_ca05.bmp ind_ca06.bmp ind_ca07.bmp ind_ca08.bmp ind_ca09.bmp ind_ca10.bmp ind_ca11.bmp ind_ca12.bmp ind_ca13.bmp ind_ca14.bmp ind_ca15.bmp ind_ca16.bmp ind_ca17.bmp ind_ca18.bmp ind_ca19.bmp ind_ca20.bmp ind_ca21.bmp ind_ca22.bmp ind_ca23.bmp ind_ca24.bmp ind_ca25.bmp ind_ca26.bmp ind_ca27.bmp ind_ca28.bmp ind_ca29.bmp ind_ca30.bmp ind_ca31.bmp ind_ca32.bmp ind_ca.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ind_dd01.bmp ind_dd02.bmp ind_dd03.bmp ind_dd04.bmp ind_dd05.bmp ind_dd06.bmp ind_dd07.bmp ind_dd08.bmp ind_dd09.bmp ind_dd10.bmp ind_dd11.bmp ind_dd12.bmp ind_dd13.bmp ind_dd14.bmp ind_dd15.bmp ind_dd16.bmp ind_dd17.bmp ind_dd18.bmp ind_dd19.bmp ind_dd20.bmp ind_dd21.bmp ind_dd22.bmp ind_dd23.bmp ind_dd24.bmp ind_dd25.bmp ind_dd26.bmp ind_dd27.bmp ind_dd28.bmp ind_dd29.bmp ind_dd30.bmp ind_dd31.bmp ind_dd32.bmp ind_dd.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ind_ga01.bmp ind_ga02.bmp ind_ga03.bmp ind_ga04.bmp ind_ga05.bmp ind_ga06.bmp ind_ga07.bmp ind_ga08.bmp ind_ga09.bmp ind_ga10.bmp ind_ga11.bmp ind_ga12.bmp ind_ga13.bmp ind_ga14.bmp ind_ga15.bmp ind_ga16.bmp ind_ga17.bmp ind_ga18.bmp ind_ga19.bmp ind_ga20.bmp ind_ga21.bmp ind_ga22.bmp ind_ga23.bmp ind_ga24.bmp ind_ga25.bmp ind_ga26.bmp ind_ga27.bmp ind_ga28.bmp ind_ga29.bmp ind_ga30.bmp ind_ga31.bmp ind_ga32.bmp ind_ga.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ind_sb01.bmp ind_sb02.bmp ind_sb03.bmp ind_sb04.bmp ind_sb05.bmp ind_sb06.bmp ind_sb07.bmp ind_sb08.bmp ind_sb09.bmp ind_sb10.bmp ind_sb11.bmp ind_sb12.bmp ind_sb13.bmp ind_sb14.bmp ind_sb15.bmp ind_sb16.bmp ind_sb17.bmp ind_sb18.bmp ind_sb19.bmp ind_sb20.bmp ind_sb21.bmp ind_sb22.bmp ind_sb23.bmp ind_sb24.bmp ind_sb25.bmp ind_sb26.bmp ind_sb27.bmp ind_sb28.bmp ind_sb29.bmp ind_sb30.bmp ind_sb31.bmp ind_sb32.bmp ind_sb.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ind_sc01.bmp ind_sc02.bmp ind_sc03.bmp ind_sc04.bmp ind_sc05.bmp ind_sc06.bmp ind_sc07.bmp ind_sc08.bmp ind_sc09.bmp ind_sc10.bmp ind_sc11.bmp ind_sc12.bmp ind_sc13.bmp ind_sc14.bmp ind_sc15.bmp ind_sc16.bmp ind_sc17.bmp ind_sc18.bmp ind_sc19.bmp ind_sc20.bmp ind_sc21.bmp ind_sc22.bmp ind_sc23.bmp ind_sc24.bmp ind_sc25.bmp ind_sc26.bmp ind_sc27.bmp ind_sc28.bmp ind_sc29.bmp ind_sc30.bmp ind_sc31.bmp ind_sc32.bmp ind_sc.bmp
+%MyCWD%\tools\imagemagick\montage -colors 256 -mode concatenate -tile 8x1 ind_sc.bmp ind_dd.bmp ind_ca.bmp ind_bb.bmp ind_as.bmp  ind_sb.bmp   ind_ga.bmp  ind_at.bmp indshipT.bmp
+popd
+pushd resources\ships\tinted\kli
+echo Making resources\ships\tinted\kli...
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 kli_as01.bmp kli_as02.bmp kli_as03.bmp kli_as04.bmp kli_as05.bmp kli_as06.bmp kli_as07.bmp kli_as08.bmp kli_as09.bmp kli_as10.bmp kli_as11.bmp kli_as12.bmp kli_as13.bmp kli_as14.bmp kli_as15.bmp kli_as16.bmp kli_as17.bmp kli_as18.bmp kli_as19.bmp kli_as20.bmp kli_as21.bmp kli_as22.bmp kli_as23.bmp kli_as24.bmp kli_as25.bmp kli_as26.bmp kli_as27.bmp kli_as28.bmp kli_as29.bmp kli_as30.bmp kli_as31.bmp kli_as32.bmp kli_as.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 kli_at01.bmp kli_at02.bmp kli_at03.bmp kli_at04.bmp kli_at05.bmp kli_at06.bmp kli_at07.bmp kli_at08.bmp kli_at09.bmp kli_at10.bmp kli_at11.bmp kli_at12.bmp kli_at13.bmp kli_at14.bmp kli_at15.bmp kli_at16.bmp kli_at17.bmp kli_at18.bmp kli_at19.bmp kli_at20.bmp kli_at21.bmp kli_at22.bmp kli_at23.bmp kli_at24.bmp kli_at25.bmp kli_at26.bmp kli_at27.bmp kli_at28.bmp kli_at29.bmp kli_at30.bmp kli_at31.bmp kli_at32.bmp kli_at.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 kli_bb01.bmp kli_bb02.bmp kli_bb03.bmp kli_bb04.bmp kli_bb05.bmp kli_bb06.bmp kli_bb07.bmp kli_bb08.bmp kli_bb09.bmp kli_bb10.bmp kli_bb11.bmp kli_bb12.bmp kli_bb13.bmp kli_bb14.bmp kli_bb15.bmp kli_bb16.bmp kli_bb17.bmp kli_bb18.bmp kli_bb19.bmp kli_bb20.bmp kli_bb21.bmp kli_bb22.bmp kli_bb23.bmp kli_bb24.bmp kli_bb25.bmp kli_bb26.bmp kli_bb27.bmp kli_bb28.bmp kli_bb29.bmp kli_bb30.bmp kli_bb31.bmp kli_bb32.bmp kli_bb.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 kli_ca01.bmp kli_ca02.bmp kli_ca03.bmp kli_ca04.bmp kli_ca05.bmp kli_ca06.bmp kli_ca07.bmp kli_ca08.bmp kli_ca09.bmp kli_ca10.bmp kli_ca11.bmp kli_ca12.bmp kli_ca13.bmp kli_ca14.bmp kli_ca15.bmp kli_ca16.bmp kli_ca17.bmp kli_ca18.bmp kli_ca19.bmp kli_ca20.bmp kli_ca21.bmp kli_ca22.bmp kli_ca23.bmp kli_ca24.bmp kli_ca25.bmp kli_ca26.bmp kli_ca27.bmp kli_ca28.bmp kli_ca29.bmp kli_ca30.bmp kli_ca31.bmp kli_ca32.bmp kli_ca.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 kli_dd01.bmp kli_dd02.bmp kli_dd03.bmp kli_dd04.bmp kli_dd05.bmp kli_dd06.bmp kli_dd07.bmp kli_dd08.bmp kli_dd09.bmp kli_dd10.bmp kli_dd11.bmp kli_dd12.bmp kli_dd13.bmp kli_dd14.bmp kli_dd15.bmp kli_dd16.bmp kli_dd17.bmp kli_dd18.bmp kli_dd19.bmp kli_dd20.bmp kli_dd21.bmp kli_dd22.bmp kli_dd23.bmp kli_dd24.bmp kli_dd25.bmp kli_dd26.bmp kli_dd27.bmp kli_dd28.bmp kli_dd29.bmp kli_dd30.bmp kli_dd31.bmp kli_dd32.bmp kli_dd.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 kli_ga01.bmp kli_ga02.bmp kli_ga03.bmp kli_ga04.bmp kli_ga05.bmp kli_ga06.bmp kli_ga07.bmp kli_ga08.bmp kli_ga09.bmp kli_ga10.bmp kli_ga11.bmp kli_ga12.bmp kli_ga13.bmp kli_ga14.bmp kli_ga15.bmp kli_ga16.bmp kli_ga17.bmp kli_ga18.bmp kli_ga19.bmp kli_ga20.bmp kli_ga21.bmp kli_ga22.bmp kli_ga23.bmp kli_ga24.bmp kli_ga25.bmp kli_ga26.bmp kli_ga27.bmp kli_ga28.bmp kli_ga29.bmp kli_ga30.bmp kli_ga31.bmp kli_ga32.bmp kli_ga.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 kli_sb01.bmp kli_sb02.bmp kli_sb03.bmp kli_sb04.bmp kli_sb05.bmp kli_sb06.bmp kli_sb07.bmp kli_sb08.bmp kli_sb09.bmp kli_sb10.bmp kli_sb11.bmp kli_sb12.bmp kli_sb13.bmp kli_sb14.bmp kli_sb15.bmp kli_sb16.bmp kli_sb17.bmp kli_sb18.bmp kli_sb19.bmp kli_sb20.bmp kli_sb21.bmp kli_sb22.bmp kli_sb23.bmp kli_sb24.bmp kli_sb25.bmp kli_sb26.bmp kli_sb27.bmp kli_sb28.bmp kli_sb29.bmp kli_sb30.bmp kli_sb31.bmp kli_sb32.bmp kli_sb.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 kli_sc01.bmp kli_sc02.bmp kli_sc03.bmp kli_sc04.bmp kli_sc05.bmp kli_sc06.bmp kli_sc07.bmp kli_sc08.bmp kli_sc09.bmp kli_sc10.bmp kli_sc11.bmp kli_sc12.bmp kli_sc13.bmp kli_sc14.bmp kli_sc15.bmp kli_sc16.bmp kli_sc17.bmp kli_sc18.bmp kli_sc19.bmp kli_sc20.bmp kli_sc21.bmp kli_sc22.bmp kli_sc23.bmp kli_sc24.bmp kli_sc25.bmp kli_sc26.bmp kli_sc27.bmp kli_sc28.bmp kli_sc29.bmp kli_sc30.bmp kli_sc31.bmp kli_sc32.bmp kli_sc.bmp
+%MyCWD%\tools\imagemagick\montage -colors 256 -mode concatenate -tile 8x1 kli_sc.bmp kli_dd.bmp kli_ca.bmp kli_bb.bmp kli_as.bmp  kli_sb.bmp   kli_ga.bmp  kli_at.bmp klishipT.bmp
+popd
+pushd resources\ships\tinted\ori
+echo Making resources\ships\tinted\ori...
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ori_as01.bmp ori_as02.bmp ori_as03.bmp ori_as04.bmp ori_as05.bmp ori_as06.bmp ori_as07.bmp ori_as08.bmp ori_as09.bmp ori_as10.bmp ori_as11.bmp ori_as12.bmp ori_as13.bmp ori_as14.bmp ori_as15.bmp ori_as16.bmp ori_as17.bmp ori_as18.bmp ori_as19.bmp ori_as20.bmp ori_as21.bmp ori_as22.bmp ori_as23.bmp ori_as24.bmp ori_as25.bmp ori_as26.bmp ori_as27.bmp ori_as28.bmp ori_as29.bmp ori_as30.bmp ori_as31.bmp ori_as32.bmp ori_as.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ori_at01.bmp ori_at02.bmp ori_at03.bmp ori_at04.bmp ori_at05.bmp ori_at06.bmp ori_at07.bmp ori_at08.bmp ori_at09.bmp ori_at10.bmp ori_at11.bmp ori_at12.bmp ori_at13.bmp ori_at14.bmp ori_at15.bmp ori_at16.bmp ori_at17.bmp ori_at18.bmp ori_at19.bmp ori_at20.bmp ori_at21.bmp ori_at22.bmp ori_at23.bmp ori_at24.bmp ori_at25.bmp ori_at26.bmp ori_at27.bmp ori_at28.bmp ori_at29.bmp ori_at30.bmp ori_at31.bmp ori_at32.bmp ori_at.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ori_bb01.bmp ori_bb02.bmp ori_bb03.bmp ori_bb04.bmp ori_bb05.bmp ori_bb06.bmp ori_bb07.bmp ori_bb08.bmp ori_bb09.bmp ori_bb10.bmp ori_bb11.bmp ori_bb12.bmp ori_bb13.bmp ori_bb14.bmp ori_bb15.bmp ori_bb16.bmp ori_bb17.bmp ori_bb18.bmp ori_bb19.bmp ori_bb20.bmp ori_bb21.bmp ori_bb22.bmp ori_bb23.bmp ori_bb24.bmp ori_bb25.bmp ori_bb26.bmp ori_bb27.bmp ori_bb28.bmp ori_bb29.bmp ori_bb30.bmp ori_bb31.bmp ori_bb32.bmp ori_bb.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ori_ca01.bmp ori_ca02.bmp ori_ca03.bmp ori_ca04.bmp ori_ca05.bmp ori_ca06.bmp ori_ca07.bmp ori_ca08.bmp ori_ca09.bmp ori_ca10.bmp ori_ca11.bmp ori_ca12.bmp ori_ca13.bmp ori_ca14.bmp ori_ca15.bmp ori_ca16.bmp ori_ca17.bmp ori_ca18.bmp ori_ca19.bmp ori_ca20.bmp ori_ca21.bmp ori_ca22.bmp ori_ca23.bmp ori_ca24.bmp ori_ca25.bmp ori_ca26.bmp ori_ca27.bmp ori_ca28.bmp ori_ca29.bmp ori_ca30.bmp ori_ca31.bmp ori_ca32.bmp ori_ca.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ori_dd01.bmp ori_dd02.bmp ori_dd03.bmp ori_dd04.bmp ori_dd05.bmp ori_dd06.bmp ori_dd07.bmp ori_dd08.bmp ori_dd09.bmp ori_dd10.bmp ori_dd11.bmp ori_dd12.bmp ori_dd13.bmp ori_dd14.bmp ori_dd15.bmp ori_dd16.bmp ori_dd17.bmp ori_dd18.bmp ori_dd19.bmp ori_dd20.bmp ori_dd21.bmp ori_dd22.bmp ori_dd23.bmp ori_dd24.bmp ori_dd25.bmp ori_dd26.bmp ori_dd27.bmp ori_dd28.bmp ori_dd29.bmp ori_dd30.bmp ori_dd31.bmp ori_dd32.bmp ori_dd.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ori_ga01.bmp ori_ga02.bmp ori_ga03.bmp ori_ga04.bmp ori_ga05.bmp ori_ga06.bmp ori_ga07.bmp ori_ga08.bmp ori_ga09.bmp ori_ga10.bmp ori_ga11.bmp ori_ga12.bmp ori_ga13.bmp ori_ga14.bmp ori_ga15.bmp ori_ga16.bmp ori_ga17.bmp ori_ga18.bmp ori_ga19.bmp ori_ga20.bmp ori_ga21.bmp ori_ga22.bmp ori_ga23.bmp ori_ga24.bmp ori_ga25.bmp ori_ga26.bmp ori_ga27.bmp ori_ga28.bmp ori_ga29.bmp ori_ga30.bmp ori_ga31.bmp ori_ga32.bmp ori_ga.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ori_sb01.bmp ori_sb02.bmp ori_sb03.bmp ori_sb04.bmp ori_sb05.bmp ori_sb06.bmp ori_sb07.bmp ori_sb08.bmp ori_sb09.bmp ori_sb10.bmp ori_sb11.bmp ori_sb12.bmp ori_sb13.bmp ori_sb14.bmp ori_sb15.bmp ori_sb16.bmp ori_sb17.bmp ori_sb18.bmp ori_sb19.bmp ori_sb20.bmp ori_sb21.bmp ori_sb22.bmp ori_sb23.bmp ori_sb24.bmp ori_sb25.bmp ori_sb26.bmp ori_sb27.bmp ori_sb28.bmp ori_sb29.bmp ori_sb30.bmp ori_sb31.bmp ori_sb32.bmp ori_sb.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ori_sc01.bmp ori_sc02.bmp ori_sc03.bmp ori_sc04.bmp ori_sc05.bmp ori_sc06.bmp ori_sc07.bmp ori_sc08.bmp ori_sc09.bmp ori_sc10.bmp ori_sc11.bmp ori_sc12.bmp ori_sc13.bmp ori_sc14.bmp ori_sc15.bmp ori_sc16.bmp ori_sc17.bmp ori_sc18.bmp ori_sc19.bmp ori_sc20.bmp ori_sc21.bmp ori_sc22.bmp ori_sc23.bmp ori_sc24.bmp ori_sc25.bmp ori_sc26.bmp ori_sc27.bmp ori_sc28.bmp ori_sc29.bmp ori_sc30.bmp ori_sc31.bmp ori_sc32.bmp ori_sc.bmp
+%MyCWD%\tools\imagemagick\montage -colors 256 -mode concatenate -tile 8x1 ori_sc.bmp ori_dd.bmp ori_ca.bmp ori_bb.bmp ori_as.bmp  ori_sb.bmp   ori_ga.bmp  ori_at.bmp orishipT.bmp
+popd
+pushd resources\ships\tinted\rom
+echo Making resources\ships\tinted\rom...
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 rom_as01.bmp rom_as02.bmp rom_as03.bmp rom_as04.bmp rom_as05.bmp rom_as06.bmp rom_as07.bmp rom_as08.bmp rom_as09.bmp rom_as10.bmp rom_as11.bmp rom_as12.bmp rom_as13.bmp rom_as14.bmp rom_as15.bmp rom_as16.bmp rom_as17.bmp rom_as18.bmp rom_as19.bmp rom_as20.bmp rom_as21.bmp rom_as22.bmp rom_as23.bmp rom_as24.bmp rom_as25.bmp rom_as26.bmp rom_as27.bmp rom_as28.bmp rom_as29.bmp rom_as30.bmp rom_as31.bmp rom_as32.bmp rom_as.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 rom_at01.bmp rom_at02.bmp rom_at03.bmp rom_at04.bmp rom_at05.bmp rom_at06.bmp rom_at07.bmp rom_at08.bmp rom_at09.bmp rom_at10.bmp rom_at11.bmp rom_at12.bmp rom_at13.bmp rom_at14.bmp rom_at15.bmp rom_at16.bmp rom_at17.bmp rom_at18.bmp rom_at19.bmp rom_at20.bmp rom_at21.bmp rom_at22.bmp rom_at23.bmp rom_at24.bmp rom_at25.bmp rom_at26.bmp rom_at27.bmp rom_at28.bmp rom_at29.bmp rom_at30.bmp rom_at31.bmp rom_at32.bmp rom_at.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 rom_bb01.bmp rom_bb02.bmp rom_bb03.bmp rom_bb04.bmp rom_bb05.bmp rom_bb06.bmp rom_bb07.bmp rom_bb08.bmp rom_bb09.bmp rom_bb10.bmp rom_bb11.bmp rom_bb12.bmp rom_bb13.bmp rom_bb14.bmp rom_bb15.bmp rom_bb16.bmp rom_bb17.bmp rom_bb18.bmp rom_bb19.bmp rom_bb20.bmp rom_bb21.bmp rom_bb22.bmp rom_bb23.bmp rom_bb24.bmp rom_bb25.bmp rom_bb26.bmp rom_bb27.bmp rom_bb28.bmp rom_bb29.bmp rom_bb30.bmp rom_bb31.bmp rom_bb32.bmp rom_bb.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 rom_ca01.bmp rom_ca02.bmp rom_ca03.bmp rom_ca04.bmp rom_ca05.bmp rom_ca06.bmp rom_ca07.bmp rom_ca08.bmp rom_ca09.bmp rom_ca10.bmp rom_ca11.bmp rom_ca12.bmp rom_ca13.bmp rom_ca14.bmp rom_ca15.bmp rom_ca16.bmp rom_ca17.bmp rom_ca18.bmp rom_ca19.bmp rom_ca20.bmp rom_ca21.bmp rom_ca22.bmp rom_ca23.bmp rom_ca24.bmp rom_ca25.bmp rom_ca26.bmp rom_ca27.bmp rom_ca28.bmp rom_ca29.bmp rom_ca30.bmp rom_ca31.bmp rom_ca32.bmp rom_ca.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 rom_dd01.bmp rom_dd02.bmp rom_dd03.bmp rom_dd04.bmp rom_dd05.bmp rom_dd06.bmp rom_dd07.bmp rom_dd08.bmp rom_dd09.bmp rom_dd10.bmp rom_dd11.bmp rom_dd12.bmp rom_dd13.bmp rom_dd14.bmp rom_dd15.bmp rom_dd16.bmp rom_dd17.bmp rom_dd18.bmp rom_dd19.bmp rom_dd20.bmp rom_dd21.bmp rom_dd22.bmp rom_dd23.bmp rom_dd24.bmp rom_dd25.bmp rom_dd26.bmp rom_dd27.bmp rom_dd28.bmp rom_dd29.bmp rom_dd30.bmp rom_dd31.bmp rom_dd32.bmp rom_dd.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 rom_ga01.bmp rom_ga02.bmp rom_ga03.bmp rom_ga04.bmp rom_ga05.bmp rom_ga06.bmp rom_ga07.bmp rom_ga08.bmp rom_ga09.bmp rom_ga10.bmp rom_ga11.bmp rom_ga12.bmp rom_ga13.bmp rom_ga14.bmp rom_ga15.bmp rom_ga16.bmp rom_ga17.bmp rom_ga18.bmp rom_ga19.bmp rom_ga20.bmp rom_ga21.bmp rom_ga22.bmp rom_ga23.bmp rom_ga24.bmp rom_ga25.bmp rom_ga26.bmp rom_ga27.bmp rom_ga28.bmp rom_ga29.bmp rom_ga30.bmp rom_ga31.bmp rom_ga32.bmp rom_ga.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 rom_sb01.bmp rom_sb02.bmp rom_sb03.bmp rom_sb04.bmp rom_sb05.bmp rom_sb06.bmp rom_sb07.bmp rom_sb08.bmp rom_sb09.bmp rom_sb10.bmp rom_sb11.bmp rom_sb12.bmp rom_sb13.bmp rom_sb14.bmp rom_sb15.bmp rom_sb16.bmp rom_sb17.bmp rom_sb18.bmp rom_sb19.bmp rom_sb20.bmp rom_sb21.bmp rom_sb22.bmp rom_sb23.bmp rom_sb24.bmp rom_sb25.bmp rom_sb26.bmp rom_sb27.bmp rom_sb28.bmp rom_sb29.bmp rom_sb30.bmp rom_sb31.bmp rom_sb32.bmp rom_sb.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 rom_sc01.bmp rom_sc02.bmp rom_sc03.bmp rom_sc04.bmp rom_sc05.bmp rom_sc06.bmp rom_sc07.bmp rom_sc08.bmp rom_sc09.bmp rom_sc10.bmp rom_sc11.bmp rom_sc12.bmp rom_sc13.bmp rom_sc14.bmp rom_sc15.bmp rom_sc16.bmp rom_sc17.bmp rom_sc18.bmp rom_sc19.bmp rom_sc20.bmp rom_sc21.bmp rom_sc22.bmp rom_sc23.bmp rom_sc24.bmp rom_sc25.bmp rom_sc26.bmp rom_sc27.bmp rom_sc28.bmp rom_sc29.bmp rom_sc30.bmp rom_sc31.bmp rom_sc32.bmp rom_sc.bmp
+%MyCWD%\tools\imagemagick\montage -colors 256 -mode concatenate -tile 8x1 rom_sc.bmp rom_dd.bmp rom_ca.bmp rom_bb.bmp rom_as.bmp  rom_sb.bmp   rom_ga.bmp  rom_at.bmp romshipT.bmp
+popd
+
+pushd resources\ships\grayscale\fed
+echo Making resources\ships\grayscale\fed...
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 fed_as01.bmp fed_as02.bmp fed_as03.bmp fed_as04.bmp fed_as05.bmp fed_as06.bmp fed_as07.bmp fed_as08.bmp fed_as09.bmp fed_as10.bmp fed_as11.bmp fed_as12.bmp fed_as13.bmp fed_as14.bmp fed_as15.bmp fed_as16.bmp fed_as17.bmp fed_as18.bmp fed_as19.bmp fed_as20.bmp fed_as21.bmp fed_as22.bmp fed_as23.bmp fed_as24.bmp fed_as25.bmp fed_as26.bmp fed_as27.bmp fed_as28.bmp fed_as29.bmp fed_as30.bmp fed_as31.bmp fed_as32.bmp fed_as.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 fed_at01.bmp fed_at02.bmp fed_at03.bmp fed_at04.bmp fed_at05.bmp fed_at06.bmp fed_at07.bmp fed_at08.bmp fed_at09.bmp fed_at10.bmp fed_at11.bmp fed_at12.bmp fed_at13.bmp fed_at14.bmp fed_at15.bmp fed_at16.bmp fed_at17.bmp fed_at18.bmp fed_at19.bmp fed_at20.bmp fed_at21.bmp fed_at22.bmp fed_at23.bmp fed_at24.bmp fed_at25.bmp fed_at26.bmp fed_at27.bmp fed_at28.bmp fed_at29.bmp fed_at30.bmp fed_at31.bmp fed_at32.bmp fed_at.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 fed_bb01.bmp fed_bb02.bmp fed_bb03.bmp fed_bb04.bmp fed_bb05.bmp fed_bb06.bmp fed_bb07.bmp fed_bb08.bmp fed_bb09.bmp fed_bb10.bmp fed_bb11.bmp fed_bb12.bmp fed_bb13.bmp fed_bb14.bmp fed_bb15.bmp fed_bb16.bmp fed_bb17.bmp fed_bb18.bmp fed_bb19.bmp fed_bb20.bmp fed_bb21.bmp fed_bb22.bmp fed_bb23.bmp fed_bb24.bmp fed_bb25.bmp fed_bb26.bmp fed_bb27.bmp fed_bb28.bmp fed_bb29.bmp fed_bb30.bmp fed_bb31.bmp fed_bb32.bmp fed_bb.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 fed_ca01.bmp fed_ca02.bmp fed_ca03.bmp fed_ca04.bmp fed_ca05.bmp fed_ca06.bmp fed_ca07.bmp fed_ca08.bmp fed_ca09.bmp fed_ca10.bmp fed_ca11.bmp fed_ca12.bmp fed_ca13.bmp fed_ca14.bmp fed_ca15.bmp fed_ca16.bmp fed_ca17.bmp fed_ca18.bmp fed_ca19.bmp fed_ca20.bmp fed_ca21.bmp fed_ca22.bmp fed_ca23.bmp fed_ca24.bmp fed_ca25.bmp fed_ca26.bmp fed_ca27.bmp fed_ca28.bmp fed_ca29.bmp fed_ca30.bmp fed_ca31.bmp fed_ca32.bmp fed_ca.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 fed_dd01.bmp fed_dd02.bmp fed_dd03.bmp fed_dd04.bmp fed_dd05.bmp fed_dd06.bmp fed_dd07.bmp fed_dd08.bmp fed_dd09.bmp fed_dd10.bmp fed_dd11.bmp fed_dd12.bmp fed_dd13.bmp fed_dd14.bmp fed_dd15.bmp fed_dd16.bmp fed_dd17.bmp fed_dd18.bmp fed_dd19.bmp fed_dd20.bmp fed_dd21.bmp fed_dd22.bmp fed_dd23.bmp fed_dd24.bmp fed_dd25.bmp fed_dd26.bmp fed_dd27.bmp fed_dd28.bmp fed_dd29.bmp fed_dd30.bmp fed_dd31.bmp fed_dd32.bmp fed_dd.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 fed_ga01.bmp fed_ga02.bmp fed_ga03.bmp fed_ga04.bmp fed_ga05.bmp fed_ga06.bmp fed_ga07.bmp fed_ga08.bmp fed_ga09.bmp fed_ga10.bmp fed_ga11.bmp fed_ga12.bmp fed_ga13.bmp fed_ga14.bmp fed_ga15.bmp fed_ga16.bmp fed_ga17.bmp fed_ga18.bmp fed_ga19.bmp fed_ga20.bmp fed_ga21.bmp fed_ga22.bmp fed_ga23.bmp fed_ga24.bmp fed_ga25.bmp fed_ga26.bmp fed_ga27.bmp fed_ga28.bmp fed_ga29.bmp fed_ga30.bmp fed_ga31.bmp fed_ga32.bmp fed_ga.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 fed_sb01.bmp fed_sb02.bmp fed_sb03.bmp fed_sb04.bmp fed_sb05.bmp fed_sb06.bmp fed_sb07.bmp fed_sb08.bmp fed_sb09.bmp fed_sb10.bmp fed_sb11.bmp fed_sb12.bmp fed_sb13.bmp fed_sb14.bmp fed_sb15.bmp fed_sb16.bmp fed_sb17.bmp fed_sb18.bmp fed_sb19.bmp fed_sb20.bmp fed_sb21.bmp fed_sb22.bmp fed_sb23.bmp fed_sb24.bmp fed_sb25.bmp fed_sb26.bmp fed_sb27.bmp fed_sb28.bmp fed_sb29.bmp fed_sb30.bmp fed_sb31.bmp fed_sb32.bmp fed_sb.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 fed_sc01.bmp fed_sc02.bmp fed_sc03.bmp fed_sc04.bmp fed_sc05.bmp fed_sc06.bmp fed_sc07.bmp fed_sc08.bmp fed_sc09.bmp fed_sc10.bmp fed_sc11.bmp fed_sc12.bmp fed_sc13.bmp fed_sc14.bmp fed_sc15.bmp fed_sc16.bmp fed_sc17.bmp fed_sc18.bmp fed_sc19.bmp fed_sc20.bmp fed_sc21.bmp fed_sc22.bmp fed_sc23.bmp fed_sc24.bmp fed_sc25.bmp fed_sc26.bmp fed_sc27.bmp fed_sc28.bmp fed_sc29.bmp fed_sc30.bmp fed_sc31.bmp fed_sc32.bmp fed_sc.bmp
+%MyCWD%\tools\imagemagick\montage -colors 256 -mode concatenate -tile 8x1 fed_sc.bmp fed_dd.bmp fed_ca.bmp fed_bb.bmp fed_as.bmp  fed_sb.bmp   fed_ga.bmp  fed_at.bmp fedshipG.bmp
+popd
+pushd resources\ships\grayscale\ind
+echo Making resources\ships\grayscale\ind...
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ind_as01.bmp ind_as02.bmp ind_as03.bmp ind_as04.bmp ind_as05.bmp ind_as06.bmp ind_as07.bmp ind_as08.bmp ind_as09.bmp ind_as10.bmp ind_as11.bmp ind_as12.bmp ind_as13.bmp ind_as14.bmp ind_as15.bmp ind_as16.bmp ind_as17.bmp ind_as18.bmp ind_as19.bmp ind_as20.bmp ind_as21.bmp ind_as22.bmp ind_as23.bmp ind_as24.bmp ind_as25.bmp ind_as26.bmp ind_as27.bmp ind_as28.bmp ind_as29.bmp ind_as30.bmp ind_as31.bmp ind_as32.bmp ind_as.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ind_at01.bmp ind_at02.bmp ind_at03.bmp ind_at04.bmp ind_at05.bmp ind_at06.bmp ind_at07.bmp ind_at08.bmp ind_at09.bmp ind_at10.bmp ind_at11.bmp ind_at12.bmp ind_at13.bmp ind_at14.bmp ind_at15.bmp ind_at16.bmp ind_at17.bmp ind_at18.bmp ind_at19.bmp ind_at20.bmp ind_at21.bmp ind_at22.bmp ind_at23.bmp ind_at24.bmp ind_at25.bmp ind_at26.bmp ind_at27.bmp ind_at28.bmp ind_at29.bmp ind_at30.bmp ind_at31.bmp ind_at32.bmp ind_at.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ind_bb01.bmp ind_bb02.bmp ind_bb03.bmp ind_bb04.bmp ind_bb05.bmp ind_bb06.bmp ind_bb07.bmp ind_bb08.bmp ind_bb09.bmp ind_bb10.bmp ind_bb11.bmp ind_bb12.bmp ind_bb13.bmp ind_bb14.bmp ind_bb15.bmp ind_bb16.bmp ind_bb17.bmp ind_bb18.bmp ind_bb19.bmp ind_bb20.bmp ind_bb21.bmp ind_bb22.bmp ind_bb23.bmp ind_bb24.bmp ind_bb25.bmp ind_bb26.bmp ind_bb27.bmp ind_bb28.bmp ind_bb29.bmp ind_bb30.bmp ind_bb31.bmp ind_bb32.bmp ind_bb.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ind_ca01.bmp ind_ca02.bmp ind_ca03.bmp ind_ca04.bmp ind_ca05.bmp ind_ca06.bmp ind_ca07.bmp ind_ca08.bmp ind_ca09.bmp ind_ca10.bmp ind_ca11.bmp ind_ca12.bmp ind_ca13.bmp ind_ca14.bmp ind_ca15.bmp ind_ca16.bmp ind_ca17.bmp ind_ca18.bmp ind_ca19.bmp ind_ca20.bmp ind_ca21.bmp ind_ca22.bmp ind_ca23.bmp ind_ca24.bmp ind_ca25.bmp ind_ca26.bmp ind_ca27.bmp ind_ca28.bmp ind_ca29.bmp ind_ca30.bmp ind_ca31.bmp ind_ca32.bmp ind_ca.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ind_dd01.bmp ind_dd02.bmp ind_dd03.bmp ind_dd04.bmp ind_dd05.bmp ind_dd06.bmp ind_dd07.bmp ind_dd08.bmp ind_dd09.bmp ind_dd10.bmp ind_dd11.bmp ind_dd12.bmp ind_dd13.bmp ind_dd14.bmp ind_dd15.bmp ind_dd16.bmp ind_dd17.bmp ind_dd18.bmp ind_dd19.bmp ind_dd20.bmp ind_dd21.bmp ind_dd22.bmp ind_dd23.bmp ind_dd24.bmp ind_dd25.bmp ind_dd26.bmp ind_dd27.bmp ind_dd28.bmp ind_dd29.bmp ind_dd30.bmp ind_dd31.bmp ind_dd32.bmp ind_dd.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ind_ga01.bmp ind_ga02.bmp ind_ga03.bmp ind_ga04.bmp ind_ga05.bmp ind_ga06.bmp ind_ga07.bmp ind_ga08.bmp ind_ga09.bmp ind_ga10.bmp ind_ga11.bmp ind_ga12.bmp ind_ga13.bmp ind_ga14.bmp ind_ga15.bmp ind_ga16.bmp ind_ga17.bmp ind_ga18.bmp ind_ga19.bmp ind_ga20.bmp ind_ga21.bmp ind_ga22.bmp ind_ga23.bmp ind_ga24.bmp ind_ga25.bmp ind_ga26.bmp ind_ga27.bmp ind_ga28.bmp ind_ga29.bmp ind_ga30.bmp ind_ga31.bmp ind_ga32.bmp ind_ga.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ind_sb01.bmp ind_sb02.bmp ind_sb03.bmp ind_sb04.bmp ind_sb05.bmp ind_sb06.bmp ind_sb07.bmp ind_sb08.bmp ind_sb09.bmp ind_sb10.bmp ind_sb11.bmp ind_sb12.bmp ind_sb13.bmp ind_sb14.bmp ind_sb15.bmp ind_sb16.bmp ind_sb17.bmp ind_sb18.bmp ind_sb19.bmp ind_sb20.bmp ind_sb21.bmp ind_sb22.bmp ind_sb23.bmp ind_sb24.bmp ind_sb25.bmp ind_sb26.bmp ind_sb27.bmp ind_sb28.bmp ind_sb29.bmp ind_sb30.bmp ind_sb31.bmp ind_sb32.bmp ind_sb.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ind_sc01.bmp ind_sc02.bmp ind_sc03.bmp ind_sc04.bmp ind_sc05.bmp ind_sc06.bmp ind_sc07.bmp ind_sc08.bmp ind_sc09.bmp ind_sc10.bmp ind_sc11.bmp ind_sc12.bmp ind_sc13.bmp ind_sc14.bmp ind_sc15.bmp ind_sc16.bmp ind_sc17.bmp ind_sc18.bmp ind_sc19.bmp ind_sc20.bmp ind_sc21.bmp ind_sc22.bmp ind_sc23.bmp ind_sc24.bmp ind_sc25.bmp ind_sc26.bmp ind_sc27.bmp ind_sc28.bmp ind_sc29.bmp ind_sc30.bmp ind_sc31.bmp ind_sc32.bmp ind_sc.bmp
+%MyCWD%\tools\imagemagick\montage -colors 256 -mode concatenate -tile 8x1 ind_sc.bmp ind_dd.bmp ind_ca.bmp ind_bb.bmp ind_as.bmp  ind_sb.bmp   ind_ga.bmp  ind_at.bmp indshipG.bmp
+popd
+pushd resources\ships\grayscale\kli
+echo Making resources\ships\grayscale\kli...
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 kli_as01.bmp kli_as02.bmp kli_as03.bmp kli_as04.bmp kli_as05.bmp kli_as06.bmp kli_as07.bmp kli_as08.bmp kli_as09.bmp kli_as10.bmp kli_as11.bmp kli_as12.bmp kli_as13.bmp kli_as14.bmp kli_as15.bmp kli_as16.bmp kli_as17.bmp kli_as18.bmp kli_as19.bmp kli_as20.bmp kli_as21.bmp kli_as22.bmp kli_as23.bmp kli_as24.bmp kli_as25.bmp kli_as26.bmp kli_as27.bmp kli_as28.bmp kli_as29.bmp kli_as30.bmp kli_as31.bmp kli_as32.bmp kli_as.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 kli_at01.bmp kli_at02.bmp kli_at03.bmp kli_at04.bmp kli_at05.bmp kli_at06.bmp kli_at07.bmp kli_at08.bmp kli_at09.bmp kli_at10.bmp kli_at11.bmp kli_at12.bmp kli_at13.bmp kli_at14.bmp kli_at15.bmp kli_at16.bmp kli_at17.bmp kli_at18.bmp kli_at19.bmp kli_at20.bmp kli_at21.bmp kli_at22.bmp kli_at23.bmp kli_at24.bmp kli_at25.bmp kli_at26.bmp kli_at27.bmp kli_at28.bmp kli_at29.bmp kli_at30.bmp kli_at31.bmp kli_at32.bmp kli_at.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 kli_bb01.bmp kli_bb02.bmp kli_bb03.bmp kli_bb04.bmp kli_bb05.bmp kli_bb06.bmp kli_bb07.bmp kli_bb08.bmp kli_bb09.bmp kli_bb10.bmp kli_bb11.bmp kli_bb12.bmp kli_bb13.bmp kli_bb14.bmp kli_bb15.bmp kli_bb16.bmp kli_bb17.bmp kli_bb18.bmp kli_bb19.bmp kli_bb20.bmp kli_bb21.bmp kli_bb22.bmp kli_bb23.bmp kli_bb24.bmp kli_bb25.bmp kli_bb26.bmp kli_bb27.bmp kli_bb28.bmp kli_bb29.bmp kli_bb30.bmp kli_bb31.bmp kli_bb32.bmp kli_bb.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 kli_ca01.bmp kli_ca02.bmp kli_ca03.bmp kli_ca04.bmp kli_ca05.bmp kli_ca06.bmp kli_ca07.bmp kli_ca08.bmp kli_ca09.bmp kli_ca10.bmp kli_ca11.bmp kli_ca12.bmp kli_ca13.bmp kli_ca14.bmp kli_ca15.bmp kli_ca16.bmp kli_ca17.bmp kli_ca18.bmp kli_ca19.bmp kli_ca20.bmp kli_ca21.bmp kli_ca22.bmp kli_ca23.bmp kli_ca24.bmp kli_ca25.bmp kli_ca26.bmp kli_ca27.bmp kli_ca28.bmp kli_ca29.bmp kli_ca30.bmp kli_ca31.bmp kli_ca32.bmp kli_ca.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 kli_dd01.bmp kli_dd02.bmp kli_dd03.bmp kli_dd04.bmp kli_dd05.bmp kli_dd06.bmp kli_dd07.bmp kli_dd08.bmp kli_dd09.bmp kli_dd10.bmp kli_dd11.bmp kli_dd12.bmp kli_dd13.bmp kli_dd14.bmp kli_dd15.bmp kli_dd16.bmp kli_dd17.bmp kli_dd18.bmp kli_dd19.bmp kli_dd20.bmp kli_dd21.bmp kli_dd22.bmp kli_dd23.bmp kli_dd24.bmp kli_dd25.bmp kli_dd26.bmp kli_dd27.bmp kli_dd28.bmp kli_dd29.bmp kli_dd30.bmp kli_dd31.bmp kli_dd32.bmp kli_dd.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 kli_ga01.bmp kli_ga02.bmp kli_ga03.bmp kli_ga04.bmp kli_ga05.bmp kli_ga06.bmp kli_ga07.bmp kli_ga08.bmp kli_ga09.bmp kli_ga10.bmp kli_ga11.bmp kli_ga12.bmp kli_ga13.bmp kli_ga14.bmp kli_ga15.bmp kli_ga16.bmp kli_ga17.bmp kli_ga18.bmp kli_ga19.bmp kli_ga20.bmp kli_ga21.bmp kli_ga22.bmp kli_ga23.bmp kli_ga24.bmp kli_ga25.bmp kli_ga26.bmp kli_ga27.bmp kli_ga28.bmp kli_ga29.bmp kli_ga30.bmp kli_ga31.bmp kli_ga32.bmp kli_ga.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 kli_sb01.bmp kli_sb02.bmp kli_sb03.bmp kli_sb04.bmp kli_sb05.bmp kli_sb06.bmp kli_sb07.bmp kli_sb08.bmp kli_sb09.bmp kli_sb10.bmp kli_sb11.bmp kli_sb12.bmp kli_sb13.bmp kli_sb14.bmp kli_sb15.bmp kli_sb16.bmp kli_sb17.bmp kli_sb18.bmp kli_sb19.bmp kli_sb20.bmp kli_sb21.bmp kli_sb22.bmp kli_sb23.bmp kli_sb24.bmp kli_sb25.bmp kli_sb26.bmp kli_sb27.bmp kli_sb28.bmp kli_sb29.bmp kli_sb30.bmp kli_sb31.bmp kli_sb32.bmp kli_sb.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 kli_sc01.bmp kli_sc02.bmp kli_sc03.bmp kli_sc04.bmp kli_sc05.bmp kli_sc06.bmp kli_sc07.bmp kli_sc08.bmp kli_sc09.bmp kli_sc10.bmp kli_sc11.bmp kli_sc12.bmp kli_sc13.bmp kli_sc14.bmp kli_sc15.bmp kli_sc16.bmp kli_sc17.bmp kli_sc18.bmp kli_sc19.bmp kli_sc20.bmp kli_sc21.bmp kli_sc22.bmp kli_sc23.bmp kli_sc24.bmp kli_sc25.bmp kli_sc26.bmp kli_sc27.bmp kli_sc28.bmp kli_sc29.bmp kli_sc30.bmp kli_sc31.bmp kli_sc32.bmp kli_sc.bmp
+%MyCWD%\tools\imagemagick\montage -colors 256 -mode concatenate -tile 8x1 kli_sc.bmp kli_dd.bmp kli_ca.bmp kli_bb.bmp kli_as.bmp  kli_sb.bmp   kli_ga.bmp  kli_at.bmp klishipG.bmp
+popd
+pushd resources\ships\grayscale\ori
+echo Making resources\ships\grayscale\ori...
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ori_as01.bmp ori_as02.bmp ori_as03.bmp ori_as04.bmp ori_as05.bmp ori_as06.bmp ori_as07.bmp ori_as08.bmp ori_as09.bmp ori_as10.bmp ori_as11.bmp ori_as12.bmp ori_as13.bmp ori_as14.bmp ori_as15.bmp ori_as16.bmp ori_as17.bmp ori_as18.bmp ori_as19.bmp ori_as20.bmp ori_as21.bmp ori_as22.bmp ori_as23.bmp ori_as24.bmp ori_as25.bmp ori_as26.bmp ori_as27.bmp ori_as28.bmp ori_as29.bmp ori_as30.bmp ori_as31.bmp ori_as32.bmp ori_as.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ori_at01.bmp ori_at02.bmp ori_at03.bmp ori_at04.bmp ori_at05.bmp ori_at06.bmp ori_at07.bmp ori_at08.bmp ori_at09.bmp ori_at10.bmp ori_at11.bmp ori_at12.bmp ori_at13.bmp ori_at14.bmp ori_at15.bmp ori_at16.bmp ori_at17.bmp ori_at18.bmp ori_at19.bmp ori_at20.bmp ori_at21.bmp ori_at22.bmp ori_at23.bmp ori_at24.bmp ori_at25.bmp ori_at26.bmp ori_at27.bmp ori_at28.bmp ori_at29.bmp ori_at30.bmp ori_at31.bmp ori_at32.bmp ori_at.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ori_bb01.bmp ori_bb02.bmp ori_bb03.bmp ori_bb04.bmp ori_bb05.bmp ori_bb06.bmp ori_bb07.bmp ori_bb08.bmp ori_bb09.bmp ori_bb10.bmp ori_bb11.bmp ori_bb12.bmp ori_bb13.bmp ori_bb14.bmp ori_bb15.bmp ori_bb16.bmp ori_bb17.bmp ori_bb18.bmp ori_bb19.bmp ori_bb20.bmp ori_bb21.bmp ori_bb22.bmp ori_bb23.bmp ori_bb24.bmp ori_bb25.bmp ori_bb26.bmp ori_bb27.bmp ori_bb28.bmp ori_bb29.bmp ori_bb30.bmp ori_bb31.bmp ori_bb32.bmp ori_bb.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ori_ca01.bmp ori_ca02.bmp ori_ca03.bmp ori_ca04.bmp ori_ca05.bmp ori_ca06.bmp ori_ca07.bmp ori_ca08.bmp ori_ca09.bmp ori_ca10.bmp ori_ca11.bmp ori_ca12.bmp ori_ca13.bmp ori_ca14.bmp ori_ca15.bmp ori_ca16.bmp ori_ca17.bmp ori_ca18.bmp ori_ca19.bmp ori_ca20.bmp ori_ca21.bmp ori_ca22.bmp ori_ca23.bmp ori_ca24.bmp ori_ca25.bmp ori_ca26.bmp ori_ca27.bmp ori_ca28.bmp ori_ca29.bmp ori_ca30.bmp ori_ca31.bmp ori_ca32.bmp ori_ca.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ori_dd01.bmp ori_dd02.bmp ori_dd03.bmp ori_dd04.bmp ori_dd05.bmp ori_dd06.bmp ori_dd07.bmp ori_dd08.bmp ori_dd09.bmp ori_dd10.bmp ori_dd11.bmp ori_dd12.bmp ori_dd13.bmp ori_dd14.bmp ori_dd15.bmp ori_dd16.bmp ori_dd17.bmp ori_dd18.bmp ori_dd19.bmp ori_dd20.bmp ori_dd21.bmp ori_dd22.bmp ori_dd23.bmp ori_dd24.bmp ori_dd25.bmp ori_dd26.bmp ori_dd27.bmp ori_dd28.bmp ori_dd29.bmp ori_dd30.bmp ori_dd31.bmp ori_dd32.bmp ori_dd.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ori_ga01.bmp ori_ga02.bmp ori_ga03.bmp ori_ga04.bmp ori_ga05.bmp ori_ga06.bmp ori_ga07.bmp ori_ga08.bmp ori_ga09.bmp ori_ga10.bmp ori_ga11.bmp ori_ga12.bmp ori_ga13.bmp ori_ga14.bmp ori_ga15.bmp ori_ga16.bmp ori_ga17.bmp ori_ga18.bmp ori_ga19.bmp ori_ga20.bmp ori_ga21.bmp ori_ga22.bmp ori_ga23.bmp ori_ga24.bmp ori_ga25.bmp ori_ga26.bmp ori_ga27.bmp ori_ga28.bmp ori_ga29.bmp ori_ga30.bmp ori_ga31.bmp ori_ga32.bmp ori_ga.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ori_sb01.bmp ori_sb02.bmp ori_sb03.bmp ori_sb04.bmp ori_sb05.bmp ori_sb06.bmp ori_sb07.bmp ori_sb08.bmp ori_sb09.bmp ori_sb10.bmp ori_sb11.bmp ori_sb12.bmp ori_sb13.bmp ori_sb14.bmp ori_sb15.bmp ori_sb16.bmp ori_sb17.bmp ori_sb18.bmp ori_sb19.bmp ori_sb20.bmp ori_sb21.bmp ori_sb22.bmp ori_sb23.bmp ori_sb24.bmp ori_sb25.bmp ori_sb26.bmp ori_sb27.bmp ori_sb28.bmp ori_sb29.bmp ori_sb30.bmp ori_sb31.bmp ori_sb32.bmp ori_sb.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 ori_sc01.bmp ori_sc02.bmp ori_sc03.bmp ori_sc04.bmp ori_sc05.bmp ori_sc06.bmp ori_sc07.bmp ori_sc08.bmp ori_sc09.bmp ori_sc10.bmp ori_sc11.bmp ori_sc12.bmp ori_sc13.bmp ori_sc14.bmp ori_sc15.bmp ori_sc16.bmp ori_sc17.bmp ori_sc18.bmp ori_sc19.bmp ori_sc20.bmp ori_sc21.bmp ori_sc22.bmp ori_sc23.bmp ori_sc24.bmp ori_sc25.bmp ori_sc26.bmp ori_sc27.bmp ori_sc28.bmp ori_sc29.bmp ori_sc30.bmp ori_sc31.bmp ori_sc32.bmp ori_sc.bmp
+%MyCWD%\tools\imagemagick\montage -colors 256 -mode concatenate -tile 8x1 ori_sc.bmp ori_dd.bmp ori_ca.bmp ori_bb.bmp ori_as.bmp  ori_sb.bmp   ori_ga.bmp  ori_at.bmp orishipG.bmp
+popd
+pushd resources\ships\grayscale\rom
+echo Making resources\ships\grayscale\rom...
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 rom_as01.bmp rom_as02.bmp rom_as03.bmp rom_as04.bmp rom_as05.bmp rom_as06.bmp rom_as07.bmp rom_as08.bmp rom_as09.bmp rom_as10.bmp rom_as11.bmp rom_as12.bmp rom_as13.bmp rom_as14.bmp rom_as15.bmp rom_as16.bmp rom_as17.bmp rom_as18.bmp rom_as19.bmp rom_as20.bmp rom_as21.bmp rom_as22.bmp rom_as23.bmp rom_as24.bmp rom_as25.bmp rom_as26.bmp rom_as27.bmp rom_as28.bmp rom_as29.bmp rom_as30.bmp rom_as31.bmp rom_as32.bmp rom_as.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 rom_at01.bmp rom_at02.bmp rom_at03.bmp rom_at04.bmp rom_at05.bmp rom_at06.bmp rom_at07.bmp rom_at08.bmp rom_at09.bmp rom_at10.bmp rom_at11.bmp rom_at12.bmp rom_at13.bmp rom_at14.bmp rom_at15.bmp rom_at16.bmp rom_at17.bmp rom_at18.bmp rom_at19.bmp rom_at20.bmp rom_at21.bmp rom_at22.bmp rom_at23.bmp rom_at24.bmp rom_at25.bmp rom_at26.bmp rom_at27.bmp rom_at28.bmp rom_at29.bmp rom_at30.bmp rom_at31.bmp rom_at32.bmp rom_at.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 rom_bb01.bmp rom_bb02.bmp rom_bb03.bmp rom_bb04.bmp rom_bb05.bmp rom_bb06.bmp rom_bb07.bmp rom_bb08.bmp rom_bb09.bmp rom_bb10.bmp rom_bb11.bmp rom_bb12.bmp rom_bb13.bmp rom_bb14.bmp rom_bb15.bmp rom_bb16.bmp rom_bb17.bmp rom_bb18.bmp rom_bb19.bmp rom_bb20.bmp rom_bb21.bmp rom_bb22.bmp rom_bb23.bmp rom_bb24.bmp rom_bb25.bmp rom_bb26.bmp rom_bb27.bmp rom_bb28.bmp rom_bb29.bmp rom_bb30.bmp rom_bb31.bmp rom_bb32.bmp rom_bb.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 rom_ca01.bmp rom_ca02.bmp rom_ca03.bmp rom_ca04.bmp rom_ca05.bmp rom_ca06.bmp rom_ca07.bmp rom_ca08.bmp rom_ca09.bmp rom_ca10.bmp rom_ca11.bmp rom_ca12.bmp rom_ca13.bmp rom_ca14.bmp rom_ca15.bmp rom_ca16.bmp rom_ca17.bmp rom_ca18.bmp rom_ca19.bmp rom_ca20.bmp rom_ca21.bmp rom_ca22.bmp rom_ca23.bmp rom_ca24.bmp rom_ca25.bmp rom_ca26.bmp rom_ca27.bmp rom_ca28.bmp rom_ca29.bmp rom_ca30.bmp rom_ca31.bmp rom_ca32.bmp rom_ca.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 rom_dd01.bmp rom_dd02.bmp rom_dd03.bmp rom_dd04.bmp rom_dd05.bmp rom_dd06.bmp rom_dd07.bmp rom_dd08.bmp rom_dd09.bmp rom_dd10.bmp rom_dd11.bmp rom_dd12.bmp rom_dd13.bmp rom_dd14.bmp rom_dd15.bmp rom_dd16.bmp rom_dd17.bmp rom_dd18.bmp rom_dd19.bmp rom_dd20.bmp rom_dd21.bmp rom_dd22.bmp rom_dd23.bmp rom_dd24.bmp rom_dd25.bmp rom_dd26.bmp rom_dd27.bmp rom_dd28.bmp rom_dd29.bmp rom_dd30.bmp rom_dd31.bmp rom_dd32.bmp rom_dd.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 rom_ga01.bmp rom_ga02.bmp rom_ga03.bmp rom_ga04.bmp rom_ga05.bmp rom_ga06.bmp rom_ga07.bmp rom_ga08.bmp rom_ga09.bmp rom_ga10.bmp rom_ga11.bmp rom_ga12.bmp rom_ga13.bmp rom_ga14.bmp rom_ga15.bmp rom_ga16.bmp rom_ga17.bmp rom_ga18.bmp rom_ga19.bmp rom_ga20.bmp rom_ga21.bmp rom_ga22.bmp rom_ga23.bmp rom_ga24.bmp rom_ga25.bmp rom_ga26.bmp rom_ga27.bmp rom_ga28.bmp rom_ga29.bmp rom_ga30.bmp rom_ga31.bmp rom_ga32.bmp rom_ga.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 rom_sb01.bmp rom_sb02.bmp rom_sb03.bmp rom_sb04.bmp rom_sb05.bmp rom_sb06.bmp rom_sb07.bmp rom_sb08.bmp rom_sb09.bmp rom_sb10.bmp rom_sb11.bmp rom_sb12.bmp rom_sb13.bmp rom_sb14.bmp rom_sb15.bmp rom_sb16.bmp rom_sb17.bmp rom_sb18.bmp rom_sb19.bmp rom_sb20.bmp rom_sb21.bmp rom_sb22.bmp rom_sb23.bmp rom_sb24.bmp rom_sb25.bmp rom_sb26.bmp rom_sb27.bmp rom_sb28.bmp rom_sb29.bmp rom_sb30.bmp rom_sb31.bmp rom_sb32.bmp rom_sb.bmp
+%MyCWD%\tools\imagemagick\montage -mode concatenate -tile 1x32 rom_sc01.bmp rom_sc02.bmp rom_sc03.bmp rom_sc04.bmp rom_sc05.bmp rom_sc06.bmp rom_sc07.bmp rom_sc08.bmp rom_sc09.bmp rom_sc10.bmp rom_sc11.bmp rom_sc12.bmp rom_sc13.bmp rom_sc14.bmp rom_sc15.bmp rom_sc16.bmp rom_sc17.bmp rom_sc18.bmp rom_sc19.bmp rom_sc20.bmp rom_sc21.bmp rom_sc22.bmp rom_sc23.bmp rom_sc24.bmp rom_sc25.bmp rom_sc26.bmp rom_sc27.bmp rom_sc28.bmp rom_sc29.bmp rom_sc30.bmp rom_sc31.bmp rom_sc32.bmp rom_sc.bmp
+%MyCWD%\tools\imagemagick\montage -colors 256 -mode concatenate -tile 8x1 rom_sc.bmp rom_dd.bmp rom_ca.bmp rom_bb.bmp rom_as.bmp  rom_sb.bmp   rom_ga.bmp  rom_at.bmp romshipG.bmp
+popd
+
 pushd resources\planlibm\bronco
 echo Making resources\planlibm\bronco
 %MyCWD%\tools\imagemagick\montage -colors 2 -mode concatenate -tile 1x9 mplan000.bmp mplan001.bmp mplan010.bmp mplan011.bmp mplan100.bmp mplan101.bmp mplan110.bmp mplan111.bmp mplanunkn.bmp mplan.bmp
@@ -276,6 +399,18 @@
 copy resources\ships\mono\ori\orishipM.bmp %InstCWD%\netrek\bitmaps\shiplib
 copy resources\ships\mono\rom\romshipM.bmp %InstCWD%\netrek\bitmaps\shiplib
 
+copy resources\ships\grayscale\fed\fedshipG.bmp %InstCWD%\netrek\bitmaps\shiplib
+copy resources\ships\grayscale\ind\indshipG.bmp %InstCWD%\netrek\bitmaps\shiplib
+copy resources\ships\grayscale\kli\klishipG.bmp %InstCWD%\netrek\bitmaps\shiplib
+copy resources\ships\grayscale\ori\orishipG.bmp %InstCWD%\netrek\bitmaps\shiplib
+copy resources\ships\grayscale\rom\romshipG.bmp %InstCWD%\netrek\bitmaps\shiplib
+
+copy resources\ships\tinted\fed\fedshipT.bmp %InstCWD%\netrek\bitmaps\shiplib
+copy resources\ships\tinted\ind\indshipT.bmp %InstCWD%\netrek\bitmaps\shiplib
+copy resources\ships\tinted\kli\klishipT.bmp %InstCWD%\netrek\bitmaps\shiplib
+copy resources\ships\tinted\ori\orishipT.bmp %InstCWD%\netrek\bitmaps\shiplib
+copy resources\ships\tinted\rom\romshipT.bmp %InstCWD%\netrek\bitmaps\shiplib
+
 mkdir %InstCWD%\netrek\bitmaps\weaplibm
 copy resources\weaplibm\*.bmp %InstCWD%\netrek\bitmaps\weaplibm
 
@@ -299,7 +434,6 @@
 copy resources\misclib\mono\vshield.bmp %InstCWD%\netrek\bitmaps\misclib
 
 copy resources\fonts\ntfonts2.fon %InstCWD%\netrek
-copy resources\ships\other\*.bmp %InstCWD%\netrek\bitmaps\shiplib
 
 mkdir %InstCWD%\netrek\docs
 copy resources\docs\*.doc %InstCWD%\netrek\docs



From modemhero at users.sourceforge.net  Fri Apr 21 11:36:12 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:36:12 +0000
Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.15,1.16
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31443/resources/docs

Modified Files:
	changes.txt 
Log Message:
Addition of greyscale and shaded old color full bitmaps to repository.  Along the way, fixed all the base bitmaps so they rotate.

Index: changes.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- changes.txt	21 Apr 2006 12:30:22 -0000	1.15
+++ changes.txt	21 Apr 2006 16:36:10 -0000	1.16
@@ -1,5 +1,6 @@
 Version TBA:
 - updated NetrekXP manual (in docs folder), removed old cow manuals.
+- all greyscale and shaded old color starbase bitmaps now rotate.
 - the new color fed starbase bitmaps now rotate.
 - Keeppeace default is now "on".
 - rewrote find bitmap routine in a smarter way (thanks Quozl)



From modemhero at users.sourceforge.net  Fri Apr 21 11:36:13 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:36:13 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/grayscale/kli
	kli_as.bmp, NONE, 1.1 kli_as01.bmp, NONE, 1.1 kli_as02.bmp,
	NONE, 1.1 kli_as03.bmp, NONE, 1.1 kli_as04.bmp, NONE,
	1.1 kli_as05.bmp, NONE, 1.1 kli_as06.bmp, NONE,
	1.1 kli_as07.bmp, NONE, 1.1 kli_as08.bmp, NONE,
	1.1 kli_as09.bmp, NONE, 1.1 kli_as10.bmp, NONE,
	1.1 kli_as11.bmp, NONE, 1.1 kli_as12.bmp, NONE,
	1.1 kli_as13.bmp, NONE, 1.1 kli_as14.bmp, NONE,
	1.1 kli_as15.bmp, NONE, 1.1 kli_as16.bmp, NONE,
	1.1 kli_as17.bmp, NONE, 1.1 kli_as18.bmp, NONE,
	1.1 kli_as19.bmp, NONE, 1.1 kli_as20.bmp, NONE,
	1.1 kli_as21.bmp, NONE, 1.1 kli_as22.bmp, NONE,
	1.1 kli_as23.bmp, NONE, 1.1 kli_as24.bmp, NONE,
	1.1 kli_as25.bmp, NONE, 1.1 kli_as26.bmp, NONE,
	1.1 kli_as27.bmp, NONE, 1.1 kli_as28.bmp, NONE,
	1.1 kli_as29.bmp, NONE, 1.1 kli_as30.bmp, NONE,
	1.1 kli_as31.bmp, NONE, 1.1 kli_as32.bmp, NONE, 1.1 kli_at.bmp,
	NONE, 1.1 kli_at01.bmp, NONE, 1.1 kli_at02.bmp, NONE,
	1.1 kli_at03.bmp, NONE, 1.1 kli_at04.bmp, NONE,
	1.1 kli_at05.bmp, NONE, 1.1 kli_at06.bmp, NONE,
	1.1 kli_at07.bmp, NONE, 1.1 kli_at08.bmp, NONE,
	1.1 kli_at09.bmp, NONE, 1.1 kli_at10.bmp, NONE,
	1.1 kli_at11.bmp, NONE, 1.1 kli_at12.bmp, NONE,
	1.1 kli_at13.bmp, NONE, 1.1 kli_at14.bmp, NONE,
	1.1 kli_at15.bmp, NONE, 1.1 kli_at16.bmp, NONE,
	1.1 kli_at17.bmp, NONE, 1.1 kli_at18.bmp, NONE,
	1.1 kli_at19.bmp, NONE, 1.1 kli_at20.bmp, NONE,
	1.1 kli_at21.bmp, NONE, 1.1 kli_at22.bmp, NONE,
	1.1 kli_at23.bmp, NONE, 1.1 kli_at24.bmp, NONE,
	1.1 kli_at25.bmp, NONE, 1.1 kli_at26.bmp, NONE,
	1.1 kli_at27.bmp, NONE, 1.1 kli_at28.bmp, NONE,
	1.1 kli_at29.bmp, NONE, 1.1 kli_at30.bmp, NONE,
	1.1 kli_at31.bmp, NONE, 1.1 kli_at32.bmp, NONE, 1.1 kli_bb.bmp,
	NONE, 1.1 kli_bb01.bmp, NONE, 1.1 kli_bb02.bmp, NONE,
	1.1 kli_bb03.bmp, NONE, 1.1 kli_bb04.bmp, NONE,
	1.1 kli_bb05.bmp, NONE, 1.1 kli_bb06.bmp, NONE,
	1.1 kli_bb07.bmp, NONE, 1.1 kli_bb08.bmp, NONE,
	1.1 kli_bb09.bmp, NONE, 1.1 kli_bb10.bmp, NONE,
	1.1 kli_bb11.bmp, NONE, 1.1 kli_bb12.bmp, NONE,
	1.1 kli_bb13.bmp, NONE, 1.1 kli_bb14.bmp, NONE,
	1.1 kli_bb15.bmp, NONE, 1.1 kli_bb16.bmp, NONE,
	1.1 kli_bb17.bmp, NONE, 1.1 kli_bb18.bmp, NONE,
	1.1 kli_bb19.bmp, NONE, 1.1 kli_bb20.bmp, NONE,
	1.1 kli_bb21.bmp, NONE, 1.1 kli_bb22.bmp, NONE,
	1.1 kli_bb23.bmp, NONE, 1.1 kli_bb24.bmp, NONE,
	1.1 kli_bb25.bmp, NONE, 1.1 kli_bb26.bmp, NONE,
	1.1 kli_bb27.bmp, NONE, 1.1 kli_bb28.bmp, NONE,
	1.1 kli_bb29.bmp, NONE, 1.1 kli_bb30.bmp, NONE,
	1.1 kli_bb31.bmp, NONE, 1.1 kli_bb32.bmp, NONE, 1.1 kli_ca.bmp,
	NONE, 1.1 kli_ca01.bmp, NONE, 1.1 kli_ca02.bmp, NONE,
	1.1 kli_ca03.bmp, NONE, 1.1 kli_ca04.bmp, NONE,
	1.1 kli_ca05.bmp, NONE, 1.1 kli_ca06.bmp, NONE,
	1.1 kli_ca07.bmp, NONE, 1.1 kli_ca08.bmp, NONE,
	1.1 kli_ca09.bmp, NONE, 1.1 kli_ca10.bmp, NONE,
	1.1 kli_ca11.bmp, NONE, 1.1 kli_ca12.bmp, NONE,
	1.1 kli_ca13.bmp, NONE, 1.1 kli_ca14.bmp, NONE,
	1.1 kli_ca15.bmp, NONE, 1.1 kli_ca16.bmp, NONE,
	1.1 kli_ca17.bmp, NONE, 1.1 kli_ca18.bmp, NONE,
	1.1 kli_ca19.bmp, NONE, 1.1 kli_ca20.bmp, NONE,
	1.1 kli_ca21.bmp, NONE, 1.1 kli_ca22.bmp, NONE,
	1.1 kli_ca23.bmp, NONE, 1.1 kli_ca24.bmp, NONE,
	1.1 kli_ca25.bmp, NONE, 1.1 kli_ca26.bmp, NONE,
	1.1 kli_ca27.bmp, NONE, 1.1 kli_ca28.bmp, NONE,
	1.1 kli_ca29.bmp, NONE, 1.1 kli_ca30.bmp, NONE,
	1.1 kli_ca31.bmp, NONE, 1.1 kli_ca32.bmp, NONE, 1.1 kli_dd.bmp,
	NONE, 1.1 kli_dd01.bmp, NONE, 1.1 kli_dd02.bmp, NONE,
	1.1 kli_dd03.bmp, NONE, 1.1 kli_dd04.bmp, NONE,
	1.1 kli_dd05.bmp, NONE, 1.1 kli_dd06.bmp, NONE,
	1.1 kli_dd07.bmp, NONE, 1.1 kli_dd08.bmp, NONE,
	1.1 kli_dd09.bmp, NONE, 1.1 kli_dd10.bmp, NONE,
	1.1 kli_dd11.bmp, NONE, 1.1 kli_dd12.bmp, NONE,
	1.1 kli_dd13.bmp, NONE, 1.1
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/grayscale/kli
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31443/resources/ships/grayscale/kli

Added Files:
	kli_as.bmp kli_as01.bmp kli_as02.bmp kli_as03.bmp kli_as04.bmp 
	kli_as05.bmp kli_as06.bmp kli_as07.bmp kli_as08.bmp 
	kli_as09.bmp kli_as10.bmp kli_as11.bmp kli_as12.bmp 
	kli_as13.bmp kli_as14.bmp kli_as15.bmp kli_as16.bmp 
	kli_as17.bmp kli_as18.bmp kli_as19.bmp kli_as20.bmp 
	kli_as21.bmp kli_as22.bmp kli_as23.bmp kli_as24.bmp 
	kli_as25.bmp kli_as26.bmp kli_as27.bmp kli_as28.bmp 
	kli_as29.bmp kli_as30.bmp kli_as31.bmp kli_as32.bmp kli_at.bmp 
	kli_at01.bmp kli_at02.bmp kli_at03.bmp kli_at04.bmp 
	kli_at05.bmp kli_at06.bmp kli_at07.bmp kli_at08.bmp 
	kli_at09.bmp kli_at10.bmp kli_at11.bmp kli_at12.bmp 
	kli_at13.bmp kli_at14.bmp kli_at15.bmp kli_at16.bmp 
	kli_at17.bmp kli_at18.bmp kli_at19.bmp kli_at20.bmp 
	kli_at21.bmp kli_at22.bmp kli_at23.bmp kli_at24.bmp 
	kli_at25.bmp kli_at26.bmp kli_at27.bmp kli_at28.bmp 
	kli_at29.bmp kli_at30.bmp kli_at31.bmp kli_at32.bmp kli_bb.bmp 
	kli_bb01.bmp kli_bb02.bmp kli_bb03.bmp kli_bb04.bmp 
	kli_bb05.bmp kli_bb06.bmp kli_bb07.bmp kli_bb08.bmp 
	kli_bb09.bmp kli_bb10.bmp kli_bb11.bmp kli_bb12.bmp 
	kli_bb13.bmp kli_bb14.bmp kli_bb15.bmp kli_bb16.bmp 
	kli_bb17.bmp kli_bb18.bmp kli_bb19.bmp kli_bb20.bmp 
	kli_bb21.bmp kli_bb22.bmp kli_bb23.bmp kli_bb24.bmp 
	kli_bb25.bmp kli_bb26.bmp kli_bb27.bmp kli_bb28.bmp 
	kli_bb29.bmp kli_bb30.bmp kli_bb31.bmp kli_bb32.bmp kli_ca.bmp 
	kli_ca01.bmp kli_ca02.bmp kli_ca03.bmp kli_ca04.bmp 
	kli_ca05.bmp kli_ca06.bmp kli_ca07.bmp kli_ca08.bmp 
	kli_ca09.bmp kli_ca10.bmp kli_ca11.bmp kli_ca12.bmp 
	kli_ca13.bmp kli_ca14.bmp kli_ca15.bmp kli_ca16.bmp 
	kli_ca17.bmp kli_ca18.bmp kli_ca19.bmp kli_ca20.bmp 
	kli_ca21.bmp kli_ca22.bmp kli_ca23.bmp kli_ca24.bmp 
	kli_ca25.bmp kli_ca26.bmp kli_ca27.bmp kli_ca28.bmp 
	kli_ca29.bmp kli_ca30.bmp kli_ca31.bmp kli_ca32.bmp kli_dd.bmp 
	kli_dd01.bmp kli_dd02.bmp kli_dd03.bmp kli_dd04.bmp 
	kli_dd05.bmp kli_dd06.bmp kli_dd07.bmp kli_dd08.bmp 
	kli_dd09.bmp kli_dd10.bmp kli_dd11.bmp kli_dd12.bmp 
	kli_dd13.bmp 
Log Message:
Addition of greyscale and shaded old color full bitmaps to repository.  Along the way, fixed all the base bitmaps so they rotate.

--- NEW FILE: kli_bb32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at19.bmp ---
(This appears to be a binary file; contents omitted.)



From modemhero at users.sourceforge.net  Fri Apr 21 11:36:13 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:36:13 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/grayscale/ind
	ind_as.bmp, NONE, 1.1 ind_as01.bmp, NONE, 1.1 ind_as02.bmp,
	NONE, 1.1 ind_as03.bmp, NONE, 1.1 ind_as04.bmp, NONE,
	1.1 ind_as05.bmp, NONE, 1.1 ind_as06.bmp, NONE,
	1.1 ind_as07.bmp, NONE, 1.1 ind_as08.bmp, NONE,
	1.1 ind_as09.bmp, NONE, 1.1 ind_as10.bmp, NONE,
	1.1 ind_as11.bmp, NONE, 1.1 ind_as12.bmp, NONE,
	1.1 ind_as13.bmp, NONE, 1.1 ind_as14.bmp, NONE,
	1.1 ind_as15.bmp, NONE, 1.1 ind_as16.bmp, NONE,
	1.1 ind_as17.bmp, NONE, 1.1 ind_as18.bmp, NONE,
	1.1 ind_as19.bmp, NONE, 1.1 ind_as20.bmp, NONE,
	1.1 ind_as21.bmp, NONE, 1.1 ind_as22.bmp, NONE,
	1.1 ind_as23.bmp, NONE, 1.1 ind_as24.bmp, NONE,
	1.1 ind_as25.bmp, NONE, 1.1 ind_as26.bmp, NONE,
	1.1 ind_as27.bmp, NONE, 1.1 ind_as28.bmp, NONE,
	1.1 ind_as29.bmp, NONE, 1.1 ind_as30.bmp, NONE,
	1.1 ind_as31.bmp, NONE, 1.1 ind_as32.bmp, NONE, 1.1 ind_at.bmp,
	NONE, 1.1 ind_at01.bmp, NONE, 1.1 ind_at02.bmp, NONE,
	1.1 ind_at03.bmp, NONE, 1.1 ind_at04.bmp, NONE,
	1.1 ind_at05.bmp, NONE, 1.1 ind_at06.bmp, NONE,
	1.1 ind_at07.bmp, NONE, 1.1 ind_at08.bmp, NONE,
	1.1 ind_at09.bmp, NONE, 1.1 ind_at10.bmp, NONE,
	1.1 ind_at11.bmp, NONE, 1.1 ind_at12.bmp, NONE,
	1.1 ind_at13.bmp, NONE, 1.1 ind_at14.bmp, NONE,
	1.1 ind_at15.bmp, NONE, 1.1 ind_at16.bmp, NONE,
	1.1 ind_at17.bmp, NONE, 1.1 ind_at18.bmp, NONE,
	1.1 ind_at19.bmp, NONE, 1.1 ind_at20.bmp, NONE,
	1.1 ind_at21.bmp, NONE, 1.1 ind_at22.bmp, NONE,
	1.1 ind_at23.bmp, NONE, 1.1 ind_at24.bmp, NONE,
	1.1 ind_at25.bmp, NONE, 1.1 ind_at26.bmp, NONE,
	1.1 ind_at27.bmp, NONE, 1.1 ind_at28.bmp, NONE,
	1.1 ind_at29.bmp, NONE, 1.1 ind_at30.bmp, NONE,
	1.1 ind_at31.bmp, NONE, 1.1 ind_at32.bmp, NONE, 1.1 ind_bb.bmp,
	NONE, 1.1 ind_bb01.bmp, NONE, 1.1 ind_bb02.bmp, NONE,
	1.1 ind_bb03.bmp, NONE, 1.1 ind_bb04.bmp, NONE,
	1.1 ind_bb05.bmp, NONE, 1.1 ind_bb06.bmp, NONE,
	1.1 ind_bb07.bmp, NONE, 1.1 ind_bb08.bmp, NONE,
	1.1 ind_bb09.bmp, NONE, 1.1 ind_bb10.bmp, NONE,
	1.1 ind_bb11.bmp, NONE, 1.1 ind_bb12.bmp, NONE,
	1.1 ind_bb13.bmp, NONE, 1.1 ind_bb14.bmp, NONE,
	1.1 ind_bb15.bmp, NONE, 1.1 ind_bb16.bmp, NONE,
	1.1 ind_bb17.bmp, NONE, 1.1 ind_bb18.bmp, NONE,
	1.1 ind_bb19.bmp, NONE, 1.1 ind_bb20.bmp, NONE,
	1.1 ind_bb21.bmp, NONE, 1.1 ind_bb22.bmp, NONE,
	1.1 ind_bb23.bmp, NONE, 1.1 ind_bb24.bmp, NONE,
	1.1 ind_bb25.bmp, NONE, 1.1 ind_bb26.bmp, NONE,
	1.1 ind_bb27.bmp, NONE, 1.1 ind_bb28.bmp, NONE,
	1.1 ind_bb29.bmp, NONE, 1.1 ind_bb30.bmp, NONE,
	1.1 ind_bb31.bmp, NONE, 1.1 ind_bb32.bmp, NONE, 1.1 ind_ca.bmp,
	NONE, 1.1 ind_ca01.bmp, NONE, 1.1 ind_ca02.bmp, NONE,
	1.1 ind_ca03.bmp, NONE, 1.1 ind_ca04.bmp, NONE,
	1.1 ind_ca05.bmp, NONE, 1.1 ind_ca06.bmp, NONE,
	1.1 ind_ca07.bmp, NONE, 1.1 ind_ca08.bmp, NONE,
	1.1 ind_ca09.bmp, NONE, 1.1 ind_ca10.bmp, NONE,
	1.1 ind_ca11.bmp, NONE, 1.1 ind_ca12.bmp, NONE,
	1.1 ind_ca13.bmp, NONE, 1.1 ind_ca14.bmp, NONE,
	1.1 ind_ca15.bmp, NONE, 1.1 ind_ca16.bmp, NONE,
	1.1 ind_ca17.bmp, NONE, 1.1 ind_ca18.bmp, NONE,
	1.1 ind_ca19.bmp, NONE, 1.1 ind_ca20.bmp, NONE,
	1.1 ind_ca21.bmp, NONE, 1.1 ind_ca22.bmp, NONE,
	1.1 ind_ca23.bmp, NONE, 1.1 ind_ca24.bmp, NONE,
	1.1 ind_ca25.bmp, NONE, 1.1 ind_ca26.bmp, NONE,
	1.1 ind_ca27.bmp, NONE, 1.1 ind_ca28.bmp, NONE,
	1.1 ind_ca29.bmp, NONE, 1.1 ind_ca30.bmp, NONE,
	1.1 ind_ca31.bmp, NONE, 1.1 ind_ca32.bmp, NONE, 1.1 ind_dd.bmp,
	NONE, 1.1 ind_dd01.bmp, NONE, 1.1 ind_dd02.bmp, NONE,
	1.1 ind_dd03.bmp, NONE, 1.1 ind_dd04.bmp, NONE,
	1.1 ind_dd05.bmp, NONE, 1.1 ind_dd06.bmp, NONE,
	1.1 ind_dd07.bmp, NONE, 1.1 ind_dd08.bmp, NONE,
	1.1 ind_dd09.bmp, NONE, 1.1 ind_dd10.bmp, NONE,
	1.1 ind_dd11.bmp, NONE, 1.1 ind_dd12.bmp, NONE,
	1.1 ind_dd13.bmp, NONE, 1.1 ind_dd14.bmp, NONE,
	1.1 ind_dd15.bmp, NONE, 1.1 ind_dd16.bmp, NONE,
	1.1 ind_dd17.bmp, NONE, 1.1 ind_dd18.bmp, NONE,
	1.1 ind_dd19.bmp, NONE, 1.1 ind_dd20.bmp, NONE,
	1.1 ind_dd21.bmp, NONE, 1.1 ind_dd22.bmp, NONE,
	1.1 ind_dd23.bmp, NONE, 1.1 ind_dd24.bmp, NONE,
	1.1 ind_dd25.bmp, NONE, 1.1 ind_dd26.bmp, NONE,
	1.1 ind_dd27.bmp, NONE, 1.1 ind_dd28.bmp, NONE,
	1.1 ind_dd29.bmp, NONE, 1.1 ind_dd30.bmp, NONE,
	1.1 ind_dd31.bmp, NONE, 1.1 ind_dd32.bmp, NONE, 1.1 ind_ga.bmp,
	NONE, 1.1 ind_ga01.bmp, NONE, 1.1 ind_ga02.bmp, NONE,
	1.1 ind_ga03.bmp, NONE, 1.1 ind_ga04.bmp, NONE,
	1.1 ind_ga05.bmp, NONE, 1.1 ind_ga06.bmp, NONE,
	1.1 ind_ga07.bmp, NONE, 1.1 ind_ga08.bmp, NONE,
	1.1 ind_ga09.bmp, NONE, 1.1 ind_ga10.bmp, NONE,
	1.1 ind_ga11.bmp, NONE, 1.1 ind_ga12.bmp, NONE,
	1.1 ind_ga13.bmp, NONE, 1.1 ind_ga14.bmp, NONE,
	1.1 ind_ga15.bmp, NONE, 1.1 ind_ga16.bmp, NONE,
	1.1 ind_ga17.bmp, NONE, 1.1 ind_ga18.bmp, NONE,
	1.1 ind_ga19.bmp, NONE, 1.1 ind_ga20.bmp, NONE,
	1.1 ind_ga21.bmp, NONE, 1.1 ind_ga22.bmp, NONE,
	1.1 ind_ga23.bmp, NONE, 1.1 ind_ga24.bmp, NONE,
	1.1 ind_ga25.bmp, NONE, 1.1 ind_ga26.bmp, NONE,
	1.1 ind_ga27.bmp, NONE, 1.1 ind_ga28.bmp, NONE,
	1.1 ind_ga29.bmp, NONE, 1.1 ind_ga30.bmp, NONE,
	1.1 ind_ga31.bmp, NONE, 1.1 ind_ga32.bmp, NONE, 1.1 ind_sb.bmp,
	NONE, 1.1 ind_sb01.bmp, NONE, 1.1 ind_sb02.bmp, NONE,
	1.1 ind_sb03.bmp, NONE, 1.1 ind_sb04.bmp, NONE,
	1.1 ind_sb05.bmp, NONE, 1.1 ind_sb06.bmp, NONE,
	1.1 ind_sb07.bmp, NONE, 1.1 ind_sb08.bmp, NONE,
	1.1 ind_sb09.bmp, NONE, 1.1 ind_sb10.bmp, NONE,
	1.1 ind_sb11.bmp, NONE, 1.1 ind_sb12.bmp, NONE,
	1.1 ind_sb13.bmp, NONE, 1.1 ind_sb14.bmp, NONE,
	1.1 ind_sb15.bmp, NONE, 1.1 ind_sb16.bmp, NONE,
	1.1 ind_sb17.bmp, NONE, 1.1 ind_sb18.bmp, NONE,
	1.1 ind_sb19.bmp, NONE, 1.1 ind_sb20.bmp, NONE,
	1.1 ind_sb21.bmp, NONE, 1.1 ind_sb22.bmp, NONE,
	1.1 ind_sb23.bmp, NONE, 1.1 ind_sb24.bmp, NONE,
	1.1 ind_sb25.bmp, NONE, 1.1 ind_sb26.bmp, NONE,
	1.1 ind_sb27.bmp, NONE, 1.1 ind_sb28.bmp, NONE,
	1.1 ind_sb29.bmp, NONE, 1.1 ind_sb30.bmp, NONE,
	1.1 ind_sb31.bmp, NONE, 1.1 ind_sb32.bmp, NONE, 1.1 ind_sc.bmp,
	NONE, 1.1 ind_sc01.bmp, NONE, 1.1 ind_sc02.bmp, NONE,
	1.1 ind_sc03.bmp, NONE, 1.1 ind_sc04.bmp, NONE,
	1.1 ind_sc05.bmp, NONE, 1.1 ind_sc06.bmp, NONE,
	1.1 ind_sc07.bmp, NONE, 1.1 ind_sc08.bmp, NONE,
	1.1 ind_sc09.bmp, NONE, 1.1 ind_sc10.bmp, NONE,
	1.1 ind_sc11.bmp, NONE, 1.1 ind_sc12.bmp, NONE,
	1.1 ind_sc13.bmp, NONE, 1.1 ind_sc14.bmp, NONE,
	1.1 ind_sc15.bmp, NONE, 1.1 ind_sc16.bmp, NONE,
	1.1 ind_sc17.bmp, NONE, 1.1 ind_sc18.bmp, NONE,
	1.1 ind_sc19.bmp, NONE, 1.1 ind_sc20.bmp, NONE,
	1.1 ind_sc21.bmp, NONE, 1.1 ind_sc22.bmp, NONE,
	1.1 ind_sc23.bmp, NONE, 1.1 ind_sc24.bmp, NONE,
	1.1 ind_sc25.bmp, NONE, 1.1 ind_sc26.bmp, NONE,
	1.1 ind_sc27.bmp, NONE, 1.1 ind_sc28.bmp, NONE,
	1.1 ind_sc29.bmp, NONE, 1.1 ind_sc30.bmp, NONE,
	1.1 ind_sc31.bmp, NONE, 1.1 ind_sc32.bmp, NONE,
	1.1 indshipG.bmp, NONE, 1.1
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/grayscale/ind
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31443/resources/ships/grayscale/ind

Added Files:
	ind_as.bmp ind_as01.bmp ind_as02.bmp ind_as03.bmp ind_as04.bmp 
	ind_as05.bmp ind_as06.bmp ind_as07.bmp ind_as08.bmp 
	ind_as09.bmp ind_as10.bmp ind_as11.bmp ind_as12.bmp 
	ind_as13.bmp ind_as14.bmp ind_as15.bmp ind_as16.bmp 
	ind_as17.bmp ind_as18.bmp ind_as19.bmp ind_as20.bmp 
	ind_as21.bmp ind_as22.bmp ind_as23.bmp ind_as24.bmp 
	ind_as25.bmp ind_as26.bmp ind_as27.bmp ind_as28.bmp 
	ind_as29.bmp ind_as30.bmp ind_as31.bmp ind_as32.bmp ind_at.bmp 
	ind_at01.bmp ind_at02.bmp ind_at03.bmp ind_at04.bmp 
	ind_at05.bmp ind_at06.bmp ind_at07.bmp ind_at08.bmp 
	ind_at09.bmp ind_at10.bmp ind_at11.bmp ind_at12.bmp 
	ind_at13.bmp ind_at14.bmp ind_at15.bmp ind_at16.bmp 
	ind_at17.bmp ind_at18.bmp ind_at19.bmp ind_at20.bmp 
	ind_at21.bmp ind_at22.bmp ind_at23.bmp ind_at24.bmp 
	ind_at25.bmp ind_at26.bmp ind_at27.bmp ind_at28.bmp 
	ind_at29.bmp ind_at30.bmp ind_at31.bmp ind_at32.bmp ind_bb.bmp 
	ind_bb01.bmp ind_bb02.bmp ind_bb03.bmp ind_bb04.bmp 
	ind_bb05.bmp ind_bb06.bmp ind_bb07.bmp ind_bb08.bmp 
	ind_bb09.bmp ind_bb10.bmp ind_bb11.bmp ind_bb12.bmp 
	ind_bb13.bmp ind_bb14.bmp ind_bb15.bmp ind_bb16.bmp 
	ind_bb17.bmp ind_bb18.bmp ind_bb19.bmp ind_bb20.bmp 
	ind_bb21.bmp ind_bb22.bmp ind_bb23.bmp ind_bb24.bmp 
	ind_bb25.bmp ind_bb26.bmp ind_bb27.bmp ind_bb28.bmp 
	ind_bb29.bmp ind_bb30.bmp ind_bb31.bmp ind_bb32.bmp ind_ca.bmp 
	ind_ca01.bmp ind_ca02.bmp ind_ca03.bmp ind_ca04.bmp 
	ind_ca05.bmp ind_ca06.bmp ind_ca07.bmp ind_ca08.bmp 
	ind_ca09.bmp ind_ca10.bmp ind_ca11.bmp ind_ca12.bmp 
	ind_ca13.bmp ind_ca14.bmp ind_ca15.bmp ind_ca16.bmp 
	ind_ca17.bmp ind_ca18.bmp ind_ca19.bmp ind_ca20.bmp 
	ind_ca21.bmp ind_ca22.bmp ind_ca23.bmp ind_ca24.bmp 
	ind_ca25.bmp ind_ca26.bmp ind_ca27.bmp ind_ca28.bmp 
	ind_ca29.bmp ind_ca30.bmp ind_ca31.bmp ind_ca32.bmp ind_dd.bmp 
	ind_dd01.bmp ind_dd02.bmp ind_dd03.bmp ind_dd04.bmp 
	ind_dd05.bmp ind_dd06.bmp ind_dd07.bmp ind_dd08.bmp 
	ind_dd09.bmp ind_dd10.bmp ind_dd11.bmp ind_dd12.bmp 
	ind_dd13.bmp ind_dd14.bmp ind_dd15.bmp ind_dd16.bmp 
	ind_dd17.bmp ind_dd18.bmp ind_dd19.bmp ind_dd20.bmp 
	ind_dd21.bmp ind_dd22.bmp ind_dd23.bmp ind_dd24.bmp 
	ind_dd25.bmp ind_dd26.bmp ind_dd27.bmp ind_dd28.bmp 
	ind_dd29.bmp ind_dd30.bmp ind_dd31.bmp ind_dd32.bmp ind_ga.bmp 
	ind_ga01.bmp ind_ga02.bmp ind_ga03.bmp ind_ga04.bmp 
	ind_ga05.bmp ind_ga06.bmp ind_ga07.bmp ind_ga08.bmp 
	ind_ga09.bmp ind_ga10.bmp ind_ga11.bmp ind_ga12.bmp 
	ind_ga13.bmp ind_ga14.bmp ind_ga15.bmp ind_ga16.bmp 
	ind_ga17.bmp ind_ga18.bmp ind_ga19.bmp ind_ga20.bmp 
	ind_ga21.bmp ind_ga22.bmp ind_ga23.bmp ind_ga24.bmp 
	ind_ga25.bmp ind_ga26.bmp ind_ga27.bmp ind_ga28.bmp 
	ind_ga29.bmp ind_ga30.bmp ind_ga31.bmp ind_ga32.bmp ind_sb.bmp 
	ind_sb01.bmp ind_sb02.bmp ind_sb03.bmp ind_sb04.bmp 
	ind_sb05.bmp ind_sb06.bmp ind_sb07.bmp ind_sb08.bmp 
	ind_sb09.bmp ind_sb10.bmp ind_sb11.bmp ind_sb12.bmp 
	ind_sb13.bmp ind_sb14.bmp ind_sb15.bmp ind_sb16.bmp 
	ind_sb17.bmp ind_sb18.bmp ind_sb19.bmp ind_sb20.bmp 
	ind_sb21.bmp ind_sb22.bmp ind_sb23.bmp ind_sb24.bmp 
	ind_sb25.bmp ind_sb26.bmp ind_sb27.bmp ind_sb28.bmp 
	ind_sb29.bmp ind_sb30.bmp ind_sb31.bmp ind_sb32.bmp ind_sc.bmp 
	ind_sc01.bmp ind_sc02.bmp ind_sc03.bmp ind_sc04.bmp 
	ind_sc05.bmp ind_sc06.bmp ind_sc07.bmp ind_sc08.bmp 
	ind_sc09.bmp ind_sc10.bmp ind_sc11.bmp ind_sc12.bmp 
	ind_sc13.bmp ind_sc14.bmp ind_sc15.bmp ind_sc16.bmp 
	ind_sc17.bmp ind_sc18.bmp ind_sc19.bmp ind_sc20.bmp 
	ind_sc21.bmp ind_sc22.bmp ind_sc23.bmp ind_sc24.bmp 
	ind_sc25.bmp ind_sc26.bmp ind_sc27.bmp ind_sc28.bmp 
	ind_sc29.bmp ind_sc30.bmp ind_sc31.bmp ind_sc32.bmp 
	indshipG.bmp 
Log Message:
Addition of greyscale and shaded old color full bitmaps to repository.  Along the way, fixed all the base bitmaps so they rotate.

--- NEW FILE: ind_bb02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: indshipG.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd25.bmp ---
(This appears to be a binary file; contents omitted.)



From modemhero at users.sourceforge.net  Fri Apr 21 11:36:12 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:36:12 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/grayscale/fed
	fed_as.bmp, NONE, 1.1 fed_as01.bmp, NONE, 1.1 fed_as02.bmp,
	NONE, 1.1 fed_as03.bmp, NONE, 1.1 fed_as04.bmp, NONE,
	1.1 fed_as05.bmp, NONE, 1.1 fed_as06.bmp, NONE,
	1.1 fed_as07.bmp, NONE, 1.1 fed_as08.bmp, NONE,
	1.1 fed_as09.bmp, NONE, 1.1 fed_as10.bmp, NONE,
	1.1 fed_as11.bmp, NONE, 1.1 fed_as12.bmp, NONE,
	1.1 fed_as13.bmp, NONE, 1.1 fed_as14.bmp, NONE,
	1.1 fed_as15.bmp, NONE, 1.1 fed_as16.bmp, NONE,
	1.1 fed_as17.bmp, NONE, 1.1 fed_as18.bmp, NONE,
	1.1 fed_as19.bmp, NONE, 1.1 fed_as20.bmp, NONE,
	1.1 fed_as21.bmp, NONE, 1.1 fed_as22.bmp, NONE,
	1.1 fed_as23.bmp, NONE, 1.1 fed_as24.bmp, NONE,
	1.1 fed_as25.bmp, NONE, 1.1 fed_as26.bmp, NONE,
	1.1 fed_as27.bmp, NONE, 1.1 fed_as28.bmp, NONE,
	1.1 fed_as29.bmp, NONE, 1.1 fed_as30.bmp, NONE,
	1.1 fed_as31.bmp, NONE, 1.1 fed_as32.bmp, NONE, 1.1 fed_at.bmp,
	NONE, 1.1 fed_at01.bmp, NONE, 1.1 fed_at02.bmp, NONE,
	1.1 fed_at03.bmp, NONE, 1.1 fed_at04.bmp, NONE,
	1.1 fed_at05.bmp, NONE, 1.1 fed_at06.bmp, NONE,
	1.1 fed_at07.bmp, NONE, 1.1 fed_at08.bmp, NONE,
	1.1 fed_at09.bmp, NONE, 1.1 fed_at10.bmp, NONE,
	1.1 fed_at11.bmp, NONE, 1.1 fed_at12.bmp, NONE,
	1.1 fed_at13.bmp, NONE, 1.1 fed_at14.bmp, NONE,
	1.1 fed_at15.bmp, NONE, 1.1 fed_at16.bmp, NONE,
	1.1 fed_at17.bmp, NONE, 1.1 fed_at18.bmp, NONE,
	1.1 fed_at19.bmp, NONE, 1.1 fed_at20.bmp, NONE,
	1.1 fed_at21.bmp, NONE, 1.1 fed_at22.bmp, NONE,
	1.1 fed_at23.bmp, NONE, 1.1 fed_at24.bmp, NONE,
	1.1 fed_at25.bmp, NONE, 1.1 fed_at26.bmp, NONE,
	1.1 fed_at27.bmp, NONE, 1.1 fed_at28.bmp, NONE,
	1.1 fed_at29.bmp, NONE, 1.1 fed_at30.bmp, NONE,
	1.1 fed_at31.bmp, NONE, 1.1 fed_at32.bmp, NONE, 1.1 fed_bb.bmp,
	NONE, 1.1 fed_bb01.bmp, NONE, 1.1 fed_bb02.bmp, NONE,
	1.1 fed_bb03.bmp, NONE, 1.1 fed_bb04.bmp, NONE,
	1.1 fed_bb05.bmp, NONE, 1.1 fed_bb06.bmp, NONE,
	1.1 fed_bb07.bmp, NONE, 1.1 fed_bb08.bmp, NONE,
	1.1 fed_bb09.bmp, NONE, 1.1 fed_bb10.bmp, NONE,
	1.1 fed_bb11.bmp, NONE, 1.1 fed_bb12.bmp, NONE,
	1.1 fed_bb13.bmp, NONE, 1.1 fed_bb14.bmp, NONE,
	1.1 fed_bb15.bmp, NONE, 1.1 fed_bb16.bmp, NONE,
	1.1 fed_bb17.bmp, NONE, 1.1 fed_bb18.bmp, NONE,
	1.1 fed_bb19.bmp, NONE, 1.1 fed_bb20.bmp, NONE,
	1.1 fed_bb21.bmp, NONE, 1.1 fed_bb22.bmp, NONE,
	1.1 fed_bb23.bmp, NONE, 1.1 fed_bb24.bmp, NONE,
	1.1 fed_bb25.bmp, NONE, 1.1 fed_bb26.bmp, NONE,
	1.1 fed_bb27.bmp, NONE, 1.1 fed_bb28.bmp, NONE,
	1.1 fed_bb29.bmp, NONE, 1.1 fed_bb30.bmp, NONE,
	1.1 fed_bb31.bmp, NONE, 1.1 fed_bb32.bmp, NONE, 1.1 fed_ca.bmp,
	NONE, 1.1 fed_ca01.bmp, NONE, 1.1 fed_ca02.bmp, NONE,
	1.1 fed_ca03.bmp, NONE, 1.1 fed_ca04.bmp, NONE,
	1.1 fed_ca05.bmp, NONE, 1.1 fed_ca06.bmp, NONE,
	1.1 fed_ca07.bmp, NONE, 1.1 fed_ca08.bmp, NONE,
	1.1 fed_ca09.bmp, NONE, 1.1 fed_ca10.bmp, NONE,
	1.1 fed_ca11.bmp, NONE, 1.1 fed_ca12.bmp, NONE,
	1.1 fed_ca13.bmp, NONE, 1.1 fed_ca14.bmp, NONE,
	1.1 fed_ca15.bmp, NONE, 1.1 fed_ca16.bmp, NONE,
	1.1 fed_ca17.bmp, NONE, 1.1 fed_ca18.bmp, NONE,
	1.1 fed_ca19.bmp, NONE, 1.1 fed_ca20.bmp, NONE,
	1.1 fed_ca21.bmp, NONE, 1.1 fed_ca22.bmp, NONE,
	1.1 fed_ca23.bmp, NONE, 1.1 fed_ca24.bmp, NONE,
	1.1 fed_ca25.bmp, NONE, 1.1 fed_ca26.bmp, NONE,
	1.1 fed_ca27.bmp, NONE, 1.1 fed_ca28.bmp, NONE,
	1.1 fed_ca29.bmp, NONE, 1.1 fed_ca30.bmp, NONE,
	1.1 fed_ca31.bmp, NONE, 1.1 fed_ca32.bmp, NONE, 1.1 fed_dd.bmp,
	NONE, 1.1 fed_dd01.bmp, NONE, 1.1 fed_dd02.bmp, NONE,
	1.1 fed_dd03.bmp, NONE, 1.1 fed_dd04.bmp, NONE,
	1.1 fed_dd05.bmp, NONE, 1.1 fed_dd06.bmp, NONE,
	1.1 fed_dd07.bmp, NONE, 1.1 fed_dd08.bmp, NONE,
	1.1 fed_dd09.bmp, NONE, 1.1 fed_dd10.bmp, NONE,
	1.1 fed_dd11.bmp, NONE, 1.1 fed_dd12.bmp, NONE,
	1.1 fed_dd13.bmp, NONE, 1.1 fed_dd14.bmp, NONE,
	1.1 fed_dd15.bmp, NONE, 1.1 fed_dd16.bmp, NONE,
	1.1 fed_dd17.bmp, NONE, 1.1 fed_dd18.bmp, NONE,
	1.1 fed_dd19.bmp, NONE, 1.1 fed_dd20.bmp, NONE,
	1.1 fed_dd21.bmp, NONE, 1.1 fed_dd22.bmp, NONE,
	1.1 fed_dd23.bmp, NONE, 1.1 fed_dd24.bmp, NONE,
	1.1 fed_dd25.bmp, NONE, 1.1 fed_dd26.bmp, NONE,
	1.1 fed_dd27.bmp, NONE, 1.1 fed_dd28.bmp, NONE,
	1.1 fed_dd29.bmp, NONE, 1.1 fed_dd30.bmp, NONE,
	1.1 fed_dd31.bmp, NONE, 1.1 fed_dd32.bmp, NONE, 1.1 fed_ga.bmp,
	NONE, 1.1 fed_ga01.bmp, NONE, 1.1 fed_ga02.bmp, NONE,
	1.1 fed_ga03.bmp, NONE, 1.1 fed_ga04.bmp, NONE,
	1.1 fed_ga05.bmp, NONE, 1.1 fed_ga06.bmp, NONE,
	1.1 fed_ga07.bmp, NONE, 1.1 fed_ga08.bmp, NONE,
	1.1 fed_ga09.bmp, NONE, 1.1 fed_ga10.bmp, NONE,
	1.1 fed_ga11.bmp, NONE, 1.1 fed_ga12.bmp, NONE,
	1.1 fed_ga13.bmp, NONE, 1.1 fed_ga14.bmp, NONE,
	1.1 fed_ga15.bmp, NONE, 1.1 fed_ga16.bmp, NONE,
	1.1 fed_ga17.bmp, NONE, 1.1 fed_ga18.bmp, NONE,
	1.1 fed_ga19.bmp, NONE, 1.1 fed_ga20.bmp, NONE,
	1.1 fed_ga21.bmp, NONE, 1.1 fed_ga22.bmp, NONE,
	1.1 fed_ga23.bmp, NONE, 1.1 fed_ga24.bmp, NONE,
	1.1 fed_ga25.bmp, NONE, 1.1 fed_ga26.bmp, NONE,
	1.1 fed_ga27.bmp, NONE, 1.1 fed_ga28.bmp, NONE,
	1.1 fed_ga29.bmp, NONE, 1.1 fed_ga30.bmp, NONE,
	1.1 fed_ga31.bmp, NONE, 1.1 fed_ga32.bmp, NONE, 1.1 fed_sb.bmp,
	NONE, 1.1 fed_sb01.bmp, NONE, 1.1 fed_sb02.bmp, NONE,
	1.1 fed_sb03.bmp, NONE, 1.1 fed_sb04.bmp, NONE,
	1.1 fed_sb05.bmp, NONE, 1.1 fed_sb06.bmp, NONE,
	1.1 fed_sb07.bmp, NONE, 1.1 fed_sb08.bmp, NONE,
	1.1 fed_sb09.bmp, NONE, 1.1 fed_sb10.bmp, NONE,
	1.1 fed_sb11.bmp, NONE, 1.1 fed_sb12.bmp, NONE,
	1.1 fed_sb13.bmp, NONE, 1.1 fed_sb14.bmp, NONE,
	1.1 fed_sb15.bmp, NONE, 1.1 fed_sb16.bmp, NONE,
	1.1 fed_sb17.bmp, NONE, 1.1 fed_sb18.bmp, NONE,
	1.1 fed_sb19.bmp, NONE, 1.1 fed_sb20.bmp, NONE,
	1.1 fed_sb21.bmp, NONE, 1.1 fed_sb22.bmp, NONE,
	1.1 fed_sb23.bmp, NONE, 1.1 fed_sb24.bmp, NONE,
	1.1 fed_sb25.bmp, NONE, 1.1 fed_sb26.bmp, NONE,
	1.1 fed_sb27.bmp, NONE, 1.1 fed_sb28.bmp, NONE,
	1.1 fed_sb29.bmp, NONE, 1.1 fed_sb30.bmp, NONE,
	1.1 fed_sb31.bmp, NONE, 1.1 fed_sb32.bmp, NONE, 1.1 fed_sc.bmp,
	NONE, 1.1 fed_sc01.bmp, NONE, 1.1 fed_sc02.bmp, NONE,
	1.1 fed_sc03.bmp, NONE, 1.1 fed_sc04.bmp, NONE,
	1.1 fed_sc05.bmp, NONE, 1.1 fed_sc06.bmp, NONE,
	1.1 fed_sc07.bmp, NONE, 1.1 fed_sc08.bmp, NONE,
	1.1 fed_sc09.bmp, NONE, 1.1 fed_sc10.bmp, NONE,
	1.1 fed_sc11.bmp, NONE, 1.1 fed_sc12.bmp, NONE,
	1.1 fed_sc13.bmp, NONE, 1.1 fed_sc14.bmp, NONE,
	1.1 fed_sc15.bmp, NONE, 1.1 fed_sc16.bmp, NONE,
	1.1 fed_sc17.bmp, NONE, 1.1 fed_sc18.bmp, NONE,
	1.1 fed_sc19.bmp, NONE, 1.1 fed_sc20.bmp, NONE,
	1.1 fed_sc21.bmp, NONE, 1.1 fed_sc22.bmp, NONE,
	1.1 fed_sc23.bmp, NONE, 1.1 fed_sc24.bmp, NONE,
	1.1 fed_sc25.bmp, NONE, 1.1 fed_sc26.bmp, NONE,
	1.1 fed_sc27.bmp, NONE, 1.1 fed_sc28.bmp, NONE,
	1.1 fed_sc29.bmp, NONE, 1.1 fed_sc30.bmp, NONE,
	1.1 fed_sc31.bmp, NONE, 1.1 fed_sc32.bmp, NONE,
	1.1 fedshipG.bmp, NONE, 1.1
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/grayscale/fed
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31443/resources/ships/grayscale/fed

Added Files:
	fed_as.bmp fed_as01.bmp fed_as02.bmp fed_as03.bmp fed_as04.bmp 
	fed_as05.bmp fed_as06.bmp fed_as07.bmp fed_as08.bmp 
	fed_as09.bmp fed_as10.bmp fed_as11.bmp fed_as12.bmp 
	fed_as13.bmp fed_as14.bmp fed_as15.bmp fed_as16.bmp 
	fed_as17.bmp fed_as18.bmp fed_as19.bmp fed_as20.bmp 
	fed_as21.bmp fed_as22.bmp fed_as23.bmp fed_as24.bmp 
	fed_as25.bmp fed_as26.bmp fed_as27.bmp fed_as28.bmp 
	fed_as29.bmp fed_as30.bmp fed_as31.bmp fed_as32.bmp fed_at.bmp 
	fed_at01.bmp fed_at02.bmp fed_at03.bmp fed_at04.bmp 
	fed_at05.bmp fed_at06.bmp fed_at07.bmp fed_at08.bmp 
	fed_at09.bmp fed_at10.bmp fed_at11.bmp fed_at12.bmp 
	fed_at13.bmp fed_at14.bmp fed_at15.bmp fed_at16.bmp 
	fed_at17.bmp fed_at18.bmp fed_at19.bmp fed_at20.bmp 
	fed_at21.bmp fed_at22.bmp fed_at23.bmp fed_at24.bmp 
	fed_at25.bmp fed_at26.bmp fed_at27.bmp fed_at28.bmp 
	fed_at29.bmp fed_at30.bmp fed_at31.bmp fed_at32.bmp fed_bb.bmp 
	fed_bb01.bmp fed_bb02.bmp fed_bb03.bmp fed_bb04.bmp 
	fed_bb05.bmp fed_bb06.bmp fed_bb07.bmp fed_bb08.bmp 
	fed_bb09.bmp fed_bb10.bmp fed_bb11.bmp fed_bb12.bmp 
	fed_bb13.bmp fed_bb14.bmp fed_bb15.bmp fed_bb16.bmp 
	fed_bb17.bmp fed_bb18.bmp fed_bb19.bmp fed_bb20.bmp 
	fed_bb21.bmp fed_bb22.bmp fed_bb23.bmp fed_bb24.bmp 
	fed_bb25.bmp fed_bb26.bmp fed_bb27.bmp fed_bb28.bmp 
	fed_bb29.bmp fed_bb30.bmp fed_bb31.bmp fed_bb32.bmp fed_ca.bmp 
	fed_ca01.bmp fed_ca02.bmp fed_ca03.bmp fed_ca04.bmp 
	fed_ca05.bmp fed_ca06.bmp fed_ca07.bmp fed_ca08.bmp 
	fed_ca09.bmp fed_ca10.bmp fed_ca11.bmp fed_ca12.bmp 
	fed_ca13.bmp fed_ca14.bmp fed_ca15.bmp fed_ca16.bmp 
	fed_ca17.bmp fed_ca18.bmp fed_ca19.bmp fed_ca20.bmp 
	fed_ca21.bmp fed_ca22.bmp fed_ca23.bmp fed_ca24.bmp 
	fed_ca25.bmp fed_ca26.bmp fed_ca27.bmp fed_ca28.bmp 
	fed_ca29.bmp fed_ca30.bmp fed_ca31.bmp fed_ca32.bmp fed_dd.bmp 
	fed_dd01.bmp fed_dd02.bmp fed_dd03.bmp fed_dd04.bmp 
	fed_dd05.bmp fed_dd06.bmp fed_dd07.bmp fed_dd08.bmp 
	fed_dd09.bmp fed_dd10.bmp fed_dd11.bmp fed_dd12.bmp 
	fed_dd13.bmp fed_dd14.bmp fed_dd15.bmp fed_dd16.bmp 
	fed_dd17.bmp fed_dd18.bmp fed_dd19.bmp fed_dd20.bmp 
	fed_dd21.bmp fed_dd22.bmp fed_dd23.bmp fed_dd24.bmp 
	fed_dd25.bmp fed_dd26.bmp fed_dd27.bmp fed_dd28.bmp 
	fed_dd29.bmp fed_dd30.bmp fed_dd31.bmp fed_dd32.bmp fed_ga.bmp 
	fed_ga01.bmp fed_ga02.bmp fed_ga03.bmp fed_ga04.bmp 
	fed_ga05.bmp fed_ga06.bmp fed_ga07.bmp fed_ga08.bmp 
	fed_ga09.bmp fed_ga10.bmp fed_ga11.bmp fed_ga12.bmp 
	fed_ga13.bmp fed_ga14.bmp fed_ga15.bmp fed_ga16.bmp 
	fed_ga17.bmp fed_ga18.bmp fed_ga19.bmp fed_ga20.bmp 
	fed_ga21.bmp fed_ga22.bmp fed_ga23.bmp fed_ga24.bmp 
	fed_ga25.bmp fed_ga26.bmp fed_ga27.bmp fed_ga28.bmp 
	fed_ga29.bmp fed_ga30.bmp fed_ga31.bmp fed_ga32.bmp fed_sb.bmp 
	fed_sb01.bmp fed_sb02.bmp fed_sb03.bmp fed_sb04.bmp 
	fed_sb05.bmp fed_sb06.bmp fed_sb07.bmp fed_sb08.bmp 
	fed_sb09.bmp fed_sb10.bmp fed_sb11.bmp fed_sb12.bmp 
	fed_sb13.bmp fed_sb14.bmp fed_sb15.bmp fed_sb16.bmp 
	fed_sb17.bmp fed_sb18.bmp fed_sb19.bmp fed_sb20.bmp 
	fed_sb21.bmp fed_sb22.bmp fed_sb23.bmp fed_sb24.bmp 
	fed_sb25.bmp fed_sb26.bmp fed_sb27.bmp fed_sb28.bmp 
	fed_sb29.bmp fed_sb30.bmp fed_sb31.bmp fed_sb32.bmp fed_sc.bmp 
	fed_sc01.bmp fed_sc02.bmp fed_sc03.bmp fed_sc04.bmp 
	fed_sc05.bmp fed_sc06.bmp fed_sc07.bmp fed_sc08.bmp 
	fed_sc09.bmp fed_sc10.bmp fed_sc11.bmp fed_sc12.bmp 
	fed_sc13.bmp fed_sc14.bmp fed_sc15.bmp fed_sc16.bmp 
	fed_sc17.bmp fed_sc18.bmp fed_sc19.bmp fed_sc20.bmp 
	fed_sc21.bmp fed_sc22.bmp fed_sc23.bmp fed_sc24.bmp 
	fed_sc25.bmp fed_sc26.bmp fed_sc27.bmp fed_sc28.bmp 
	fed_sc29.bmp fed_sc30.bmp fed_sc31.bmp fed_sc32.bmp 
	fedshipG.bmp 
Log Message:
Addition of greyscale and shaded old color full bitmaps to repository.  Along the way, fixed all the base bitmaps so they rotate.

--- NEW FILE: fed_sc01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fedshipG.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at01.bmp ---
(This appears to be a binary file; contents omitted.)



From modemhero at users.sourceforge.net  Fri Apr 21 11:36:42 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:36:42 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/grayscale/kli
	kli_dd14.bmp, NONE, 1.1 kli_dd15.bmp, NONE, 1.1 kli_dd16.bmp,
	NONE, 1.1 kli_dd17.bmp, NONE, 1.1 kli_dd18.bmp, NONE,
	1.1 kli_dd19.bmp, NONE, 1.1 kli_dd20.bmp, NONE,
	1.1 kli_dd21.bmp, NONE, 1.1 kli_dd22.bmp, NONE,
	1.1 kli_dd23.bmp, NONE, 1.1 kli_dd24.bmp, NONE,
	1.1 kli_dd25.bmp, NONE, 1.1 kli_dd26.bmp, NONE,
	1.1 kli_dd27.bmp, NONE, 1.1 kli_dd28.bmp, NONE,
	1.1 kli_dd29.bmp, NONE, 1.1 kli_dd30.bmp, NONE,
	1.1 kli_dd31.bmp, NONE, 1.1 kli_dd32.bmp, NONE, 1.1 kli_ga.bmp,
	NONE, 1.1 kli_ga01.bmp, NONE, 1.1 kli_ga02.bmp, NONE,
	1.1 kli_ga03.bmp, NONE, 1.1 kli_ga04.bmp, NONE,
	1.1 kli_ga05.bmp, NONE, 1.1 kli_ga06.bmp, NONE,
	1.1 kli_ga07.bmp, NONE, 1.1 kli_ga08.bmp, NONE,
	1.1 kli_ga09.bmp, NONE, 1.1 kli_ga10.bmp, NONE,
	1.1 kli_ga11.bmp, NONE, 1.1 kli_ga12.bmp, NONE,
	1.1 kli_ga13.bmp, NONE, 1.1 kli_ga14.bmp, NONE,
	1.1 kli_ga15.bmp, NONE, 1.1 kli_ga16.bmp, NONE,
	1.1 kli_ga17.bmp, NONE, 1.1 kli_ga18.bmp, NONE,
	1.1 kli_ga19.bmp, NONE, 1.1 kli_ga20.bmp, NONE,
	1.1 kli_ga21.bmp, NONE, 1.1 kli_ga22.bmp, NONE,
	1.1 kli_ga23.bmp, NONE, 1.1 kli_ga24.bmp, NONE,
	1.1 kli_ga25.bmp, NONE, 1.1 kli_ga26.bmp, NONE,
	1.1 kli_ga27.bmp, NONE, 1.1 kli_ga28.bmp, NONE,
	1.1 kli_ga29.bmp, NONE, 1.1 kli_ga30.bmp, NONE,
	1.1 kli_ga31.bmp, NONE, 1.1 kli_ga32.bmp, NONE, 1.1 kli_sb.bmp,
	NONE, 1.1 kli_sb01.bmp, NONE, 1.1 kli_sb02.bmp, NONE,
	1.1 kli_sb03.bmp, NONE, 1.1 kli_sb04.bmp, NONE,
	1.1 kli_sb05.bmp, NONE, 1.1 kli_sb06.bmp, NONE,
	1.1 kli_sb07.bmp, NONE, 1.1 kli_sb08.bmp, NONE,
	1.1 kli_sb09.bmp, NONE, 1.1 kli_sb10.bmp, NONE,
	1.1 kli_sb11.bmp, NONE, 1.1 kli_sb12.bmp, NONE,
	1.1 kli_sb13.bmp, NONE, 1.1 kli_sb14.bmp, NONE,
	1.1 kli_sb15.bmp, NONE, 1.1 kli_sb16.bmp, NONE,
	1.1 kli_sb17.bmp, NONE, 1.1 kli_sb18.bmp, NONE,
	1.1 kli_sb19.bmp, NONE, 1.1 kli_sb20.bmp, NONE,
	1.1 kli_sb21.bmp, NONE, 1.1 kli_sb22.bmp, NONE,
	1.1 kli_sb23.bmp, NONE, 1.1 kli_sb24.bmp, NONE,
	1.1 kli_sb25.bmp, NONE, 1.1 kli_sb26.bmp, NONE,
	1.1 kli_sb27.bmp, NONE, 1.1 kli_sb28.bmp, NONE,
	1.1 kli_sb29.bmp, NONE, 1.1 kli_sb30.bmp, NONE,
	1.1 kli_sb31.bmp, NONE, 1.1 kli_sb32.bmp, NONE, 1.1 kli_sc.bmp,
	NONE, 1.1 kli_sc01.bmp, NONE, 1.1 kli_sc02.bmp, NONE,
	1.1 kli_sc03.bmp, NONE, 1.1 kli_sc04.bmp, NONE,
	1.1 kli_sc05.bmp, NONE, 1.1 kli_sc06.bmp, NONE,
	1.1 kli_sc07.bmp, NONE, 1.1 kli_sc08.bmp, NONE,
	1.1 kli_sc09.bmp, NONE, 1.1 kli_sc10.bmp, NONE,
	1.1 kli_sc11.bmp, NONE, 1.1 kli_sc12.bmp, NONE,
	1.1 kli_sc13.bmp, NONE, 1.1 kli_sc14.bmp, NONE,
	1.1 kli_sc15.bmp, NONE, 1.1 kli_sc16.bmp, NONE,
	1.1 kli_sc17.bmp, NONE, 1.1 kli_sc18.bmp, NONE,
	1.1 kli_sc19.bmp, NONE, 1.1 kli_sc20.bmp, NONE,
	1.1 kli_sc21.bmp, NONE, 1.1 kli_sc22.bmp, NONE,
	1.1 kli_sc23.bmp, NONE, 1.1 kli_sc24.bmp, NONE,
	1.1 kli_sc25.bmp, NONE, 1.1 kli_sc26.bmp, NONE,
	1.1 kli_sc27.bmp, NONE, 1.1 kli_sc28.bmp, NONE,
	1.1 kli_sc29.bmp, NONE, 1.1 kli_sc30.bmp, NONE,
	1.1 kli_sc31.bmp, NONE, 1.1 kli_sc32.bmp, NONE,
	1.1 klishipG.bmp, NONE, 1.1
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/grayscale/kli
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31653/resources/ships/grayscale/kli

Added Files:
	kli_dd14.bmp kli_dd15.bmp kli_dd16.bmp kli_dd17.bmp 
	kli_dd18.bmp kli_dd19.bmp kli_dd20.bmp kli_dd21.bmp 
	kli_dd22.bmp kli_dd23.bmp kli_dd24.bmp kli_dd25.bmp 
	kli_dd26.bmp kli_dd27.bmp kli_dd28.bmp kli_dd29.bmp 
	kli_dd30.bmp kli_dd31.bmp kli_dd32.bmp kli_ga.bmp kli_ga01.bmp 
	kli_ga02.bmp kli_ga03.bmp kli_ga04.bmp kli_ga05.bmp 
	kli_ga06.bmp kli_ga07.bmp kli_ga08.bmp kli_ga09.bmp 
	kli_ga10.bmp kli_ga11.bmp kli_ga12.bmp kli_ga13.bmp 
	kli_ga14.bmp kli_ga15.bmp kli_ga16.bmp kli_ga17.bmp 
	kli_ga18.bmp kli_ga19.bmp kli_ga20.bmp kli_ga21.bmp 
	kli_ga22.bmp kli_ga23.bmp kli_ga24.bmp kli_ga25.bmp 
	kli_ga26.bmp kli_ga27.bmp kli_ga28.bmp kli_ga29.bmp 
	kli_ga30.bmp kli_ga31.bmp kli_ga32.bmp kli_sb.bmp kli_sb01.bmp 
	kli_sb02.bmp kli_sb03.bmp kli_sb04.bmp kli_sb05.bmp 
	kli_sb06.bmp kli_sb07.bmp kli_sb08.bmp kli_sb09.bmp 
	kli_sb10.bmp kli_sb11.bmp kli_sb12.bmp kli_sb13.bmp 
	kli_sb14.bmp kli_sb15.bmp kli_sb16.bmp kli_sb17.bmp 
	kli_sb18.bmp kli_sb19.bmp kli_sb20.bmp kli_sb21.bmp 
	kli_sb22.bmp kli_sb23.bmp kli_sb24.bmp kli_sb25.bmp 
	kli_sb26.bmp kli_sb27.bmp kli_sb28.bmp kli_sb29.bmp 
	kli_sb30.bmp kli_sb31.bmp kli_sb32.bmp kli_sc.bmp kli_sc01.bmp 
	kli_sc02.bmp kli_sc03.bmp kli_sc04.bmp kli_sc05.bmp 
	kli_sc06.bmp kli_sc07.bmp kli_sc08.bmp kli_sc09.bmp 
	kli_sc10.bmp kli_sc11.bmp kli_sc12.bmp kli_sc13.bmp 
	kli_sc14.bmp kli_sc15.bmp kli_sc16.bmp kli_sc17.bmp 
	kli_sc18.bmp kli_sc19.bmp kli_sc20.bmp kli_sc21.bmp 
	kli_sc22.bmp kli_sc23.bmp kli_sc24.bmp kli_sc25.bmp 
	kli_sc26.bmp kli_sc27.bmp kli_sc28.bmp kli_sc29.bmp 
	kli_sc30.bmp kli_sc31.bmp kli_sc32.bmp klishipG.bmp 
Log Message:
Addition of greyscale and shaded old color full bitmaps to repository.  Along the way, fixed all the base bitmaps so they rotate.

--- NEW FILE: kli_sb22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: klishipG.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb17.bmp ---
(This appears to be a binary file; contents omitted.)



From modemhero at users.sourceforge.net  Fri Apr 21 11:36:42 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:36:42 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/grayscale/rom
	rom_as.bmp, NONE, 1.1 rom_as01.bmp, NONE, 1.1 rom_as02.bmp,
	NONE, 1.1 rom_as03.bmp, NONE, 1.1 rom_as04.bmp, NONE,
	1.1 rom_as05.bmp, NONE, 1.1 rom_as06.bmp, NONE,
	1.1 rom_as07.bmp, NONE, 1.1 rom_as08.bmp, NONE,
	1.1 rom_as09.bmp, NONE, 1.1 rom_as10.bmp, NONE,
	1.1 rom_as11.bmp, NONE, 1.1 rom_as12.bmp, NONE,
	1.1 rom_as13.bmp, NONE, 1.1 rom_as14.bmp, NONE,
	1.1 rom_as15.bmp, NONE, 1.1 rom_as16.bmp, NONE,
	1.1 rom_as17.bmp, NONE, 1.1 rom_as18.bmp, NONE,
	1.1 rom_as19.bmp, NONE, 1.1 rom_as20.bmp, NONE,
	1.1 rom_as21.bmp, NONE, 1.1 rom_as22.bmp, NONE,
	1.1 rom_as23.bmp, NONE, 1.1 rom_as24.bmp, NONE,
	1.1 rom_as25.bmp, NONE, 1.1 rom_as26.bmp, NONE,
	1.1 rom_as27.bmp, NONE, 1.1 rom_as28.bmp, NONE,
	1.1 rom_as29.bmp, NONE, 1.1 rom_as30.bmp, NONE,
	1.1 rom_as31.bmp, NONE, 1.1 rom_as32.bmp, NONE, 1.1 rom_at.bmp,
	NONE, 1.1 rom_at01.bmp, NONE, 1.1 rom_at02.bmp, NONE,
	1.1 rom_at03.bmp, NONE, 1.1 rom_at04.bmp, NONE,
	1.1 rom_at05.bmp, NONE, 1.1 rom_at06.bmp, NONE,
	1.1 rom_at07.bmp, NONE, 1.1 rom_at08.bmp, NONE,
	1.1 rom_at09.bmp, NONE, 1.1 rom_at10.bmp, NONE,
	1.1 rom_at11.bmp, NONE, 1.1 rom_at12.bmp, NONE,
	1.1 rom_at13.bmp, NONE, 1.1 rom_at14.bmp, NONE,
	1.1 rom_at15.bmp, NONE, 1.1 rom_at16.bmp, NONE,
	1.1 rom_at17.bmp, NONE, 1.1 rom_at18.bmp, NONE,
	1.1 rom_at19.bmp, NONE, 1.1 rom_at20.bmp, NONE,
	1.1 rom_at21.bmp, NONE, 1.1 rom_at22.bmp, NONE,
	1.1 rom_at23.bmp, NONE, 1.1 rom_at24.bmp, NONE,
	1.1 rom_at25.bmp, NONE, 1.1 rom_at26.bmp, NONE,
	1.1 rom_at27.bmp, NONE, 1.1 rom_at28.bmp, NONE,
	1.1 rom_at29.bmp, NONE, 1.1 rom_at30.bmp, NONE,
	1.1 rom_at31.bmp, NONE, 1.1 rom_at32.bmp, NONE, 1.1 rom_bb.bmp,
	NONE, 1.1 rom_bb01.bmp, NONE, 1.1 rom_bb02.bmp, NONE,
	1.1 rom_bb03.bmp, NONE, 1.1 rom_bb04.bmp, NONE,
	1.1 rom_bb05.bmp, NONE, 1.1 rom_bb06.bmp, NONE,
	1.1 rom_bb07.bmp, NONE, 1.1 rom_bb08.bmp, NONE,
	1.1 rom_bb09.bmp, NONE, 1.1 rom_bb10.bmp, NONE,
	1.1 rom_bb11.bmp, NONE, 1.1 rom_bb12.bmp, NONE,
	1.1 rom_bb13.bmp, NONE, 1.1 rom_bb14.bmp, NONE,
	1.1 rom_bb15.bmp, NONE, 1.1 rom_bb16.bmp, NONE,
	1.1 rom_bb17.bmp, NONE, 1.1 rom_bb18.bmp, NONE,
	1.1 rom_bb19.bmp, NONE, 1.1 rom_bb20.bmp, NONE,
	1.1 rom_bb21.bmp, NONE, 1.1 rom_bb22.bmp, NONE,
	1.1 rom_bb23.bmp, NONE, 1.1 rom_bb24.bmp, NONE,
	1.1 rom_bb25.bmp, NONE, 1.1 rom_bb26.bmp, NONE,
	1.1 rom_bb27.bmp, NONE, 1.1 rom_bb28.bmp, NONE,
	1.1 rom_bb29.bmp, NONE, 1.1 rom_bb30.bmp, NONE,
	1.1 rom_bb31.bmp, NONE, 1.1 rom_bb32.bmp, NONE, 1.1 rom_ca.bmp,
	NONE, 1.1 rom_ca01.bmp, NONE, 1.1 rom_ca02.bmp, NONE,
	1.1 rom_ca03.bmp, NONE, 1.1 rom_ca04.bmp, NONE,
	1.1 rom_ca05.bmp, NONE, 1.1 rom_ca06.bmp, NONE,
	1.1 rom_ca07.bmp, NONE, 1.1 rom_ca08.bmp, NONE,
	1.1 rom_ca09.bmp, NONE, 1.1 rom_ca10.bmp, NONE,
	1.1 rom_ca11.bmp, NONE, 1.1 rom_ca12.bmp, NONE,
	1.1 rom_ca13.bmp, NONE, 1.1 rom_ca14.bmp, NONE,
	1.1 rom_ca15.bmp, NONE, 1.1 rom_ca16.bmp, NONE,
	1.1 rom_ca17.bmp, NONE, 1.1 rom_ca18.bmp, NONE,
	1.1 rom_ca19.bmp, NONE, 1.1 rom_ca20.bmp, NONE,
	1.1 rom_ca21.bmp, NONE, 1.1 rom_ca22.bmp, NONE,
	1.1 rom_ca23.bmp, NONE, 1.1 rom_ca24.bmp, NONE,
	1.1 rom_ca25.bmp, NONE, 1.1 rom_ca26.bmp, NONE,
	1.1 rom_ca27.bmp, NONE, 1.1 rom_ca28.bmp, NONE,
	1.1 rom_ca29.bmp, NONE, 1.1 rom_ca30.bmp, NONE,
	1.1 rom_ca31.bmp, NONE, 1.1 rom_ca32.bmp, NONE, 1.1 rom_dd.bmp,
	NONE, 1.1 rom_dd01.bmp, NONE, 1.1 rom_dd02.bmp, NONE,
	1.1 rom_dd03.bmp, NONE, 1.1 rom_dd04.bmp, NONE,
	1.1 rom_dd05.bmp, NONE, 1.1 rom_dd06.bmp, NONE,
	1.1 rom_dd07.bmp, NONE, 1.1 rom_dd08.bmp, NONE,
	1.1 rom_dd09.bmp, NONE, 1.1 rom_dd10.bmp, NONE,
	1.1 rom_dd11.bmp, NONE, 1.1 rom_dd12.bmp, NONE,
	1.1 rom_dd13.bmp, NONE, 1.1 rom_dd14.bmp, NONE,
	1.1 rom_dd15.bmp, NONE, 1.1 rom_dd16.bmp, NONE,
	1.1 rom_dd17.bmp, NONE, 1.1 rom_dd18.bmp, NONE,
	1.1 rom_dd19.bmp, NONE, 1.1 rom_dd20.bmp, NONE,
	1.1 rom_dd21.bmp, NONE, 1.1 rom_dd22.bmp, NONE,
	1.1 rom_dd23.bmp, NONE, 1.1 rom_dd24.bmp, NONE,
	1.1 rom_dd25.bmp, NONE, 1.1 rom_dd26.bmp, NONE,
	1.1 rom_dd27.bmp, NONE, 1.1 rom_dd28.bmp, NONE,
	1.1 rom_dd29.bmp, NONE, 1.1 rom_dd30.bmp, NONE,
	1.1 rom_dd31.bmp, NONE, 1.1 rom_dd32.bmp, NONE, 1.1 rom_ga.bmp,
	NONE, 1.1 rom_ga01.bmp, NONE, 1.1 rom_ga02.bmp, NONE,
	1.1 rom_ga03.bmp, NONE, 1.1 rom_ga04.bmp, NONE,
	1.1 rom_ga05.bmp, NONE, 1.1 rom_ga06.bmp, NONE,
	1.1 rom_ga07.bmp, NONE, 1.1 rom_ga08.bmp, NONE,
	1.1 rom_ga09.bmp, NONE, 1.1 rom_ga10.bmp, NONE,
	1.1 rom_ga11.bmp, NONE, 1.1 rom_ga12.bmp, NONE,
	1.1 rom_ga13.bmp, NONE, 1.1 rom_ga14.bmp, NONE,
	1.1 rom_ga15.bmp, NONE, 1.1 rom_ga16.bmp, NONE,
	1.1 rom_ga17.bmp, NONE, 1.1 rom_ga18.bmp, NONE,
	1.1 rom_ga19.bmp, NONE, 1.1 rom_ga20.bmp, NONE,
	1.1 rom_ga21.bmp, NONE, 1.1 rom_ga22.bmp, NONE,
	1.1 rom_ga23.bmp, NONE, 1.1 rom_ga24.bmp, NONE,
	1.1 rom_ga25.bmp, NONE, 1.1 rom_ga26.bmp, NONE,
	1.1 rom_ga27.bmp, NONE, 1.1 rom_ga28.bmp, NONE,
	1.1 rom_ga29.bmp, NONE, 1.1 rom_ga30.bmp, NONE,
	1.1 rom_ga31.bmp, NONE, 1.1 rom_ga32.bmp, NONE, 1.1 rom_sb.bmp,
	NONE, 1.1 rom_sb01.bmp, NONE, 1.1 rom_sb02.bmp, NONE,
	1.1 rom_sb03.bmp, NONE, 1.1 rom_sb04.bmp, NONE,
	1.1 rom_sb05.bmp, NONE, 1.1 rom_sb06.bmp, NONE,
	1.1 rom_sb07.bmp, NONE, 1.1 rom_sb08.bmp, NONE,
	1.1 rom_sb09.bmp, NONE, 1.1 rom_sb10.bmp, NONE,
	1.1 rom_sb11.bmp, NONE, 1.1 rom_sb12.bmp, NONE,
	1.1 rom_sb13.bmp, NONE, 1.1 rom_sb14.bmp, NONE,
	1.1 rom_sb15.bmp, NONE, 1.1 rom_sb16.bmp, NONE,
	1.1 rom_sb17.bmp, NONE, 1.1 rom_sb18.bmp, NONE,
	1.1 rom_sb19.bmp, NONE, 1.1 rom_sb20.bmp, NONE,
	1.1 rom_sb21.bmp, NONE, 1.1 rom_sb22.bmp, NONE,
	1.1 rom_sb23.bmp, NONE, 1.1 rom_sb24.bmp, NONE,
	1.1 rom_sb25.bmp, NONE, 1.1 rom_sb26.bmp, NONE,
	1.1 rom_sb27.bmp, NONE, 1.1 rom_sb28.bmp, NONE,
	1.1 rom_sb29.bmp, NONE, 1.1 rom_sb30.bmp, NONE,
	1.1 rom_sb31.bmp, NONE, 1.1 rom_sb32.bmp, NONE, 1.1 rom_sc.bmp,
	NONE, 1.1 rom_sc01.bmp, NONE, 1.1 rom_sc02.bmp, NONE,
	1.1 rom_sc03.bmp, NONE, 1.1 rom_sc04.bmp, NONE,
	1.1 rom_sc05.bmp, NONE, 1.1 rom_sc06.bmp, NONE,
	1.1 rom_sc07.bmp, NONE, 1.1 rom_sc08.bmp, NONE,
	1.1 rom_sc09.bmp, NONE, 1.1 rom_sc10.bmp, NONE,
	1.1 rom_sc11.bmp, NONE, 1.1 rom_sc12.bmp, NONE,
	1.1 rom_sc13.bmp, NONE, 1.1 rom_sc14.bmp, NONE,
	1.1 rom_sc15.bmp, NONE, 1.1 rom_sc16.bmp, NONE,
	1.1 rom_sc17.bmp, NONE, 1.1 rom_sc18.bmp, NONE,
	1.1 rom_sc19.bmp, NONE, 1.1 rom_sc20.bmp, NONE,
	1.1 rom_sc21.bmp, NONE, 1.1 rom_sc22.bmp, NONE,
	1.1 rom_sc23.bmp, NONE, 1.1 rom_sc24.bmp, NONE,
	1.1 rom_sc25.bmp, NONE, 1.1 rom_sc26.bmp, NONE,
	1.1 rom_sc27.bmp, NONE, 1.1 rom_sc28.bmp, NONE,
	1.1 rom_sc29.bmp, NONE, 1.1 rom_sc30.bmp, NONE,
	1.1 rom_sc31.bmp, NONE, 1.1 rom_sc32.bmp, NONE,
	1.1 romshipG.bmp, NONE, 1.1
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/grayscale/rom
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31653/resources/ships/grayscale/rom

Added Files:
	rom_as.bmp rom_as01.bmp rom_as02.bmp rom_as03.bmp rom_as04.bmp 
	rom_as05.bmp rom_as06.bmp rom_as07.bmp rom_as08.bmp 
	rom_as09.bmp rom_as10.bmp rom_as11.bmp rom_as12.bmp 
	rom_as13.bmp rom_as14.bmp rom_as15.bmp rom_as16.bmp 
	rom_as17.bmp rom_as18.bmp rom_as19.bmp rom_as20.bmp 
	rom_as21.bmp rom_as22.bmp rom_as23.bmp rom_as24.bmp 
	rom_as25.bmp rom_as26.bmp rom_as27.bmp rom_as28.bmp 
	rom_as29.bmp rom_as30.bmp rom_as31.bmp rom_as32.bmp rom_at.bmp 
	rom_at01.bmp rom_at02.bmp rom_at03.bmp rom_at04.bmp 
	rom_at05.bmp rom_at06.bmp rom_at07.bmp rom_at08.bmp 
	rom_at09.bmp rom_at10.bmp rom_at11.bmp rom_at12.bmp 
	rom_at13.bmp rom_at14.bmp rom_at15.bmp rom_at16.bmp 
	rom_at17.bmp rom_at18.bmp rom_at19.bmp rom_at20.bmp 
	rom_at21.bmp rom_at22.bmp rom_at23.bmp rom_at24.bmp 
	rom_at25.bmp rom_at26.bmp rom_at27.bmp rom_at28.bmp 
	rom_at29.bmp rom_at30.bmp rom_at31.bmp rom_at32.bmp rom_bb.bmp 
	rom_bb01.bmp rom_bb02.bmp rom_bb03.bmp rom_bb04.bmp 
	rom_bb05.bmp rom_bb06.bmp rom_bb07.bmp rom_bb08.bmp 
	rom_bb09.bmp rom_bb10.bmp rom_bb11.bmp rom_bb12.bmp 
	rom_bb13.bmp rom_bb14.bmp rom_bb15.bmp rom_bb16.bmp 
	rom_bb17.bmp rom_bb18.bmp rom_bb19.bmp rom_bb20.bmp 
	rom_bb21.bmp rom_bb22.bmp rom_bb23.bmp rom_bb24.bmp 
	rom_bb25.bmp rom_bb26.bmp rom_bb27.bmp rom_bb28.bmp 
	rom_bb29.bmp rom_bb30.bmp rom_bb31.bmp rom_bb32.bmp rom_ca.bmp 
	rom_ca01.bmp rom_ca02.bmp rom_ca03.bmp rom_ca04.bmp 
	rom_ca05.bmp rom_ca06.bmp rom_ca07.bmp rom_ca08.bmp 
	rom_ca09.bmp rom_ca10.bmp rom_ca11.bmp rom_ca12.bmp 
	rom_ca13.bmp rom_ca14.bmp rom_ca15.bmp rom_ca16.bmp 
	rom_ca17.bmp rom_ca18.bmp rom_ca19.bmp rom_ca20.bmp 
	rom_ca21.bmp rom_ca22.bmp rom_ca23.bmp rom_ca24.bmp 
	rom_ca25.bmp rom_ca26.bmp rom_ca27.bmp rom_ca28.bmp 
	rom_ca29.bmp rom_ca30.bmp rom_ca31.bmp rom_ca32.bmp rom_dd.bmp 
	rom_dd01.bmp rom_dd02.bmp rom_dd03.bmp rom_dd04.bmp 
	rom_dd05.bmp rom_dd06.bmp rom_dd07.bmp rom_dd08.bmp 
	rom_dd09.bmp rom_dd10.bmp rom_dd11.bmp rom_dd12.bmp 
	rom_dd13.bmp rom_dd14.bmp rom_dd15.bmp rom_dd16.bmp 
	rom_dd17.bmp rom_dd18.bmp rom_dd19.bmp rom_dd20.bmp 
	rom_dd21.bmp rom_dd22.bmp rom_dd23.bmp rom_dd24.bmp 
	rom_dd25.bmp rom_dd26.bmp rom_dd27.bmp rom_dd28.bmp 
	rom_dd29.bmp rom_dd30.bmp rom_dd31.bmp rom_dd32.bmp rom_ga.bmp 
	rom_ga01.bmp rom_ga02.bmp rom_ga03.bmp rom_ga04.bmp 
	rom_ga05.bmp rom_ga06.bmp rom_ga07.bmp rom_ga08.bmp 
	rom_ga09.bmp rom_ga10.bmp rom_ga11.bmp rom_ga12.bmp 
	rom_ga13.bmp rom_ga14.bmp rom_ga15.bmp rom_ga16.bmp 
	rom_ga17.bmp rom_ga18.bmp rom_ga19.bmp rom_ga20.bmp 
	rom_ga21.bmp rom_ga22.bmp rom_ga23.bmp rom_ga24.bmp 
	rom_ga25.bmp rom_ga26.bmp rom_ga27.bmp rom_ga28.bmp 
	rom_ga29.bmp rom_ga30.bmp rom_ga31.bmp rom_ga32.bmp rom_sb.bmp 
	rom_sb01.bmp rom_sb02.bmp rom_sb03.bmp rom_sb04.bmp 
	rom_sb05.bmp rom_sb06.bmp rom_sb07.bmp rom_sb08.bmp 
	rom_sb09.bmp rom_sb10.bmp rom_sb11.bmp rom_sb12.bmp 
	rom_sb13.bmp rom_sb14.bmp rom_sb15.bmp rom_sb16.bmp 
	rom_sb17.bmp rom_sb18.bmp rom_sb19.bmp rom_sb20.bmp 
	rom_sb21.bmp rom_sb22.bmp rom_sb23.bmp rom_sb24.bmp 
	rom_sb25.bmp rom_sb26.bmp rom_sb27.bmp rom_sb28.bmp 
	rom_sb29.bmp rom_sb30.bmp rom_sb31.bmp rom_sb32.bmp rom_sc.bmp 
	rom_sc01.bmp rom_sc02.bmp rom_sc03.bmp rom_sc04.bmp 
	rom_sc05.bmp rom_sc06.bmp rom_sc07.bmp rom_sc08.bmp 
	rom_sc09.bmp rom_sc10.bmp rom_sc11.bmp rom_sc12.bmp 
	rom_sc13.bmp rom_sc14.bmp rom_sc15.bmp rom_sc16.bmp 
	rom_sc17.bmp rom_sc18.bmp rom_sc19.bmp rom_sc20.bmp 
	rom_sc21.bmp rom_sc22.bmp rom_sc23.bmp rom_sc24.bmp 
	rom_sc25.bmp rom_sc26.bmp rom_sc27.bmp rom_sc28.bmp 
	rom_sc29.bmp rom_sc30.bmp rom_sc31.bmp rom_sc32.bmp 
	romshipG.bmp 
Log Message:
Addition of greyscale and shaded old color full bitmaps to repository.  Along the way, fixed all the base bitmaps so they rotate.

--- NEW FILE: rom_as11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: romshipG.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as28.bmp ---
(This appears to be a binary file; contents omitted.)



From modemhero at users.sourceforge.net  Fri Apr 21 11:36:42 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:36:42 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/grayscale/ori
	ori_as.bmp, NONE, 1.1 ori_as01.bmp, NONE, 1.1 ori_as02.bmp,
	NONE, 1.1 ori_as03.bmp, NONE, 1.1 ori_as04.bmp, NONE,
	1.1 ori_as05.bmp, NONE, 1.1 ori_as06.bmp, NONE,
	1.1 ori_as07.bmp, NONE, 1.1 ori_as08.bmp, NONE,
	1.1 ori_as09.bmp, NONE, 1.1 ori_as10.bmp, NONE,
	1.1 ori_as11.bmp, NONE, 1.1 ori_as12.bmp, NONE,
	1.1 ori_as13.bmp, NONE, 1.1 ori_as14.bmp, NONE,
	1.1 ori_as15.bmp, NONE, 1.1 ori_as16.bmp, NONE,
	1.1 ori_as17.bmp, NONE, 1.1 ori_as18.bmp, NONE,
	1.1 ori_as19.bmp, NONE, 1.1 ori_as20.bmp, NONE,
	1.1 ori_as21.bmp, NONE, 1.1 ori_as22.bmp, NONE,
	1.1 ori_as23.bmp, NONE, 1.1 ori_as24.bmp, NONE,
	1.1 ori_as25.bmp, NONE, 1.1 ori_as26.bmp, NONE,
	1.1 ori_as27.bmp, NONE, 1.1 ori_as28.bmp, NONE,
	1.1 ori_as29.bmp, NONE, 1.1 ori_as30.bmp, NONE,
	1.1 ori_as31.bmp, NONE, 1.1 ori_as32.bmp, NONE, 1.1 ori_at.bmp,
	NONE, 1.1 ori_at01.bmp, NONE, 1.1 ori_at02.bmp, NONE,
	1.1 ori_at03.bmp, NONE, 1.1 ori_at04.bmp, NONE,
	1.1 ori_at05.bmp, NONE, 1.1 ori_at06.bmp, NONE,
	1.1 ori_at07.bmp, NONE, 1.1 ori_at08.bmp, NONE,
	1.1 ori_at09.bmp, NONE, 1.1 ori_at10.bmp, NONE,
	1.1 ori_at11.bmp, NONE, 1.1 ori_at12.bmp, NONE,
	1.1 ori_at13.bmp, NONE, 1.1 ori_at14.bmp, NONE,
	1.1 ori_at15.bmp, NONE, 1.1 ori_at16.bmp, NONE,
	1.1 ori_at17.bmp, NONE, 1.1 ori_at18.bmp, NONE,
	1.1 ori_at19.bmp, NONE, 1.1 ori_at20.bmp, NONE,
	1.1 ori_at21.bmp, NONE, 1.1 ori_at22.bmp, NONE,
	1.1 ori_at23.bmp, NONE, 1.1 ori_at24.bmp, NONE,
	1.1 ori_at25.bmp, NONE, 1.1 ori_at26.bmp, NONE,
	1.1 ori_at27.bmp, NONE, 1.1 ori_at28.bmp, NONE,
	1.1 ori_at29.bmp, NONE, 1.1 ori_at30.bmp, NONE,
	1.1 ori_at31.bmp, NONE, 1.1 ori_at32.bmp, NONE, 1.1 ori_bb.bmp,
	NONE, 1.1 ori_bb01.bmp, NONE, 1.1 ori_bb02.bmp, NONE,
	1.1 ori_bb03.bmp, NONE, 1.1 ori_bb04.bmp, NONE,
	1.1 ori_bb05.bmp, NONE, 1.1 ori_bb06.bmp, NONE,
	1.1 ori_bb07.bmp, NONE, 1.1 ori_bb08.bmp, NONE,
	1.1 ori_bb09.bmp, NONE, 1.1 ori_bb10.bmp, NONE,
	1.1 ori_bb11.bmp, NONE, 1.1 ori_bb12.bmp, NONE,
	1.1 ori_bb13.bmp, NONE, 1.1 ori_bb14.bmp, NONE,
	1.1 ori_bb15.bmp, NONE, 1.1 ori_bb16.bmp, NONE,
	1.1 ori_bb17.bmp, NONE, 1.1 ori_bb18.bmp, NONE,
	1.1 ori_bb19.bmp, NONE, 1.1 ori_bb20.bmp, NONE,
	1.1 ori_bb21.bmp, NONE, 1.1 ori_bb22.bmp, NONE,
	1.1 ori_bb23.bmp, NONE, 1.1 ori_bb24.bmp, NONE,
	1.1 ori_bb25.bmp, NONE, 1.1 ori_bb26.bmp, NONE,
	1.1 ori_bb27.bmp, NONE, 1.1 ori_bb28.bmp, NONE,
	1.1 ori_bb29.bmp, NONE, 1.1 ori_bb30.bmp, NONE,
	1.1 ori_bb31.bmp, NONE, 1.1 ori_bb32.bmp, NONE, 1.1 ori_ca.bmp,
	NONE, 1.1 ori_ca01.bmp, NONE, 1.1 ori_ca02.bmp, NONE,
	1.1 ori_ca03.bmp, NONE, 1.1 ori_ca04.bmp, NONE,
	1.1 ori_ca05.bmp, NONE, 1.1 ori_ca06.bmp, NONE,
	1.1 ori_ca07.bmp, NONE, 1.1 ori_ca08.bmp, NONE,
	1.1 ori_ca09.bmp, NONE, 1.1 ori_ca10.bmp, NONE,
	1.1 ori_ca11.bmp, NONE, 1.1 ori_ca12.bmp, NONE,
	1.1 ori_ca13.bmp, NONE, 1.1 ori_ca14.bmp, NONE,
	1.1 ori_ca15.bmp, NONE, 1.1 ori_ca16.bmp, NONE,
	1.1 ori_ca17.bmp, NONE, 1.1 ori_ca18.bmp, NONE,
	1.1 ori_ca19.bmp, NONE, 1.1 ori_ca20.bmp, NONE,
	1.1 ori_ca21.bmp, NONE, 1.1 ori_ca22.bmp, NONE,
	1.1 ori_ca23.bmp, NONE, 1.1 ori_ca24.bmp, NONE,
	1.1 ori_ca25.bmp, NONE, 1.1 ori_ca26.bmp, NONE,
	1.1 ori_ca27.bmp, NONE, 1.1 ori_ca28.bmp, NONE,
	1.1 ori_ca29.bmp, NONE, 1.1 ori_ca30.bmp, NONE,
	1.1 ori_ca31.bmp, NONE, 1.1 ori_ca32.bmp, NONE, 1.1 ori_dd.bmp,
	NONE, 1.1 ori_dd01.bmp, NONE, 1.1 ori_dd02.bmp, NONE,
	1.1 ori_dd03.bmp, NONE, 1.1 ori_dd04.bmp, NONE,
	1.1 ori_dd05.bmp, NONE, 1.1 ori_dd06.bmp, NONE,
	1.1 ori_dd07.bmp, NONE, 1.1 ori_dd08.bmp, NONE,
	1.1 ori_dd09.bmp, NONE, 1.1 ori_dd10.bmp, NONE,
	1.1 ori_dd11.bmp, NONE, 1.1 ori_dd12.bmp, NONE,
	1.1 ori_dd13.bmp, NONE, 1.1 ori_dd14.bmp, NONE,
	1.1 ori_dd15.bmp, NONE, 1.1 ori_dd16.bmp, NONE,
	1.1 ori_dd17.bmp, NONE, 1.1 ori_dd18.bmp, NONE,
	1.1 ori_dd19.bmp, NONE, 1.1 ori_dd20.bmp, NONE,
	1.1 ori_dd21.bmp, NONE, 1.1 ori_dd22.bmp, NONE,
	1.1 ori_dd23.bmp, NONE, 1.1 ori_dd24.bmp, NONE,
	1.1 ori_dd25.bmp, NONE, 1.1 ori_dd26.bmp, NONE,
	1.1 ori_dd27.bmp, NONE, 1.1 ori_dd28.bmp, NONE,
	1.1 ori_dd29.bmp, NONE, 1.1 ori_dd30.bmp, NONE,
	1.1 ori_dd31.bmp, NONE, 1.1 ori_dd32.bmp, NONE, 1.1 ori_ga.bmp,
	NONE, 1.1 ori_ga01.bmp, NONE, 1.1 ori_ga02.bmp, NONE,
	1.1 ori_ga03.bmp, NONE, 1.1 ori_ga04.bmp, NONE,
	1.1 ori_ga05.bmp, NONE, 1.1 ori_ga06.bmp, NONE,
	1.1 ori_ga07.bmp, NONE, 1.1 ori_ga08.bmp, NONE,
	1.1 ori_ga09.bmp, NONE, 1.1 ori_ga10.bmp, NONE,
	1.1 ori_ga11.bmp, NONE, 1.1 ori_ga12.bmp, NONE,
	1.1 ori_ga13.bmp, NONE, 1.1 ori_ga14.bmp, NONE,
	1.1 ori_ga15.bmp, NONE, 1.1 ori_ga16.bmp, NONE,
	1.1 ori_ga17.bmp, NONE, 1.1 ori_ga18.bmp, NONE,
	1.1 ori_ga19.bmp, NONE, 1.1 ori_ga20.bmp, NONE,
	1.1 ori_ga21.bmp, NONE, 1.1 ori_ga22.bmp, NONE,
	1.1 ori_ga23.bmp, NONE, 1.1 ori_ga24.bmp, NONE,
	1.1 ori_ga25.bmp, NONE, 1.1 ori_ga26.bmp, NONE,
	1.1 ori_ga27.bmp, NONE, 1.1 ori_ga28.bmp, NONE,
	1.1 ori_ga29.bmp, NONE, 1.1 ori_ga30.bmp, NONE,
	1.1 ori_ga31.bmp, NONE, 1.1 ori_ga32.bmp, NONE, 1.1 ori_sb.bmp,
	NONE, 1.1 ori_sb01.bmp, NONE, 1.1 ori_sb02.bmp, NONE,
	1.1 ori_sb03.bmp, NONE, 1.1 ori_sb04.bmp, NONE,
	1.1 ori_sb05.bmp, NONE, 1.1 ori_sb06.bmp, NONE,
	1.1 ori_sb07.bmp, NONE, 1.1 ori_sb08.bmp, NONE,
	1.1 ori_sb09.bmp, NONE, 1.1 ori_sb10.bmp, NONE,
	1.1 ori_sb11.bmp, NONE, 1.1 ori_sb12.bmp, NONE,
	1.1 ori_sb13.bmp, NONE, 1.1 ori_sb14.bmp, NONE,
	1.1 ori_sb15.bmp, NONE, 1.1 ori_sb16.bmp, NONE,
	1.1 ori_sb17.bmp, NONE, 1.1 ori_sb18.bmp, NONE,
	1.1 ori_sb19.bmp, NONE, 1.1 ori_sb20.bmp, NONE,
	1.1 ori_sb21.bmp, NONE, 1.1 ori_sb22.bmp, NONE,
	1.1 ori_sb23.bmp, NONE, 1.1 ori_sb24.bmp, NONE,
	1.1 ori_sb25.bmp, NONE, 1.1 ori_sb26.bmp, NONE,
	1.1 ori_sb27.bmp, NONE, 1.1 ori_sb28.bmp, NONE,
	1.1 ori_sb29.bmp, NONE, 1.1 ori_sb30.bmp, NONE,
	1.1 ori_sb31.bmp, NONE, 1.1 ori_sb32.bmp, NONE, 1.1 ori_sc.bmp,
	NONE, 1.1 ori_sc01.bmp, NONE, 1.1 ori_sc02.bmp, NONE,
	1.1 ori_sc03.bmp, NONE, 1.1 ori_sc04.bmp, NONE,
	1.1 ori_sc05.bmp, NONE, 1.1 ori_sc06.bmp, NONE,
	1.1 ori_sc07.bmp, NONE, 1.1 ori_sc08.bmp, NONE,
	1.1 ori_sc09.bmp, NONE, 1.1 ori_sc10.bmp, NONE,
	1.1 ori_sc11.bmp, NONE, 1.1 ori_sc12.bmp, NONE,
	1.1 ori_sc13.bmp, NONE, 1.1 ori_sc14.bmp, NONE,
	1.1 ori_sc15.bmp, NONE, 1.1 ori_sc16.bmp, NONE,
	1.1 ori_sc17.bmp, NONE, 1.1 ori_sc18.bmp, NONE,
	1.1 ori_sc19.bmp, NONE, 1.1 ori_sc20.bmp, NONE,
	1.1 ori_sc21.bmp, NONE, 1.1 ori_sc22.bmp, NONE,
	1.1 ori_sc23.bmp, NONE, 1.1 ori_sc24.bmp, NONE,
	1.1 ori_sc25.bmp, NONE, 1.1 ori_sc26.bmp, NONE,
	1.1 ori_sc27.bmp, NONE, 1.1 ori_sc28.bmp, NONE,
	1.1 ori_sc29.bmp, NONE, 1.1 ori_sc30.bmp, NONE,
	1.1 ori_sc31.bmp, NONE, 1.1 ori_sc32.bmp, NONE,
	1.1 orishipG.bmp, NONE, 1.1
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/grayscale/ori
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31653/resources/ships/grayscale/ori

Added Files:
	ori_as.bmp ori_as01.bmp ori_as02.bmp ori_as03.bmp ori_as04.bmp 
	ori_as05.bmp ori_as06.bmp ori_as07.bmp ori_as08.bmp 
	ori_as09.bmp ori_as10.bmp ori_as11.bmp ori_as12.bmp 
	ori_as13.bmp ori_as14.bmp ori_as15.bmp ori_as16.bmp 
	ori_as17.bmp ori_as18.bmp ori_as19.bmp ori_as20.bmp 
	ori_as21.bmp ori_as22.bmp ori_as23.bmp ori_as24.bmp 
	ori_as25.bmp ori_as26.bmp ori_as27.bmp ori_as28.bmp 
	ori_as29.bmp ori_as30.bmp ori_as31.bmp ori_as32.bmp ori_at.bmp 
	ori_at01.bmp ori_at02.bmp ori_at03.bmp ori_at04.bmp 
	ori_at05.bmp ori_at06.bmp ori_at07.bmp ori_at08.bmp 
	ori_at09.bmp ori_at10.bmp ori_at11.bmp ori_at12.bmp 
	ori_at13.bmp ori_at14.bmp ori_at15.bmp ori_at16.bmp 
	ori_at17.bmp ori_at18.bmp ori_at19.bmp ori_at20.bmp 
	ori_at21.bmp ori_at22.bmp ori_at23.bmp ori_at24.bmp 
	ori_at25.bmp ori_at26.bmp ori_at27.bmp ori_at28.bmp 
	ori_at29.bmp ori_at30.bmp ori_at31.bmp ori_at32.bmp ori_bb.bmp 
	ori_bb01.bmp ori_bb02.bmp ori_bb03.bmp ori_bb04.bmp 
	ori_bb05.bmp ori_bb06.bmp ori_bb07.bmp ori_bb08.bmp 
	ori_bb09.bmp ori_bb10.bmp ori_bb11.bmp ori_bb12.bmp 
	ori_bb13.bmp ori_bb14.bmp ori_bb15.bmp ori_bb16.bmp 
	ori_bb17.bmp ori_bb18.bmp ori_bb19.bmp ori_bb20.bmp 
	ori_bb21.bmp ori_bb22.bmp ori_bb23.bmp ori_bb24.bmp 
	ori_bb25.bmp ori_bb26.bmp ori_bb27.bmp ori_bb28.bmp 
	ori_bb29.bmp ori_bb30.bmp ori_bb31.bmp ori_bb32.bmp ori_ca.bmp 
	ori_ca01.bmp ori_ca02.bmp ori_ca03.bmp ori_ca04.bmp 
	ori_ca05.bmp ori_ca06.bmp ori_ca07.bmp ori_ca08.bmp 
	ori_ca09.bmp ori_ca10.bmp ori_ca11.bmp ori_ca12.bmp 
	ori_ca13.bmp ori_ca14.bmp ori_ca15.bmp ori_ca16.bmp 
	ori_ca17.bmp ori_ca18.bmp ori_ca19.bmp ori_ca20.bmp 
	ori_ca21.bmp ori_ca22.bmp ori_ca23.bmp ori_ca24.bmp 
	ori_ca25.bmp ori_ca26.bmp ori_ca27.bmp ori_ca28.bmp 
	ori_ca29.bmp ori_ca30.bmp ori_ca31.bmp ori_ca32.bmp ori_dd.bmp 
	ori_dd01.bmp ori_dd02.bmp ori_dd03.bmp ori_dd04.bmp 
	ori_dd05.bmp ori_dd06.bmp ori_dd07.bmp ori_dd08.bmp 
	ori_dd09.bmp ori_dd10.bmp ori_dd11.bmp ori_dd12.bmp 
	ori_dd13.bmp ori_dd14.bmp ori_dd15.bmp ori_dd16.bmp 
	ori_dd17.bmp ori_dd18.bmp ori_dd19.bmp ori_dd20.bmp 
	ori_dd21.bmp ori_dd22.bmp ori_dd23.bmp ori_dd24.bmp 
	ori_dd25.bmp ori_dd26.bmp ori_dd27.bmp ori_dd28.bmp 
	ori_dd29.bmp ori_dd30.bmp ori_dd31.bmp ori_dd32.bmp ori_ga.bmp 
	ori_ga01.bmp ori_ga02.bmp ori_ga03.bmp ori_ga04.bmp 
	ori_ga05.bmp ori_ga06.bmp ori_ga07.bmp ori_ga08.bmp 
	ori_ga09.bmp ori_ga10.bmp ori_ga11.bmp ori_ga12.bmp 
	ori_ga13.bmp ori_ga14.bmp ori_ga15.bmp ori_ga16.bmp 
	ori_ga17.bmp ori_ga18.bmp ori_ga19.bmp ori_ga20.bmp 
	ori_ga21.bmp ori_ga22.bmp ori_ga23.bmp ori_ga24.bmp 
	ori_ga25.bmp ori_ga26.bmp ori_ga27.bmp ori_ga28.bmp 
	ori_ga29.bmp ori_ga30.bmp ori_ga31.bmp ori_ga32.bmp ori_sb.bmp 
	ori_sb01.bmp ori_sb02.bmp ori_sb03.bmp ori_sb04.bmp 
	ori_sb05.bmp ori_sb06.bmp ori_sb07.bmp ori_sb08.bmp 
	ori_sb09.bmp ori_sb10.bmp ori_sb11.bmp ori_sb12.bmp 
	ori_sb13.bmp ori_sb14.bmp ori_sb15.bmp ori_sb16.bmp 
	ori_sb17.bmp ori_sb18.bmp ori_sb19.bmp ori_sb20.bmp 
	ori_sb21.bmp ori_sb22.bmp ori_sb23.bmp ori_sb24.bmp 
	ori_sb25.bmp ori_sb26.bmp ori_sb27.bmp ori_sb28.bmp 
	ori_sb29.bmp ori_sb30.bmp ori_sb31.bmp ori_sb32.bmp ori_sc.bmp 
	ori_sc01.bmp ori_sc02.bmp ori_sc03.bmp ori_sc04.bmp 
	ori_sc05.bmp ori_sc06.bmp ori_sc07.bmp ori_sc08.bmp 
	ori_sc09.bmp ori_sc10.bmp ori_sc11.bmp ori_sc12.bmp 
	ori_sc13.bmp ori_sc14.bmp ori_sc15.bmp ori_sc16.bmp 
	ori_sc17.bmp ori_sc18.bmp ori_sc19.bmp ori_sc20.bmp 
	ori_sc21.bmp ori_sc22.bmp ori_sc23.bmp ori_sc24.bmp 
	ori_sc25.bmp ori_sc26.bmp ori_sc27.bmp ori_sc28.bmp 
	ori_sc29.bmp ori_sc30.bmp ori_sc31.bmp ori_sc32.bmp 
	orishipG.bmp 
Log Message:
Addition of greyscale and shaded old color full bitmaps to repository.  Along the way, fixed all the base bitmaps so they rotate.

--- NEW FILE: ori_dd.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: orishipG.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb29.bmp ---
(This appears to be a binary file; contents omitted.)



From modemhero at users.sourceforge.net  Fri Apr 21 11:37:42 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:37:42 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/tinted/kli
	kli_sb29.bmp, NONE, 1.1 kli_sb30.bmp, NONE, 1.1 kli_sb31.bmp,
	NONE, 1.1 kli_sb32.bmp, NONE, 1.1 kli_sc.bmp, NONE,
	1.1 kli_sc01.bmp, NONE, 1.1 kli_sc02.bmp, NONE,
	1.1 kli_sc03.bmp, NONE, 1.1 kli_sc04.bmp, NONE,
	1.1 kli_sc05.bmp, NONE, 1.1 kli_sc06.bmp, NONE,
	1.1 kli_sc07.bmp, NONE, 1.1 kli_sc08.bmp, NONE,
	1.1 kli_sc09.bmp, NONE, 1.1 kli_sc10.bmp, NONE,
	1.1 kli_sc11.bmp, NONE, 1.1 kli_sc12.bmp, NONE,
	1.1 kli_sc13.bmp, NONE, 1.1 kli_sc14.bmp, NONE,
	1.1 kli_sc15.bmp, NONE, 1.1 kli_sc16.bmp, NONE,
	1.1 kli_sc17.bmp, NONE, 1.1 kli_sc18.bmp, NONE,
	1.1 kli_sc19.bmp, NONE, 1.1 kli_sc20.bmp, NONE,
	1.1 kli_sc21.bmp, NONE, 1.1 kli_sc22.bmp, NONE,
	1.1 kli_sc23.bmp, NONE, 1.1 kli_sc24.bmp, NONE,
	1.1 kli_sc25.bmp, NONE, 1.1 kli_sc26.bmp, NONE,
	1.1 kli_sc27.bmp, NONE, 1.1 kli_sc28.bmp, NONE,
	1.1 kli_sc29.bmp, NONE, 1.1 kli_sc30.bmp, NONE,
	1.1 kli_sc31.bmp, NONE, 1.1 kli_sc32.bmp, NONE,
	1.1 klishipT.bmp, NONE, 1.1
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/tinted/kli
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32293/resources/ships/tinted/kli

Added Files:
	kli_sb29.bmp kli_sb30.bmp kli_sb31.bmp kli_sb32.bmp kli_sc.bmp 
	kli_sc01.bmp kli_sc02.bmp kli_sc03.bmp kli_sc04.bmp 
	kli_sc05.bmp kli_sc06.bmp kli_sc07.bmp kli_sc08.bmp 
	kli_sc09.bmp kli_sc10.bmp kli_sc11.bmp kli_sc12.bmp 
	kli_sc13.bmp kli_sc14.bmp kli_sc15.bmp kli_sc16.bmp 
	kli_sc17.bmp kli_sc18.bmp kli_sc19.bmp kli_sc20.bmp 
	kli_sc21.bmp kli_sc22.bmp kli_sc23.bmp kli_sc24.bmp 
	kli_sc25.bmp kli_sc26.bmp kli_sc27.bmp kli_sc28.bmp 
	kli_sc29.bmp kli_sc30.bmp kli_sc31.bmp kli_sc32.bmp 
	klishipT.bmp 
Log Message:
Addition of greyscale and shaded old color full bitmaps to repository.  Along the way, fixed all the base bitmaps so they rotate.

--- NEW FILE: kli_sc22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sc16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: klishipT.bmp ---
(This appears to be a binary file; contents omitted.)



From modemhero at users.sourceforge.net  Fri Apr 21 11:37:43 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:37:43 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/tinted/ori ori_as.bmp,
	NONE, 1.1 ori_as01.bmp, NONE, 1.1 ori_as02.bmp, NONE,
	1.1 ori_as03.bmp, NONE, 1.1 ori_as04.bmp, NONE,
	1.1 ori_as05.bmp, NONE, 1.1 ori_as06.bmp, NONE,
	1.1 ori_as07.bmp, NONE, 1.1 ori_as08.bmp, NONE,
	1.1 ori_as09.bmp, NONE, 1.1 ori_as10.bmp, NONE,
	1.1 ori_as11.bmp, NONE, 1.1 ori_as12.bmp, NONE,
	1.1 ori_as13.bmp, NONE, 1.1 ori_as14.bmp, NONE,
	1.1 ori_as15.bmp, NONE, 1.1 ori_as16.bmp, NONE,
	1.1 ori_as17.bmp, NONE, 1.1 ori_as18.bmp, NONE,
	1.1 ori_as19.bmp, NONE, 1.1 ori_as20.bmp, NONE,
	1.1 ori_as21.bmp, NONE, 1.1 ori_as22.bmp, NONE,
	1.1 ori_as23.bmp, NONE, 1.1 ori_as24.bmp, NONE,
	1.1 ori_as25.bmp, NONE, 1.1 ori_as26.bmp, NONE,
	1.1 ori_as27.bmp, NONE, 1.1 ori_as28.bmp, NONE,
	1.1 ori_as29.bmp, NONE, 1.1 ori_as30.bmp, NONE,
	1.1 ori_as31.bmp, NONE, 1.1 ori_as32.bmp, NONE, 1.1 ori_at.bmp,
	NONE, 1.1 ori_at01.bmp, NONE, 1.1 ori_at02.bmp, NONE,
	1.1 ori_at03.bmp, NONE, 1.1 ori_at04.bmp, NONE,
	1.1 ori_at05.bmp, NONE, 1.1 ori_at06.bmp, NONE,
	1.1 ori_at07.bmp, NONE, 1.1 ori_at08.bmp, NONE,
	1.1 ori_at09.bmp, NONE, 1.1 ori_at10.bmp, NONE,
	1.1 ori_at11.bmp, NONE, 1.1 ori_at12.bmp, NONE,
	1.1 ori_at13.bmp, NONE, 1.1 ori_at14.bmp, NONE,
	1.1 ori_at15.bmp, NONE, 1.1 ori_at16.bmp, NONE,
	1.1 ori_at17.bmp, NONE, 1.1 ori_at18.bmp, NONE,
	1.1 ori_at19.bmp, NONE, 1.1 ori_at20.bmp, NONE,
	1.1 ori_at21.bmp, NONE, 1.1 ori_at22.bmp, NONE,
	1.1 ori_at23.bmp, NONE, 1.1 ori_at24.bmp, NONE,
	1.1 ori_at25.bmp, NONE, 1.1 ori_at26.bmp, NONE,
	1.1 ori_at27.bmp, NONE, 1.1 ori_at28.bmp, NONE,
	1.1 ori_at29.bmp, NONE, 1.1 ori_at30.bmp, NONE,
	1.1 ori_at31.bmp, NONE, 1.1 ori_at32.bmp, NONE, 1.1 ori_bb.bmp,
	NONE, 1.1 ori_bb01.bmp, NONE, 1.1 ori_bb02.bmp, NONE,
	1.1 ori_bb03.bmp, NONE, 1.1 ori_bb04.bmp, NONE,
	1.1 ori_bb05.bmp, NONE, 1.1 ori_bb06.bmp, NONE,
	1.1 ori_bb07.bmp, NONE, 1.1 ori_bb08.bmp, NONE,
	1.1 ori_bb09.bmp, NONE, 1.1 ori_bb10.bmp, NONE,
	1.1 ori_bb11.bmp, NONE, 1.1 ori_bb12.bmp, NONE,
	1.1 ori_bb13.bmp, NONE, 1.1 ori_bb14.bmp, NONE,
	1.1 ori_bb15.bmp, NONE, 1.1 ori_bb16.bmp, NONE,
	1.1 ori_bb17.bmp, NONE, 1.1 ori_bb18.bmp, NONE,
	1.1 ori_bb19.bmp, NONE, 1.1 ori_bb20.bmp, NONE,
	1.1 ori_bb21.bmp, NONE, 1.1 ori_bb22.bmp, NONE,
	1.1 ori_bb23.bmp, NONE, 1.1 ori_bb24.bmp, NONE,
	1.1 ori_bb25.bmp, NONE, 1.1 ori_bb26.bmp, NONE,
	1.1 ori_bb27.bmp, NONE, 1.1 ori_bb28.bmp, NONE,
	1.1 ori_bb29.bmp, NONE, 1.1 ori_bb30.bmp, NONE,
	1.1 ori_bb31.bmp, NONE, 1.1 ori_bb32.bmp, NONE, 1.1 ori_ca.bmp,
	NONE, 1.1 ori_ca01.bmp, NONE, 1.1 ori_ca02.bmp, NONE,
	1.1 ori_ca03.bmp, NONE, 1.1 ori_ca04.bmp, NONE,
	1.1 ori_ca05.bmp, NONE, 1.1 ori_ca06.bmp, NONE,
	1.1 ori_ca07.bmp, NONE, 1.1 ori_ca08.bmp, NONE,
	1.1 ori_ca09.bmp, NONE, 1.1 ori_ca10.bmp, NONE,
	1.1 ori_ca11.bmp, NONE, 1.1 ori_ca12.bmp, NONE,
	1.1 ori_ca13.bmp, NONE, 1.1 ori_ca14.bmp, NONE,
	1.1 ori_ca15.bmp, NONE, 1.1 ori_ca16.bmp, NONE,
	1.1 ori_ca17.bmp, NONE, 1.1 ori_ca18.bmp, NONE,
	1.1 ori_ca19.bmp, NONE, 1.1 ori_ca20.bmp, NONE,
	1.1 ori_ca21.bmp, NONE, 1.1 ori_ca22.bmp, NONE,
	1.1 ori_ca23.bmp, NONE, 1.1 ori_ca24.bmp, NONE,
	1.1 ori_ca25.bmp, NONE, 1.1 ori_ca26.bmp, NONE,
	1.1 ori_ca27.bmp, NONE, 1.1 ori_ca28.bmp, NONE,
	1.1 ori_ca29.bmp, NONE, 1.1 ori_ca30.bmp, NONE,
	1.1 ori_ca31.bmp, NONE, 1.1 ori_ca32.bmp, NONE, 1.1 ori_dd.bmp,
	NONE, 1.1 ori_dd01.bmp, NONE, 1.1 ori_dd02.bmp, NONE,
	1.1 ori_dd03.bmp, NONE, 1.1 ori_dd04.bmp, NONE,
	1.1 ori_dd05.bmp, NONE, 1.1 ori_dd06.bmp, NONE,
	1.1 ori_dd07.bmp, NONE, 1.1 ori_dd08.bmp, NONE,
	1.1 ori_dd09.bmp, NONE, 1.1 ori_dd10.bmp, NONE,
	1.1 ori_dd11.bmp, NONE, 1.1 ori_dd12.bmp, NONE,
	1.1 ori_dd13.bmp, NONE, 1.1 ori_dd14.bmp, NONE,
	1.1 ori_dd15.bmp, NONE, 1.1 ori_dd16.bmp, NONE,
	1.1 ori_dd17.bmp, NONE, 1.1 ori_dd18.bmp, NONE,
	1.1 ori_dd19.bmp, NONE, 1.1 ori_dd20.bmp, NONE,
	1.1 ori_dd21.bmp, NONE, 1.1 ori_dd22.bmp, NONE,
	1.1 ori_dd23.bmp, NONE, 1.1 ori_dd24.bmp, NONE,
	1.1 ori_dd25.bmp, NONE, 1.1 ori_dd26.bmp, NONE,
	1.1 ori_dd27.bmp, NONE, 1.1 ori_dd28.bmp, NONE,
	1.1 ori_dd29.bmp, NONE, 1.1 ori_dd30.bmp, NONE,
	1.1 ori_dd31.bmp, NONE, 1.1 ori_dd32.bmp, NONE, 1.1 ori_ga.bmp,
	NONE, 1.1 ori_ga01.bmp, NONE, 1.1 ori_ga02.bmp, NONE,
	1.1 ori_ga03.bmp, NONE, 1.1 ori_ga04.bmp, NONE,
	1.1 ori_ga05.bmp, NONE, 1.1 ori_ga06.bmp, NONE,
	1.1 ori_ga07.bmp, NONE, 1.1 ori_ga08.bmp, NONE,
	1.1 ori_ga09.bmp, NONE, 1.1 ori_ga10.bmp, NONE,
	1.1 ori_ga11.bmp, NONE, 1.1 ori_ga12.bmp, NONE,
	1.1 ori_ga13.bmp, NONE, 1.1 ori_ga14.bmp, NONE,
	1.1 ori_ga15.bmp, NONE, 1.1 ori_ga16.bmp, NONE,
	1.1 ori_ga17.bmp, NONE, 1.1 ori_ga18.bmp, NONE,
	1.1 ori_ga19.bmp, NONE, 1.1 ori_ga20.bmp, NONE,
	1.1 ori_ga21.bmp, NONE, 1.1 ori_ga22.bmp, NONE,
	1.1 ori_ga23.bmp, NONE, 1.1 ori_ga24.bmp, NONE,
	1.1 ori_ga25.bmp, NONE, 1.1 ori_ga26.bmp, NONE,
	1.1 ori_ga27.bmp, NONE, 1.1 ori_ga28.bmp, NONE,
	1.1 ori_ga29.bmp, NONE, 1.1 ori_ga30.bmp, NONE,
	1.1 ori_ga31.bmp, NONE, 1.1 ori_ga32.bmp, NONE, 1.1 ori_sb.bmp,
	NONE, 1.1 ori_sb01.bmp, NONE, 1.1 ori_sb02.bmp, NONE,
	1.1 ori_sb03.bmp, NONE, 1.1 ori_sb04.bmp, NONE,
	1.1 ori_sb05.bmp, NONE, 1.1 ori_sb06.bmp, NONE,
	1.1 ori_sb07.bmp, NONE, 1.1 ori_sb08.bmp, NONE,
	1.1 ori_sb09.bmp, NONE, 1.1 ori_sb10.bmp, NONE,
	1.1 ori_sb11.bmp, NONE, 1.1 ori_sb12.bmp, NONE,
	1.1 ori_sb13.bmp, NONE, 1.1 ori_sb14.bmp, NONE,
	1.1 ori_sb15.bmp, NONE, 1.1 ori_sb16.bmp, NONE,
	1.1 ori_sb17.bmp, NONE, 1.1 ori_sb18.bmp, NONE,
	1.1 ori_sb19.bmp, NONE, 1.1 ori_sb20.bmp, NONE,
	1.1 ori_sb21.bmp, NONE, 1.1 ori_sb22.bmp, NONE,
	1.1 ori_sb23.bmp, NONE, 1.1 ori_sb24.bmp, NONE,
	1.1 ori_sb25.bmp, NONE, 1.1 ori_sb26.bmp, NONE,
	1.1 ori_sb27.bmp, NONE, 1.1 ori_sb28.bmp, NONE,
	1.1 ori_sb29.bmp, NONE, 1.1 ori_sb30.bmp, NONE,
	1.1 ori_sb31.bmp, NONE, 1.1 ori_sb32.bmp, NONE, 1.1 ori_sc.bmp,
	NONE, 1.1 ori_sc01.bmp, NONE, 1.1 ori_sc02.bmp, NONE,
	1.1 ori_sc03.bmp, NONE, 1.1 ori_sc04.bmp, NONE,
	1.1 ori_sc05.bmp, NONE, 1.1 ori_sc06.bmp, NONE,
	1.1 ori_sc07.bmp, NONE, 1.1 ori_sc08.bmp, NONE,
	1.1 ori_sc09.bmp, NONE, 1.1 ori_sc10.bmp, NONE,
	1.1 ori_sc11.bmp, NONE, 1.1 ori_sc12.bmp, NONE,
	1.1 ori_sc13.bmp, NONE, 1.1 ori_sc14.bmp, NONE,
	1.1 ori_sc15.bmp, NONE, 1.1 ori_sc16.bmp, NONE,
	1.1 ori_sc17.bmp, NONE, 1.1 ori_sc18.bmp, NONE,
	1.1 ori_sc19.bmp, NONE, 1.1 ori_sc20.bmp, NONE,
	1.1 ori_sc21.bmp, NONE, 1.1 ori_sc22.bmp, NONE,
	1.1 ori_sc23.bmp, NONE, 1.1 ori_sc24.bmp, NONE,
	1.1 ori_sc25.bmp, NONE, 1.1 ori_sc26.bmp, NONE,
	1.1 ori_sc27.bmp, NONE, 1.1 ori_sc28.bmp, NONE,
	1.1 ori_sc29.bmp, NONE, 1.1 ori_sc30.bmp, NONE,
	1.1 ori_sc31.bmp, NONE, 1.1 ori_sc32.bmp, NONE,
	1.1 orishipT.bmp, NONE, 1.1
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/tinted/ori
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32293/resources/ships/tinted/ori

Added Files:
	ori_as.bmp ori_as01.bmp ori_as02.bmp ori_as03.bmp ori_as04.bmp 
	ori_as05.bmp ori_as06.bmp ori_as07.bmp ori_as08.bmp 
	ori_as09.bmp ori_as10.bmp ori_as11.bmp ori_as12.bmp 
	ori_as13.bmp ori_as14.bmp ori_as15.bmp ori_as16.bmp 
	ori_as17.bmp ori_as18.bmp ori_as19.bmp ori_as20.bmp 
	ori_as21.bmp ori_as22.bmp ori_as23.bmp ori_as24.bmp 
	ori_as25.bmp ori_as26.bmp ori_as27.bmp ori_as28.bmp 
	ori_as29.bmp ori_as30.bmp ori_as31.bmp ori_as32.bmp ori_at.bmp 
	ori_at01.bmp ori_at02.bmp ori_at03.bmp ori_at04.bmp 
	ori_at05.bmp ori_at06.bmp ori_at07.bmp ori_at08.bmp 
	ori_at09.bmp ori_at10.bmp ori_at11.bmp ori_at12.bmp 
	ori_at13.bmp ori_at14.bmp ori_at15.bmp ori_at16.bmp 
	ori_at17.bmp ori_at18.bmp ori_at19.bmp ori_at20.bmp 
	ori_at21.bmp ori_at22.bmp ori_at23.bmp ori_at24.bmp 
	ori_at25.bmp ori_at26.bmp ori_at27.bmp ori_at28.bmp 
	ori_at29.bmp ori_at30.bmp ori_at31.bmp ori_at32.bmp ori_bb.bmp 
	ori_bb01.bmp ori_bb02.bmp ori_bb03.bmp ori_bb04.bmp 
	ori_bb05.bmp ori_bb06.bmp ori_bb07.bmp ori_bb08.bmp 
	ori_bb09.bmp ori_bb10.bmp ori_bb11.bmp ori_bb12.bmp 
	ori_bb13.bmp ori_bb14.bmp ori_bb15.bmp ori_bb16.bmp 
	ori_bb17.bmp ori_bb18.bmp ori_bb19.bmp ori_bb20.bmp 
	ori_bb21.bmp ori_bb22.bmp ori_bb23.bmp ori_bb24.bmp 
	ori_bb25.bmp ori_bb26.bmp ori_bb27.bmp ori_bb28.bmp 
	ori_bb29.bmp ori_bb30.bmp ori_bb31.bmp ori_bb32.bmp ori_ca.bmp 
	ori_ca01.bmp ori_ca02.bmp ori_ca03.bmp ori_ca04.bmp 
	ori_ca05.bmp ori_ca06.bmp ori_ca07.bmp ori_ca08.bmp 
	ori_ca09.bmp ori_ca10.bmp ori_ca11.bmp ori_ca12.bmp 
	ori_ca13.bmp ori_ca14.bmp ori_ca15.bmp ori_ca16.bmp 
	ori_ca17.bmp ori_ca18.bmp ori_ca19.bmp ori_ca20.bmp 
	ori_ca21.bmp ori_ca22.bmp ori_ca23.bmp ori_ca24.bmp 
	ori_ca25.bmp ori_ca26.bmp ori_ca27.bmp ori_ca28.bmp 
	ori_ca29.bmp ori_ca30.bmp ori_ca31.bmp ori_ca32.bmp ori_dd.bmp 
	ori_dd01.bmp ori_dd02.bmp ori_dd03.bmp ori_dd04.bmp 
	ori_dd05.bmp ori_dd06.bmp ori_dd07.bmp ori_dd08.bmp 
	ori_dd09.bmp ori_dd10.bmp ori_dd11.bmp ori_dd12.bmp 
	ori_dd13.bmp ori_dd14.bmp ori_dd15.bmp ori_dd16.bmp 
	ori_dd17.bmp ori_dd18.bmp ori_dd19.bmp ori_dd20.bmp 
	ori_dd21.bmp ori_dd22.bmp ori_dd23.bmp ori_dd24.bmp 
	ori_dd25.bmp ori_dd26.bmp ori_dd27.bmp ori_dd28.bmp 
	ori_dd29.bmp ori_dd30.bmp ori_dd31.bmp ori_dd32.bmp ori_ga.bmp 
	ori_ga01.bmp ori_ga02.bmp ori_ga03.bmp ori_ga04.bmp 
	ori_ga05.bmp ori_ga06.bmp ori_ga07.bmp ori_ga08.bmp 
	ori_ga09.bmp ori_ga10.bmp ori_ga11.bmp ori_ga12.bmp 
	ori_ga13.bmp ori_ga14.bmp ori_ga15.bmp ori_ga16.bmp 
	ori_ga17.bmp ori_ga18.bmp ori_ga19.bmp ori_ga20.bmp 
	ori_ga21.bmp ori_ga22.bmp ori_ga23.bmp ori_ga24.bmp 
	ori_ga25.bmp ori_ga26.bmp ori_ga27.bmp ori_ga28.bmp 
	ori_ga29.bmp ori_ga30.bmp ori_ga31.bmp ori_ga32.bmp ori_sb.bmp 
	ori_sb01.bmp ori_sb02.bmp ori_sb03.bmp ori_sb04.bmp 
	ori_sb05.bmp ori_sb06.bmp ori_sb07.bmp ori_sb08.bmp 
	ori_sb09.bmp ori_sb10.bmp ori_sb11.bmp ori_sb12.bmp 
	ori_sb13.bmp ori_sb14.bmp ori_sb15.bmp ori_sb16.bmp 
	ori_sb17.bmp ori_sb18.bmp ori_sb19.bmp ori_sb20.bmp 
	ori_sb21.bmp ori_sb22.bmp ori_sb23.bmp ori_sb24.bmp 
	ori_sb25.bmp ori_sb26.bmp ori_sb27.bmp ori_sb28.bmp 
	ori_sb29.bmp ori_sb30.bmp ori_sb31.bmp ori_sb32.bmp ori_sc.bmp 
	ori_sc01.bmp ori_sc02.bmp ori_sc03.bmp ori_sc04.bmp 
	ori_sc05.bmp ori_sc06.bmp ori_sc07.bmp ori_sc08.bmp 
	ori_sc09.bmp ori_sc10.bmp ori_sc11.bmp ori_sc12.bmp 
	ori_sc13.bmp ori_sc14.bmp ori_sc15.bmp ori_sc16.bmp 
	ori_sc17.bmp ori_sc18.bmp ori_sc19.bmp ori_sc20.bmp 
	ori_sc21.bmp ori_sc22.bmp ori_sc23.bmp ori_sc24.bmp 
	ori_sc25.bmp ori_sc26.bmp ori_sc27.bmp ori_sc28.bmp 
	ori_sc29.bmp ori_sc30.bmp ori_sc31.bmp ori_sc32.bmp 
	orishipT.bmp 
Log Message:
Addition of greyscale and shaded old color full bitmaps to repository.  Along the way, fixed all the base bitmaps so they rotate.

--- NEW FILE: ori_dd.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: orishipT.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_at01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sc23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_sb29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ca22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_as01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_dd05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_ga02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ori_bb29.bmp ---
(This appears to be a binary file; contents omitted.)



From modemhero at users.sourceforge.net  Fri Apr 21 11:37:12 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:37:12 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/tinted/kli kli_as.bmp,
	NONE, 1.1 kli_as01.bmp, NONE, 1.1 kli_as02.bmp, NONE,
	1.1 kli_as03.bmp, NONE, 1.1 kli_as04.bmp, NONE,
	1.1 kli_as05.bmp, NONE, 1.1 kli_as06.bmp, NONE,
	1.1 kli_as07.bmp, NONE, 1.1 kli_as08.bmp, NONE,
	1.1 kli_as09.bmp, NONE, 1.1 kli_as10.bmp, NONE,
	1.1 kli_as11.bmp, NONE, 1.1 kli_as12.bmp, NONE,
	1.1 kli_as13.bmp, NONE, 1.1 kli_as14.bmp, NONE,
	1.1 kli_as15.bmp, NONE, 1.1 kli_as16.bmp, NONE,
	1.1 kli_as17.bmp, NONE, 1.1 kli_as18.bmp, NONE,
	1.1 kli_as19.bmp, NONE, 1.1 kli_as20.bmp, NONE,
	1.1 kli_as21.bmp, NONE, 1.1 kli_as22.bmp, NONE,
	1.1 kli_as23.bmp, NONE, 1.1 kli_as24.bmp, NONE,
	1.1 kli_as25.bmp, NONE, 1.1 kli_as26.bmp, NONE,
	1.1 kli_as27.bmp, NONE, 1.1 kli_as28.bmp, NONE,
	1.1 kli_as29.bmp, NONE, 1.1 kli_as30.bmp, NONE,
	1.1 kli_as31.bmp, NONE, 1.1 kli_as32.bmp, NONE, 1.1 kli_at.bmp,
	NONE, 1.1 kli_at01.bmp, NONE, 1.1 kli_at02.bmp, NONE,
	1.1 kli_at03.bmp, NONE, 1.1 kli_at04.bmp, NONE,
	1.1 kli_at05.bmp, NONE, 1.1 kli_at06.bmp, NONE,
	1.1 kli_at07.bmp, NONE, 1.1 kli_at08.bmp, NONE,
	1.1 kli_at09.bmp, NONE, 1.1 kli_at10.bmp, NONE,
	1.1 kli_at11.bmp, NONE, 1.1 kli_at12.bmp, NONE,
	1.1 kli_at13.bmp, NONE, 1.1 kli_at14.bmp, NONE,
	1.1 kli_at15.bmp, NONE, 1.1 kli_at16.bmp, NONE,
	1.1 kli_at17.bmp, NONE, 1.1 kli_at18.bmp, NONE,
	1.1 kli_at19.bmp, NONE, 1.1 kli_at20.bmp, NONE,
	1.1 kli_at21.bmp, NONE, 1.1 kli_at22.bmp, NONE,
	1.1 kli_at23.bmp, NONE, 1.1 kli_at24.bmp, NONE,
	1.1 kli_at25.bmp, NONE, 1.1 kli_at26.bmp, NONE,
	1.1 kli_at27.bmp, NONE, 1.1 kli_at28.bmp, NONE,
	1.1 kli_at29.bmp, NONE, 1.1 kli_at30.bmp, NONE,
	1.1 kli_at31.bmp, NONE, 1.1 kli_at32.bmp, NONE, 1.1 kli_bb.bmp,
	NONE, 1.1 kli_bb01.bmp, NONE, 1.1 kli_bb02.bmp, NONE,
	1.1 kli_bb03.bmp, NONE, 1.1 kli_bb04.bmp, NONE,
	1.1 kli_bb05.bmp, NONE, 1.1 kli_bb06.bmp, NONE,
	1.1 kli_bb07.bmp, NONE, 1.1 kli_bb08.bmp, NONE,
	1.1 kli_bb09.bmp, NONE, 1.1 kli_bb10.bmp, NONE,
	1.1 kli_bb11.bmp, NONE, 1.1 kli_bb12.bmp, NONE,
	1.1 kli_bb13.bmp, NONE, 1.1 kli_bb14.bmp, NONE,
	1.1 kli_bb15.bmp, NONE, 1.1 kli_bb16.bmp, NONE,
	1.1 kli_bb17.bmp, NONE, 1.1 kli_bb18.bmp, NONE,
	1.1 kli_bb19.bmp, NONE, 1.1 kli_bb20.bmp, NONE,
	1.1 kli_bb21.bmp, NONE, 1.1 kli_bb22.bmp, NONE,
	1.1 kli_bb23.bmp, NONE, 1.1 kli_bb24.bmp, NONE,
	1.1 kli_bb25.bmp, NONE, 1.1 kli_bb26.bmp, NONE,
	1.1 kli_bb27.bmp, NONE, 1.1 kli_bb28.bmp, NONE,
	1.1 kli_bb29.bmp, NONE, 1.1 kli_bb30.bmp, NONE,
	1.1 kli_bb31.bmp, NONE, 1.1 kli_bb32.bmp, NONE, 1.1 kli_ca.bmp,
	NONE, 1.1 kli_ca01.bmp, NONE, 1.1 kli_ca02.bmp, NONE,
	1.1 kli_ca03.bmp, NONE, 1.1 kli_ca04.bmp, NONE,
	1.1 kli_ca05.bmp, NONE, 1.1 kli_ca06.bmp, NONE,
	1.1 kli_ca07.bmp, NONE, 1.1 kli_ca08.bmp, NONE,
	1.1 kli_ca09.bmp, NONE, 1.1 kli_ca10.bmp, NONE,
	1.1 kli_ca11.bmp, NONE, 1.1 kli_ca12.bmp, NONE,
	1.1 kli_ca13.bmp, NONE, 1.1 kli_ca14.bmp, NONE,
	1.1 kli_ca15.bmp, NONE, 1.1 kli_ca16.bmp, NONE,
	1.1 kli_ca17.bmp, NONE, 1.1 kli_ca18.bmp, NONE,
	1.1 kli_ca19.bmp, NONE, 1.1 kli_ca20.bmp, NONE,
	1.1 kli_ca21.bmp, NONE, 1.1 kli_ca22.bmp, NONE,
	1.1 kli_ca23.bmp, NONE, 1.1 kli_ca24.bmp, NONE,
	1.1 kli_ca25.bmp, NONE, 1.1 kli_ca26.bmp, NONE,
	1.1 kli_ca27.bmp, NONE, 1.1 kli_ca28.bmp, NONE,
	1.1 kli_ca29.bmp, NONE, 1.1 kli_ca30.bmp, NONE,
	1.1 kli_ca31.bmp, NONE, 1.1 kli_ca32.bmp, NONE, 1.1 kli_dd.bmp,
	NONE, 1.1 kli_dd01.bmp, NONE, 1.1 kli_dd02.bmp, NONE,
	1.1 kli_dd03.bmp, NONE, 1.1 kli_dd04.bmp, NONE,
	1.1 kli_dd05.bmp, NONE, 1.1 kli_dd06.bmp, NONE,
	1.1 kli_dd07.bmp, NONE, 1.1 kli_dd08.bmp, NONE,
	1.1 kli_dd09.bmp, NONE, 1.1 kli_dd10.bmp, NONE,
	1.1 kli_dd11.bmp, NONE, 1.1 kli_dd12.bmp, NONE,
	1.1 kli_dd13.bmp, NONE, 1.1 kli_dd14.bmp, NONE,
	1.1 kli_dd15.bmp, NONE, 1.1 kli_dd16.bmp, NONE,
	1.1 kli_dd17.bmp, NONE, 1.1 kli_dd18.bmp, NONE,
	1.1 kli_dd19.bmp, NONE, 1.1 kli_dd20.bmp, NONE,
	1.1 kli_dd21.bmp, NONE, 1.1 kli_dd22.bmp, NONE,
	1.1 kli_dd23.bmp, NONE, 1.1 kli_dd24.bmp, NONE,
	1.1 kli_dd25.bmp, NONE, 1.1 kli_dd26.bmp, NONE,
	1.1 kli_dd27.bmp, NONE, 1.1 kli_dd28.bmp, NONE,
	1.1 kli_dd29.bmp, NONE, 1.1 kli_dd30.bmp, NONE,
	1.1 kli_dd31.bmp, NONE, 1.1 kli_dd32.bmp, NONE, 1.1 kli_ga.bmp,
	NONE, 1.1 kli_ga01.bmp, NONE, 1.1 kli_ga02.bmp, NONE,
	1.1 kli_ga03.bmp, NONE, 1.1 kli_ga04.bmp, NONE,
	1.1 kli_ga05.bmp, NONE, 1.1 kli_ga06.bmp, NONE,
	1.1 kli_ga07.bmp, NONE, 1.1 kli_ga08.bmp, NONE,
	1.1 kli_ga09.bmp, NONE, 1.1 kli_ga10.bmp, NONE,
	1.1 kli_ga11.bmp, NONE, 1.1 kli_ga12.bmp, NONE,
	1.1 kli_ga13.bmp, NONE, 1.1 kli_ga14.bmp, NONE,
	1.1 kli_ga15.bmp, NONE, 1.1 kli_ga16.bmp, NONE,
	1.1 kli_ga17.bmp, NONE, 1.1 kli_ga18.bmp, NONE,
	1.1 kli_ga19.bmp, NONE, 1.1 kli_ga20.bmp, NONE,
	1.1 kli_ga21.bmp, NONE, 1.1 kli_ga22.bmp, NONE,
	1.1 kli_ga23.bmp, NONE, 1.1 kli_ga24.bmp, NONE,
	1.1 kli_ga25.bmp, NONE, 1.1 kli_ga26.bmp, NONE,
	1.1 kli_ga27.bmp, NONE, 1.1 kli_ga28.bmp, NONE,
	1.1 kli_ga29.bmp, NONE, 1.1 kli_ga30.bmp, NONE,
	1.1 kli_ga31.bmp, NONE, 1.1 kli_ga32.bmp, NONE, 1.1 kli_sb.bmp,
	NONE, 1.1 kli_sb01.bmp, NONE, 1.1 kli_sb02.bmp, NONE,
	1.1 kli_sb03.bmp, NONE, 1.1 kli_sb04.bmp, NONE,
	1.1 kli_sb05.bmp, NONE, 1.1 kli_sb06.bmp, NONE,
	1.1 kli_sb07.bmp, NONE, 1.1 kli_sb08.bmp, NONE,
	1.1 kli_sb09.bmp, NONE, 1.1 kli_sb10.bmp, NONE,
	1.1 kli_sb11.bmp, NONE, 1.1 kli_sb12.bmp, NONE,
	1.1 kli_sb13.bmp, NONE, 1.1 kli_sb14.bmp, NONE,
	1.1 kli_sb15.bmp, NONE, 1.1 kli_sb16.bmp, NONE,
	1.1 kli_sb17.bmp, NONE, 1.1 kli_sb18.bmp, NONE,
	1.1 kli_sb19.bmp, NONE, 1.1 kli_sb20.bmp, NONE,
	1.1 kli_sb21.bmp, NONE, 1.1 kli_sb22.bmp, NONE,
	1.1 kli_sb23.bmp, NONE, 1.1 kli_sb24.bmp, NONE,
	1.1 kli_sb25.bmp, NONE, 1.1 kli_sb26.bmp, NONE,
	1.1 kli_sb27.bmp, NONE, 1.1 kli_sb28.bmp, NONE, 1.1
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/tinted/kli
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32097/resources/ships/tinted/kli

Added Files:
	kli_as.bmp kli_as01.bmp kli_as02.bmp kli_as03.bmp kli_as04.bmp 
	kli_as05.bmp kli_as06.bmp kli_as07.bmp kli_as08.bmp 
	kli_as09.bmp kli_as10.bmp kli_as11.bmp kli_as12.bmp 
	kli_as13.bmp kli_as14.bmp kli_as15.bmp kli_as16.bmp 
	kli_as17.bmp kli_as18.bmp kli_as19.bmp kli_as20.bmp 
	kli_as21.bmp kli_as22.bmp kli_as23.bmp kli_as24.bmp 
	kli_as25.bmp kli_as26.bmp kli_as27.bmp kli_as28.bmp 
	kli_as29.bmp kli_as30.bmp kli_as31.bmp kli_as32.bmp kli_at.bmp 
	kli_at01.bmp kli_at02.bmp kli_at03.bmp kli_at04.bmp 
	kli_at05.bmp kli_at06.bmp kli_at07.bmp kli_at08.bmp 
	kli_at09.bmp kli_at10.bmp kli_at11.bmp kli_at12.bmp 
	kli_at13.bmp kli_at14.bmp kli_at15.bmp kli_at16.bmp 
	kli_at17.bmp kli_at18.bmp kli_at19.bmp kli_at20.bmp 
	kli_at21.bmp kli_at22.bmp kli_at23.bmp kli_at24.bmp 
	kli_at25.bmp kli_at26.bmp kli_at27.bmp kli_at28.bmp 
	kli_at29.bmp kli_at30.bmp kli_at31.bmp kli_at32.bmp kli_bb.bmp 
	kli_bb01.bmp kli_bb02.bmp kli_bb03.bmp kli_bb04.bmp 
	kli_bb05.bmp kli_bb06.bmp kli_bb07.bmp kli_bb08.bmp 
	kli_bb09.bmp kli_bb10.bmp kli_bb11.bmp kli_bb12.bmp 
	kli_bb13.bmp kli_bb14.bmp kli_bb15.bmp kli_bb16.bmp 
	kli_bb17.bmp kli_bb18.bmp kli_bb19.bmp kli_bb20.bmp 
	kli_bb21.bmp kli_bb22.bmp kli_bb23.bmp kli_bb24.bmp 
	kli_bb25.bmp kli_bb26.bmp kli_bb27.bmp kli_bb28.bmp 
	kli_bb29.bmp kli_bb30.bmp kli_bb31.bmp kli_bb32.bmp kli_ca.bmp 
	kli_ca01.bmp kli_ca02.bmp kli_ca03.bmp kli_ca04.bmp 
	kli_ca05.bmp kli_ca06.bmp kli_ca07.bmp kli_ca08.bmp 
	kli_ca09.bmp kli_ca10.bmp kli_ca11.bmp kli_ca12.bmp 
	kli_ca13.bmp kli_ca14.bmp kli_ca15.bmp kli_ca16.bmp 
	kli_ca17.bmp kli_ca18.bmp kli_ca19.bmp kli_ca20.bmp 
	kli_ca21.bmp kli_ca22.bmp kli_ca23.bmp kli_ca24.bmp 
	kli_ca25.bmp kli_ca26.bmp kli_ca27.bmp kli_ca28.bmp 
	kli_ca29.bmp kli_ca30.bmp kli_ca31.bmp kli_ca32.bmp kli_dd.bmp 
	kli_dd01.bmp kli_dd02.bmp kli_dd03.bmp kli_dd04.bmp 
	kli_dd05.bmp kli_dd06.bmp kli_dd07.bmp kli_dd08.bmp 
	kli_dd09.bmp kli_dd10.bmp kli_dd11.bmp kli_dd12.bmp 
	kli_dd13.bmp kli_dd14.bmp kli_dd15.bmp kli_dd16.bmp 
	kli_dd17.bmp kli_dd18.bmp kli_dd19.bmp kli_dd20.bmp 
	kli_dd21.bmp kli_dd22.bmp kli_dd23.bmp kli_dd24.bmp 
	kli_dd25.bmp kli_dd26.bmp kli_dd27.bmp kli_dd28.bmp 
	kli_dd29.bmp kli_dd30.bmp kli_dd31.bmp kli_dd32.bmp kli_ga.bmp 
	kli_ga01.bmp kli_ga02.bmp kli_ga03.bmp kli_ga04.bmp 
	kli_ga05.bmp kli_ga06.bmp kli_ga07.bmp kli_ga08.bmp 
	kli_ga09.bmp kli_ga10.bmp kli_ga11.bmp kli_ga12.bmp 
	kli_ga13.bmp kli_ga14.bmp kli_ga15.bmp kli_ga16.bmp 
	kli_ga17.bmp kli_ga18.bmp kli_ga19.bmp kli_ga20.bmp 
	kli_ga21.bmp kli_ga22.bmp kli_ga23.bmp kli_ga24.bmp 
	kli_ga25.bmp kli_ga26.bmp kli_ga27.bmp kli_ga28.bmp 
	kli_ga29.bmp kli_ga30.bmp kli_ga31.bmp kli_ga32.bmp kli_sb.bmp 
	kli_sb01.bmp kli_sb02.bmp kli_sb03.bmp kli_sb04.bmp 
	kli_sb05.bmp kli_sb06.bmp kli_sb07.bmp kli_sb08.bmp 
	kli_sb09.bmp kli_sb10.bmp kli_sb11.bmp kli_sb12.bmp 
	kli_sb13.bmp kli_sb14.bmp kli_sb15.bmp kli_sb16.bmp 
	kli_sb17.bmp kli_sb18.bmp kli_sb19.bmp kli_sb20.bmp 
	kli_sb21.bmp kli_sb22.bmp kli_sb23.bmp kli_sb24.bmp 
	kli_sb25.bmp kli_sb26.bmp kli_sb27.bmp kli_sb28.bmp 
Log Message:
Addition of greyscale and shaded old color full bitmaps to repository.  Along the way, fixed all the base bitmaps so they rotate.

--- NEW FILE: kli_bb32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_as22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_bb22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_dd25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ca30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_ga06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_sb17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kli_at19.bmp ---
(This appears to be a binary file; contents omitted.)



From modemhero at users.sourceforge.net  Fri Apr 21 11:37:12 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:37:12 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/tinted/ind ind_as.bmp,
	NONE, 1.1 ind_as01.bmp, NONE, 1.1 ind_as02.bmp, NONE,
	1.1 ind_as03.bmp, NONE, 1.1 ind_as04.bmp, NONE,
	1.1 ind_as05.bmp, NONE, 1.1 ind_as06.bmp, NONE,
	1.1 ind_as07.bmp, NONE, 1.1 ind_as08.bmp, NONE,
	1.1 ind_as09.bmp, NONE, 1.1 ind_as10.bmp, NONE,
	1.1 ind_as11.bmp, NONE, 1.1 ind_as12.bmp, NONE,
	1.1 ind_as13.bmp, NONE, 1.1 ind_as14.bmp, NONE,
	1.1 ind_as15.bmp, NONE, 1.1 ind_as16.bmp, NONE,
	1.1 ind_as17.bmp, NONE, 1.1 ind_as18.bmp, NONE,
	1.1 ind_as19.bmp, NONE, 1.1 ind_as20.bmp, NONE,
	1.1 ind_as21.bmp, NONE, 1.1 ind_as22.bmp, NONE,
	1.1 ind_as23.bmp, NONE, 1.1 ind_as24.bmp, NONE,
	1.1 ind_as25.bmp, NONE, 1.1 ind_as26.bmp, NONE,
	1.1 ind_as27.bmp, NONE, 1.1 ind_as28.bmp, NONE,
	1.1 ind_as29.bmp, NONE, 1.1 ind_as30.bmp, NONE,
	1.1 ind_as31.bmp, NONE, 1.1 ind_as32.bmp, NONE, 1.1 ind_at.bmp,
	NONE, 1.1 ind_at01.bmp, NONE, 1.1 ind_at02.bmp, NONE,
	1.1 ind_at03.bmp, NONE, 1.1 ind_at04.bmp, NONE,
	1.1 ind_at05.bmp, NONE, 1.1 ind_at06.bmp, NONE,
	1.1 ind_at07.bmp, NONE, 1.1 ind_at08.bmp, NONE,
	1.1 ind_at09.bmp, NONE, 1.1 ind_at10.bmp, NONE,
	1.1 ind_at11.bmp, NONE, 1.1 ind_at12.bmp, NONE,
	1.1 ind_at13.bmp, NONE, 1.1 ind_at14.bmp, NONE,
	1.1 ind_at15.bmp, NONE, 1.1 ind_at16.bmp, NONE,
	1.1 ind_at17.bmp, NONE, 1.1 ind_at18.bmp, NONE,
	1.1 ind_at19.bmp, NONE, 1.1 ind_at20.bmp, NONE,
	1.1 ind_at21.bmp, NONE, 1.1 ind_at22.bmp, NONE,
	1.1 ind_at23.bmp, NONE, 1.1 ind_at24.bmp, NONE,
	1.1 ind_at25.bmp, NONE, 1.1 ind_at26.bmp, NONE,
	1.1 ind_at27.bmp, NONE, 1.1 ind_at28.bmp, NONE,
	1.1 ind_at29.bmp, NONE, 1.1 ind_at30.bmp, NONE,
	1.1 ind_at31.bmp, NONE, 1.1 ind_at32.bmp, NONE, 1.1 ind_bb.bmp,
	NONE, 1.1 ind_bb01.bmp, NONE, 1.1 ind_bb02.bmp, NONE,
	1.1 ind_bb03.bmp, NONE, 1.1 ind_bb04.bmp, NONE,
	1.1 ind_bb05.bmp, NONE, 1.1 ind_bb06.bmp, NONE,
	1.1 ind_bb07.bmp, NONE, 1.1 ind_bb08.bmp, NONE,
	1.1 ind_bb09.bmp, NONE, 1.1 ind_bb10.bmp, NONE,
	1.1 ind_bb11.bmp, NONE, 1.1 ind_bb12.bmp, NONE,
	1.1 ind_bb13.bmp, NONE, 1.1 ind_bb14.bmp, NONE,
	1.1 ind_bb15.bmp, NONE, 1.1 ind_bb16.bmp, NONE,
	1.1 ind_bb17.bmp, NONE, 1.1 ind_bb18.bmp, NONE,
	1.1 ind_bb19.bmp, NONE, 1.1 ind_bb20.bmp, NONE,
	1.1 ind_bb21.bmp, NONE, 1.1 ind_bb22.bmp, NONE,
	1.1 ind_bb23.bmp, NONE, 1.1 ind_bb24.bmp, NONE,
	1.1 ind_bb25.bmp, NONE, 1.1 ind_bb26.bmp, NONE,
	1.1 ind_bb27.bmp, NONE, 1.1 ind_bb28.bmp, NONE,
	1.1 ind_bb29.bmp, NONE, 1.1 ind_bb30.bmp, NONE,
	1.1 ind_bb31.bmp, NONE, 1.1 ind_bb32.bmp, NONE, 1.1 ind_ca.bmp,
	NONE, 1.1 ind_ca01.bmp, NONE, 1.1 ind_ca02.bmp, NONE,
	1.1 ind_ca03.bmp, NONE, 1.1 ind_ca04.bmp, NONE,
	1.1 ind_ca05.bmp, NONE, 1.1 ind_ca06.bmp, NONE,
	1.1 ind_ca07.bmp, NONE, 1.1 ind_ca08.bmp, NONE,
	1.1 ind_ca09.bmp, NONE, 1.1 ind_ca10.bmp, NONE,
	1.1 ind_ca11.bmp, NONE, 1.1 ind_ca12.bmp, NONE,
	1.1 ind_ca13.bmp, NONE, 1.1 ind_ca14.bmp, NONE,
	1.1 ind_ca15.bmp, NONE, 1.1 ind_ca16.bmp, NONE,
	1.1 ind_ca17.bmp, NONE, 1.1 ind_ca18.bmp, NONE,
	1.1 ind_ca19.bmp, NONE, 1.1 ind_ca20.bmp, NONE,
	1.1 ind_ca21.bmp, NONE, 1.1 ind_ca22.bmp, NONE,
	1.1 ind_ca23.bmp, NONE, 1.1 ind_ca24.bmp, NONE,
	1.1 ind_ca25.bmp, NONE, 1.1 ind_ca26.bmp, NONE,
	1.1 ind_ca27.bmp, NONE, 1.1 ind_ca28.bmp, NONE,
	1.1 ind_ca29.bmp, NONE, 1.1 ind_ca30.bmp, NONE,
	1.1 ind_ca31.bmp, NONE, 1.1 ind_ca32.bmp, NONE, 1.1 ind_dd.bmp,
	NONE, 1.1 ind_dd01.bmp, NONE, 1.1 ind_dd02.bmp, NONE,
	1.1 ind_dd03.bmp, NONE, 1.1 ind_dd04.bmp, NONE,
	1.1 ind_dd05.bmp, NONE, 1.1 ind_dd06.bmp, NONE,
	1.1 ind_dd07.bmp, NONE, 1.1 ind_dd08.bmp, NONE,
	1.1 ind_dd09.bmp, NONE, 1.1 ind_dd10.bmp, NONE,
	1.1 ind_dd11.bmp, NONE, 1.1 ind_dd12.bmp, NONE,
	1.1 ind_dd13.bmp, NONE, 1.1 ind_dd14.bmp, NONE,
	1.1 ind_dd15.bmp, NONE, 1.1 ind_dd16.bmp, NONE,
	1.1 ind_dd17.bmp, NONE, 1.1 ind_dd18.bmp, NONE,
	1.1 ind_dd19.bmp, NONE, 1.1 ind_dd20.bmp, NONE,
	1.1 ind_dd21.bmp, NONE, 1.1 ind_dd22.bmp, NONE,
	1.1 ind_dd23.bmp, NONE, 1.1 ind_dd24.bmp, NONE,
	1.1 ind_dd25.bmp, NONE, 1.1 ind_dd26.bmp, NONE,
	1.1 ind_dd27.bmp, NONE, 1.1 ind_dd28.bmp, NONE,
	1.1 ind_dd29.bmp, NONE, 1.1 ind_dd30.bmp, NONE,
	1.1 ind_dd31.bmp, NONE, 1.1 ind_dd32.bmp, NONE, 1.1 ind_ga.bmp,
	NONE, 1.1 ind_ga01.bmp, NONE, 1.1 ind_ga02.bmp, NONE,
	1.1 ind_ga03.bmp, NONE, 1.1 ind_ga04.bmp, NONE,
	1.1 ind_ga05.bmp, NONE, 1.1 ind_ga06.bmp, NONE,
	1.1 ind_ga07.bmp, NONE, 1.1 ind_ga08.bmp, NONE,
	1.1 ind_ga09.bmp, NONE, 1.1 ind_ga10.bmp, NONE,
	1.1 ind_ga11.bmp, NONE, 1.1 ind_ga12.bmp, NONE,
	1.1 ind_ga13.bmp, NONE, 1.1 ind_ga14.bmp, NONE,
	1.1 ind_ga15.bmp, NONE, 1.1 ind_ga16.bmp, NONE,
	1.1 ind_ga17.bmp, NONE, 1.1 ind_ga18.bmp, NONE,
	1.1 ind_ga19.bmp, NONE, 1.1 ind_ga20.bmp, NONE,
	1.1 ind_ga21.bmp, NONE, 1.1 ind_ga22.bmp, NONE,
	1.1 ind_ga23.bmp, NONE, 1.1 ind_ga24.bmp, NONE,
	1.1 ind_ga25.bmp, NONE, 1.1 ind_ga26.bmp, NONE,
	1.1 ind_ga27.bmp, NONE, 1.1 ind_ga28.bmp, NONE,
	1.1 ind_ga29.bmp, NONE, 1.1 ind_ga30.bmp, NONE,
	1.1 ind_ga31.bmp, NONE, 1.1 ind_ga32.bmp, NONE, 1.1 ind_sb.bmp,
	NONE, 1.1 ind_sb01.bmp, NONE, 1.1 ind_sb02.bmp, NONE,
	1.1 ind_sb03.bmp, NONE, 1.1 ind_sb04.bmp, NONE,
	1.1 ind_sb05.bmp, NONE, 1.1 ind_sb06.bmp, NONE,
	1.1 ind_sb07.bmp, NONE, 1.1 ind_sb08.bmp, NONE,
	1.1 ind_sb09.bmp, NONE, 1.1 ind_sb10.bmp, NONE,
	1.1 ind_sb11.bmp, NONE, 1.1 ind_sb12.bmp, NONE,
	1.1 ind_sb13.bmp, NONE, 1.1 ind_sb14.bmp, NONE,
	1.1 ind_sb15.bmp, NONE, 1.1 ind_sb16.bmp, NONE,
	1.1 ind_sb17.bmp, NONE, 1.1 ind_sb18.bmp, NONE,
	1.1 ind_sb19.bmp, NONE, 1.1 ind_sb20.bmp, NONE,
	1.1 ind_sb21.bmp, NONE, 1.1 ind_sb22.bmp, NONE,
	1.1 ind_sb23.bmp, NONE, 1.1 ind_sb24.bmp, NONE,
	1.1 ind_sb25.bmp, NONE, 1.1 ind_sb26.bmp, NONE,
	1.1 ind_sb27.bmp, NONE, 1.1 ind_sb28.bmp, NONE,
	1.1 ind_sb29.bmp, NONE, 1.1 ind_sb30.bmp, NONE,
	1.1 ind_sb31.bmp, NONE, 1.1 ind_sb32.bmp, NONE, 1.1 ind_sc.bmp,
	NONE, 1.1 ind_sc01.bmp, NONE, 1.1 ind_sc02.bmp, NONE,
	1.1 ind_sc03.bmp, NONE, 1.1 ind_sc04.bmp, NONE,
	1.1 ind_sc05.bmp, NONE, 1.1 ind_sc06.bmp, NONE,
	1.1 ind_sc07.bmp, NONE, 1.1 ind_sc08.bmp, NONE,
	1.1 ind_sc09.bmp, NONE, 1.1 ind_sc10.bmp, NONE,
	1.1 ind_sc11.bmp, NONE, 1.1 ind_sc12.bmp, NONE,
	1.1 ind_sc13.bmp, NONE, 1.1 ind_sc14.bmp, NONE,
	1.1 ind_sc15.bmp, NONE, 1.1 ind_sc16.bmp, NONE,
	1.1 ind_sc17.bmp, NONE, 1.1 ind_sc18.bmp, NONE,
	1.1 ind_sc19.bmp, NONE, 1.1 ind_sc20.bmp, NONE,
	1.1 ind_sc21.bmp, NONE, 1.1 ind_sc22.bmp, NONE,
	1.1 ind_sc23.bmp, NONE, 1.1 ind_sc24.bmp, NONE,
	1.1 ind_sc25.bmp, NONE, 1.1 ind_sc26.bmp, NONE,
	1.1 ind_sc27.bmp, NONE, 1.1 ind_sc28.bmp, NONE,
	1.1 ind_sc29.bmp, NONE, 1.1 ind_sc30.bmp, NONE,
	1.1 ind_sc31.bmp, NONE, 1.1 ind_sc32.bmp, NONE,
	1.1 indshipT.bmp, NONE, 1.1
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/tinted/ind
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32097/resources/ships/tinted/ind

Added Files:
	ind_as.bmp ind_as01.bmp ind_as02.bmp ind_as03.bmp ind_as04.bmp 
	ind_as05.bmp ind_as06.bmp ind_as07.bmp ind_as08.bmp 
	ind_as09.bmp ind_as10.bmp ind_as11.bmp ind_as12.bmp 
	ind_as13.bmp ind_as14.bmp ind_as15.bmp ind_as16.bmp 
	ind_as17.bmp ind_as18.bmp ind_as19.bmp ind_as20.bmp 
	ind_as21.bmp ind_as22.bmp ind_as23.bmp ind_as24.bmp 
	ind_as25.bmp ind_as26.bmp ind_as27.bmp ind_as28.bmp 
	ind_as29.bmp ind_as30.bmp ind_as31.bmp ind_as32.bmp ind_at.bmp 
	ind_at01.bmp ind_at02.bmp ind_at03.bmp ind_at04.bmp 
	ind_at05.bmp ind_at06.bmp ind_at07.bmp ind_at08.bmp 
	ind_at09.bmp ind_at10.bmp ind_at11.bmp ind_at12.bmp 
	ind_at13.bmp ind_at14.bmp ind_at15.bmp ind_at16.bmp 
	ind_at17.bmp ind_at18.bmp ind_at19.bmp ind_at20.bmp 
	ind_at21.bmp ind_at22.bmp ind_at23.bmp ind_at24.bmp 
	ind_at25.bmp ind_at26.bmp ind_at27.bmp ind_at28.bmp 
	ind_at29.bmp ind_at30.bmp ind_at31.bmp ind_at32.bmp ind_bb.bmp 
	ind_bb01.bmp ind_bb02.bmp ind_bb03.bmp ind_bb04.bmp 
	ind_bb05.bmp ind_bb06.bmp ind_bb07.bmp ind_bb08.bmp 
	ind_bb09.bmp ind_bb10.bmp ind_bb11.bmp ind_bb12.bmp 
	ind_bb13.bmp ind_bb14.bmp ind_bb15.bmp ind_bb16.bmp 
	ind_bb17.bmp ind_bb18.bmp ind_bb19.bmp ind_bb20.bmp 
	ind_bb21.bmp ind_bb22.bmp ind_bb23.bmp ind_bb24.bmp 
	ind_bb25.bmp ind_bb26.bmp ind_bb27.bmp ind_bb28.bmp 
	ind_bb29.bmp ind_bb30.bmp ind_bb31.bmp ind_bb32.bmp ind_ca.bmp 
	ind_ca01.bmp ind_ca02.bmp ind_ca03.bmp ind_ca04.bmp 
	ind_ca05.bmp ind_ca06.bmp ind_ca07.bmp ind_ca08.bmp 
	ind_ca09.bmp ind_ca10.bmp ind_ca11.bmp ind_ca12.bmp 
	ind_ca13.bmp ind_ca14.bmp ind_ca15.bmp ind_ca16.bmp 
	ind_ca17.bmp ind_ca18.bmp ind_ca19.bmp ind_ca20.bmp 
	ind_ca21.bmp ind_ca22.bmp ind_ca23.bmp ind_ca24.bmp 
	ind_ca25.bmp ind_ca26.bmp ind_ca27.bmp ind_ca28.bmp 
	ind_ca29.bmp ind_ca30.bmp ind_ca31.bmp ind_ca32.bmp ind_dd.bmp 
	ind_dd01.bmp ind_dd02.bmp ind_dd03.bmp ind_dd04.bmp 
	ind_dd05.bmp ind_dd06.bmp ind_dd07.bmp ind_dd08.bmp 
	ind_dd09.bmp ind_dd10.bmp ind_dd11.bmp ind_dd12.bmp 
	ind_dd13.bmp ind_dd14.bmp ind_dd15.bmp ind_dd16.bmp 
	ind_dd17.bmp ind_dd18.bmp ind_dd19.bmp ind_dd20.bmp 
	ind_dd21.bmp ind_dd22.bmp ind_dd23.bmp ind_dd24.bmp 
	ind_dd25.bmp ind_dd26.bmp ind_dd27.bmp ind_dd28.bmp 
	ind_dd29.bmp ind_dd30.bmp ind_dd31.bmp ind_dd32.bmp ind_ga.bmp 
	ind_ga01.bmp ind_ga02.bmp ind_ga03.bmp ind_ga04.bmp 
	ind_ga05.bmp ind_ga06.bmp ind_ga07.bmp ind_ga08.bmp 
	ind_ga09.bmp ind_ga10.bmp ind_ga11.bmp ind_ga12.bmp 
	ind_ga13.bmp ind_ga14.bmp ind_ga15.bmp ind_ga16.bmp 
	ind_ga17.bmp ind_ga18.bmp ind_ga19.bmp ind_ga20.bmp 
	ind_ga21.bmp ind_ga22.bmp ind_ga23.bmp ind_ga24.bmp 
	ind_ga25.bmp ind_ga26.bmp ind_ga27.bmp ind_ga28.bmp 
	ind_ga29.bmp ind_ga30.bmp ind_ga31.bmp ind_ga32.bmp ind_sb.bmp 
	ind_sb01.bmp ind_sb02.bmp ind_sb03.bmp ind_sb04.bmp 
	ind_sb05.bmp ind_sb06.bmp ind_sb07.bmp ind_sb08.bmp 
	ind_sb09.bmp ind_sb10.bmp ind_sb11.bmp ind_sb12.bmp 
	ind_sb13.bmp ind_sb14.bmp ind_sb15.bmp ind_sb16.bmp 
	ind_sb17.bmp ind_sb18.bmp ind_sb19.bmp ind_sb20.bmp 
	ind_sb21.bmp ind_sb22.bmp ind_sb23.bmp ind_sb24.bmp 
	ind_sb25.bmp ind_sb26.bmp ind_sb27.bmp ind_sb28.bmp 
	ind_sb29.bmp ind_sb30.bmp ind_sb31.bmp ind_sb32.bmp ind_sc.bmp 
	ind_sc01.bmp ind_sc02.bmp ind_sc03.bmp ind_sc04.bmp 
	ind_sc05.bmp ind_sc06.bmp ind_sc07.bmp ind_sc08.bmp 
	ind_sc09.bmp ind_sc10.bmp ind_sc11.bmp ind_sc12.bmp 
	ind_sc13.bmp ind_sc14.bmp ind_sc15.bmp ind_sc16.bmp 
	ind_sc17.bmp ind_sc18.bmp ind_sc19.bmp ind_sc20.bmp 
	ind_sc21.bmp ind_sc22.bmp ind_sc23.bmp ind_sc24.bmp 
	ind_sc25.bmp ind_sc26.bmp ind_sc27.bmp ind_sc28.bmp 
	ind_sc29.bmp ind_sc30.bmp ind_sc31.bmp ind_sc32.bmp 
	indshipT.bmp 
Log Message:
Addition of greyscale and shaded old color full bitmaps to repository.  Along the way, fixed all the base bitmaps so they rotate.

--- NEW FILE: ind_bb02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ca19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: indshipT.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_as01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_ga11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sc11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_sb02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_bb14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_at14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ind_dd25.bmp ---
(This appears to be a binary file; contents omitted.)



From modemhero at users.sourceforge.net  Fri Apr 21 11:37:43 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:37:43 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/tinted/rom rom_as.bmp,
	NONE, 1.1 rom_as01.bmp, NONE, 1.1 rom_as02.bmp, NONE,
	1.1 rom_as03.bmp, NONE, 1.1 rom_as04.bmp, NONE,
	1.1 rom_as05.bmp, NONE, 1.1 rom_as06.bmp, NONE,
	1.1 rom_as07.bmp, NONE, 1.1 rom_as08.bmp, NONE,
	1.1 rom_as09.bmp, NONE, 1.1 rom_as10.bmp, NONE,
	1.1 rom_as11.bmp, NONE, 1.1 rom_as12.bmp, NONE,
	1.1 rom_as13.bmp, NONE, 1.1 rom_as14.bmp, NONE,
	1.1 rom_as15.bmp, NONE, 1.1 rom_as16.bmp, NONE,
	1.1 rom_as17.bmp, NONE, 1.1 rom_as18.bmp, NONE,
	1.1 rom_as19.bmp, NONE, 1.1 rom_as20.bmp, NONE,
	1.1 rom_as21.bmp, NONE, 1.1 rom_as22.bmp, NONE,
	1.1 rom_as23.bmp, NONE, 1.1 rom_as24.bmp, NONE,
	1.1 rom_as25.bmp, NONE, 1.1 rom_as26.bmp, NONE,
	1.1 rom_as27.bmp, NONE, 1.1 rom_as28.bmp, NONE,
	1.1 rom_as29.bmp, NONE, 1.1 rom_as30.bmp, NONE,
	1.1 rom_as31.bmp, NONE, 1.1 rom_as32.bmp, NONE, 1.1 rom_at.bmp,
	NONE, 1.1 rom_at01.bmp, NONE, 1.1 rom_at02.bmp, NONE,
	1.1 rom_at03.bmp, NONE, 1.1 rom_at04.bmp, NONE,
	1.1 rom_at05.bmp, NONE, 1.1 rom_at06.bmp, NONE,
	1.1 rom_at07.bmp, NONE, 1.1 rom_at08.bmp, NONE,
	1.1 rom_at09.bmp, NONE, 1.1 rom_at10.bmp, NONE,
	1.1 rom_at11.bmp, NONE, 1.1 rom_at12.bmp, NONE,
	1.1 rom_at13.bmp, NONE, 1.1 rom_at14.bmp, NONE,
	1.1 rom_at15.bmp, NONE, 1.1 rom_at16.bmp, NONE,
	1.1 rom_at17.bmp, NONE, 1.1 rom_at18.bmp, NONE,
	1.1 rom_at19.bmp, NONE, 1.1 rom_at20.bmp, NONE,
	1.1 rom_at21.bmp, NONE, 1.1 rom_at22.bmp, NONE,
	1.1 rom_at23.bmp, NONE, 1.1 rom_at24.bmp, NONE,
	1.1 rom_at25.bmp, NONE, 1.1 rom_at26.bmp, NONE,
	1.1 rom_at27.bmp, NONE, 1.1 rom_at28.bmp, NONE,
	1.1 rom_at29.bmp, NONE, 1.1 rom_at30.bmp, NONE,
	1.1 rom_at31.bmp, NONE, 1.1 rom_at32.bmp, NONE, 1.1 rom_bb.bmp,
	NONE, 1.1 rom_bb01.bmp, NONE, 1.1 rom_bb02.bmp, NONE,
	1.1 rom_bb03.bmp, NONE, 1.1 rom_bb04.bmp, NONE,
	1.1 rom_bb05.bmp, NONE, 1.1 rom_bb06.bmp, NONE,
	1.1 rom_bb07.bmp, NONE, 1.1 rom_bb08.bmp, NONE,
	1.1 rom_bb09.bmp, NONE, 1.1 rom_bb10.bmp, NONE,
	1.1 rom_bb11.bmp, NONE, 1.1 rom_bb12.bmp, NONE,
	1.1 rom_bb13.bmp, NONE, 1.1 rom_bb14.bmp, NONE,
	1.1 rom_bb15.bmp, NONE, 1.1 rom_bb16.bmp, NONE,
	1.1 rom_bb17.bmp, NONE, 1.1 rom_bb18.bmp, NONE,
	1.1 rom_bb19.bmp, NONE, 1.1 rom_bb20.bmp, NONE,
	1.1 rom_bb21.bmp, NONE, 1.1 rom_bb22.bmp, NONE,
	1.1 rom_bb23.bmp, NONE, 1.1 rom_bb24.bmp, NONE,
	1.1 rom_bb25.bmp, NONE, 1.1 rom_bb26.bmp, NONE,
	1.1 rom_bb27.bmp, NONE, 1.1 rom_bb28.bmp, NONE,
	1.1 rom_bb29.bmp, NONE, 1.1 rom_bb30.bmp, NONE,
	1.1 rom_bb31.bmp, NONE, 1.1 rom_bb32.bmp, NONE, 1.1 rom_ca.bmp,
	NONE, 1.1 rom_ca01.bmp, NONE, 1.1 rom_ca02.bmp, NONE,
	1.1 rom_ca03.bmp, NONE, 1.1 rom_ca04.bmp, NONE,
	1.1 rom_ca05.bmp, NONE, 1.1 rom_ca06.bmp, NONE,
	1.1 rom_ca07.bmp, NONE, 1.1 rom_ca08.bmp, NONE,
	1.1 rom_ca09.bmp, NONE, 1.1 rom_ca10.bmp, NONE,
	1.1 rom_ca11.bmp, NONE, 1.1 rom_ca12.bmp, NONE,
	1.1 rom_ca13.bmp, NONE, 1.1 rom_ca14.bmp, NONE,
	1.1 rom_ca15.bmp, NONE, 1.1 rom_ca16.bmp, NONE,
	1.1 rom_ca17.bmp, NONE, 1.1 rom_ca18.bmp, NONE,
	1.1 rom_ca19.bmp, NONE, 1.1 rom_ca20.bmp, NONE,
	1.1 rom_ca21.bmp, NONE, 1.1 rom_ca22.bmp, NONE,
	1.1 rom_ca23.bmp, NONE, 1.1 rom_ca24.bmp, NONE,
	1.1 rom_ca25.bmp, NONE, 1.1 rom_ca26.bmp, NONE,
	1.1 rom_ca27.bmp, NONE, 1.1 rom_ca28.bmp, NONE,
	1.1 rom_ca29.bmp, NONE, 1.1 rom_ca30.bmp, NONE,
	1.1 rom_ca31.bmp, NONE, 1.1 rom_ca32.bmp, NONE, 1.1 rom_dd.bmp,
	NONE, 1.1 rom_dd01.bmp, NONE, 1.1 rom_dd02.bmp, NONE,
	1.1 rom_dd03.bmp, NONE, 1.1 rom_dd04.bmp, NONE,
	1.1 rom_dd05.bmp, NONE, 1.1 rom_dd06.bmp, NONE,
	1.1 rom_dd07.bmp, NONE, 1.1 rom_dd08.bmp, NONE,
	1.1 rom_dd09.bmp, NONE, 1.1 rom_dd10.bmp, NONE,
	1.1 rom_dd11.bmp, NONE, 1.1 rom_dd12.bmp, NONE,
	1.1 rom_dd13.bmp, NONE, 1.1 rom_dd14.bmp, NONE,
	1.1 rom_dd15.bmp, NONE, 1.1 rom_dd16.bmp, NONE,
	1.1 rom_dd17.bmp, NONE, 1.1 rom_dd18.bmp, NONE,
	1.1 rom_dd19.bmp, NONE, 1.1 rom_dd20.bmp, NONE,
	1.1 rom_dd21.bmp, NONE, 1.1 rom_dd22.bmp, NONE,
	1.1 rom_dd23.bmp, NONE, 1.1 rom_dd24.bmp, NONE,
	1.1 rom_dd25.bmp, NONE, 1.1 rom_dd26.bmp, NONE,
	1.1 rom_dd27.bmp, NONE, 1.1 rom_dd28.bmp, NONE,
	1.1 rom_dd29.bmp, NONE, 1.1 rom_dd30.bmp, NONE,
	1.1 rom_dd31.bmp, NONE, 1.1 rom_dd32.bmp, NONE, 1.1 rom_ga.bmp,
	NONE, 1.1 rom_ga01.bmp, NONE, 1.1 rom_ga02.bmp, NONE,
	1.1 rom_ga03.bmp, NONE, 1.1 rom_ga04.bmp, NONE,
	1.1 rom_ga05.bmp, NONE, 1.1 rom_ga06.bmp, NONE,
	1.1 rom_ga07.bmp, NONE, 1.1 rom_ga08.bmp, NONE,
	1.1 rom_ga09.bmp, NONE, 1.1 rom_ga10.bmp, NONE,
	1.1 rom_ga11.bmp, NONE, 1.1 rom_ga12.bmp, NONE,
	1.1 rom_ga13.bmp, NONE, 1.1 rom_ga14.bmp, NONE,
	1.1 rom_ga15.bmp, NONE, 1.1 rom_ga16.bmp, NONE,
	1.1 rom_ga17.bmp, NONE, 1.1 rom_ga18.bmp, NONE,
	1.1 rom_ga19.bmp, NONE, 1.1 rom_ga20.bmp, NONE,
	1.1 rom_ga21.bmp, NONE, 1.1 rom_ga22.bmp, NONE,
	1.1 rom_ga23.bmp, NONE, 1.1 rom_ga24.bmp, NONE,
	1.1 rom_ga25.bmp, NONE, 1.1 rom_ga26.bmp, NONE,
	1.1 rom_ga27.bmp, NONE, 1.1 rom_ga28.bmp, NONE,
	1.1 rom_ga29.bmp, NONE, 1.1 rom_ga30.bmp, NONE,
	1.1 rom_ga31.bmp, NONE, 1.1 rom_ga32.bmp, NONE, 1.1 rom_sb.bmp,
	NONE, 1.1 rom_sb01.bmp, NONE, 1.1 rom_sb02.bmp, NONE,
	1.1 rom_sb03.bmp, NONE, 1.1 rom_sb04.bmp, NONE,
	1.1 rom_sb05.bmp, NONE, 1.1 rom_sb06.bmp, NONE,
	1.1 rom_sb07.bmp, NONE, 1.1 rom_sb08.bmp, NONE,
	1.1 rom_sb09.bmp, NONE, 1.1 rom_sb10.bmp, NONE,
	1.1 rom_sb11.bmp, NONE, 1.1 rom_sb12.bmp, NONE,
	1.1 rom_sb13.bmp, NONE, 1.1 rom_sb14.bmp, NONE,
	1.1 rom_sb15.bmp, NONE, 1.1 rom_sb16.bmp, NONE,
	1.1 rom_sb17.bmp, NONE, 1.1 rom_sb18.bmp, NONE,
	1.1 rom_sb19.bmp, NONE, 1.1 rom_sb20.bmp, NONE,
	1.1 rom_sb21.bmp, NONE, 1.1 rom_sb22.bmp, NONE,
	1.1 rom_sb23.bmp, NONE, 1.1 rom_sb24.bmp, NONE,
	1.1 rom_sb25.bmp, NONE, 1.1 rom_sb26.bmp, NONE,
	1.1 rom_sb27.bmp, NONE, 1.1 rom_sb28.bmp, NONE,
	1.1 rom_sb29.bmp, NONE, 1.1 rom_sb30.bmp, NONE,
	1.1 rom_sb31.bmp, NONE, 1.1 rom_sb32.bmp, NONE, 1.1 rom_sc.bmp,
	NONE, 1.1 rom_sc01.bmp, NONE, 1.1 rom_sc02.bmp, NONE,
	1.1 rom_sc03.bmp, NONE, 1.1 rom_sc04.bmp, NONE,
	1.1 rom_sc05.bmp, NONE, 1.1 rom_sc06.bmp, NONE,
	1.1 rom_sc07.bmp, NONE, 1.1 rom_sc08.bmp, NONE,
	1.1 rom_sc09.bmp, NONE, 1.1 rom_sc10.bmp, NONE,
	1.1 rom_sc11.bmp, NONE, 1.1 rom_sc12.bmp, NONE,
	1.1 rom_sc13.bmp, NONE, 1.1 rom_sc14.bmp, NONE,
	1.1 rom_sc15.bmp, NONE, 1.1 rom_sc16.bmp, NONE,
	1.1 rom_sc17.bmp, NONE, 1.1 rom_sc18.bmp, NONE,
	1.1 rom_sc19.bmp, NONE, 1.1 rom_sc20.bmp, NONE,
	1.1 rom_sc21.bmp, NONE, 1.1 rom_sc22.bmp, NONE,
	1.1 rom_sc23.bmp, NONE, 1.1 rom_sc24.bmp, NONE,
	1.1 rom_sc25.bmp, NONE, 1.1 rom_sc26.bmp, NONE,
	1.1 rom_sc27.bmp, NONE, 1.1 rom_sc28.bmp, NONE,
	1.1 rom_sc29.bmp, NONE, 1.1 rom_sc30.bmp, NONE,
	1.1 rom_sc31.bmp, NONE, 1.1 rom_sc32.bmp, NONE,
	1.1 romshipT.bmp, NONE, 1.1
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/tinted/rom
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32293/resources/ships/tinted/rom

Added Files:
	rom_as.bmp rom_as01.bmp rom_as02.bmp rom_as03.bmp rom_as04.bmp 
	rom_as05.bmp rom_as06.bmp rom_as07.bmp rom_as08.bmp 
	rom_as09.bmp rom_as10.bmp rom_as11.bmp rom_as12.bmp 
	rom_as13.bmp rom_as14.bmp rom_as15.bmp rom_as16.bmp 
	rom_as17.bmp rom_as18.bmp rom_as19.bmp rom_as20.bmp 
	rom_as21.bmp rom_as22.bmp rom_as23.bmp rom_as24.bmp 
	rom_as25.bmp rom_as26.bmp rom_as27.bmp rom_as28.bmp 
	rom_as29.bmp rom_as30.bmp rom_as31.bmp rom_as32.bmp rom_at.bmp 
	rom_at01.bmp rom_at02.bmp rom_at03.bmp rom_at04.bmp 
	rom_at05.bmp rom_at06.bmp rom_at07.bmp rom_at08.bmp 
	rom_at09.bmp rom_at10.bmp rom_at11.bmp rom_at12.bmp 
	rom_at13.bmp rom_at14.bmp rom_at15.bmp rom_at16.bmp 
	rom_at17.bmp rom_at18.bmp rom_at19.bmp rom_at20.bmp 
	rom_at21.bmp rom_at22.bmp rom_at23.bmp rom_at24.bmp 
	rom_at25.bmp rom_at26.bmp rom_at27.bmp rom_at28.bmp 
	rom_at29.bmp rom_at30.bmp rom_at31.bmp rom_at32.bmp rom_bb.bmp 
	rom_bb01.bmp rom_bb02.bmp rom_bb03.bmp rom_bb04.bmp 
	rom_bb05.bmp rom_bb06.bmp rom_bb07.bmp rom_bb08.bmp 
	rom_bb09.bmp rom_bb10.bmp rom_bb11.bmp rom_bb12.bmp 
	rom_bb13.bmp rom_bb14.bmp rom_bb15.bmp rom_bb16.bmp 
	rom_bb17.bmp rom_bb18.bmp rom_bb19.bmp rom_bb20.bmp 
	rom_bb21.bmp rom_bb22.bmp rom_bb23.bmp rom_bb24.bmp 
	rom_bb25.bmp rom_bb26.bmp rom_bb27.bmp rom_bb28.bmp 
	rom_bb29.bmp rom_bb30.bmp rom_bb31.bmp rom_bb32.bmp rom_ca.bmp 
	rom_ca01.bmp rom_ca02.bmp rom_ca03.bmp rom_ca04.bmp 
	rom_ca05.bmp rom_ca06.bmp rom_ca07.bmp rom_ca08.bmp 
	rom_ca09.bmp rom_ca10.bmp rom_ca11.bmp rom_ca12.bmp 
	rom_ca13.bmp rom_ca14.bmp rom_ca15.bmp rom_ca16.bmp 
	rom_ca17.bmp rom_ca18.bmp rom_ca19.bmp rom_ca20.bmp 
	rom_ca21.bmp rom_ca22.bmp rom_ca23.bmp rom_ca24.bmp 
	rom_ca25.bmp rom_ca26.bmp rom_ca27.bmp rom_ca28.bmp 
	rom_ca29.bmp rom_ca30.bmp rom_ca31.bmp rom_ca32.bmp rom_dd.bmp 
	rom_dd01.bmp rom_dd02.bmp rom_dd03.bmp rom_dd04.bmp 
	rom_dd05.bmp rom_dd06.bmp rom_dd07.bmp rom_dd08.bmp 
	rom_dd09.bmp rom_dd10.bmp rom_dd11.bmp rom_dd12.bmp 
	rom_dd13.bmp rom_dd14.bmp rom_dd15.bmp rom_dd16.bmp 
	rom_dd17.bmp rom_dd18.bmp rom_dd19.bmp rom_dd20.bmp 
	rom_dd21.bmp rom_dd22.bmp rom_dd23.bmp rom_dd24.bmp 
	rom_dd25.bmp rom_dd26.bmp rom_dd27.bmp rom_dd28.bmp 
	rom_dd29.bmp rom_dd30.bmp rom_dd31.bmp rom_dd32.bmp rom_ga.bmp 
	rom_ga01.bmp rom_ga02.bmp rom_ga03.bmp rom_ga04.bmp 
	rom_ga05.bmp rom_ga06.bmp rom_ga07.bmp rom_ga08.bmp 
	rom_ga09.bmp rom_ga10.bmp rom_ga11.bmp rom_ga12.bmp 
	rom_ga13.bmp rom_ga14.bmp rom_ga15.bmp rom_ga16.bmp 
	rom_ga17.bmp rom_ga18.bmp rom_ga19.bmp rom_ga20.bmp 
	rom_ga21.bmp rom_ga22.bmp rom_ga23.bmp rom_ga24.bmp 
	rom_ga25.bmp rom_ga26.bmp rom_ga27.bmp rom_ga28.bmp 
	rom_ga29.bmp rom_ga30.bmp rom_ga31.bmp rom_ga32.bmp rom_sb.bmp 
	rom_sb01.bmp rom_sb02.bmp rom_sb03.bmp rom_sb04.bmp 
	rom_sb05.bmp rom_sb06.bmp rom_sb07.bmp rom_sb08.bmp 
	rom_sb09.bmp rom_sb10.bmp rom_sb11.bmp rom_sb12.bmp 
	rom_sb13.bmp rom_sb14.bmp rom_sb15.bmp rom_sb16.bmp 
	rom_sb17.bmp rom_sb18.bmp rom_sb19.bmp rom_sb20.bmp 
	rom_sb21.bmp rom_sb22.bmp rom_sb23.bmp rom_sb24.bmp 
	rom_sb25.bmp rom_sb26.bmp rom_sb27.bmp rom_sb28.bmp 
	rom_sb29.bmp rom_sb30.bmp rom_sb31.bmp rom_sb32.bmp rom_sc.bmp 
	rom_sc01.bmp rom_sc02.bmp rom_sc03.bmp rom_sc04.bmp 
	rom_sc05.bmp rom_sc06.bmp rom_sc07.bmp rom_sc08.bmp 
	rom_sc09.bmp rom_sc10.bmp rom_sc11.bmp rom_sc12.bmp 
	rom_sc13.bmp rom_sc14.bmp rom_sc15.bmp rom_sc16.bmp 
	rom_sc17.bmp rom_sc18.bmp rom_sc19.bmp rom_sc20.bmp 
	rom_sc21.bmp rom_sc22.bmp rom_sc23.bmp rom_sc24.bmp 
	rom_sc25.bmp rom_sc26.bmp rom_sc27.bmp rom_sc28.bmp 
	rom_sc29.bmp rom_sc30.bmp rom_sc31.bmp rom_sc32.bmp 
	romshipT.bmp 
Log Message:
Addition of greyscale and shaded old color full bitmaps to repository.  Along the way, fixed all the base bitmaps so they rotate.

--- NEW FILE: rom_as11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: romshipT.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ga32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_bb23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_at02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sc05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_dd11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_ca32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_sb29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rom_as28.bmp ---
(This appears to be a binary file; contents omitted.)



From modemhero at users.sourceforge.net  Fri Apr 21 11:37:12 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:37:12 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/tinted/fed
	fed_as30.bmp, NONE, 1.1 fed_as31.bmp, NONE, 1.1 fed_as32.bmp,
	NONE, 1.1 fed_at.bmp, NONE, 1.1 fed_at01.bmp, NONE,
	1.1 fed_at02.bmp, NONE, 1.1 fed_at03.bmp, NONE,
	1.1 fed_at04.bmp, NONE, 1.1 fed_at05.bmp, NONE,
	1.1 fed_at06.bmp, NONE, 1.1 fed_at07.bmp, NONE,
	1.1 fed_at08.bmp, NONE, 1.1 fed_at09.bmp, NONE,
	1.1 fed_at10.bmp, NONE, 1.1 fed_at11.bmp, NONE,
	1.1 fed_at12.bmp, NONE, 1.1 fed_at13.bmp, NONE,
	1.1 fed_at14.bmp, NONE, 1.1 fed_at15.bmp, NONE,
	1.1 fed_at16.bmp, NONE, 1.1 fed_at17.bmp, NONE,
	1.1 fed_at18.bmp, NONE, 1.1 fed_at19.bmp, NONE,
	1.1 fed_at20.bmp, NONE, 1.1 fed_at21.bmp, NONE,
	1.1 fed_at22.bmp, NONE, 1.1 fed_at23.bmp, NONE,
	1.1 fed_at24.bmp, NONE, 1.1 fed_at25.bmp, NONE,
	1.1 fed_at26.bmp, NONE, 1.1 fed_at27.bmp, NONE,
	1.1 fed_at28.bmp, NONE, 1.1 fed_at29.bmp, NONE,
	1.1 fed_at30.bmp, NONE, 1.1 fed_at31.bmp, NONE,
	1.1 fed_at32.bmp, NONE, 1.1 fed_bb.bmp, NONE, 1.1 fed_bb01.bmp,
	NONE, 1.1 fed_bb02.bmp, NONE, 1.1 fed_bb03.bmp, NONE,
	1.1 fed_bb04.bmp, NONE, 1.1 fed_bb05.bmp, NONE,
	1.1 fed_bb06.bmp, NONE, 1.1 fed_bb07.bmp, NONE,
	1.1 fed_bb08.bmp, NONE, 1.1 fed_bb09.bmp, NONE,
	1.1 fed_bb10.bmp, NONE, 1.1 fed_bb11.bmp, NONE,
	1.1 fed_bb12.bmp, NONE, 1.1 fed_bb13.bmp, NONE,
	1.1 fed_bb14.bmp, NONE, 1.1 fed_bb15.bmp, NONE,
	1.1 fed_bb16.bmp, NONE, 1.1 fed_bb17.bmp, NONE,
	1.1 fed_bb18.bmp, NONE, 1.1 fed_bb19.bmp, NONE,
	1.1 fed_bb20.bmp, NONE, 1.1 fed_bb21.bmp, NONE,
	1.1 fed_bb22.bmp, NONE, 1.1 fed_bb23.bmp, NONE,
	1.1 fed_bb24.bmp, NONE, 1.1 fed_bb25.bmp, NONE,
	1.1 fed_bb26.bmp, NONE, 1.1 fed_bb27.bmp, NONE,
	1.1 fed_bb28.bmp, NONE, 1.1 fed_bb29.bmp, NONE,
	1.1 fed_bb30.bmp, NONE, 1.1 fed_bb31.bmp, NONE,
	1.1 fed_bb32.bmp, NONE, 1.1 fed_ca.bmp, NONE, 1.1 fed_ca01.bmp,
	NONE, 1.1 fed_ca02.bmp, NONE, 1.1 fed_ca03.bmp, NONE,
	1.1 fed_ca04.bmp, NONE, 1.1 fed_ca05.bmp, NONE,
	1.1 fed_ca06.bmp, NONE, 1.1 fed_ca07.bmp, NONE,
	1.1 fed_ca08.bmp, NONE, 1.1 fed_ca09.bmp, NONE,
	1.1 fed_ca10.bmp, NONE, 1.1 fed_ca11.bmp, NONE,
	1.1 fed_ca12.bmp, NONE, 1.1 fed_ca13.bmp, NONE,
	1.1 fed_ca14.bmp, NONE, 1.1 fed_ca15.bmp, NONE,
	1.1 fed_ca16.bmp, NONE, 1.1 fed_ca17.bmp, NONE,
	1.1 fed_ca18.bmp, NONE, 1.1 fed_ca19.bmp, NONE,
	1.1 fed_ca20.bmp, NONE, 1.1 fed_ca21.bmp, NONE,
	1.1 fed_ca22.bmp, NONE, 1.1 fed_ca23.bmp, NONE,
	1.1 fed_ca24.bmp, NONE, 1.1 fed_ca25.bmp, NONE,
	1.1 fed_ca26.bmp, NONE, 1.1 fed_ca27.bmp, NONE,
	1.1 fed_ca28.bmp, NONE, 1.1 fed_ca29.bmp, NONE,
	1.1 fed_ca30.bmp, NONE, 1.1 fed_ca31.bmp, NONE,
	1.1 fed_ca32.bmp, NONE, 1.1 fed_dd.bmp, NONE, 1.1 fed_dd01.bmp,
	NONE, 1.1 fed_dd02.bmp, NONE, 1.1 fed_dd03.bmp, NONE,
	1.1 fed_dd04.bmp, NONE, 1.1 fed_dd05.bmp, NONE,
	1.1 fed_dd06.bmp, NONE, 1.1 fed_dd07.bmp, NONE,
	1.1 fed_dd08.bmp, NONE, 1.1 fed_dd09.bmp, NONE,
	1.1 fed_dd10.bmp, NONE, 1.1 fed_dd11.bmp, NONE,
	1.1 fed_dd12.bmp, NONE, 1.1 fed_dd13.bmp, NONE,
	1.1 fed_dd14.bmp, NONE, 1.1 fed_dd15.bmp, NONE,
	1.1 fed_dd16.bmp, NONE, 1.1 fed_dd17.bmp, NONE,
	1.1 fed_dd18.bmp, NONE, 1.1 fed_dd19.bmp, NONE,
	1.1 fed_dd20.bmp, NONE, 1.1 fed_dd21.bmp, NONE,
	1.1 fed_dd22.bmp, NONE, 1.1 fed_dd23.bmp, NONE,
	1.1 fed_dd24.bmp, NONE, 1.1 fed_dd25.bmp, NONE,
	1.1 fed_dd26.bmp, NONE, 1.1 fed_dd27.bmp, NONE,
	1.1 fed_dd28.bmp, NONE, 1.1 fed_dd29.bmp, NONE,
	1.1 fed_dd30.bmp, NONE, 1.1 fed_dd31.bmp, NONE,
	1.1 fed_dd32.bmp, NONE, 1.1 fed_ga.bmp, NONE, 1.1 fed_ga01.bmp,
	NONE, 1.1 fed_ga02.bmp, NONE, 1.1 fed_ga03.bmp, NONE,
	1.1 fed_ga04.bmp, NONE, 1.1 fed_ga05.bmp, NONE,
	1.1 fed_ga06.bmp, NONE, 1.1 fed_ga07.bmp, NONE,
	1.1 fed_ga08.bmp, NONE, 1.1 fed_ga09.bmp, NONE,
	1.1 fed_ga10.bmp, NONE, 1.1 fed_ga11.bmp, NONE,
	1.1 fed_ga12.bmp, NONE, 1.1 fed_ga13.bmp, NONE,
	1.1 fed_ga14.bmp, NONE, 1.1 fed_ga15.bmp, NONE,
	1.1 fed_ga16.bmp, NONE, 1.1 fed_ga17.bmp, NONE,
	1.1 fed_ga18.bmp, NONE, 1.1 fed_ga19.bmp, NONE,
	1.1 fed_ga20.bmp, NONE, 1.1 fed_ga21.bmp, NONE,
	1.1 fed_ga22.bmp, NONE, 1.1 fed_ga23.bmp, NONE,
	1.1 fed_ga24.bmp, NONE, 1.1 fed_ga25.bmp, NONE,
	1.1 fed_ga26.bmp, NONE, 1.1 fed_ga27.bmp, NONE,
	1.1 fed_ga28.bmp, NONE, 1.1 fed_ga29.bmp, NONE,
	1.1 fed_ga30.bmp, NONE, 1.1 fed_ga31.bmp, NONE,
	1.1 fed_ga32.bmp, NONE, 1.1 fed_sb.bmp, NONE, 1.1 fed_sb01.bmp,
	NONE, 1.1 fed_sb02.bmp, NONE, 1.1 fed_sb03.bmp, NONE,
	1.1 fed_sb04.bmp, NONE, 1.1 fed_sb05.bmp, NONE,
	1.1 fed_sb06.bmp, NONE, 1.1 fed_sb07.bmp, NONE,
	1.1 fed_sb08.bmp, NONE, 1.1 fed_sb09.bmp, NONE,
	1.1 fed_sb10.bmp, NONE, 1.1 fed_sb11.bmp, NONE,
	1.1 fed_sb12.bmp, NONE, 1.1 fed_sb13.bmp, NONE,
	1.1 fed_sb14.bmp, NONE, 1.1 fed_sb15.bmp, NONE,
	1.1 fed_sb16.bmp, NONE, 1.1 fed_sb17.bmp, NONE,
	1.1 fed_sb18.bmp, NONE, 1.1 fed_sb19.bmp, NONE,
	1.1 fed_sb20.bmp, NONE, 1.1 fed_sb21.bmp, NONE,
	1.1 fed_sb22.bmp, NONE, 1.1 fed_sb23.bmp, NONE,
	1.1 fed_sb24.bmp, NONE, 1.1 fed_sb25.bmp, NONE,
	1.1 fed_sb26.bmp, NONE, 1.1 fed_sb27.bmp, NONE,
	1.1 fed_sb28.bmp, NONE, 1.1 fed_sb29.bmp, NONE,
	1.1 fed_sb30.bmp, NONE, 1.1 fed_sb31.bmp, NONE,
	1.1 fed_sb32.bmp, NONE, 1.1 fed_sc.bmp, NONE, 1.1 fed_sc01.bmp,
	NONE, 1.1 fed_sc02.bmp, NONE, 1.1 fed_sc03.bmp, NONE,
	1.1 fed_sc04.bmp, NONE, 1.1 fed_sc05.bmp, NONE,
	1.1 fed_sc06.bmp, NONE, 1.1 fed_sc07.bmp, NONE,
	1.1 fed_sc08.bmp, NONE, 1.1 fed_sc09.bmp, NONE,
	1.1 fed_sc10.bmp, NONE, 1.1 fed_sc11.bmp, NONE,
	1.1 fed_sc12.bmp, NONE, 1.1 fed_sc13.bmp, NONE,
	1.1 fed_sc14.bmp, NONE, 1.1 fed_sc15.bmp, NONE,
	1.1 fed_sc16.bmp, NONE, 1.1 fed_sc17.bmp, NONE,
	1.1 fed_sc18.bmp, NONE, 1.1 fed_sc19.bmp, NONE,
	1.1 fed_sc20.bmp, NONE, 1.1 fed_sc21.bmp, NONE,
	1.1 fed_sc22.bmp, NONE, 1.1 fed_sc23.bmp, NONE,
	1.1 fed_sc24.bmp, NONE, 1.1 fed_sc25.bmp, NONE,
	1.1 fed_sc26.bmp, NONE, 1.1 fed_sc27.bmp, NONE,
	1.1 fed_sc28.bmp, NONE, 1.1 fed_sc29.bmp, NONE,
	1.1 fed_sc30.bmp, NONE, 1.1 fed_sc31.bmp, NONE,
	1.1 fed_sc32.bmp, NONE, 1.1 fedshipT.bmp, NONE, 1.1
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/tinted/fed
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32097/resources/ships/tinted/fed

Added Files:
	fed_as30.bmp fed_as31.bmp fed_as32.bmp fed_at.bmp fed_at01.bmp 
	fed_at02.bmp fed_at03.bmp fed_at04.bmp fed_at05.bmp 
	fed_at06.bmp fed_at07.bmp fed_at08.bmp fed_at09.bmp 
	fed_at10.bmp fed_at11.bmp fed_at12.bmp fed_at13.bmp 
	fed_at14.bmp fed_at15.bmp fed_at16.bmp fed_at17.bmp 
	fed_at18.bmp fed_at19.bmp fed_at20.bmp fed_at21.bmp 
	fed_at22.bmp fed_at23.bmp fed_at24.bmp fed_at25.bmp 
	fed_at26.bmp fed_at27.bmp fed_at28.bmp fed_at29.bmp 
	fed_at30.bmp fed_at31.bmp fed_at32.bmp fed_bb.bmp fed_bb01.bmp 
	fed_bb02.bmp fed_bb03.bmp fed_bb04.bmp fed_bb05.bmp 
	fed_bb06.bmp fed_bb07.bmp fed_bb08.bmp fed_bb09.bmp 
	fed_bb10.bmp fed_bb11.bmp fed_bb12.bmp fed_bb13.bmp 
	fed_bb14.bmp fed_bb15.bmp fed_bb16.bmp fed_bb17.bmp 
	fed_bb18.bmp fed_bb19.bmp fed_bb20.bmp fed_bb21.bmp 
	fed_bb22.bmp fed_bb23.bmp fed_bb24.bmp fed_bb25.bmp 
	fed_bb26.bmp fed_bb27.bmp fed_bb28.bmp fed_bb29.bmp 
	fed_bb30.bmp fed_bb31.bmp fed_bb32.bmp fed_ca.bmp fed_ca01.bmp 
	fed_ca02.bmp fed_ca03.bmp fed_ca04.bmp fed_ca05.bmp 
	fed_ca06.bmp fed_ca07.bmp fed_ca08.bmp fed_ca09.bmp 
	fed_ca10.bmp fed_ca11.bmp fed_ca12.bmp fed_ca13.bmp 
	fed_ca14.bmp fed_ca15.bmp fed_ca16.bmp fed_ca17.bmp 
	fed_ca18.bmp fed_ca19.bmp fed_ca20.bmp fed_ca21.bmp 
	fed_ca22.bmp fed_ca23.bmp fed_ca24.bmp fed_ca25.bmp 
	fed_ca26.bmp fed_ca27.bmp fed_ca28.bmp fed_ca29.bmp 
	fed_ca30.bmp fed_ca31.bmp fed_ca32.bmp fed_dd.bmp fed_dd01.bmp 
	fed_dd02.bmp fed_dd03.bmp fed_dd04.bmp fed_dd05.bmp 
	fed_dd06.bmp fed_dd07.bmp fed_dd08.bmp fed_dd09.bmp 
	fed_dd10.bmp fed_dd11.bmp fed_dd12.bmp fed_dd13.bmp 
	fed_dd14.bmp fed_dd15.bmp fed_dd16.bmp fed_dd17.bmp 
	fed_dd18.bmp fed_dd19.bmp fed_dd20.bmp fed_dd21.bmp 
	fed_dd22.bmp fed_dd23.bmp fed_dd24.bmp fed_dd25.bmp 
	fed_dd26.bmp fed_dd27.bmp fed_dd28.bmp fed_dd29.bmp 
	fed_dd30.bmp fed_dd31.bmp fed_dd32.bmp fed_ga.bmp fed_ga01.bmp 
	fed_ga02.bmp fed_ga03.bmp fed_ga04.bmp fed_ga05.bmp 
	fed_ga06.bmp fed_ga07.bmp fed_ga08.bmp fed_ga09.bmp 
	fed_ga10.bmp fed_ga11.bmp fed_ga12.bmp fed_ga13.bmp 
	fed_ga14.bmp fed_ga15.bmp fed_ga16.bmp fed_ga17.bmp 
	fed_ga18.bmp fed_ga19.bmp fed_ga20.bmp fed_ga21.bmp 
	fed_ga22.bmp fed_ga23.bmp fed_ga24.bmp fed_ga25.bmp 
	fed_ga26.bmp fed_ga27.bmp fed_ga28.bmp fed_ga29.bmp 
	fed_ga30.bmp fed_ga31.bmp fed_ga32.bmp fed_sb.bmp fed_sb01.bmp 
	fed_sb02.bmp fed_sb03.bmp fed_sb04.bmp fed_sb05.bmp 
	fed_sb06.bmp fed_sb07.bmp fed_sb08.bmp fed_sb09.bmp 
	fed_sb10.bmp fed_sb11.bmp fed_sb12.bmp fed_sb13.bmp 
	fed_sb14.bmp fed_sb15.bmp fed_sb16.bmp fed_sb17.bmp 
	fed_sb18.bmp fed_sb19.bmp fed_sb20.bmp fed_sb21.bmp 
	fed_sb22.bmp fed_sb23.bmp fed_sb24.bmp fed_sb25.bmp 
	fed_sb26.bmp fed_sb27.bmp fed_sb28.bmp fed_sb29.bmp 
	fed_sb30.bmp fed_sb31.bmp fed_sb32.bmp fed_sc.bmp fed_sc01.bmp 
	fed_sc02.bmp fed_sc03.bmp fed_sc04.bmp fed_sc05.bmp 
	fed_sc06.bmp fed_sc07.bmp fed_sc08.bmp fed_sc09.bmp 
	fed_sc10.bmp fed_sc11.bmp fed_sc12.bmp fed_sc13.bmp 
	fed_sc14.bmp fed_sc15.bmp fed_sc16.bmp fed_sc17.bmp 
	fed_sc18.bmp fed_sc19.bmp fed_sc20.bmp fed_sc21.bmp 
	fed_sc22.bmp fed_sc23.bmp fed_sc24.bmp fed_sc25.bmp 
	fed_sc26.bmp fed_sc27.bmp fed_sc28.bmp fed_sc29.bmp 
	fed_sc30.bmp fed_sc31.bmp fed_sc32.bmp fedshipT.bmp 
Log Message:
Addition of greyscale and shaded old color full bitmaps to repository.  Along the way, fixed all the base bitmaps so they rotate.

--- NEW FILE: fed_sc01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fedshipT.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb31.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca32.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd30.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca14.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_bb.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_dd21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sb09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ca15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_sc03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_ga24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_at01.bmp ---
(This appears to be a binary file; contents omitted.)



From modemhero at users.sourceforge.net  Fri Apr 21 11:36:43 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:36:43 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/tinted/fed fed_as.bmp,
	NONE, 1.1 fed_as01.bmp, NONE, 1.1 fed_as02.bmp, NONE,
	1.1 fed_as03.bmp, NONE, 1.1 fed_as04.bmp, NONE,
	1.1 fed_as05.bmp, NONE, 1.1 fed_as06.bmp, NONE,
	1.1 fed_as07.bmp, NONE, 1.1 fed_as08.bmp, NONE,
	1.1 fed_as09.bmp, NONE, 1.1 fed_as10.bmp, NONE,
	1.1 fed_as11.bmp, NONE, 1.1 fed_as12.bmp, NONE,
	1.1 fed_as13.bmp, NONE, 1.1 fed_as14.bmp, NONE,
	1.1 fed_as15.bmp, NONE, 1.1 fed_as16.bmp, NONE,
	1.1 fed_as17.bmp, NONE, 1.1 fed_as18.bmp, NONE,
	1.1 fed_as19.bmp, NONE, 1.1 fed_as20.bmp, NONE,
	1.1 fed_as21.bmp, NONE, 1.1 fed_as22.bmp, NONE,
	1.1 fed_as23.bmp, NONE, 1.1 fed_as24.bmp, NONE,
	1.1 fed_as25.bmp, NONE, 1.1 fed_as26.bmp, NONE,
	1.1 fed_as27.bmp, NONE, 1.1 fed_as28.bmp, NONE,
	1.1 fed_as29.bmp, NONE, 1.1
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/tinted/fed
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31653/resources/ships/tinted/fed

Added Files:
	fed_as.bmp fed_as01.bmp fed_as02.bmp fed_as03.bmp fed_as04.bmp 
	fed_as05.bmp fed_as06.bmp fed_as07.bmp fed_as08.bmp 
	fed_as09.bmp fed_as10.bmp fed_as11.bmp fed_as12.bmp 
	fed_as13.bmp fed_as14.bmp fed_as15.bmp fed_as16.bmp 
	fed_as17.bmp fed_as18.bmp fed_as19.bmp fed_as20.bmp 
	fed_as21.bmp fed_as22.bmp fed_as23.bmp fed_as24.bmp 
	fed_as25.bmp fed_as26.bmp fed_as27.bmp fed_as28.bmp 
	fed_as29.bmp 
Log Message:
Addition of greyscale and shaded old color full bitmaps to repository.  Along the way, fixed all the base bitmaps so they rotate.

--- NEW FILE: fed_as11.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as29.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as25.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as28.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as08.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as19.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as16.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as13.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as04.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as18.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as24.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as27.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as23.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as15.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as22.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as21.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as20.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as12.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as26.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as09.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as10.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as17.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fed_as14.bmp ---
(This appears to be a binary file; contents omitted.)



From modemhero at users.sourceforge.net  Fri Apr 21 11:44:32 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:44:32 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/other fedshipG.bmp,
	1.1.1.1, NONE fedshipT.bmp, 1.1.1.1, NONE indshipG.bmp,
	1.1.1.1, NONE indshipT.bmp, 1.1.1.1, NONE klishipG.bmp,
	1.1.1.1, NONE klishipT.bmp, 1.1.1.1, NONE orishipG.bmp,
	1.1.1.1, NONE orishipT.bmp, 1.1.1.1, NONE romshipG.bmp,
	1.1.1.1, NONE romshipT.bmp, 1.1.1.1, NONE
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/other
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3999/resources/ships/other

Removed Files:
	fedshipG.bmp fedshipT.bmp indshipG.bmp indshipT.bmp 
	klishipG.bmp klishipT.bmp orishipG.bmp orishipT.bmp 
	romshipG.bmp romshipT.bmp 
Log Message:
Removal of old bitmaps.

--- orishipT.bmp DELETED ---

--- romshipG.bmp DELETED ---

--- indshipG.bmp DELETED ---

--- fedshipT.bmp DELETED ---

--- klishipG.bmp DELETED ---

--- indshipT.bmp DELETED ---

--- romshipT.bmp DELETED ---

--- fedshipG.bmp DELETED ---

--- orishipG.bmp DELETED ---

--- klishipT.bmp DELETED ---



From modemhero at users.sourceforge.net  Fri Apr 21 11:47:14 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:47:14 +0000
Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html changes.html,
	NONE, 1.1
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5653/resources/htmlhelp/html

Added Files:
	changes.html 
Log Message:
Addition of new changes page to html help, as well as the most recent version of the completed help index.

--- NEW FILE: changes.html ---




Version Changes



                Version Changes
                

                
This section lists chronological changes incorporated into client.  Versions 4.4.0.4 and earlier were done by Stas Pirogov under the client he called "Netrek XP Mod", as a reference to his modifications of the original NetrekXP which was coded by Steve Sheldon.

                


                Version 4.4.0.4:
                

                - added "allowWheelActions: (on)/off" to be able to disable wheel in non-scrolling windows
- added new window "player2" that behaves exactly as player list window, but allows to
  select alternate custom layout and could be toggled with 'A' key
- added "playerList2: (string)" option that allows to select different player list layout
  for alternate player list window, by default it will be "n T R N l M K W L r O D d "
- fixed bug that caused main thread to continue in case player died while scrolling
  message window using scrollbar (which forced him close client window and reconnect)
- fixed incorrect behavior of 'windowMove: off' feature. Previously window would snap
  back to wrong place if the main window top-left corner was not (0,0) coordinates
- long lines are now wrapped by words instead of by chars. Maximum message length was
  reduced to 4 full message lines (4 * 69 characters)
- message input window will now show Sender->Recipient even when the input line is longer
  than 69 characters
- changed 'Forum' URL on metaserver window to open Google's r.g.n location

                


                Version 4.4.0.3: (Released on 11-Jul-2004)
                

                - added "viewBox: (on)/off" to show tactical boundaries on galaxy
- added "omitTeamLetter: on/(off)" to stop drawing team letter on galaxy
- added "showStars: (on)/off" to have paradise-like background stars
- added "warpStreaks: (on)/off" to draw streaks while warping to starbase and having
  background stars on
- added "disableWinkey: (on)/off" to allow Windows and Context keyboard keys to be disabled
- added "timerType: 0-4" to be able to switch timer like in paradise.
  0 - don't show
  (1) - show current time
  2 - show server time
  3 - show time in ship
  4 - show user-set time
- "\" will now reset timer to 00:00:00 and start counting up
- added "continuousMouseFix: on/(off)" option. If enabled the continuous mouse will follow
  any buttons that are pressed at the same time. For example if you are steering and
  firing at the same time this fix will allow both events to occur. Without the fix the
  behavior was to only allow one button action.
- sound volume can now be changed using keyboard: 
  'v' - decrease volume
  'V' - increase volume
- planet bitmaps can now be switched through options menu
- rearranged option menus. moved all show/hide window options to Windows menu
- added metaserver2.us.netrek.org and metaserver.eu.netrek.org to the default list of
  servers to try to connect to before falling down to metaCache
- changed some defaults to help newbies
- options menu now automatically resizes when switching from one page to another
- messages can now be up to 1024 characters long. to allow server-side compatibility every
  message longer than 69 characters is split to chunks of 69 and sent one-by-one
- planets and players will appear as soon as they enter tactical window bounds. earlier
  the bitmaps were painted only when their center was entering tactical window

                


                Version 4.4.0.2: (Released on 04-Mar-2004)
                

                - repack of 4.4.0.1 with some bug fixes

                


                Version 4.4.0.1:
                

                - most options in rc file can now have four appearances:
     1. option.observer: string (i.e. "keymap.observer: aabbcc")
     2. option.servernick: string (i.e. "keymap.continuum: aabbcc")
        This one will work only if you have "server.servernick: servername" in rc
        (i.e. "server.continuum: continuum.us.netrek.org")
     3. option.servertype: string (i.e. "keymap.bronco: aabbcc")
        This will work if you either connect from metaserver window (then types are taken from metaserver report)
        or if you use option "server.nickname" to map server to nickname and then define "serverType.nickname" to
        be one of "paradise, bronco, chaos, inl, sturgeon, hockey, dogfight" (so you will have two lines is rc:
        "server.pickled: pickled.psychosis.net" and "serverType.pickled: bronco")
     4. option: string (i.e. "keymap: aabbccdd")
  the options are validated in same order (from 1 to 4 where 1 is best match and 4 is worst match)
- added "window.allow" option to message windows (review, review_all, review_team, review_your, review_kill, review_phaser)
  The option lets you set type of messages logged into that window.
  Message types:
	I - individual messages
        T - team messages
        A - all messages
        K - kill messages
        P - phaser messages
  Default settings:
        review.allow: ITAKP
        review_all.allow: A
        review_team.allow: T
        review_your.allow: I
        review_kill.allow: K
        review_phaser.allow: P
- removed "phaserMsg" rc option, because now you can define where to log phaser messages using "window.allow: P"
- changed player list to not show any information on hidden players instead of returning your own info like
  it was before
- player list is now clickable:
     LeftClick - send private message to person that was clicked
     RightClick - send message to own team
     MiddleClick - send message to all
- added "playerListMessaging: on/off" rc option to enable/disable clickable player list (also added to options
  window to be able to do that in-game)
- added "beepOnPrivateMessage: on/off" rc option. If enabled the client will beep when you receive private
  message from somebody that is not yourself or god.
- added "showHockeyScore: on/off" rc option to show hockey score during the game on map
- changed '-n' command line behavior to opposite. Now the client won't show console window by default
  unless you run it with '-n' or you start the program from command line.
- modified help window to show 'Off' for unmapped keys
- now you can remap keys by pointing at the key in the help window and pushing key you want it to be
- xtrekrc.txt and netrekrc.txt are also searched during defaults initialization
- Pig Call will now include binary version number
- 4th and 5th mouse buttons can now be mapped and used (not tested)
  button 4 can be mapped as '4'
  button 5 can be mapped as '5'
- wheel up and down can be mapped in buttonmap now ('6' for wheelup and '7' for wheeldown)
- added average phaser hit to phaser statistics
- added player number to phaser message (Phaser burst hit guest (R0) for 64 points 10:00:01)
- minor fix in message window. it wasn't refreshed when switching out of netrek with Alt-Tab
  and coming back.
- fixed application bitmap that wasn't loaded right. added both big and small bitmaps. So don't panic when
  you don't see ugly Windows default application icon on your taskbar.
- pingStats window didn't have base window as parent, so it could float around. Also removed option
  to display while not logged in.
- swapped between message windows and dashboard/playerlist. dashboard is now below tactical
- added help line to metaserver window. clickable links to favorite netrek internet resources
- fixed minor bug in saveOptions() where first two macro lines of the first macro were not saved
- added help file to the project (netrek.chm)
- binded F1 to open help file if it exists in executable directory
- added "Save options now" menu to options menu

                


                Versions pre-4.4.0.1:
                


                03-Feb-2004:
                

                - added command line option '-n' to hide console window that is pretty much useless
  unless you need to see what is the problem with connection

                

                05-Jul-2003:
                

                - added "metaPing: on/off" to show ping statistics in the metaserver window. The feature
  was coded by Erik Hietbrink (Shadow Hunter). The feature is enabled by default.

                


                18-May-2003:
                

                - macros in macro window can now be scrolled using 'f' - line down, 'b' - line up,
  'F' - page down, 'B' - page up

                


                16-May-2003:
                

                - added "mainResizeable: on/off" to enable resizing of main window (not in-game).
- fixed the behavior of main window with "windowMove: off" (it wouldn't move too).

                


                14-May-2003:
                

                - added "windowMove: on/off" rc option to disable in-game movement of client windows.
- same for options menu (under Controls menu)

                


                15-Mar-2003:
                

                - Ctrl-g will autologin as guest in the login screen

                


                13-Mar-2003:
                

                - added randomizer for first hint to be shown in hints window
- added "agriCAPS: on/off" rc option to be able to display AGRI planet names in capital
  letters on the map window
- added "agriColor: 0-2" to choose between: 0 - owner race color, 1 - white, 2 - gray
- hints window can now be closed with "unmap special windows" key (space by default)

                


                12-Mar-2003:
                

                - agri planet names are written in white on the map
- hints code was rewritten to get rid of hints.dat formatting.
- fixed code that allowed to gather info on cloaked or in-fog-of-war enemy from playerlist

                


                21-Feb-2003:
                

                - extended "playerlist" rc option to be able to select amount of decimal places in
  float numbers. 
  Now it is possible to set "playerlist: nTK1  RNr1 S1d0" in order to see:
  "R0 CA 0.5  Ensign guest 0.8 2.4 95"
  or giving old "playerlist: nTK RNr Sd" will give you:
  "R0 CA 0.50 Ensign guest 0.82 2.43 95.07"
  Current options that can be followed by numbers 0-2 are: KODSrdBPHkVv

                


                19-Feb-2003:
                

                - macros can now be sent using players from the player list as target. Some default
  distresses can also be used with playerlist.

                


                09-Feb-2003:
                

                - added hints window. If you're newbie player you will be given some hints on the
  game. Credits to Charlie ter Horst, Kevin M Bernatz, David Swasey.
- added showHints: on/off rc option to disable hints window. Don't do that if you
  still didn't read all of them

                


                25-Jan-2003:
                

                - fixed info/lock in the player list window to work right in case of playerListHack: on

                


                24-Jan-2003:
                

                - added playerListHack: on/off option to fix the problem with displaying
  observers/players in the player list window while playing on server with
  old code. If playerListHack is on then every player with letter greater 
  than 'f' will be shown as observer.
  This way you can display only players in the player list. 
  Use 'L' to rotate player list window between: all players/players only/observers only
- changed maximum number of macro lines to be 500 instead of old 75

                


                20-Jan-2003:
                

                - fixed colorfulPhasers option to shrink in case that shrinkage is used
- added phaserShrinkStyle option to enable switch between standard COW
  phaser shrink code and BRMH shrink code (phaser shrinks during rechange time)
  0 - COW style
  1 - BRMH style

                


                19-Jan-2003:
                

                - Alt+End will minimize netrek window
- Alt+Enter will show titlebar of main window (this is old feature that wasn't documented)

                


                18-Jan-2003:
                

                - added player status window toggle 'S' to playback mode
- changed normal playback speed to more 'normal'
- fixed playback help window

                


                13-Jan-2003:
                

                - added "saveMacro", "saveRCD", "saveRCM" boolean rc options to enable saving of
  macros, distresses and messages.
- added new Save_Menu options menu that has options on what information to include
  in the saveFile.

                


                12-Jan-2003:
                

                - added keymap and buttonmap to save options code
- changed saveBig to be on by default

                


                11-Jan-2003:
                

                - expanded options menu to contain some missing options
- changed code for tractor/pressor clearing
- fixed player statistics window for playback mode

                


                10-Jan-2003:
                

                - added some string variables to options save file. probably it is enough for most
  players

                


                09-Jan-2003:
                

                - added "saveFile: filename" rc option to define file to save options to 
  (default xtrekrc.sav). Currently can save only integer and boolean options.
- added "saveBig: on/off" rc option to save options with/without remarks. 
  on - the saveFile will contain description of each variable and possible 
       values for some of them.
  off - only options with their values will be saved.
- mapped " (double quote) to save current options to saveFile
- updated help window

                


                08-Jan-2003:
                

                - removed player number from Puck player on hockey server (local window)

                


                07-Jan-2003:
                

                - added support for 19FLAGS feature.

                


                01-Jan-2003:
                

                - added help window for playback mode
- added support for wheel mouse scroll in text windows

                


                31-Dec-2002:
                

                - added functionality to player list window. Now you can get info on any player or
  lock on any player (observers can lock on cloacked teammates) by just pointing
  at the player line in the list and pushing appropriate key.

                


                24-Dec-2002:
                

                - changed phaserMsg to be printed to review window by default. This was done to
  enable newbie players to see phaser messages by default.
- added "SHOW_ALL_TRACTORS" feature support. This feature enables code that shows 
  tractor/pressor beams of every player in the game. It is server side decision 
  to enable this feature. By default it is enabled only for observers.
- added "showAllTractorPressor on/off" to be able to disable the code of
  SHOW_ALL_TRACTORS even if server supports it
- added option menu for "showAllTractorPressor" variable.

                


                17-Dec-2002:
                

                - added xtrekrc_options.txt file that contains a full list of available xtrekrc options
- renamed sample.xtrekrc to xtrekrc_sample.txt and formatted appropriately
- changed "showHockeyLines" to "showHockeyLinesLocal"
- added "showHockeyLinesMap" to show hockey lines on galaxy
- added menu line for showHockeyLinesMap
- mapped "G" to toggle hockey lines on galaxy window
- updated help window

                


                16-Dec-2002:
                

                - mapped "H" to toggle hockey lines
- moved all documentation to docs folder
- changed loaddocs() function to strip first two characters of the document line
  if they are ^[b or ^[i. In case these are the first two characters of netrekxp.doc 
  the line will appear in bold for ^[b or in underline for ^[i (^[ character here is
  ascii x1b that represents ESC char)
- added cow.doc, cow.txt, newbie.txt to distribution. As I know these files can be
  distributed freely.
- added sample.xtrekrc (actually some strips from mine xtrekrc).

                


                15-Dec-2002:
                

                - added "hockeyLines on/off" to show hockey lines on tactical
- Changed help window text to match current working keys
- Fixed bitmaps location in playback.c
- changed default documentation file to be netrekxp.doc instead of brm.doc
- compiled netrekxp.doc from old version of cow.doc. Still some features missing
- fixed some bitmaps 
- reduced bitmap sizes

                




From modemhero at users.sourceforge.net  Fri Apr 21 11:47:14 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Fri, 21 Apr 2006 16:47:14 +0000
Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp netrek.chm, NONE,
	1.1
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5653/resources/htmlhelp

Added Files:
	netrek.chm 
Log Message:
Addition of new changes page to html help, as well as the most recent version of the completed help index.

--- NEW FILE: netrek.chm ---
(This appears to be a binary file; contents omitted.)



From quozl at users.sourceforge.net  Fri Apr 21 21:16:48 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sat, 22 Apr 2006 02:16:48 +0000
Subject: [netrek-cvs] server/Vanilla/ntserv commands.c, 1.1, 1.2 daemonII.c,
	1.7, 1.8 feature.c, 1.1, 1.2 findslot.c, 1.3, 1.4 openmem.c,
	1.1, 1.2 rsa_key.c, 1.1, 1.2 socket.c, 1.5, 1.6 wander2.c, 1.1, 1.2
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/ntserv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6880/ntserv

Modified Files:
	commands.c daemonII.c feature.c findslot.c openmem.c rsa_key.c 
	socket.c wander2.c 
Log Message:


Index: rsa_key.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/rsa_key.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rsa_key.c	21 Mar 2005 05:23:44 -0000	1.1
+++ rsa_key.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -7,6 +7,7 @@
  */
 #include "copyright2.h"
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -41,20 +42,21 @@
 {
     struct rsa_key key;
     struct sockaddr_in saddr;
+    socklen_t addrlen;
     u_char temp[KEY_SIZE], *data;
 #ifdef SHOW_RSA
     char format[MSG_LEN];
 #endif
     int fd;
     FILE *logfile;
-    int done, found, curtime, len;
+    int done, found, curtime;
     int foo;
     int total;
 
 /*    SIGNAL(SIGALRM, SIG_IGN);*/
 
-    len = sizeof(saddr);
-    if (getsockname(sock, &saddr, &len) < 0) {
+    addrlen = sizeof(saddr);
+    if (getsockname(sock, (struct sockaddr *) &saddr, &addrlen) < 0) {
         perror("getsockname(sock)");
         exit(1);
     }

Index: findslot.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/findslot.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- findslot.c	27 Sep 2005 12:26:37 -0000	1.3
+++ findslot.c	22 Apr 2006 02:16:46 -0000	1.4
@@ -9,6 +9,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include "defs.h"
 #include "struct.h"

Index: openmem.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/openmem.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- openmem.c	21 Mar 2005 05:23:44 -0000	1.1
+++ openmem.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -6,6 +6,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -117,7 +118,7 @@
     if (sharedMemory == (struct memory *) -1) {
 	printf("Error number: %d\n",errno);
 	perror("shared memory");
-	exit (1);
+	exit(1);
     }
     setup_memory(sharedMemory);
 

Index: commands.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/commands.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- commands.c	21 Mar 2005 05:23:43 -0000	1.1
+++ commands.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -15,6 +15,7 @@
 #include 
 #include 
 #include 
+#include 
 #include "defs.h"
 #include "struct.h"
 #include "data.h"

Index: feature.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/feature.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- feature.c	21 Mar 2005 05:23:43 -0000	1.1
+++ feature.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -67,6 +67,11 @@
 static int                    num_features;
 static struct feature_spacket *features;
 
+static void freeFeatures(void)
+{
+  free(features);
+}
+
 /*
  * Called once to read in feature strings
  */
@@ -97,6 +102,7 @@
       num_features = 0;
       return;
    }
+   atexit(freeFeatures);
 
    f = fopen(Feature_File, "r");
    i=0;

Index: daemonII.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/daemonII.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- daemonII.c	15 Apr 2006 12:10:57 -0000	1.7
+++ daemonII.c	22 Apr 2006 02:16:46 -0000	1.8
@@ -67,7 +67,7 @@
 /* file scope prototypes */
 static void check_load(void);
 static int tournamentMode(void);
-static int check_scummers(void);
+static int check_scummers(int);
 static void move(int ignored);
 static void udplayersight(void);
 static void udplayers(void);
@@ -394,7 +394,7 @@
    Nick Trown   12/19/92
 */
 
-static int check_scummers(void)
+static int check_scummers(int verbose)
 {
     int i, j;
     int num;
@@ -443,7 +443,8 @@
             }
           }
         }
-        if (num>1){
+        if (num>(check_scum-1)){
+            if (!verbose) return 1;
             pmessage(0,MALL,"GOD->ALL", "*****************************************");
             pmessage(0,MALL,"GOD->ALL","Possible t-mode scummers have been found.");
             pmessage(0,MALL,"GOD->ALL","They have been noted for god to review.");
@@ -553,6 +554,13 @@
     static int oldtourn=0;
     static int oldmessage;
     int old_robot;
+    static enum ts {
+	    TS_PICKUP, 
+	    TS_SCUMMERS,
+	    TS_BEGIN,
+	    TS_TOURNAMENT,
+	    TS_END
+    } ts = TS_PICKUP;
 
     /* Don't tell us it's time for another move in the middle of a move. */
     (void) SIGNAL(SIGALRM, SIG_IGN);
@@ -618,24 +626,49 @@
         pmessage(0, MALL, "GOD->ALL","Loading new server configuration.");
     }
 
-    if (tournamentMode()) {
-        if (!oldtourn) {
-            if (check_scum)     
-                check_scummers();               /* NBT */
-            oldmessage=(random() % 8);
+    switch (ts) {
+    case TS_PICKUP:
+	    status->tourn = 0;
+	    if (tournamentMode()) {
+		    ts = TS_BEGIN;
+		    if (check_scum && check_scummers(1))
+			    ts = TS_SCUMMERS;
+	    }
+	    break;
+
+    case TS_SCUMMERS:
+	    status->tourn = 0;
+	    if (!tournamentMode()) {
+		    ts = TS_PICKUP;
+	    } else {
+		    if (!check_scum) {
+			    ts = TS_BEGIN;
+			    break;
+		    }
+		    if (!check_scummers(0))
+			    ts = TS_BEGIN;
+	    }
+	    break;
+
+    case TS_BEGIN:
+	    oldmessage = (random() % 8);
 	    political_begin(oldmessage);
-        }
-        oldtourn=1;
-        status->tourn=1;
-        status->time++;
-        tourntimestamp = ticks;
-    } else {
-        if (oldtourn) {
+	    ts = TS_TOURNAMENT;
+            /* break; */
+
+    case TS_TOURNAMENT:
+            status->tourn = 1;
+            status->time++;
+            tourntimestamp = ticks;
+            if (tournamentMode()) break;
+            ts = TS_END;
+            /* break; */
+
+    case TS_END:
             tourntimestamp = ticks; /* record end of Tmode 8/2/91 TC */
-	    political_end(oldmessage);
-        }
-        oldtourn=0;
-        status->tourn=0;
+            political_end(oldmessage);
+            ts = TS_PICKUP;
+            break;
     }
 
 #ifdef PUCK_FIRST

Index: socket.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/socket.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- socket.c	10 Apr 2006 10:56:33 -0000	1.5
+++ socket.c	22 Apr 2006 02:16:46 -0000	1.6
@@ -13,6 +13,7 @@
  */
 #include "copyright2.h"
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -364,7 +365,8 @@
 
 int connectToClient(char *machine, int port)
 {
-    int ns, stat, derrno, derrnol;
+    int ns, stat, derrno;
+    socklen_t derrnol;
     struct sockaddr_in addr;
     struct hostent *hp;
     struct timeval timeout;
@@ -488,7 +490,7 @@
 void checkSocket(void)
 {
     struct sockaddr_in sin;
-    int len = sizeof(sin);
+    socklen_t len = sizeof(sin);
     if (getpeername(sock, (struct sockaddr *) &sin, &len) < 0) {
 	return;
     }
@@ -961,7 +963,7 @@
     int temp;
 #ifdef UDP_PORTSWAP
     struct sockaddr_in moo;
-    int s;
+    socklen_t moolen;
 #endif
 
 #ifdef PING             /* need the socket in the ping handler routine */
@@ -978,10 +980,10 @@
      */
 
     if (portswapflags == (PORTSWAP_UDPRECEIVED | PORTSWAP_ENABLED)) {
-        s = sizeof(moo);
+        moolen = sizeof(moo);
         UDPDIAG(("portswap hack entered\n"));
         if (0 > recvfrom(asock, buf, BUFSIZ*2, MSG_PEEK,
-                         (struct sockaddr *)&moo, &s)) {
+                         (struct sockaddr *)&moo, &moolen)) {
 	    ERROR(1,("%s: portswap recvfrom() failed, %s\n",
 		     whoami(), strerror(errno)));
         }
@@ -2255,7 +2257,7 @@
 static int connUdpConn(void)
 {
     struct sockaddr_in addr;
-    int len;
+    socklen_t addrlen;
 
     if (udpSock > 0) {
 	ERROR(2,( "ntserv: tried to open udpSock twice\n"));
@@ -2273,8 +2275,8 @@
 
 #ifdef UDP_FIX 			/* 15/6/93 SK UDP connection time out fix */
     /* Bind to interface used by the TCP socket 10/13/99 TAP */
-    len = sizeof(addr);
-    if (getsockname(sock, (struct sockaddr *)&addr, &len) < 0) {
+    addrlen = sizeof(addr);
+    if (getsockname(sock, (struct sockaddr *)&addr, &addrlen) < 0) {
 	perror("netrek: unable to getsockname(TCP)");
 	UDPDIAG(("Can't get our own socket; using default interface\n"));
 	addr.sin_family = AF_INET;
@@ -2292,8 +2294,8 @@
     }
 
     /* determine what our port is */
-    len = sizeof(addr);
-    if (getsockname(udpSock, (struct sockaddr *)&addr, &len) < 0) {
+    addrlen = sizeof(addr);
+    if (getsockname(udpSock, (struct sockaddr *)&addr, &addrlen) < 0) {
 	perror("netrek: unable to getsockname(UDP)");
 	UDPDIAG(("Can't get our own socket; connection failed\n"));
 	close(udpSock);
@@ -2345,8 +2347,8 @@
 	     me->p_name, udpClientPort, remoteaddr));
 
     /* determine what our port is */
-    len = sizeof(addr);
-    if (getsockname(udpSock, (struct sockaddr *) &addr, &len) < 0) {
+    addrlen = sizeof(addr);
+    if (getsockname(udpSock, (struct sockaddr *) &addr, &addrlen) < 0) {
 	perror("netrek: unable to getsockname(UDP)");
 	UDPDIAG(("Can't get our own socket; connection failed\n"));
 	close(udpSock);
@@ -2384,17 +2386,17 @@
 static void printUdpInfo(void)
 {
     struct sockaddr_in addr;
-    int len;
+    socklen_t addrlen;
 
-    len = sizeof(addr);
-    if (getsockname(udpSock, (struct sockaddr *) &addr, &len) < 0) {
+    addrlen = sizeof(addr);
+    if (getsockname(udpSock, (struct sockaddr *) &addr, &addrlen) < 0) {
 	perror("printUdpInfo: getsockname");
 	return;
     }
     UDPDIAG(("LOCAL: addr=0x%x, family=%d, port=%d\n", addr.sin_addr.s_addr,
 	     addr.sin_family, ntohs(addr.sin_port)));
 
-    if (getpeername(udpSock, (struct sockaddr *) &addr, &len) < 0) {
+    if (getpeername(udpSock, (struct sockaddr *) &addr, &addrlen) < 0) {
 	perror("printUdpInfo: getpeername");
 	return;
     }

Index: wander2.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/wander2.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- wander2.c	21 Mar 2005 05:23:44 -0000	1.1
+++ wander2.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -14,6 +14,12 @@
 static const double incrementrecip = 62.5;
 static float *Cosine, *Sine;
 
+static void pfree(void)
+{
+  free(Cosine);
+  free(Sine);
+}
+
 /* call only once */
 void pinit(void)
 {
@@ -25,7 +31,11 @@
     pre = 3.5/increment;
 
     Cosine = (float*) calloc(sizeof(float), pre);
+    if (Cosine == NULL) abort();
     Sine = (float*) calloc(sizeof(float), pre);
+    if (Sine == NULL) abort();
+    atexit(pfree);
+
     for (i = 0; i < pre; i++) {
 	Cosine[i] = cos((double)i*increment);
 	Sine[i] = sin((double)i*increment);



From quozl at users.sourceforge.net  Fri Apr 21 21:16:48 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sat, 22 Apr 2006 02:16:48 +0000
Subject: [netrek-cvs] server/Vanilla/newstartd newaccess.c, 1.2,
	1.3 newstartd.c, 1.7, 1.8
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/newstartd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6880/newstartd

Modified Files:
	newaccess.c newstartd.c 
Log Message:


Index: newstartd.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/newstartd/newstartd.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- newstartd.c	10 Apr 2006 04:24:51 -0000	1.7
+++ newstartd.c	22 Apr 2006 02:16:46 -0000	1.8
@@ -377,10 +377,11 @@
   }
 }
 
-int get_connection ()
+int get_connection()
 {
   struct sockaddr_in addr;
   struct sockaddr_in naddr;
+  socklen_t addrlen;
   fd_set accept_fds;
   int len, i, st, newsock;
   
@@ -393,23 +394,23 @@
     sock = prog[i].sock;
     if (sock < 0) {
 
-      fprintf (stderr, "netrekd: port %d, %s, ", prog[i].port, prog[i].prog);
-      if ((sock = socket (AF_INET, prog[i].type, 0)) < 0) {
-	perror ("socket");
-	sleep (1);
+      fprintf(stderr, "netrekd: port %d, %s, ", prog[i].port, prog[i].prog);
+      if ((sock = socket(AF_INET, prog[i].type, 0)) < 0) {
+	perror("socket");
+	sleep(1);
 	return -1;
       }
 
       /* we can't cope with having socket zero for a listening socket */
       if (sock == 0) {
-	if (debug) fprintf (stderr, "gack: don't want socket zero\n");
-        if ((sock = socket (AF_INET, prog[i].type, 0)) < 0) {
-	  perror ("socket");
-	  sleep (1);
-	  close (0);
+	if (debug) fprintf(stderr, "gack: don't want socket zero\n");
+        if ((sock = socket(AF_INET, prog[i].type, 0)) < 0) {
+	  perror("socket");
+	  sleep(1);
+	  close(0);
 	  return -1;
 	}
-	close (0);
+	close(0);
       }
       
       /* set the listening socket to close on exec so that children
@@ -417,9 +418,9 @@
 	 restarting netrekd. */
       
       if (fcntl(sock, F_SETFD, FD_CLOEXEC) < 0) {
-	perror ("fcntl F_SETFD FD_CLOEXEC");
-	close (sock);
-	sleep (1);
+	perror("fcntl F_SETFD FD_CLOEXEC");
+	close(sock);
+	sleep(1);
 	return -1;
       }
 
@@ -427,39 +428,39 @@
 	 so that we don't have to pay the CLOSE_WAIT penalty if we need
 	 to close and re-open the socket on restart. */
 
-      if (setsockopt (sock, SOL_SOCKET, SO_REUSEADDR,
-		      (char *) &foo, sizeof (int)) < 0) {
-	perror ("setsockopt SOL_SOCKET SO_REUSEADDR");
-	close (sock);
-	sleep (1);
+      if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
+		     (char *) &foo, sizeof(int)) < 0) {
+	perror("setsockopt SOL_SOCKET SO_REUSEADDR");
+	close(sock);
+	sleep(1);
 	return -1;
       }
       
       addr.sin_family = AF_INET;
       addr.sin_addr.s_addr = prog[i].addr;
-      addr.sin_port = htons (prog[i].port);
+      addr.sin_port = htons(prog[i].port);
       
-      if (bind (sock, (struct sockaddr*)&addr, sizeof(addr)) < 0) {
-	perror ("bind");
-	close (sock);
-	sleep (1);
+      if (bind(sock, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+	perror("bind");
+	close(sock);
+	sleep(1);
 	continue;
       }
 
       if (prog[i].type == SOCK_STREAM) {
-	if (listen (sock, 1) < 0) {
-	  perror ("listen");
-	  close (sock);
-	  sleep (1);
+	if (listen(sock, 1) < 0) {
+	  perror("listen");
+	  close(sock);
+	  sleep(1);
 	  continue;
 	}
       }
 
       prog[i].sock = sock;
-      fprintf (stderr, "listening fd %d, to do \"%s\" %s %s %s %s\n",
-	       prog[i].sock, prog[i].progname, prog[i].arg[0],
-	       prog[i].arg[1], prog[i].arg[2], prog[i].arg[3]);
-      fflush (stderr);
+      fprintf(stderr, "listening fd %d, to do \"%s\" %s %s %s %s\n",
+	      prog[i].sock, prog[i].progname, prog[i].arg[0],
+	      prog[i].arg[1], prog[i].arg[2], prog[i].arg[3]);
+      fflush(stderr);
     }
   }
 
@@ -468,15 +469,15 @@
   for (;;) { 				/* wait for a connection */
     st = 0;
 
-    FD_ZERO (&accept_fds);		/* clear the file descriptor mask */
+    FD_ZERO(&accept_fds);		/* clear the file descriptor mask */
     for (i = 0; i < num_progs; i++) {	/* set bits in mask for each sock */
       sock = prog[i].sock;
       if (sock < 0) continue;
       if (prog[i].type == SOCK_STREAM)
-	FD_SET (sock, &accept_fds);
+	FD_SET(sock, &accept_fds);
       if (prog[i].type == SOCK_DGRAM)
 	if (prog[i].child == 0)
-	  FD_SET (sock, &accept_fds);
+	  FD_SET(sock, &accept_fds);
       st++;
     }
 
@@ -488,7 +489,7 @@
     }
     
     /* block until select() indicates accept() will complete */
-    st = select (32, &accept_fds, 0, 0, 0);
+    st = select(32, &accept_fds, 0, 0, 0);
     if (st > 0) break;
     if (restart) return -1;
     if (errno == EINTR) continue;
@@ -500,30 +501,30 @@
   for (i = 0; i < num_progs; i++) {
     sock = prog[i].sock;
     if (sock < 0) continue;
-    if (FD_ISSET (sock, &accept_fds)) break;
+    if (FD_ISSET(sock, &accept_fds)) break;
   }
 
   /* none of the sockets showed activity? erk */
   if (i >= num_progs) return -1;
 
-  len = sizeof(naddr);
+  addrlen = sizeof(naddr);
 
   if (prog[i].type == SOCK_STREAM) {
     /* accept stream connections as new socket */
     for (;;) {
-      newsock = accept (sock, (struct sockaddr*)&naddr, &len);
+      newsock = accept(sock, (struct sockaddr *) &naddr, &addrlen);
       if (newsock >= 0) break;
       if (errno == EINTR) continue;
-      fprintf (stderr, "netrekd: port %d, %s, ", prog[i].port, prog[i].prog);
-      perror ("accept");
-      sleep (1);
+      fprintf(stderr, "netrekd: port %d, %s, ", prog[i].port, prog[i].prog);
+      perror("accept");
+      sleep(1);
       return -1;
     }
     if (newsock != 0) {
-      if (dup2 (newsock, 0) == -1) {
-	perror ("dup2");
+      if (dup2(newsock, 0) == -1) {
+	perror("dup2");
       }
-      close (newsock);
+      close(newsock);
     }
   } else {
     /* datagrams will be read by child on duplicated socket */

Index: newaccess.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/newstartd/newaccess.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- newaccess.c	30 Sep 2005 05:46:19 -0000	1.2
+++ newaccess.c	22 Apr 2006 02:16:46 -0000	1.3
@@ -55,10 +55,11 @@
     int			canplay;
     int			ncanplay;
     int			netmatch;
-    int			count, sockt, length;
+    int			count, sockt;
     unsigned LONG	net_addr;
     struct netent	*np;
-    struct sockaddr_in sin;
+    struct sockaddr_in	addr;
+    socklen_t		addrlen;
     struct hostent	*hp;
     FILE		*acs_fp;
 #ifdef SUBNET
@@ -90,13 +91,13 @@
 #endif
 
     sockt = fileno(stdin);
-    length = sizeof (struct sockaddr_in);
+    addrlen = sizeof (struct sockaddr_in);
     
 #ifdef DEBUG
     return 1;
 #endif
     
-    if (getpeername(sockt, (struct sockaddr *) &sin, &length) < 0) {
+    if (getpeername(sockt, (struct sockaddr *) &addr, &addrlen) < 0) {
 	if (isatty(sockt)) {
 #ifdef LOG
 	    (void) strcpy(peerhostname, "stdin");
@@ -111,12 +112,12 @@
 	return (canplay);
     }
     
-    hp = gethostbyaddr((char *) &sin.sin_addr.s_addr, sizeof(U_LONG),
+    hp = gethostbyaddr((char *) &addr.sin_addr.s_addr, sizeof(U_LONG),
 		       AF_INET);
     if (hp != NULL)
 	(void) strcpy(host_name, hp->h_name);
     else
-	(void) strcpy(host_name, inet_ntoa(sin.sin_addr));
+	(void) strcpy(host_name, inet_ntoa(addr.sin_addr));
     
 #ifdef LOG
 #ifdef notdef
@@ -128,7 +129,7 @@
     if (host) {
 	hp = gethostbyname(host);
 	if (hp) {
-	    MCOPY(hp->h_addr, &sin.sin_addr, sizeof (hp->h_length));
+	    MCOPY(hp->h_addr, &addr.sin_addr, sizeof (hp->h_length));
 	    (void) strcpy(host_name, host);
 	}
     }
@@ -138,11 +139,11 @@
 	    *cp = tolower(*cp);
     
     /*
-     * At this point, sin.sin_addr.s_addr is the address of
+     * At this point, addr.sin_addr.s_addr is the address of
      * the host in network order.
      */
     
-    net_addr = inet_netof(sin.sin_addr);	/* net_addr in host order */
+    net_addr = inet_netof(addr.sin_addr);	/* net_addr in host order */
     
     np = getnetbyaddr(net_addr, AF_INET);
     if (np != NULL)
@@ -151,7 +152,7 @@
 	(void) strcpy(net_name,inet_ntoa(*(struct in_addr *)&net_addr));
     
 #ifdef SUBNET
-    snet_addr = inet_snetof(sin.sin_addr.s_addr);
+    snet_addr = inet_snetof(addr.sin_addr.s_addr);
     if (snet_addr == 0)
 	snet_name[0] = '\0';
     else {



From quozl at users.sourceforge.net  Fri Apr 21 21:16:48 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sat, 22 Apr 2006 02:16:48 +0000
Subject: [netrek-cvs] server/Vanilla/keycomp rsa_key2cap.c, 1.1,
	1.2 rsa_keycomp.c, 1.1, 1.2
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/keycomp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6880/keycomp

Modified Files:
	rsa_key2cap.c rsa_keycomp.c 
Log Message:


Index: rsa_key2cap.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/keycomp/rsa_key2cap.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rsa_key2cap.c	21 Mar 2005 05:23:37 -0000	1.1
+++ rsa_key2cap.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -1,6 +1,7 @@
 #include 
 
 #ifdef RSA
+#include 
 #include 
 #include 
 #include 

Index: rsa_keycomp.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/keycomp/rsa_keycomp.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rsa_keycomp.c	21 Mar 2005 05:23:37 -0000	1.1
+++ rsa_keycomp.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -7,12 +7,14 @@
 #include 
 
 #ifdef RSA
+#include 
 #include 
 #include 
 #include  /* ultrix insists on types.h before stst.h */
 #include 
 #include 
 #include "defs.h"
+#include 
 #include INC_STRINGS
 #include INC_FCNTL
 #include "struct.h"



From quozl at users.sourceforge.net  Fri Apr 21 21:16:48 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sat, 22 Apr 2006 02:16:48 +0000
Subject: [netrek-cvs] server/Vanilla/include patchlevel.h,1.5,1.6
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6880/include

Modified Files:
	patchlevel.h 
Log Message:


Index: patchlevel.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/patchlevel.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- patchlevel.h	22 Feb 2006 09:18:30 -0000	1.5
+++ patchlevel.h	22 Apr 2006 02:16:45 -0000	1.6
@@ -12,7 +12,7 @@
  *  (a) reset this to zero before each major release, and;
  *  (b) increment this number before each patch release.
  */
-#define PATCHLEVEL 2
+#define PATCHLEVEL 3
 #if !defined(NULL)
 #define NULL 0
 #endif



From quozl at users.sourceforge.net  Fri Apr 21 21:16:49 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sat, 22 Apr 2006 02:16:49 +0000
Subject: [netrek-cvs] server/Vanilla/rpm netrek.spec,1.3,1.4
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/rpm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6880/rpm

Modified Files:
	netrek.spec 
Log Message:


Index: netrek.spec
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/rpm/netrek.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- netrek.spec	22 Feb 2006 09:18:30 -0000	1.3
+++ netrek.spec	22 Apr 2006 02:16:47 -0000	1.4
@@ -1,6 +1,6 @@
 Summary: Netrek Software Suite
 Name: netrek
-Version: 2.10.2
+Version: 2.10.3
 Release: 0
 Copyright: Undetermined
 Packager: Vanilla Server Development Team



From quozl at users.sourceforge.net  Fri Apr 21 21:16:47 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sat, 22 Apr 2006 02:16:47 +0000
Subject: [netrek-cvs] server/Vanilla/debian changelog,1.3,1.4
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/debian
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6880/debian

Modified Files:
	changelog 
Log Message:


Index: changelog
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/debian/changelog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- changelog	22 Feb 2006 09:18:30 -0000	1.3
+++ changelog	22 Apr 2006 02:16:45 -0000	1.4
@@ -1,3 +1,9 @@
+netrek-server-vanilla (2.10.3-0) unstable; urgency=low
+
+  * release planned
+
+ -- James Cameron   Sat, 22 Apr 2006 08:34:49 +1000
+
 netrek-server-vanilla (2.10.2-0) unstable; urgency=low
 
   * release planned



From quozl at users.sourceforge.net  Fri Apr 21 21:16:49 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sat, 22 Apr 2006 02:16:49 +0000
Subject: [netrek-cvs] server/Vanilla/tools keyman.c, 1.2, 1.3 metaget.c, 1.1,
	1.2 players.c, 1.4, 1.5 watchmes.c, 1.1, 1.2
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6880/tools

Modified Files:
	keyman.c metaget.c players.c watchmes.c 
Log Message:


Index: metaget.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/tools/metaget.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- metaget.c	14 Jan 2006 00:48:08 -0000	1.1
+++ metaget.c	22 Apr 2006 02:16:47 -0000	1.2
@@ -26,6 +26,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 

Index: watchmes.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/tools/watchmes.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- watchmes.c	21 Mar 2005 05:23:47 -0000	1.1
+++ watchmes.c	22 Apr 2006 02:16:47 -0000	1.2
@@ -18,7 +18,7 @@
 #include "proto.h"
 
 static void spew_mess(struct message *mess);
-static void log(struct message *m);
+static void logmessage(struct message *m);
 
 int main(int argc, char **argv)
 {
@@ -61,7 +61,7 @@
 	    oldmctl++;
 	    if (oldmctl==MAXMESSAGE) oldmctl=0;
 	    if (filter)
-		log(&(messages[oldmctl]));
+		logmessage(&(messages[oldmctl]));
 	    else {
                 MCOPY(&messages[oldmctl],&msg,sizeof(struct message));
 #ifdef RCD
@@ -127,7 +127,7 @@
 }
 
 
-static void log(struct message *m)
+static void logmessage(struct message *m)
 {
     time_t curtime;
     struct tm *tmstruct;

Index: players.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/tools/players.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- players.c	10 Apr 2006 04:24:51 -0000	1.4
+++ players.c	22 Apr 2006 02:16:47 -0000	1.5
@@ -217,9 +217,9 @@
 {
   char buf[2];
   struct sockaddr addr;
-  int len = sizeof(addr);
+  socklen_t addrlen = sizeof(addr);
   int sock = 0;
-  int stat = recvfrom(sock, buf, 1, MSG_TRUNC, &addr, &len);
+  int stat = recvfrom(sock, buf, 1, MSG_TRUNC, &addr, &addrlen);
   if (stat < 0 && errno == ENOTSOCK)
     fprintf(stderr, "players: must be called by netrekd with UDP file descriptor setup\n");
   if (stat < 0) { perror("players: recvfrom"); return; }
@@ -248,7 +248,7 @@
   }
   
   /* send the reply */
-  stat = sendto(sock, packet, strlen(packet), 0, &addr, len);
+  stat = sendto(sock, packet, strlen(packet), 0, &addr, addrlen);
   if (stat < 0) { perror("players: sendto"); return; }
 }
 

Index: keyman.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/tools/keyman.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- keyman.c	30 Sep 2005 05:46:19 -0000	1.2
+++ keyman.c	22 Apr 2006 02:16:47 -0000	1.3
@@ -8,6 +8,8 @@
 
 #include 
 #ifdef RSA
+#include 
+#include 
 #include 
 #include 
 #include 



From quozl at users.sourceforge.net  Fri Apr 21 21:16:49 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sat, 22 Apr 2006 02:16:49 +0000
Subject: [netrek-cvs] server/Vanilla/robots basep.c, 1.1, 1.2 inl.c, 1.2,
	1.3 mars.c, 1.2, 1.3 marsmove.c, 1.1, 1.2 newbie.c, 1.2,
	1.3 pret.c, 1.1, 1.2 puck.c, 1.2, 1.3 puckmove.c, 1.2,
	1.3 robotII.c, 1.1, 1.2
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/robots
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6880/robots

Modified Files:
	basep.c inl.c mars.c marsmove.c newbie.c pret.c puck.c 
	puckmove.c robotII.c 
Log Message:


Index: mars.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robots/mars.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mars.c	28 Sep 2005 12:14:05 -0000	1.2
+++ mars.c	22 Apr 2006 02:16:46 -0000	1.3
@@ -13,6 +13,7 @@
 
 #include "copyright.h"
 #include 
+#include 
 #include 
 #include 
 #include 

Index: inl.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robots/inl.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- inl.c	10 Apr 2006 10:30:44 -0000	1.2
+++ inl.c	22 Apr 2006 02:16:46 -0000	1.3
@@ -26,6 +26,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include "defs.h"
 #include "struct.h"
 #include "data.h"

Index: robotII.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robots/robotII.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- robotII.c	21 Mar 2005 05:23:46 -0000	1.1
+++ robotII.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -3,6 +3,7 @@
 #include "copyright.h"
 
 #include 
+#include 
 #include 
 #include 
 #include 

Index: marsmove.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robots/marsmove.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- marsmove.c	21 Mar 2005 05:23:46 -0000	1.1
+++ marsmove.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -24,6 +24,7 @@
 #include "copyright.h"
 
 #include 
+#include 
 #include 
 #include 
 #include 

Index: puck.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robots/puck.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- puck.c	21 Mar 2005 10:17:18 -0000	1.2
+++ puck.c	22 Apr 2006 02:16:46 -0000	1.3
@@ -10,6 +10,7 @@
 #include "copyright.h"
 
 #include 
+#include 
 #include 
 #include 
 #include 

Index: pret.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robots/pret.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pret.c	21 Mar 2005 10:17:18 -0000	1.1
+++ pret.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -8,6 +8,8 @@
 
 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 

Index: newbie.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robots/newbie.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- newbie.c	27 Sep 2005 10:31:49 -0000	1.2
+++ newbie.c	22 Apr 2006 02:16:46 -0000	1.3
@@ -8,6 +8,8 @@
 
 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 

Index: basep.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robots/basep.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- basep.c	21 Mar 2005 05:23:46 -0000	1.1
+++ basep.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -8,6 +8,8 @@
 
 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 

Index: puckmove.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robots/puckmove.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- puckmove.c	21 Mar 2005 10:17:18 -0000	1.2
+++ puckmove.c	22 Apr 2006 02:16:46 -0000	1.3
@@ -16,6 +16,7 @@
 #include "copyright.h"
 
 #include 
+#include 
 #include 
 #include 
 #include "defs.h"



From quozl at users.sourceforge.net  Fri Apr 21 21:16:47 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sat, 22 Apr 2006 02:16:47 +0000
Subject: [netrek-cvs] server/Vanilla STYLE, NONE, 1.1 ChangeLog, 1.23,
	1.24 Makefile.in, 1.8, 1.9 NEWS, 1.13, 1.14 PROJECTS, 1.6,
	1.7 README.releasing, 1.12, 1.13
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6880

Modified Files:
	ChangeLog Makefile.in NEWS PROJECTS README.releasing 
Added Files:
	STYLE 
Log Message:


--- NEW FILE: STYLE ---
Coding style for patch acceptance on Vanilla project.

 *  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.

{{{
static int foo(int a)
{
    if (a) {
        func(abc);
        def;
    } else {
        ghi;
        jkl;
    }
}
}}}

Index: ChangeLog
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- ChangeLog	21 Apr 2006 11:38:57 -0000	1.23
+++ ChangeLog	22 Apr 2006 02:16:42 -0000	1.24
@@ -1,3 +1,18 @@
+Sat Apr 22 12:07:50 2006  James Cameron  
+
+	* Makefile.in (dist): avoid certain CVS files.
+
+Sat Apr 22 11:47:55 2006  James Cameron  
+
+	* ntserv/feature.c, ntserv/wander2.c (pfree): fix two small
+	valgrind leaks.
+
+	* */*.c, */*.h: fix compilation warnings on GCC 4.0.3.
+
+Sat Apr 22 10:37:51 2006  James Cameron  
+
+	* tools/watchmes.c (logmessage): avoid built-in function name.
+
 Fri Apr 14 22:21:22 2006  James Cameron  
 
 	* ntserv/daemonII.c (move): prevent tournament mode from starting

Index: Makefile.in
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.in	22 Feb 2006 09:18:30 -0000	1.8
+++ Makefile.in	22 Apr 2006 02:16:44 -0000	1.9
@@ -5,7 +5,7 @@
 #
 
 PACKAGE=netrek-server-vanilla
-VERSION=2.10.2
+VERSION=2.10.3
 
 VPATH = @srcdir@
 srcdir = @srcdir@
@@ -190,7 +190,6 @@
         # subdirectories
 	cp -rp docs gum include keycomp motd newstartd ntserv php \
 	pledit res-rsa robotd robots sequencer tools xsg $(NAME)/
-	rm -rf $(NAME)/*/CVS $(NAME)/*/*/CVS
         # packaging subdirectories (debian)
 	mkdir $(NAME)/debian $(NAME)/rpm
 	cp -p debian/README.Debian debian/changelog debian/control \
@@ -198,6 +197,10 @@
 	$(NAME)/debian
         # packaging subdirectories (rpm)
 	cp -rp rpm $(NAME)/
+        # strip out surplus
+	rm -rf $(NAME)/*/CVS $(NAME)/*/*/CVS 
+	rm -rf $(NAME)/.cvsignore $(NAME)/*/.cvsignore
+	rm -rf $(NAME)/*/.deps $(NAME)/*~ $(NAME)/*/*~
         # build
 	GZIP=--best tar cfz $(NAME).tar.gz $(NAME)
 	rm -rf $(NAME)

Index: README.releasing
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/README.releasing,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- README.releasing	1 Mar 2006 22:26:48 -0000	1.12
+++ README.releasing	22 Apr 2006 02:16:45 -0000	1.13
@@ -7,8 +7,8 @@
 cd Vanilla
 
 # set variables
-VS=2.10.2
-VL=v_2_10_2
+VS=2.10.3
+VL=v_2_10_3
 PN=netrek-server-vanilla
 
 # check version numbers in files
@@ -29,6 +29,9 @@
 # commit changes
 cvs commit -m "prerelease $VS"
 
+# reduce source tree to only CVS files, or fix .cvsignore
+cvs update > tmp
+
 # tag the release
 cvs tag -F $VL
 cvs tag -F v_release
@@ -48,6 +51,7 @@
 cd $PN-$VS
 ./configure --prefix=/tmp/$VS
 make
+# FUTURE, test that the tree is returned to pristine condition by distclean
 
 # test install kit
 make install

Index: NEWS
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/NEWS,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- NEWS	14 Apr 2006 10:19:17 -0000	1.13
+++ NEWS	22 Apr 2006 02:16:45 -0000	1.14
@@ -1,4 +1,8 @@
-- fix client/server error over army capacity of AS in certain cases [balcerski]
+- fix valgrind detected heap leaks [Cameron]
+- compilation fixes for GCC 4.0.3 [Cameron]
+- remove some crud from tar.gz [Cameron]
+- add coding STYLE file [Cameron]
+- fix client/server error over army capacity of AS in certain cases [Balcerski]
 - use IP addresses only for t-mode scum test [Cameron]
 - compilation fix for FreeBSD [O'Conner]
 

Index: PROJECTS
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/PROJECTS,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- PROJECTS	12 Apr 2006 12:58:11 -0000	1.6
+++ PROJECTS	22 Apr 2006 02:16:45 -0000	1.7
@@ -3,6 +3,10 @@
 
 List of things to do in the future
 
+	- metaserver begins to list robots on a server after the
+	  server has stopped sending player count updates by perhaps
+	  the TCP query from the server is mistaken.
+
 	- vote per IP address only, not per slot
 
 	- separate ban and eject votes, ban to include effect of



From quozl at users.sourceforge.net  Fri Apr 21 21:16:49 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sat, 22 Apr 2006 02:16:49 +0000
Subject: [netrek-cvs] server/Vanilla/xsg defaults.c, 1.2, 1.3 input.c, 1.1,
	1.2 main.c, 1.1, 1.2 modify.c, 1.1, 1.2 robotwin.c, 1.1,
	1.2 shmem.c, 1.1, 1.2 x11window.c, 1.2, 1.3
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/xsg
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6880/xsg

Modified Files:
	defaults.c input.c main.c modify.c robotwin.c shmem.c 
	x11window.c 
Log Message:


Index: main.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/xsg/main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- main.c	21 Mar 2005 05:23:48 -0000	1.1
+++ main.c	22 Apr 2006 02:16:47 -0000	1.2
@@ -4,6 +4,7 @@
 #include "copyright.h"
 
 #include 
+#include 
 #include 
 #include 
 #include 

Index: input.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/xsg/input.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- input.c	21 Mar 2005 05:23:48 -0000	1.1
+++ input.c	22 Apr 2006 02:16:47 -0000	1.2
@@ -6,6 +6,7 @@
 #include "copyright.h"
 
 #include 
+#include 
 #include 
 #include 
 #include 

Index: robotwin.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/xsg/robotwin.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- robotwin.c	21 Mar 2005 05:23:48 -0000	1.1
+++ robotwin.c	22 Apr 2006 02:16:47 -0000	1.2
@@ -4,6 +4,7 @@
 #include "copyright.h"
 
 #include 
+#include 
 #include 
 #include 
 #include 

Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/xsg/defaults.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- defaults.c	30 Sep 2005 05:52:13 -0000	1.2
+++ defaults.c	22 Apr 2006 02:16:47 -0000	1.3
@@ -4,6 +4,7 @@
  */
 #include "copyright2.h"
 #include 
+#include 
 
 struct stringlist {
     char *string;
@@ -14,7 +15,6 @@
 struct stringlist *defaults=NULL;
 
 char *getenv();
-char *strdup();
 
 initDefaults(deffile)
 char *deffile;		/* As opposed to defile? */
@@ -61,16 +61,6 @@
     fclose(fp);
 }
 
-char *strdup(str)
-const char *str;
-{
-    char *s;
-
-    s=(char *) malloc(strlen(str)+1);
-    strcpy(s,str);
-    return(s);
-}
-
 char *getdefault(str)
 char *str;
 {

Index: modify.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/xsg/modify.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- modify.c	21 Mar 2005 05:23:48 -0000	1.1
+++ modify.c	22 Apr 2006 02:16:47 -0000	1.2
@@ -36,7 +36,7 @@
 	"Ship class: Galaxy (GA)",
 #endif
 #ifdef ATT
-	"Ship class: AT&T (??)",
+	"Ship class: AT&T",
 #endif
 	""};
 

Index: x11window.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/xsg/x11window.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- x11window.c	30 Sep 2005 05:46:19 -0000	1.2
+++ x11window.c	22 Apr 2006 02:16:47 -0000	1.3
@@ -316,17 +316,17 @@
 	    }
 	    if (i==W_Red) {
 		colortable[i].pixmap=XCreatePixmapFromBitmapData(W_Display,
-		    W_Root, striped, TILESIDE, TILESIDE,
+		    W_Root, (char *) striped, TILESIDE, TILESIDE,
 		    white, black,
 		    DefaultDepth(W_Display, W_Screen));
 	    } else if (i==W_Yellow) {
 		colortable[i].pixmap=XCreatePixmapFromBitmapData(W_Display,
-		    W_Root, gray, TILESIDE, TILESIDE,
+		    W_Root, (char *) gray, TILESIDE, TILESIDE,
 		    white, black,
 		    DefaultDepth(W_Display, W_Screen));
 	    } else {
 		colortable[i].pixmap=XCreatePixmapFromBitmapData(W_Display,
-		    W_Root, solid, TILESIDE, TILESIDE, 
+		    W_Root, (char *) solid, TILESIDE, TILESIDE, 
 		    colortable[i].pixelValue,
 		    colortable[i].pixelValue, 
 		    DefaultDepth(W_Display, W_Screen));
@@ -353,7 +353,7 @@
           XAllocColor(W_Display, W_Colormap, &foo);
           colortable[i].pixelValue = foo.pixel;
           colortable[i].pixmap = XCreatePixmapFromBitmapData(W_Display,
-          W_Root, solid, TILESIDE, TILESIDE, foo.pixel, foo.pixel, 
+          W_Root, (char *) solid, TILESIDE, TILESIDE, foo.pixel, foo.pixel, 
           DefaultDepth(W_Display, W_Screen));
         }
     }  else {
@@ -415,7 +415,7 @@
 	    XStoreColor(W_Display, W_Colormap, &foo);
 	    colortable[i].pixelValue = foo.pixel;
 	    colortable[i].pixmap = XCreatePixmapFromBitmapData(W_Display,
-		W_Root, solid, TILESIDE, TILESIDE, foo.pixel, foo.pixel,
+		W_Root, (char *) solid, TILESIDE, TILESIDE, foo.pixel, foo.pixel,
 		DefaultDepth(W_Display, W_Screen));
 	}
     }

Index: shmem.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/xsg/shmem.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- shmem.c	21 Mar 2005 05:23:48 -0000	1.1
+++ shmem.c	22 Apr 2006 02:16:47 -0000	1.2
@@ -4,6 +4,7 @@
 #include "copyright.h"
 
 #include 
+#include 
 #include 
 #include 
 #include 



From quozl at users.sourceforge.net  Fri Apr 21 21:16:48 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sat, 22 Apr 2006 02:16:48 +0000
Subject: [netrek-cvs] server/Vanilla/robotd assault.c, 1.1, 1.2 data.c, 1.2,
	1.3 data.h, 1.2, 1.3 death.c, 1.1, 1.2 decide.c, 1.2,
	1.3 defaults.c, 1.2, 1.3 defs.h, 1.3, 1.4 disengage.c, 1.1,
	1.2 dmessage.c, 1.2, 1.3 dodge.c, 1.1, 1.2 engage.c, 1.1,
	1.2 findslot.c, 1.1, 1.2 getarmies.c, 1.1, 1.2 getname.c, 1.1,
	1.2 getship.c, 1.1, 1.2 input.c, 1.1, 1.2 main.c, 1.2,
	1.3 master.c, 1.1, 1.2 newwin.c, 1.1, 1.2 ogg.c, 1.1,
	1.2 packets.h, 1.1, 1.2 parse.c, 1.1, 1.2 pwarfare.c, 1.1,
	1.2 redraw.c, 1.1, 1.2 reserved.c, 1.1, 1.2 robot.c, 1.2,
	1.3 rwarfare.c, 1.1, 1.2 shmem.c, 1.1, 1.2 socket.c, 1.2,
	1.3 struct.h, 1.2, 1.3 update_planets.c, 1.1,
	1.2 update_players.c, 1.1, 1.2 util.c, 1.3, 1.4 warfare.c, 1.1, 1.2
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/robotd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6880/robotd

Modified Files:
	assault.c data.c data.h death.c decide.c defaults.c defs.h 
	disengage.c dmessage.c dodge.c engage.c findslot.c getarmies.c 
	getname.c getship.c input.c main.c master.c newwin.c ogg.c 
	packets.h parse.c pwarfare.c redraw.c reserved.c robot.c 
	rwarfare.c shmem.c socket.c struct.h update_planets.c 
	update_players.c util.c warfare.c 
Log Message:


Index: findslot.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/findslot.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- findslot.c	21 Mar 2005 05:23:45 -0000	1.1
+++ findslot.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -7,6 +7,7 @@
 #include "copyright2.h"
 
 #include 
+#include 
 #include 
 #include 
 #include 

Index: ogg.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/ogg.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ogg.c	21 Mar 2005 05:23:45 -0000	1.1
+++ ogg.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -44,7 +44,7 @@
       _oggdist = e->hispr-2000;
    else
       _oggdist = 4000;	/* experiment */
-#endif nodef
+#endif
 
    if((MYFUEL() < 10 || MYDAMAGE() > 50) && e->dist > 7000){
       if(DEBUG & DEBUG_OGG)

Index: update_planets.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/update_planets.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- update_planets.c	21 Mar 2005 05:23:45 -0000	1.1
+++ update_planets.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -97,7 +97,7 @@
       printf("total independents: %d\n", pls->num_indsp);
       printf("total unknowns: %d\n", pls->num_unknownsp);
       printf("total war planets: %d\n", pls->num_warteamsp);
-#endif nodef
+#endif
 }
 
 _plcmp(el1, el2)

Index: util.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/util.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- util.c	30 Sep 2005 05:57:43 -0000	1.3
+++ util.c	22 Apr 2006 02:16:46 -0000	1.4
@@ -13,12 +13,23 @@
 #include "data.h"
 #include "robot.h"
 
-mprintf(char *format, ...);
-
 #define ADDRLEN		10
 
 struct distress *loaddistress(enum dist_type i);
 
+mprintf(char *format, ...)
+{
+   va_list	ap;
+
+   if(!read_stdin)
+      return;
+   
+   va_start(ap, format);
+   (void)vprintf(format, ap);
+   fflush(stdout);
+   va_end(ap);
+}
+
 /*
 ** Provide the angular distance between two angles.
 */
@@ -71,7 +82,7 @@
     vec.sv_handler = funct;
     sigvector(sig, &vec, (struct sigvec *) 0);
 }
-#endif hpux
+#endif
 
 warning(s, o)
 
@@ -431,19 +442,6 @@
 }
 #endif
 
-mprintf(char *format, ...)
-{
-   va_list	ap;
-
-   if(!read_stdin)
-      return;
-   
-   va_start(ap, format);
-   (void)vprintf(format, ap);
-   fflush(stdout);
-   va_end(ap);
-}
-
 
 mfprintf(char *format, ...)
 {

Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/defaults.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- defaults.c	12 Apr 2006 11:57:00 -0000	1.2
+++ defaults.c	22 Apr 2006 02:16:46 -0000	1.3
@@ -4,9 +4,7 @@
  */
 #include "copyright2.h"
 #include 
-#ifdef __FreeBSD__
 #include 
-#endif
 
 struct stringlist {
     char *string;
@@ -18,7 +16,6 @@
 
 #ifndef __FreeBSD__
 char *getenv();
-char *strdup();
 #endif
 
 initDefaults(deffile)
@@ -66,18 +63,6 @@
     fclose(fp);
 }
 
-#ifndef __FreeBSD__
-char *strdup(str)
-char *str;
-{
-    char *s;
-
-    s=(char *) malloc(strlen(str)+1);
-    strcpy(s,str);
-    return(s);
-}
-#endif
-
 char *getdefault(str)
 char *str;
 {

Index: data.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/data.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- data.c	21 Mar 2005 10:17:17 -0000	1.2
+++ data.c	22 Apr 2006 02:16:46 -0000	1.3
@@ -102,7 +102,7 @@
 int     udpClientSend=1;                /* UDP: send our packets using UDP? */
 int     udpClientRecv=1;                /* UDP: receive with fat UDP */
 int     udpSequenceChk=1;               /* UDP: check sequence numbers */
-#endif ATM
+#endif
 
 #ifdef SHORT_PACKETS
 int	recv_short = 0;

Index: assault.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/assault.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- assault.c	21 Mar 2005 05:23:44 -0000	1.1
+++ assault.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -143,7 +143,7 @@
 #ifdef nodef
    if(!do_cloak(0))
       req_cloak_off();
-#endif nodef
+#endif
    if(e && e->p && isAlive(e->p)){
       if(e->dist < 10000)
 	 req_cloak_on();
@@ -163,7 +163,7 @@
 	 return;
       }
    }
-#endif nodef
+#endif
 
    if(me->p_armies == 0){
       req_shields_up();

Index: data.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/data.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- data.h	21 Mar 2005 10:17:17 -0000	1.2
+++ data.h	22 Apr 2006 02:16:46 -0000	1.3
@@ -113,7 +113,7 @@
 extern int udpClientSend;       /* UDP */
 extern int udpClientRecv;       /* UDP */
 extern int udpSequenceChk;      /* UDP */
-#endif ATM
+#endif
 
 #ifdef SHORT_PACKETS
 extern int recv_short;

Index: shmem.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/shmem.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- shmem.c	21 Mar 2005 05:23:45 -0000	1.1
+++ shmem.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -1,5 +1,6 @@
 #include "copyright.h"
 #include 
+#include 
 #include 
 #include 
 #include 

Index: pwarfare.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/pwarfare.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pwarfare.c	21 Mar 2005 05:23:45 -0000	1.1
+++ pwarfare.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -77,12 +77,12 @@
 	 }
       }
    }
-#endif nodef
+#endif
 
 #ifdef nodef
    if(j->p_flags & PFCLOAK)
       printf("%s: speed: %d, dir %d\n", j->p_name, j->p_speed, j->p_dir);
-#endif nodef
+#endif
 
    if(e->invisible)
       return;
@@ -250,7 +250,7 @@
       else if((me->p_flags & PFPRESS) && (me->p_tractor != j->p_no)){
 	    req_tractor_off();
       }
-#endif nodef
+#endif
       _special_tr = 1;
    }
 
@@ -289,7 +289,7 @@
 	 }
 #ifdef nodef
 	 urnd = (8*edist)/7500 + 2;
-#endif nodef
+#endif
 	 if(j->p_flags & PFORBIT){
 	    get_torp_course(j, &tcrs, me->p_x, me->p_y);
 	    if(!_state.defend || angdist(tcrs, dcrs) > 32)
@@ -364,7 +364,7 @@
 	    req_torp(tcrs);
       }
       return;
-#endif nodef
+#endif
 
       if(_state.protect && (j->p_flags & PFORBIT) && !(j->p_flags & PFCLOAK) &&
 	 (j->p_planet == _state.protect_planet->pl_no) && edist < 9000){
@@ -417,7 +417,7 @@
       printf("damage: %d\n", 100-PL_DAMAGE(e) + PL_SHIELD(e));
       printf("td: %d\n", SH_TORPDAMAGE(me));
       printf("dist: %d\n", e->dist);
-#endif nodef
+#endif
       
 
       if(_state.defend){
@@ -754,7 +754,7 @@
 	       if(DEBUG & DEBUG_WARFARE){
 		  printf("hitme = %d\n", e->phit_me);
 	       }
-#endif nodef
+#endif
 	       if(e->phit_me > 0)
 		  e->phit_me --;
 	    }

Index: robot.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/robot.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- robot.c	21 Mar 2005 10:17:17 -0000	1.2
+++ robot.c	22 Apr 2006 02:16:46 -0000	1.3
@@ -1,4 +1,6 @@
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -543,12 +545,12 @@
 #ifdef nodef
    if(_state.torp_danger || _state.recharge_danger)
       check_me_explode();
-#endif nodef
+#endif
 
 #ifdef nodef
    if(me->p_ship.s_type != STARBASE && !starbase(e))
       check_pressor(e);
-#endif nodef
+#endif
 
    num_hits = compute_course(mycrs, &newc, myspeed, &speed, &hittime, &lvorbit);
    handle_disvars(e, &myspeed);
@@ -623,7 +625,7 @@
    else if(me->p_speed == 0 && num_hits > 1 && _state.det_torps < 4 
       && MYFUEL() > 25)
       req_detonate("");
-#endif nodef
+#endif
 #ifdef nodef
    /* debug */
    if(num_hits > 0 && me->p_speed > 6){
@@ -631,7 +633,7 @@
 	 _state.det_damage, 50*num_hits);
       printf("my damage + detdamage = %d\n", MYDAMAGE() + _state.det_damage);
    }
-#endif nodef
+#endif
    if(_state.det_torps == 0) return;
 
    if(!_state.det_const){
@@ -683,7 +685,7 @@
 #ifdef nodef
    if((me->p_flags & PFORBIT) && _state.assault && !_state.planet)
       pl = _state.assault_planet;
-#endif nodef
+#endif
 
    if(pl && !(me->p_flags & PFORBIT)){
       disengage_c(_state.diswhy, _state.planet, "planet but no orbit");
@@ -1421,7 +1423,7 @@
 	 if(RANDOM()%4 < _state.human) 
 	    return 0;
 
-#endif nodef
+#endif
 	 if(_udcounter - tfired < _state.human){
 	    if(angdist(c, tfire_dir) > 20+ (RANDOM()%20))
 	       return 0;
@@ -1488,7 +1490,7 @@
 	 if(angdist(crs, turned_dir) > 40)
 	    return 0;
       }
-#endif nodef
+#endif
    }
 
    /*
@@ -1576,7 +1578,7 @@
 		  if(angdist(crs, turned_dir) > 40)
 		     return 0;
 	       }
-#endif nodef
+#endif
 	       if(_udcounter - tfired < 5 || (me->p_ship.s_type != STARBASE 
 		  && _udcounter - pfired < 11 + (RANDOM()%10)))
 		  return 0;

Index: disengage.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/disengage.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- disengage.c	21 Mar 2005 05:23:45 -0000	1.1
+++ disengage.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -42,7 +42,7 @@
 	 /* first try at using friends */
 #ifdef nodef
 	 || (_state.closest_f && _state.closest_f->dist < 7000)
-#endif nodef
+#endif
 	 )
 	 req_cloak_off("disengage: enemy farther than 10000");
       
@@ -50,7 +50,7 @@
       /* last ditch */
       if((me->p_ship.s_type != SCOUT) && MYFUEL() < 10)
 	 req_cloak_off("disengage: fuel < 10");
-#endif nodef
+#endif
    }
       
 
@@ -335,7 +335,7 @@
    crs = get_pl_course(pl, &speed, &cloak);
 #ifdef nodef
    crs = get_wrapcourse(pl->pl_x, pl->pl_y);
-#endif nodef
+#endif
 
    if(_state.recharge_danger || (e && e->dist < 8000) || 
       (e && e ->dist < 10000 && edang(e, 40))){

Index: input.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/input.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- input.c	21 Mar 2005 05:23:45 -0000	1.1
+++ input.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -10,9 +10,9 @@
 #include 
 #ifdef hpux
 #include 
-#else hpux
+#else
 #include 
-#endif hpux
+#endif
 #include 
 #include 
 #include "defs.h"
@@ -46,7 +46,7 @@
    udt.it_value.tv_usec = 100000;
    setitimer(ITIMER_REAL, &udt, 0);
    signal(SIGALRM, setflag);
-#endif nodef
+#endif
 
    while (1) {
 
@@ -62,7 +62,7 @@
 	 commSwitchTimeout = 0;
 	 if (udpSock >= 0)
 	    closeUdpConn();
-#endif ATM
+#endif
 
 	 connectToServer(nextSocket);
 	 printf("Yea!  We've been resurrected!\n");

Index: packets.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/packets.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- packets.h	21 Mar 2005 05:23:45 -0000	1.1
+++ packets.h	22 Apr 2006 02:16:46 -0000	1.2
@@ -143,7 +143,7 @@
 
 struct packet_handler {
     int size;
-    int (*handler)();
+    int (*handler)(char *bufptr);
 };
 
 struct mesg_spacket {

Index: getname.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/getname.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- getname.c	21 Mar 2005 05:23:45 -0000	1.1
+++ getname.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -7,6 +7,7 @@
 #include "copyright2.h"
 
 #include 
+#include 
 #include 
 #include 
 #include 

Index: struct.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/struct.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- struct.h	10 Apr 2006 10:56:33 -0000	1.2
+++ struct.h	22 Apr 2006 02:16:46 -0000	1.3
@@ -81,7 +81,7 @@
     short s_type;
     int s_torpspeed;
 };
-#endif nodef
+#endif /* nodef */
 struct ship {
     int s_turns;
     short s_accs;

Index: rwarfare.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/rwarfare.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rwarfare.c	21 Mar 2005 05:23:45 -0000	1.1
+++ rwarfare.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -40,7 +40,7 @@
 #ifdef nodef
    if(dist > 5000)
       dist = 5000;
-#endif nodef
+#endif
    
    if(edist < dist){
       
@@ -221,7 +221,7 @@
 	 _timers.robot_attack ++;
       return;
    }
-#endif nodef
+#endif
 
    _timers.robot_attack = 0;
    mprintf("unknown phase. %d\n", _timers.robot_attack);

Index: getship.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/getship.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- getship.c	21 Mar 2005 05:23:45 -0000	1.1
+++ getship.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -295,7 +295,7 @@
 	    shipp->s_height = 20;
 	    shipp->s_type = ATT;
 	    break;
-#endif nodef
+#endif
 	default:
 	    shipp->s_turns = 170000;
 	    shipp->s_accint = 150;
@@ -614,7 +614,7 @@
 	    shipp->s_height = 20;
 	    shipp->s_type = ATT;
 	    break;
-#endif nodef
+#endif
 	default:
 	    shipp->s_turns = 170000;
 	    shipp->s_accint = 150;

Index: master.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/master.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- master.c	21 Mar 2005 05:23:45 -0000	1.1
+++ master.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -63,7 +63,7 @@
       }
    }
 
-   if(connect(ms, &addr, sizeof(addr)) < 0){
+   if(connect(ms, (struct sockaddr *) &addr, sizeof(addr)) < 0){
       perror("connect");
       close(ms);
       return 0;

Index: dodge.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/dodge.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dodge.c	21 Mar 2005 05:23:45 -0000	1.1
+++ dodge.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -174,7 +174,7 @@
 	    continue;
 	 else if(tdi < 8)	/* torp heading our way */
 	    _state.recharge_danger = 1;
-#endif tmpNODEF
+#endif
 	 /* Experimental */
 	 if(tdi < 8 && tdist < 7000)
 	    _state.recharge_danger = 1;
@@ -185,7 +185,7 @@
 #ifdef nodef
 	 tx += rint(_avsdelay * tdx);
 	 ty += rint(_avsdelay * tdy);
-#endif nodef
+#endif
 
 	 tp->tp_dist 	= tdist;
 	 tp->tp_x 	= tx;
@@ -357,7 +357,7 @@
 #ifdef nodef
       !(_state.assault && _state.assault_planet == _state.hplanet) &&
 	 (_state.planet != _state.hplanet)
-#endif nodef
+#endif
 
 	 unsigned char	deg;
 	 int		dist = _state.hpldist;
@@ -649,7 +649,7 @@
 	 tp->tp_ndir = tp->tp_dir;
       }
    }
-#endif nodef
+#endif
 
    for(i=0; i< _state.maxfuse; i++){
       
@@ -705,7 +705,7 @@
 	       expdist = EXPDIST + (tp->tp_dist*EXPDIST)/_state.seek_const 
 		  + 500;
 	 }
-#endif nodef
+#endif
 
 	 if(ABS(dx) < expdist && ABS(dy) < expdist) {
 	    int	torp_d;
@@ -907,7 +907,7 @@
    if(_state.planet && (&planets[me->p_planet] != _state.planet)){
       printf("error in getorbit_ppos: wrong planet.\n");
    }
-#endif nodef
+#endif
 
    px = planets[me->p_planet].pl_x;
    py = planets[me->p_planet].pl_y;
@@ -1321,7 +1321,7 @@
                         mindamage = INT_MAX,
 #ifdef nodef
                         begin_time = mtime(0), 
-#endif nodef
+#endif
 			speed, crs, chklower=1, damage;
    int                  avdir;
    int			plhit = 0;
@@ -1360,7 +1360,7 @@
       if(DEBUG & DEBUG_HITS){
          printf("returning no hits at %d\n", hittime);
       }
-#endif nodef
+#endif
       Xplhit = 0;
       return 0;
    }
@@ -1369,7 +1369,7 @@
    /* experiment */
    if(me->p_speed == 0)
       return nh;
-#endif nodef
+#endif
    
    if(d_speed < 2){
       speed = 2;
@@ -1405,7 +1405,7 @@
             if(DEBUG & DEBUG_HITS){
                printf("returning no hits at %d\n", hittime);
             }
-#endif nodef
+#endif
 	    Xplhit = 0;
             return 0;
          }
@@ -1461,7 +1461,7 @@
 #ifdef nodef    /* need more variables */
          if(minhittime < 3 && _state.det_torps < 3)     /* experiment */
             req_detonate("");
-#endif nodef
+#endif
 
 	 Xplhit = plhit;
          return minhits;
@@ -1477,7 +1477,7 @@
          }
          return minhits;
       }
-#endif nodef
+#endif
    }
    /* NOTREACHED */
 }

Index: defs.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/defs.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- defs.h	10 Apr 2006 10:56:33 -0000	1.3
+++ defs.h	22 Apr 2006 02:16:46 -0000	1.4
@@ -227,7 +227,7 @@
 /* client version of UDPDIAG */
 #define UDPDIAG(x)      { if (udpDebug) { printf("UDP: "); printf x; }}
 #define V_UDPDIAG(x)    /*UDPDIAG(x)*/
-#endif ATM
+#endif
 
 #define RANDOM()	rand()
 #define SRANDOM(x)	srand(x)

Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/newwin.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- newwin.c	21 Mar 2005 05:23:45 -0000	1.1
+++ newwin.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -9,9 +9,9 @@
 #include 
 #ifdef hpux
 #include 
-#else hpux
+#else
 #include 
-#endif hpux
+#endif
 #include "defs.h"
 #include "struct.h"
 #include "data.h"

Index: parse.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/parse.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- parse.c	21 Mar 2005 05:23:45 -0000	1.1
+++ parse.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -77,7 +77,7 @@
 #ifdef nodef
    printf("new info gives dam %d, shield %d, armies %d\n",
       PL_DAMAGE(p), PL_SHIELD(p), p->armies);
-#endif nodef
+#endif
    
    /* decide on escort */
 

Index: main.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- main.c	21 Mar 2005 10:17:17 -0000	1.2
+++ main.c	22 Apr 2006 02:16:46 -0000	1.3
@@ -4,6 +4,8 @@
 #include "copyright.h"
 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -255,7 +257,7 @@
 	    argv++;
 	    argc--;
 	    break;
-#endif nodef
+#endif
 	 case 'q':
 	    noargs ++;
 	    break;

Index: redraw.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/redraw.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- redraw.c	21 Mar 2005 05:23:45 -0000	1.1
+++ redraw.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -152,4 +152,4 @@
 	    }
 	 }
       }
-#endif nodef
+#endif

Index: dmessage.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/dmessage.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dmessage.c	21 Mar 2005 10:17:17 -0000	1.2
+++ dmessage.c	22 Apr 2006 02:16:46 -0000	1.3
@@ -1113,7 +1113,7 @@
 	 udpaction(UDP_UPDATE_ALL);
 	 response("Sending udp update-all req");
       }
-#endif ATM
+#endif
 #ifdef SHORT_PACKETS
       else if(strncmp(m, "shortp", 6)==0){
 	 if(recv_short)
@@ -1752,7 +1752,7 @@
         fprintf(stderr, "unknown UDP command\n");
     }
 }
-#endif ATM
+#endif
 
 setlog(dir)
    

Index: engage.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/engage.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- engage.c	21 Mar 2005 05:23:45 -0000	1.1
+++ engage.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -632,7 +632,7 @@
       case STARBASE:
 	 break;
    }
-#endif nodef
+#endif
    
    if(e_dist < hispr){
       if(DEBUG & DEBUG_ENGAGE){
@@ -773,7 +773,7 @@
       /* right edge */
       *crs = get_course(
       /* HERE */
-#endif nodef
+#endif
 }
 
 /* based on get_torp_course */

Index: update_players.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/update_players.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- update_players.c	21 Mar 2005 05:23:45 -0000	1.1
+++ update_players.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -1,4 +1,5 @@
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -215,7 +216,7 @@
 #ifdef nodef
       if(DEBUG & DEBUG_ENEMY)
 	 print_player(p);
-#endif nodef
+#endif
 
       p->p_x = j->p_x;	/* last x */
       p->p_y = j->p_y;	/* last y */
@@ -249,7 +250,7 @@
       _state.p_subspeed, _state.p_subdir,
       _state.sp_subspeed - _state.p_subspeed,
       _state.sp_subdir - _state.p_subspeed);
-#endif nodef
+#endif
 
    /* update my information */
    _state.last_x	= me->p_x;
@@ -333,7 +334,7 @@
 	 }
       }
    }
-#endif nodef
+#endif
 
    if(j->p_flags & PFORBIT){
       j->p_planet = planet_from_ppos(j);
@@ -347,7 +348,7 @@
 	    printf("%s orbiting %s\n", j->p_name, 
 	       planets[j->p_planet].pl_name);
 	 }
-#endif nodef
+#endif
       }
       else
 	 p->pl_armies = 0;
@@ -433,7 +434,7 @@
 	    pl->pl_name);
 	 printf("%s(%d) has %d armies.\n",
 	    j->p_name, j->p_no, p->armies);
-#endif nodef
+#endif
       }
       else{
 	 p->armies += (pa - pl->pl_armies);
@@ -444,7 +445,7 @@
 	    pl->pl_name);
 	 printf("%s(%d) has %d armies.\n",
 	    j->p_name, j->p_no, p->armies);
-#endif nodef
+#endif
       }
    }
    else{
@@ -459,7 +460,7 @@
 	    pl->pl_name);
 	 printf("%s(%d) has %d armies.\n",
 	    j->p_name, j->p_no, p->armies);
-#endif nodef
+#endif
       }
    }
    if(p->armies < 0) p->armies = 0;
@@ -1229,7 +1230,7 @@
 	    else if(p->p == me && dist < 6000){
 	       printf("dens: NOT attacking %s\n", en->p_mapchars);
 	    }
-#endif nodef
+#endif
 	 }
       }
    }
@@ -1256,7 +1257,7 @@
       }
       printf("\n");
    }
-#endif nodef
+#endif
 }
 
 calc_attackdiff()
@@ -1308,7 +1309,7 @@
 #ifdef nodef
    /* tmp */
    printf("att %d, def %d\n", at, df);
-#endif nodef
+#endif
 }
 
 /* SSS: speed critical */
@@ -1366,7 +1367,7 @@
 #ifdef nodef
 	 printf("choosing invisible player with hp %s (%d,%d)\n",
 	    hp->pl_name, hp->pl_x, hp->pl_y);
-#endif nodef
+#endif
 	 p->invisible = 0;	/* xx */
       }
       return p;
@@ -1396,7 +1397,7 @@
 #ifdef nodef
 	 printf("choosing invisible player with hp %s (%d,%d)\n",
 	    hp->pl_name, hp->pl_x, hp->pl_y);
-#endif nodef
+#endif
 	 p->invisible = 0;	/* xx */
       }
    }

Index: death.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/death.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- death.c	21 Mar 2005 05:23:45 -0000	1.1
+++ death.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -9,9 +9,9 @@
 #include 
 #ifdef hpux
 #include 
-#else hpux
+#else
 #include 
-#endif hpux
+#endif
 #include "defs.h"
 #include "struct.h"
 #include "data.h"
@@ -39,7 +39,7 @@
     udt.it_value.tv_usec = 0;
     setitimer(ITIMER_REAL, &udt, 0);
     signal(SIGALRM, SIG_DFL);
-#endif nodef
+#endif
 
     switch (me->p_whydead) {
     case KQUIT:

Index: decide.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/decide.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- decide.c	21 Mar 2005 10:17:17 -0000	1.2
+++ decide.c	22 Apr 2006 02:16:46 -0000	1.3
@@ -82,7 +82,7 @@
 	 return;
       else
 	 check_refit();
-#endif nodef
+#endif
 	 return;
    }
    
@@ -296,7 +296,7 @@
       if(MYDAMAGE() > 25 || MYFUEL() < 60)
 	 disengage_c(EDAMAGE, NULL);
    }
-#endif nodef
+#endif
 
    if(MYDAMAGE() > 75)
       disengage_c(EDAMAGE, NULL, "dam > 75");
@@ -574,7 +574,7 @@
 #ifdef nodef
    /* tmp */
    return 0;
-#endif nodef
+#endif
 
    if(pls->total_wextra_armies == 0) return 0;
 

Index: warfare.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/warfare.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- warfare.c	21 Mar 2005 05:23:45 -0000	1.1
+++ warfare.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -40,7 +40,7 @@
       dgo = 0;
       return;
    }
-#endif nodef
+#endif
 
    if(!isAlive(me))
       return;
@@ -316,7 +316,7 @@
    printf("%s not orbiting anything.\n", j->p_name);
    */
    return -1;
-#endif NO_PFORBIT
+#endif
    
    for(i=0, pl=planets; i < MAXPLANETS; i++, pl++){
       if(ABS(pl->pl_x - j->p_x) < 5000 && ABS(pl->pl_y - j->p_y) < 5000)
@@ -350,5 +350,5 @@
       return 0;
    }
    return 1;
-#endif nodef
+#endif
 }

Index: getarmies.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/getarmies.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- getarmies.c	21 Mar 2005 05:23:45 -0000	1.1
+++ getarmies.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -236,7 +236,7 @@
 #ifdef nodef
       if(k == pl)
 	 continue;
-#endif nodef
+#endif
       if(k->pl_armies < 5)
 	 continue;
 
@@ -244,13 +244,13 @@
       p = get_nearest_to_pl_dist(k, &hdist);
       if(p && (hdist < 6000 || (hdist < 15000 && edang(p, 64))))
 	 continue;
-#endif nodef
+#endif
 
 #ifdef nodef
       dx = k->pl_x - me->p_x;
       dy = k->pl_y - me->p_y;
       pdist = (int)ihypot(dx,dy);
-#endif nodef
+#endif
       pdist = k->pl_mydist;
 
       if(pdist < mdist){

Index: reserved.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/reserved.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- reserved.c	21 Mar 2005 05:23:45 -0000	1.1
+++ reserved.c	22 Apr 2006 02:16:46 -0000	1.2
@@ -4,6 +4,8 @@
  */
 #include "copyright2.h"
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 

Index: socket.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robotd/socket.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- socket.c	21 Mar 2005 10:17:17 -0000	1.2
+++ socket.c	22 Apr 2006 02:16:46 -0000	1.3
@@ -8,6 +8,8 @@
 #include "copyright2.h"
 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -37,7 +39,7 @@
 
 #define DEBUG_SOCKET(p)		printf("%s at %d\n", p, mtime(1)-_read_time);
 static int	_read_time;
-#endif DEBUG_SCK
+#endif
 
 static int	rsock_failed;
 static int	debug;
@@ -56,11 +58,10 @@
 int handleReserved();
 int handleScan(), handleUdpReply(), handleSequence();
 int handleMasterComm();
-extern int exit();
 #ifdef ATM
 int handleUdpReply(), handleSequence();
 int handleScan();
-#endif ATM
+#endif /* ATM */
 
 #ifdef PING
 int	handlePing();	/* ping.c */
@@ -98,32 +99,32 @@
 #ifdef SCANNERS
     { sizeof(struct scan_spacket), handleScan },	    /* SP_SCAN */
 #else
-    { 0, exit},
+    { 0, NULL },
 #endif
-    { sizeof(struct udp_reply_spacket), handleUdpReply },  /* SP_UDP_STAT */
+    { sizeof(struct udp_reply_spacket), handleUdpReply },   /* SP_UDP_STAT */
     { sizeof(struct sequence_spacket), handleSequence },    /* SP_SEQUENCE */
     { sizeof(struct sc_sequence_spacket), handleSequence }, /* SP_SC_SEQUENCE */
-#endif ATM
+#endif
 #ifdef RSA
-    { sizeof(struct rsa_key_spacket), handleRSAKey },     /* SP_RSA_KEY */
+    { sizeof(struct rsa_key_spacket), handleRSAKey },       /* SP_RSA_KEY */
 #else
-    { 0, exit}, /* #31, and exit won't really be called */
+    { 0, NULL }, /* #31 */
 #endif
-    { 0, exit},                                             /* 32 */
-    { 0, exit},                                             /* 33 */
-    { 0, exit},                                             /* 34 */
-    { 0, exit},                                             /* 35 */
-    { 0, exit},                                             /* 36 */
-    { 0, exit},                                             /* 37 */
-    { 0, exit},                                             /* 38 */
-    { 0, exit},                                             /* 39 */
-    { 0, exit},                                             /* 40 */
-    { 0, exit},                                             /* 41 */
-    { 0, exit},                                             /* 42 */
-    { 0, exit},                                             /* 43 */
-    { 0, exit},                                             /* 44 */
+    { 0, NULL },                                            /* 32 */
+    { 0, NULL },                                            /* 33 */
+    { 0, NULL },                                            /* 34 */
+    { 0, NULL },                                            /* 35 */
+    { 0, NULL },                                            /* 36 */
+    { 0, NULL },                                            /* 37 */
+    { 0, NULL },                                            /* 38 */
+    { 0, NULL },                                            /* 39 */
+    { 0, NULL },                                            /* 40 */
+    { 0, NULL },                                            /* 41 */
+    { 0, NULL },                                            /* 42 */
+    { 0, NULL },                                            /* 43 */
+    { 0, NULL },                                            /* 44 */
 #ifdef PING
-    { 0, exit},                                             /* 45 */
+    { 0, NULL },                                            /* 45 */
     { sizeof(struct ping_spacket),       handlePing },      /* SP_PING */
 #endif
     { sizeof(struct mastercomm_spacket), handleMasterComm },/* SP_MASTER_COMM */
@@ -173,7 +174,7 @@
 #endif
     sizeof(struct udp_req_cpacket),             /* CP_UDP_REQ */
     sizeof(struct sequence_cpacket),            /* CP_SEQUENCE */
-#endif ATM
+#endif
 #ifdef RSA
     sizeof(struct rsa_key_cpacket),           /* CP_RSA_KEY */
 #else
@@ -291,7 +292,7 @@
     FCHECK_TRACT(PFTRACT, fTractor, CP_TRACTOR);
     FCHECK_TRACT(PFPRESS, fRepress, CP_REPRESS);
 }
-#endif ATM
+#endif /* ATM */
 
 connectToServer(port)
 int port;
@@ -299,7 +300,7 @@
     int s;
     struct sockaddr_in addr;
     struct sockaddr_in naddr;
-    int len;
+    socklen_t addrlen;
     fd_set	readfds;
     struct timeval timeout;
     struct hostent	*hp;
@@ -325,11 +326,11 @@
     addr.sin_addr.s_addr = INADDR_ANY;
     addr.sin_port = htons(port);
 
-    if (bind(s, &addr, sizeof(addr)) < 0) {
+    if (bind(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
 	sleep(10);
-	if (bind(s, &addr, sizeof(addr)) < 0) {
+	if (bind(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
 	    sleep(10);
-	    if (bind(s, &addr, sizeof(addr)) < 0) {
+	    if (bind(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
 		printf("I can't bind to port!\n");
 		exit(3);
 	    }
@@ -338,7 +339,7 @@
 
     listen(s,1);
 
-    len=sizeof(naddr);
+    addrlen=sizeof(naddr);
 
 tryagain:
     timeout.tv_sec=240;	/* four minutes */
@@ -350,7 +351,7 @@
 	exit(0);
     }
 
-    sock=accept(s,&naddr,&len);
+    sock=accept(s,(struct sockaddr *)&naddr,&addrlen);
 
     if (sock==-1) {
 	extern int errno;
@@ -368,8 +369,8 @@
      * caller is, and set "serverName" and "serveraddr" appropriately.
      * (ATM)
      */
-    len = sizeof(struct sockaddr_in);
-    if (getpeername(sock, (struct sockaddr *) &addr, &len) < 0) {
+    addrlen = sizeof(struct sockaddr_in);
+    if (getpeername(sock, (struct sockaddr *) &addr, &addrlen) < 0) {
         perror("unable to get peername");
         serverName = "nowhere";
     } else {
@@ -435,10 +436,10 @@
         }
     }
 
-    if (connect(ns, &addr, sizeof(addr)) < 0) {
+    if (connect(ns, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
 #ifdef nodef
         printf("rwatch: I cannot connect through port %d\n", port);
-#endif nodef
+#endif
         close(ns);
         return 0;
     }
@@ -501,7 +502,7 @@
       printf("SO_SNDBUF: %d\n", optval);
       printf("optlen: %d\n", optlen);
    }
-#endif nodef
+#endif
 
 
     addr.sin_family = AF_INET;
@@ -518,9 +519,9 @@
 
 #ifdef ATM
     serveraddr = addr.sin_addr.s_addr;
-#endif ATM
+#endif
 
-    if (connect(s, &addr, sizeof(addr)) < 0) {
+    if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
 	printf("Server not listening!\n");
 	exit(0);
     }
@@ -547,7 +548,7 @@
 #ifdef ATM
     if(udpSock >= 0)
        FD_SET(udpSock, &readfds);
-#endif ATM
+#endif
     select(32,&readfds,0,0,&timeout);
 }
 
@@ -654,7 +655,7 @@
                     addr.sin_addr.s_addr = serveraddr;
                     addr.sin_port = htons(udpServerPort);
                     addr.sin_family = AF_INET;
-                    if (connect(udpSock, &addr, sizeof(addr)) < 0) {
+                    if (connect(udpSock, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
                         perror("connect");
                         UDPDIAG(("Unable to reconnect\n"));
                         /* and fall through to disconnect */
@@ -776,7 +777,7 @@
     if (select(32,&readfds,0,0,&timeout) != 0) {
 #ifdef DEBUG_SCK
 	_read_time = mtime(1);
-#endif DEBUG_SCK
+#endif
 	/* Read info from the xtrek server */
 
 	if(FD_ISSET(sock, &readfds){
@@ -877,7 +878,7 @@
     }
     return 0;
 }
-#endif ATM
+#endif
 
 handleTorp(packet)
 struct torp_spacket *packet;
@@ -889,7 +890,7 @@
 
 #ifdef DEBUG_SCK
     DEBUG_SOCKET("handleTorp");
-#endif DEBUG_SCK
+#endif
 
     thetorp= &torps[ntohs(packet->tnum)];
 
@@ -1004,7 +1005,7 @@
 	       torps_time[j->p_no]);
 	    torps_time[j->p_no] = mtime(1);
 	 }
-#endif TORP_TIME
+#endif
 	 p->fuel -= SH_TORPCOST(j);
 	 if(p->fuel < 0) p->fuel = 0;
 	 if(j == me){
@@ -1045,11 +1046,11 @@
 
 #ifdef TORP_TIME
     static int torps_time[MAXPLAYER];
-#endif TORP_TIME
+#endif
 
 #ifdef DEBUG_SCK
     DEBUG_SOCKET("handleTorpInfo");
-#endif DEBUG_SCK
+#endif
 
     thetorp= &torps[ntohs(packet->tnum)];
 
@@ -1057,7 +1058,7 @@
     if(packet->status == TEXPLODE && thetorp->t_status == TFREE){
       return;
    }
-#endif ATM
+#endif
 
     p = &_state.players[thetorp->t_owner];
     j = &players[thetorp->t_owner];
@@ -1078,7 +1079,7 @@
 	    torps_time[j->p_no]);
 	 torps_time[j->p_no] = mtime(1);
       }
-#endif TORP_TIME
+#endif
       p->fuel -= SH_TORPCOST(j);
       p->wpntemp += SH_TORPCOST(j)/10 - 10;
       if(p->fuel < 0) p->fuel = 0;
@@ -1114,7 +1115,7 @@
       j->p_ntorp--;
       /* torp damage handled in dodge.c */
     }
-#endif nodef
+#endif
 }
 
 handleStatus(packet)
@@ -1122,7 +1123,7 @@
 {
 #ifdef DEBUG_SCK
     DEBUG_SOCKET("handleStatus");
-#endif DEBUG_SCK
+#endif
     if(ignoreTMode) {
       status->tourn=1;
     } else {
@@ -1141,7 +1142,7 @@
 {
 #ifdef DEBUG_SCK
     DEBUG_SOCKET("handleSelf");
-#endif DEBUG_SCK
+#endif
     me= &players[packet->pnum];
     me_p = &_state.players[packet->pnum];
     myship = &(me->p_ship);
@@ -1164,7 +1165,7 @@
 #ifdef nodef    /* tmp */
     else
         me->p_tractor = -1;
-#endif nodef
+#endif
 #endif
 }
 
@@ -1207,7 +1208,7 @@
 
 #ifdef DEBUG_SCK
    DEBUG_SOCKET("handlePlayer");
-#endif DEBUG_SCK
+#endif
    pl= &players[packet->pnum];
    p = &_state.players[packet->pnum];
    if(_state.borg_detect){
@@ -1243,7 +1244,7 @@
 
 #ifdef TMP
    pl->p_updates = ntohl(packet->updates);
-#endif TMP
+#endif
    redrawPlayer[packet->pnum]=1;
 }
 
@@ -1314,13 +1315,13 @@
 {
 #ifdef DEBUG_SCK
     DEBUG_SOCKET("handleWarning");
-#endif DEBUG_SCK
+#endif
     warning(packet->mesg, 0);
 
 #ifdef nodef
     if(strncmp(packet->mesg, "Phasers", 7) == 0)
       _state.lastphaserreq = 0;
-#endif nodef
+#endif
 }
 
 sendShortPacket(type, state)
@@ -1373,7 +1374,7 @@
             }
         }
     }
-#endif ATM
+#endif
 }
 
 #ifdef ATM
@@ -1456,7 +1457,7 @@
             packets_sent ++;
 #endif
             V_UDPDIAG(("Sent %d on UDP port\n", packet->type));
-            if (gwrite(udpSock, packet, size) != size) {
+            if (gwrite(udpSock, (char *) packet, size) != size) {
                 UDPDIAG(("gwrite on UDP failed.  Closing UDP connection\n"));
                 warning("UDP link severed");
                 /*serverDead=1;*/
@@ -1477,7 +1478,7 @@
         }
     }
 }
-#endif ATM
+#endif
 
 handlePlanet(packet)
 struct planet_spacket *packet;
@@ -1486,7 +1487,7 @@
 
 #ifdef DEBUG_SCK
    DEBUG_SOCKET("handlePlanet");
-#endif DEBUG_SCK
+#endif
 
    plan= &planets[packet->pnum];
 
@@ -1540,7 +1541,7 @@
 
 #ifdef DEBUG_SCK
     DEBUG_SOCKET("handlePhaser");
-#endif DEBUG_SCK
+#endif
 }
 
 handleMessage(packet)
@@ -1548,7 +1549,7 @@
 {
 #ifdef DEBUG_SCK
     DEBUG_SOCKET("handleMessage");
-#endif DEBUG_SCK
+#endif
     if (packet->m_from >= MAXPLAYER) packet->m_from=255;
     dmessage(packet->mesg, packet->m_flags, packet->m_from, packet->m_recpt);
 }
@@ -1558,7 +1559,7 @@
 {
 #ifdef DEBUG_SCK
     DEBUG_SOCKET("handleQueue");
-#endif DEBUG_SCK
+#endif
     queuePos = ntohs(packet->pos);
 }
 
@@ -1579,7 +1580,7 @@
 {
 #ifdef DEBUG_SCK
     DEBUG_SOCKET("handlePickok");
-#endif DEBUG_SCK
+#endif
     pickOk=packet->state;
     mprintf("got pickOk = %d\n", pickOk);
 }
@@ -1606,7 +1607,7 @@
 {
 #ifdef DEBUG_SCK
     DEBUG_SOCKET("handleLogin");
-#endif DEBUG_SCK
+#endif
     loginAccept=packet->accept;
     if (packet->accept) {
 	bcopy(packet->keymap, mystats->st_keymap, 96);
@@ -1636,7 +1637,7 @@
         fTractor = pnum | 0x40;
     else
         fTractor = 0;
-#endif ATM
+#endif
 
 }
 
@@ -1656,7 +1657,7 @@
         fRepress = pnum | 0x40;
     else
         fRepress = 0;
-#endif ATM
+#endif
 
 }
 
@@ -1679,14 +1680,14 @@
 
 #ifdef DEBUG_SCK
     DEBUG_SOCKET("handlePlasmaInfo");
-#endif DEBUG_SCK
+#endif
    thetorp= &plasmatorps[ntohs(packet->pnum)];
 
 #ifdef ATM
    if(packet->status == PTEXPLODE && thetorp->pt_status == PTFREE){
       return;
    }
-#endif ATM
+#endif
 
    p = &_state.players[thetorp->pt_owner];
    j = &players[thetorp->pt_owner];
@@ -1721,7 +1722,7 @@
 
 #ifdef DEBUG_SCK
     DEBUG_SOCKET("handlePlasma");
-#endif DEBUG_SCK
+#endif
     thetorp= &plasmatorps[ntohs(packet->pnum)];
 
     /* plasmas seek */
@@ -1742,7 +1743,7 @@
    unsigned int		pflags;
 #ifdef DEBUG_SCK
     DEBUG_SOCKET("handleFlags");
-#endif DEBUG_SCK
+#endif
 
    j = &players[packet->pnum];
     redrawPlayer[packet->pnum]=1;
@@ -1772,7 +1773,7 @@
 #ifdef nodef
     else
         players[packet->pnum].p_tractor = -1;
-#endif nodef
+#endif
 #endif
 
 }
@@ -1782,7 +1783,7 @@
 {
 #ifdef DEBUG_SCK
     DEBUG_SOCKET("handleKills");
-#endif DEBUG_SCK
+#endif
     players[packet->pnum].p_kills=ntohl(packet->kills)/100.0;
     updatePlayer[packet->pnum]=1;
 }
@@ -1792,7 +1793,7 @@
 {
 #ifdef DEBUG_SCK
     DEBUG_SOCKET("handlePStatus");
-#endif DEBUG_SCK
+#endif
     if (packet->status==PEXPLODE) {
 	/*
 	printf("%s exploding.\n", players[packet->pnum].p_name);
@@ -1808,7 +1809,7 @@
     if (packet->status==PDEAD) {
       mprintf("%s dead.\n", players[packet->pnum].p_name);
     }
-#endif nodef
+#endif
 
     players[packet->pnum].p_status=packet->status;
     redrawPlayer[packet->pnum]=1;
@@ -1820,10 +1821,10 @@
 {
 #ifdef DEBUG_SCK
     DEBUG_SOCKET("handleMotd");
-#endif DEBUG_SCK
+#endif
 #ifdef nodef
     newMotdLine(packet->line);
-#endif nodef
+#endif
 }
 
 sendMessage(mes, group, indiv)
@@ -1844,7 +1845,7 @@
 {
 #ifdef DEBUG_SCK
     DEBUG_SOCKET("handleMask");
-#endif DEBUG_SCK
+#endif
     tournMask=packet->mask;
 }
 
@@ -1879,7 +1880,7 @@
     sockPack.version=(char) SOCKVERSION;
 #ifdef ATM
     sockPack.udp_version=(char) UDPVERSION;
-#endif ATM
+#endif
     sendServerPacket(&sockPack);
     /* Did we get new socket # sent? */
     if (serverDead) return;
@@ -1891,7 +1892,7 @@
 {
 #ifdef DEBUG_SCK
     DEBUG_SOCKET("handleBadVersion");
-#endif DEBUG_SCK
+#endif
     switch(packet->why) {
     case 0:
 	printf("Sorry, this is an invalid client version.\n");
@@ -1922,7 +1923,7 @@
 	        perror("write");
                 printUdpInfo();
             }
-#endif ATM
+#endif
             return(-1);
 	}
         bytes -= n;
@@ -1938,7 +1939,7 @@
 
 #ifdef DEBUG_SCK
     DEBUG_SOCKET("handleHostile");
-#endif DEBUG_SCK
+#endif
     updatePlayer[packet->pnum]=1;
     pl= &players[packet->pnum];
     pl->p_swar=packet->war;
@@ -1953,7 +1954,7 @@
 
 #ifdef DEBUG_SCK
     DEBUG_SOCKET("handlePlyrLogin");
-#endif DEBUG_SCK
+#endif
     updatePlayer[packet->pnum]=1;
     pl= &players[packet->pnum];
 
@@ -1983,7 +1984,7 @@
 
 #ifdef DEBUG_SCK
     DEBUG_SOCKET("handleStats");
-#endif DEBUG_SCK
+#endif
     updatePlayer[packet->pnum]=1;
     pl= &players[packet->pnum];
     pl->p_stats.st_tkills=ntohl(packet->tkills);
@@ -2009,7 +2010,7 @@
 
 #ifdef DEBUG_SCK
     DEBUG_SOCKET("handlePlyrInfo");
-#endif DEBUG_SCK
+#endif
     updatePlayer[packet->pnum]=1;
     pl= &players[packet->pnum];
     getship(&pl->p_ship, packet->shiptype);
@@ -2023,7 +2024,7 @@
 	calibrate_stats();
 	redrawTstats();
     }
-#endif nodef
+#endif
     redrawPlayer[packet->pnum]=1;
 }
 
@@ -2126,7 +2127,7 @@
 
 #ifdef DEBUG_SCK
     DEBUG_SOCKET("handlePlanetLoc");
-#endif DEBUG_SCK
+#endif
     pl= &planets[packet->pnum];
     pl->pl_x=ntohl(packet->x);
     pl->pl_y=ntohl(packet->y);
@@ -2145,11 +2146,11 @@
    /* TMP */
 #ifdef nodef
    testcl(packet, &response);
-#endif nodef
+#endif
 
 #ifdef DEBUG_SCK
     DEBUG_SOCKET("handleReserved");
-#endif DEBUG_SCK
+#endif
     if(_state.do_reserved)
        encryptReservedPacket(packet, &response, serverName, me->p_no);
     sendServerPacket(&response);
@@ -2175,7 +2176,7 @@
    packet.wtemp		= j->p_wtemp;
    packet.whydead	= j->p_whydead;
    packet.whodead	= j->p_whodead;
-#endif nodef
+#endif
 
    /* XXX */
 #ifdef VIS_TRACTOR
@@ -2195,7 +2196,7 @@
    int			s;
 {
    if(rsock != -1)
-      gwrite(rsock, p, s);
+      gwrite(rsock, (char *) p, s);
 }
 
 #ifdef SCANNERS
@@ -2414,7 +2415,7 @@
     }
 #ifdef nodef
     set_udp_opts(udpSock);
-#endif nodef
+#endif
 
     addr.sin_addr.s_addr = INADDR_ANY;
     addr.sin_family = AF_INET;
@@ -2433,7 +2434,7 @@
         }
 #endif
         addr.sin_port = htons(udpLocalPort);
-        if (bind(udpSock, &addr, sizeof(addr)) >= 0)
+        if (bind(udpSock, (struct sockaddr *) &addr, sizeof(addr)) >= 0)
             break;
     }
     if (attempts == MAX_PORT_RETRY) {
@@ -2489,7 +2490,8 @@
     struct timeval      to;
     struct sockaddr_in  from;
     struct sockaddr_in  addr;
-    int fromlen, res;
+    socklen_t		fromlen;
+    int res;
 
     bzero(&from, sizeof(from));         /* don't get garbage if really broken */
 
@@ -2517,7 +2519,7 @@
         }
     }
 
-    if (recvfrom(udpSock, _buf, BUFSIZ, 0, &from, &fromlen) < 0) {
+    if (recvfrom(udpSock, _buf, BUFSIZ, 0, (struct sockaddr *) &from, &fromlen) < 0) {
         perror("recvfrom");
         UDPDIAG(("recvfrom failed, aborting UDP attempt"));
         return (-1);
@@ -2540,7 +2542,7 @@
     }
 #endif
 
-    if (connect(udpSock, &from, sizeof(from)) < 0) {
+    if (connect(udpSock, (struct sockaddr *) &from, sizeof(from)) < 0) {
         perror("netrek: unable to connect UDP socket after recvfrom()");
         close(udpSock);
         udpSock = -1;
@@ -2568,17 +2570,17 @@
 printUdpInfo()
 {
     struct sockaddr_in addr;
-    int len;
+    socklen_t len;
 
     len = sizeof(addr);
-    if (getsockname(udpSock, &addr, &len) < 0) {
+    if (getsockname(udpSock, (struct sockaddr *) &addr, &len) < 0) {
 /*      perror("printUdpInfo: getsockname");*/
         return;
     }
     UDPDIAG(("LOCAL: addr=0x%x, family=%d, port=%d\n", addr.sin_addr.s_addr,
         addr.sin_family, ntohs(addr.sin_port)));
 
-    if (getpeername(udpSock, &addr, &len) < 0) {
+    if (getpeername(udpSock, (struct sockaddr *) &addr, &len) < 0) {
 /*      perror("printUdpInfo: getpeername");*/
         return;
     }
@@ -2649,7 +2651,7 @@
         recent_count = recent_dropped = 0;
     }
 }
-#endif ATM
+#endif
 
 
 handleMasterComm(packet)



From modemhero at users.sourceforge.net  Sat Apr 22 04:13:46 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 22 Apr 2006 09:13:46 +0000
Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.16,1.17
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18949/resources/docs

Modified Files:
	changes.txt 
Log Message:
Tidied up fed sb mono bitmaps.
Deleted repetitive code in parsemeta.h

Index: changes.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- changes.txt	21 Apr 2006 16:36:10 -0000	1.16
+++ changes.txt	22 Apr 2006 09:13:44 -0000	1.17
@@ -1,4 +1,5 @@
 Version TBA:
+- fixed the mono fed sb bitmaps so they rotate more cleanly
 - updated NetrekXP manual (in docs folder), removed old cow manuals.
 - all greyscale and shaded old color starbase bitmaps now rotate.
 - the new color fed starbase bitmaps now rotate.



From modemhero at users.sourceforge.net  Sat Apr 22 04:13:46 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 22 Apr 2006 09:13:46 +0000
Subject: [netrek-cvs] client/netrekxp/include parsemeta.h,1.1.1.1,1.2
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18949/include

Modified Files:
	parsemeta.h 
Log Message:
Tidied up fed sb mono bitmaps.
Deleted repetitive code in parsemeta.h

Index: parsemeta.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/parsemeta.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- parsemeta.h	21 Jan 2003 21:27:54 -0000	1.1.1.1
+++ parsemeta.h	22 Apr 2006 09:13:44 -0000	1.2
@@ -51,109 +51,3 @@
 
 #endif /* defined META */
 #endif /* defined meta_h_header */
-#ifndef meta_h_header
-#define meta_h_header
-#ifdef META
-
-/*
-   meta.h
-*/
-
-
-/* Global Variables */
-
-extern int num_servers;         /* The number of servers in the list */
-
-
-/* Function Definitions */
-
-void parsemeta (int metaType);
-/*
- * Read and Parse the meta-server information, either from the meta-
- * server (if metaType = 1) or from the cache (if metaType = 2).
- *  
- * NOTE: This function sets the variable "num_servers" which is
- * later used to decide the hight of the meta-server window.
- */
-
-
-void metawindow (void);
-/*
- *  Show the meta server menu window
- */
-
-
-void metaaction (W_Event * data);
-/*
- *  Recieve an action in the meta server window.  Check selection to see
- *  if was valid.  If it was then we have a winner!
- */
-
-
-void metainput (void);
-/*  
- *  Wait for actions in the meta-server window.
- *
- *  This is really the meta-server window's own little input() function.
- *  It is needed so we don't have to use all the bull in the main
- *  input(). Plus to use it I'd have to call mapAll() first and the client
- *  would read in the default server and then call it up before I can
- *  select a server.
- */
-
-
-#endif /* defined META */
-#endif /* defined meta_h_header */
-#ifndef meta_h_header
-#define meta_h_header
-#ifdef META
-
-/*
-   meta.h
-*/
-
-
-/* Global Variables */
-
-extern int num_servers;         /* The number of servers in the list */
-
-
-/* Function Definitions */
-
-void parsemeta (int metaType);
-/*
- * Read and Parse the meta-server information, either from the meta-
- * server (if metaType = 1) or from the cache (if metaType = 2).
- *  
- * NOTE: This function sets the variable "num_servers" which is
- * later used to decide the hight of the meta-server window.
- */
-
-
-void metawindow (void);
-/*
- *  Show the meta server menu window
- */
-
-
-void metaaction (W_Event * data);
-/*
- *  Recieve an action in the meta server window.  Check selection to see
- *  if was valid.  If it was then we have a winner!
- */
-
-
-void metainput (void);
-/*  
- *  Wait for actions in the meta-server window.
- *
- *  This is really the meta-server window's own little input() function.
- *  It is needed so we don't have to use all the bull in the main
- *  input(). Plus to use it I'd have to call mapAll() first and the client
- *  would read in the default server and then call it up before I can
- *  select a server.
- */
-
-
-#endif /* defined META */
-#endif /* defined meta_h_header */



From modemhero at users.sourceforge.net  Sat Apr 22 04:13:46 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 22 Apr 2006 09:13:46 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/mono/fed fed_sb02.bmp,
	1.1.1.1, 1.2 fed_sb03.bmp, 1.1.1.1, 1.2 fed_sb04.bmp, 1.1.1.1,
	1.2 fed_sb06.bmp, 1.1.1.1, 1.2 fed_sb07.bmp, 1.1.1.1,
	1.2 fed_sb08.bmp, 1.1.1.1, 1.2 fed_sb10.bmp, 1.1.1.1,
	1.2 fed_sb11.bmp, 1.1.1.1, 1.2 fed_sb12.bmp, 1.1.1.1,
	1.2 fed_sb13.bmp, 1.1.1.1, 1.2 fed_sb14.bmp, 1.1.1.1,
	1.2 fed_sb15.bmp, 1.1.1.1, 1.2 fed_sb16.bmp, 1.1.1.1,
	1.2 fed_sb18.bmp, 1.1.1.1, 1.2 fed_sb19.bmp, 1.1.1.1,
	1.2 fed_sb20.bmp, 1.1.1.1, 1.2 fed_sb21.bmp, 1.1.1.1,
	1.2 fed_sb22.bmp, 1.1.1.1, 1.2 fed_sb23.bmp, 1.1.1.1,
	1.2 fed_sb24.bmp, 1.1.1.1, 1.2 fed_sb26.bmp, 1.1.1.1,
	1.2 fed_sb27.bmp, 1.1.1.1, 1.2 fed_sb28.bmp, 1.1.1.1,
	1.2 fed_sb29.bmp, 1.1.1.1, 1.2 fed_sb30.bmp, 1.1.1.1,
	1.2 fed_sb31.bmp, 1.1.1.1, 1.2 fed_sb32.bmp, 1.1.1.1, 1.2
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/mono/fed
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18949/resources/ships/mono/fed

Modified Files:
	fed_sb02.bmp fed_sb03.bmp fed_sb04.bmp fed_sb06.bmp 
	fed_sb07.bmp fed_sb08.bmp fed_sb10.bmp fed_sb11.bmp 
	fed_sb12.bmp fed_sb13.bmp fed_sb14.bmp fed_sb15.bmp 
	fed_sb16.bmp fed_sb18.bmp fed_sb19.bmp fed_sb20.bmp 
	fed_sb21.bmp fed_sb22.bmp fed_sb23.bmp fed_sb24.bmp 
	fed_sb26.bmp fed_sb27.bmp fed_sb28.bmp fed_sb29.bmp 
	fed_sb30.bmp fed_sb31.bmp fed_sb32.bmp 
Log Message:
Tidied up fed sb mono bitmaps.
Deleted repetitive code in parsemeta.h

Index: fed_sb08.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/mono/fed/fed_sb08.bmp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvswQIVPa and /tmp/cvseZGPoa differ

Index: fed_sb12.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/mono/fed/fed_sb12.bmp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsX2lJXc and /tmp/cvsIhN1Bc differ

Index: fed_sb22.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/mono/fed/fed_sb22.bmp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvshre39h and /tmp/cvsyhJYVh differ

Index: fed_sb32.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/mono/fed/fed_sb32.bmp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsg0pKEk and /tmp/cvsNh8Ywk differ

Index: fed_sb31.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/mono/fed/fed_sb31.bmp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvslDr7Dn and /tmp/cvsHvXWDn differ

Index: fed_sb30.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/mono/fed/fed_sb30.bmp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsBnbaTo and /tmp/cvsrDRL1o differ

Index: fed_sb02.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/mono/fed/fed_sb02.bmp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvso7IhBx and /tmp/cvsCnKq0x differ

Index: fed_sb15.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/mono/fed/fed_sb15.bmp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvs7HunHB and /tmp/cvsIcoUgC differ

Index: fed_sb19.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/mono/fed/fed_sb19.bmp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsAHC9iL and /tmp/cvs1Qj3mM differ

Index: fed_sb10.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/mono/fed/fed_sb10.bmp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsQzO6TT and /tmp/cvsYxyUdV differ

Index: fed_sb07.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/mono/fed/fed_sb07.bmp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvs5gXa4V and /tmp/cvs32QrtX differ

Index: fed_sb04.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/mono/fed/fed_sb04.bmp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsGEDdBY and /tmp/cvsTnry6Z differ

Index: fed_sb28.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/mono/fed/fed_sb28.bmp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvstpn1d0 and /tmp/cvsHborT1 differ

Index: fed_sb23.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/mono/fed/fed_sb23.bmp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsScA4A2 and /tmp/cvsqMNUm4 differ

Index: fed_sb20.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/mono/fed/fed_sb20.bmp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsnQF3b8 and /tmp/cvsicDL59 differ

Index: fed_sb29.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/mono/fed/fed_sb29.bmp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsdf15y9 and /tmp/cvsEwPDCb differ

Index: fed_sb24.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/mono/fed/fed_sb24.bmp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsA5pfte and /tmp/cvseoOfJg differ

Index: fed_sb16.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/mono/fed/fed_sb16.bmp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsEEwHWj and /tmp/cvslRBgkm differ

Index: fed_sb26.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/mono/fed/fed_sb26.bmp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvs9Dcn3m and /tmp/cvs5d0dzp differ

Index: fed_sb18.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/mono/fed/fed_sb18.bmp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsiFyq4f and /tmp/cvsROwlMi differ

Index: fed_sb27.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/mono/fed/fed_sb27.bmp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsrSSrao and /tmp/cvsNSdm7q differ

Index: fed_sb11.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/mono/fed/fed_sb11.bmp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvs1d6Tar and /tmp/cvs6pMsfu differ

Index: fed_sb21.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/mono/fed/fed_sb21.bmp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsif3jGr and /tmp/cvsilHIRu differ

Index: fed_sb06.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/mono/fed/fed_sb06.bmp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsO0nkmy and /tmp/cvsAAw6IB differ

Index: fed_sb03.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/mono/fed/fed_sb03.bmp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsp8T8Bz and /tmp/cvsGRqI7C differ

Index: fed_sb13.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/mono/fed/fed_sb13.bmp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvshubHvH and /tmp/cvsC75JfL differ

Index: fed_sb14.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/ships/mono/fed/fed_sb14.bmp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsmBMwtK and /tmp/cvsFlj5kO differ



From quozl at users.sourceforge.net  Sat Apr 22 06:31:55 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sat, 22 Apr 2006 11:31:55 +0000
Subject: [netrek-cvs] server/Vanilla/ntserv Makefile.in, 1.4, 1.5 commands.c,
	1.2, 1.3 data.c, 1.3, 1.4 gencmds.c, 1.1, 1.2 main.c, 1.5,
	1.6 socket.c, 1.6, 1.7
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/ntserv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv693/ntserv

Modified Files:
	Makefile.in commands.c data.c gencmds.c main.c socket.c 
Log Message:
libnetrek.a

Index: Makefile.in
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.in	10 Apr 2006 10:56:31 -0000	1.4
+++ Makefile.in	22 Apr 2006 11:31:53 -0000	1.5
@@ -1,5 +1,3 @@
-#	Change CONFIG to your .mk file
-
 VPATH = @srcdir@
 srcdir = @srcdir@
 
@@ -11,25 +9,41 @@
 INSTALLPROG = @INSTALL_PROGRAM@
 INSTALLDATA = @INSTALL_DATA@
 
-#	Do not edit below here. Everything should be setup in config
+#	libnetrek object files
+
+L_OBJS = bay.o \
+	coup.o \
+	data.o db.o detonate.o distress.o \
+	enter.o \
+	feature.o features.o \
+	gencmds.o genspkt.o getpath.o getship.o glog.o \
+	interface.o \
+	ltd_stats.o \
+	openmem.o orbit.o \
+	phaser.o ping.o plasma.o \
+	rsa_key.o reserved.o \
+	salt.o slotmaint.o sintab.o smessage.o socket.o startrobot.o sysdefaults.o \
+	torp.o transwarp.o \
+	util.o \
+	warning.o
 
 #	ntserv object files
 
-R_OBJS =    cluecheck.o coup.o data.o db.o death.o detonate.o enter.o \
-	    findslot.o  getentry.o  getname.o  salt.o getship.o  input.o \
+R_OBJS =    cluecheck.o coup.o db.o death.o detonate.o enter.o \
+	    findslot.o  getentry.o  getname.o  getship.o  input.o \
 	    interface.o  main.o  orbit.o  phaser.o  plasma.o  redraw.o \
 	    reserved.o  sintab.o  socket.o  genspkt.o  smessage.o  \
 	    startrobot.o  sysdefaults.o  timecheck.o  torp.o  util.o  \
-	    warning.o ping.o $(RANDOMO) getpath.o $(STRDUPO) features.o \
+	    warning.o ping.o $(RANDOMO) $(STRDUPO) features.o \
 	    distress.o transwarp.o gencmds.o ntscmds.o openmem.o feature.o \
-	    queue.o slotmaint.o rsa_key.o ltd_stats.o bay.o
+	    queue.o slotmaint.o rsa_key.o ltd_stats.o libnetrek.a
 
 
 #	daemonII object files
 
-D_OBJS =    daemonII.o  sintab.o  sysdefaults.o  data.o  slotmaint.o \
-	    util.o  $(RANDOMO) getpath.o getship.o smessage.o  queue.o \
-	    wander2.o openmem.o solicit.o ltd_stats.o bay.o
+D_OBJS =    daemonII.o  sintab.o  sysdefaults.o  slotmaint.o \
+	    util.o  $(RANDOMO) getship.o smessage.o  queue.o \
+	    wander2.o openmem.o solicit.o ltd_stats.o libnetrek.a
 
 #	Src files
 
@@ -48,15 +62,14 @@
             ${srcdir}/features.c ${srcdir}/distress.c ${srcdir}/transwarp.c \
             ${srcdir}/gencmds.c ${srcdir}/ntscmds.c ${srcdir}/openmem.c \
             ${srcdir}/feature.c ${srcdir}/queue.c ${srcdir}/slotmaint.c \
-            ${srcdir}/wander2.c ${srcdir}/sysdefaults.c ${srcdir}/rsa_key.c \
-            ${srcdir}/bay.c
+            ${srcdir}/wander2.c ${srcdir}/sysdefaults.c ${srcdir}/rsa_key.c
 
 SRC = 	    $(R_FILES)  data.h  defs.h planets.h  struct.h \
 	    packets.h  copyright.h
 
 LIBS = $(RSA_LIB) $(EXTRALIBS)
 
-INCS = $(RSA_INCS) $(EXTRAINCS) -I. -I${srcdir} -I../include -I${srcdir}/../include
+INCS = $(RSA_INCS) $(EXTRAINCS) -I../include
 
 CFLAGS = $(FLAGS) $(INCS)
 
@@ -71,6 +84,13 @@
 daemonII: $(PMAKE) $(D_OBJS)
 	$(CC) $(CFLAGS) ${LDFLAGS} -o daemonII $(D_OBJS) $(EXTRALIBS)
 
+libnetrek.a: $(L_OBJS)
+	ar cru $@ $(L_OBJS)
+	ranlib $@
+
+libnetrek.so: $(L_OBJS)
+	gcc -shared -Wl,-soname,$@ -o $@ $(L_OBJS) -lc
+
 commands.o: $(PMAKE) ${srcdir}/commands.c
 	$(CC) $(CFLAGS) $(DEP) -c ${srcdir}/commands.c
 
@@ -88,12 +108,11 @@
 	ling $(LINTFLAGS) $(SRC)
 
 clean: rmdependencies
-	/bin/rm -f *.o *.ln make.out core
+	/bin/rm -f *.a *.o *.ln make.out core
 
 reallyclean:  clean
 	rm -f ntserv daemonII .motd *~ #*#
 
-
 uninstall:
 	-cd $(XTREKDIR); rm -f daemonII .motd .sysdef; rm -rf slots
 	-cd $(LIBDIR); rm -f ntserv ; rm -rf slots

Index: data.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/data.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- data.c	27 Sep 2005 12:26:37 -0000	1.3
+++ data.c	22 Apr 2006 11:31:53 -0000	1.4
@@ -26,11 +26,7 @@
 
 int	oldalert = PFGREEN;	/* Avoid changing more than we have to */
 
-#ifdef XSG
-int     remap[16] = { 0, 1, 2, 0, 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0 };
-#else
 int 	remap[9] = { 0, 1, 2, -1, 3, -1, -1, -1, 4 };
-#endif
 int	reality = 10;		/* reality updates per second */
 int	minskip = 10;		/* maximum client updates per second */
 int	defskip = 5;		/* default client updates per second */
@@ -409,3 +405,4 @@
 int remoteaddr = -1;		/* inet address in net format */
 int whitelisted = 0;
 int blacklisted = 0;
+int ignored[MAXPLAYER];

Index: commands.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/commands.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- commands.c	22 Apr 2006 02:16:46 -0000	1.2
+++ commands.c	22 Apr 2006 11:31:53 -0000	1.3
@@ -1080,7 +1080,6 @@
     char *current;
     int pcount=0;  /* Total players in game */
     int vcount=0;  /* Number who've voted recently */
-    FILE *glog;
     int mflag = 0;
     int sendto = 0;
 
@@ -1094,22 +1093,19 @@
 #endif
 
     if ( votes[num].tag & VC_GLOG ){
-      if (!(glog = fopen(GodLog,"a")) )       /* Log votes for God to see */
-        perror(GodLog);
-      else {
+      if (glog_open() == 0) {	/* Log votes for God to see */
         time_t    t = time(NULL);
         char      tbuf[40];
         struct tm *tmv = localtime(&t);
       
 #ifdef STRFTIME
-      sprintf(tbuf, "%02d/%02d %d/%d", tmv->tm_hour,tmv->tm_min,
-              tmv->tm_mday,tmv->tm_mon);
+	sprintf(tbuf, "%02d/%02d %d/%d", tmv->tm_hour,tmv->tm_min,
+		tmv->tm_mday,tmv->tm_mon);
 #else
 	strftime(tbuf, 39, "%R %D", tmv);
 #endif
-        fprintf(glog, "VOTE: %s %s@%s \"%s\"\n", tbuf, players[who].p_login, 
-		players[who].p_monitor, comm);
- 	fclose(glog);
+        glog_printf("VOTE: %s %s@%s \"%s\"\n", tbuf, players[who].p_login, 
+		    players[who].p_ip, comm);
       }
     }
 
@@ -1184,11 +1180,8 @@
       pmessage(sendto, mflag, addr_mess(sendto,mflag), 
              "The motion %s passes", current);
       if ( votes[num].tag & VC_GLOG ){
-        if (!(glog = fopen(GodLog,"a")) )       /* Log pass for God to see */
-          perror(GodLog);
-        else {
- 	  fprintf(glog, "VOTE: The motion %s passes\n", current);
-	  fclose(glog);
+        if (glog_open() == 0) {	/* Log pass for God to see */
+ 	  glog_printf("VOTE: The motion %s passes\n", current);
 	}
       }
       

Index: main.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- main.c	10 Apr 2006 10:38:22 -0000	1.5
+++ main.c	22 Apr 2006 11:31:53 -0000	1.6
@@ -44,9 +44,7 @@
 static void printStats(void);
 static int checkbanned(char *login, char *host);
 
-
-int ignored[MAXPLAYER];	/* change 7/24/91 TC */
-
+extern int ignored[MAXPLAYER];
 int indie = 0;			/* always be indie 8/28/91 TC */
 int living = 1;			/* our ship is living, reset by death */
 
@@ -232,6 +230,7 @@
     else
 	STRNCPY(login, "Bozo", NAME_LEN);
     login[NAME_LEN - 1] = '\0';
+    endpwent();
 
     strcpy(pseudo, "Guest");
 

Index: gencmds.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/gencmds.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gencmds.c	21 Mar 2005 05:23:43 -0000	1.1
+++ gencmds.c	22 Apr 2006 11:31:53 -0000	1.2
@@ -49,7 +49,6 @@
 {
   int i, len;
   char *comm;
-  FILE *glog;
 
   if (!(mess->m_flags & MINDIV)) return 0;	/* double-check */
 
@@ -89,10 +88,7 @@
       /* Record vote in GodLog if C_GLOG is set */
       if (cmds[i].tag & C_GLOG )
       {
-	if (!(glog = fopen(GodLog,"a")) )       /* Log votes for God to see */
-	  perror(GodLog);
-	else
-	{
+	if (glog_open() == 0) {	/* Log votes for God to see */
 	  time_t    t = time(NULL);
 	  char      tbuf[40];
 	  struct tm *tmv = localtime(&t);
@@ -103,10 +99,9 @@
 #else
 	  strftime(tbuf, 39, "%R %D", tmv);
 #endif
-	  fprintf(glog, "VOTE: %s %s@%s \"%s\"\n", tbuf,
+	  glog_printf("VOTE: %s %s@%s \"%s\"\n", tbuf,
 		  players[mess->m_from].p_login, 
 		  players[mess->m_from].p_monitor, comm);
-	  fclose(glog);
 	}
       } /* !C_GLOG */
 
@@ -117,12 +112,8 @@
 	{
 	  if ( cmds[i].tag & C_GLOG ) {
 
-	    if (!(glog = fopen(GodLog,"a")) )       /* Log pass for God to see */
-	      perror(GodLog);
-	    else
-	    {
-	      fprintf(glog, "VOTE: The motion %s passes\n", comm);
-	      fclose(glog);
+	    if (glog_open() == 0) {	/* Log pass for God to see */
+	      glog_printf("VOTE: The motion %s passes\n", comm);
 	    }
           }
 	}

Index: socket.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/socket.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- socket.c	22 Apr 2006 02:16:46 -0000	1.6
+++ socket.c	22 Apr 2006 11:31:53 -0000	1.7
@@ -300,7 +300,7 @@
 #define MAX_NONFAT	10		/* if we have this much left, stop */
 
 #ifdef CHECKMESG
-static FILE	*mlog, *glog;
+static FILE	*mlog;
 #endif
 
 /*int           send_short        = 0;*/ /* is now in data.c , because of robotII.c */
@@ -507,10 +507,7 @@
 	if (!mlog) mlog = fopen(MesgLog, "a");
 	if (!mlog) perror(MesgLog);
     }
-    if (loggod) {
-	if (!glog) glog = fopen(GodLog,"a");
-	if (!glog) perror(GodLog);
-    }
+    if (loggod) glog_open();
 #endif
 
     clientDead=0;
@@ -627,10 +624,7 @@
 	if(!mlog) mlog = fopen(MesgLog, "a");
 	if(!mlog) perror(MesgLog);
     }
-    if(loggod){
-	if(!glog) glog = fopen(GodLog, "a");
-	if(!glog) perror(GodLog);
-    }
+    if (loggod) glog_open();
 #endif
 
     if(commMode == COMM_UDP) addSequenceFlags(udpbuf);
@@ -1844,8 +1838,8 @@
     if (packet->mesg[0] != '@')
 	return FALSE;
 
+    /* FIXME: never freed */
     version = (char *)strdup(INDEX(packet->mesg,'@')+1);
-    version[strlen(version)] = '\0';
     return TRUE;
 }
 
@@ -2841,12 +2835,9 @@
 		      (packet->group & MGOD))){
 	    static int counter = 0;
 
-	    if(!glog) {
-		ERROR(1,( "ntserv: ERROR, null glog file descriptor\n"));
-		return 0;
-	    }
-	    fprintf(glog, "%s\n", buf);
-	    fflush(glog);
+	    if(glog_open() != 0) return;
+	    glog_printf("%s\n", buf);
+	    glog_flush();
 	    counter++;
 
 	    /* response */



From quozl at users.sourceforge.net  Sat Apr 22 06:31:55 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sat, 22 Apr 2006 11:31:55 +0000
Subject: [netrek-cvs] server/Vanilla/robots Makefile.in, 1.3, 1.4 detonate.c,
	1.1, 1.2 roboshar.c, 1.1, 1.2
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/robots
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv693/robots

Modified Files:
	Makefile.in detonate.c roboshar.c 
Log Message:
libnetrek.a

Index: Makefile.in
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robots/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.in	10 Apr 2006 10:56:33 -0000	1.3
+++ Makefile.in	22 Apr 2006 11:31:53 -0000	1.4
@@ -1,103 +1,61 @@
-# Change CONFIG to the .mk file that matches your system
-
 CONFIG = system.mk
 VPATH = @srcdir@
 srcdir = @srcdir@
 
-# Do Not Change anything below this line. It should be setup in config
-
 include ../$(CONFIG)
 
 INSTALL = @INSTALL@
 INSTALLPROG = @INSTALL_PROGRAM@
 INSTALLDATA = @INSTALL_DATA@
 
-# this is for revised ntserv/struct.h
-
-CFLAGS = $(EXTRAINCS) $(FLAGS) -DROBOT -I. -I${srcdir} -I../include -I${srcdir}/../include
+CFLAGS = $(EXTRAINCS) $(FLAGS) -DROBOT -I. -I../include
 
 LIBS = $(EXTRALIBS)
 
 TOOLDIR= $(LIBDIR)/tools
 
-GETPATH = getpath.o ../ntserv/data.o
-
 LINTFLAGS = -habxc $(EXTRAINCS) $(FLAGS)
 
-#	Common Objects
-
-C_OBJS = ../ntserv/data.o detonate.o  enter.o ../ntserv/getship.o interface.o \
-	../ntserv/orbit.o ../ntserv/phaser.o ../ntserv/sintab.o \
-	../ntserv/openmem.o  sysdefaults.o ../ntserv/torp.o  \
-	../ntserv/util.o $(RANDOMO) ../ntserv/getpath.o ../ntserv/smessage.o \
-	roboshar.o ../ntserv/slotmaint.o ../ntserv/distress.o \
-	../ntserv/ltd_stats.o ../ntserv/bay.o 
-
-#	Puck Objects
-
-PUCK_OBJS = puck.o  puckmove.o commands_puck.o $(C_OBJS)
-
-#	Mars (dogfighter) Objects
-
-M_OBJS = mars.o marsmove.o commands_mars.o $(C_OBJS)
-
-#	Robot Objects
-
-R_OBJS = robotII.o rmove.o commands.o $(C_OBJS)
-
-#       basepractice object files
-
-B_OBJS = basep.o commands_basep.o $(C_OBJS)  
-
-#       newbie server object files
-
-N_OBJS = newbie.o commands_newbie.o $(C_OBJS)
-
-#       pre-T server object files
-
-P_OBJS = pret.o commands_pret.o $(C_OBJS)
-
-#	INL Objects
-
-I_OBJS = inl.o inlcomm.o inlcmds.o gencmds.o $(C_OBJS)
-
+C_OBJS = $(RANDOMO) roboshar.o ../ntserv/libnetrek.a
 
-SRCS = ${srcdir}/puck.c ${srcdir}/puckmove.c ${srcdir}/mars.c \
-	${srcdir}/marsmove.c ${srcdir}/robotII.c ${srcdir}/rmove.c \
-	${srcdir}/../ntserv/getpath.c ${srcdir}/../ntserv/data.c \
-	${srcdir}/detonate.c  ${srcdir}/../ntserv/enter.c \
-	${srcdir}/../ntserv/getship.c  ${srcdir}/../ntserv/interface.c \
-	${srcdir}/../ntserv/orbit.c  ${srcdir}/../ntserv/phaser.c \
-	${srcdir}/../ntserv/sintab.c ${srcdir}/../ntserv/openmem.c \
-	${srcdir}/../ntserv/sysdefaults.c ${srcdir}/../ntserv/torp.c \
-	${srcdir}/../ntserv/util.c $(RANDOMC) ${srcdir}/../ntserv/commands.c \
-	${srcdir}/../ntserv/smessage.c ${srcdir}/basep.c  ${srcdir}/../ntserv/wander2.c \
-	${srcdir}/newbie.c ${srcdir}/inl.c ${srcdir}/inlcomm.c \
-	${srcdir}/../ntserv/slotmaint.c ${srcdir}/inlcmds.c \
-	${srcdir}/../ntserv/gencmds.c ${srcdir}/pret.c
+SRCS = ${srcdir}/puck.c ${srcdir}/puckmove.c \
+	${srcdir}/mars.c ${srcdir}/marsmove.c \
+	${srcdir}/robotII.c ${srcdir}/rmove.c \
+	$(RANDOMC) ${srcdir}/../ntserv/commands.c \
+	${srcdir}/basep.c \
+	${srcdir}/newbie.c \
+	${srcdir}/inl.c ${srcdir}/inlcomm.c ${srcdir}/inlcmds.c \
+	${srcdir}/pret.c
 
 EXECS =	puck mars robotII basep newbie inl pret
 
 all: $(PMAKE) $(EXECS)
 
+PUCK_OBJS = puck.o puckmove.o commands_puck.o $(C_OBJS)
 puck: $(PMAKE) $(PUCK_OBJS)
 	$(CC) $(CFLAGS)  ${LDFLAGS} -o puck $(PUCK_OBJS) $(EXTRALIBS)
 
+M_OBJS = mars.o marsmove.o commands_mars.o $(C_OBJS)
 mars: $(PMAKE) $(M_OBJS)
 	$(CC) $(CFLAGS)  ${LDFLAGS} -o mars $(M_OBJS) $(EXTRALIBS)
 
+R_OBJS = robotII.o rmove.o commands.o $(C_OBJS)
 robotII: $(PMAKE) $(R_OBJS)
 	$(CC) $(CFLAGS)  ${LDFLAGS} -o robotII  $(R_OBJS) $(EXTRALIBS)
 
+B_OBJS = basep.o commands_basep.o $(C_OBJS)  
 basep: $(PMAKE) $(B_OBJS)
 	$(CC) $(CFLAGS)  ${LDFLAGS} -o basep $(B_OBJS) $(EXTRALIBS)
 
+N_OBJS = newbie.o commands_newbie.o $(C_OBJS)
 newbie: $(PMAKE) $(N_OBJS)
 	$(CC) $(CFLAGS)  ${LDFLAGS} -o newbie $(N_OBJS) $(EXTRALIBS)
 
+P_OBJS = pret.o commands_pret.o $(C_OBJS)
 pret: $(PMAKE) $(P_OBJS)
 	$(CC) $(CFLAGS)  ${LDFLAGS} -o pret $(P_OBJS) $(EXTRALIBS)
 
+I_OBJS = inl.o inlcomm.o inlcmds.o $(C_OBJS)
 inl: $(PMAKE) $(I_OBJS)
 	$(CC) $(CFLAGS)  ${LDFLAGS} -o inl $(I_OBJS) $(EXTRALIBS)
 
@@ -107,18 +65,6 @@
 commands_puck.o: $(PMAKE) ${srcdir}/../ntserv/commands.c
 	$(CC) $(CFLAGS) $(DEP) -DPUCK -c ${srcdir}/../ntserv/commands.c -o commands_puck.o
 
-gencmds.o: $(PMAKE) ${srcdir}/../ntserv/gencmds.c
-	$(CC) $(CFLAGS) $(DEP) -c ${srcdir}/../ntserv/gencmds.c
-
-sysdefaults.o: $(PMAKE) ${srcdir}/../ntserv/sysdefaults.c
-	$(CC) $(CFLAGS) $(DEP) -c ${srcdir}/../ntserv/sysdefaults.c
-
-interface.o: $(PMAKE) ${srcdir}/../ntserv/interface.c
-	$(CC) $(CFLAGS) $(DEP) -c ${srcdir}/../ntserv/interface.c
-
-enter.o: $(PMAKE) ${srcdir}/../ntserv/enter.c
-	$(CC) $(CFLAGS) $(DEP) -c ${srcdir}/../ntserv/enter.c
-
 commands.o: $(PMAKE) ${srcdir}/../ntserv/commands.c
 	$(CC) $(CFLAGS) $(DEP) -c ${srcdir}/../ntserv/commands.c -o commands.o
 
@@ -149,9 +95,6 @@
 	$(INSTALLPROG) $(INSTALLOPTS) ${srcdir}/end_tourney.pl $(DESTDIR)$(LIBDIR)/end_tourney.pl
 	$(INSTALLPROG) $(INSTALLOPTS) ${srcdir}/auto-archive.pl $(DESTDIR)$(LIBDIR)/auto-archive.pl
 
-updated: update.o ../ntserv/data.o getpath.o
-	$(CC) $(CFLAGS) -o updated  update.o data.o getpath.o $(EXTRALIBS)
-
 lint: $(SRCS)
 	lint $(LINTFLAGS) -u $?
 	touch lint

Index: roboshar.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robots/roboshar.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- roboshar.c	21 Mar 2005 05:23:46 -0000	1.1
+++ roboshar.c	22 Apr 2006 11:31:53 -0000	1.2
@@ -157,3 +157,13 @@
     return((u_char) nint((atan2((double) (x2 - x1),
         (double) (y1 - y2)) / M_PI * 128.)));
 }
+
+/*
+ * Null client packet sending function for ntserv specific code in
+ * enter.c and interface.c so that we can avoid compiling it in the
+ * robots directory, and use libnetrek instead.
+ */
+void sendClientPacket(void *ignored)
+{
+  return;
+}

Index: detonate.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robots/detonate.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- detonate.c	21 Mar 2005 05:23:46 -0000	1.1
+++ detonate.c	22 Apr 2006 11:31:53 -0000	1.2
@@ -1,3 +1,5 @@
+/* apparently obsolete, use ntserv/detonate.c */
+
 /*
  * detonate.c
  */
@@ -5,7 +7,6 @@
 
 #include 
 #include 
-#include 
 #include "defs.h"
 #include "struct.h"
 #include "data.h"
@@ -15,8 +16,7 @@
             (((a)->p_team == (b)->p_team) && !((a)->p_flags & PFPRACTR))
 
 
-void
-detothers ()
+void detothers ()
 {
   int dx, dy;
   struct player *j;



From quozl at users.sourceforge.net  Sat Apr 22 06:31:55 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sat, 22 Apr 2006 11:31:55 +0000
Subject: [netrek-cvs] server/Vanilla/xsg Makefile.in,1.2,1.3
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/xsg
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv693/xsg

Modified Files:
	Makefile.in 
Log Message:
libnetrek.a

Index: Makefile.in
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/xsg/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.in	21 Mar 2005 10:17:19 -0000	1.2
+++ Makefile.in	22 Apr 2006 11:31:53 -0000	1.3
@@ -18,42 +18,37 @@
 			defs.h oldbitmaps.h patchlevel.h struct.h version.h \
 			localdata.h
 
-SRCS =	${srcdir}/colors.c ${srcdir}/../ntserv/data.c ${srcdir}/defaults.c \
-	${srcdir}/dmessage.c ${srcdir}/../ntserv/getship.c \
+SRCS =	${srcdir}/colors.c ${srcdir}/defaults.c \
+	${srcdir}/dmessage.c \
 	${srcdir}/inform.c ${srcdir}/input.c ${srcdir}/main.c \
 	${srcdir}/modify.c ${srcdir}/newwin.c ${srcdir}/option.c \
 	${srcdir}/planetlist.c ${srcdir}/planets.c ${srcdir}/playerlist.c \
 	${srcdir}/redraw.c ${srcdir}/robotwin.c ${srcdir}/shmem.c \
 	${srcdir}/sintab.c ${srcdir}/smessage.c ${srcdir}/stats.c \
 	${srcdir}/util.c ${srcdir}/war.c ${srcdir}/warning.c \
-	${srcdir}/x11window.c ${srcdir}/localdata.c \
-	${srcdir}/../ntserv/getpath.c ${srcdir}/../ntserv/distress.c \
-	${srcdir}/../ntserv/slotmaint.c ${srcdir}/../ntserv/ltd_stats.c
+	${srcdir}/x11window.c ${srcdir}/localdata.c
 
-OBJS =	colors.o data.o defaults.o dmessage.o ../ntserv/getship.o inform.o \
-	input.o main.o modify.o newwin.o option.o planetlist.o planets.o \
-	playerlist.o redraw.o robotwin.o shmem.o sintab.o smessage.o stats.o \
-	util.o war.o warning.o x11window.o localdata.o ../ntserv/getpath.o \
-	../ntserv/distress.o ../ntserv/slotmaint.o ../ntserv/ltd_stats.o
+OBJS = colors.o defaults.o dmessage.o inform.o input.o localdata.o \
+	main.o modify.o newwin.o option.o planetlist.o planets.o playerlist.o \
+	redraw.o robotwin.o shmem.o sintab.o smessage.o stats.o util.o war.o \
+	warning.o x11window.o ../ntserv/libnetrek.a
 
 LIBS = $(X11LIB) $(EXTRALIBS)
-INCS = $(EXTRAINCS) $(X11INCLUDE)
+INCS = $(EXTRAINCS)
 
-CFLAGS = $(EXTRACFLAGS) $(FLAGS) ${INCS} -I. -I${srcdir} -I../include -I${srcdir}/../include
+CFLAGS = $(EXTRACFLAGS) $(FLAGS) ${INCS} -I../include
 
 all: xsg
 
 xsg: $(OBJS)
 	$(CC) $(CFLAGS) ${LDFLAGS} -o $@ $(OBJS) $(LIBS)
 
-# data.c has an ifdef XSG in it, it must be recompiled here.
-
-data.o:	${srcdir}/../ntserv/data.c
-	$(CC) $(CFLAGS) -c ${srcdir}/../ntserv/data.c
+x11window.o: x11window.c
+	$(CC) $(CFLAGS) $(X11INCLUDE) -c -o $@ $<
 
 clean:
 	/bin/rm -f *.o make.out core
-        
+
 reallyclean:  clean 
 	/bin/rm -f xsg #* *~
 



From quozl at users.sourceforge.net  Sat Apr 22 06:31:55 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sat, 22 Apr 2006 11:31:55 +0000
Subject: [netrek-cvs] server/Vanilla/pledit Makefile.in,1.2,1.3
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/pledit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv693/pledit

Modified Files:
	Makefile.in 
Log Message:
libnetrek.a

Index: Makefile.in
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/pledit/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.in	21 Mar 2005 10:17:17 -0000	1.2
+++ Makefile.in	22 Apr 2006 11:31:53 -0000	1.3
@@ -12,18 +12,13 @@
 INSTALLPROG = @INSTALL_PROGRAM@
 INSTALLDATA = @INSTALL_DATA@
 
-SRCS	= ${srcdir}/main.c ${srcdir}/edit.c ${srcdir}/input.c \
-	${srcdir}/../ntserv/getpath.c ${srcdir}/../ntserv/data.c \
-	${srcdir}/../ntserv/salt.c
-OBJS	= main.o edit.o input.o ../ntserv/getpath.o ../ntserv/data.o \
-	  ../ntserv/salt.o
+SRCS	= ${srcdir}/main.c ${srcdir}/edit.c ${srcdir}/input.c
+OBJS	= main.o edit.o input.o ../ntserv/libnetrek.a
 HDRS	= ${srcdir}/pledit.h
-# LIBCURSES = -lcurses
 LIBS	= $(LIBCURSES) $(LIBTERMCAP) $(LIBCRYPT) $(EXTRALIBS)
 PROGRAM	= pledit
 
-# NBR server cflags
-CFLAGS = $(FLAGS) $(EXTRAFLAGS) -I. -I${srcdir} -I../include -I${srcdir}/../include
+CFLAGS = $(FLAGS) $(EXTRAFLAGS) -I. -I../include
 
 all:	$(PROGRAM)
 
@@ -34,7 +29,7 @@
 	rm -f pledit #* *~
 
 clean: rmdependencies
-	-rm -f $(OBJS)
+	-rm -f *.o
 
 clobber: clean
 	-rm -f $(PROGRAM)



From quozl at users.sourceforge.net  Sat Apr 22 06:31:55 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sat, 22 Apr 2006 11:31:55 +0000
Subject: [netrek-cvs] server/Vanilla/sequencer Makefile.in,1.2,1.3
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/sequencer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv693/sequencer

Modified Files:
	Makefile.in 
Log Message:
libnetrek.a

Index: Makefile.in
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/sequencer/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.in	21 Mar 2005 10:17:18 -0000	1.2
+++ Makefile.in	22 Apr 2006 11:31:53 -0000	1.3
@@ -14,33 +14,30 @@
 
 # this is for revised ntserv/struct.h
 
-CFLAGS = $(EXTRAINCS) $(FLAGS) -I. -I${srcdir} -I../include -I${srcdir}/../include
+CFLAGS = $(EXTRAINCS) $(FLAGS) -I../include
 
 LIBS = $(EXTRALIBS)
 
-TOOLDIR= $(LIBDIR)/tools
+TOOLDIR = $(LIBDIR)/tools
 
 LINTFLAGS = -habxc $(EXTRAINCS) $(FLAGS)
 
 #	Common Objects
 
-C_OBJS = ../ntserv/data.o  ../ntserv/openmem.o  ../ntserv/smessage.o \
-        roboshar.o ../ntserv/slotmaint.o 
+C_OBJS = roboshar.o ../ntserv/libnetrek.a
 
 #	Sequencer Objects
 
-S_OBJS = sequencer.o  commands_sequencer.o $(C_OBJS) ../ntserv/ltd_stats.o
+S_OBJS = sequencer.o commands_sequencer.o $(C_OBJS) ../ntserv/libnetrek.a
 
-SRCS = ${srcdir}/roboshar.c ${srcdir}/sequencer.c ${srcdir}/../ntserv/commands.c \
-	${srcdir}/../ntserv/data.c ${srcdir}/../ntserv/openmem.c \
-	${srcdir}/../ntserv/smessage.c ${srcdir}/../ntserv/slotmaint.c
+SRCS = ${srcdir}/roboshar.c ${srcdir}/sequencer.c
 
 EXECS =	sequencer 
 
 all: $(PMAKE) $(EXECS)
 
 sequencer: $(PMAKE) $(S_OBJS)
-	$(CC) $(CFLAGS)  ${LDFLAGS} -o sequencer $(S_OBJS) $(EXTRALIBS)
+	$(CC) $(CFLAGS)  ${LDFLAGS} -o sequencer $(S_OBJS) $(LIBS)
 
 commands_sequencer.o: $(PMAKE) ${srcdir}/../ntserv/commands.c
 	$(CC) $(CFLAGS) $(DEP) -DSEQUENCER -c ${srcdir}/../ntserv/commands.c -o commands_sequencer.o



From quozl at users.sourceforge.net  Sat Apr 22 06:31:55 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sat, 22 Apr 2006 11:31:55 +0000
Subject: [netrek-cvs] server/Vanilla/keycomp Makefile.in,1.2,1.3
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/keycomp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv693/keycomp

Modified Files:
	Makefile.in 
Log Message:
libnetrek.a

Index: Makefile.in
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/keycomp/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.in	21 Mar 2005 10:17:16 -0000	1.2
+++ Makefile.in	22 Apr 2006 11:31:53 -0000	1.3
@@ -14,10 +14,10 @@
 INSTALLPROG = @INSTALL_PROGRAM@
 INSTALLDATA = @INSTALL_DATA@
 
-SRCS = ${srcdir}/rsa_keycomp.c ${srcdir}/../ntserv/getpath.c ${srcdir}/../ntserv/data.c ${srcdir}/rsa_key2cap.c $(RANDOMC)
-OBJS = rsa_keycomp.o ../ntserv/getpath.o ../ntserv/data.o $(STRDUPO) $(RANDOMO)
+SRCS = ${srcdir}/rsa_keycomp.c ${srcdir}/rsa_key2cap.c $(RANDOMC)
+OBJS = rsa_keycomp.o $(STRDUPO) $(RANDOMO) ../ntserv/libnetrek.a
 
-CFLAGS = $(MOREDEFS) $(FLAGS) -I../include -I${srcdir}/../include -I. -I${srcdir}
+CFLAGS = $(MOREDEFS) $(FLAGS) -I../include
 
 LINTFLAGS = -habxc $(MOREDEFS) $(FLAGS)
 



From quozl at users.sourceforge.net  Sat Apr 22 06:31:55 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sat, 22 Apr 2006 11:31:55 +0000
Subject: [netrek-cvs] server/Vanilla/include proto.h,1.4,1.5
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv693/include

Modified Files:
	proto.h 
Log Message:
libnetrek.a

Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/proto.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- proto.h	10 Apr 2006 10:56:31 -0000	1.4
+++ proto.h	22 Apr 2006 11:31:53 -0000	1.5
@@ -93,6 +93,12 @@
 void getshipdefaults(void);
 void getship(struct ship *shipp, int s_type);
 
+/* glog.c */
+void glog_close(void);
+int glog_open();
+void glog_printf(const char *fmt, ...);
+void glog_flush();
+
 /* input.c */
 void input(void);
 



From quozl at users.sourceforge.net  Sat Apr 22 06:31:55 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sat, 22 Apr 2006 11:31:55 +0000
Subject: [netrek-cvs] server/Vanilla/newstartd Makefile.in,1.3,1.4
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/newstartd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv693/newstartd

Modified Files:
	Makefile.in 
Log Message:
libnetrek.a

Index: Makefile.in
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/newstartd/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.in	28 Sep 2005 12:14:05 -0000	1.3
+++ Makefile.in	22 Apr 2006 11:31:53 -0000	1.4
@@ -13,19 +13,16 @@
 INSTALLDATA = @INSTALL_DATA@
 
 N_SRC = ${srcdir}/newstartd.c ${srcdir}/newaccess.c ${srcdir}/subnet.c
-N_OBJS = newstartd.o newaccess.o subnet.o
+N_OBJS = newstartd.o newaccess.o subnet.o ../ntserv/libnetrek.a
 
 LIBS = $(EXTRALIBS)
 
-GETPATH_SRC = ${srcdir}/../ntserv/getpath.c ${srcdir}/../ntserv/data.c
-GETPATH = ../ntserv/getpath.o ../ntserv/data.o
-
-CFLAGS = $(FLAGS) $(EXTRAFLAGS) $(PORT) -I. -I${srcdir} -I../include -I${srcdir}/../include
+CFLAGS = $(FLAGS) $(EXTRAFLAGS) $(PORT) -I../include
 
 all: newstartd
 
-newstartd: $(N_OBJS) $(GETPATH)
-	$(CC) $(CFLAGS) ${LDFLAGS} -o $@ $(N_OBJS) $(GETPATH) $(LIBS)
+newstartd: $(N_OBJS)
+	$(CC) $(CFLAGS) ${LDFLAGS} -o $@ $(N_OBJS) $(LIBS)
 
 clean: rmdependencies
 	/bin/rm -f *.o make.out core
@@ -43,7 +40,7 @@
 	ln -sf $(LIBDIR)/newstartd $(DESTDIR)$(BINDIR)/netrekd
 
 depend: 
-	${CC} -M  $(CFLAGS) $(N_SRC) $(GETPATH_SRC) > .depend
+	${CC} -M  $(CFLAGS) $(N_SRC) > .depend
 
 rmdependencies:
 	rm -f .depend



From quozl at users.sourceforge.net  Sat Apr 22 06:31:55 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sat, 22 Apr 2006 11:31:55 +0000
Subject: [netrek-cvs] server/Vanilla/gum Makefile.am, 1.3, 1.4 Makefile.in,
	1.3, 1.4 aclocal.m4, 1.2, 1.3
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/gum
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv693/gum

Modified Files:
	Makefile.am Makefile.in aclocal.m4 
Log Message:
libnetrek.a

Index: aclocal.m4
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/gum/aclocal.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- aclocal.m4	10 Apr 2006 04:24:50 -0000	1.2
+++ aclocal.m4	22 Apr 2006 11:31:53 -0000	1.3
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005  Free Software Foundation, Inc.
@@ -17,7 +17,7 @@
 dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
 dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
 dnl
-AC_DEFUN(AM_PATH_GTK,
+AC_DEFUN([AM_PATH_GTK],
 [dnl 
 dnl Get the cflags and libraries from the gtk-config script
 dnl
@@ -223,7 +223,7 @@
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.5])])
+	 [AM_AUTOMAKE_VERSION([1.9.6])])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 

Index: Makefile.in
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/gum/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.in	10 Apr 2006 04:24:50 -0000	1.3
+++ Makefile.in	22 Apr 2006 11:31:53 -0000	1.4
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14,8 +14,6 @@
 
 @SET_MAKE@
 
-SOURCES = $(gum_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -56,7 +54,7 @@
 am_gum_OBJECTS = support.$(OBJEXT) main.$(OBJEXT) signals.$(OBJEXT) \
 	id.$(OBJEXT) xmalloc.$(OBJEXT)
 gum_OBJECTS = $(am_gum_OBJECTS)
-gum_DEPENDENCIES = ../ntserv/data.o
+gum_DEPENDENCIES = ../ntserv/libnetrek.a
 DEFAULT_INCLUDES = -I. -I$(srcdir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -168,7 +166,7 @@
 	signals.c signals.h \
 	id.c xmalloc.c
 
-gum_LDADD = @GTK_LIBS@ ../ntserv/data.o 
+gum_LDADD = @GTK_LIBS@ ../ntserv/libnetrek.a
 AM_CFLAGS = @AM_CFLAGS@ -DPACKAGE_DATA_DIR=\"@prefix@\"
 all: all-recursive
 

Index: Makefile.am
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/gum/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	10 Apr 2006 04:24:50 -0000	1.3
+++ Makefile.am	22 Apr 2006 11:31:53 -0000	1.4
@@ -13,7 +13,7 @@
 	signals.c signals.h \
 	id.c xmalloc.c
 
-gum_LDADD = @GTK_LIBS@ ../ntserv/data.o 
+gum_LDADD = @GTK_LIBS@ ../ntserv/libnetrek.a
 
 AM_CFLAGS = @AM_CFLAGS@ -DPACKAGE_DATA_DIR=\"@prefix@\"
 



From quozl at users.sourceforge.net  Sat Apr 22 06:31:55 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sat, 22 Apr 2006 11:31:55 +0000
Subject: [netrek-cvs] server/Vanilla ChangeLog, 1.24, 1.25 Makefile.in, 1.9,
	1.10 NEWS, 1.14, 1.15 PROJECTS, 1.7, 1.8
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv693

Modified Files:
	ChangeLog Makefile.in NEWS PROJECTS 
Log Message:
libnetrek.a

Index: Makefile.in
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.in	22 Apr 2006 02:16:44 -0000	1.9
+++ Makefile.in	22 Apr 2006 11:31:52 -0000	1.10
@@ -14,9 +14,17 @@
 
 include $(CONFIG)
 
-.PHONY: rmdependencies clean reallyclean install installbin server utils startup rsa_utils do_xsg do_pledit do_robots do_gum
+.PHONY: rmdependencies clean reallyclean install installbin \
+	do_library do_server do_listener do_robots do_robotd \
+	do_utilities do_rsa_utilities do_xsg do_pledit do_gum
 
-all: null $(PMAKE) server utils startup rsa_utils do_xsg do_pledit do_robots do_robotd @GUM@
+all: null $(PMAKE) \
+	do_library do_server do_listener do_robots do_robotd \
+	do_utilities do_rsa_utilities do_xsg do_pledit @GUM@
+
+minimal: null $(PMAKE) \
+	do_library do_server do_listener do_robots do_robotd \
+	do_utilities do_rsa_utilities 
 
 depend: system.mk
 	cd ntserv;    $(MAKE) depend
@@ -46,38 +54,40 @@
 config.h: system.mk
 	touch config.h
 
-# make the server binaries and such
-server: null rsalib
+do_library: null
+	cd ntserv; $(MAKE) libnetrek.a
+
+do_server: null do_rsa_library
 	cd ntserv; $(MAKE)
 
-do_robots:
+do_robots: do_library
 	cd robots; $(MAKE)
 
 do_robotd: 
 	cd robotd; $(MAKE)
 
-do_gum: 
+do_gum: do_library
 	cd gum; $(MAKE)
 
-do_xsg:
+do_xsg: do_library
 	cd xsg; $(MAKE);
 
-do_pledit:
+do_pledit: do_library
 	cd pledit; $(MAKE) 
 
-rsalib:	
+do_rsa_library:	
 	- at if [ -f res-rsa/Makefile ]; then \
 		(cd res-rsa; $(MAKE) librsa.a) \
 	fi
 
-utils: rsalib
+do_utilities: do_rsa_library do_library
 	cd tools; $(MAKE) 
 	cd sequencer; $(MAKE)
 
-rsa_utils: 
+do_rsa_utilities: do_library
 	cd keycomp; $(MAKE)
 
-startup: 
+do_listener: do_library
 	cd newstartd; $(MAKE)
 
 cflags.h: Makefile $(CONFIG)

Index: NEWS
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/NEWS,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- NEWS	22 Apr 2006 02:16:45 -0000	1.14
+++ NEWS	22 Apr 2006 11:31:52 -0000	1.15
@@ -1,3 +1,6 @@
+- move common code into a libnetrek [Cameron]
+- lesser lights minimal compilation target [Cameron]
+- factorise god log access functions [Cameron]
 - fix valgrind detected heap leaks [Cameron]
 - compilation fixes for GCC 4.0.3 [Cameron]
 - remove some crud from tar.gz [Cameron]

Index: PROJECTS
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/PROJECTS,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- PROJECTS	22 Apr 2006 02:16:45 -0000	1.7
+++ PROJECTS	22 Apr 2006 11:31:52 -0000	1.8
@@ -140,10 +140,6 @@
 	- observers, allow them to have a ship of their own that is ineffective
 	  and invisible to others.
 
-	- special compile mode for lesser lights trying to build an INL server
-	  that avoids trying to compile xsg or pledit, and perhaps a few other
-	  things, suggested by Tom Holub [VANILLA-LIST:2566]
-
 	- pledit should be able to edit entries in place online.
 
 	- god's text client, displays messages to god and all, and allows

Index: ChangeLog
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ChangeLog	22 Apr 2006 02:16:42 -0000	1.24
+++ ChangeLog	22 Apr 2006 11:31:52 -0000	1.25
@@ -1,3 +1,26 @@
+Sat Apr 22 19:01:51 2006  James Cameron  
+
+	* xsg/Makefile.in: remove use of data.c in favour of already
+	existing localdata.c
+
+	* Makefile.in (minimal): add new rule for build with minimal
+	dependencies, so as to get a server running quickly.  Rename
+	component targets to make it clearer to new users.
+
+	* */Makefile.in: create libnetrek to hold common code in ntserv,
+	remove excess compiler include directives.
+	
+	* ntserv/enter.c, ntserv/interface.c, robots/roboshar.c: remove
+	robot specific compilation of some ntserv source in favour of a
+	null callback entry point.
+
+	* glog.c, socket.c, commands.c, gencmds.c: factorise god log
+	access, due to valgrind detected file descriptor left open after
+	exit.
+
+	* ntserv/socket.c (clientVersion): remove superfluous NULL
+	termination of string returned by strdup().
+
 Sat Apr 22 12:07:50 2006  James Cameron  
 
 	* Makefile.in (dist): avoid certain CVS files.



From quozl at users.sourceforge.net  Sat Apr 22 06:31:55 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sat, 22 Apr 2006 11:31:55 +0000
Subject: [netrek-cvs] server/Vanilla/tools Makefile.in,1.5,1.6
Message-ID: <20060422113237.DD1BD877E5@mx1.real-time.com>

Update of /cvsroot/netrek/server/Vanilla/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv693/tools

Modified Files:
	Makefile.in 
Log Message:
libnetrek.a

Index: Makefile.in
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/tools/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.in	10 Apr 2006 10:56:33 -0000	1.5
+++ Makefile.in	22 Apr 2006 11:31:53 -0000	1.6
@@ -12,19 +12,15 @@
 INSTALLPROG = @INSTALL_PROGRAM@
 INSTALLDATA = @INSTALL_DATA@
 
-# this is for revised ntserv/struct.h
-
-CFLAGS = $(EXTRAINCS) $(FLAGS) -I. -I${srcdir} -I../include -I${srcdir}/../include
+CFLAGS = $(EXTRAINCS) $(FLAGS) -I../include
 
-#LIBCURSES = -lcurses
 LIBS = $(EXTRALIBS)
 
 TOOLDIR= $(LIBDIR)/tools
 
 LINTFLAGS = -habxc $(EXTRAINCS) $(FLAGS)
 
-OBJS_SHM = ../ntserv/data.o ../ntserv/openmem.o ../ntserv/ltd_stats.o
-OBJS_PATH = ../ntserv/getpath.o ../ntserv/data.o
+OBJS = ../ntserv/libnetrek.a
 
 SRCS = ${srcdir}/blotpassword.c ${srcdir}/loadchecker.c ${srcdir}/mess.c \
 	${srcdir}/mergescores.c \
@@ -33,13 +29,10 @@
 	${srcdir}/stat.c ${srcdir}/trimscores.c ${srcdir}/watchmes.c \
 	${srcdir}/fun.c ${srcdir}/xtkill.c ${srcdir}/keyman.c \
 	${srcdir}/nuke.c ${srcdir}/metaget.c \
-	${srcdir}/../ntserv/getpath.c ${srcdir}/../ntserv/data.c \
-	${srcdir}/../ntserv/distress.c ${srcdir}/../ntserv/getship.c \
-	${srcdir}/update.c ${srcdir}/../ntserv/openmem.c ${srcdir}/convert.c \
-	${srcdir}/conq_vert.c ${srcdir}/../ntserv/slotmaint.c $(RANDOMC) \
-	${srcdir}/sortdb.c ${srcdir}/../robots/roboshar.c \
-	${srcdir}/../ntserv/smessage.c ${srcdir}/ntpasswd.c \
-	${srcdir}/../ntserv/salt.c ${srcdir}/../ntserv/bay.c 
+	${srcdir}/update.c ${srcdir}/convert.c \
+	${srcdir}/conq_vert.c $(RANDOMC) \
+	${srcdir}/sortdb.c \
+	${srcdir}/ntpasswd.c
 
 EXECS =	blotpassword loadchecker mess message newscores planets players \
 	scores \
@@ -86,83 +79,80 @@
 	$(INSTALLPROG) $(INSTALLOPTS) cambot $(DESTDIR)$(LIBDIR)/cambot
 	$(INSTALLPROG) $(INSTALLOPTS) metaget $(DESTDIR)$(LIBDIR)/tools/metaget
 
-# cb_sock.o: packets.h ../ntserv/socket.c
-#	$(CC) -o ./cb_sock.o -g $(CFLAGS) -DCAMBOT -c ../ntserv/socket.c
-
-cambot: cambot.o $(OBJS_SHM) $(OBJS_PATH)
-	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} cambot.o ../ntserv/genspkt.o ../ntserv/sysdefaults.o ../ntserv/getship.o ../ntserv/warning.o ../ntserv/smessage.o ../ntserv/distress.o ../ntserv/util.o $(OBJS_SHM) ../ntserv/getpath.o  $(RSA_LIB)
+cambot: cambot.o $(OBJS)
+	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} cambot.o $(OBJS) $(RSA_LIB)
 
 sortdb: sortdb.o
 	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} sortdb.o
 
-ntpasswd: ntpasswd.o $(OBJS_PATH) ../ntserv/salt.o
-	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} ntpasswd.o $(OBJS_PATH) ../ntserv/salt.o $(LIBCRYPT)
+ntpasswd: ntpasswd.o $(OBJS)
+	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} ntpasswd.o $(OBJS) $(LIBCRYPT)
 
-loadchecker: loadchecker.o $(OBJS_SHM)
-	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} loadchecker.o $(OBJS_SHM) $(LIBS)
+loadchecker: loadchecker.o $(OBJS)
+	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} loadchecker.o $(OBJS) $(LIBS)
 
-mess: mess.o $(OBJS_SHM)
-	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} mess.o $(OBJS_SHM) $(LIBS)
+mess: mess.o $(OBJS)
+	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} mess.o $(OBJS) $(LIBS)
 
-message: message.o $(OBJS_SHM)
-	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} message.o $(OBJS_SHM) $(LIBS)
+message: message.o $(OBJS)
+	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} message.o $(OBJS) $(LIBS)
 
-mergescores: mergescores.o $(OBJS_PATH)
-	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} mergescores.o $(OBJS_PATH) $(LIBS)
+mergescores: mergescores.o $(OBJS)
+	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} mergescores.o $(OBJS) $(LIBS)
 
-newscores: newscores.o $(OBJS_PATH)
-	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} newscores.o $(OBJS_PATH) $(LIBS)
+newscores: newscores.o $(OBJS)
+	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} newscores.o $(OBJS) $(LIBS)
 
-planets: planets.o $(OBJS_SHM)
-	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} planets.o $(OBJS_SHM) $(LIBS)
+planets: planets.o $(OBJS)
+	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} planets.o $(OBJS) $(LIBS)
 
-players: players.o $(OBJS_SHM) $(RANDOMO)
-	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} players.o $(OBJS_SHM) $(RANDOMO) $(LIBS)
+players: players.o $(OBJS) $(RANDOMO)
+	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} players.o $(OBJS) $(RANDOMO) $(LIBS)
 
-nuke: nuke.o $(OBJS_SHM) $(RANDOMO)
-	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} nuke.o $(OBJS_SHM) $(RANDOMO) $(LIBS)
+nuke: nuke.o $(OBJS) $(RANDOMO)
+	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} nuke.o $(OBJS) $(RANDOMO) $(LIBS)
 
-scores: scores.o $(OBJS_PATH)
-	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} scores.o $(OBJS_PATH) $(LIBS) ../ntserv/ltd_stats.o
+scores: scores.o $(OBJS)
+	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} scores.o $(OBJS) $(LIBS)
 
-setgalaxy: setgalaxy.o $(RANDOMO) $(OBJS_SHM)
-	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} setgalaxy.o $(RANDOMO) $(OBJS_SHM) $(LIBS)
+setgalaxy: setgalaxy.o $(RANDOMO) $(OBJS)
+	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} setgalaxy.o $(RANDOMO) $(OBJS) $(LIBS)
 
-showgalaxy: showgalaxy.o ../ntserv/distress.o $(OBJS_SHM)
-	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} showgalaxy.o ../ntserv/distress.o $(OBJS_SHM) $(LIBS) $(LIBCURSES) $(LIBTERMCAP)
+showgalaxy: showgalaxy.o $(OBJS)
+	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} showgalaxy.o $(OBJS) $(LIBS) $(LIBCURSES) $(LIBTERMCAP)
 
-stat: stat.o $(OBJS_SHM)
-	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} stat.o $(OBJS_SHM) $(LIBS)
+stat: stat.o $(OBJS)
+	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} stat.o $(OBJS) $(LIBS)
 
 blotpassword: blotpassword.o
-	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} blotpassword.o $(OBJS_PATH) $(LIBS)
+	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} blotpassword.o $(OBJS) $(LIBS)
 
-trimscores: trimscores.o $(OBJS_PATH)
-	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} trimscores.o $(OBJS_PATH) $(LIBS)
+trimscores: trimscores.o $(OBJS)
+	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} trimscores.o $(OBJS) $(LIBS)
 
-watchmes: watchmes.o ../ntserv/distress.o $(OBJS_SHM)
-	$(CC) $(CFLAGS) ${LDFLAGS} watchmes.o ../ntserv/distress.o $(OBJS_SHM) $(LIBS) -o $@
+watchmes: watchmes.o $(OBJS)
+	$(CC) $(CFLAGS) ${LDFLAGS} watchmes.o $(OBJS) $(LIBS) -o $@
 
-xtkill: xtkill.o $(OBJS_SHM) $(OBJS_PATH) ../ntserv/getship.o ../ntserv/slotmaint.o ../ntserv/ltd_stats.o ../ntserv/bay.o
-	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} xtkill.o ../ntserv/getship.o ../ntserv/openmem.o ../ntserv/slotmaint.o ../ntserv/ltd_stats.o ../ntserv/bay.o $(OBJS_PATH) $(LIBS)
+xtkill: xtkill.o $(OBJS)
+	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} xtkill.o $(OBJS) $(LIBS)
 
-keyman: keyman.o $(OBJS_PATH)
-	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} keyman.o $(OBJS_PATH) $(LIBS)
+keyman: keyman.o $(OBJS)
+	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} keyman.o $(OBJS) $(LIBS)
 
-fun: $(RANDOMO) fun.o $(OBJS_SHM)
-	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} fun.o $(RANDOMO) $(OBJS_SHM) $(LIBS)
+fun: $(RANDOMO) fun.o $(OBJS)
+	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} fun.o $(RANDOMO) $(OBJS) $(LIBS)
 
-convert: $(OBJS_PATH) convert.o
-	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} convert.o $(OBJS_PATH) $(LIBS)
+convert: $(OBJS) convert.o
+	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} convert.o $(OBJS) $(LIBS)
 
-updated: update.o $(OBJS_PATH)
-	$(CC) $(CFLAGS) ${LDFLAGS} -o updated update.o ../ntserv/ltd_stats.o $(OBJS_PATH) $(EXTRALIBS)
+updated: update.o $(OBJS)
+	$(CC) $(CFLAGS) ${LDFLAGS} -o updated update.o $(OBJS) $(EXTRALIBS)
 
 ltd_dump: ltd_dump.o
-	$(CC) $(CFLAGS) ${LDFLAGS} -o ltd_dump ltd_dump.o ../ntserv/ltd_stats.o $(OBJS_PATH)
+	$(CC) $(CFLAGS) ${LDFLAGS} -o ltd_dump ltd_dump.o $(OBJS)
 
 ltd_convert: ltd_convert.o
-	$(CC) $(CFLAGS) ${LDFLAGS} -o ltd_convert ltd_convert.o ../ntserv/ltd_stats.o $(OBJS_PATH)
+	$(CC) $(CFLAGS) ${LDFLAGS} -o ltd_convert ltd_convert.o $(OBJS)
 
 conq_vert: conq_vert.o
 	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} conq_vert.o



From modemhero at users.sourceforge.net  Sat Apr 22 07:09:21 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 22 Apr 2006 12:09:21 +0000
Subject: [netrek-cvs] client/netrekxp/resources/docs netrekxp.doc, 1.4,
	1.5 xtrekrc_options.txt, 1.3, 1.4
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23016/resources/docs

Modified Files:
	netrekxp.doc xtrekrc_options.txt 
Log Message:
Minor documentation and comment fixes.

Index: xtrekrc_options.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/xtrekrc_options.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xtrekrc_options.txt	21 Apr 2006 11:35:02 -0000	1.3
+++ xtrekrc_options.txt	22 Apr 2006 12:09:19 -0000	1.4
@@ -293,7 +293,8 @@
 # help            Help Window
 # UDP             UDP Options Window
 # pingStats       Ping Statistics Window
-# xtrekrc_help    The xtrekrc help Window
+# docwin	  Documentation window
+# xtrekrcwin      Your netrekrc file
 # macro           Active Macros Window
 
 .geometry:        (geometry) window geometry

Index: netrekxp.doc
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekxp.doc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- netrekxp.doc	21 Apr 2006 11:35:02 -0000	1.4
+++ netrekxp.doc	22 Apr 2006 12:09:19 -0000	1.5
@@ -1,19 +1,25 @@
 *****************************************************
-*                                                                                                     *
-*      General Documentation for the NetrekXP Client                 *
-*                                                                                                     *
-*  Comments, suggestion and bug reports to keyos at keyos.org   *
-*                                                                                                     *
-*  This is a modified version of COW.DOC which was               *
-*  originally distributed with the Client Of Win (COW)              *
-*  netrek client.                                                                              *
-*  The point of this version is to change the original                    *
-*  document to match the current configuration options of          *
-*  NetrekXP.                                                                                  *
-*                                                                                                     *
-*    Document revised by Bill Balcerski in 2006                          *
-*                                                                                                     *
-*                                                                                                     *
+*                                                   *
+*                                                   *
+*   General Documentation for the NetrekXP Client   *
+*                                                   *
+*                                                   *
+*    Comments, suggestion and bug reports to        *
+*               keyos at keyos.org                     *
+*                                                   *
+*                                                   *
+*  This is a modified version of COW.DOC which was  *
+*  originally distributed with the Client Of Win    *
+* (COW) netrek client.                              *
+*                                                   *
+*  The point of this version is to change the       *
+*  original document to match the current           *
+*  configuration options of NetrekXP.               *
+*                                                   *
+*                                                   *
+*                                                   *
+*    Document revised by Bill Balcerski in 2006     *
+*                                                   *
 *****************************************************
 
 
@@ -271,7 +277,7 @@
 
 5.0 Netrekrc
 
-NetrekXP looks for a netrekrc or xtrekrc file in your netrek install directory.  There are many, many options, and for a complete list, see the xtrekrc_options.txt file in the docs directory.
+NetrekXP looks for a netrekrc or xtrekrc file in your netrek install directory.  There are many, many options, and for a complete list, see the netrekrc_options.txt file in the docs directory.
 
 
 
@@ -325,7 +331,7 @@
 
 You can add one of: sc, dd, ca, bb, as, sb, ga, att, default to the following default options to override them based on ship type:
 
-rcfile-??:  	ship specific .xtrekrc file,
+rcfile-??:  	ship specific .netrekrc file,
 keymap-??:	ship dependent keymap,
 ckeymap-??:	ship dependent CTRL keymap,
 buttonmap-??:	ship dependent buttonmap.
@@ -432,14 +438,10 @@
      tstat          - dasboard window
      help           - help window
      UDP            - UDP options window
-     lagMeter       - lag meter window
      pingStats      - ping statistics window
-     buttonkeymap   - the key map window
-     xtrekrc_help   - the xtrekrc help window (duh)
      MetaServer List- (including the space) Metaserver window
-     tools          - the shell tools window
      DocWin         - Documentation window
-     xtrekrcWin     - xtrekrc display window
+     xtrekrcWin     - netrekrc display window
      
 
      You can specify whether windows are initially mapped (displayed), like this:
@@ -1045,7 +1047,7 @@
 
 2) Configuring via netrekrc
 
-     Message beeps are configured as on and off.  They are turned on if the proper line is in your .xtrekrc.  Otherwise they are left off.
+     Message beeps are configured as on and off.  They are turned on if the proper line is in your .netrekrc.  Otherwise they are left off.
 
      Message lites are configured in a way very similar to macros.  However, in addition to the original set of macro arguments, a new class of arguments is introduced to handle the highliting.
 



From modemhero at users.sourceforge.net  Sat Apr 22 07:09:21 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 22 Apr 2006 12:09:21 +0000
Subject: [netrek-cvs] client/netrekxp/src data.c,1.8,1.9 option.c,1.7,1.8
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23016/src

Modified Files:
	data.c option.c 
Log Message:
Minor documentation and comment fixes.

Index: option.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- option.c	21 Apr 2006 12:30:22 -0000	1.7
+++ option.c	22 Apr 2006 12:09:19 -0000	1.8
@@ -320,7 +320,7 @@
     {1, "show xtrekrc defaults window", 0, &defWin, 0, 0, NULL, NULL},
 #endif
 #ifdef DOC_WIN
-    {1, "show xtrekrc", 0, &xtrekrcwin, 0, 0, NULL, NULL},
+    {1, "show netrekrc", 0, &xtrekrcwin, 0, 0, NULL, NULL},
     {1, "show documentation window", 0, &docwin, 0, 0, NULL, NULL},
 #endif
 #ifdef TOOLS

Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- data.c	21 Apr 2006 12:30:22 -0000	1.8
+++ data.c	22 Apr 2006 12:09:19 -0000	1.9
@@ -137,7 +137,7 @@
                                  * redraws */
 int reportKills = 1;            /* report kill messages (in
                                  * review window)? */
-int phaserWindow = 0;           /* What window to show phaser msgs in */
+int phaserWindow = 0;           /* Whether to show phaser window */
 #ifdef PHASER_STATS
 int phaserStats = 0;        /* How to show phaser stats */
 int phaserStatTry = 0;          /* Try/attemps to phaser */



From modemhero at users.sourceforge.net  Sat Apr 22 09:11:49 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 22 Apr 2006 14:11:49 +0000
Subject: [netrek-cvs] client/netrekxp/resources/docs netrekrc_options.txt,
	NONE, 1.1 changes.txt, 1.17, 1.18 netrekxp.doc, 1.5, 1.6
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29806/resources/docs

Modified Files:
	changes.txt netrekxp.doc 
Added Files:
	netrekrc_options.txt 
Log Message:
Went through various documents and help files to get them in sync in terms of features and their default settings.
Replaced a bunch of xtrek references with netrek.

--- NEW FILE: netrekrc_options.txt ---
# This document lists all available options that could be changed
# in the netrekrc file

agriCAPS:                 (on/off) show AGRI planet name in caps on the map
agriColor:                (0-2) select color to display agri planet names on the map
# 0 - owner race color
# 1 - white
# 2 - gray

allowWheelActions:        (on/off) allow mouse wheel to work in non-scrolling windows
autoQuit:                 (int) autoquit time after death
b1keymap:                 (string) keymap for mouse button 1 (mouseAsShift=on)
b2keymap:                 (string) keymap for mouse button 2 (mouseAsShift=on)
b3keymap:                 (string) keymap for mouse button 3 (mouseAsShift=on)
b4keymap:                 (string) keymap for mouse button 4 (mouseAsShift=on)
b5keymap:                 (string) keymap for mouse button 5 (mouseAsShift=on)
baseUdpLocalPort:         (port) use this port as base for UDP
beepOnPrivateMessage:	  (on/off) beep if received private message
buttonmap:                (string) change mouse button map
buttonmap-:         (string) use this buttonmap for ship (sc,dd,ca,bb,as,sb,ga,att)
ckeymap:                  (string) change control keymap
ckeymap-:           (string) use this ckeymap for ship (sc,dd,ca,bb,as,sb,ga,att)
cloakChars:               (two chars) how to display cloaker on galactic
color.:            (color) replace first  with (color)
color.:             (color) replace that race color with (color)
colorClient:              (0-3) what type of ship bitmaps to use
# 0 - mono
# 1 - new color bitmaps
# 2 - old color bitmaps
# 3 - shaded old color bitmaps

colorfulPhasers:          (on/off) make your phasers multicolored
continueTractor:          (on/off) show tractors after lock
continuousMouse:          (on/off) use continuous mouse mode
continuousMouseFix:       (on/off) fix continuous mouse behavior
disableWinkey             (on/off) disable Windows and Context keys
documentation:            (path) path to documentation file
dynamicBitmaps:           (on/off) allow switching of ship bitmaps in game
enemyPhasers:             (1-10) enemy phaser line width
extraAlertBorder:         (on/off) change window border on enemy approach
fedshipbmpfile:           (path) - old color bitmaps
fedship1bmpfile:          (path) - new color bitmaps
fedshipGbmpfile:          (path) - your own ship's grayscale bitmaps
fedshipTbmpfile:          (path) - shaded color bitmaps
fedshipMbmpfile:          (path) - mono bitmaps
fontSize:                 (int) default 10
forceDisplay:             (0/3) how many colors to display
# 0 - find best available color option (default)
# 1 - 16 colors
# 2 - 256 colors
# 3 - true color

forceMono:                (on/off) outdated option, that will force display to
                                   16 colors (but only works if forceDisplay = 0).
fullScreen:               (on/off) create border for main window
highlightFriendlyPhasers: (on/off) use white color for friendly phasers
ignoreCaps:               (on/off) ignore CapsLock key state
indshipbmpfile:           (path) - old color bitmaps
indship1bmpfile:          (path) - new color bitmaps
indshipGbmpfile:          (path) - your own ship's grayscale bitmaps
indshipTbmpfile:          (path) - shaded color bitmaps
indshipMbmpfile:          (path) - mono bitmaps
keepInfo:                 (0-100) number of updates to keep info (default 15)
keepPeace:                (on/off) stays in peace after being killed
keymap:                   (string) change keymap
keymap-:            (string) use this keymap for ship (sc,dd,ca,bb,as,sb,ga,att)
klishipbmpfile:           (path) - old color bitmaps
kliship1bmpfile:          (path) - new color bitmaps
klishipGbmpfile:          (path) - your own ship's grayscale bitmaps
klishipTbmpfile:          (path) - shaded color bitmaps
klishipMbmpfile:          (path) - mono bitmaps
logfile:                  (path) path to logfile
logging:                  (on/off) enable logging
login:                    (string) character login
macroKey:                 (char, ESC, TAB) key to toggle macro mode
mainResizeable:           (on/off) make main window (netrek) resizeable
messageHoldThresh:        (integer) put message on hold after mouse move (Adds # to the end of message)
messageHUD:               (0-2) where to duplicate message that is written in message window
# 0 - none (default)
# 1 - tactical top
# 2 - tactical bottom

metaCache:                (path) path to metacache file
metaPing:                 (on/off) show ping stats to all servers in metaserver window
metaPort:                 (port) metaserver port
metaServer:               (address) metaserver address
metaStatusLevel:          (0-4) what servers to display
# 0 - servers with players, but not on a wait queue
# 1 - servers with players and with a wait queue
# 2 - servers with nobody playing
# 3 - servers timed out to metaserver (default)
# 4 - servers that metaServer could not contact

motionThresh:             (int) mouse motion threshold
mouseAsShift:             (on/off) use mouse buttons to switch keymaps
mungScrollbarColors:      (on/off) set scrollbar colors to match background colors
name:                     (string) character nick name
netrek.w32caption:        (on/off) when off - shows titlebar in netrek window
newDashboard:             (0-3) dashboard style
# 0 - Text
# 1 - COW
# 2 - KRP (default)
# 3 - LABs

newDistress:              (on/off) indent distress calls to the right
newPlist:                 (on/off) compatibility variable for player list
# on - COW style
# off - old style

omitTeamLetter:           (on/off) omit team letter on galaxy
orishipbmpfile:           (path) - old color bitmaps
oriship1bmpfile:          (path) - new color bitmaps
orishipGbmpfile:          (path) - your own ship's grayscale bitmaps
orishipTbmpfile:          (path) - shaded color bitmaps
orishipMbmpfile:          (path) - mono bitmaps
partitionList:            (on/off) add blank line between teams in player list
password:                 (string) password for autologin
phaserShrink:             (0-16) shrink own phaser by x/16 of its length
# 0-16 for COW style phaser shrink
# 0-11 for BRMH style phaser shrink

phaserShrinkStyle:        (0-1) shrink own phasers using specific style
# 0 - COW style (fixed length phaser)
# 1 - BRMH style (phaser shrinks during recharge time)

phaserStats:              (on/off) show phaser statistics
phaserWindow:		  (on/off) whether to show phaser window
planetBitmap:             (0-2) what bitmaps to use for planets
# 0 - Bronco (default)
# 1 - Moo
# 2 - Rabbitear

playerList:               (string) custom style of player list
# ' ' - White Space
# 'b' - Armies Bombed
# 'd' - Damage Inflicted (DI)
# 'k' - Max Kills
# 'l' - Login Name
# 'n' - Ship Number
# 'p' - Planets Taken
# 'r' - Ratio
# 's' - Speed
# 'v' - Deaths per hour
# 'w' - War status
# 'B' - Bombing
# 'C' - Curt (short) rank
# 'D' - Defense
# 'H' - Hours Played
# 'K' - Kills
# 'L' - Losses
# 'M' - Display, Host Machine
# 'N' - Name
# 'O' - Offense
# 'P' - Planets
# 'R' - Rank
# 'S' - Total Rating (stats)
# 'T' - Ship Type
# 'V' - Kills per hour
# 'W' - Wins

playerList2:              (string) custom layout for alternate player list window (same as playerlist)
playerListHack:           (on/off) if player's letter is greater than 'f' suppose that
                                   the player is observer.
playerListMessaging:      (on/off) allow messages to be sent to players by clicking player
                                   on the player list window

playerlistObserver:       (0-2) what kind of players to show
# 0 - all (default)
# 1 - players
# 2 - observers

playerListStyle:          (0-4) what player list style to use
# 0 - custom style as defined in playerList
# 1 - old style "nTRNKWLr O D d "
# 2 - COW style "nTR N  K lrSd" (default)
# 3 - kill watch style "nTK  RNlr Sd"
# 4 - BRMH style "nTR N  K l M"

port:                     (port) default port
port.:            (port) port for 
portSwap:                 (on/off) use UDP port swap code (use if you behind NAT)
rcfile-:            (path) use this file as netrekrc for ship (sc,dd,ca,bb,as,sb,ga,att)
redrawDelay:              (0-10) how many updates to wait before redraw
rejectMacro:              (on/off) reject macros
reportKills:              (on/off) report kills
romshipbmpfile:           (path) - old color bitmaps
romship1bmpfile:          (path) - new color bitmaps
romshipGbmpfile:          (path) - your own ship's grayscale bitmaps
romshipTbmpfile:          (path) - shaded color bitmaps
romshipMbmpfile:          (path) - mono bitmaps
saveFile:                 (path) path to saved options file
saveBig:                  (on/off) save options with remarks
saveMacro:                (on/off) save macros to saveFile
saveRCD:                  (on/off) save receiver configurable distresses to saveFile
saveRCM:                  (on/off) save receiver configurable messages to saveFile
server:                   (address) default server
server.:          (address)  is a nickname for (address)
shiftedMouse:             (on/off) shift+mouse buttons will work as commands
showAllTractorPressor:    (on/off) show each player's tractor/pressor beams (requires server support)
showHints:                (on/off) show hints window
showHockeyLinesLocal:     (on/off) show hockey lines on tactical
showHockeyLinesMap:       (on/off) show hockey lines on galactic
showHockeyScore:          (on/off) show hockey score on galactic
showIND:                  (on/off) show neutral planets with X over them
showLock:                 (0-3) where to show lock triangle
# 0 - nowhere
# 1 - galactic
# 2 - tactical
# 3 - both (default)

showMySpeed:              (on/off) show my speed on tactical
showMotd:                 (on/off) show Motd if waiting on queue
showPlanetNames:          (on/off) show planet names on tactical
showPlanetOwner:          (on/off) show planet owner on galaxy
showStars:                (on/off) show background stars
showStats:                (on/off) show ship statistics
showTractorPressor:       (on/off) show tractors and pressors
shrinkPhaserOnMiss:       (on/off) don't draw phaser line on miss
singleMacro:              (string) macro keys that will trigger macro without macro mode
sortMyTeamFirst:          (on/off) show my team first in the player list
sortPlayers:              (on/off) sort players by teams
sound:                    (on/off) enable sound
soundDir:                 (path) path to directory containing sound files
theirPhaserShrink:        (0-16) shrink enemy phaser by x/16 of its length
timerType:                (0-4) type of timer on dashboard window
# 0 - don't show
# 1 - current time
# 2 - server time
# 3 - time in ship
# 4 - user-set time

tpDotDist:                (int) distance between tractor/pressor dots (default 10)
tryShort:                 (on/off) enable short packets
tryUdp:                   (on/off) try using UDP
udpClientReceive:         (0-2) how to receive data from server
# 0 - TCP
# 1 - simple UDP (default)
# 2 - fat UDP

udpClientSend:            (0-3) how to send data to server
# 0 - TCP
# 1 - simple UDP (default)
# 2 - enforced UDP (state)
# 3 - enforced UDP (state & weapons)

udpDebug:                 (0/1) debug UDP traffic
udpSequenceCheck:         (on/off) check UDP sequence
updatesPerSec:            (0-10) how much data updates per second to request from server
useLite:                  (on/off) use beeplite
defLite:                  (on/off) use default beeplite settings
useRSA:                   (on/off) use RSA client verification
useRSA.           (on/off) user RSA for 
varyShields:              (on/off) change shields color on shields damage
viewBox:                  (on/off) show tactical window boundaries on map
warnShields:              (on/off) change shields color on enemy approach
warpStreaks:              (on/off) show streaks while warping to starbase
windowMove:               (on/off) enable internal windows to be moved with mouse

.allow:           [A][T][I][P][K]
# Allow specific messages to be shown in window
# Only valid for message windows (i.e. review_* and review)
# A - show messages sent to all
# T - show messages sent to the team
# I - show messages sent to yourself
# P - show phaser messages
# K - show kill messages

.mapped:          (on/off) show window 
# List of possible window names
#
# netrek          Main Window
# local           Main Fighting Window
# map             Galactic Map
# warn            Warning Window
# message         Message Window
# review          All Messages Window
# review_all      Messages to All Window
# review_team     Messages to Team Window
# review_your     Messages to Individual Window
# review_kill     Kill Messages Window
# review_phaser   Phaser hits Window
# planet          Planet List Window
# player          Player List Window
# player2         Alternate Player List Window
# war             War Declarations Window
# fed             Federation Selection Window
# ori             Orion Selection Window
# rom             Romulan Selection Window
# kli             Klingon Selection Window
# quit            The Quit Countdown Clock
# option          Option Menu Window
# rank            Rank Window
# stats           Statistics Window
# tstat           Dashboard Window
# help            Help Window
# UDP             UDP Options Window
# pingStats       Ping Statistics Window
# MetaServer List (including the space) Metaserver window
# macro           Active Macros Window

.geometry:        (geometry) window geometry
# Window Placement syntax
#
# This displays the size, and position of the window.
# .geometry:x++
#
# This displays just the position of the window.
# .geometry:++
#
# ...or just the size
# .geometry:x

.parent:          (window)  is a child of (window)


Index: changes.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- changes.txt	22 Apr 2006 09:13:44 -0000	1.17
+++ changes.txt	22 Apr 2006 14:11:47 -0000	1.18
@@ -1,4 +1,5 @@
 Version TBA:
+- continuousMouse and continuousMouseFix now default to on
 - fixed the mono fed sb bitmaps so they rotate more cleanly
 - updated NetrekXP manual (in docs folder), removed old cow manuals.
 - all greyscale and shaded old color starbase bitmaps now rotate.

Index: netrekxp.doc
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekxp.doc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- netrekxp.doc	22 Apr 2006 12:09:19 -0000	1.5
+++ netrekxp.doc	22 Apr 2006 14:11:47 -0000	1.6
@@ -425,6 +425,7 @@
      review_phaser  - phaser hits window
      planet         - planet list window
      player         - playerlist window
+     player2        - alternate player list window
      war            - war declarations window
      fed            - Fed selection window
      ori            - Orion selection window
@@ -433,15 +434,13 @@
      quit           - The quit countdown clock
      option         - options menu window
      rank           - rank window
-     sound          - sound options window
      stats          - statistics window
      tstat          - dasboard window
      help           - help window
      UDP            - UDP options window
      pingStats      - ping statistics window
      MetaServer List- (including the space) Metaserver window
-     DocWin         - Documentation window
-     xtrekrcWin     - netrekrc display window
+     macro          - active Macros Window
      
 
      You can specify whether windows are initially mapped (displayed), like this:



From modemhero at users.sourceforge.net  Sat Apr 22 09:11:49 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 22 Apr 2006 14:11:49 +0000
Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp netrek.chm, 1.1, 1.2
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29806/resources/htmlhelp

Modified Files:
	netrek.chm 
Log Message:
Went through various documents and help files to get them in sync in terms of features and their default settings.
Replaced a bunch of xtrek references with netrek.

Index: netrek.chm
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/netrek.chm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsSD92m6 and /tmp/cvsvmC3WB differ



From modemhero at users.sourceforge.net  Sat Apr 22 09:11:49 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 22 Apr 2006 14:11:49 +0000
Subject: [netrek-cvs] client/netrekxp/src data.c, 1.9, 1.10 defaults.c, 1.7,
	1.8 socket.c, 1.3, 1.4
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29806/src

Modified Files:
	data.c defaults.c socket.c 
Log Message:
Went through various documents and help files to get them in sync in terms of features and their default settings.
Replaced a bunch of xtrek references with netrek.

Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- defaults.c	21 Apr 2006 12:00:06 -0000	1.7
+++ defaults.c	22 Apr 2006 14:11:47 -0000	1.8
@@ -138,17 +138,17 @@
     },
     {"extraAlertBorder", &extraAlertBorder, RC_BOOL,
         {
-            "Extend alter borders",
+            "Change window border on enemy approach",
             NULL
         }
     },
     {"forceDisplay", &forceDisplay, RC_INT,
         {
             "Number of colors the client will display",
-            "0 - find best available color option",
+            "0 - find best available color option (default)",
             "1 - 16 colors",
             "2 - 256 colors",
-            "3 - true color (default)",
+            "3 - true color",
             NULL
         }
     },
@@ -173,7 +173,7 @@
     },
     {"keepInfo", &keepInfo, RC_INT,
         {
-            "How much updates to keep info window on (default 15)",
+            "How many updates to keep info window on (default 15)",
             NULL
         }
     },
@@ -439,7 +439,7 @@
         {
             "Show tractor/pressor for all players",
             "This option actually helps to turn the feature off",
-            "Server god decides wether to enable it on server",
+            "Server god decides whether to enable it on server",
             NULL
         }
     },
@@ -490,7 +490,7 @@
     },
     {"showMotd", &showMotd, RC_BOOL,
         {
-            "Show MOTD before login",
+            "Show MOTD if waiting on queue",
             NULL
         }
     },

Index: socket.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/socket.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- socket.c	21 Apr 2006 12:00:07 -0000	1.3
+++ socket.c	22 Apr 2006 14:11:47 -0000	1.4
@@ -1971,7 +1971,7 @@
     case 4:
     case 5:
     case 6:
-        LineToConsole ("Sorry, but you cannot play xtrek now.\n");
+        LineToConsole ("Sorry, but you cannot play netrek now.\n");
         LineToConsole ("Try again later.\n");
         break;
     default:

Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- data.c	22 Apr 2006 12:09:19 -0000	1.9
+++ data.c	22 Apr 2006 14:11:47 -0000	1.10
@@ -517,8 +517,8 @@
 
 #ifdef MOTION_MOUSE
 /* KRP */
-int continuousMouse = 0;
-int continuousMouseFix = 0;
+int continuousMouse = 1;
+int continuousMouseFix = 1;
 int motionThresh = 16;
 int motion_mouse_enablable = 1;
 int motion_mouse_steering = 0;



From modemhero at users.sourceforge.net  Sat Apr 22 09:11:49 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 22 Apr 2006 14:11:49 +0000
Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html
	generalconfig.html, 1.2, 1.3 windowsconfig.html, 1.2, 1.3
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29806/resources/htmlhelp/html

Modified Files:
	generalconfig.html windowsconfig.html 
Log Message:
Went through various documents and help files to get them in sync in terms of features and their default settings.
Replaced a bunch of xtrek references with netrek.

Index: windowsconfig.html
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/windowsconfig.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- windowsconfig.html	21 Apr 2006 11:37:05 -0000	1.2
+++ windowsconfig.html	22 Apr 2006 14:11:47 -0000	1.3
@@ -35,7 +35,7 @@
 
              • help - Help window
                • 
 
              • udp - UDP options window
                • 
 
              • pingstats - Ping statistics window
                • 
-
              • xtrekrc_help - xtrekrc help window
                • 
+
              • Metaserver List - Metaserver window
                • 
 
              • macro - Macros window
                • 
 
              
 
              

Index: generalconfig.html
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/generalconfig.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- generalconfig.html	21 Apr 2006 11:37:05 -0000	1.2
+++ generalconfig.html	22 Apr 2006 14:11:47 -0000	1.3
@@ -165,8 +165,8 @@
 This can be disabled by server
 
 	
                
-	
              • on
                • 
-	
              • off (default)
                • 
+	
              • on (default)
                • 
+	
              • off
                • 
 	
              
 
 
@@ -177,8 +177,8 @@
 
 
 	
                
-	
              • on
                • 
-	
              • off (default)
                • 
+	
              • on (default)
                • 
+	
              • off
                • 
 	
              
 
 
@@ -198,13 +198,23 @@
 path
 
 
+dynamicBitmaps
+Allow switching of ship bitmaps in game
+
+	
                
+	
              • on (default)
                • 
+	
              • off
                • 
+	
              
+
+
+
 enemyPhasers
 Angle between enemy phaser lines
 1-10
 
 
 extraAlertBorder
-Extend alert border
+Change window border on enemy approach
 
 	
                
 	
              • on (default)
                • 
@@ -214,7 +224,12 @@
 
 
 fedshipbmpfile
-Path to Fed bitmaps for players
+Path to Fed bitmaps for old color ships
+path
+
+
+fedship1bmpfile
+Path to Fed bitmaps for new color ships
 path
 
 
@@ -224,29 +239,34 @@
 
 
 fedshipTbmpfile
-Path to Fed tainted bitmaps for your ship
+Path to Fed shaded color bitmaps
 path
 
 
 fedshipMbmpfile
-Path to Fed monochrome bitmaps for players
+Path to Fed monochrome bitmaps
 path
 
 
+fontsize
+Choose your font size (default is 10)
+integer(1-whatever)
+
+
 forceDisplay
 Force specific number of colors to display
 
 	
                  
-	
                • 0 - two colors
                  • 
+	
                • 0 - find best color option (default)
                  • 
 	
                • 1 - 16 colors
                  • 
 	
                • 2 - 256 colors
                  • 
-	
                • 3 (default) - true color
                  • 
+	
                • 3  - true color
                  • 
 	
                
 
 
 
 forceMono
-Use old monochrome bitmaps
+Outdated option that will force colors to 16 if forceDisplay=0
 
 	
                  
 	
                • on
                  • 
@@ -266,7 +286,12 @@
 
 
 indshipbmpfile
-Path to Ind bitmaps for players
+Path to Ind bitmaps for old color ships
+path
+
+
+indship1bmpfile
+Path to Ind bitmaps for new color ships
 path
 
 
@@ -276,12 +301,12 @@
 
 
 indshipTbmpfile
-Path to Ind tainted bitmaps for your ship
+Path to Ind shaded color bitmaps
 path
 
 
 indshipMbmpfile
-Path to Ind monochrome bitmaps for players
+Path to Ind monochrome bitmaps
 path
 
 
@@ -304,8 +329,8 @@
 Keep peace with enemy team after you've been killed
 
 	
                    
-	
                  • on
                    • 
-	
                  • off (default)
                    • 
+	
                  • on (default)
                    • 
+	
                  • off
                    • 
 	
                  
 
 
@@ -321,7 +346,12 @@
 
 
 klishipbmpfile
-Path to Kli bitmaps for players
+Path to Kli bitmaps for old color ships
+path
+
+
+kliship1bmpfile
+Path to Kli bitmaps for new color ships
 path
 
 
@@ -331,12 +361,12 @@
 
 
 klishipTbmpfile
-Path to Kli tainted bitmaps for your ship
+Path to Kli shaded color bitmaps
 path
 
 
 klishipMbmpfile
-Path to Kli monochrome bitmaps for players
+Path to Kli monochrome bitmaps
 path
 
 
@@ -366,11 +396,11 @@
 
 
 mainResizeable
-Enable resize caption on main window
+Enable resizing of main window
 
 	
                    
-	
                  • on
                    • 
-	
                  • off (default)
                    • 
+	
                  • on (default)
                    • 
+	
                  • off
                    • 
 	
                  
 
 
@@ -463,7 +493,7 @@
 Hide titlebar in the main window
 
 	
                    
-	
                  • on - hide titlebar
                    • 
+	
                  • on (default) - hide titlebar
                    • 
 	
                  • off - show titlebar
                    • 
 	
                  
 
@@ -502,7 +532,12 @@
 
 
 orishipbmpfile
-Path to Ori bitmaps for players
+Path to Ori bitmaps for old color ships
+path
+
+
+oriship1bmpfile
+Path to Ori bitmaps for new color ships
 path
 
 
@@ -512,17 +547,18 @@
 
 
 orishipTbmpfile
-Path to Ori tainted bitmaps for your ship
+Path to Ori shaded color bitmaps
 path
 
 
 orishipMbmpfile
-Path to Ori monochrome bitmaps for players
+Path to Ori monochrome bitmaps
 path
 
+
 
 partitionPlist
-Separate teams by space in player list
+Separate teams by a blank line in the player list
 
 	
                    
 	
                  • on
                    • 
@@ -690,7 +726,12 @@
 
 
 romshipbmpfile
-Path to Rom bitmaps for players
+Path to Rom bitmaps for old color ships
+path
+
+
+romship1bmpfile
+Path to Rom bitmaps for new color ships
 path
 
 
@@ -700,12 +741,12 @@
 
 
 romshipTbmpfile
-Path to Rom tainted bitmaps for your ship
+Path to Rom shaded color bitmaps
 path
 
 
 romshipMbmpfile
-Path to Rom monochrome bitmaps for players
+Path to Rom monochrome bitmaps
 path
 
 
@@ -754,16 +795,6 @@
 hostname
 
 
-shellTools
-Enable shell tools
-
-	
                      
-	
                    • on (default)
                      • 
-	
                    • off
                      • 
-	
                    
-
-
-
 shiftedMouse
 Shift/Ctrl/Shift+Ctrl + Mouse button generates action
 
@@ -1067,6 +1098,26 @@
 
 
 
+useLite
+Use beeplite
+
+	
                      
+	
                    • on (default)
                      • 
+	
                    • off
                      • 
+	
                    
+
+
+
+deflite
+Use default beeplite settings
+
+	
                      
+	
                    • on (default)
                      • 
+	
                    • off
                      • 
+	
                    
+
+
+
 varyShields
 Vary shields color by damage
 



From modemhero at users.sourceforge.net  Sat Apr 22 09:13:20 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 22 Apr 2006 14:13:20 +0000
Subject: [netrek-cvs] client/netrekxp/resources/docs xtrekrc_options.txt, 1.4,
	NONE
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30808/resources/docs

Removed Files:
	xtrekrc_options.txt 
Log Message:
Renamed xtrekc_options to netrekrc_options

--- xtrekrc_options.txt DELETED ---



From quozl at users.sourceforge.net  Sun Apr 23 05:39:12 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sun, 23 Apr 2006 10:39:12 +0000
Subject: [netrek-cvs] server/Vanilla/robots pret.c,1.2,1.3
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/robots
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3938/robots

Modified Files:
	pret.c 
Log Message:
factorise team name

Index: pret.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robots/pret.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pret.c	22 Apr 2006 02:16:46 -0000	1.2
+++ pret.c	23 Apr 2006 10:39:10 -0000	1.3
@@ -33,9 +33,6 @@
 
 char *roboname = "Kathy";
 
-static char *teamNames[9] = {" ", "Federation", "Romulans", " ", "Klingons",
-                              " ", " ", " ", "Orions"};
-
 #define NUMADJ 12
 static char    *adj_s[NUMADJ] = {
     "VICIOUS", "RUTHLESS", "IRONFISTED", "RELENTLESS",
@@ -675,7 +672,7 @@
     if(o>=13) winner = ORI;
 
     if(winner > 0) {
-        messAll(255,roboname,"The %s have won this round of pre-T entertainment!", teamNames[winner]);
+        messAll(255,roboname,"The %s have won this round of pre-T entertainment!", team_name(winner));
         obliterate(1,KPROVIDENCE, 0);
         resetPlanets();
     }



From quozl at users.sourceforge.net  Sun Apr 23 05:39:12 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sun, 23 Apr 2006 10:39:12 +0000
Subject: [netrek-cvs] server/Vanilla/include proto.h,1.5,1.6
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3938/include

Modified Files:
	proto.h 
Log Message:
factorise team name

Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/proto.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- proto.h	22 Apr 2006 11:31:53 -0000	1.5
+++ proto.h	23 Apr 2006 10:39:10 -0000	1.6
@@ -149,6 +149,7 @@
 
 /* orbit.c */
 void orbit(void);
+void orbit_release_by_planet(struct planet *pl);
 
 /* phaser.c */
 void phaser(u_char course);
@@ -239,6 +240,10 @@
 #endif /* LTD_STATS */
 int find_slot_by_host(char *host, int j);
 int mprintf(char *format, ...);
+char *team_name(int team);
+char *team_verb(int team);
+char *team_code(int team);
+int team_find(char *name);
 
 /* warning.c */
 void new_warning(int index, const char *fmt, ...);



From quozl at users.sourceforge.net  Sun Apr 23 05:39:12 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sun, 23 Apr 2006 10:39:12 +0000
Subject: [netrek-cvs] server/Vanilla ChangeLog,1.25,1.26
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3938

Modified Files:
	ChangeLog 
Log Message:
factorise team name

Index: ChangeLog
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- ChangeLog	22 Apr 2006 11:31:52 -0000	1.25
+++ ChangeLog	23 Apr 2006 10:39:10 -0000	1.26
@@ -1,3 +1,7 @@
+Sun Apr 23 16:56:46 2006  James Cameron  
+
+	* ntserv/util.c: factorise team naming and verbiage.
+
 Sat Apr 22 19:01:51 2006  James Cameron  
 
 	* xsg/Makefile.in: remove use of data.c in favour of already



From quozl at users.sourceforge.net  Sun Apr 23 05:39:12 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sun, 23 Apr 2006 10:39:12 +0000
Subject: [netrek-cvs] server/Vanilla/ntserv util.c, 1.3, 1.4 commands.c, 1.3,
	1.4 daemonII.c, 1.8, 1.9 ntscmds.c, 1.6, 1.7
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/ntserv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3938/ntserv

Modified Files:
	util.c commands.c daemonII.c ntscmds.c 
Log Message:
factorise team name

Index: commands.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/commands.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- commands.c	22 Apr 2006 11:31:53 -0000	1.3
+++ commands.c	23 Apr 2006 10:39:10 -0000	1.4
@@ -77,8 +77,6 @@
 #endif
 
 #if defined (TRIPLE_PLANET_MAYHEM)
-char *teamNames[9] = {" ", "Federation", "Romulans", " ", "Klingons",
-                      " ", " ", " ", "Orions"};
 int do_balance();
 int do_triple_planet_mayhem();
 #endif
@@ -622,7 +620,7 @@
     struct player *k = &players[p_no];
     pmessage(0, MALL, "GOD->ALL",
        "Balance: %16s (%c%c) is to join the %s",
-       k->p_name, teamlet[k->p_team], shipnos[p_no], teamNames[ours] );
+       k->p_name, teamlet[k->p_team], shipnos[p_no], team_name(ours));
 }
 
 /*
@@ -638,15 +636,15 @@
   
   if ( k->p_team != ours ) {
     pmessage(k->p_no, MINDIV, addr_mess(k->p_no,MINDIV),
-	     "%s: please SWAP SIDES to the %s", k->p_name, teamNames[ours] );
+	     "%s: please SWAP SIDES to the %s", k->p_name, team_name(ours));
   }
   else {
     pmessage(k->p_no, MINDIV, addr_mess(k->p_no,MINDIV),
-	     "%s: please remain with the %s", k->p_name, teamNames[ours] );
+	     "%s: please remain with the %s", k->p_name, team_name(ours));
   }
   
   printf("Balance: %16s (%s) is to join the %s\n", 
-	 k->p_name, k->p_mapchars, teamNames[ours]);
+	 k->p_name, k->p_mapchars, team_name(ours));
   
   /* cope with a balance during INL pre-game, if we don't shift players who
      are on the QU_HOME or QU_AWAY queues then the queue masks will force
@@ -912,12 +910,12 @@
     /* advise all of resultant team mix difference */
     pmessage ( 0, MALL, "GOD->ALL",
         "The %s total rating will be %.2f",
-        teamNames[one],
+        team_name(one),
         (float) ( best.one / 100.0 ) );
 
     pmessage ( 0, MALL, "GOD->ALL",
         "The %s total rating will be %.2f",
-        teamNames[two],
+        team_name(two),
         (float) ( best.two / 100.0 ) );
 
     return 0;
@@ -1262,13 +1260,11 @@
 int who,type;
 {
     static char addrbuf[10];
-    char* team_names[MAXTEAM+1] = { "", "FED", "ROM", "", "KLI",
-                                 "", "", "", "ORI" };
 
     if (type == MALL) 
       sprintf(addrbuf,"%s->ALL", myname);
     else if (type == MTEAM)
-      sprintf(addrbuf,"%s->%3s", myname, team_names[who]);
+      sprintf(addrbuf,"%s->%3s", myname, team_code(who));
     else /* Assume MINDIV */
       sprintf(addrbuf, "%s->%2s", myname, players[who].p_mapchars);
 
@@ -1618,8 +1614,6 @@
 char *comm;
 struct message *mess;
 {
-  char *teamNames[9] = {" ", "Federation", "Romulans", " ", "Klingons", 
-			  " ", " ", " ", "Orions"};
   int who;
   int t;
   char *addr;
@@ -1632,7 +1626,7 @@
   if (t>MAXTEAM) {
     pmessage(who, MINDIV, addr, "No one is considering surrender now.  Go take some planets.");
   } else {
-    pmessage(who, MINDIV, addr, "The %s have %d minutes left before they surrender.", teamNames[t],teams[t].s_surrender);
+    pmessage(who, MINDIV, addr, "The %s have %d minutes left before they surrender.", team_name(t), teams[t].s_surrender);
   }
 }
 

Index: ntscmds.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/ntscmds.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ntscmds.c	10 Apr 2006 11:57:00 -0000	1.6
+++ ntscmds.c	23 Apr 2006 10:39:10 -0000	1.7
@@ -47,8 +47,6 @@
 #endif
 
 #if defined (TRIPLE_PLANET_MAYHEM)
-char *teamNames[9] = {" ", "Federation", "Romulans", " ", "Klingons",
-                      " ", " ", " ", "Orions"};
 void do_balance(void);
 void do_triple_planet_mayhem(void);
 #endif
@@ -608,8 +606,6 @@
 /* ARGSUSED */
 void do_time_msg(char *comm, struct message *mess)
 {
-  char *teamNames[9] = {" ", "Federation", "Romulans", " ", "Klingons", 
-			  " ", " ", " ", "Orions"};
   int who;
   int t;
   char *addr;
@@ -622,7 +618,7 @@
   if (t>MAXTEAM) {
     pmessage(who, MINDIV, addr, "No one is considering surrender now.  Go take some planets.");
   } else {
-    pmessage(who, MINDIV, addr, "The %s have %d minutes left before they surrender.", teamNames[t],teams[t].s_surrender);
+    pmessage(who, MINDIV, addr, "The %s have %d minutes left before they surrender.", team_name(t), teams[t].s_surrender);
   }
 }
 
@@ -730,7 +726,7 @@
        "Balance: %16s (slot %c, rating %.2f) is to join the %s",
        k->p_name, shipnos[p_no], 
        (float) ( p_value / 100.0 ),
-       teamNames[ours] );
+       team_name(ours));
 
     /* annoying compiler warning */
     if (theirs) ;
@@ -748,15 +744,15 @@
     
   if ( k->p_team != ours ) {
     pmessage(k->p_no, MINDIV, addr_mess(k->p_no,MINDIV),
-	     "%s: please SWAP SIDES to the --> %s <--", k->p_name, teamNames[ours] );
+	     "%s: please SWAP SIDES to the --> %s <--", k->p_name, team_name(ours));
   }
   else {
     pmessage(k->p_no, MINDIV, addr_mess(k->p_no,MINDIV),
-	     "%s: please remain with the --> %s <--", k->p_name, teamNames[ours] );
+	     "%s: please remain with the --> %s <--", k->p_name, team_name(ours));
   }
   
   printf("Balance: %16s (%s) is to join the %s\n", 
-	 k->p_name, k->p_mapchars, teamNames[ours]);
+	 k->p_name, k->p_mapchars, team_name(ours));
   
   /* cope with a balance during INL pre-game, if we don't shift players who
      are on the QU_HOME or QU_AWAY queues then the queue masks will force
@@ -1044,8 +1040,8 @@
     {
         pmessage ( 0, MALL, addr_mess(0, MALL),
             "No balance performed, this is the best: %-3s %.2f, %-3s %.2f",
-            teamNames[one], (float) ( best.one / 100.0 ),
-            teamNames[two], (float) ( best.two / 100.0 ) );
+            team_name(one), (float) ( best.one / 100.0 ),
+            team_name(two), (float) ( best.two / 100.0 ) );
     }
     
 }

Index: util.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/util.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- util.c	10 Apr 2006 10:41:08 -0000	1.3
+++ util.c	23 Apr 2006 10:39:10 -0000	1.4
@@ -126,3 +126,44 @@
 #endif
   return -1;
 }
+
+char *team_name(int team) {
+  char *array[MAXTEAM+1] = { "0", "Federation", "Romulans", "3", "Klingons", 
+			     "5", "6", "7", "Orions" };
+  return array[team];
+}
+
+char *team_verb(int team) {
+  char *array[MAXTEAM+1] = { "0", "has", "have", "3", "have",
+			     "5", "6", "7", "have" };
+  return array[team];
+}
+
+char *team_code(int team) {
+  char *array[MAXTEAM+1] = { "0", "FED", "ROM", "3", "KLI",
+			     "5", "6", "7", "ORI" };
+  return array[team];
+}
+
+int team_find(char *name)
+{
+  if (!strncasecmp(name,team_name(FED),strlen(name))) return FED;
+  if (!strncasecmp(name,team_name(ROM),strlen(name))) return ROM;
+  if (!strncasecmp(name,team_name(KLI),strlen(name))) return KLI;
+  if (!strncasecmp(name,team_name(ORI),strlen(name))) return ORI;
+  return 0;
+}
+
+void orbit_release_by_planet(struct planet *pl) {
+  int i;
+  for (i=0; ip_status & PFREE) continue;
+    if (me->p_flags & PFOBSERV) continue;
+    if (me->p_flags & PFORBIT) {
+      if (me->p_planet == pl->pl_no) {
+	me->p_flags &= ~(PFBOMB | PFORBIT | PFBEAMUP | PFBEAMDOWN);
+      }
+    }
+  }
+}

Index: daemonII.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/daemonII.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- daemonII.c	22 Apr 2006 02:16:46 -0000	1.8
+++ daemonII.c	23 Apr 2006 10:39:10 -0000	1.9
@@ -121,7 +121,6 @@
 static void doResources(void);
 /* static void doRotateGalaxy(void); */
 static void signal_servers(void);
-/* static void message_flag(struct message *cur, char *address); */
 
 /* external scope prototypes */
 extern void pinit(void);
@@ -139,10 +138,6 @@
 static int ticks = 0;
 static int tourntimestamp = 0; /* ticks since last Tmode 8/2/91 TC */
 
-char *teamNames[9] = {" ", "Federation", "Romulans", " ", "Klingons", 
-                      " ", " ", " ", "Orions"};
-char *teamVerbage[9] = {" ", "has", "have", " ", "have", " ", " ", " ", "have"};
-
 static int tcount[MAXTEAM + 1];
 u_char getbearing();
 
@@ -2516,7 +2511,7 @@
 
             pmessage(0, MALL, " ", " ");
             pmessage(0, MALL, "GOD->ALL", "The %s %s surrendered.",
-                teamNames[t], teamVerbage[t]);
+                team_name(t), team_verb(t));
             pmessage(0, MALL, " ", " ");
             surrenderMessage(t);
             
@@ -2563,7 +2558,7 @@
             if ((teams[t].s_surrender % 5) == 0) {
                 pmessage(0, MALL, " ", " ");
                 pmessage(0, MALL, "GOD->ALL", "The %s %s %d minutes remaining.",
-                        teamNames[t], teamVerbage[t],
+                        team_name(t), team_verb(t),
                         teams[t].s_surrender);
 
                 pmessage(0, MALL, "GOD->ALL", "%d planets will sustain the empire.  %d suspends countdown.",
@@ -3639,7 +3634,7 @@
         pmessage(0, MALL, " ", " ");
         pmessage(0, MALL, "GOD->ALL",
                 "The %s %s %d minutes before the empire collapses.",
-                teamNames[loser], teamVerbage[loser],
+                team_name(loser), team_verb(loser),
                 binconfirm ? SURRLENGTH : SURRLENGTH*2/3);
         pmessage(0, MALL, "GOD->ALL",
                 "%d planets are needed to sustain the empire.",
@@ -3766,7 +3761,7 @@
         pmessage(0, MALL, " ", " ");
         pmessage(0, MALL, "GOD->ALL",
                 "The %s %s prevented collapse of the empire.",
-                teamNames[winner->p_team], teamVerbage[winner->p_team]);
+                team_name(winner->p_team), team_verb(winner->p_team));
         pmessage(0, MALL, " ", " ");
         teams[winner->p_team].s_surrender = 0; /* stop the clock */
     }
@@ -4124,20 +4119,10 @@
     strcat(buf, ctime(&curtime));
     fprintf(conqfile,"  %s\n",buf);
 
-    sprintf(buf, "The %s %s surrendered.", teamNames[loser],
-        teamVerbage[loser]);
+    sprintf(buf, "The %s %s surrendered.", team_name(loser),
+        team_verb(loser));
         
     fprintf(conqfile, "  %s\n", buf);
-/*    sprintf(buf, "The %s:", teamNames[winner]);
-    pmessage(0, MALL | MGENO, " ",buf);
-    fprintf(conqfile, "  %s\n", buf);
-    displayBest(conqfile, winner, KGENOCIDE);*/
-/*    sprintf(buf, "The %s:", teamNames[loser]);
-    pmessage(0, MALL | MGENO, " ",buf);
-    fprintf(conqfile, "  %s\n", buf);
-    displayBest(conqfile, loser, KGENOCIDE);
-    pmessage(0, MALL | MGENO, " ",
-        "***********************************************************");*/
     fprintf(conqfile, "\n");
     if (conqfile != stderr) fclose(conqfile);
 }
@@ -4159,16 +4144,16 @@
 
     pmessage(0, MALL | MGENO, " ","%s",
         "***********************************************************");
-    sprintf(buf, "The %s %s been genocided by the %s.", teamNames[loser],
-        teamVerbage[loser], teamNames[winner]);
+    sprintf(buf, "The %s %s been genocided by the %s.", team_name(loser),
+        team_verb(loser), team_name(winner));
     pmessage(0, MALL | MGENO, " ","%s",buf);
         
     fprintf(conqfile, "  %s\n", buf);
-    sprintf(buf, "The %s:", teamNames[winner]);
+    sprintf(buf, "The %s:", team_name(winner));
     pmessage(0, MALL | MGENO, " ","%s",buf);
     fprintf(conqfile, "  %s\n", buf);
     displayBest(conqfile, winner, KGENOCIDE);
-    sprintf(buf, "The %s:", teamNames[loser]);
+    sprintf(buf, "The %s:", team_name(loser));
     pmessage(0, MALL | MGENO, " ","%s",buf);
     fprintf(conqfile, "  %s\n", buf);
     displayBest(conqfile, loser, KGENOCIDE);
@@ -4195,10 +4180,10 @@
 
     pmessage(0, MALL | MCONQ, " ","%s",
         "***********************************************************");
-    sprintf(buf, "The galaxy has been conquered by the %s:", teamNames[winner]);
+    sprintf(buf, "The galaxy has been conquered by the %s:", team_name(winner));
     pmessage(0, MALL | MCONQ, " ","%s",buf);
     fprintf(conqfile, "  %s\n", buf);
-    sprintf(buf, "The %s:", teamNames[winner]);
+    sprintf(buf, "The %s:", team_name(winner));
     pmessage(0, MALL | MCONQ, " ","%s",buf);
     fprintf(conqfile, "  %s\n", buf);
     displayBest(conqfile, winner, KWINNER);



From quozl at users.sourceforge.net  Sun Apr 23 06:17:05 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sun, 23 Apr 2006 11:17:05 +0000
Subject: [netrek-cvs] server/Vanilla STYLE,1.1,1.2
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29290

Modified Files:
	STYLE 
Log Message:
spacing of function arguments

Index: STYLE
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/STYLE,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- STYLE	22 Apr 2006 02:16:45 -0000	1.1
+++ STYLE	23 Apr 2006 11:17:03 -0000	1.2
@@ -9,7 +9,7 @@
 static int foo(int a)
 {
     if (a) {
-        func(abc);
+        func(abc, xyz);
         def;
     } else {
         ghi;



From quozl at users.sourceforge.net  Sun Apr 23 06:21:03 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sun, 23 Apr 2006 11:21:03 +0000
Subject: [netrek-cvs] server/Vanilla/tools setgalaxy.c,1.3,1.4
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31842/tools

Modified Files:
	setgalaxy.c 
Log Message:


Index: setgalaxy.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/tools/setgalaxy.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- setgalaxy.c	27 May 2005 04:00:23 -0000	1.3
+++ setgalaxy.c	23 Apr 2006 11:21:01 -0000	1.4
@@ -1,4 +1,4 @@
-/* setgalaxy.c -- new tool, supercedes resetplanets
+/* setgalaxy.c
 
    usage:
    setgalaxy l              restore planet locations
@@ -12,28 +12,12 @@
 */
 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
 #include "defs.h"
-#include INC_STRINGS
 #include "struct.h"
 #include "planets.h"
 #include "data.h"
+#include "proto.h"
 
-extern int openmem(int);
-
-static void usage(void);
 static void CoolServerIdea(void);
 static void CloseUpShop(void);
 static void doINLResources(void);
@@ -42,6 +26,19 @@
 static int agricount[4] = { 0, 0, 0, 0};
 #define AGRI_LIMIT	3
 
+static void usage(void)
+{
+    printf("   usage:\n");
+    printf("   setgalaxy l              restore planet locations\n");
+    printf("   setgalaxy r (num)        standard reset of galaxy\n");
+    printf("   setgalaxy t (num)        tourney reset of galaxy - equal agris\n");
+    printf("   setgalaxy f              flatten all planets to 1 army\n");
+    printf("   setgalaxy F (num)        top out all planets at (num) armies\n");
+    printf("   setgalaxy n :  rename planet  to \n");
+    printf("   setgalaxy C              triple planet mayhem\n");
+    printf("   setgalaxy Z              close up shop for maintenance\n");
+}
+
 int main(int argc, char **argv)
 {
     int i;
@@ -49,7 +46,7 @@
 
     srandom(getpid());
     openmem(0);
-    if (argc == 1) usage();
+    if (argc == 1) { usage(); return 1; }
 
     if (argc == 3) {
       if ((*argv[1] == 'F') || (*argv[1] == 'r') || (*argv[1] == 't')) 
@@ -64,23 +61,25 @@
 		strcpy(planets[num].pl_name, name);
 		planets[num].pl_namelen = strlen(name);
 		planets[num].pl_flags |= PLREDRAW;
-	    }
-	    else
+	    } else {
 		printf("Planet number must be in range (0-39).\n");
-	    exit(0);
+		return 1;
+	    }
+	    return 0;
+	} else {
+	  usage(); return 1;
 	}
-	else usage();
       }
     }
  
     if (*argv[1] == 'C') {
         CoolServerIdea();
-        exit(0);
+        return 0;
     }
 
     if (*argv[1] == 'Z') {
         CloseUpShop();
-        exit(0);
+        return 0;
     }
 
     if (*argv[1] == 'l') {
@@ -89,7 +88,7 @@
 	    planets[i].pl_y = pdata[i].pl_y;
 	}
 	printf("Restored locations.\n");
-	exit(0);
+	return 0;
     }
 
     if (*argv[1] == 'f') { /* flatten planets */
@@ -97,26 +96,32 @@
 	    planets[i].pl_armies = 1;
 	}
 	printf("All planets set to 1 army.\n");
+	return 0;
     }
-    else if (*argv[1] == 'F') { /* top out planets */
+
+    if (*argv[1] == 'F') { /* top out planets */
 	for (i = 0; i < 40; i++) {
 	    planets[i].pl_armies = top_armies;
 	}
 	printf("All planets set to %d armies.\n",top_armies);
+	return 0;
     }
-    else if (*argv[1] == 't') { /* tourney reset resources, owners */
+
+    if (*argv[1] == 't') { /* tourney reset resources, owners */
 	MCOPY(pdata, planets, sizeof(pdata));
 	for (i = 0; i < 40; i++) {
 	    planets[i].pl_armies = top_armies;
 	}
 	doINLResources();
-    /* reset the SB construction and surrender countdown immediately */
+	/* reset the SB construction and surrender countdown immediately */
 	for (i = 0; i <= MAXTEAM; i++) {
 	  teams[i].s_turns = 0;
 	  teams[i].s_surrender = 0;
 	}
+	return 0;
     }
-    else if (*argv[1] == 'r') { /* reset resources, owners */
+
+    if (*argv[1] == 'r') { /* reset resources, owners */
 	MCOPY(pdata, planets, sizeof(pdata));
 	for (i = 0; i < 40; i++) {
 	    planets[i].pl_armies = top_armies;
@@ -124,14 +129,16 @@
 	doResources();
 	printf("Agri counts: %d/%d/%d/%d.\n", agricount[0],
 	       agricount[1], agricount[2], agricount[3]);
-    /* reset the SB construction and surrender countdown immediately */
+	/* reset the SB construction and surrender countdown immediately */
 	for (i = 0; i <= MAXTEAM; i++) {
 	  teams[i].s_turns = 0;
 	  teams[i].s_surrender = 0;
 	}
+	return 0;
     }
-    else usage();
-    return 1;		/* satisfy lint */
+
+    usage();
+    return 1;
 }
 
 /* the four close planets to the home planet */
@@ -227,21 +234,6 @@
            (agricount[3] > AGRI_LIMIT));
 }
 
-
-static void usage(void)
-{
-    printf("   usage:\n");
-    printf("   setgalaxy l              restore planet locations\n");
-    printf("   setgalaxy r (num)        standard reset of galaxy\n");
-    printf("   setgalaxy t (num)        tourney reset of galaxy - equal agris\n");
-    printf("   setgalaxy f              flatten all planets to 1 army\n");
-    printf("   setgalaxy F (num)        top out all planets at (num) armies\n");
-    printf("   setgalaxy n :  rename planet  to \n");
-    printf("   setgalaxy C              triple planet mayhem\n");
-    printf("   setgalaxy Z              close up shop for maintenance\n");
-    exit(0);
-}
-
 static void CoolServerIdea(void)
 {
     int i;



From quozl at users.sourceforge.net  Sun Apr 23 06:21:03 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sun, 23 Apr 2006 11:21:03 +0000
Subject: [netrek-cvs] server/Vanilla ChangeLog,1.26,1.27
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31842

Modified Files:
	ChangeLog 
Log Message:


Index: ChangeLog
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- ChangeLog	23 Apr 2006 10:39:10 -0000	1.26
+++ ChangeLog	23 Apr 2006 11:21:01 -0000	1.27
@@ -1,3 +1,8 @@
+Sun Apr 23 21:18:08 2006  James Cameron  
+
+	* tools/setgalaxy.c: reduce includes to minimum required, fix
+	prototypes, and return rather than exit.
+
 Sun Apr 23 16:56:46 2006  James Cameron  
 
 	* ntserv/util.c: factorise team naming and verbiage.



From quozl at users.sourceforge.net  Sun Apr 23 06:24:55 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sun, 23 Apr 2006 11:24:55 +0000
Subject: [netrek-cvs] server/Vanilla/tools xtkill.c,1.5,1.6
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31595/tools

Modified Files:
	xtkill.c 
Log Message:


Index: xtkill.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/tools/xtkill.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- xtkill.c	10 Apr 2006 10:56:33 -0000	1.5
+++ xtkill.c	23 Apr 2006 11:24:53 -0000	1.6
@@ -1,15 +1,6 @@
 #include 
 #include 
-#include 
-#include 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
 #include "defs.h"
 #include "struct.h"
 #include "data.h"
@@ -20,6 +11,32 @@
 
 static char *names[] = { "Neutral", "Fed", "Rom", "", "Kli", "", "", "", "Ori"};
 
+static void Usage(void)
+{
+  printf("\
+    xtkill [0-9a-z] \n\
+\n\
+    where  is one of :\n\
+      F(ree slot)                   (bypasses 6 minute ghostbuster timeout)\n\
+      e(ject from game)             (simulates self-destruct)\n\
+      (no mode == obliterate)\n\
+      s(hip class change)[abcdosA]  (A = ATT)\n\
+      t(eleport to quadrant)[frkoc] (c = center of galaxy)\n\
+      p(uck)                        (harmless little thing)\n\
+      S(uper)                       (big shields/max damage/max etmp)\n\
+      T(eam change)[frko]           (no team == independent)\n\
+      D(emote)                      (-1 to rank)\n\
+      P(romote)                     (+1 to rank)\n\
+      k(ills increment)             (+1 kill)\n\
+      h(arm)                        (no shields, 50%% damage)\n\
+      a(rmies increment)[n]         (+6 armies, or set to n)\n\
+      C(lock, surrender -- set it)  (to 6 minutes (debugging aid))\n\
+      L(oss adjust, SB (-1))        (in case you toast an SB accidentally)\n\
+      R(obot obliterate)            (like obliterate, but only for robots)\n\
+");
+  exit(1);
+}
+
 static void refit(struct player *me, int type)
 {
   int i;
@@ -313,28 +330,3 @@
   cur->m_flags |= MVALID;
 }
 
-static void Usage(void)
-{
-  printf("\
-    xtkill [0-9a-z] \n\
-\n\
-    where  is one of :\n\
-      F(ree slot)                   (bypasses 6 minute ghostbuster timeout)\n\
-      e(ject from game)             (simulates self-destruct)\n\
-      (no mode == obliterate)\n\
-      s(hip class change)[abcdosA]  (A = ATT)\n\
-      t(eleport to quadrant)[frkoc] (c = center of galaxy)\n\
-      p(uck)                        (harmless little thing)\n\
-      S(uper)                       (big shields/max damage/max etmp)\n\
-      T(eam change)[frko]           (no team == independent)\n\
-      D(emote)                      (-1 to rank)\n\
-      P(romote)                     (+1 to rank)\n\
-      k(ills increment)             (+1 kill)\n\
-      h(arm)                        (no shields, 50%% damage)\n\
-      a(rmies increment)[n]         (+6 armies, or set to n)\n\
-      C(lock, surrender -- set it)  (to 6 minutes (debugging aid))\n\
-      L(oss adjust, SB (-1))        (in case you toast an SB accidentally)\n\
-      R(obot obliterate)            (like obliterate, but only for robots)\n\
-");
-  exit(1);
-}



From quozl at users.sourceforge.net  Sun Apr 23 06:24:55 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sun, 23 Apr 2006 11:24:55 +0000
Subject: [netrek-cvs] server/Vanilla ChangeLog,1.28,1.29
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31595

Modified Files:
	ChangeLog 
Log Message:


Index: ChangeLog
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- ChangeLog	23 Apr 2006 11:22:53 -0000	1.28
+++ ChangeLog	23 Apr 2006 11:24:53 -0000	1.29
@@ -1,3 +1,7 @@
+Sun Apr 23 21:24:07 2006  James Cameron  
+
+	* tools/xtkill.c: move usage to top, remove excess includes.
+
 Sun Apr 23 21:22:04 2006  James Cameron  
 
 	* tools/Makefile.in, tools/setplanet.c: new CLI planet interface.



From quozl at users.sourceforge.net  Sun Apr 23 06:22:55 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sun, 23 Apr 2006 11:22:55 +0000
Subject: [netrek-cvs] server/Vanilla ChangeLog,1.27,1.28
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11765

Modified Files:
	ChangeLog 
Log Message:
setplanet

Index: ChangeLog
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- ChangeLog	23 Apr 2006 11:21:01 -0000	1.27
+++ ChangeLog	23 Apr 2006 11:22:53 -0000	1.28
@@ -1,3 +1,7 @@
+Sun Apr 23 21:22:04 2006  James Cameron  
+
+	* tools/Makefile.in, tools/setplanet.c: new CLI planet interface.
+
 Sun Apr 23 21:18:08 2006  James Cameron  
 
 	* tools/setgalaxy.c: reduce includes to minimum required, fix



From quozl at users.sourceforge.net  Sun Apr 23 06:22:55 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sun, 23 Apr 2006 11:22:55 +0000
Subject: [netrek-cvs] server/Vanilla/tools setplanet.c, NONE, 1.1 Makefile.in,
	1.6, 1.7
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11765/tools

Modified Files:
	Makefile.in 
Added Files:
	setplanet.c 
Log Message:
setplanet

Index: Makefile.in
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/tools/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.in	22 Apr 2006 11:31:53 -0000	1.6
+++ Makefile.in	23 Apr 2006 11:22:53 -0000	1.7
@@ -32,13 +32,13 @@
 	${srcdir}/update.c ${srcdir}/convert.c \
 	${srcdir}/conq_vert.c $(RANDOMC) \
 	${srcdir}/sortdb.c \
-	${srcdir}/ntpasswd.c
+	${srcdir}/ntpasswd.c ${srcdir}/setplanet.c 
 
 EXECS =	blotpassword loadchecker mess message newscores planets players \
 	scores \
         setgalaxy showgalaxy stat trimscores watchmes xtkill \
         mergescores keyman updated fun conq_vert convert sortdb cambot \
-        ntpasswd ltd_dump ltd_convert nuke trekon metaget
+        ntpasswd ltd_dump ltd_convert nuke trekon metaget setplanet
 
 all: $(PMAKE) $(EXECS)
 
@@ -78,6 +78,7 @@
 	$(INSTALLPROG) $(INSTALLOPTS) updated $(DESTDIR)$(LIBDIR)/updated
 	$(INSTALLPROG) $(INSTALLOPTS) cambot $(DESTDIR)$(LIBDIR)/cambot
 	$(INSTALLPROG) $(INSTALLOPTS) metaget $(DESTDIR)$(LIBDIR)/tools/metaget
+	$(INSTALLPROG) $(INSTALLOPTS) setplanet $(DESTDIR)$(LIBDIR)/tools/metaget
 
 cambot: cambot.o $(OBJS)
 	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} cambot.o $(OBJS) $(RSA_LIB)
@@ -160,6 +161,9 @@
 metaget: metaget.o
 	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} metaget.o
 
+setplanet: setplanet.o $(OBJS)
+	$(CC) -o $@ $(CFLAGS) ${LDFLAGS} setplanet.o $(OBJS)
+
 trekon: ${srcdir}/mktrekon ${srcdir}/trekon.bitmap ${srcdir}/trekoff.bitmap
 	${srcdir}/mktrekon $(LIBDIR)
 	chmod a+x trekon

--- NEW FILE: setplanet.c ---
#include 
#include 
#include "defs.h"
#include "struct.h"
#include "planets.h"
#include "data.h"
#include "proto.h"

static void usage(void)
{
  fprintf(stderr, "\
Usage: setplanet dump\n\
       setplanet PLANET COMMAND [COMMAND ...]\n\
\n\
PLANET is either a planet name, prefix of a name, or a number.\n\
COMMAND is one of:\n\
\n\
get           dump planet data for one planet in setplanet format\n\
verbose       send messages to all in game for certain changes\n\
pause         wait one second before proceeding\n\
\n\
FLAG          set a planet flag\n\
noFLAG        clear a planet flag\n\
              flags are (repair fuel agri redraw home coup cheap core)\n\
\n\
owner TEAM    set the owner of the planet to a team\n\
x COORDINATE  change the coordinates of the planet on the galactic\n\
y COORDINATE\n\
restore       restore the coordinates to the standard position\n\
name NAME     change the name of the planet (client may not see it)\n\
armies COUNT  change the number of armies on the planet to COUNT\n\
flatten       set the army count to one\n\
pop           increment the army count\n\
plague        decrement the army count\n\
info MASK     set the information mask (which teams see the planet)\n\
reveal        make planet known to all teams\n\
lose          make planet unknown to non-owning teams\n\
lost          make planet unknown to all teams, including owner\n\
hide          hide the planet by moving it off the galactic\n\
deorbit       break the orbit of any player orbiting the planet\n\
couptime N    set the time allowed before coup\n\
");
}

/* send message to players */
static void _pmessage(char *str, int recip, int group)
{
  struct message *cur;
  if (++(mctl->mc_current) >= MAXMESSAGE)
    mctl->mc_current = 0;
  cur = &messages[mctl->mc_current];
  cur->m_no = mctl->mc_current;
  cur->m_flags = group;
  cur->m_time = 0;
  cur->m_from = 255;
  cur->m_recpt = recip;
  (void) sprintf(cur->m_data, "%s", str);
  cur->m_flags |= MVALID;
}

/* send message to players */
static void say(const char *fmt, ...)
{
  va_list args;
  char buf[80];

  va_start(args, fmt);
  vsnprintf(buf, sizeof(buf), fmt, args);
  _pmessage(buf, 0, MALL);
  va_end(args);
}

/* find a planet by name */
static struct planet *planet_find(char *name)
{
  int i, count = 0, match = 0;

  for(i=0; i (MAXPLANETS-1)) return NULL;
  return &planets[i];
}

static struct player *player_by_number(char *name)
{
  int i = atoi(name);
  if ((i == 0) && (name[0] != '0')) {
    char c = name[0];
    if (c >= 'a' && c <= 'z')
      i = c - 'a' + 10;
    else
      return NULL;
  }
  if (i >= MAXPLAYER) return NULL;
  return &players[i];
}

/* display a planet flag */
static void get_flag(char *name, int mask, struct planet *pl)
{
  if (pl->pl_flags & mask) {
    printf(" %s", name);
  } else {
    printf(" no%s", name);
  }
}

/* check for a request to set a planet flag, and do it */
static int set_flag(char *argv, char *name, int mask, struct planet *pl, int verbose)
{
  if (strcmp(argv, name)) return 0;
  if (!(pl->pl_flags & mask)) {
    pl->pl_flags |= mask;
    if (verbose) say("%s made %s", pl->pl_name, name);
    return 1;
  }
}

/* check for a request to clear a planet flag, and do it */
static int clr_flag(char *argv, char *name, int mask, struct planet *pl, int verbose)
{
  if (strcmp(argv, name)) return 0;
  if (pl->pl_flags & mask) {
    pl->pl_flags &= ~mask;
    if (verbose) say("%s made %s", pl->pl_name, name);
    return 1;
  }
}

/* display everything known about a planet in command line format */
void get(char *us, struct planet *pl)
{
  printf("%s %d", us, pl->pl_no);
  get_flag("repair", PLREPAIR, pl);
  get_flag("fuel",   PLFUEL,   pl);
  get_flag("agri",   PLAGRI,   pl);
  get_flag("redraw", PLREDRAW, pl);
  get_flag("home",   PLHOME,   pl);
  get_flag("coup",   PLCOUP,   pl);
  get_flag("cheap",  PLCHEAP,  pl);
  get_flag("core",   PLCORE,   pl);
  printf(" owner %s", team_name(pl->pl_owner));
  printf(" x %d", pl->pl_x);
  printf(" y %d", pl->pl_y);
  printf(" name '%s'", pl->pl_name);
  printf(" armies %d", pl->pl_armies);
  printf(" info %d", pl->pl_info);
  printf(" couptime %d", pl->pl_couptime);
  printf("\n");
}

/* display everything about every planet */
static void dump(char *us) {
  int i;
  for(i=0; ipl_owner = team_find(argv[i]);
      goto state_1;
    }

    if (!strcmp(argv[i], "taken-by")) {
      if (++i == argc) return 0;
      pl->pl_owner = team_find(argv[i]);
      pl->pl_armies = 1;
      pl->pl_info = pl->pl_owner;
      if (verbose) say("%s taken for the %s", pl->pl_name, 
		       team_name(pl->pl_owner));
      goto state_1;
    }

    if (!strcmp(argv[i], "neutral")) {
      pl->pl_armies = 0;
      pl->pl_owner = 0;
      pl->pl_info = ALLTEAM;
      if (verbose) say("%s neutral", pl->pl_name);
      goto state_1;
    }

    if (!strcmp(argv[i], "x")) {
      if (++i == argc) return 0;
      pl->pl_x = atoi(argv[i]);
      goto state_1;
    }

    if (!strcmp(argv[i], "y")) {
      if (++i == argc) return 0;
      pl->pl_y = atoi(argv[i]);
      goto state_1;
    }

    if (!strcmp(argv[i], "restore")) {
      pl->pl_x = pdata[pl->pl_no].pl_x;
      pl->pl_y = pdata[pl->pl_no].pl_y;
      if (verbose) say("%s restored to normal location", pl->pl_name);
      goto state_1;
    }

    /* crawl after a player until slot freed */
    if (!strcmp(argv[i], "crawl-after")) {
      if (++i == argc) return 0;
      struct player *me = player_by_number(argv[i]);
      while (me != NULL) {
	if (me->p_status == PFREE) break;
	if (me->p_flags & PFORBIT)
	  if (me->p_planet == pl->pl_no) continue;
	if (pl->pl_y > me->p_y + 10) pl->pl_y -= 10;
	if (pl->pl_y < me->p_y - 10) pl->pl_y += 10;
	if (pl->pl_x > me->p_x + 10) pl->pl_x -= 10;
	if (pl->pl_x < me->p_x - 10) pl->pl_x += 10;
	usleep(100000);
      }
      goto state_1;
    }

    if (!strcmp(argv[i], "name")) {
      if (++i == argc) return 0;
      if (verbose) say("%s renamed to %s", pl->pl_name, argv[i]);
      pl->pl_namelen = 0;
      strcpy(pl->pl_name, argv[i]);
      pl->pl_namelen = strlen(pl->pl_name);
      goto state_1;
    }

    if (!strcmp(argv[i], "armies")) {
      if (++i == argc) return 0;
      pl->pl_armies = atoi(argv[i]);
      if (verbose) say("%s armies set to %s", pl->pl_name, argv[i]);
      goto state_1;
    }

    if (!strcmp(argv[i], "flatten")) {
      pl->pl_armies = 1;
      if (verbose) say("%s flattened", pl->pl_name);
      goto state_1;
    }

    if (!strcmp(argv[i], "pop")) {
      pl->pl_armies++;
      if (verbose) say("%s popped to %d", pl->pl_name, pl->pl_armies);
      goto state_1;
    }

    if (!strcmp(argv[i], "plague")) {
      pl->pl_armies--;
      if (verbose) say("%s plagued to %d", pl->pl_name, pl->pl_armies);
      goto state_1;
    }

    if (!strcmp(argv[i], "info")) {
      if (++i == argc) return 0;
      pl->pl_info = atoi(argv[i]);
      goto state_1;
    }

    if (!strcmp(argv[i], "reveal")) {
      pl->pl_info = ALLTEAM;
      goto state_1;
    }

    if (!strcmp(argv[i], "lose")) {
      pl->pl_info = pl->pl_owner;
      goto state_1;
    }

    if (!strcmp(argv[i], "lost")) {
      pl->pl_info = 0;
      goto state_1;
    }

    if (!strcmp(argv[i], "hide")) {
      orbit_release_by_planet(pl);
      pl->pl_x = -10000;
      pl->pl_y = -10000;
      goto state_1;
    }

    if (!strcmp(argv[i], "deorbit")) {
      orbit_release_by_planet(pl);
      goto state_1;
    }

    if (!strcmp(argv[i], "couptime")) {
      if (++i == argc) return 0;
      pl->pl_couptime = atoi(argv[i]);
      goto state_1;
    }

    if (!strcmp(argv[i], "pause")) {
      sleep(1);
      goto state_1;
    }

    goto state_0;
}



From quozl at users.sourceforge.net  Sun Apr 23 07:47:47 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sun, 23 Apr 2006 12:47:47 +0000
Subject: [netrek-cvs] server/Vanilla/robots rmove.c,1.1,1.2
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/robots
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20208/robots

Modified Files:
	rmove.c 
Log Message:


Index: rmove.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robots/rmove.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rmove.c	21 Mar 2005 05:23:46 -0000	1.1
+++ rmove.c	23 Apr 2006 12:47:45 -0000	1.2
@@ -13,10 +13,7 @@
 #define SIZEOF(s)		(sizeof (s) / sizeof (*(s)))
 #define AVOID_TIME		4
 #define AVOID_CLICKS		200
-
-#define BOREDOM_TIME		1200 /* 10 minutes since last torp fired =>
-					become hostile to all 4/13/92 TC */
-
+#define BOREDOM_TIME		300
 #define NORMALIZE(d) 		(((d) + 256) % 256)
 
 #define E_INTRUDER	0x01



From quozl at users.sourceforge.net  Sun Apr 23 07:47:47 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sun, 23 Apr 2006 12:47:47 +0000
Subject: [netrek-cvs] server/Vanilla ChangeLog,1.29,1.30
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20208

Modified Files:
	ChangeLog 
Log Message:


Index: ChangeLog
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- ChangeLog	23 Apr 2006 11:24:53 -0000	1.29
+++ ChangeLog	23 Apr 2006 12:47:45 -0000	1.30
@@ -1,3 +1,8 @@
+Sun Apr 23 22:46:42 2006  James Cameron  
+
+	* robots/rmove.c (BOREDOM_TIME): fix unrealistic boredom timer for
+	practice robots.
+
 Sun Apr 23 21:24:07 2006  James Cameron  
 
 	* tools/xtkill.c: move usage to top, remove excess includes.



From quozl at users.sourceforge.net  Sun Apr 23 08:30:42 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sun, 23 Apr 2006 13:30:42 +0000
Subject: [netrek-cvs] server/Vanilla NEWS,1.15,1.16 ChangeLog,1.30,1.31
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15815

Modified Files:
	NEWS ChangeLog 
Log Message:
conquer gloating

Index: NEWS
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/NEWS,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- NEWS	22 Apr 2006 11:31:52 -0000	1.15
+++ NEWS	23 Apr 2006 13:30:38 -0000	1.16
@@ -1,3 +1,6 @@
+- change to conquest sequence to add a parade [Cameron]
+- fix unrealistic robot boredom timer [Cameron]
+- add galaxy configuration tool, setplanet [Cameron]
 - move common code into a libnetrek [Cameron]
 - lesser lights minimal compilation target [Cameron]
 - factorise god log access functions [Cameron]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ChangeLog	23 Apr 2006 12:47:45 -0000	1.30
+++ ChangeLog	23 Apr 2006 13:30:39 -0000	1.31
@@ -1,3 +1,17 @@
+Sun Apr 23 23:20:15 2006  James Cameron  
+
+	* ntserv/daemonII.c (checkwin): change to conquest sequence,
+	instead of merely blowing everybody up, pause the game for a few
+	seconds, during which cloakers are decloaked, weapons don't fire,
+	ships are placed in a circular parade formation around the final
+	planet, and then blown up.  Also, if there is no queue, do not
+	force the players to exit their client.
+
+	* include/struct.h: add new gameup flag.
+	* ntserv/death.c: allow winners to stay on if no queue.
+	* ntserv/detonate.c, ntserv/phaser.c, ntserv/torp.c: no firing.
+	* ntserv/getentry.c: allow winners to change teams.
+
 Sun Apr 23 22:46:42 2006  James Cameron  
 
 	* robots/rmove.c (BOREDOM_TIME): fix unrealistic boredom timer for



From quozl at users.sourceforge.net  Sun Apr 23 08:30:43 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sun, 23 Apr 2006 13:30:43 +0000
Subject: [netrek-cvs] server/Vanilla/ntserv daemonII.c, 1.9, 1.10 death.c,
	1.1, 1.2 detonate.c, 1.1, 1.2 getentry.c, 1.2, 1.3 phaser.c,
	1.1, 1.2 torp.c, 1.1, 1.2
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/ntserv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15815/ntserv

Modified Files:
	daemonII.c death.c detonate.c getentry.c phaser.c torp.c 
Log Message:
conquer gloating

Index: getentry.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/getentry.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- getentry.c	21 Mar 2005 10:17:17 -0000	1.2
+++ getentry.c	23 Apr 2006 13:30:41 -0000	1.3
@@ -144,6 +144,7 @@
 		(me->p_team != ALLTEAM) && 
 		(switching != teamPick) && 
 		(me->p_whydead != KGENOCIDE) && 
+		(me->p_whydead != KWINNER) && 
 		(me->p_whydead != KPROVIDENCE) ) {
 		    switching = teamPick;
                     new_warning(10,"Please confirm change of teams.  Select the new team again.");
@@ -277,7 +278,7 @@
     /* Is the server closed, or did the daemond die. */
     if ((!time_access()) || !(status->gameup & GU_GAMEOK)) return 0;
     /* You must leave */
-    if (mustexit) return (0);
+    if (mustexit) return 0;
     /* Special modes */
     if (chaos || topgun) return (allteams);
     /* Only continue if the queue has mask restrictions */

Index: phaser.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/phaser.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- phaser.c	21 Mar 2005 05:23:44 -0000	1.1
+++ phaser.c	23 Apr 2006 13:30:41 -0000	1.2
@@ -29,6 +29,8 @@
   U_LONG range_sq, this_range_sq;
   struct phaser *mine = &phasers[me->p_no];
 
+  if (status->gameup & GU_GLOAT_CONQUER) return;
+
   if (mine->ph_status != PHFREE) {
     new_warning(32, "Phasers have not recharged.");
     return;

Index: death.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/death.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- death.c	21 Mar 2005 05:23:43 -0000	1.1
+++ death.c	23 Apr 2006 13:30:41 -0000	1.2
@@ -42,9 +42,14 @@
     case TOURNEND:
     case TOURNSTART:
 	break;
+    case KWINNER:
+        if ((queues[QU_PICKUP].q_flags & QU_OPEN) &&
+	    (queues[QU_PICKUP].count > 0)){
+	  mustexit = 1;
+	}
+	break;
     case KQUIT:
     case KDAEMON:
-    case KWINNER:
     case KOVER:
     case KBADBIN:
 	mustexit = 1;

Index: torp.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/torp.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- torp.c	21 Mar 2005 05:23:44 -0000	1.1
+++ torp.c	23 Apr 2006 13:30:41 -0000	1.2
@@ -53,6 +53,8 @@
   static LONG last_torp_fired_update = 0;
   struct torp *k;
 
+  if (status->gameup & GU_GLOAT_CONQUER) return;
+
   /*
    * Prevent player from firing more than one torp per update.  */
   if (me->p_updates == last_torp_fired_update)

Index: detonate.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/detonate.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- detonate.c	21 Mar 2005 05:23:43 -0000	1.1
+++ detonate.c	23 Apr 2006 13:30:41 -0000	1.2
@@ -20,6 +20,8 @@
   struct player *j;
   struct torp *t;
 
+  if (status->gameup & GU_GLOAT_CONQUER) return;
+
   if (me->p_fuel < myship->s_detcost) {
     new_warning(UNDEF, "Not enough fuel to detonate");
     return;

Index: daemonII.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/daemonII.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- daemonII.c	23 Apr 2006 10:39:10 -0000	1.9
+++ daemonII.c	23 Apr 2006 13:30:41 -0000	1.10
@@ -101,6 +101,7 @@
 static void exitDaemon(int sig);
 static void save_planets(void);
 static void checkgen(int loser, struct player *winner);
+static void gloat_conquer_timer();
 static int checkwin(struct player *winner);
 static void ghostmess(struct player *victim);
 static void saveplayer(struct player *victim);
@@ -568,7 +569,7 @@
     if (status->gameup & GU_PAUSED){ /* Game is paused */
       if (fuse(PLAYERFUSE))
         udplayerpause();
-
+      if (status->gameup & GU_GLOAT_CONQUER) gloat_conquer_timer();
       signal_servers();
       (void) SIGNAL(SIGALRM, move);
       return;
@@ -3709,6 +3710,105 @@
     /* constants (now in defs.h).  30-60 min for a coup.  4/15/92 TC */
 }
 
+#define GLOAT_TIMER_BEGIN 100
+#define GLOAT_TIMER_DECLOAK 90
+#define GLOAT_TIMER_PARADE 40
+#define GLOAT_TIMER_GOODBYE 10
+
+int gloat_player;
+int gloat_planet;
+int gloat_timer;
+
+static void gloat_conquer_decloak()
+{
+	int h;
+	struct player *j;
+
+	for (h = 0, j = &players[0]; h < MAXPLAYER; h++, j++) {
+                if (j->p_status == PFREE) continue;
+		if (j->p_flags & PFCLOAK) {
+			j->p_flags &= ~PFCLOAK;
+			// players[i].p_cloakphase--;
+		}
+	}
+}
+
+static void gloat_conquer_parade()
+{
+	int i, h;
+	struct player *j;
+
+	for (i = 0, h = 0, j = &players[0]; h < MAXPLAYER; h++, j++) {
+                if (j->p_status == PFREE) continue;
+		if (j->p_no == gloat_player) continue;
+		i++;
+	}
+	for (h = 0, j = &players[0]; h < MAXPLAYER; h++, j++) {
+                if (j->p_status == PFREE) continue;
+		if (j->p_no == gloat_player) continue;
+		j->p_dir = h*256/i;
+		j->p_desdir = j->p_dir;
+		j->p_x = planets[gloat_planet].pl_x + (ORBDIST * 5)
+                        * Cos[(u_char) (j->p_dir - (u_char) 64)];
+		j->p_y = planets[gloat_planet].pl_y + (ORBDIST * 5)
+                        * Sin[(u_char) (j->p_dir - (u_char) 64)];
+	}
+}
+
+static void gloat_conquer_kill()
+{
+	int h;
+	struct player *j;
+
+	for (h = 0, j = &players[0]; h < MAXPLAYER; h++, j++) {
+                if (j->p_status == PFREE) continue;
+#ifdef NEWBIESERVER
+                /* Don't kill newbie robot. */
+                if (status->gameup & GU_NEWBIE && j->p_flags & PFROBOT) continue;
+#endif
+#ifdef PRETSERVER
+                /* Don't kill pre-T robot. */
+                if (status->gameup & GU_PRET && j->p_flags & PFROBOT) continue;
+#endif
+                j->p_status = PEXPLODE;
+                j->p_whydead = KWINNER;
+                j->p_whodead = gloat_player;
+                if (j->p_ship.s_type == STARBASE)
+			j->p_explode = 2*SBEXPVIEWS/PLAYERFUSE;
+                else
+			j->p_explode = 10/PLAYERFUSE;
+                j->p_ntorp = 0;
+                j->p_nplasmatorp = 0;
+	}
+}
+
+static void gloat_conquer_reset()
+{
+	int i;
+
+	doResources();
+	ERROR(2,("Resetting galaxy after Conquer.\n"));
+	for (i = 0; i <= MAXTEAM; i++) {
+                teams[i].s_turns = 0;
+                teams[i].s_surrender = 0;
+	}
+}
+
+static void gloat_conquer_timer()
+{
+	gloat_timer--;
+	if (gloat_timer == GLOAT_TIMER_DECLOAK)
+		gloat_conquer_decloak();
+	if (gloat_timer == GLOAT_TIMER_PARADE)
+		gloat_conquer_parade();
+	if (gloat_timer == GLOAT_TIMER_GOODBYE)
+		pmessage(0, MALL, "GOD->ALL", "Goodbye.");
+	if (gloat_timer > 0) return;
+	
+	status->gameup &= ~(GU_PAUSED|GU_GLOAT_CONQUER);
+	gloat_conquer_kill();
+	gloat_conquer_reset();
+}
 
 /* This function is called when a planet has been taken over.
    It checks all the planets to see if the victory conditions
@@ -3768,35 +3868,12 @@
 
     for (i = 0; i < 4; i++) {
         if (team[1<= VICTORY) {
-            /* We have a winning team */
             conquerMessage(winner->p_team);
-            for (h = 0, j = &players[0]; h < MAXPLAYER; h++, j++) {
-                if (j->p_status == PFREE) continue;
-#ifdef NEWBIESERVER
-                /* Don't kill newbie robot. */
-                if (status->gameup & GU_NEWBIE && j->p_flags & PFROBOT) continue;
-#endif
-#ifdef PRETSERVER
-                /* Don't kill pre-T robot. */
-                if (status->gameup & GU_PRET && j->p_flags & PFROBOT) continue;
-#endif
-                j->p_status = PEXPLODE;
-                j->p_whydead = KWINNER;
-                j->p_whodead = winner->p_no;
-                if (j->p_ship.s_type == STARBASE)
-                    j->p_explode = 2*SBEXPVIEWS/PLAYERFUSE;
-                else
-                    j->p_explode = 10/PLAYERFUSE;
-                j->p_ntorp = 0;
-                j->p_nplasmatorp = 0;
-            }
-            doResources();
-            ERROR(2,("Resetting galaxy after Conquer.\n"));
-            for (i = 0; i <= MAXTEAM; i++) {
-                teams[i].s_turns = 0;
-                teams[i].s_surrender = 0;
-            }
-            return 1;
+	    status->gameup |= GU_GLOAT_CONQUER|GU_PAUSED;
+	    gloat_player = winner->p_no;
+	    gloat_planet = winner->p_planet;
+	    gloat_timer = GLOAT_TIMER_BEGIN;
+	    return 1;
         }
     }
     return 0;
@@ -4213,7 +4290,7 @@
     for (i = 0, j = &players[0]; i < MAXPLAYER; i++, j++) {
         if (j->p_team != team || j->p_status == PFREE) continue;
 #ifdef GENO_COUNT
-        if (type==KWINNER) j->p_stats.st_genos++;
+        if (type == KWINNER) j->p_stats.st_genos++;
 #endif
         if (type == KGENOCIDE) {
             planets=j->p_genoplanets;



From quozl at users.sourceforge.net  Sun Apr 23 08:30:43 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Sun, 23 Apr 2006 13:30:43 +0000
Subject: [netrek-cvs] server/Vanilla/include struct.h,1.4,1.5
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15815/include

Modified Files:
	struct.h 
Log Message:
conquer gloating

Index: struct.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/struct.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- struct.h	10 Apr 2006 10:56:31 -0000	1.4
+++ struct.h	23 Apr 2006 13:30:40 -0000	1.5
@@ -97,6 +97,7 @@
 #define pre_t_mode ((status->gameup) & GU_PRET)
 #define GU_BOT_IN_GAME 128
 #define bot_in_game ((status->gameup) & GU_BOT_IN_GAME)
+#define GU_GLOAT_CONQUER 256
 
 /* values of p_status */
 #define PFREE 		   0x0000
@@ -177,6 +178,7 @@
     int s_turns;		/* turns till another starbase is legal */
     int s_surrender;		/* minutes until this team surrenders */
     int s_plcount;		/* how many planets this team owns */
+    /* FIXME: global change s_ prefix to te_ prefix */
 };
 
 struct ship {



From modemhero at users.sourceforge.net  Mon Apr 24 05:06:17 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Mon, 24 Apr 2006 10:06:17 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/grayscale/ind
	ind_as.bmp, 1.1, NONE ind_at.bmp, 1.1, NONE ind_bb.bmp, 1.1,
	NONE ind_ca.bmp, 1.1, NONE ind_dd.bmp, 1.1, NONE ind_ga.bmp,
	1.1, NONE ind_sb.bmp, 1.1, NONE ind_sc.bmp, 1.1,
	NONE indshipG.bmp, 1.1, NONE
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/grayscale/ind
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9304/resources/ships/grayscale/ind

Removed Files:
	ind_as.bmp ind_at.bmp ind_bb.bmp ind_ca.bmp ind_dd.bmp 
	ind_ga.bmp ind_sb.bmp ind_sc.bmp indshipG.bmp 
Log Message:
Removed a bunch of concactenated bitmaps that shouldn't have been put into the library (my bad).

--- ind_at.bmp DELETED ---

--- ind_bb.bmp DELETED ---

--- indshipG.bmp DELETED ---

--- ind_dd.bmp DELETED ---

--- ind_as.bmp DELETED ---

--- ind_sb.bmp DELETED ---

--- ind_ga.bmp DELETED ---

--- ind_ca.bmp DELETED ---

--- ind_sc.bmp DELETED ---



From modemhero at users.sourceforge.net  Mon Apr 24 05:06:17 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Mon, 24 Apr 2006 10:06:17 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/grayscale/fed
	fed_as.bmp, 1.1, NONE fed_at.bmp, 1.1, NONE fed_bb.bmp, 1.1,
	NONE fed_ca.bmp, 1.1, NONE fed_dd.bmp, 1.1, NONE fed_ga.bmp,
	1.1, NONE fed_sb.bmp, 1.1, NONE fed_sc.bmp, 1.1,
	NONE fedshipG.bmp, 1.1, NONE
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/grayscale/fed
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9304/resources/ships/grayscale/fed

Removed Files:
	fed_as.bmp fed_at.bmp fed_bb.bmp fed_ca.bmp fed_dd.bmp 
	fed_ga.bmp fed_sb.bmp fed_sc.bmp fedshipG.bmp 
Log Message:
Removed a bunch of concactenated bitmaps that shouldn't have been put into the library (my bad).

--- fed_bb.bmp DELETED ---

--- fed_sc.bmp DELETED ---

--- fed_dd.bmp DELETED ---

--- fed_ga.bmp DELETED ---

--- fed_as.bmp DELETED ---

--- fed_sb.bmp DELETED ---

--- fed_ca.bmp DELETED ---

--- fedshipG.bmp DELETED ---

--- fed_at.bmp DELETED ---



From modemhero at users.sourceforge.net  Mon Apr 24 05:06:18 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Mon, 24 Apr 2006 10:06:18 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/tinted/ori ori_as.bmp,
	1.1, NONE ori_at.bmp, 1.1, NONE ori_bb.bmp, 1.1,
	NONE ori_ca.bmp, 1.1, NONE ori_dd.bmp, 1.1, NONE ori_ga.bmp,
	1.1, NONE ori_sb.bmp, 1.1, NONE ori_sc.bmp, 1.1,
	NONE orishipT.bmp, 1.1, NONE
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/tinted/ori
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9304/resources/ships/tinted/ori

Removed Files:
	ori_as.bmp ori_at.bmp ori_bb.bmp ori_ca.bmp ori_dd.bmp 
	ori_ga.bmp ori_sb.bmp ori_sc.bmp orishipT.bmp 
Log Message:
Removed a bunch of concactenated bitmaps that shouldn't have been put into the library (my bad).

--- ori_dd.bmp DELETED ---

--- orishipT.bmp DELETED ---

--- ori_at.bmp DELETED ---

--- ori_sc.bmp DELETED ---

--- ori_bb.bmp DELETED ---

--- ori_ca.bmp DELETED ---

--- ori_sb.bmp DELETED ---

--- ori_ga.bmp DELETED ---

--- ori_as.bmp DELETED ---



From modemhero at users.sourceforge.net  Mon Apr 24 05:06:18 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Mon, 24 Apr 2006 10:06:18 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/tinted/kli kli_as.bmp,
	1.1, NONE kli_at.bmp, 1.1, NONE kli_bb.bmp, 1.1,
	NONE kli_ca.bmp, 1.1, NONE kli_dd.bmp, 1.1, NONE kli_ga.bmp,
	1.1, NONE kli_sb.bmp, 1.1, NONE kli_sc.bmp, 1.1,
	NONE klishipT.bmp, 1.1, NONE
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/tinted/kli
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9304/resources/ships/tinted/kli

Removed Files:
	kli_as.bmp kli_at.bmp kli_bb.bmp kli_ca.bmp kli_dd.bmp 
	kli_ga.bmp kli_sb.bmp kli_sc.bmp klishipT.bmp 
Log Message:
Removed a bunch of concactenated bitmaps that shouldn't have been put into the library (my bad).

--- kli_dd.bmp DELETED ---

--- kli_ca.bmp DELETED ---

--- kli_sc.bmp DELETED ---

--- kli_bb.bmp DELETED ---

--- kli_at.bmp DELETED ---

--- kli_ga.bmp DELETED ---

--- kli_sb.bmp DELETED ---

--- kli_as.bmp DELETED ---

--- klishipT.bmp DELETED ---



From modemhero at users.sourceforge.net  Mon Apr 24 05:06:18 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Mon, 24 Apr 2006 10:06:18 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/grayscale/rom
	rom_as.bmp, 1.1, NONE rom_at.bmp, 1.1, NONE rom_bb.bmp, 1.1,
	NONE rom_ca.bmp, 1.1, NONE rom_dd.bmp, 1.1, NONE rom_ga.bmp,
	1.1, NONE rom_sb.bmp, 1.1, NONE rom_sc.bmp, 1.1,
	NONE romshipG.bmp, 1.1, NONE
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/grayscale/rom
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9304/resources/ships/grayscale/rom

Removed Files:
	rom_as.bmp rom_at.bmp rom_bb.bmp rom_ca.bmp rom_dd.bmp 
	rom_ga.bmp rom_sb.bmp rom_sc.bmp romshipG.bmp 
Log Message:
Removed a bunch of concactenated bitmaps that shouldn't have been put into the library (my bad).

--- romshipG.bmp DELETED ---

--- rom_as.bmp DELETED ---

--- rom_ca.bmp DELETED ---

--- rom_sc.bmp DELETED ---

--- rom_dd.bmp DELETED ---

--- rom_bb.bmp DELETED ---

--- rom_at.bmp DELETED ---

--- rom_ga.bmp DELETED ---

--- rom_sb.bmp DELETED ---



From modemhero at users.sourceforge.net  Mon Apr 24 05:06:17 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Mon, 24 Apr 2006 10:06:17 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/grayscale/ori
	ori_as.bmp, 1.1, NONE ori_at.bmp, 1.1, NONE ori_bb.bmp, 1.1,
	NONE ori_ca.bmp, 1.1, NONE ori_dd.bmp, 1.1, NONE ori_ga.bmp,
	1.1, NONE ori_sb.bmp, 1.1, NONE ori_sc.bmp, 1.1,
	NONE orishipG.bmp, 1.1, NONE
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/grayscale/ori
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9304/resources/ships/grayscale/ori

Removed Files:
	ori_as.bmp ori_at.bmp ori_bb.bmp ori_ca.bmp ori_dd.bmp 
	ori_ga.bmp ori_sb.bmp ori_sc.bmp orishipG.bmp 
Log Message:
Removed a bunch of concactenated bitmaps that shouldn't have been put into the library (my bad).

--- ori_dd.bmp DELETED ---

--- ori_at.bmp DELETED ---

--- ori_sc.bmp DELETED ---

--- ori_bb.bmp DELETED ---

--- ori_ca.bmp DELETED ---

--- ori_sb.bmp DELETED ---

--- ori_as.bmp DELETED ---

--- orishipG.bmp DELETED ---

--- ori_ga.bmp DELETED ---



From modemhero at users.sourceforge.net  Mon Apr 24 05:06:17 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Mon, 24 Apr 2006 10:06:17 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/grayscale/kli
	kli_as.bmp, 1.1, NONE kli_at.bmp, 1.1, NONE kli_bb.bmp, 1.1,
	NONE kli_ca.bmp, 1.1, NONE kli_dd.bmp, 1.1, NONE kli_ga.bmp,
	1.1, NONE kli_sb.bmp, 1.1, NONE kli_sc.bmp, 1.1,
	NONE klishipG.bmp, 1.1, NONE
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/grayscale/kli
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9304/resources/ships/grayscale/kli

Removed Files:
	kli_as.bmp kli_at.bmp kli_bb.bmp kli_ca.bmp kli_dd.bmp 
	kli_ga.bmp kli_sb.bmp kli_sc.bmp klishipG.bmp 
Log Message:
Removed a bunch of concactenated bitmaps that shouldn't have been put into the library (my bad).

--- kli_dd.bmp DELETED ---

--- kli_ca.bmp DELETED ---

--- kli_sc.bmp DELETED ---

--- kli_bb.bmp DELETED ---

--- kli_at.bmp DELETED ---

--- klishipG.bmp DELETED ---

--- kli_ga.bmp DELETED ---

--- kli_sb.bmp DELETED ---

--- kli_as.bmp DELETED ---



From modemhero at users.sourceforge.net  Mon Apr 24 05:06:18 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Mon, 24 Apr 2006 10:06:18 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/tinted/rom rom_as.bmp,
	1.1, NONE rom_at.bmp, 1.1, NONE rom_bb.bmp, 1.1,
	NONE rom_ca.bmp, 1.1, NONE rom_dd.bmp, 1.1, NONE rom_ga.bmp,
	1.1, NONE rom_sb.bmp, 1.1, NONE rom_sc.bmp, 1.1,
	NONE romshipT.bmp, 1.1, NONE
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/tinted/rom
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9304/resources/ships/tinted/rom

Removed Files:
	rom_as.bmp rom_at.bmp rom_bb.bmp rom_ca.bmp rom_dd.bmp 
	rom_ga.bmp rom_sb.bmp rom_sc.bmp romshipT.bmp 
Log Message:
Removed a bunch of concactenated bitmaps that shouldn't have been put into the library (my bad).

--- rom_dd.bmp DELETED ---

--- rom_as.bmp DELETED ---

--- rom_at.bmp DELETED ---

--- rom_sc.bmp DELETED ---

--- rom_ca.bmp DELETED ---

--- rom_bb.bmp DELETED ---

--- romshipT.bmp DELETED ---

--- rom_ga.bmp DELETED ---

--- rom_sb.bmp DELETED ---



From modemhero at users.sourceforge.net  Mon Apr 24 05:06:18 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Mon, 24 Apr 2006 10:06:18 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/tinted/fed fed_as.bmp,
	1.1, NONE fed_at.bmp, 1.1, NONE fed_bb.bmp, 1.1,
	NONE fed_ca.bmp, 1.1, NONE fed_dd.bmp, 1.1, NONE fed_ga.bmp,
	1.1, NONE fed_sb.bmp, 1.1, NONE fed_sc.bmp, 1.1,
	NONE fedshipT.bmp, 1.1, NONE
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/tinted/fed
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9304/resources/ships/tinted/fed

Removed Files:
	fed_as.bmp fed_at.bmp fed_bb.bmp fed_ca.bmp fed_dd.bmp 
	fed_ga.bmp fed_sb.bmp fed_sc.bmp fedshipT.bmp 
Log Message:
Removed a bunch of concactenated bitmaps that shouldn't have been put into the library (my bad).

--- fed_bb.bmp DELETED ---

--- fed_sc.bmp DELETED ---

--- fed_dd.bmp DELETED ---

--- fed_ga.bmp DELETED ---

--- fedshipT.bmp DELETED ---

--- fed_as.bmp DELETED ---

--- fed_sb.bmp DELETED ---

--- fed_ca.bmp DELETED ---

--- fed_at.bmp DELETED ---



From modemhero at users.sourceforge.net  Mon Apr 24 05:06:18 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Mon, 24 Apr 2006 10:06:18 +0000
Subject: [netrek-cvs] client/netrekxp/resources/ships/tinted/ind ind_as.bmp,
	1.1, NONE ind_at.bmp, 1.1, NONE ind_bb.bmp, 1.1,
	NONE ind_ca.bmp, 1.1, NONE ind_dd.bmp, 1.1, NONE ind_ga.bmp,
	1.1, NONE ind_sb.bmp, 1.1, NONE ind_sc.bmp, 1.1,
	NONE indshipT.bmp, 1.1, NONE
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/ships/tinted/ind
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9304/resources/ships/tinted/ind

Removed Files:
	ind_as.bmp ind_at.bmp ind_bb.bmp ind_ca.bmp ind_dd.bmp 
	ind_ga.bmp ind_sb.bmp ind_sc.bmp indshipT.bmp 
Log Message:
Removed a bunch of concactenated bitmaps that shouldn't have been put into the library (my bad).

--- ind_at.bmp DELETED ---

--- ind_bb.bmp DELETED ---

--- indshipT.bmp DELETED ---

--- ind_dd.bmp DELETED ---

--- ind_as.bmp DELETED ---

--- ind_sb.bmp DELETED ---

--- ind_ga.bmp DELETED ---

--- ind_ca.bmp DELETED ---

--- ind_sc.bmp DELETED ---



From quozl at users.sourceforge.net  Mon Apr 24 05:12:19 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Mon, 24 Apr 2006 10:12:19 +0000
Subject: [netrek-cvs] server/Vanilla ChangeLog,1.31,1.32
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13843

Modified Files:
	ChangeLog 
Log Message:
conquest gloat

Index: ChangeLog
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- ChangeLog	23 Apr 2006 13:30:39 -0000	1.31
+++ ChangeLog	24 Apr 2006 10:12:17 -0000	1.32
@@ -1,3 +1,8 @@
+Mon Apr 24 19:59:29 2006  James Cameron  
+
+	* ntserv/conquer.c: move conquest animation sequence to separate
+	source file, and add an expanding ring of plasma torps.
+
 Sun Apr 23 23:20:15 2006  James Cameron  
 
 	* ntserv/daemonII.c (checkwin): change to conquest sequence,



From quozl at users.sourceforge.net  Mon Apr 24 05:12:19 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Mon, 24 Apr 2006 10:12:19 +0000
Subject: [netrek-cvs] server/Vanilla/include struct.h,1.5,1.6
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13843/include

Modified Files:
	struct.h 
Log Message:
conquest gloat

Index: struct.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/struct.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- struct.h	23 Apr 2006 13:30:40 -0000	1.5
+++ struct.h	24 Apr 2006 10:12:17 -0000	1.6
@@ -97,7 +97,7 @@
 #define pre_t_mode ((status->gameup) & GU_PRET)
 #define GU_BOT_IN_GAME 128
 #define bot_in_game ((status->gameup) & GU_BOT_IN_GAME)
-#define GU_GLOAT_CONQUER 256
+#define GU_CONQUER 256			/* conquest parade in progress	*/
 
 /* values of p_status */
 #define PFREE 		   0x0000



From quozl at users.sourceforge.net  Mon Apr 24 05:12:20 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Mon, 24 Apr 2006 10:12:20 +0000
Subject: [netrek-cvs] server/Vanilla/ntserv conquer.c, NONE, 1.1 Makefile.in,
	1.5, 1.6 daemonII.c, 1.10, 1.11 detonate.c, 1.2, 1.3 phaser.c,
	1.2, 1.3 torp.c, 1.2, 1.3
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/ntserv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13843/ntserv

Modified Files:
	Makefile.in daemonII.c detonate.c phaser.c torp.c 
Added Files:
	conquer.c 
Log Message:
conquest gloat

Index: phaser.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/phaser.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- phaser.c	23 Apr 2006 13:30:41 -0000	1.2
+++ phaser.c	24 Apr 2006 10:12:18 -0000	1.3
@@ -29,7 +29,7 @@
   U_LONG range_sq, this_range_sq;
   struct phaser *mine = &phasers[me->p_no];
 
-  if (status->gameup & GU_GLOAT_CONQUER) return;
+  if (status->gameup & GU_CONQUER) return;
 
   if (mine->ph_status != PHFREE) {
     new_warning(32, "Phasers have not recharged.");

--- NEW FILE: conquer.c ---
#include "copyright.h"
#include "config.h"
#include "defs.h"
#include "struct.h"
#include "data.h"

/* conquest gloating parade */

static int conquer_player;	/* player number that won	*/
static int conquer_planet;	/* planet they won at		*/
static int conquer_timer;	/* countdown timer		*/

#define CONQUER_TIMER_BEGIN	100	/* total parade length in ticks	*/
#define CONQUER_TIMER_DECLOAK	 90	/* threshold to decloak all	*/
#define CONQUER_TIMER_PARADE	 40	/* threshold to complete parade	*/
#define CONQUER_TIMER_GOODBYE	 10	/* threshold to say goodbye	*/

#define CONQUER_RING_RADIUS	  5	/* orbital radius of ring	*/

/* total bandwidth cost is 2000 bytes per second per slot over ten seconds */

/* borrowed from daemonII.c until we find a better place */
#define TORPFUSE 1
#define PLASMAFUSE 1
#define PLAYERFUSE 1

/* force decloak and visibility of all ships */
static void conquer_decloak()
{
	int h;
	struct player *j;

	for (h = 0, j = &players[0]; h < MAXPLAYER; h++, j++) {
                if (j->p_status == PFREE) continue;
		j->p_flags &= ~PFCLOAK;
		j->p_flags |= PFSEEN;
	}
}

/* cancel any inflight plasma, we want the plasma slots */
static void conquer_deplasma()
{
	struct torp *t;
	for (t = firstPlasma; t <= lastPlasma; t++) {
		t->t_status = TFREE;
	}
}

/* count the number of players to be paraded */
static int conquer_count_players()
{
	int n, h;
	struct player *j;
	for (n = 0, h = 0, j = &players[0]; h < MAXPLAYER; h++, j++) {
                if (j->p_status == PFREE) continue;
		if (j->p_no == conquer_player) continue;
		n++;
	}
	return n;
}

/* calculate parade ring coordinates */
static void conquer_ring_coordinates(struct player *j, int h, int n, int *x, int *y)
{
	j->p_dir = h*256/(n+1);
	j->p_desdir = j->p_dir;
	*x = planets[conquer_planet].pl_x + (ORBDIST * CONQUER_RING_RADIUS)
		* Cos[(u_char) (j->p_dir - (u_char) 64)];
	*y = planets[conquer_planet].pl_y + (ORBDIST * CONQUER_RING_RADIUS)
		* Sin[(u_char) (j->p_dir - (u_char) 64)];
}

/* animate a ring of plasma, in expanding spiral */
static void conquer_plasma_ring()
{
	struct torp *k;
	int np = 0, pn = 0;
	int radius = (CONQUER_TIMER_BEGIN - conquer_timer) 
		* CONQUER_RING_RADIUS * ORBDIST / CONQUER_TIMER_BEGIN;

	for (k = firstPlasma; k <= lastPlasma; k++, k++) {
		np++;
	}

	for (k = firstPlasma; k <= lastPlasma; k++, k++, pn++) {
		k->t_status = TMOVE;
		k->t_type = TPLASMA;
		k->t_attribute = 0;
		k->t_owner = conquer_player;
		k->t_dir = (pn*256/np)+conquer_timer;
		k->t_x = planets[conquer_planet].pl_x + radius
			* Cos[(u_char) (k->t_dir - (u_char) 64)];
		k->t_y = planets[conquer_planet].pl_y + radius
			* Sin[(u_char) (k->t_dir - (u_char) 64)];
		k->t_turns = k->t_damage = k->t_gspeed = k->t_fuse = 1;
		k->t_war = players[conquer_player].p_war;
		k->t_team = players[conquer_player].p_team;
		k->t_whodet = NODET;
	}
}

/* explode the ring of plasma */
static void conquer_plasma_explode()
{
	struct torp *k;
	int np = 0, pn = 0;
	for (k = firstPlasma; k <= lastPlasma; k++, k++) {
		np++;
	}
	for (k = firstPlasma; k <= lastPlasma; k++, k++, pn++) {
		k->t_status = TEXPLODE;
		k->t_fuse = 10/TORPFUSE; 
	}
}

/* animate a ring of ships, move them slowly into position */
static void conquer_ships_ring()
{
	int n, h;
	struct player *j;

	conquer_decloak();
	n = conquer_count_players();
	for (h = 0, j = &players[0]; h < MAXPLAYER; h++, j++) {
		int x, y, dx, dy;
                if (j->p_status == PFREE) continue;
		if (j->p_no == conquer_player) continue;
		conquer_ring_coordinates(j, h, n, &x, &y);
		dx = j->p_x - x;
		dy = j->p_y - y;
		if (abs(dx) < 50) {
			j->p_x = x;
			j->p_y = y;
		} else {
			j->p_x = j->p_x - (dx / 10);
			j->p_y = j->p_y - (dy / 10);
		}
	}


}

/* force the ring of ships into final position */
static void conquer_parade()
{
	int n, h;
	struct player *j;

	n = conquer_count_players();
	for (h = 0, j = &players[0]; h < MAXPLAYER; h++, j++) {
                if (j->p_status == PFREE) continue;
		if (j->p_no == conquer_player) continue;
		conquer_ring_coordinates(j, h, n, &j->p_x, &j->p_y);
		j->p_speed = 0;
	}
}

/* explode the ring of ships */
static void conquer_ships_explode()
{
	int h;
	struct player *j;


	for (h = 0, j = &players[0]; h < MAXPLAYER; h++, j++) {
                if (j->p_status == PFREE) continue;
#ifdef NEWBIESERVER
                /* Don't kill newbie robot. */
                if (status->gameup & GU_NEWBIE && j->p_flags & PFROBOT) continue;
#endif
#ifdef PRETSERVER
                /* Don't kill pre-T robot. */
                if (status->gameup & GU_PRET && j->p_flags & PFROBOT) continue;
#endif
                j->p_status = PEXPLODE;
                j->p_whydead = KWINNER;
                j->p_whodead = conquer_player;
                if (j->p_ship.s_type == STARBASE)
			j->p_explode = 2*SBEXPVIEWS/PLAYERFUSE;
                else
			j->p_explode = 10/PLAYERFUSE;
                j->p_ntorp = 0;
                j->p_nplasmatorp = 0;
	}
}

/* reset the galaxy after conquer */
static void conquer_galaxy_reset()
{
	int i;

	doResources();
	for (i = 0; i <= MAXTEAM; i++) {
                teams[i].s_turns = 0;
                teams[i].s_surrender = 0;
	}
}

static void conquer_end()
{
	conquer_ships_explode();
	conquer_galaxy_reset();
}

/* manage the animation sequence */
/* called by daemon once per tick while in a GU_CONQUER pause */
void conquer_update()
{
	conquer_timer--;
	if (conquer_timer == CONQUER_TIMER_DECLOAK) {
		conquer_decloak();
		conquer_deplasma();
	}
	if (conquer_timer < CONQUER_TIMER_DECLOAK) {
		conquer_plasma_ring();
		conquer_ships_ring();
	}
	if (conquer_timer == CONQUER_TIMER_PARADE)
		conquer_parade();
	if (conquer_timer == CONQUER_TIMER_GOODBYE)
		pmessage(0, MALL, "GOD->ALL", "Goodbye.");
	if (conquer_timer > 0) return;
	status->gameup &= ~(GU_PAUSED|GU_CONQUER);
	conquer_plasma_explode();
	conquer_end();
}

/* begin a conquer parade sequence */
void conquer_begin(struct player *winner)
{
#ifdef NOCONQUERPARADE
	conquer_end();
#else
	status->gameup |= GU_CONQUER|GU_PAUSED;
	conquer_player = winner->p_no;
	conquer_planet = winner->p_planet;
	conquer_timer = CONQUER_TIMER_BEGIN;
#endif
}

/*  Hey Emacs!
 * Local Variables:
 * c-file-style:"bsd"
 * End:
 */

Index: Makefile.in
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.in	22 Apr 2006 11:31:53 -0000	1.5
+++ Makefile.in	24 Apr 2006 10:12:17 -0000	1.6
@@ -43,7 +43,8 @@
 
 D_OBJS =    daemonII.o  sintab.o  sysdefaults.o  slotmaint.o \
 	    util.o  $(RANDOMO) getship.o smessage.o  queue.o \
-	    wander2.o openmem.o solicit.o ltd_stats.o libnetrek.a
+	    wander2.o openmem.o solicit.o ltd_stats.o conquer.o \
+	    libnetrek.a
 
 #	Src files
 

Index: torp.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/torp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- torp.c	23 Apr 2006 13:30:41 -0000	1.2
+++ torp.c	24 Apr 2006 10:12:18 -0000	1.3
@@ -53,7 +53,7 @@
   static LONG last_torp_fired_update = 0;
   struct torp *k;
 
-  if (status->gameup & GU_GLOAT_CONQUER) return;
+  if (status->gameup & GU_CONQUER) return;
 
   /*
    * Prevent player from firing more than one torp per update.  */

Index: detonate.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/detonate.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- detonate.c	23 Apr 2006 13:30:41 -0000	1.2
+++ detonate.c	24 Apr 2006 10:12:18 -0000	1.3
@@ -20,7 +20,7 @@
   struct player *j;
   struct torp *t;
 
-  if (status->gameup & GU_GLOAT_CONQUER) return;
+  if (status->gameup & GU_CONQUER) return;
 
   if (me->p_fuel < myship->s_detcost) {
     new_warning(UNDEF, "Not enough fuel to detonate");

Index: daemonII.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/daemonII.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- daemonII.c	23 Apr 2006 13:30:41 -0000	1.10
+++ daemonII.c	24 Apr 2006 10:12:17 -0000	1.11
@@ -101,7 +101,6 @@
 static void exitDaemon(int sig);
 static void save_planets(void);
 static void checkgen(int loser, struct player *winner);
-static void gloat_conquer_timer();
 static int checkwin(struct player *winner);
 static void ghostmess(struct player *victim);
 static void saveplayer(struct player *victim);
@@ -119,7 +118,7 @@
 static void conquerMessage(int winner);
 static void displayBest(FILE *conqfile, int team, int type);
 static void fork_robot(int robot);
-static void doResources(void);
+void doResources(void);
 /* static void doRotateGalaxy(void); */
 static void signal_servers(void);
 
@@ -569,7 +568,7 @@
     if (status->gameup & GU_PAUSED){ /* Game is paused */
       if (fuse(PLAYERFUSE))
         udplayerpause();
-      if (status->gameup & GU_GLOAT_CONQUER) gloat_conquer_timer();
+      if (status->gameup & GU_CONQUER) conquer_update();
       signal_servers();
       (void) SIGNAL(SIGALRM, move);
       return;
@@ -3710,106 +3709,6 @@
     /* constants (now in defs.h).  30-60 min for a coup.  4/15/92 TC */
 }
 
-#define GLOAT_TIMER_BEGIN 100
-#define GLOAT_TIMER_DECLOAK 90
-#define GLOAT_TIMER_PARADE 40
-#define GLOAT_TIMER_GOODBYE 10
-
-int gloat_player;
-int gloat_planet;
-int gloat_timer;
-
-static void gloat_conquer_decloak()
-{
-	int h;
-	struct player *j;
-
-	for (h = 0, j = &players[0]; h < MAXPLAYER; h++, j++) {
-                if (j->p_status == PFREE) continue;
-		if (j->p_flags & PFCLOAK) {
-			j->p_flags &= ~PFCLOAK;
-			// players[i].p_cloakphase--;
-		}
-	}
-}
-
-static void gloat_conquer_parade()
-{
-	int i, h;
-	struct player *j;
-
-	for (i = 0, h = 0, j = &players[0]; h < MAXPLAYER; h++, j++) {
-                if (j->p_status == PFREE) continue;
-		if (j->p_no == gloat_player) continue;
-		i++;
-	}
-	for (h = 0, j = &players[0]; h < MAXPLAYER; h++, j++) {
-                if (j->p_status == PFREE) continue;
-		if (j->p_no == gloat_player) continue;
-		j->p_dir = h*256/i;
-		j->p_desdir = j->p_dir;
-		j->p_x = planets[gloat_planet].pl_x + (ORBDIST * 5)
-                        * Cos[(u_char) (j->p_dir - (u_char) 64)];
-		j->p_y = planets[gloat_planet].pl_y + (ORBDIST * 5)
-                        * Sin[(u_char) (j->p_dir - (u_char) 64)];
-	}
-}
-
-static void gloat_conquer_kill()
-{
-	int h;
-	struct player *j;
-
-	for (h = 0, j = &players[0]; h < MAXPLAYER; h++, j++) {
-                if (j->p_status == PFREE) continue;
-#ifdef NEWBIESERVER
-                /* Don't kill newbie robot. */
-                if (status->gameup & GU_NEWBIE && j->p_flags & PFROBOT) continue;
-#endif
-#ifdef PRETSERVER
-                /* Don't kill pre-T robot. */
-                if (status->gameup & GU_PRET && j->p_flags & PFROBOT) continue;
-#endif
-                j->p_status = PEXPLODE;
-                j->p_whydead = KWINNER;
-                j->p_whodead = gloat_player;
-                if (j->p_ship.s_type == STARBASE)
-			j->p_explode = 2*SBEXPVIEWS/PLAYERFUSE;
-                else
-			j->p_explode = 10/PLAYERFUSE;
-                j->p_ntorp = 0;
-                j->p_nplasmatorp = 0;
-	}
-}
-
-static void gloat_conquer_reset()
-{
-	int i;
-
-	doResources();
-	ERROR(2,("Resetting galaxy after Conquer.\n"));
-	for (i = 0; i <= MAXTEAM; i++) {
-                teams[i].s_turns = 0;
-                teams[i].s_surrender = 0;
-	}
-}
-
-static void gloat_conquer_timer()
-{
-	gloat_timer--;
-	if (gloat_timer == GLOAT_TIMER_DECLOAK)
-		gloat_conquer_decloak();
-	if (gloat_timer == GLOAT_TIMER_PARADE)
-		gloat_conquer_parade();
-	if (gloat_timer == GLOAT_TIMER_GOODBYE)
-		pmessage(0, MALL, "GOD->ALL", "Goodbye.");
-	if (gloat_timer > 0) return;
-	
-	status->gameup &= ~(GU_PAUSED|GU_GLOAT_CONQUER);
-	gloat_conquer_kill();
-	gloat_conquer_reset();
-}
-
 /* This function is called when a planet has been taken over.
    It checks all the planets to see if the victory conditions
    are right.  If so, it blows everyone out of the game and
@@ -3869,10 +3768,7 @@
     for (i = 0; i < 4; i++) {
         if (team[1<= VICTORY) {
             conquerMessage(winner->p_team);
-	    status->gameup |= GU_GLOAT_CONQUER|GU_PAUSED;
-	    gloat_player = winner->p_no;
-	    gloat_planet = winner->p_planet;
-	    gloat_timer = GLOAT_TIMER_BEGIN;
+	    conquer_begin(winner);
 	    return 1;
         }
     }
@@ -4393,7 +4289,7 @@
  { 31, 32, 33, 35, 36,},
 };
 
-static void doResources(void)
+void doResources(void)
 {
   int i, j, k, which;
   MCOPY(pdata, planets, sizeof(pdata));
@@ -4447,7 +4343,7 @@
   }
 }
 #else
-static void doResources(void)
+void doResources(void)
 {
     int i;
     int agricount[4];



From quozl at users.sourceforge.net  Mon Apr 24 07:35:19 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Mon, 24 Apr 2006 12:35:19 +0000
Subject: [netrek-cvs] server/Vanilla NEWS,1.16,1.17 ChangeLog,1.32,1.33
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20227

Modified Files:
	NEWS ChangeLog 
Log Message:
vote to ban

Index: NEWS
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/NEWS,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- NEWS	23 Apr 2006 13:30:38 -0000	1.16
+++ NEWS	24 Apr 2006 12:35:17 -0000	1.17
@@ -1,3 +1,4 @@
+- add vote to temporarily ban a player [Cameron]
 - change to conquest sequence to add a parade [Cameron]
 - fix unrealistic robot boredom timer [Cameron]
 - add galaxy configuration tool, setplanet [Cameron]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- ChangeLog	24 Apr 2006 10:12:17 -0000	1.32
+++ ChangeLog	24 Apr 2006 12:35:17 -0000	1.33
@@ -1,3 +1,20 @@
+Mon Apr 24 22:30:47 2006  James Cameron  
+
+	* ntserv/ntscmds.c: add a vote to temporarily ban, which requires
+	100 non-banned logins before the temporary ban expires.  If the
+	banned IP address tries in the meanwhile, the countdown is
+	manipulated upwards.
+
+	* include/config.h.in: add a vote to temporarily ban, and disable
+	VICIOUS_EJECT now that a ban vote is available.
+
+	* include/struct.h: add a structure for temporary bans, which
+	expire according to the number of login attempts that are not
+	banned.
+
+	* ntserv/main.c (main): split permanent bans from temporary bans,
+	rename the functions, and give different responses in messages.
+	
 Mon Apr 24 19:59:29 2006  James Cameron  
 
 	* ntserv/conquer.c: move conquest animation sequence to separate



From quozl at users.sourceforge.net  Mon Apr 24 07:35:19 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Mon, 24 Apr 2006 12:35:19 +0000
Subject: [netrek-cvs] server/Vanilla/include config.h.in, 1.4, 1.5 data.h,
	1.3, 1.4 defs.h, 1.5, 1.6 struct.h, 1.6, 1.7
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20227/include

Modified Files:
	config.h.in data.h defs.h struct.h 
Log Message:
vote to ban

Index: defs.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/defs.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- defs.h	10 Apr 2006 11:57:00 -0000	1.5
+++ defs.h	24 Apr 2006 12:35:17 -0000	1.6
@@ -17,6 +17,7 @@
 #define FNAMESIZE	256
 
 #define MAXHOSTNAMESIZE	64	/* maximum host name size in characters	*/
+#define MAXBANS 32
 
 #define NODET (char)(-1) /* isae - chain reaction case */
 
@@ -65,9 +66,10 @@
 
 #ifdef VOTING
 #define PV_EXTRA 8			/* # of non-eject vote types      */
-#define PV_TOTAL MAXPLAYER+PV_EXTRA	/* total number of voting slots   */
-#define PV_EJECT 0			/* array base for eject votes     */
-#define PV_OTHER MAXPLAYER		/* array base for non-eject votes */
+#define PV_TOTAL MAXPLAYER*2+PV_EXTRA	/* total number of voting slots   */
+#define PV_EJECT 0*MAXPLAYER		/* array base for eject votes     */
+#define PV_BAN   1*MAXPLAYER		/* array base for eject votes     */
+#define PV_OTHER 2*MAXPLAYER		/* array base for non-eject votes */
 /* see ntserv/ntscmds.c for array */
 #endif
 

Index: config.h.in
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/config.h.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- config.h.in	10 Apr 2006 04:24:51 -0000	1.4
+++ config.h.in	24 Apr 2006 12:35:17 -0000	1.5
@@ -347,20 +347,23 @@
                                 /* ALLOW_EJECT     - define to allow players to
                                                      eject others */
                                 
-                                /* VICIOUS_EJECT   - free's the players slot
-                                		     after ejection */
+                                /* ALLOW_BAN       - define to allow players to
+                                                     eject and ban others */
+                                
+				/* VICIOUS_EJECT   - free's the players slot
+						     after ejection,
+						     causes some clients to 
+						     hang */
 
 				/* EJECT_ONLY_IF_QUEUE - refuses to eject
 							 unless queue != 0 */
 
-				/* EJECT_PERSISTENCY - does not let player back
-				in if same character name or same ip address */
 #ifdef VOTING
-#undef ALLOW_EJECT
+#define ALLOW_EJECT
 #ifdef ALLOW_EJECT
-#define VICIOUS_EJECT
-#define EJECT_ONLY_IF_QUEUE
-#define EJECT_PERSISTENCY
+#define ALLOW_BAN
+#undef VICIOUS_EJECT
+#undef EJECT_ONLY_IF_QUEUE
 #endif
 #endif
 

Index: data.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/data.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- data.h	27 Sep 2005 12:26:37 -0000	1.3
+++ data.h	24 Apr 2006 12:35:17 -0000	1.4
@@ -68,6 +68,7 @@
 extern struct ship *shipvals;
 extern struct pqueue *queues;
 extern struct queuewait *waiting;
+extern struct ban *bans;
 
 extern int	oldalert;
 extern int	remap[];

Index: struct.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/struct.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- struct.h	24 Apr 2006 10:12:17 -0000	1.6
+++ struct.h	24 Apr 2006 12:35:17 -0000	1.7
@@ -586,6 +586,11 @@
     char *name;
 };
 
+struct ban {
+    int b_expire;		/* joins to see before expiry	*/
+    char b_ip[NAME_LEN];	/* ip address banned		*/
+};
+
 struct memory {
     struct player	players[MAXPLAYER];
     struct torp		torps[MAXPLAYER * (MAXTORP + MAXPLASMA)];
@@ -598,7 +603,9 @@
     struct ship		shipvals[NUM_TYPES];
     struct pqueue       queues[MAXQUEUE];
     struct queuewait    waiting[MAXWAITING];
+    struct ban          bans[MAXBANS];
 };
+/* note: adding to struct memory requires changes to openmem.c */
 
 #ifdef RSA
 struct rsa_key {
@@ -716,3 +723,10 @@
 #endif
 
 #endif /* __INCLUDED_struct_h__ */
+
+/*  Hey Emacs!
+ * Local Variables:
+ * c-basic-offset:4
+ * indent-tabs-mode:"t"
+ * End:
+ */



From quozl at users.sourceforge.net  Mon Apr 24 07:35:19 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Mon, 24 Apr 2006 12:35:19 +0000
Subject: [netrek-cvs] server/Vanilla/ntserv data.c, 1.4, 1.5 ntscmds.c, 1.7,
	1.8 main.c, 1.6, 1.7 openmem.c, 1.2, 1.3
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/ntserv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20227/ntserv

Modified Files:
	data.c ntscmds.c main.c openmem.c 
Log Message:
vote to ban

Index: ntscmds.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/ntscmds.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ntscmds.c	23 Apr 2006 10:39:10 -0000	1.7
+++ ntscmds.c	24 Apr 2006 12:35:17 -0000	1.8
@@ -30,6 +30,10 @@
 void do_player_eject(int who, int player, int mflags, int sendto);
 #endif
 
+#if defined (ALLOW_BAN)
+void do_player_ban(int who, int player, int mflags, int sendto);
+#endif
+
 #if defined (AUTO_INL)
 void do_start_inl(void);
 #endif
@@ -71,6 +75,9 @@
 #if defined (ALLOW_EJECT)
 void eject_player(int who);
 #endif
+#if defined (ALLOW_BAN)
+void ban_player(int who);
+#endif
 void do_client_query(char *comm, struct message *mess, int who);
 void do_ping_query(char *comm, struct message *mess, int who);
 void do_stats_query(char *comm, struct message *mess, int who);
@@ -189,6 +196,13 @@
 	do_player_eject,				/* EJECT */
 	2, PV_EJECT, 120, 600},
 #endif
+#if defined(ALLOW_BAN)
+    { "BAN",
+	C_VC_TEAM | C_GLOG | C_PLAYER | C_PR_INPICKUP,
+	"Eject and ban a player       e.g. 'BAN 0'", 
+	do_player_ban,					/* BAN */
+	2, PV_BAN, 120, 600},
+#endif
 #if defined(TRIPLE_PLANET_MAYHEM)
     { "TRIPLE",
         C_VC_ALL | C_GLOG | C_PR_INPICKUP,
@@ -272,9 +286,24 @@
     }
 
     pmessage(0, MALL, addr_mess(who,MALL), 
-	" %2s has been ejected by their team", j->p_mapchars);
+	"%2s has been ejected by their team", j->p_mapchars);
 
     eject_player(j->p_no);
+}
+
+void eject_player(int who)
+{
+  struct player *j;
+
+  j = &players[who];
+  j->p_ship.s_type = STARBASE;
+  j->p_whydead=KQUIT;
+  j->p_explode=10;
+  /* note VICIOUS_EJECT prevents animation of ship explosion */
+  j->p_status=PEXPLODE;
+  j->p_whodead=me->p_no;
+  bay_release(j);
+
 #if defined(VICIOUS_EJECT)
                                       /* Eject AND free the slot. I am sick
                                          of the idiots who login and just
@@ -288,22 +317,57 @@
       freeslot(j);
     }
 #endif
+
 }
+#endif /* ALLOW_EJECT */
 
-void eject_player(int who)
+#if defined (ALLOW_BAN)
+void do_player_ban(int who, int player, int mflags, int sendto)
 {
-  struct player* j;
+    struct player *j;
+    char *reason = NULL;
 
-  j = &players[who];
-  j->p_ship.s_type = STARBASE;
-  j->p_whydead=KQUIT;
-  j->p_explode=10;
-  /* note VICIOUS_EJECT prevents animation of ship explosion */
-  j->p_status=PEXPLODE;
-  j->p_whodead=me->p_no;
-  bay_release(j);
+    j = &players[player];
+
+    if (j->p_status == PFREE) {
+      reason = "You may not ban a free slot.";
+    } else if (j->p_flags & PFROBOT) {
+      reason = "You may not ban a robot.";
+    } else if (j->p_team != players[who].p_team) {
+      reason = "You may not ban players of the other team.";
+    }
+
+    if (reason != NULL) {
+      pmessage(players[who].p_team, MTEAM, 
+	       addr_mess(players[who].p_team,MTEAM), 
+	       reason);
+      return;
+    }
+
+    pmessage(0, MALL, addr_mess(who,MALL), 
+	"%2s has been temporarily banned by their team", j->p_mapchars);
+
+    eject_player(j->p_no);
+    ban_player(j->p_no);
 }
-#endif /* ALLOW_EJECT */
+
+void ban_player(int who)
+{
+  int i;
+  struct player *j = &players[who];
+  for (i=0; ib_expire == 0) {
+      strcpy(b->b_ip, j->p_ip);
+      b->b_expire = 100;
+      ERROR(2,( "ban of %s was voted\n", b->b_ip));
+      return;
+    }
+  }
+  pmessage(0, MALL, addr_mess(who,MALL), 
+	   " temporary ban list is full, ban ineffective");
+}
+#endif /* ALLOW_BAN */
 
 #if defined(AUTO_PRACTICE)
 void do_start_basep(void)

Index: data.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/data.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- data.c	22 Apr 2006 11:31:53 -0000	1.4
+++ data.c	24 Apr 2006 12:35:17 -0000	1.5
@@ -23,6 +23,7 @@
 struct ship *shipvals;
 struct pqueue *queues;
 struct queuewait *waiting;
+struct ban *bans;
 
 int	oldalert = PFGREEN;	/* Avoid changing more than we have to */
 

Index: main.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/main.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- main.c	22 Apr 2006 11:31:53 -0000	1.6
+++ main.c	24 Apr 2006 12:35:17 -0000	1.7
@@ -42,7 +42,8 @@
 static void sendMotd(void);
 static void sendConfigMsg(void);
 static void printStats(void);
-static int checkbanned(char *login, char *host);
+static int check_temporary_bans(char *ip);
+static int check_permanent_bans(char *login, char *host);
 
 extern int ignored[MAXPLAYER];
 int indie = 0;			/* always be indie 8/28/91 TC */
@@ -406,25 +407,34 @@
     me->p_status = PALIVE;			/* Put player in game */
     me->p_ghostbuster = 0;
 
-    if (!bypassed)
-    if (checkbanned(login, host) == TRUE) {
-      FILE        *logfile;
-      time_t curtime;
-
-      pmessage(0, MALL, "GOD->ALL","%s (%s@%s) is banned from the game.",
-              me->p_name, me->p_login, host);
-      new_warning(UNDEF,"You are banned from the game.");
-      me->p_explode=100;
-      me->p_status=PEXPLODE;
-      me->p_whydead=KQUIT;   /* make him self destruct */
-      me->p_whodead=0;
-      logfile=fopen(LogFileName, "a");
-      if (logfile) {
-        curtime=time(NULL);
-        fprintf(logfile, "Banned and exiting: %s (%s@%s), (%c), %s",
-              me->p_name,  me->p_login, host, shipnos[me->p_no], ctime(&curtime)
-);
-        fclose(logfile);
+    if (!bypassed) {
+      char *reason = NULL;
+      if (check_permanent_bans(login, host) == TRUE) {
+	reason = "banned by the administrator";
+      } else if (check_permanent_bans(login, me->p_ip) == TRUE) {
+	reason = "banned by the administrator";
+      } else if (check_temporary_bans(me->p_ip) == TRUE) {
+	reason = "banned by the players";
+      }
+      if (reason != NULL) {
+	FILE *logfile;
+	time_t curtime;
+	
+	pmessage(0, MALL, "GOD->ALL","%s (%s@%s) is %s.",
+		 me->p_name, me->p_login, me->p_ip, reason);
+	new_warning(UNDEF,"You are banned from the game.");
+	me->p_explode=100;
+	me->p_status=PEXPLODE;
+	me->p_whydead=KQUIT;   /* make him self destruct */
+	me->p_whodead=0;
+	logfile=fopen(LogFileName, "a");
+	if (logfile) {
+	  curtime=time(NULL);
+	  fprintf(logfile, "Banned and exiting: %s (%s@%s), (%c), %s",
+		  me->p_name,  me->p_login, host, shipnos[me->p_no], ctime(&curtime)
+		  );
+	  fclose(logfile);
+	}
       }
     }
 
@@ -813,12 +823,34 @@
     fclose(logfile);
 }
 
-static int checkbanned(char *login, char *host)
+/* check temporary bans voted */
+static int check_temporary_bans(char *ip)
+{
+  int i;
+  for(i=0; ib_expire) {
+      if (!strcmp(b->b_ip, ip)) {
+	ERROR(2,( "ban of %s has been probed\n", b->b_ip));
+	b->b_expire += 10;
+	return TRUE;
+      }
+      b->b_expire--;
+      if (!b->b_expire) {
+	ERROR(2,( "ban of %s has expired\n", b->b_ip));
+      }
+    }
+  }
+  return FALSE;
+}
+
+/* check permanent bans in file */
+static int check_permanent_bans(char *login, char *host)
 {
   FILE  *bannedfile;
   char  log_buf[64], host_buf[64], line_buf[160];
   char  *position;
-  int           num1;
+  int   num1;
   int   Hits=0;                 /* Hits==2 means we're banned */
 
   if ((bannedfile = fopen(Banned_File, "r")) == NULL) {

Index: openmem.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/openmem.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- openmem.c	22 Apr 2006 02:16:46 -0000	1.2
+++ openmem.c	24 Apr 2006 12:35:17 -0000	1.3
@@ -79,6 +79,7 @@
     shipvals = sharedMemory->shipvals;
     queues = sharedMemory->queues;
     waiting = sharedMemory->waiting;
+    bans = sharedMemory->bans;
 }
 
 /*ARGSUSED*/



From modemhero at users.sourceforge.net  Mon Apr 24 09:05:19 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Mon, 24 Apr 2006 14:05:19 +0000
Subject: [netrek-cvs] client/netrekxp/resources/sounds nt_cloaked.wav, 1.2,
	1.3 nt_enter_ship.wav, 1.2, 1.3 nt_intro.wav, 1.1,
	1.2 nt_phaser.wav, 1.2, 1.3 nt_phaser_other.wav, 1.2, 1.3
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/sounds
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23391/resources/sounds

Modified Files:
	nt_cloaked.wav nt_enter_ship.wav nt_intro.wav nt_phaser.wav 
	nt_phaser_other.wav 
Log Message:
Converted intro to 22 KHz to be compatabile with SDL, touched up a few other sound files that had been clipped for brevity.

Index: nt_phaser.wav
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/sounds/nt_phaser.wav,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsqxmAkz and /tmp/cvsNc1Ef6 differ

Index: nt_enter_ship.wav
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/sounds/nt_enter_ship.wav,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsVoxGkG and /tmp/cvsenV4xd differ

Index: nt_intro.wav
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/sounds/nt_intro.wav,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvscZRdiK and /tmp/cvsQLOkEh differ

Index: nt_phaser_other.wav
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/sounds/nt_phaser_other.wav,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsWvglgK and /tmp/cvsDMbl1h differ

Index: nt_cloaked.wav
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/sounds/nt_cloaked.wav,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvscaEhSN and /tmp/cvs3waXHl differ



From modemhero at users.sourceforge.net  Mon Apr 24 09:13:27 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Mon, 24 Apr 2006 14:13:27 +0000
Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.18,1.19
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30379/resources/docs

Modified Files:
	changes.txt 
Log Message:
Initial SDL patch for multilayered sounds.

Index: changes.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- changes.txt	22 Apr 2006 14:11:47 -0000	1.18
+++ changes.txt	24 Apr 2006 14:13:25 -0000	1.19
@@ -1,4 +1,5 @@
 Version TBA:
+- initial SDL implementation
 - continuousMouse and continuousMouseFix now default to on
 - fixed the mono fed sb bitmaps so they rotate more cleanly
 - updated NetrekXP manual (in docs folder), removed old cow manuals.



From modemhero at users.sourceforge.net  Mon Apr 24 09:13:28 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Mon, 24 Apr 2006 14:13:28 +0000
Subject: [netrek-cvs] client/netrekxp/src beeplite.c, 1.3, 1.4 cowmain.c, 1.7,
	1.8 findslot.c, 1.2, 1.3 input.c, 1.4, 1.5 local.c, 1.6,
	1.7 makefile, 1.5, 1.6 newwin.c, 1.9, 1.10 playback.c, 1.8,
	1.9 sound.c, 1.2, 1.3
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30379/src

Modified Files:
	beeplite.c cowmain.c findslot.c input.c local.c makefile 
	newwin.c playback.c sound.c 
Log Message:
Initial SDL patch for multilayered sounds.

Index: findslot.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/findslot.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- findslot.c	21 Apr 2006 12:00:06 -0000	1.2
+++ findslot.c	24 Apr 2006 14:13:25 -0000	1.3
@@ -111,9 +111,9 @@
         socketPause ();
         if (isServerDead ())
         {
-
-#ifdef SOUND
-            Exit_Sound ();
+        	
+#if defined(SOUND) && !defined(HAVE_SDL)
+            Exit_Sound();
 #endif
 
             LineToConsole ("Shit!  Ghostbusted!\n");
@@ -158,8 +158,8 @@
         if (isServerDead ())
         {
 
-#ifdef SOUND
-            Exit_Sound ();
+#if defined(SOUND) && !defined(HAVE_SDL)
+            Exit_Sound();
 #endif
 
             LineToConsole ("Damn, We've been ghostbusted!\n");
@@ -217,8 +217,8 @@
                 else if (event.Window == qwin)
                 {
 
-#ifdef SOUND
-                    Exit_Sound ();
+#if defined(SOUND) && !defined(HAVE_SDL)
+                    Exit_Sound();
 #endif
 
                     LineToConsole ("OK, bye!\n");

Index: sound.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/sound.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sound.c	21 Apr 2006 12:00:07 -0000	1.2
+++ sound.c	24 Apr 2006 14:13:25 -0000	1.3
@@ -10,6 +10,11 @@
 #include "config.h"
 
 #ifdef SOUND
+#if defined(HAVE_SDL)
+#include "SDL.h"
+#include "SDL_mixer.h"
+#endif
+
 #include "copyright.h"
 
 #include 
@@ -25,6 +30,11 @@
 #include "audio.h"
 #include "proto.h"
 
+#if defined(HAVE_SDL)
+/* This is probably unix specific path */
+Mix_Chunk *sounds[NUM_WAVES];
+
+#else 
 /* Each sound has a priority which controls what can override what
    Currently these are set as follows:
 
@@ -69,21 +79,73 @@
     {"nt_explosion_other", 10, 1}
 };
 
-static char sound_prefix[PATH_MAX];
 static int current_sound = NO_SOUND;
 static int sound_other = 1;     /* Play other ship's sounds? */
+#endif // Not SDL sound
 
-extern void
-Exit_Sound (void)
+static char sound_prefix[PATH_MAX];
+
+#if defined(HAVE_SDL)
+
+/*
+ * Build the patch to the sound files 
+ */
+char *DATAFILE(const char* wav) {    
+    strcpy(sound_prefix, sounddir);
+    strcat(sound_prefix, "/");
+    strcat(sound_prefix, wav);
+    return sound_prefix;
+} 
+
+/*
+ * Load the .wave files into the sounds array
+ */
+int loadSounds(void) {
+  int i;
+
+  sounds[CLOAKED_WAV] = Mix_LoadWAV(DATAFILE("nt_cloaked.wav"));
+  sounds[ENGINE_WAV] = Mix_LoadWAV(DATAFILE("nt_engine.wav"));
+  sounds[ENTER_SHIP_WAV] = Mix_LoadWAV(DATAFILE("nt_enter_ship.wav"));
+  sounds[EXPLOSION_WAV] = Mix_LoadWAV(DATAFILE("nt_explosion.wav"));
+  sounds[EXPLOSION_OTHER_WAV] = Mix_LoadWAV(DATAFILE("nt_explosion_other.wav"));
+  sounds[FIRE_PLASMA_WAV] = Mix_LoadWAV(DATAFILE("nt_fire_plasma.wav"));
+  sounds[FIRE_TORP_WAV] = Mix_LoadWAV(DATAFILE("nt_fire_torp.wav"));
+  sounds[FIRE_TORP_OTHER_WAV] = Mix_LoadWAV(DATAFILE("nt_fire_torp_other.wav"));
+  sounds[INTRO_WAV] = Mix_LoadWAV(DATAFILE("nt_intro.wav"));
+  sounds[MESSAGE_WAV] = Mix_LoadWAV(DATAFILE("nt_message.wav"));
+  sounds[PHASER_WAV] = Mix_LoadWAV(DATAFILE("nt_phaser.wav"));
+  sounds[PHASER_OTHER_WAV] = Mix_LoadWAV(DATAFILE("nt_phaser_other.wav"));
+  sounds[PLASMA_HIT_WAV] = Mix_LoadWAV(DATAFILE("nt_plasma_hit.wav"));
+  sounds[RED_ALERT_WAV] = Mix_LoadWAV(DATAFILE("nt_red_alert.wav"));
+  sounds[SELF_DESTRUCT_WAV] = Mix_LoadWAV(DATAFILE("nt_self_destruct.wav"));
+  sounds[SHIELD_DOWN_WAV] = Mix_LoadWAV(DATAFILE("nt_shield_down.wav"));
+  sounds[SHIELD_UP_WAV] = Mix_LoadWAV(DATAFILE("nt_shield_up.wav"));
+  sounds[TORP_HIT_WAV] = Mix_LoadWAV(DATAFILE("nt_torp_hit.wav"));
+  sounds[UNCLOAK_WAV] = Mix_LoadWAV(DATAFILE("nt_uncloak.wav"));
+  sounds[WARNING_WAV] = Mix_LoadWAV(DATAFILE("nt_warning.wav"));
+
+  for (i=0; i < NUM_WAVES; i++) {
+    if (!sounds[i]) {
+      LineToConsole("Mix_LoadWAV sound[%d] could not be loaded. Check soundDir in your .netrekrc: %s\n", i, Mix_GetError());
+      return(-1);
+    }
+  }
+
+  return(1);
+}
+#endif
+
+#if !defined(HAVE_SDL)
+extern void Exit_Sound (void)
 {
     if (sound_init)
         ExitSound ();
     sound_init = 0;
     sound_toggle = 0;
 }
+#endif
 
-extern void
-Init_Sound (void)
+extern void Init_Sound (void)
 {
     char buf[PATH_MAX];
 
@@ -101,7 +163,33 @@
             else
                 sounddir = "./sounds";
         }
+        
+#if defined(HAVE_SDL)
+#ifdef DEBUG
+	LineToConsole ("Init_Sound using SDL\n");
+#endif
+
+    	/* Initialize the SDL library */
+    	if (SDL_Init(SDL_INIT_AUDIO) < 0)
+      		LineToConsole("Couldn't initialize SDL: %s\n",SDL_GetError());
 
+    	atexit(SDL_Quit);
+
+    	/* Open the audio device at 22050 Hz 8 bit Microsoft PCM with stereo */
+    	if (Mix_OpenAudio(22050, AUDIO_U8, 2, 1024) < 0) 
+      		LineToConsole("Mix_OpenAudio: %s\n", Mix_GetError());
+
+    	/* If we successfully loaded the wav files, so shut-off sound_init and play
+    	 * the introduction
+    	 */
+    	if (loadSounds())
+    	{
+     	  if (Mix_PlayChannel(-1, sounds[INTRO_WAV], 0) < 0)
+		LineToConsole("Mix_PlayChannel: %s\n", Mix_GetError());
+      	}
+      	/* Default of 8 channels not enough */
+      	Mix_AllocateChannels(16);
+#else
         if (InitSound () == -1)
         {
             sound_toggle = 0;
@@ -122,12 +210,25 @@
             strcat (buf, "/nt_intro");
             StartSound (buf);
         }
+#endif
     }
 }
 
-extern void
-Play_Sound (int type)
+extern void Play_Sound (int type)
 {
+#if defined(HAVE_SDL)
+
+    if (!sound_init)
+	return;
+
+    if ((type >= NUM_WAVES) || (type < 0))
+        LineToConsole("Invalid sound type %d\n", type);
+
+    if (Mix_PlayChannel(-1, sounds[type], 0) < 0)
+        LineToConsole("Mix_PlayChannel: %s\n", Mix_GetError());
+
+
+#else
     char buf[PATH_MAX];
 
     /*  Don't play other ship's sounds if turned off */
@@ -146,15 +247,16 @@
 
     if (!(sound_toggle))
         current_sound = NO_SOUND;
+#endif
 }
 
-extern void
-Abort_Sound (int type)
+#if !defined(HAVE_SDL)
+extern void Abort_Sound (int type)
 {
     if ((current_sound != NO_SOUND) && (type == current_sound))
         StopSound ();
 }
-
+#endif
 
 /* Sound options window stuff */
 
@@ -165,20 +267,24 @@
 
 static void soundrefresh (int i);
 
-extern void
-soundwindow (void)
+extern void soundwindow (void)
 {
+#if defined(HAVE_SDL)
+    char *buf="All or nothing with SDL sound. Sorry";
+    W_WriteText(soundWin, 0, 0, textColor, buf, strlen(buf), 0);
+#else
     int i;
 
     for (i = 0; i <= SOUND_DONE; i++)
         soundrefresh (i);
+#endif
 
     /* Map window */
     W_MapWindow (soundWin);
 }
 
-static void
-soundrefresh (int i)
+#if !defined(HAVE_SDL)
+static void soundrefresh (int i)
 {
     char buf[BUFSIZ], *flag;
 
@@ -265,10 +371,11 @@
 
     W_WriteText (soundWin, 0, i, textColor, buf, strlen (buf), 0);
 }
+#endif /* HAVE_SDL */
 
-void
-soundaction (W_Event * data)
+void soundaction (W_Event * data)
 {
+#if !defined(HAVE_SDL)
     int i, j;
 
     i = data->y;
@@ -322,10 +429,10 @@
     {
         sounddone ();
     }
+#endif /* HAVE_SDL */
 }
 
-extern void
-sounddone (void)
+extern void sounddone (void)
 {
     W_UnmapWindow (soundWin);
 }

Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- newwin.c	21 Apr 2006 12:00:07 -0000	1.9
+++ newwin.c	24 Apr 2006 14:13:25 -0000	1.10
@@ -579,10 +579,15 @@
 #endif
 
 #ifdef SOUND
-    soundWin = W_MakeMenu ("sound", WINSIDE + 20, -BORDER + 10, 30, MESSAGE_SOUND + 4, NULL, 2);
-    W_SetWindowKeyDownHandler (soundWin, soundaction);
-    W_SetWindowButtonHandler (soundWin, soundaction);
-    W_DefineArrowCursor (soundWin);
+#if defined(HAVE_SDL)
+    soundWin = W_MakeMenu("sound", WINSIDE + 20, -BORDER + 10, 40, 1, NULL, 2);
+#else
+    soundWin = W_MakeMenu("sound", WINSIDE + 20, -BORDER + 10, 30,
+			MESSAGE_SOUND + 4, NULL, 2);
+    W_SetWindowKeyDownHandler(soundWin, soundaction);
+    W_SetWindowButtonHandler(soundWin, soundaction);
+    W_DefineArrowCursor(soundWin);
+#endif
 #endif
 
 #ifdef TOOLS

Index: input.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/input.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- input.c	21 Apr 2006 12:00:07 -0000	1.4
+++ input.c	24 Apr 2006 14:13:25 -0000	1.5
@@ -1510,7 +1510,11 @@
 			/* Here we will have to enter message_on () followed by
 			   smessage to player */
 #ifdef SOUND
-			Play_Sound (MESSAGE_SOUND);
+#if defined(HAVE_SDL)
+  			Play_Sound(MESSAGE_WAV);
+#else
+  			Play_Sound(MESSAGE_SOUND);
+#endif
 #endif
 			message_on ();
 			data->key = players[target->o_num].p_mapchars[1];
@@ -1524,7 +1528,11 @@
 			/* Here we will have to enter message_on () followed by
 			   smessage to player */
 #ifdef SOUND
-			Play_Sound (MESSAGE_SOUND);
+#if defined(HAVE_SDL)
+  			Play_Sound(MESSAGE_WAV);
+#else
+  			Play_Sound(MESSAGE_SOUND);
+#endif
 #endif
 			message_on ();
 			data->key = 'T';
@@ -1538,7 +1546,11 @@
 			/* Here we will have to enter message_on () followed by
 			   smessage to player */
 #ifdef SOUND
-			Play_Sound (MESSAGE_SOUND);
+#if defined(HAVE_SDL)
+  			Play_Sound(MESSAGE_WAV);
+#else
+  			Play_Sound(MESSAGE_SOUND);
+#endif
 #endif
 			message_on ();
 			data->key = 'A';
@@ -2713,7 +2725,11 @@
 {
 
 #ifdef SOUND
-    Play_Sound (SELF_DESTRUCT_SOUND);
+#if defined(HAVE_SDL)
+    Play_Sound(SELF_DESTRUCT_WAV);
+#else
+    Play_Sound(SELF_DESTRUCT_SOUND);
+#endif
 #endif
 
     sendQuitReq ();
@@ -3133,7 +3149,11 @@
 {
 
 #ifdef SOUND
-    Play_Sound (MESSAGE_SOUND);
+#if defined(HAVE_SDL)
+    Play_Sound(MESSAGE_WAV);
+#else
+    Play_Sound(MESSAGE_SOUND);
+#endif
 #endif
 
     message_on ();
@@ -3197,7 +3217,11 @@
 {
 
 #ifdef SOUND
-    Play_Sound (SELF_DESTRUCT_SOUND);
+#if defined(HAVE_SDL)
+    Play_Sound(SELF_DESTRUCT_WAV);
+#else
+    Play_Sound(SELF_DESTRUCT_SOUND);
+#endif
 #endif
 
     fastQuit = 1;

Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- local.c	21 Apr 2006 12:00:07 -0000	1.6
+++ local.c	24 Apr 2006 14:13:25 -0000	1.7
@@ -148,8 +148,6 @@
 
         /* redraw upper sector */
         redrawStarSector (sectorx, sectory-1);
-        /* redraw upper sector */
-        redrawStarSector (sectorx, sectory-1);
 
         if (r)          
             /* redraw upper-right sector */
@@ -481,8 +479,12 @@
             {
 
 #ifdef SOUND
-                if (myPlayer (j) && (j->p_cloakphase == 0))
-                    Play_Sound (CLOAK_SOUND);
+                if (myPlayer(j) && (j->p_cloakphase == 0))
+#if defined(HAVE_SDL)
+                    Play_Sound(CLOAKED_WAV);
+#else
+                    Play_Sound(CLOAK_SOUND);
+#endif
 #endif
 
                 j->p_cloakphase++;
@@ -492,13 +494,19 @@
         {
             if (j->p_cloakphase)
             {
+            	
 #ifdef SOUND
-                if (myPlayer (j))
+                if (myPlayer(j))
                     if (j->p_cloakphase == CLOAK_PHASES - 1)
-                        Play_Sound (UNCLOAK_SOUND);
+#if defined(HAVE_SDL)
+                        Play_Sound(UNCLOAK_WAV);
+#else
+                        Play_Sound(UNCLOAK_SOUND);
                     else
-                        Abort_Sound (CLOAK_SOUND);
+                        Abort_Sound(CLOAK_SOUND);
+#endif     	
 #endif
+            	
                 j->p_cloakphase--;
             }
         }
@@ -704,9 +712,17 @@
             if (j->p_no == me->p_no)
             {
                 if ((sound_flags & PFSHIELD) && !(j->p_flags & PFSHIELD))
-                    Play_Sound (SHIELD_DOWN_SOUND);
+#if defined(HAVE_SDL)
+                    Play_Sound(SHIELD_DOWN_WAV);
+#else
+                    Play_Sound(SHIELD_DOWN_SOUND);
+#endif
                 if (!(sound_flags & PFSHIELD) && (j->p_flags & PFSHIELD))
-                    Play_Sound (SHIELD_UP_SOUND);
+#if defined(HAVE_SDL)
+                    Play_Sound(SHIELD_UP_WAV);
+#else
+                    Play_Sound(SHIELD_UP_SOUND);
+#endif
             }
 #endif
 
@@ -853,11 +869,14 @@
             int i;
 
             i = j->p_explode;
-
+            
 #ifdef SOUND
             if (i == 1)
-                Play_Sound (j ==
-                            me ? EXPLOSION_SOUND : OTHER_EXPLOSION_SOUND);
+#if defined(HAVE_SDL)
+                Play_Sound(j == me ? EXPLOSION_WAV : EXPLOSION_OTHER_WAV);
+#else
+                Play_Sound(j == me ? EXPLOSION_SOUND : OTHER_EXPLOSION_SOUND);
+#endif
 #endif
 
             if (i < BMP_SHIPEXPL_FRAMES ||
@@ -900,13 +919,19 @@
 
         if (php->ph_status != PHFREE)
         {
+        	
 #ifdef SOUND
             if (!sound_phaser)
             {
-                Play_Sound (j == me ? PHASER_SOUND : OTHER_PHASER_SOUND);
+#if defined(HAVE_SDL)
+                Play_Sound(j == me ? PHASER_WAV : PHASER_OTHER_WAV);
+#else
+                Play_Sound(j == me ? PHASER_SOUND : OTHER_PHASER_SOUND);
+#endif
                 sound_phaser++;
             }
 #endif
+
             if ((php->ph_updateFuse -= weaponUpdate) == 0)
             {
                 /* Expire the phaser */
@@ -1342,8 +1367,13 @@
 
 #ifdef SOUND
                 if (k->t_fuse == BMP_TORPDET_FRAMES - 1)
-                    Play_Sound (TORP_HIT_SOUND);
+#if defined(HAVE_SDL)
+                    Play_Sound(TORP_HIT_WAV);
+#else
+                    Play_Sound(TORP_HIT_SOUND);
 #endif
+#endif
+
 #ifdef COLORIZEWEAPON
                 switch (j->p_team)
                 {
@@ -1516,11 +1546,16 @@
             {
                 pt->pt_fuse = BMP_TORPDET_FRAMES - 1;
             }
-
+            
 #ifdef SOUND
             if (pt->pt_fuse == BMP_TORPDET_FRAMES - 1)
-                Play_Sound (PLASMA_HIT_SOUND);
+#if defined(HAVE_SDL)
+                Play_Sound(PLASMA_HIT_WAV);
+#else
+                Play_Sound(PLASMA_HIT_SOUND);
 #endif
+#endif
+
 #ifdef COLORIZEWEAPON
             switch (players[pt->pt_owner].p_team)
             {
@@ -1820,8 +1855,8 @@
             }
             W_ChangeBorder (baseWin, gColor);
 
-#ifdef SOUND
-            Abort_Sound (WARNING_SOUND);
+#if defined(SOUND) && !defined(HAVE_SDL)
+            Abort_Sound(WARNING_SOUND);
 #endif
 
             break;
@@ -1835,8 +1870,8 @@
             }
             W_ChangeBorder (baseWin, yColor);
 
-#ifdef SOUND
-            Abort_Sound (WARNING_SOUND);
+#if defined(SOUND) && !defined(HAVE_SDL)
+            Abort_Sound(WARNING_SOUND);
 #endif
 
             break;
@@ -1849,9 +1884,13 @@
                 //W_ChangeBorderDB (localSDB, rColor);
             }
             W_ChangeBorder (baseWin, rColor);
-
+            
 #ifdef SOUND
-            Play_Sound (WARNING_SOUND);
+#if defined(HAVE_SDL)
+            Play_Sound(WARNING_WAV);
+#else
+            Play_Sound(WARNING_SOUND);
+#endif
 #endif
 
             break;
@@ -1859,12 +1898,21 @@
     }
 
 #ifdef SOUND
+#if defined(HAVE_SDL)
     if (sound_torps < me->p_ntorp)
-        Play_Sound (FIRE_TORP_SOUND);
+        Play_Sound(FIRE_TORP_WAV);
     if (sound_other_torps < num_other_torps)
-        Play_Sound (OTHER_FIRE_TORP_SOUND);
+        Play_Sound(FIRE_TORP_OTHER_WAV);
     if (sound_plasma < me->p_nplasmatorp)
-        Play_Sound (FIRE_PLASMA_SOUND);
+        Play_Sound(FIRE_PLASMA_WAV);
+#else
+    if (sound_torps < me->p_ntorp)
+        Play_Sound(FIRE_TORP_SOUND);
+    if (sound_other_torps < num_other_torps)
+        Play_Sound(OTHER_FIRE_TORP_SOUND);
+    if (sound_plasma < me->p_nplasmatorp)
+        Play_Sound(FIRE_PLASMA_SOUND);
+#endif
 
     sound_flags = me->p_flags;
     sound_torps = me->p_ntorp;

Index: makefile
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- makefile	21 Apr 2006 12:00:07 -0000	1.5
+++ makefile	24 Apr 2006 14:13:25 -0000	1.6
@@ -48,7 +48,7 @@
 #
 
 !IFDEF DEBUG
-ldebug = /Gn /v 
+ldebug = /Gn /v
 !ELSE
 ldebug = /Gn /w-dup
 !ENDIF
@@ -72,7 +72,7 @@
 #..\Win32\lib\libmpbcc.lib
 !ENDIF
 
-LIBS = CW32mt.LIB IMPORT32.LIB user32.lib gdi32.lib wsock32.lib kernel32.lib shell32.lib winmm.lib mpr.lib $(GMPLIB)
+LIBS = SDL.LIB SDL_mixer.LIB SDL_main.LIB CW32mt.LIB IMPORT32.LIB user32.lib gdi32.lib wsock32.lib kernel32.lib shell32.lib winmm.lib mpr.lib $(GMPLIB)
 
 # ---------------------------------------------------------------------------
 # - Start of makefile proper

Index: playback.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/playback.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- playback.c	21 Apr 2006 12:00:07 -0000	1.8
+++ playback.c	24 Apr 2006 14:13:25 -0000	1.9
@@ -282,8 +282,8 @@
     if (i >= RETURNBASE)
         return (i - RETURNBASE);        /* Terminate with retcode */
 
-#ifdef SOUND
-    Abort_Sound (ENGINE_SOUND);
+#if defined(SOUND) && !defined(HAVE_SDL)
+    Abort_Sound(ENGINE_SOUND);
 #endif
 
 //#ifdef nodef
@@ -326,8 +326,13 @@
         redrawPStats ();
 
 #ifdef SOUND
-    Play_Sound (ENTER_SHIP_SOUND);
-    Play_Sound (ENGINE_SOUND);
+#if defined(HAVE_SDL)
+    Mix_HaltChannel(-1); /* Kill all currently playing sounds when entering game */
+    Play_Sound(ENTER_SHIP_WAV);
+#else
+    Play_Sound(ENTER_SHIP_SOUND);
+    Play_Sound(ENGINE_SOUND);
+#endif
 #endif
 
     while (1)

Index: beeplite.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/beeplite.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- beeplite.c	19 Apr 2006 15:18:27 -0000	1.3
+++ beeplite.c	24 Apr 2006 14:13:25 -0000	1.4
@@ -1,6 +1,9 @@
 /* beeplite.c
  *
  * $Log$
+ * Revision 1.4  2006/04/24 14:13:25  modemhero
+ * Initial SDL patch for multilayered sounds.
+ *
  * Revision 1.3  2006/04/19 15:18:27  modemhero
  * Tidied up the save_options function, fixing some spacing errors, and puttting the
  * keymap/buttonmap on the top of the list due to its importance.  Also added the
@@ -217,17 +220,24 @@
 	        if (F_beeplite_flags & LITE_SOUNDS)
 		{
 
-#ifdef SOUND
-		    if (sound_toggle)
-		      Play_Sound(MESSAGE_SOUND);
-		    else
+#if defined(SOUND)
+#if defined(HAVE_SDL)
+                    Play_Sound(MESSAGE_WAV);
+#else
+                    if (sound_toggle)
+                        Play_Sound(MESSAGE_SOUND);
+                    else
+		        W_Beep();
+#endif
 #endif
-
-		    W_Beep();
 		}
 	        break;
 
+/* The sound files don't even exist in standard client, and
+   are not loaded into SDL library currently - can change at
+   a later time. */
 #ifdef SOUND
+#if !defined(HAVE_SDL)
 	    case '1':
 	        if (F_beeplite_flags & LITE_SOUNDS)
 		  Play_Sound(MESSAGE1_SOUND);
@@ -265,6 +275,7 @@
 		  Play_Sound(MESSAGE9_SOUND);
 	        break;
 #endif
+#endif
 
 	      /* Text between:  /|    |   will be displayed with TTS */
 	    case '|':

Index: cowmain.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/cowmain.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- cowmain.c	21 Apr 2006 12:00:06 -0000	1.7
+++ cowmain.c	24 Apr 2006 14:13:25 -0000	1.8
@@ -768,6 +768,10 @@
 
     resetdefaults ();
     savebitmaps ();
+    
+#if defined(SOUND) && defined(HAVE_SDL)
+    Init_Sound();
+#endif
 
     /* open memory...? */
     openmem ();
@@ -892,18 +896,21 @@
     init_hockey_lines ();
 #endif
 
-#ifdef SOUND
-    Init_Sound ();
+  /* Moved SDL sound initialization to right after readdefaults() so
+   * the intro can start playing ASAP */
+#if defined(SOUND) && !defined(HAVE_SDL)
+    Init_Sound();
 #endif
 
+
     isFirstEntry = 1;           /* First entry into game */
 
     i = setjmp (env);           /* Reentry point of game */
     if (i >= RETURNBASE)
         return (i - RETURNBASE);        /* Terminate with retcode */
 
-#ifdef SOUND
-    Abort_Sound (ENGINE_SOUND);
+#if defined(SOUND) && !defined(HAVE_SDL)
+    Abort_Sound(ENGINE_SOUND);
 #endif
 
     /* give the player the motd and find out which team he wants */
@@ -950,8 +957,8 @@
 
         sendByeReq ();
 
-#ifdef SOUND
-        Exit_Sound ();
+#if defined(SOUND) && !defined(HAVE_SDL)
+        Exit_Sound();
 #endif
 
         sleep (1);
@@ -1034,8 +1041,13 @@
 
 
 #ifdef SOUND
-    Play_Sound (ENTER_SHIP_SOUND);
-    Play_Sound (ENGINE_SOUND);
+#if defined(HAVE_SDL)
+    Mix_HaltChannel(-1); /* Kill all currently playing sounds when entering game */
+    Play_Sound(ENTER_SHIP_WAV);
+#else
+    Play_Sound(ENTER_SHIP_SOUND);
+    Play_Sound(ENGINE_SOUND);
+#endif /* HAVE_SDL */
 #endif
 
     /* Get input until the player quits or dies */



From modemhero at users.sourceforge.net  Mon Apr 24 09:13:27 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Mon, 24 Apr 2006 14:13:27 +0000
Subject: [netrek-cvs] client/netrekxp/include proto.h, 1.6, 1.7 sound.h,
	1.1.1.1, 1.2
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30379/include

Modified Files:
	proto.h sound.h 
Log Message:
Initial SDL patch for multilayered sounds.

Index: sound.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/sound.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- sound.h	21 Jan 2003 21:27:55 -0000	1.1.1.1
+++ sound.h	24 Apr 2006 14:13:25 -0000	1.2
@@ -58,4 +58,28 @@
 extern void Init_Sound (void);
 extern void Exit_Sound (void);
 
+enum {
+  CLOAKED_WAV,
+  ENGINE_WAV,
+  ENTER_SHIP_WAV,
+  EXPLOSION_WAV,
+  EXPLOSION_OTHER_WAV,
+  FIRE_PLASMA_WAV,
+  FIRE_TORP_WAV,
+  FIRE_TORP_OTHER_WAV,
+  INTRO_WAV,
+  MESSAGE_WAV,
+  PHASER_WAV,
+  PHASER_OTHER_WAV,
+  PLASMA_HIT_WAV,
+  RED_ALERT_WAV,
+  SELF_DESTRUCT_WAV,
+  SHIELD_DOWN_WAV,
+  SHIELD_UP_WAV,
+  TORP_HIT_WAV,
+  UNCLOAK_WAV,
+  WARNING_WAV,
+  NUM_WAVES
+};
+
 #endif /* __SOUND_H */

Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- proto.h	21 Apr 2006 12:00:06 -0000	1.6
+++ proto.h	24 Apr 2006 14:13:25 -0000	1.7
@@ -1089,7 +1089,9 @@
      extern void Abort_Sound (int type);
      extern void soundwindow (void);
 //static void soundrefresh(int i);
+#if defined(SOUND) && !defined(HAVE_SDL)
      void soundaction (W_Event * data);
+#endif
      extern void sounddone (void);
 
 /******************************************************************************/



From modemhero at users.sourceforge.net  Mon Apr 24 09:13:27 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Mon, 24 Apr 2006 14:13:27 +0000
Subject: [netrek-cvs] client/netrekxp build.cmd,1.6,1.7
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30379

Modified Files:
	build.cmd 
Log Message:
Initial SDL patch for multilayered sounds.

Index: build.cmd
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/build.cmd,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- build.cmd	21 Apr 2006 16:36:09 -0000	1.6
+++ build.cmd	24 Apr 2006 14:13:25 -0000	1.7
@@ -467,6 +467,18 @@
 del resources\ships\mono\ori\orishipM.bmp resources\ships\mono\ori\ori_??.bmp
 del resources\ships\mono\rom\romshipM.bmp resources\ships\mono\rom\rom_??.bmp
 
+del resources\ships\grayscale\fed\fedshipG.bmp resources\ships\grayscale\fed\fed_??.bmp
+del resources\ships\grayscale\ind\indshipG.bmp resources\ships\grayscale\ind\ind_??.bmp
+del resources\ships\grayscale\kli\klishipG.bmp resources\ships\grayscale\kli\kli_??.bmp
+del resources\ships\grayscale\ori\orishipG.bmp resources\ships\grayscale\ori\ori_??.bmp
+del resources\ships\grayscale\rom\romshipG.bmp resources\ships\grayscale\rom\rom_??.bmp
+
+del resources\ships\tinted\fed\fedshipT.bmp resources\ships\tinted\fed\fed_??.bmp
+del resources\ships\tinted\ind\indshipT.bmp resources\ships\tinted\ind\ind_??.bmp
+del resources\ships\tinted\kli\klishipT.bmp resources\ships\tinted\kli\kli_??.bmp
+del resources\ships\tinted\ori\orishipT.bmp resources\ships\tinted\ori\ori_??.bmp
+del resources\ships\tinted\rom\romshipT.bmp resources\ships\tinted\rom\rom_??.bmp
+
 del resources\planlibm\bronco\plan.bmp
 del resources\planlibm\rabbit\planR.bmp
 del resources\planlibm\moo\planM.bmp



From modemhero at users.sourceforge.net  Mon Apr 24 09:13:28 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Mon, 24 Apr 2006 14:13:28 +0000
Subject: [netrek-cvs] client/netrekxp/win32 config.h,1.4,1.5
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30379/win32

Modified Files:
	config.h 
Log Message:
Initial SDL patch for multilayered sounds.

Index: config.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/win32/config.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- config.h	21 Apr 2006 12:00:07 -0000	1.4
+++ config.h	24 Apr 2006 14:13:26 -0000	1.5
@@ -126,6 +126,8 @@
 /*      RACE_COLORS             - additional bitplane for race colors           */
 #define RACE_COLORS
 
+/*      SDL			- new SDL sound					*/
+#define HAVE_SDL
 
 #define PLIST1 
 #define PLIST 



From modemhero at users.sourceforge.net  Mon Apr 24 10:30:40 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Mon, 24 Apr 2006 15:30:40 +0000
Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp netrek.chm, 1.2, 1.3
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21311/resources/htmlhelp

Modified Files:
	netrek.chm 
Log Message:
Instead of a #define SDL, changed it to always load in as I couldn't imagine ever wanting to distribute the client without this option enabled.  Instead, I'm using a netrekrc option, newSound, to let user choose whether to use the new SDL sound system or the old way.

Index: netrek.chm
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/netrek.chm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvseN6RUP and /tmp/cvsP3lnFN differ



From modemhero at users.sourceforge.net  Mon Apr 24 10:30:40 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Mon, 24 Apr 2006 15:30:40 +0000
Subject: [netrek-cvs] client/netrekxp/src beeplite.c, 1.4, 1.5 cowmain.c, 1.8,
	1.9 data.c, 1.10, 1.11 defaults.c, 1.8, 1.9 findslot.c, 1.3,
	1.4 input.c, 1.5, 1.6 local.c, 1.7, 1.8 newwin.c, 1.10,
	1.11 playback.c, 1.9, 1.10 sound.c, 1.3, 1.4
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21311/src

Modified Files:
	beeplite.c cowmain.c data.c defaults.c findslot.c input.c 
	local.c newwin.c playback.c sound.c 
Log Message:
Instead of a #define SDL, changed it to always load in as I couldn't imagine ever wanting to distribute the client without this option enabled.  Instead, I'm using a netrekrc option, newSound, to let user choose whether to use the new SDL sound system or the old way.

Index: findslot.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/findslot.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- findslot.c	24 Apr 2006 14:13:25 -0000	1.3
+++ findslot.c	24 Apr 2006 15:30:38 -0000	1.4
@@ -112,8 +112,9 @@
         if (isServerDead ())
         {
         	
-#if defined(SOUND) && !defined(HAVE_SDL)
-            Exit_Sound();
+#if defined(SOUND)
+            if (!newSound)
+                Exit_Sound();
 #endif
 
             LineToConsole ("Shit!  Ghostbusted!\n");
@@ -158,8 +159,9 @@
         if (isServerDead ())
         {
 
-#if defined(SOUND) && !defined(HAVE_SDL)
-            Exit_Sound();
+#if defined(SOUND)
+            if (!newSound)
+                Exit_Sound();
 #endif
 
             LineToConsole ("Damn, We've been ghostbusted!\n");
@@ -217,8 +219,9 @@
                 else if (event.Window == qwin)
                 {
 
-#if defined(SOUND) && !defined(HAVE_SDL)
-                    Exit_Sound();
+#if defined(SOUND)
+                    if (!newSound)
+                        Exit_Sound();
 #endif
 
                     LineToConsole ("OK, bye!\n");

Index: sound.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/sound.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sound.c	24 Apr 2006 14:13:25 -0000	1.3
+++ sound.c	24 Apr 2006 15:30:38 -0000	1.4
@@ -10,10 +10,8 @@
 #include "config.h"
 
 #ifdef SOUND
-#if defined(HAVE_SDL)
 #include "SDL.h"
 #include "SDL_mixer.h"
-#endif
 
 #include "copyright.h"
 
@@ -30,11 +28,7 @@
 #include "audio.h"
 #include "proto.h"
 
-#if defined(HAVE_SDL)
-/* This is probably unix specific path */
-Mix_Chunk *sounds[NUM_WAVES];
-
-#else 
+Mix_Chunk *newsounds[NUM_WAVES];
 /* Each sound has a priority which controls what can override what
    Currently these are set as follows:
 
@@ -81,15 +75,9 @@
 
 static int current_sound = NO_SOUND;
 static int sound_other = 1;     /* Play other ship's sounds? */
-#endif // Not SDL sound
 
 static char sound_prefix[PATH_MAX];
 
-#if defined(HAVE_SDL)
-
-/*
- * Build the patch to the sound files 
- */
 char *DATAFILE(const char* wav) {    
     strcpy(sound_prefix, sounddir);
     strcat(sound_prefix, "/");
@@ -103,39 +91,37 @@
 int loadSounds(void) {
   int i;
 
-  sounds[CLOAKED_WAV] = Mix_LoadWAV(DATAFILE("nt_cloaked.wav"));
-  sounds[ENGINE_WAV] = Mix_LoadWAV(DATAFILE("nt_engine.wav"));
-  sounds[ENTER_SHIP_WAV] = Mix_LoadWAV(DATAFILE("nt_enter_ship.wav"));
-  sounds[EXPLOSION_WAV] = Mix_LoadWAV(DATAFILE("nt_explosion.wav"));
-  sounds[EXPLOSION_OTHER_WAV] = Mix_LoadWAV(DATAFILE("nt_explosion_other.wav"));
-  sounds[FIRE_PLASMA_WAV] = Mix_LoadWAV(DATAFILE("nt_fire_plasma.wav"));
-  sounds[FIRE_TORP_WAV] = Mix_LoadWAV(DATAFILE("nt_fire_torp.wav"));
-  sounds[FIRE_TORP_OTHER_WAV] = Mix_LoadWAV(DATAFILE("nt_fire_torp_other.wav"));
-  sounds[INTRO_WAV] = Mix_LoadWAV(DATAFILE("nt_intro.wav"));
-  sounds[MESSAGE_WAV] = Mix_LoadWAV(DATAFILE("nt_message.wav"));
-  sounds[PHASER_WAV] = Mix_LoadWAV(DATAFILE("nt_phaser.wav"));
-  sounds[PHASER_OTHER_WAV] = Mix_LoadWAV(DATAFILE("nt_phaser_other.wav"));
-  sounds[PLASMA_HIT_WAV] = Mix_LoadWAV(DATAFILE("nt_plasma_hit.wav"));
-  sounds[RED_ALERT_WAV] = Mix_LoadWAV(DATAFILE("nt_red_alert.wav"));
-  sounds[SELF_DESTRUCT_WAV] = Mix_LoadWAV(DATAFILE("nt_self_destruct.wav"));
-  sounds[SHIELD_DOWN_WAV] = Mix_LoadWAV(DATAFILE("nt_shield_down.wav"));
-  sounds[SHIELD_UP_WAV] = Mix_LoadWAV(DATAFILE("nt_shield_up.wav"));
-  sounds[TORP_HIT_WAV] = Mix_LoadWAV(DATAFILE("nt_torp_hit.wav"));
-  sounds[UNCLOAK_WAV] = Mix_LoadWAV(DATAFILE("nt_uncloak.wav"));
-  sounds[WARNING_WAV] = Mix_LoadWAV(DATAFILE("nt_warning.wav"));
+  newsounds[CLOAKED_WAV] = Mix_LoadWAV(DATAFILE("nt_cloaked.wav"));
+  newsounds[ENGINE_WAV] = Mix_LoadWAV(DATAFILE("nt_engine.wav"));
+  newsounds[ENTER_SHIP_WAV] = Mix_LoadWAV(DATAFILE("nt_enter_ship.wav"));
+  newsounds[EXPLOSION_WAV] = Mix_LoadWAV(DATAFILE("nt_explosion.wav"));
+  newsounds[EXPLOSION_OTHER_WAV] = Mix_LoadWAV(DATAFILE("nt_explosion_other.wav"));
+  newsounds[FIRE_PLASMA_WAV] = Mix_LoadWAV(DATAFILE("nt_fire_plasma.wav"));
+  newsounds[FIRE_TORP_WAV] = Mix_LoadWAV(DATAFILE("nt_fire_torp.wav"));
+  newsounds[FIRE_TORP_OTHER_WAV] = Mix_LoadWAV(DATAFILE("nt_fire_torp_other.wav"));
+  newsounds[INTRO_WAV] = Mix_LoadWAV(DATAFILE("nt_intro.wav"));
+  newsounds[MESSAGE_WAV] = Mix_LoadWAV(DATAFILE("nt_message.wav"));
+  newsounds[PHASER_WAV] = Mix_LoadWAV(DATAFILE("nt_phaser.wav"));
+  newsounds[PHASER_OTHER_WAV] = Mix_LoadWAV(DATAFILE("nt_phaser_other.wav"));
+  newsounds[PLASMA_HIT_WAV] = Mix_LoadWAV(DATAFILE("nt_plasma_hit.wav"));
+  newsounds[RED_ALERT_WAV] = Mix_LoadWAV(DATAFILE("nt_red_alert.wav"));
+  newsounds[SELF_DESTRUCT_WAV] = Mix_LoadWAV(DATAFILE("nt_self_destruct.wav"));
+  newsounds[SHIELD_DOWN_WAV] = Mix_LoadWAV(DATAFILE("nt_shield_down.wav"));
+  newsounds[SHIELD_UP_WAV] = Mix_LoadWAV(DATAFILE("nt_shield_up.wav"));
+  newsounds[TORP_HIT_WAV] = Mix_LoadWAV(DATAFILE("nt_torp_hit.wav"));
+  newsounds[UNCLOAK_WAV] = Mix_LoadWAV(DATAFILE("nt_uncloak.wav"));
+  newsounds[WARNING_WAV] = Mix_LoadWAV(DATAFILE("nt_warning.wav"));
 
   for (i=0; i < NUM_WAVES; i++) {
-    if (!sounds[i]) {
-      LineToConsole("Mix_LoadWAV sound[%d] could not be loaded. Check soundDir in your .netrekrc: %s\n", i, Mix_GetError());
+    if (!newsounds[i]) {
+      LineToConsole("Mix_LoadWAV newsound[%d] could not be loaded. Check soundDir in your .netrekrc: %s\n", i, Mix_GetError());
       return(-1);
     }
   }
 
   return(1);
 }
-#endif
 
-#if !defined(HAVE_SDL)
 extern void Exit_Sound (void)
 {
     if (sound_init)
@@ -143,7 +129,7 @@
     sound_init = 0;
     sound_toggle = 0;
 }
-#endif
+
 
 extern void Init_Sound (void)
 {
@@ -164,99 +150,101 @@
                 sounddir = "./sounds";
         }
         
-#if defined(HAVE_SDL)
+       if (newSound)
+       {
 #ifdef DEBUG
-	LineToConsole ("Init_Sound using SDL\n");
+	    LineToConsole ("Init_Sound using SDL\n");
 #endif
 
-    	/* Initialize the SDL library */
-    	if (SDL_Init(SDL_INIT_AUDIO) < 0)
+    	    /* Initialize the SDL library */
+    	    if (SDL_Init(SDL_INIT_AUDIO) < 0)
       		LineToConsole("Couldn't initialize SDL: %s\n",SDL_GetError());
 
-    	atexit(SDL_Quit);
+    	    atexit(SDL_Quit);
 
-    	/* Open the audio device at 22050 Hz 8 bit Microsoft PCM with stereo */
-    	if (Mix_OpenAudio(22050, AUDIO_U8, 2, 1024) < 0) 
+    	    /* Open the audio device at 22050 Hz 8 bit Microsoft PCM with stereo */
+    	    if (Mix_OpenAudio(22050, AUDIO_U8, 2, 1024) < 0) 
       		LineToConsole("Mix_OpenAudio: %s\n", Mix_GetError());
 
-    	/* If we successfully loaded the wav files, so shut-off sound_init and play
-    	 * the introduction
-    	 */
-    	if (loadSounds())
-    	{
-     	  if (Mix_PlayChannel(-1, sounds[INTRO_WAV], 0) < 0)
-		LineToConsole("Mix_PlayChannel: %s\n", Mix_GetError());
-      	}
-      	/* Default of 8 channels not enough */
-      	Mix_AllocateChannels(16);
-#else
-        if (InitSound () == -1)
-        {
-            sound_toggle = 0;
-            sound_init = 0;
+    	    /* If we successfully loaded the wav files, so shut-off sound_init and play
+    	     * the introduction
+    	     */
+    	    if (loadSounds())
+    	    {
+     	        if (Mix_PlayChannel(-1, newsounds[INTRO_WAV], 0) < 0)
+		    LineToConsole("Mix_PlayChannel: %s\n", Mix_GetError());
+      	    }
+      	    /* Default of 8 channels not enough */
+       	    Mix_AllocateChannels(16);
         }
         else
         {
-            sound_init = 1;
-            sound_toggle = 1;
-        }
+            if (InitSound () == -1)
+            {
+                sound_toggle = 0;
+                sound_init = 0;
+            }
+            else
+            {
+                sound_init = 1;
+                sound_toggle = 1;
+            }
 
-        strcpy (sound_prefix, sounddir);
-        strcat (sound_prefix, "/");
+            strcpy (sound_prefix, sounddir);
+            strcat (sound_prefix, "/");
 
-        if (sound_toggle)
-        {
-            strcpy (buf, sounddir);
-            strcat (buf, "/nt_intro");
-            StartSound (buf);
+            if (sound_toggle)
+            {
+                strcpy (buf, sounddir);
+                strcat (buf, "/nt_intro");
+                StartSound (buf);
+            }
         }
-#endif
     }
 }
 
 extern void Play_Sound (int type)
 {
-#if defined(HAVE_SDL)
-
-    if (!sound_init)
-	return;
-
-    if ((type >= NUM_WAVES) || (type < 0))
-        LineToConsole("Invalid sound type %d\n", type);
-
-    if (Mix_PlayChannel(-1, sounds[type], 0) < 0)
-        LineToConsole("Mix_PlayChannel: %s\n", Mix_GetError());
+    if (newSound)
+    {
+        if (!sound_init)
+	    return;
 
+        if ((type >= NUM_WAVES) || (type < 0))
+            LineToConsole("Invalid sound type %d\n", type);
 
-#else
-    char buf[PATH_MAX];
+        if (Mix_PlayChannel(-1, newsounds[type], 0) < 0)
+            LineToConsole("Mix_PlayChannel: %s\n", Mix_GetError());
+    }
+    else
+    {
+        char buf[PATH_MAX];
 
-    /*  Don't play other ship's sounds if turned off */
-    if (type > OTHER_SOUND_OFFSET && !sound_other)
-        return;
+        /*  Don't play other ship's sounds if turned off */
+        if (type > OTHER_SOUND_OFFSET && !sound_other)
+            return;
 
-    if (sound_toggle && sounds[type].flag &&
+        if (sound_toggle && sounds[type].flag &&
         ((sounds[type].priority >= sounds[current_sound].priority) ||
          !SoundPlaying ()))
-    {
-        STRNCPY (buf, sound_prefix, PATH_MAX);
-        strcat (buf, sounds[type].name);
-        StartSound (buf);
-        current_sound = type;
-    }
+        {
+            STRNCPY (buf, sound_prefix, PATH_MAX);
+            strcat (buf, sounds[type].name);
+            StartSound (buf);
+            current_sound = type;
+        }
 
-    if (!(sound_toggle))
-        current_sound = NO_SOUND;
-#endif
+        if (!(sound_toggle))
+            current_sound = NO_SOUND;
+     }
 }
 
-#if !defined(HAVE_SDL)
 extern void Abort_Sound (int type)
 {
     if ((current_sound != NO_SOUND) && (type == current_sound))
         StopSound ();
 }
-#endif
+
 
 /* Sound options window stuff */
 
@@ -269,21 +257,22 @@
 
 extern void soundwindow (void)
 {
-#if defined(HAVE_SDL)
-    char *buf="All or nothing with SDL sound. Sorry";
-    W_WriteText(soundWin, 0, 0, textColor, buf, strlen(buf), 0);
-#else
-    int i;
-
-    for (i = 0; i <= SOUND_DONE; i++)
-        soundrefresh (i);
-#endif
+    if (newSound)
+    {
+        char *buf="All or nothing with SDL sound. Sorry";
+        W_WriteText(soundWin, 0, 0, textColor, buf, strlen(buf), 0);
+    }
+    else
+    {
+        int i;
 
+        for (i = 0; i <= SOUND_DONE; i++)
+            soundrefresh (i);
+    }
     /* Map window */
     W_MapWindow (soundWin);
 }
 
-#if !defined(HAVE_SDL)
 static void soundrefresh (int i)
 {
     char buf[BUFSIZ], *flag;
@@ -371,11 +360,11 @@
 
     W_WriteText (soundWin, 0, i, textColor, buf, strlen (buf), 0);
 }
-#endif /* HAVE_SDL */
 
 void soundaction (W_Event * data)
 {
-#if !defined(HAVE_SDL)
+  if (!newSound)
+  {
     int i, j;
 
     i = data->y;
@@ -429,7 +418,7 @@
     {
         sounddone ();
     }
-#endif /* HAVE_SDL */
+  }
 }
 
 extern void sounddone (void)

Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- newwin.c	24 Apr 2006 14:13:25 -0000	1.10
+++ newwin.c	24 Apr 2006 15:30:38 -0000	1.11
@@ -578,18 +578,6 @@
     W_SetWindowButtonHandler (spWin, spaction);
 #endif
 
-#ifdef SOUND
-#if defined(HAVE_SDL)
-    soundWin = W_MakeMenu("sound", WINSIDE + 20, -BORDER + 10, 40, 1, NULL, 2);
-#else
-    soundWin = W_MakeMenu("sound", WINSIDE + 20, -BORDER + 10, 30,
-			MESSAGE_SOUND + 4, NULL, 2);
-    W_SetWindowKeyDownHandler(soundWin, soundaction);
-    W_SetWindowButtonHandler(soundWin, soundaction);
-    W_DefineArrowCursor(soundWin);
-#endif
-#endif
-
 #ifdef TOOLS
     toolsWin = W_MakeScrollingWindow ("tools", WINSIDE + BORDER, BORDER,
                                         80, TOOLSWINLEN, NULL, BORDER);
@@ -666,6 +654,23 @@
     getResources (progname);
 }
 
+/******************************************************************************/
+/***  newsoundwin() - Need to map it after reset_defaults, so pulled out of newwin
+/******************************************************************************/
+newsoundwin (char *hostmon,
+        char *progname)
+{
+    if (newSound)
+        soundWin = W_MakeMenu("sound", WINSIDE + 20, -BORDER + 10, 40, 1, NULL, 2);
+    else
+    {
+        soundWin = W_MakeMenu("sound", WINSIDE + 20, -BORDER + 10, 30,
+			MESSAGE_SOUND + 4, NULL, 2);
+        W_SetWindowKeyDownHandler(soundWin, soundaction);
+        W_SetWindowButtonHandler(soundWin, soundaction);
+        W_DefineArrowCursor(soundWin);
+    }
+}
 
 /******************************************************************************/
 /***  mapAll()

Index: input.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/input.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- input.c	24 Apr 2006 14:13:25 -0000	1.5
+++ input.c	24 Apr 2006 15:30:38 -0000	1.6
@@ -1510,11 +1510,10 @@
 			/* Here we will have to enter message_on () followed by
 			   smessage to player */
 #ifdef SOUND
-#if defined(HAVE_SDL)
-  			Play_Sound(MESSAGE_WAV);
-#else
-  			Play_Sound(MESSAGE_SOUND);
-#endif
+                        if (newSound)
+  			    Play_Sound(MESSAGE_WAV);
+                        else
+  			    Play_Sound(MESSAGE_SOUND);
 #endif
 			message_on ();
 			data->key = players[target->o_num].p_mapchars[1];
@@ -1528,11 +1527,10 @@
 			/* Here we will have to enter message_on () followed by
 			   smessage to player */
 #ifdef SOUND
-#if defined(HAVE_SDL)
-  			Play_Sound(MESSAGE_WAV);
-#else
-  			Play_Sound(MESSAGE_SOUND);
-#endif
+                        if (newSound)
+  			    Play_Sound(MESSAGE_WAV);
+                        else
+  			    Play_Sound(MESSAGE_SOUND);
 #endif
 			message_on ();
 			data->key = 'T';
@@ -1546,11 +1544,10 @@
 			/* Here we will have to enter message_on () followed by
 			   smessage to player */
 #ifdef SOUND
-#if defined(HAVE_SDL)
-  			Play_Sound(MESSAGE_WAV);
-#else
-  			Play_Sound(MESSAGE_SOUND);
-#endif
+                        if (newSound)
+  			    Play_Sound(MESSAGE_WAV);
+                        else
+  			    Play_Sound(MESSAGE_SOUND);
 #endif
 			message_on ();
 			data->key = 'A';
@@ -2725,11 +2722,10 @@
 {
 
 #ifdef SOUND
-#if defined(HAVE_SDL)
-    Play_Sound(SELF_DESTRUCT_WAV);
-#else
-    Play_Sound(SELF_DESTRUCT_SOUND);
-#endif
+    if (newSound)
+        Play_Sound(SELF_DESTRUCT_WAV);
+    else
+        Play_Sound(SELF_DESTRUCT_SOUND);
 #endif
 
     sendQuitReq ();
@@ -3149,11 +3145,10 @@
 {
 
 #ifdef SOUND
-#if defined(HAVE_SDL)
-    Play_Sound(MESSAGE_WAV);
-#else
-    Play_Sound(MESSAGE_SOUND);
-#endif
+    if (newSound)
+        Play_Sound(MESSAGE_WAV);
+    else
+        Play_Sound(MESSAGE_SOUND);
 #endif
 
     message_on ();
@@ -3217,11 +3212,10 @@
 {
 
 #ifdef SOUND
-#if defined(HAVE_SDL)
-    Play_Sound(SELF_DESTRUCT_WAV);
-#else
-    Play_Sound(SELF_DESTRUCT_SOUND);
-#endif
+    if (newSound)
+        Play_Sound(SELF_DESTRUCT_WAV);
+    else
+        Play_Sound(SELF_DESTRUCT_SOUND);
 #endif
 
     fastQuit = 1;

Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- local.c	24 Apr 2006 14:13:25 -0000	1.7
+++ local.c	24 Apr 2006 15:30:38 -0000	1.8
@@ -480,11 +480,12 @@
 
 #ifdef SOUND
                 if (myPlayer(j) && (j->p_cloakphase == 0))
-#if defined(HAVE_SDL)
-                    Play_Sound(CLOAKED_WAV);
-#else
-                    Play_Sound(CLOAK_SOUND);
-#endif
+                {
+                    if (newSound)
+                        Play_Sound(CLOAKED_WAV);
+                    else
+                        Play_Sound(CLOAK_SOUND);
+                }
 #endif
 
                 j->p_cloakphase++;
@@ -498,13 +499,17 @@
 #ifdef SOUND
                 if (myPlayer(j))
                     if (j->p_cloakphase == CLOAK_PHASES - 1)
-#if defined(HAVE_SDL)
-                        Play_Sound(UNCLOAK_WAV);
-#else
-                        Play_Sound(UNCLOAK_SOUND);
+                    {
+                        if (newSound)
+                            Play_Sound(UNCLOAK_WAV);
+                        else
+                            Play_Sound(UNCLOAK_SOUND);
+                    }
                     else
-                        Abort_Sound(CLOAK_SOUND);
-#endif     	
+                    {
+                        if (!newSound)
+                             Abort_Sound(CLOAK_SOUND);
+                    } 	
 #endif
             	
                 j->p_cloakphase--;
@@ -712,17 +717,19 @@
             if (j->p_no == me->p_no)
             {
                 if ((sound_flags & PFSHIELD) && !(j->p_flags & PFSHIELD))
-#if defined(HAVE_SDL)
-                    Play_Sound(SHIELD_DOWN_WAV);
-#else
-                    Play_Sound(SHIELD_DOWN_SOUND);
-#endif
+                {
+                    if (newSound)
+                        Play_Sound(SHIELD_DOWN_WAV);
+                    else
+                        Play_Sound(SHIELD_DOWN_SOUND);
+                }
                 if (!(sound_flags & PFSHIELD) && (j->p_flags & PFSHIELD))
-#if defined(HAVE_SDL)
-                    Play_Sound(SHIELD_UP_WAV);
-#else
-                    Play_Sound(SHIELD_UP_SOUND);
-#endif
+                {
+                    if (newSound)
+                        Play_Sound(SHIELD_UP_WAV);
+                    else
+                        Play_Sound(SHIELD_UP_SOUND);
+                }
             }
 #endif
 
@@ -872,11 +879,12 @@
             
 #ifdef SOUND
             if (i == 1)
-#if defined(HAVE_SDL)
-                Play_Sound(j == me ? EXPLOSION_WAV : EXPLOSION_OTHER_WAV);
-#else
-                Play_Sound(j == me ? EXPLOSION_SOUND : OTHER_EXPLOSION_SOUND);
-#endif
+            {
+                if (newSound)
+                    Play_Sound(j == me ? EXPLOSION_WAV : EXPLOSION_OTHER_WAV);
+                else
+                    Play_Sound(j == me ? EXPLOSION_SOUND : OTHER_EXPLOSION_SOUND);
+            }
 #endif
 
             if (i < BMP_SHIPEXPL_FRAMES ||
@@ -923,11 +931,10 @@
 #ifdef SOUND
             if (!sound_phaser)
             {
-#if defined(HAVE_SDL)
-                Play_Sound(j == me ? PHASER_WAV : PHASER_OTHER_WAV);
-#else
-                Play_Sound(j == me ? PHASER_SOUND : OTHER_PHASER_SOUND);
-#endif
+                if (newSound)
+                    Play_Sound(j == me ? PHASER_WAV : PHASER_OTHER_WAV);
+                else
+                    Play_Sound(j == me ? PHASER_SOUND : OTHER_PHASER_SOUND);
                 sound_phaser++;
             }
 #endif
@@ -1367,11 +1374,12 @@
 
 #ifdef SOUND
                 if (k->t_fuse == BMP_TORPDET_FRAMES - 1)
-#if defined(HAVE_SDL)
-                    Play_Sound(TORP_HIT_WAV);
-#else
-                    Play_Sound(TORP_HIT_SOUND);
-#endif
+                {
+                    if (newSound)
+                        Play_Sound(TORP_HIT_WAV);
+                    else
+                        Play_Sound(TORP_HIT_SOUND);
+                }
 #endif
 
 #ifdef COLORIZEWEAPON
@@ -1549,11 +1557,12 @@
             
 #ifdef SOUND
             if (pt->pt_fuse == BMP_TORPDET_FRAMES - 1)
-#if defined(HAVE_SDL)
-                Play_Sound(PLASMA_HIT_WAV);
-#else
-                Play_Sound(PLASMA_HIT_SOUND);
-#endif
+            {
+                if (newSound)
+                    Play_Sound(PLASMA_HIT_WAV);
+                else
+                    Play_Sound(PLASMA_HIT_SOUND);
+            }
 #endif
 
 #ifdef COLORIZEWEAPON
@@ -1855,8 +1864,9 @@
             }
             W_ChangeBorder (baseWin, gColor);
 
-#if defined(SOUND) && !defined(HAVE_SDL)
-            Abort_Sound(WARNING_SOUND);
+#if defined(SOUND)
+            if (!newSound)
+                Abort_Sound(WARNING_SOUND);
 #endif
 
             break;
@@ -1870,8 +1880,9 @@
             }
             W_ChangeBorder (baseWin, yColor);
 
-#if defined(SOUND) && !defined(HAVE_SDL)
-            Abort_Sound(WARNING_SOUND);
+#if defined(SOUND)
+            if (!newSound)
+                Abort_Sound(WARNING_SOUND);
 #endif
 
             break;
@@ -1886,11 +1897,10 @@
             W_ChangeBorder (baseWin, rColor);
             
 #ifdef SOUND
-#if defined(HAVE_SDL)
-            Play_Sound(WARNING_WAV);
-#else
-            Play_Sound(WARNING_SOUND);
-#endif
+            if (newSound)
+                Play_Sound(WARNING_WAV);
+            else
+                Play_Sound(WARNING_SOUND);
 #endif
 
             break;
@@ -1898,21 +1908,24 @@
     }
 
 #ifdef SOUND
-#if defined(HAVE_SDL)
-    if (sound_torps < me->p_ntorp)
-        Play_Sound(FIRE_TORP_WAV);
-    if (sound_other_torps < num_other_torps)
-        Play_Sound(FIRE_TORP_OTHER_WAV);
-    if (sound_plasma < me->p_nplasmatorp)
-        Play_Sound(FIRE_PLASMA_WAV);
-#else
-    if (sound_torps < me->p_ntorp)
-        Play_Sound(FIRE_TORP_SOUND);
-    if (sound_other_torps < num_other_torps)
-        Play_Sound(OTHER_FIRE_TORP_SOUND);
-    if (sound_plasma < me->p_nplasmatorp)
-        Play_Sound(FIRE_PLASMA_SOUND);
-#endif
+    if (newSound)
+    {
+        if (sound_torps < me->p_ntorp)
+            Play_Sound(FIRE_TORP_WAV);
+        if (sound_other_torps < num_other_torps)
+            Play_Sound(FIRE_TORP_OTHER_WAV);
+        if (sound_plasma < me->p_nplasmatorp)
+            Play_Sound(FIRE_PLASMA_WAV);
+    }
+    else
+    {
+        if (sound_torps < me->p_ntorp)
+            Play_Sound(FIRE_TORP_SOUND);
+        if (sound_other_torps < num_other_torps)
+            Play_Sound(OTHER_FIRE_TORP_SOUND);
+        if (sound_plasma < me->p_nplasmatorp)
+            Play_Sound(FIRE_PLASMA_SOUND);
+    }
 
     sound_flags = me->p_flags;
     sound_torps = me->p_ntorp;

Index: playback.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/playback.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- playback.c	24 Apr 2006 14:13:25 -0000	1.9
+++ playback.c	24 Apr 2006 15:30:38 -0000	1.10
@@ -269,6 +269,7 @@
 #endif
 
 #ifdef SOUND
+    newsoundwin (display_host, name);
     Init_Sound ();
 #endif
 
@@ -282,8 +283,9 @@
     if (i >= RETURNBASE)
         return (i - RETURNBASE);        /* Terminate with retcode */
 
-#if defined(SOUND) && !defined(HAVE_SDL)
-    Abort_Sound(ENGINE_SOUND);
+#if defined(SOUND)
+    if (!newSound)
+        Abort_Sound(ENGINE_SOUND);
 #endif
 
 //#ifdef nodef
@@ -326,13 +328,16 @@
         redrawPStats ();
 
 #ifdef SOUND
-#if defined(HAVE_SDL)
-    Mix_HaltChannel(-1); /* Kill all currently playing sounds when entering game */
-    Play_Sound(ENTER_SHIP_WAV);
-#else
-    Play_Sound(ENTER_SHIP_SOUND);
-    Play_Sound(ENGINE_SOUND);
-#endif
+    if (newSound)
+    { 
+        Mix_HaltChannel(-1); /* Kill all currently playing sounds when entering game */
+        Play_Sound(ENTER_SHIP_WAV);
+    }
+    else
+    {
+        Play_Sound(ENTER_SHIP_SOUND);
+        Play_Sound(ENGINE_SOUND);
+    }
 #endif
 
     while (1)

Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- defaults.c	22 Apr 2006 14:11:47 -0000	1.8
+++ defaults.c	24 Apr 2006 15:30:38 -0000	1.9
@@ -278,6 +278,12 @@
             NULL
         }
     },
+    {"newSound", &newSound, RC_BOOL,
+        {
+            "Use new layered, stereo sound",
+            NULL
+        }
+    },
     {"omitTeamLetter", &omitTeamLetter, RC_BOOL,
         {
             "Omit team letter on galaxy",
@@ -1348,7 +1354,7 @@
         timerType = T_SHIP;
 
     allowWheelActions = booleanDefault ("allowWheelActions", allowWheelActions);
-
+    newSound = booleanDefault ("newSound", newSound);
     tpDotDist = intDefault ("tpDotDist", tpDotDist);
     omitTeamLetter = booleanDefault ("omitTeamLetter", omitTeamLetter);
 	beepOnPrivateMessage = booleanDefault ("beepOnPrivateMessage", beepOnPrivateMessage);

Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- data.c	22 Apr 2006 14:11:47 -0000	1.10
+++ data.c	24 Apr 2006 15:30:38 -0000	1.11
@@ -720,4 +720,6 @@
 
 WNDPROC lpfnDefRichEditWndProc;     /* default window proc */
 
-int richText = 0;   /* temporary variable to select rich text message windows */
\ No newline at end of file
+int richText = 0;   /* temporary variable to select rich text message windows */
+
+int newSound = 1;   /* use new SDL sound */
\ No newline at end of file

Index: beeplite.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/beeplite.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- beeplite.c	24 Apr 2006 14:13:25 -0000	1.4
+++ beeplite.c	24 Apr 2006 15:30:38 -0000	1.5
@@ -1,36 +1,5 @@
 /* beeplite.c
  *
- * $Log$
- * Revision 1.4  2006/04/24 14:13:25  modemhero
- * Initial SDL patch for multilayered sounds.
- *
- * Revision 1.3  2006/04/19 15:18:27  modemhero
- * Tidied up the save_options function, fixing some spacing errors, and puttting the
- * keymap/buttonmap on the top of the list due to its importance.  Also added the
- * sounddir option.  The eventual goal is to make save_options generate a file that contains
- * everything from your netrekrc file, so the options menus act as an in-game netrekrc editor.
- * Once everything is in place, save_options could write over your current netrekrc (the default
- * will be to write to a separate file, but there will be a menu option to save over your netrekrc).
- * Currently it writes to a separate file (netrek.sav) because it still doesn't save everything that is needed.
- * Default windows placements need to be saved, uselite options need to be saved, review window mapping
- * needs to be saved, option server/servernick/servertype needs to be saved, and lastly, the save
- * keymap routine is broken.
- *
- * Fixed mainResizeable loading from rc/saving.  Also made default setting = on.
- *
- * Revision 1.2  2006/04/19 13:02:33  modemhero
- * Rewrote TTS centering/refresh code so that text is properly centered and clears properly when the message expires.
- * The old code used an average text width that was not so good, resulting in poor centering for long messages.  The new code measures the length of the message directly.
- * Also, the W_ClearArea function was not catching the 3 left-most pixels for whatever reason, so the call to this function slightly extends the area to clear.
- * Updated COW manual to reflect change of tts_pos variable to tts_ypos.
- * This patch could be applied to other windows clients as well.
- *
- * Revision 1.1  2006/04/18 13:47:24  modemhero
- * First attempt at reimport of beeplite into NetrekXP.  Unresolved issue: improper text clearing on TTS beeplite messages.  Still to add: saving of beeplite settings in save_options.
- *
- * Revision 1.1.1.1  1998/11/01 17:24:08  siegl
- * COW 3.0 initial revision
- *
  */
 
 #include "config.h"
@@ -221,14 +190,15 @@
 		{
 
 #if defined(SOUND)
-#if defined(HAVE_SDL)
-                    Play_Sound(MESSAGE_WAV);
-#else
-                    if (sound_toggle)
-                        Play_Sound(MESSAGE_SOUND);
+                    if (newSound)
+                        Play_Sound(MESSAGE_WAV);
                     else
-		        W_Beep();
-#endif
+                    {
+                        if (sound_toggle)
+                            Play_Sound(MESSAGE_SOUND);
+                        else
+		            W_Beep();
+                    }
 #endif
 		}
 	        break;
@@ -237,7 +207,8 @@
    are not loaded into SDL library currently - can change at
    a later time. */
 #ifdef SOUND
-#if !defined(HAVE_SDL)
+            if (!newSound)
+            {
 	    case '1':
 	        if (F_beeplite_flags & LITE_SOUNDS)
 		  Play_Sound(MESSAGE1_SOUND);
@@ -274,7 +245,7 @@
 	        if (F_beeplite_flags & LITE_SOUNDS)
 		  Play_Sound(MESSAGE9_SOUND);
 	        break;
-#endif
+            }
 #endif
 
 	      /* Text between:  /|    |   will be displayed with TTS */

Index: cowmain.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/cowmain.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- cowmain.c	24 Apr 2006 14:13:25 -0000	1.8
+++ cowmain.c	24 Apr 2006 15:30:38 -0000	1.9
@@ -769,8 +769,10 @@
     resetdefaults ();
     savebitmaps ();
     
-#if defined(SOUND) && defined(HAVE_SDL)
-    Init_Sound();
+#if defined(SOUND)
+    newsoundwin (display_host, name);
+    if (newSound)
+        Init_Sound();
 #endif
 
     /* open memory...? */
@@ -898,8 +900,9 @@
 
   /* Moved SDL sound initialization to right after readdefaults() so
    * the intro can start playing ASAP */
-#if defined(SOUND) && !defined(HAVE_SDL)
-    Init_Sound();
+#if defined(SOUND)
+    if (!newSound)
+        Init_Sound();
 #endif
 
 
@@ -909,8 +912,9 @@
     if (i >= RETURNBASE)
         return (i - RETURNBASE);        /* Terminate with retcode */
 
-#if defined(SOUND) && !defined(HAVE_SDL)
-    Abort_Sound(ENGINE_SOUND);
+#if defined(SOUND)
+    if (!newSound)
+        Abort_Sound(ENGINE_SOUND);
 #endif
 
     /* give the player the motd and find out which team he wants */
@@ -957,8 +961,9 @@
 
         sendByeReq ();
 
-#if defined(SOUND) && !defined(HAVE_SDL)
-        Exit_Sound();
+#if defined(SOUND)
+        if (!newSound)
+            Exit_Sound();
 #endif
 
         sleep (1);
@@ -1041,13 +1046,16 @@
 
 
 #ifdef SOUND
-#if defined(HAVE_SDL)
-    Mix_HaltChannel(-1); /* Kill all currently playing sounds when entering game */
-    Play_Sound(ENTER_SHIP_WAV);
-#else
-    Play_Sound(ENTER_SHIP_SOUND);
-    Play_Sound(ENGINE_SOUND);
-#endif /* HAVE_SDL */
+    if (newSound)
+    {
+        Mix_HaltChannel(-1); /* Kill all currently playing sounds when entering game */
+        Play_Sound(ENTER_SHIP_WAV);
+    }
+    else
+    {
+        Play_Sound(ENTER_SHIP_SOUND);
+        Play_Sound(ENGINE_SOUND);
+    }
 #endif
 
     /* Get input until the player quits or dies */



From modemhero at users.sourceforge.net  Mon Apr 24 10:30:40 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Mon, 24 Apr 2006 15:30:40 +0000
Subject: [netrek-cvs] client/netrekxp/win32 config.h,1.5,1.6
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21311/win32

Modified Files:
	config.h 
Log Message:
Instead of a #define SDL, changed it to always load in as I couldn't imagine ever wanting to distribute the client without this option enabled.  Instead, I'm using a netrekrc option, newSound, to let user choose whether to use the new SDL sound system or the old way.

Index: config.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/win32/config.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- config.h	24 Apr 2006 14:13:26 -0000	1.5
+++ config.h	24 Apr 2006 15:30:38 -0000	1.6
@@ -126,9 +126,6 @@
 /*      RACE_COLORS             - additional bitplane for race colors           */
 #define RACE_COLORS
 
-/*      SDL			- new SDL sound					*/
-#define HAVE_SDL
-
 #define PLIST1 
 #define PLIST 
 #define CONTROL_KEY



From modemhero at users.sourceforge.net  Mon Apr 24 10:30:40 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Mon, 24 Apr 2006 15:30:40 +0000
Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html
	generalconfig.html, 1.3, 1.4
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21311/resources/htmlhelp/html

Modified Files:
	generalconfig.html 
Log Message:
Instead of a #define SDL, changed it to always load in as I couldn't imagine ever wanting to distribute the client without this option enabled.  Instead, I'm using a netrekrc option, newSound, to let user choose whether to use the new SDL sound system or the old way.

Index: generalconfig.html
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/generalconfig.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- generalconfig.html	22 Apr 2006 14:11:47 -0000	1.3
+++ generalconfig.html	24 Apr 2006 15:30:38 -0000	1.4
@@ -521,6 +521,16 @@
 
 
 
+newSound
+Use new layered, stereo sound effects
+
+	
                      
+	
                    • on(default)
                      • 
+	
                    • off
                      • 
+	
                    
+
+
+
 omitTeamLetter
 Don't draw team letter on galaxy
 



From modemhero at users.sourceforge.net  Mon Apr 24 10:30:39 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Mon, 24 Apr 2006 15:30:39 +0000
Subject: [netrek-cvs] client/netrekxp/include data.h, 1.6, 1.7 proto.h, 1.7,
	1.8
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21311/include

Modified Files:
	data.h proto.h 
Log Message:
Instead of a #define SDL, changed it to always load in as I couldn't imagine ever wanting to distribute the client without this option enabled.  Instead, I'm using a netrekrc option, newSound, to let user choose whether to use the new SDL sound system or the old way.

Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- data.h	21 Apr 2006 12:00:06 -0000	1.6
+++ data.h	24 Apr 2006 15:30:37 -0000	1.7
@@ -621,4 +621,6 @@
 
 extern int richText;    /* temporary variable to enable/disable rich text windows */
 
+extern int newSound;	/* Use new SDL sound interface */
+
 #endif /* _h_data */

Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- proto.h	24 Apr 2006 14:13:25 -0000	1.7
+++ proto.h	24 Apr 2006 15:30:37 -0000	1.8
@@ -1089,7 +1089,7 @@
      extern void Abort_Sound (int type);
      extern void soundwindow (void);
 //static void soundrefresh(int i);
-#if defined(SOUND) && !defined(HAVE_SDL)
+#if defined(SOUND)
      void soundaction (W_Event * data);
 #endif
      extern void sounddone (void);



From modemhero at users.sourceforge.net  Mon Apr 24 10:30:40 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Mon, 24 Apr 2006 15:30:40 +0000
Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.19,
	1.20 netrekrc_options.txt, 1.1, 1.2
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21311/resources/docs

Modified Files:
	changes.txt netrekrc_options.txt 
Log Message:
Instead of a #define SDL, changed it to always load in as I couldn't imagine ever wanting to distribute the client without this option enabled.  Instead, I'm using a netrekrc option, newSound, to let user choose whether to use the new SDL sound system or the old way.

Index: netrekrc_options.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc_options.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- netrekrc_options.txt	22 Apr 2006 14:11:47 -0000	1.1
+++ netrekrc_options.txt	24 Apr 2006 15:30:37 -0000	1.2
@@ -107,6 +107,7 @@
 # on - COW style
 # off - old style
 
+newSound:                 (on/off) use layered, stereo sound   
 omitTeamLetter:           (on/off) omit team letter on galaxy
 orishipbmpfile:           (path) - old color bitmaps
 oriship1bmpfile:          (path) - new color bitmaps

Index: changes.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- changes.txt	24 Apr 2006 14:13:25 -0000	1.19
+++ changes.txt	24 Apr 2006 15:30:37 -0000	1.20
@@ -1,4 +1,7 @@
 Version TBA:
+- added "newSound: (on)/off".  Allows one to choose not to use the new sound system.  Note
+  that this option is not settable in game through options menu, only through the .netrekrc
+  file.
 - initial SDL implementation
 - continuousMouse and continuousMouseFix now default to on
 - fixed the mono fed sb bitmaps so they rotate more cleanly



From quozl at users.sourceforge.net  Tue Apr 25 03:06:17 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Tue, 25 Apr 2006 08:06:17 +0000
Subject: [netrek-cvs] server/Vanilla/tests - New directory
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26107/tests

Log Message:
Directory /cvsroot/netrek/server/Vanilla/tests added to the repository




From quozl at users.sourceforge.net  Tue Apr 25 03:15:23 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Tue, 25 Apr 2006 08:15:23 +0000
Subject: [netrek-cvs] server/Vanilla/tests conquer, NONE, 1.1 genocide, NONE,
	1.1 parade, NONE, 1.1
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv800/tests

Added Files:
	conquer genocide parade 
Log Message:
test scripts

--- NEW FILE: conquer ---
#!/bin/sh
LIBDIR=/usr/local/games/netrek-server-vanilla
cd ${LIBDIR}

# reset galaxy
lib/tools/setgalaxy r

# make all planets visible to all teams
for x in `seq 10 39`; do lib/tools/setplanet $x reveal; done

# make most of the romulan planets owned by federation
for x in `seq 10 18`; do lib/tools/setplanet $x owner fed; done

# move hyd near ear and flatten to one army
lib/tools/setplanet hyd y 80000 x 17000 armies 1

# move ori near ear and change ownership to rom
lib/tools/setplanet Ori y 83000 x 20000 owner rom

# teleport test player to ear, give kills, give armies
lib/tools/xtkill 0 tf
lib/tools/xtkill 0 k
lib/tools/xtkill 0 k
lib/tools/xtkill 0 k
lib/tools/xtkill 0 a

# instructions for test player
# take planet hyd to trigger conquer
# neut not enough

# allow time for last planet to be taken
sleep 600

# destroy all robots
killall robot

# destroy all client connections
killall ntserv

# allow time to run down
sleep 1

# destroy daemon
killall daemonII

--- NEW FILE: genocide ---
#!/bin/sh
LIBDIR=/usr/local/games/netrek-server-vanilla
cd ${LIBDIR}

# reset galaxy
lib/tools/setgalaxy r

# make all planets visible to all teams
for x in `seq 10 39`; do lib/tools/setplanet $x reveal; done

# make most of the romulan planets owned by federation
for x in `seq 10 18`; do lib/tools/setplanet $x owner fed; done

# move hyd near ear and flatten to one army
lib/tools/setplanet hyd y 80000 x 17000 armies 1 owner ori

# move ori near ear and change ownership to rom
lib/tools/setplanet ori y 83000 x 20000 armies 1 owner rom

# teleport test player to ear, give kills, give armies
lib/tools/xtkill 0 tf
lib/tools/xtkill 0 k
lib/tools/xtkill 0 k
lib/tools/xtkill 0 k
lib/tools/xtkill 0 a

# instructions for test player
# neut planet ori to trigger genocide
# do not take planet hyd as this will merely trigger conquer

--- NEW FILE: parade ---
#!/bin/sh
LIBDIR=/usr/local/games/netrek-server-vanilla
cd ${LIBDIR}

# reset galaxy
lib/tools/setgalaxy r

# make all planets visible to all teams
for x in `seq 10 39`; do lib/tools/setplanet $x reveal; done

# make most of the romulan planets owned by federation
for x in `seq 10 18`; do lib/tools/setplanet $x owner fed; done

# move hyd near ear and flatten to one army
lib/tools/setplanet hyd y 80000 x 17000 armies 1

# move ori near ear and change ownership to rom
lib/tools/setplanet ori y 83000 x 20000 owner rom

# teleport test player to ear, give kills, give armies
lib/tools/xtkill 0 tf
lib/tools/xtkill 0 k
lib/tools/xtkill 0 k
lib/tools/xtkill 0 k
lib/tools/xtkill 0 a

# instructions for test player
# take planet hyd to trigger conquer
# neut not enough

# start a set of robots
lib/og/robot -h localhost -Tr 2>/dev/null >/dev/null &
sleep 0.2
lib/og/robot -h localhost -Tr 2>/dev/null >/dev/null &
sleep 0.2
lib/og/robot -h localhost -Tr 2>/dev/null >/dev/null &
sleep 0.2
lib/og/robot -h localhost -Tr 2>/dev/null >/dev/null &
sleep 0.2
lib/og/robot -h localhost -Tf 2>/dev/null >/dev/null &
sleep 0.2
lib/og/robot -h localhost -Tf 2>/dev/null >/dev/null &
sleep 0.2
lib/og/robot -h localhost -Tf 2>/dev/null >/dev/null &

# allow time for last planet to be taken
sleep 600

# destroy all robots
killall robot

# destroy all client connections
killall ntserv

# allow time to run down
sleep 1

# destroy daemon
killall daemonII



From modemhero at users.sourceforge.net  Tue Apr 25 20:32:26 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Wed, 26 Apr 2006 01:32:26 +0000
Subject: [netrek-cvs] client/netrekxp/win32/lib/BCC - New directory
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/win32/lib/BCC
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15719/BCC

Log Message:
Directory /cvsroot/netrek/client/netrekxp/win32/lib/BCC added to the repository




From modemhero at users.sourceforge.net  Tue Apr 25 20:32:27 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Wed, 26 Apr 2006 01:32:27 +0000
Subject: [netrek-cvs] client/netrekxp/win32/lib/VCC - New directory
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/win32/lib/VCC
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15719/VCC

Log Message:
Directory /cvsroot/netrek/client/netrekxp/win32/lib/VCC added to the repository




From modemhero at users.sourceforge.net  Tue Apr 25 20:32:01 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Wed, 26 Apr 2006 01:32:01 +0000
Subject: [netrek-cvs] client/netrekxp/win32/SDL - New directory
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/win32/SDL
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15267/SDL

Log Message:
Directory /cvsroot/netrek/client/netrekxp/win32/SDL added to the repository




From modemhero at users.sourceforge.net  Tue Apr 25 20:51:21 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Wed, 26 Apr 2006 01:51:21 +0000
Subject: [netrek-cvs] client/netrekxp/win32/SDL SDL.h, NONE, 1.1 SDL_active.h,
	NONE, 1.1 SDL_audio.h, NONE, 1.1 SDL_byteorder.h, NONE,
	1.1 SDL_cdrom.h, NONE, 1.1 SDL_error.h, NONE, 1.1 SDL_events.h,
	NONE, 1.1 SDL_getenv.h, NONE, 1.1 SDL_joystick.h, NONE,
	1.1 SDL_keyboard.h, NONE, 1.1 SDL_keysym.h, NONE,
	1.1 SDL_main.h, NONE, 1.1 SDL_mixer.h, NONE, 1.1 SDL_mouse.h,
	NONE, 1.1 SDL_mutex.h, NONE, 1.1 SDL_quit.h, NONE,
	1.1 SDL_rwops.h, NONE, 1.1 SDL_timer.h, NONE, 1.1 SDL_types.h,
	NONE, 1.1 SDL_version.h, NONE, 1.1 SDL_video.h, NONE,
	1.1 begin_code.h, NONE, 1.1 close_code.h, NONE, 1.1
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/win32/SDL
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29707/win32/SDL

Added Files:
	SDL.h SDL_active.h SDL_audio.h SDL_byteorder.h SDL_cdrom.h 
	SDL_error.h SDL_events.h SDL_getenv.h SDL_joystick.h 
	SDL_keyboard.h SDL_keysym.h SDL_main.h SDL_mixer.h SDL_mouse.h 
	SDL_mutex.h SDL_quit.h SDL_rwops.h SDL_timer.h SDL_types.h 
	SDL_version.h SDL_video.h begin_code.h close_code.h 
Log Message:
SDL header files

--- NEW FILE: SDL_main.h ---
/*
    SDL - Simple DirectMedia Layer
    Copyright (C) 1997-2004 Sam Lantinga

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

    Sam Lantinga
    slouken at libsdl.org
*/

#ifdef SAVE_RCSID
static char rcsid =
 "@(#) $Id: SDL_main.h,v 1.1 2006/04/26 01:51:19 modemhero Exp $";
#endif

#ifndef _SDL_main_h
#define _SDL_main_h

/* Redefine main() on Win32 and MacOS so that it is called by winmain.c */

#if defined(WIN32) || defined(_WIN32) || \
    (defined(__MWERKS__) && !defined(__BEOS__)) || \
    defined(macintosh) || defined(__APPLE__) || \
    defined(__SYMBIAN32__) || defined(QWS)

#ifdef __cplusplus
#define C_LINKAGE	"C"
#else
#define C_LINKAGE
#endif /* __cplusplus */

/* The application's main() function must be called with C linkage,
   and should be declared like this:
#ifdef __cplusplus
extern "C"
#endif
	int main(int argc, char *argv[])
	{
	}
 */
#define main	SDL_main

/* The prototype for the application's main() function */
extern C_LINKAGE int SDL_main(int argc, char *argv[]);


/* From the SDL library code -- needed for registering the app on Win32 */
#if defined(WIN32)
#include "SDL_types.h"
#include "begin_code.h"

#ifdef __cplusplus
extern "C" {
#endif

/* This should be called from your WinMain() function, if any */
extern DECLSPEC void SDLCALL SDL_SetModuleHandle(void *hInst);
/* This can also be called, but is no longer necessary */
extern DECLSPEC int SDLCALL SDL_RegisterApp(char *name, Uint32 style, void *hInst);

#ifdef __cplusplus
}
#endif
#include "close_code.h"
#endif

/* From the SDL library code -- needed for registering QuickDraw on MacOS */
#if defined(macintosh)
#include "begin_code.h"

#ifdef __cplusplus
extern "C" {
#endif

/* Forward declaration so we don't need to include QuickDraw.h */
struct QDGlobals;

/* This should be called from your main() function, if any */
extern DECLSPEC void SDLCALL SDL_InitQuickDraw(struct QDGlobals *the_qd);

#ifdef __cplusplus
}
#endif
#include "close_code.h"
#endif

#endif /* Need to redefine main()? */

#endif /* _SDL_main_h */

--- NEW FILE: SDL_audio.h ---
/*
    SDL - Simple DirectMedia Layer
    Copyright (C) 1997-2004 Sam Lantinga

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

    Sam Lantinga
    slouken at libsdl.org
*/

#ifdef SAVE_RCSID
static char rcsid =
 "@(#) $Id: SDL_audio.h,v 1.1 2006/04/26 01:51:19 modemhero Exp $";
#endif

/* Access to the raw audio mixing buffer for the SDL library */

#ifndef _SDL_audio_h
#define _SDL_audio_h

#include 

#include "SDL_main.h"
#include "SDL_types.h"
#include "SDL_error.h"
#include "SDL_rwops.h"
#include "SDL_byteorder.h"

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
extern "C" {
#endif

/* The calculated values in this structure are calculated by SDL_OpenAudio() */
typedef struct SDL_AudioSpec {
	int freq;		/* DSP frequency -- samples per second */
	Uint16 format;		/* Audio data format */
	Uint8  channels;	/* Number of channels: 1 mono, 2 stereo */
	Uint8  silence;		/* Audio buffer silence value (calculated) */
	Uint16 samples;		/* Audio buffer size in samples (power of 2) */
	Uint16 padding;		/* Necessary for some compile environments */
	Uint32 size;		/* Audio buffer size in bytes (calculated) */
	/* This function is called when the audio device needs more data.
	   'stream' is a pointer to the audio data buffer
	   'len' is the length of that buffer in bytes.
	   Once the callback returns, the buffer will no longer be valid.
	   Stereo samples are stored in a LRLRLR ordering.
	*/
	void (SDLCALL *callback)(void *userdata, Uint8 *stream, int len);
	void  *userdata;
} SDL_AudioSpec;

/* Audio format flags (defaults to LSB byte order) */
#define AUDIO_U8	0x0008	/* Unsigned 8-bit samples */
#define AUDIO_S8	0x8008	/* Signed 8-bit samples */
#define AUDIO_U16LSB	0x0010	/* Unsigned 16-bit samples */
#define AUDIO_S16LSB	0x8010	/* Signed 16-bit samples */
#define AUDIO_U16MSB	0x1010	/* As above, but big-endian byte order */
#define AUDIO_S16MSB	0x9010	/* As above, but big-endian byte order */
#define AUDIO_U16	AUDIO_U16LSB
#define AUDIO_S16	AUDIO_S16LSB

/* Native audio byte ordering */
#if SDL_BYTEORDER == SDL_LIL_ENDIAN
#define AUDIO_U16SYS	AUDIO_U16LSB
#define AUDIO_S16SYS	AUDIO_S16LSB
#else
#define AUDIO_U16SYS	AUDIO_U16MSB
#define AUDIO_S16SYS	AUDIO_S16MSB
#endif


/* A structure to hold a set of audio conversion filters and buffers */
typedef struct SDL_AudioCVT {
	int needed;			/* Set to 1 if conversion possible */
	Uint16 src_format;		/* Source audio format */
	Uint16 dst_format;		/* Target audio format */
	double rate_incr;		/* Rate conversion increment */
	Uint8 *buf;			/* Buffer to hold entire audio data */
	int    len;			/* Length of original audio buffer */
	int    len_cvt;			/* Length of converted audio buffer */
	int    len_mult;		/* buffer must be len*len_mult big */
	double len_ratio; 	/* Given len, final size is len*len_ratio */
	void (SDLCALL *filters[10])(struct SDL_AudioCVT *cvt, Uint16 format);
	int filter_index;		/* Current audio conversion function */
} SDL_AudioCVT;


/* Function prototypes */

/* These functions are used internally, and should not be used unless you
 * have a specific need to specify the audio driver you want to use.
 * You should normally use SDL_Init() or SDL_InitSubSystem().
 */
extern DECLSPEC int SDLCALL SDL_AudioInit(const char *driver_name);
extern DECLSPEC void SDLCALL SDL_AudioQuit(void);

/* This function fills the given character buffer with the name of the
 * current audio driver, and returns a pointer to it if the audio driver has
 * been initialized.  It returns NULL if no driver has been initialized.
 */
extern DECLSPEC char * SDLCALL SDL_AudioDriverName(char *namebuf, int maxlen);

/*
 * This function opens the audio device with the desired parameters, and
 * returns 0 if successful, placing the actual hardware parameters in the
 * structure pointed to by 'obtained'.  If 'obtained' is NULL, the audio
 * data passed to the callback function will be guaranteed to be in the
 * requested format, and will be automatically converted to the hardware
 * audio format if necessary.  This function returns -1 if it failed 
 * to open the audio device, or couldn't set up the audio thread.
 *
 * When filling in the desired audio spec structure,
 *  'desired->freq' should be the desired audio frequency in samples-per-second.
 *  'desired->format' should be the desired audio format.
 *  'desired->samples' is the desired size of the audio buffer, in samples.
 *     This number should be a power of two, and may be adjusted by the audio
 *     driver to a value more suitable for the hardware.  Good values seem to
 *     range between 512 and 8096 inclusive, depending on the application and
 *     CPU speed.  Smaller values yield faster response time, but can lead
 *     to underflow if the application is doing heavy processing and cannot
 *     fill the audio buffer in time.  A stereo sample consists of both right
 *     and left channels in LR ordering.
 *     Note that the number of samples is directly related to time by the
 *     following formula:  ms = (samples*1000)/freq
 *  'desired->size' is the size in bytes of the audio buffer, and is
 *     calculated by SDL_OpenAudio().
 *  'desired->silence' is the value used to set the buffer to silence,
 *     and is calculated by SDL_OpenAudio().
 *  'desired->callback' should be set to a function that will be called
 *     when the audio device is ready for more data.  It is passed a pointer
 *     to the audio buffer, and the length in bytes of the audio buffer.
 *     This function usually runs in a separate thread, and so you should
 *     protect data structures that it accesses by calling SDL_LockAudio()
 *     and SDL_UnlockAudio() in your code.
 *  'desired->userdata' is passed as the first parameter to your callback
 *     function.
 *
 * The audio device starts out playing silence when it's opened, and should
 * be enabled for playing by calling SDL_PauseAudio(0) when you are ready
 * for your audio callback function to be called.  Since the audio driver
 * may modify the requested size of the audio buffer, you should allocate
 * any local mixing buffers after you open the audio device.
 */
extern DECLSPEC int SDLCALL SDL_OpenAudio(SDL_AudioSpec *desired, SDL_AudioSpec *obtained);

/*
 * Get the current audio state:
 */
typedef enum {
	SDL_AUDIO_STOPPED = 0,
	SDL_AUDIO_PLAYING,
	SDL_AUDIO_PAUSED
} SDL_audiostatus;
extern DECLSPEC SDL_audiostatus SDLCALL SDL_GetAudioStatus(void);

/*
 * This function pauses and unpauses the audio callback processing.
 * It should be called with a parameter of 0 after opening the audio
 * device to start playing sound.  This is so you can safely initialize
 * data for your callback function after opening the audio device.
 * Silence will be written to the audio device during the pause.
 */
extern DECLSPEC void SDLCALL SDL_PauseAudio(int pause_on);

/*
 * This function loads a WAVE from the data source, automatically freeing
 * that source if 'freesrc' is non-zero.  For example, to load a WAVE file,
 * you could do:
 *	SDL_LoadWAV_RW(SDL_RWFromFile("sample.wav", "rb"), 1, ...);
 *
 * If this function succeeds, it returns the given SDL_AudioSpec,
 * filled with the audio data format of the wave data, and sets
 * 'audio_buf' to a malloc()'d buffer containing the audio data,
 * and sets 'audio_len' to the length of that audio buffer, in bytes.
 * You need to free the audio buffer with SDL_FreeWAV() when you are 
 * done with it.
 *
 * This function returns NULL and sets the SDL error message if the 
 * wave file cannot be opened, uses an unknown data format, or is 
 * corrupt.  Currently raw and MS-ADPCM WAVE files are supported.
 */
extern DECLSPEC SDL_AudioSpec * SDLCALL SDL_LoadWAV_RW(SDL_RWops *src, int freesrc, SDL_AudioSpec *spec, Uint8 **audio_buf, Uint32 *audio_len);

/* Compatibility convenience function -- loads a WAV from a file */
#define SDL_LoadWAV(file, spec, audio_buf, audio_len) \
	SDL_LoadWAV_RW(SDL_RWFromFile(file, "rb"),1, spec,audio_buf,audio_len)

/*
 * This function frees data previously allocated with SDL_LoadWAV_RW()
 */
extern DECLSPEC void SDLCALL SDL_FreeWAV(Uint8 *audio_buf);

/*
 * This function takes a source format and rate and a destination format
 * and rate, and initializes the 'cvt' structure with information needed
 * by SDL_ConvertAudio() to convert a buffer of audio data from one format
 * to the other.
 * This function returns 0, or -1 if there was an error.
 */
extern DECLSPEC int SDLCALL SDL_BuildAudioCVT(SDL_AudioCVT *cvt,
		Uint16 src_format, Uint8 src_channels, int src_rate,
		Uint16 dst_format, Uint8 dst_channels, int dst_rate);

/* Once you have initialized the 'cvt' structure using SDL_BuildAudioCVT(),
 * created an audio buffer cvt->buf, and filled it with cvt->len bytes of
 * audio data in the source format, this function will convert it in-place
 * to the desired format.
 * The data conversion may expand the size of the audio data, so the buffer
 * cvt->buf should be allocated after the cvt structure is initialized by
 * SDL_BuildAudioCVT(), and should be cvt->len*cvt->len_mult bytes long.
 */
extern DECLSPEC int SDLCALL SDL_ConvertAudio(SDL_AudioCVT *cvt);

/*
 * This takes two audio buffers of the playing audio format and mixes
 * them, performing addition, volume adjustment, and overflow clipping.
 * The volume ranges from 0 - 128, and should be set to SDL_MIX_MAXVOLUME
 * for full audio volume.  Note this does not change hardware volume.
 * This is provided for convenience -- you can mix your own audio data.
 */
#define SDL_MIX_MAXVOLUME 128
extern DECLSPEC void SDLCALL SDL_MixAudio(Uint8 *dst, const Uint8 *src, Uint32 len, int volume);

/*
 * The lock manipulated by these functions protects the callback function.
 * During a LockAudio/UnlockAudio pair, you can be guaranteed that the
 * callback function is not running.  Do not call these from the callback
 * function or you will cause deadlock.
 */
extern DECLSPEC void SDLCALL SDL_LockAudio(void);
extern DECLSPEC void SDLCALL SDL_UnlockAudio(void);

/*
 * This function shuts down audio processing and closes the audio device.
 */
extern DECLSPEC void SDLCALL SDL_CloseAudio(void);


/* Ends C function definitions when using C++ */
#ifdef __cplusplus
}
#endif
#include "close_code.h"

#endif /* _SDL_audio_h */

--- NEW FILE: SDL_quit.h ---
/*
    SDL - Simple DirectMedia Layer
    Copyright (C) 1997-2004 Sam Lantinga

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

    Sam Lantinga
    slouken at libsdl.org
*/

#ifdef SAVE_RCSID
static char rcsid =
 "@(#) $Id: SDL_quit.h,v 1.1 2006/04/26 01:51:19 modemhero Exp $";
#endif

/* Include file for SDL quit event handling */

#ifndef _SDL_quit_h
#define _SDL_quit_h

/* 
  An SDL_QUITEVENT is generated when the user tries to close the application
  window.  If it is ignored or filtered out, the window will remain open.
  If it is not ignored or filtered, it is queued normally and the window
  is allowed to close.  When the window is closed, screen updates will 
  complete, but have no effect.

  SDL_Init() installs signal handlers for SIGINT (keyboard interrupt)
  and SIGTERM (system termination request), if handlers do not already
  exist, that generate SDL_QUITEVENT events as well.  There is no way
  to determine the cause of an SDL_QUITEVENT, but setting a signal
  handler in your application will override the default generation of
  quit events for that signal.
*/

/* There are no functions directly affecting the quit event */
#define SDL_QuitRequested() \
        (SDL_PumpEvents(), SDL_PeepEvents(NULL,0,SDL_PEEKEVENT,SDL_QUITMASK))

#endif /* _SDL_quit_h */

--- NEW FILE: SDL_joystick.h ---
/*
    SDL - Simple DirectMedia Layer
    Copyright (C) 1997-2004 Sam Lantinga

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

    Sam Lantinga
    slouken at libsdl.org
*/

#ifdef SAVE_RCSID
static char rcsid =
 "@(#) $Id: SDL_joystick.h,v 1.1 2006/04/26 01:51:19 modemhero Exp $";
#endif

/* Include file for SDL joystick event handling */

#ifndef _SDL_joystick_h
#define _SDL_joystick_h

#include "SDL_types.h"

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
extern "C" {
#endif

/* In order to use these functions, SDL_Init() must have been called
   with the SDL_INIT_JOYSTICK flag.  This causes SDL to scan the system
   for joysticks, and load appropriate drivers.
*/

/* The joystick structure used to identify an SDL joystick */
struct _SDL_Joystick;
typedef struct _SDL_Joystick SDL_Joystick;


/* Function prototypes */
/*
 * Count the number of joysticks attached to the system
 */
extern DECLSPEC int SDLCALL SDL_NumJoysticks(void);

/*
 * Get the implementation dependent name of a joystick.
 * This can be called before any joysticks are opened.
 * If no name can be found, this function returns NULL.
 */
extern DECLSPEC const char * SDLCALL SDL_JoystickName(int device_index);

/*
 * Open a joystick for use - the index passed as an argument refers to
 * the N'th joystick on the system.  This index is the value which will
 * identify this joystick in future joystick events.
 *
 * This function returns a joystick identifier, or NULL if an error occurred.
 */
extern DECLSPEC SDL_Joystick * SDLCALL SDL_JoystickOpen(int device_index);

/*
 * Returns 1 if the joystick has been opened, or 0 if it has not.
 */
extern DECLSPEC int SDLCALL SDL_JoystickOpened(int device_index);

/*
 * Get the device index of an opened joystick.
 */
extern DECLSPEC int SDLCALL SDL_JoystickIndex(SDL_Joystick *joystick);

/*
 * Get the number of general axis controls on a joystick
 */
extern DECLSPEC int SDLCALL SDL_JoystickNumAxes(SDL_Joystick *joystick);

/*
 * Get the number of trackballs on a joystick
 * Joystick trackballs have only relative motion events associated
 * with them and their state cannot be polled.
 */
extern DECLSPEC int SDLCALL SDL_JoystickNumBalls(SDL_Joystick *joystick);

/*
 * Get the number of POV hats on a joystick
 */
extern DECLSPEC int SDLCALL SDL_JoystickNumHats(SDL_Joystick *joystick);

/*
 * Get the number of buttons on a joystick
 */
extern DECLSPEC int SDLCALL SDL_JoystickNumButtons(SDL_Joystick *joystick);

/*
 * Update the current state of the open joysticks.
 * This is called automatically by the event loop if any joystick
 * events are enabled.
 */
extern DECLSPEC void SDLCALL SDL_JoystickUpdate(void);

/*
 * Enable/disable joystick event polling.
 * If joystick events are disabled, you must call SDL_JoystickUpdate()
 * yourself and check the state of the joystick when you want joystick
 * information.
 * The state can be one of SDL_QUERY, SDL_ENABLE or SDL_IGNORE.
 */
extern DECLSPEC int SDLCALL SDL_JoystickEventState(int state);

/*
 * Get the current state of an axis control on a joystick
 * The state is a value ranging from -32768 to 32767.
 * The axis indices start at index 0.
 */
extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick *joystick, int axis);

/*
 * Get the current state of a POV hat on a joystick
 * The return value is one of the following positions:
 */
#define SDL_HAT_CENTERED	0x00
#define SDL_HAT_UP		0x01
#define SDL_HAT_RIGHT		0x02
#define SDL_HAT_DOWN		0x04
#define SDL_HAT_LEFT		0x08
#define SDL_HAT_RIGHTUP		(SDL_HAT_RIGHT|SDL_HAT_UP)
#define SDL_HAT_RIGHTDOWN	(SDL_HAT_RIGHT|SDL_HAT_DOWN)
#define SDL_HAT_LEFTUP		(SDL_HAT_LEFT|SDL_HAT_UP)
#define SDL_HAT_LEFTDOWN	(SDL_HAT_LEFT|SDL_HAT_DOWN)
/*
 * The hat indices start at index 0.
 */
extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetHat(SDL_Joystick *joystick, int hat);

/*
 * Get the ball axis change since the last poll
 * This returns 0, or -1 if you passed it invalid parameters.
 * The ball indices start at index 0.
 */
extern DECLSPEC int SDLCALL SDL_JoystickGetBall(SDL_Joystick *joystick, int ball, int *dx, int *dy);

/*
 * Get the current state of a button on a joystick
 * The button indices start at index 0.
 */
extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetButton(SDL_Joystick *joystick, int button);

/*
 * Close a joystick previously opened with SDL_JoystickOpen()
 */
extern DECLSPEC void SDLCALL SDL_JoystickClose(SDL_Joystick *joystick);


/* Ends C function definitions when using C++ */
#ifdef __cplusplus
}
#endif
#include "close_code.h"

#endif /* _SDL_joystick_h */

--- NEW FILE: SDL_active.h ---
/*
    SDL - Simple DirectMedia Layer
    Copyright (C) 1997-2004 Sam Lantinga

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

    Sam Lantinga
    slouken at libsdl.org
*/

#ifdef SAVE_RCSID
static char rcsid =
 "@(#) $Id: SDL_active.h,v 1.1 2006/04/26 01:51:19 modemhero Exp $";
#endif

/* Include file for SDL application focus event handling */

#ifndef _SDL_active_h
#define _SDL_active_h

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
extern "C" {
#endif

/* The available application states */
#define SDL_APPMOUSEFOCUS	0x01		/* The app has mouse coverage */
#define SDL_APPINPUTFOCUS	0x02		/* The app has input focus */
#define SDL_APPACTIVE		0x04		/* The application is active */

/* Function prototypes */
/* 
 * This function returns the current state of the application, which is a
 * bitwise combination of SDL_APPMOUSEFOCUS, SDL_APPINPUTFOCUS, and
 * SDL_APPACTIVE.  If SDL_APPACTIVE is set, then the user is able to
 * see your application, otherwise it has been iconified or disabled.
 */
extern DECLSPEC Uint8 SDLCALL SDL_GetAppState(void);


/* Ends C function definitions when using C++ */
#ifdef __cplusplus
}
#endif
#include "close_code.h"

#endif /* _SDL_active_h */

--- NEW FILE: SDL_rwops.h ---
/*
    SDL - Simple DirectMedia Layer
    Copyright (C) 1997-2004 Sam Lantinga

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

    Sam Lantinga
    slouken at libsdl.org
*/

#ifdef SAVE_RCSID
static char rcsid =
 "@(#) $Id: SDL_rwops.h,v 1.1 2006/04/26 01:51:19 modemhero Exp $";
#endif

/* This file provides a general interface for SDL to read and write
   data sources.  It can easily be extended to files, memory, etc.
*/

#ifndef _SDL_RWops_h
#define _SDL_RWops_h

#include 

#include "SDL_types.h"

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
extern "C" {
#endif

/* This is the read/write operation structure -- very basic */

typedef struct SDL_RWops {
	/* Seek to 'offset' relative to whence, one of stdio's whence values:
		SEEK_SET, SEEK_CUR, SEEK_END
	   Returns the final offset in the data source.
	 */
	int (SDLCALL *seek)(struct SDL_RWops *context, int offset, int whence);

	/* Read up to 'num' objects each of size 'objsize' from the data
	   source to the area pointed at by 'ptr'.
	   Returns the number of objects read, or -1 if the read failed.
	 */
	int (SDLCALL *read)(struct SDL_RWops *context, void *ptr, int size, int maxnum);

	/* Write exactly 'num' objects each of size 'objsize' from the area
	   pointed at by 'ptr' to data source.
	   Returns 'num', or -1 if the write failed.
	 */
	int (SDLCALL *write)(struct SDL_RWops *context, const void *ptr, int size, int num);

	/* Close and free an allocated SDL_FSops structure */
	int (SDLCALL *close)(struct SDL_RWops *context);

	Uint32 type;
	union {
	    struct {
		int autoclose;
	 	FILE *fp;
	    } stdio;
	    struct {
		Uint8 *base;
	 	Uint8 *here;
		Uint8 *stop;
	    } mem;
	    struct {
		void *data1;
	    } unknown;
	} hidden;

} SDL_RWops;


/* Functions to create SDL_RWops structures from various data sources */

extern DECLSPEC SDL_RWops * SDLCALL SDL_RWFromFile(const char *file, const char *mode);

extern DECLSPEC SDL_RWops * SDLCALL SDL_RWFromFP(FILE *fp, int autoclose);

extern DECLSPEC SDL_RWops * SDLCALL SDL_RWFromMem(void *mem, int size);
extern DECLSPEC SDL_RWops * SDLCALL SDL_RWFromConstMem(const void *mem, int size);

extern DECLSPEC SDL_RWops * SDLCALL SDL_AllocRW(void);
extern DECLSPEC void SDLCALL SDL_FreeRW(SDL_RWops *area);

/* Macros to easily read and write from an SDL_RWops structure */
#define SDL_RWseek(ctx, offset, whence)	(ctx)->seek(ctx, offset, whence)
#define SDL_RWtell(ctx)			(ctx)->seek(ctx, 0, SEEK_CUR)
#define SDL_RWread(ctx, ptr, size, n)	(ctx)->read(ctx, ptr, size, n)
#define SDL_RWwrite(ctx, ptr, size, n)	(ctx)->write(ctx, ptr, size, n)
#define SDL_RWclose(ctx)		(ctx)->close(ctx)


/* Ends C function definitions when using C++ */
#ifdef __cplusplus
}
#endif
#include "close_code.h"

#endif /* _SDL_RWops_h */

--- NEW FILE: SDL_keyboard.h ---
/*
    SDL - Simple DirectMedia Layer
    Copyright (C) 1997-2004 Sam Lantinga

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

    Sam Lantinga
    slouken at libsdl.org
*/

#ifdef SAVE_RCSID
static char rcsid =
 "@(#) $Id: SDL_keyboard.h,v 1.1 2006/04/26 01:51:19 modemhero Exp $";
#endif

/* Include file for SDL keyboard event handling */

#ifndef _SDL_keyboard_h
#define _SDL_keyboard_h

#include "SDL_types.h"
#include "SDL_keysym.h"

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
extern "C" {
#endif

/* Keysym structure
   - The scancode is hardware dependent, and should not be used by general
     applications.  If no hardware scancode is available, it will be 0.

   - The 'unicode' translated character is only available when character
     translation is enabled by the SDL_EnableUNICODE() API.  If non-zero,
     this is a UNICODE character corresponding to the keypress.  If the
     high 9 bits of the character are 0, then this maps to the equivalent
     ASCII character:
	char ch;
	if ( (keysym.unicode & 0xFF80) == 0 ) {
		ch = keysym.unicode & 0x7F;
	} else {
		An international character..
	}
 */
typedef struct SDL_keysym {
	Uint8 scancode;			/* hardware specific scancode */
	SDLKey sym;			/* SDL virtual keysym */
	SDLMod mod;			/* current key modifiers */
	Uint16 unicode;			/* translated character */
} SDL_keysym;

/* This is the mask which refers to all hotkey bindings */
#define SDL_ALL_HOTKEYS		0xFFFFFFFF

/* Function prototypes */
/*
 * Enable/Disable UNICODE translation of keyboard input.
 * This translation has some overhead, so translation defaults off.
 * If 'enable' is 1, translation is enabled.
 * If 'enable' is 0, translation is disabled.
 * If 'enable' is -1, the translation state is not changed.
 * It returns the previous state of keyboard translation.
 */
extern DECLSPEC int SDLCALL SDL_EnableUNICODE(int enable);

/*
 * Enable/Disable keyboard repeat.  Keyboard repeat defaults to off.
 * 'delay' is the initial delay in ms between the time when a key is
 * pressed, and keyboard repeat begins.
 * 'interval' is the time in ms between keyboard repeat events.
 */
#define SDL_DEFAULT_REPEAT_DELAY	500
#define SDL_DEFAULT_REPEAT_INTERVAL	30
/*
 * If 'delay' is set to 0, keyboard repeat is disabled.
 */
extern DECLSPEC int SDLCALL SDL_EnableKeyRepeat(int delay, int interval);

/*
 * Get a snapshot of the current state of the keyboard.
 * Returns an array of keystates, indexed by the SDLK_* syms.
 * Used:
 * 	Uint8 *keystate = SDL_GetKeyState(NULL);
 *	if ( keystate[SDLK_RETURN] ) ...  is pressed.
 */
extern DECLSPEC Uint8 * SDLCALL SDL_GetKeyState(int *numkeys);

/*
 * Get the current key modifier state
 */
extern DECLSPEC SDLMod SDLCALL SDL_GetModState(void);

/*
 * Set the current key modifier state
 * This does not change the keyboard state, only the key modifier flags.
 */
extern DECLSPEC void SDLCALL SDL_SetModState(SDLMod modstate);

/*
 * Get the name of an SDL virtual keysym
 */
extern DECLSPEC char * SDLCALL SDL_GetKeyName(SDLKey key);


/* Ends C function definitions when using C++ */
#ifdef __cplusplus
}
#endif
#include "close_code.h"

#endif /* _SDL_keyboard_h */

--- NEW FILE: SDL_timer.h ---
/*
    SDL - Simple DirectMedia Layer
    Copyright (C) 1997-2004 Sam Lantinga

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

    Sam Lantinga
    slouken at libsdl.org
*/

#ifdef SAVE_RCSID
static char rcsid =
 "@(#) $Id: SDL_timer.h,v 1.1 2006/04/26 01:51:19 modemhero Exp $";
#endif

#ifndef _SDL_timer_h
#define _SDL_timer_h

/* Header for the SDL time management routines */

#include "SDL_main.h"
#include "SDL_types.h"

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
extern "C" {
#endif

/* This is the OS scheduler timeslice, in milliseconds */
#define SDL_TIMESLICE		10

/* This is the maximum resolution of the SDL timer on all platforms */
#define TIMER_RESOLUTION	10	/* Experimentally determined */

/* Get the number of milliseconds since the SDL library initialization.
 * Note that this value wraps if the program runs for more than ~49 days.
 */ 
extern DECLSPEC Uint32 SDLCALL SDL_GetTicks(void);

/* Wait a specified number of milliseconds before returning */
extern DECLSPEC void SDLCALL SDL_Delay(Uint32 ms);

/* Function prototype for the timer callback function */
typedef Uint32 (SDLCALL *SDL_TimerCallback)(Uint32 interval);

/* Set a callback to run after the specified number of milliseconds has
 * elapsed. The callback function is passed the current timer interval
 * and returns the next timer interval.  If the returned value is the 
 * same as the one passed in, the periodic alarm continues, otherwise a
 * new alarm is scheduled.  If the callback returns 0, the periodic alarm
 * is cancelled.
 *
 * To cancel a currently running timer, call SDL_SetTimer(0, NULL);
 *
 * The timer callback function may run in a different thread than your
 * main code, and so shouldn't call any functions from within itself.
 *
 * The maximum resolution of this timer is 10 ms, which means that if
 * you request a 16 ms timer, your callback will run approximately 20 ms
 * later on an unloaded system.  If you wanted to set a flag signaling
 * a frame update at 30 frames per second (every 33 ms), you might set a 
 * timer for 30 ms:
 *   SDL_SetTimer((33/10)*10, flag_update);
 *
 * If you use this function, you need to pass SDL_INIT_TIMER to SDL_Init().
 *
 * Under UNIX, you should not use raise or use SIGALRM and this function
 * in the same program, as it is implemented using setitimer().  You also
 * should not use this function in multi-threaded applications as signals
 * to multi-threaded apps have undefined behavior in some implementations.
 *
 * This function returns 0 if successful, or -1 if there was an error.
 */
extern DECLSPEC int SDLCALL SDL_SetTimer(Uint32 interval, SDL_TimerCallback callback);

/* New timer API, supports multiple timers
 * Written by Stephane Peter 
 */

/* Function prototype for the new timer callback function.
 * The callback function is passed the current timer interval and returns
 * the next timer interval.  If the returned value is the same as the one
 * passed in, the periodic alarm continues, otherwise a new alarm is
 * scheduled.  If the callback returns 0, the periodic alarm is cancelled.
 */
typedef Uint32 (SDLCALL *SDL_NewTimerCallback)(Uint32 interval, void *param);

/* Definition of the timer ID type */
typedef struct _SDL_TimerID *SDL_TimerID;

/* Add a new timer to the pool of timers already running.
   Returns a timer ID, or NULL when an error occurs.
 */
extern DECLSPEC SDL_TimerID SDLCALL SDL_AddTimer(Uint32 interval, SDL_NewTimerCallback callback, void *param);

/* Remove one of the multiple timers knowing its ID.
 * Returns a boolean value indicating success.
 */
extern DECLSPEC SDL_bool SDLCALL SDL_RemoveTimer(SDL_TimerID t);

/* Ends C function definitions when using C++ */
#ifdef __cplusplus
}
#endif
#include "close_code.h"

#endif /* _SDL_timer_h */

--- NEW FILE: SDL_byteorder.h ---
/*
    SDL - Simple DirectMedia Layer
    Copyright (C) 1997-2004 Sam Lantinga

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

    Sam Lantinga
    slouken at libsdl.org
*/

#ifdef SAVE_RCSID
static char rcsid =
 "@(#) $Id: SDL_byteorder.h,v 1.1 2006/04/26 01:51:19 modemhero Exp $";
#endif

/* Macros for determining the byte-order of this platform */

#ifndef _SDL_byteorder_h
#define _SDL_byteorder_h

/* The two types of endianness */
#define SDL_LIL_ENDIAN	1234
#define SDL_BIG_ENDIAN	4321

/* Pardon the mess, I'm trying to determine the endianness of this host.
   I'm doing it by preprocessor defines rather than some sort of configure
   script so that application code can use this too.  The "right" way would
   be to dynamically generate this file on install, but that's a lot of work.
 */
#if (defined(__i386__) || defined(__i386)) || \
     defined(__ia64__) || defined(WIN32) || \
    (defined(__alpha__) || defined(__alpha)) || \
     defined(__arm__) || \
    (defined(__mips__) && defined(__MIPSEL__)) || \
     defined(__SYMBIAN32__) || \
     defined(__x86_64__) || \
     defined(__LITTLE_ENDIAN__)
#define SDL_BYTEORDER	SDL_LIL_ENDIAN
#else
#define SDL_BYTEORDER	SDL_BIG_ENDIAN
#endif

#endif /* _SDL_byteorder_h */

--- NEW FILE: SDL_mouse.h ---
/*
    SDL - Simple DirectMedia Layer
    Copyright (C) 1997-2004 Sam Lantinga

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

    Sam Lantinga
    slouken at libsdl.org
*/

#ifdef SAVE_RCSID
static char rcsid =
 "@(#) $Id: SDL_mouse.h,v 1.1 2006/04/26 01:51:19 modemhero Exp $";
#endif

/* Include file for SDL mouse event handling */

#ifndef _SDL_mouse_h
#define _SDL_mouse_h

#include "SDL_types.h"
#include "SDL_video.h"

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
extern "C" {
#endif

typedef struct WMcursor WMcursor;	/* Implementation dependent */
typedef struct SDL_Cursor {
	SDL_Rect area;			/* The area of the mouse cursor */
	Sint16 hot_x, hot_y;		/* The "tip" of the cursor */
	Uint8 *data;			/* B/W cursor data */
	Uint8 *mask;			/* B/W cursor mask */
	Uint8 *save[2];			/* Place to save cursor area */
	WMcursor *wm_cursor;		/* Window-manager cursor */
} SDL_Cursor;

/* Function prototypes */
/*
 * Retrieve the current state of the mouse.
 * The current button state is returned as a button bitmask, which can
 * be tested using the SDL_BUTTON(X) macros, and x and y are set to the
 * current mouse cursor position.  You can pass NULL for either x or y.
 */
extern DECLSPEC Uint8 SDLCALL SDL_GetMouseState(int *x, int *y);

/*
 * Retrieve the current state of the mouse.
 * The current button state is returned as a button bitmask, which can
 * be tested using the SDL_BUTTON(X) macros, and x and y are set to the
 * mouse deltas since the last call to SDL_GetRelativeMouseState().
 */
extern DECLSPEC Uint8 SDLCALL SDL_GetRelativeMouseState(int *x, int *y);

/*
 * Set the position of the mouse cursor (generates a mouse motion event)
 */
extern DECLSPEC void SDLCALL SDL_WarpMouse(Uint16 x, Uint16 y);

/*
 * Create a cursor using the specified data and mask (in MSB format).
 * The cursor width must be a multiple of 8 bits.
 *
 * The cursor is created in black and white according to the following:
 * data  mask    resulting pixel on screen
 *  0     1       White
 *  1     1       Black
 *  0     0       Transparent
 *  1     0       Inverted color if possible, black if not.
 *
 * Cursors created with this function must be freed with SDL_FreeCursor().
 */
extern DECLSPEC SDL_Cursor * SDLCALL SDL_CreateCursor
		(Uint8 *data, Uint8 *mask, int w, int h, int hot_x, int hot_y);

/*
 * Set the currently active cursor to the specified one.
 * If the cursor is currently visible, the change will be immediately 
 * represented on the display.
 */
extern DECLSPEC void SDLCALL SDL_SetCursor(SDL_Cursor *cursor);

/*
 * Returns the currently active cursor.
 */
extern DECLSPEC SDL_Cursor * SDLCALL SDL_GetCursor(void);

/*
 * Deallocates a cursor created with SDL_CreateCursor().
 */
extern DECLSPEC void SDLCALL SDL_FreeCursor(SDL_Cursor *cursor);

/*
 * Toggle whether or not the cursor is shown on the screen.
 * The cursor start off displayed, but can be turned off.
 * SDL_ShowCursor() returns 1 if the cursor was being displayed
 * before the call, or 0 if it was not.  You can query the current
 * state by passing a 'toggle' value of -1.
 */
extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle);

/* Used as a mask when testing buttons in buttonstate
   Button 1:	Left mouse button
   Button 2:	Middle mouse button
   Button 3:	Right mouse button
   Button 4:	Mouse wheel up	 (may also be a real button)
   Button 5:	Mouse wheel down (may also be a real button)
 */
#define SDL_BUTTON(X)		(SDL_PRESSED << ((X)-1))
#define SDL_BUTTON_LEFT		1
#define SDL_BUTTON_MIDDLE	2
#define SDL_BUTTON_RIGHT	3
#define SDL_BUTTON_WHEELUP	4
#define SDL_BUTTON_WHEELDOWN	5
#define SDL_BUTTON_LMASK	SDL_BUTTON(SDL_BUTTON_LEFT)
#define SDL_BUTTON_MMASK	SDL_BUTTON(SDL_BUTTON_MIDDLE)
#define SDL_BUTTON_RMASK	SDL_BUTTON(SDL_BUTTON_RIGHT)


/* Ends C function definitions when using C++ */
#ifdef __cplusplus
}
#endif
#include "close_code.h"

#endif /* _SDL_mouse_h */

--- NEW FILE: SDL_events.h ---
/*
    SDL - Simple DirectMedia Layer
    Copyright (C) 1997-2004 Sam Lantinga

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

    Sam Lantinga
    slouken at libsdl.org
*/

#ifdef SAVE_RCSID
static char rcsid =
 "@(#) $Id: SDL_events.h,v 1.1 2006/04/26 01:51:19 modemhero Exp $";
#endif

/* Include file for SDL event handling */

#ifndef _SDL_events_h
#define _SDL_events_h

#include "SDL_types.h"
#include "SDL_active.h"
#include "SDL_keyboard.h"
#include "SDL_mouse.h"
#include "SDL_joystick.h"
#include "SDL_quit.h"

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
extern "C" {
#endif

/* Event enumerations */
enum { SDL_NOEVENT = 0,			/* Unused (do not remove) */
       SDL_ACTIVEEVENT,			/* Application loses/gains visibility */
       SDL_KEYDOWN,			/* Keys pressed */
       SDL_KEYUP,			/* Keys released */
       SDL_MOUSEMOTION,			/* Mouse moved */
       SDL_MOUSEBUTTONDOWN,		/* Mouse button pressed */
       SDL_MOUSEBUTTONUP,		/* Mouse button released */
       SDL_JOYAXISMOTION,		/* Joystick axis motion */
       SDL_JOYBALLMOTION,		/* Joystick trackball motion */
       SDL_JOYHATMOTION,		/* Joystick hat position change */
       SDL_JOYBUTTONDOWN,		/* Joystick button pressed */
       SDL_JOYBUTTONUP,			/* Joystick button released */
       SDL_QUIT,			/* User-requested quit */
       SDL_SYSWMEVENT,			/* System specific event */
       SDL_EVENT_RESERVEDA,		/* Reserved for future use.. */
       SDL_EVENT_RESERVEDB,		/* Reserved for future use.. */
       SDL_VIDEORESIZE,			/* User resized video mode */
       SDL_VIDEOEXPOSE,			/* Screen needs to be redrawn */
       SDL_EVENT_RESERVED2,		/* Reserved for future use.. */
       SDL_EVENT_RESERVED3,		/* Reserved for future use.. */
       SDL_EVENT_RESERVED4,		/* Reserved for future use.. */
       SDL_EVENT_RESERVED5,		/* Reserved for future use.. */
       SDL_EVENT_RESERVED6,		/* Reserved for future use.. */
       SDL_EVENT_RESERVED7,		/* Reserved for future use.. */
       /* Events SDL_USEREVENT through SDL_MAXEVENTS-1 are for your use */
       SDL_USEREVENT = 24,
       /* This last event is only for bounding internal arrays
	  It is the number of bits in the event mask datatype -- Uint32
        */
       SDL_NUMEVENTS = 32
};

/* Predefined event masks */
#define SDL_EVENTMASK(X)	(1<<(X))
enum {
	SDL_ACTIVEEVENTMASK	= SDL_EVENTMASK(SDL_ACTIVEEVENT),
	SDL_KEYDOWNMASK		= SDL_EVENTMASK(SDL_KEYDOWN),
	SDL_KEYUPMASK		= SDL_EVENTMASK(SDL_KEYUP),
	SDL_MOUSEMOTIONMASK	= SDL_EVENTMASK(SDL_MOUSEMOTION),
	SDL_MOUSEBUTTONDOWNMASK	= SDL_EVENTMASK(SDL_MOUSEBUTTONDOWN),
	SDL_MOUSEBUTTONUPMASK	= SDL_EVENTMASK(SDL_MOUSEBUTTONUP),
	SDL_MOUSEEVENTMASK	= SDL_EVENTMASK(SDL_MOUSEMOTION)|
	                          SDL_EVENTMASK(SDL_MOUSEBUTTONDOWN)|
	                          SDL_EVENTMASK(SDL_MOUSEBUTTONUP),
	SDL_JOYAXISMOTIONMASK	= SDL_EVENTMASK(SDL_JOYAXISMOTION),
	SDL_JOYBALLMOTIONMASK	= SDL_EVENTMASK(SDL_JOYBALLMOTION),
	SDL_JOYHATMOTIONMASK	= SDL_EVENTMASK(SDL_JOYHATMOTION),
	SDL_JOYBUTTONDOWNMASK	= SDL_EVENTMASK(SDL_JOYBUTTONDOWN),
	SDL_JOYBUTTONUPMASK	= SDL_EVENTMASK(SDL_JOYBUTTONUP),
	SDL_JOYEVENTMASK	= SDL_EVENTMASK(SDL_JOYAXISMOTION)|
	                          SDL_EVENTMASK(SDL_JOYBALLMOTION)|
	                          SDL_EVENTMASK(SDL_JOYHATMOTION)|
	                          SDL_EVENTMASK(SDL_JOYBUTTONDOWN)|
	                          SDL_EVENTMASK(SDL_JOYBUTTONUP),
	SDL_VIDEORESIZEMASK	= SDL_EVENTMASK(SDL_VIDEORESIZE),
	SDL_VIDEOEXPOSEMASK	= SDL_EVENTMASK(SDL_VIDEOEXPOSE),
	SDL_QUITMASK		= SDL_EVENTMASK(SDL_QUIT),
	SDL_SYSWMEVENTMASK	= SDL_EVENTMASK(SDL_SYSWMEVENT)
};
#define SDL_ALLEVENTS		0xFFFFFFFF

/* Application visibility event structure */
typedef struct SDL_ActiveEvent {
	Uint8 type;	/* SDL_ACTIVEEVENT */
	Uint8 gain;	/* Whether given states were gained or lost (1/0) */
	Uint8 state;	/* A mask of the focus states */
} SDL_ActiveEvent;

/* Keyboard event structure */
typedef struct SDL_KeyboardEvent {
	Uint8 type;	/* SDL_KEYDOWN or SDL_KEYUP */
	Uint8 which;	/* The keyboard device index */
	Uint8 state;	/* SDL_PRESSED or SDL_RELEASED */
	SDL_keysym keysym;
} SDL_KeyboardEvent;

/* Mouse motion event structure */
typedef struct SDL_MouseMotionEvent {
	Uint8 type;	/* SDL_MOUSEMOTION */
	Uint8 which;	/* The mouse device index */
	Uint8 state;	/* The current button state */
	Uint16 x, y;	/* The X/Y coordinates of the mouse */
	Sint16 xrel;	/* The relative motion in the X direction */
	Sint16 yrel;	/* The relative motion in the Y direction */
} SDL_MouseMotionEvent;

/* Mouse button event structure */
typedef struct SDL_MouseButtonEvent {
	Uint8 type;	/* SDL_MOUSEBUTTONDOWN or SDL_MOUSEBUTTONUP */
	Uint8 which;	/* The mouse device index */
	Uint8 button;	/* The mouse button index */
	Uint8 state;	/* SDL_PRESSED or SDL_RELEASED */
	Uint16 x, y;	/* The X/Y coordinates of the mouse at press time */
} SDL_MouseButtonEvent;

/* Joystick axis motion event structure */
typedef struct SDL_JoyAxisEvent {
	Uint8 type;	/* SDL_JOYAXISMOTION */
	Uint8 which;	/* The joystick device index */
	Uint8 axis;	/* The joystick axis index */
	Sint16 value;	/* The axis value (range: -32768 to 32767) */
} SDL_JoyAxisEvent;

/* Joystick trackball motion event structure */
typedef struct SDL_JoyBallEvent {
	Uint8 type;	/* SDL_JOYBALLMOTION */
	Uint8 which;	/* The joystick device index */
	Uint8 ball;	/* The joystick trackball index */
	Sint16 xrel;	/* The relative motion in the X direction */
	Sint16 yrel;	/* The relative motion in the Y direction */
} SDL_JoyBallEvent;

/* Joystick hat position change event structure */
typedef struct SDL_JoyHatEvent {
	Uint8 type;	/* SDL_JOYHATMOTION */
	Uint8 which;	/* The joystick device index */
	Uint8 hat;	/* The joystick hat index */
	Uint8 value;	/* The hat position value:
			    SDL_HAT_LEFTUP   SDL_HAT_UP       SDL_HAT_RIGHTUP
			    SDL_HAT_LEFT     SDL_HAT_CENTERED SDL_HAT_RIGHT
			    SDL_HAT_LEFTDOWN SDL_HAT_DOWN     SDL_HAT_RIGHTDOWN
			   Note that zero means the POV is centered.
			*/
} SDL_JoyHatEvent;

/* Joystick button event structure */
typedef struct SDL_JoyButtonEvent {
	Uint8 type;	/* SDL_JOYBUTTONDOWN or SDL_JOYBUTTONUP */
	Uint8 which;	/* The joystick device index */
	Uint8 button;	/* The joystick button index */
	Uint8 state;	/* SDL_PRESSED or SDL_RELEASED */
} SDL_JoyButtonEvent;

/* The "window resized" event
   When you get this event, you are responsible for setting a new video
   mode with the new width and height.
 */
typedef struct SDL_ResizeEvent {
	Uint8 type;	/* SDL_VIDEORESIZE */
	int w;		/* New width */
	int h;		/* New height */
} SDL_ResizeEvent;

/* The "screen redraw" event */
typedef struct SDL_ExposeEvent {
	Uint8 type;	/* SDL_VIDEOEXPOSE */
} SDL_ExposeEvent;

/* The "quit requested" event */
typedef struct SDL_QuitEvent {
	Uint8 type;	/* SDL_QUIT */
} SDL_QuitEvent;

/* A user-defined event type */
typedef struct SDL_UserEvent {
	Uint8 type;	/* SDL_USEREVENT through SDL_NUMEVENTS-1 */
	int code;	/* User defined event code */
	void *data1;	/* User defined data pointer */
	void *data2;	/* User defined data pointer */
} SDL_UserEvent;

/* If you want to use this event, you should include SDL_syswm.h */
struct SDL_SysWMmsg;
typedef struct SDL_SysWMmsg SDL_SysWMmsg;
typedef struct SDL_SysWMEvent {
	Uint8 type;
	SDL_SysWMmsg *msg;
} SDL_SysWMEvent;

/* General event structure */
typedef union {
	Uint8 type;
	SDL_ActiveEvent active;
	SDL_KeyboardEvent key;
	SDL_MouseMotionEvent motion;
	SDL_MouseButtonEvent button;
	SDL_JoyAxisEvent jaxis;
	SDL_JoyBallEvent jball;
	SDL_JoyHatEvent jhat;
	SDL_JoyButtonEvent jbutton;
	SDL_ResizeEvent resize;
	SDL_ExposeEvent expose;
	SDL_QuitEvent quit;
	SDL_UserEvent user;
	SDL_SysWMEvent syswm;
} SDL_Event;


/* Function prototypes */

/* Pumps the event loop, gathering events from the input devices.
   This function updates the event queue and internal input device state.
   This should only be run in the thread that sets the video mode.
*/
extern DECLSPEC void SDLCALL SDL_PumpEvents(void);

/* Checks the event queue for messages and optionally returns them.
   If 'action' is SDL_ADDEVENT, up to 'numevents' events will be added to
   the back of the event queue.
   If 'action' is SDL_PEEKEVENT, up to 'numevents' events at the front
   of the event queue, matching 'mask', will be returned and will not
   be removed from the queue.
   If 'action' is SDL_GETEVENT, up to 'numevents' events at the front 
   of the event queue, matching 'mask', will be returned and will be
   removed from the queue.
   This function returns the number of events actually stored, or -1
   if there was an error.  This function is thread-safe.
*/
typedef enum {
	SDL_ADDEVENT,
	SDL_PEEKEVENT,
	SDL_GETEVENT
} SDL_eventaction;
/* */
extern DECLSPEC int SDLCALL SDL_PeepEvents(SDL_Event *events, int numevents,
				SDL_eventaction action, Uint32 mask);

/* Polls for currently pending events, and returns 1 if there are any pending
   events, or 0 if there are none available.  If 'event' is not NULL, the next
   event is removed from the queue and stored in that area.
 */
extern DECLSPEC int SDLCALL SDL_PollEvent(SDL_Event *event);

/* Waits indefinitely for the next available event, returning 1, or 0 if there
   was an error while waiting for events.  If 'event' is not NULL, the next
   event is removed from the queue and stored in that area.
 */
extern DECLSPEC int SDLCALL SDL_WaitEvent(SDL_Event *event);

/* Add an event to the event queue.
   This function returns 0 on success, or -1 if the event queue was full
   or there was some other error.
 */
extern DECLSPEC int SDLCALL SDL_PushEvent(SDL_Event *event);

/*
  This function sets up a filter to process all events before they
  change internal state and are posted to the internal event queue.

  The filter is protypted as:
*/
typedef int (SDLCALL *SDL_EventFilter)(const SDL_Event *event);
/*
  If the filter returns 1, then the event will be added to the internal queue.
  If it returns 0, then the event will be dropped from the queue, but the 
  internal state will still be updated.  This allows selective filtering of
  dynamically arriving events.

  WARNING:  Be very careful of what you do in the event filter function, as 
            it may run in a different thread!

  There is one caveat when dealing with the SDL_QUITEVENT event type.  The
  event filter is only called when the window manager desires to close the
  application window.  If the event filter returns 1, then the window will
  be closed, otherwise the window will remain open if possible.
  If the quit event is generated by an interrupt signal, it will bypass the
  internal queue and be delivered to the application at the next event poll.
*/
extern DECLSPEC void SDLCALL SDL_SetEventFilter(SDL_EventFilter filter);

/*
  Return the current event filter - can be used to "chain" filters.
  If there is no event filter set, this function returns NULL.
*/
extern DECLSPEC SDL_EventFilter SDLCALL SDL_GetEventFilter(void);

/*
  This function allows you to set the state of processing certain events.
  If 'state' is set to SDL_IGNORE, that event will be automatically dropped
  from the event queue and will not event be filtered.
  If 'state' is set to SDL_ENABLE, that event will be processed normally.
  If 'state' is set to SDL_QUERY, SDL_EventState() will return the 
  current processing state of the specified event.
*/
#define SDL_QUERY	-1
#define SDL_IGNORE	 0
#define SDL_DISABLE	 0
#define SDL_ENABLE	 1
extern DECLSPEC Uint8 SDLCALL SDL_EventState(Uint8 type, int state);


/* Ends C function definitions when using C++ */
#ifdef __cplusplus
}
#endif
#include "close_code.h"

#endif /* _SDL_events_h */

--- NEW FILE: SDL_error.h ---
/*
    SDL - Simple DirectMedia Layer
    Copyright (C) 1997-2004 Sam Lantinga

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

    Sam Lantinga
    slouken at libsdl.org
*/

#ifdef SAVE_RCSID
static char rcsid =
 "@(#) $Id: SDL_error.h,v 1.1 2006/04/26 01:51:19 modemhero Exp $";
#endif

/* Simple error message routines for SDL */

#ifndef _SDL_error_h
#define _SDL_error_h

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
extern "C" {
#endif

/* Public functions */
extern DECLSPEC void SDLCALL SDL_SetError(const char *fmt, ...);
extern DECLSPEC char * SDLCALL SDL_GetError(void);
extern DECLSPEC void SDLCALL SDL_ClearError(void);

/* Private error message function - used internally */
#define SDL_OutOfMemory()	SDL_Error(SDL_ENOMEM)
typedef enum {
	SDL_ENOMEM,
	SDL_EFREAD,
	SDL_EFWRITE,
	SDL_EFSEEK,
	SDL_LASTERROR
} SDL_errorcode;
extern DECLSPEC void SDLCALL SDL_Error(SDL_errorcode code);


/* Ends C function definitions when using C++ */
#ifdef __cplusplus
}
#endif
#include "close_code.h"

#endif /* _SDL_error_h */

--- NEW FILE: SDL_getenv.h ---

/* Not all environments have a working getenv()/putenv() */

#if defined(macintosh) || defined(_WIN32_WCE)
#define NEED_SDL_GETENV
#endif

#ifdef NEED_SDL_GETENV

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
extern "C" {
#endif

/* Put a variable of the form "name=value" into the environment */
extern DECLSPEC int SDLCALL SDL_putenv(const char *variable);
#define putenv(X)   SDL_putenv(X)

/* Retrieve a variable named "name" from the environment */
extern DECLSPEC char * SDLCALL SDL_getenv(const char *name);
#define getenv(X)     SDL_getenv(X)

/* Ends C function definitions when using C++ */
#ifdef __cplusplus
}
#endif
#include "close_code.h"

#endif /* NEED_GETENV */

--- NEW FILE: begin_code.h ---
/*
    SDL - Simple DirectMedia Layer
    Copyright (C) 1997-2004 Sam Lantinga

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

    Sam Lantinga
    slouken at libsdl.org
*/

/* This file sets things up for C dynamic library function definitions,
   static inlined functions, and structures aligned at 4-byte alignment.
   If you don't like ugly C preprocessor code, don't look at this file. :)
*/

/* This shouldn't be nested -- included it around code only. */
#ifdef _begin_code_h
#error Nested inclusion of begin_code.h
#endif
#define _begin_code_h

/* Make sure the correct platform symbols are defined */
#if !defined(WIN32) && defined(_WIN32)
#define WIN32
#endif /* Windows */

/* Some compilers use a special export keyword */
#ifndef DECLSPEC
# ifdef __BEOS__
#  if defined(__GNUC__)
#   define DECLSPEC	__declspec(dllexport)
#  else
#   define DECLSPEC	__declspec(export)
#  endif
# else
# ifdef WIN32
#  ifdef __BORLANDC__
#   ifdef BUILD_SDL
#    define DECLSPEC 
#   else
#    define DECLSPEC __declspec(dllimport)
#   endif
#  else
#   define DECLSPEC	__declspec(dllexport)
#  endif
# else
#  define DECLSPEC
# endif
# endif
#endif

/* By default SDL uses the C calling convention */
#ifndef SDLCALL
#if defined(WIN32) && !defined(__GNUC__)
#define SDLCALL __cdecl
#else
#define SDLCALL
#endif
#endif /* SDLCALL */

/* Removed DECLSPEC on Symbian OS because SDL cannot be a DLL in EPOC */
#ifdef __SYMBIAN32__ 
#undef DECLSPEC
#define DECLSPEC
#endif /* __SYMBIAN32__ */

/* Force structure packing at 4 byte alignment.
   This is necessary if the header is included in code which has structure
   packing set to an alternate value, say for loading structures from disk.
   The packing is reset to the previous value in close_code.h
 */
#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__BORLANDC__)
#ifdef _MSC_VER
#pragma warning(disable: 4103)
#endif
#ifdef __BORLANDC__
#pragma nopackwarning
#endif
#pragma pack(push,4)
#elif (defined(__MWERKS__) && defined(macintosh))
#pragma options align=mac68k4byte
#pragma enumsalwaysint on
#endif /* Compiler needs structure packing set */

/* Set up compiler-specific options for inlining functions */
#ifndef SDL_INLINE_OKAY
#ifdef __GNUC__
#define SDL_INLINE_OKAY
#else
/* Add any special compiler-specific cases here */
#if defined(_MSC_VER) || defined(__BORLANDC__) || \
    defined(__DMC__) || defined(__SC__) || \
    defined(__WATCOMC__) || defined(__LCC__) || \
    defined(__DECC)
#ifndef __inline__
#define __inline__	__inline
#endif
#define SDL_INLINE_OKAY
#else
#if !defined(__MRC__) && !defined(_SGI_SOURCE)
#define __inline__ inline
#define SDL_INLINE_OKAY
#endif /* Not a funky compiler */
#endif /* Visual C++ */
#endif /* GNU C */
#endif /* SDL_INLINE_OKAY */

/* If inlining isn't supported, remove "__inline__", turning static
   inlined functions into static functions (resulting in code bloat
   in all files which include the offending header files)
*/
#ifndef SDL_INLINE_OKAY
#define __inline__
#endif

/* Apparently this is needed by several Windows compilers */
#if !defined(__MACH__)
#ifndef NULL
#ifdef __cplusplus
#define NULL 0
#else
#define NULL ((void *)0)
#endif
#endif /* NULL */
#endif /* ! MacOS X - breaks precompiled headers */

--- NEW FILE: close_code.h ---
/*
    SDL - Simple DirectMedia Layer
    Copyright (C) 1997-2004 Sam Lantinga

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

    Sam Lantinga
    slouken at libsdl.org
*/

/* This file reverses the effects of begin_code.h and should be included
   after you finish any function and structure declarations in your headers
*/

#undef _begin_code_h

/* Reset structure packing at previous byte alignment */
#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__WATCOMC__)  || defined(__BORLANDC__)
#ifdef __BORLANDC__
#pragma nopackwarning
#endif
#if (defined(__MWERKS__) && defined(macintosh))
#pragma options align=reset
#pragma enumsalwaysint reset
#else
#pragma pack(pop)
#endif
#endif /* Compiler needs structure packing set */


--- NEW FILE: SDL_types.h ---
/*
    SDL - Simple DirectMedia Layer
    Copyright (C) 1997-2004 Sam Lantinga

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

    Sam Lantinga
    slouken at libsdl.org
*/

#ifdef SAVE_RCSID
static char rcsid =
 "@(#) $Id: SDL_types.h,v 1.1 2006/04/26 01:51:19 modemhero Exp $";
#endif

/* General data types used by the SDL library */

#ifndef _SDL_types_h
#define _SDL_types_h

/* The number of elements in a table */
#define SDL_TABLESIZE(table)	(sizeof(table)/sizeof(table[0]))

/* Basic data types */
typedef enum {
	SDL_FALSE = 0,
	SDL_TRUE  = 1
} SDL_bool;

#ifdef H_MMBASIC /* mmbasic.h (Tru64 MME) */
/* Some of the basic types are already defined in mmbasic.h */
typedef signed char	Sint8;
typedef signed short	Sint16;
typedef signed int	Sint32;
#else
typedef unsigned char	Uint8;
typedef signed char	Sint8;
typedef unsigned short	Uint16;
typedef signed short	Sint16;
typedef unsigned int	Uint32;
typedef signed int	Sint32;
#endif

/* Figure out how to support 64-bit datatypes */
#if !defined(__STRICT_ANSI__)
#ifdef __osf__ /* Tru64 */
#define SDL_HAS_64BIT_TYPE	long
#elif defined(__GNUC__) || defined(__MWERKS__) || defined(__SUNPRO_C) || defined(__DECC)
#define SDL_HAS_64BIT_TYPE	long long
#elif defined(_MSC_VER) /* VC++ */
#define SDL_HAS_64BIT_TYPE	__int64
#endif
#endif /* !__STRICT_ANSI__ */

/* The 64-bit type isn't available on EPOC/Symbian OS */
#ifdef __SYMBIAN32__
#undef SDL_HAS_64BIT_TYPE
#endif

/* The 64-bit datatype isn't supported on all platforms */
#ifdef SDL_HAS_64BIT_TYPE
#ifndef H_MMBASIC
typedef unsigned SDL_HAS_64BIT_TYPE Uint64;
#endif
typedef SDL_HAS_64BIT_TYPE Sint64;
#else
/* This is really just a hack to prevent the compiler from complaining */
typedef struct {
	Uint32 hi;
	Uint32 lo;
} Uint64, Sint64;
#endif

/* Make sure the types really have the right sizes */
#define SDL_COMPILE_TIME_ASSERT(name, x)               \
       typedef int SDL_dummy_ ## name[(x) * 2 - 1]

SDL_COMPILE_TIME_ASSERT(uint8, sizeof(Uint8) == 1);
SDL_COMPILE_TIME_ASSERT(sint8, sizeof(Sint8) == 1);
SDL_COMPILE_TIME_ASSERT(uint16, sizeof(Uint16) == 2);
SDL_COMPILE_TIME_ASSERT(sint16, sizeof(Sint16) == 2);
SDL_COMPILE_TIME_ASSERT(uint32, sizeof(Uint32) == 4);
SDL_COMPILE_TIME_ASSERT(sint32, sizeof(Sint32) == 4);
SDL_COMPILE_TIME_ASSERT(uint64, sizeof(Uint64) == 8);
SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8);

/* Check to make sure enums are the size of ints, for structure packing.
   For both Watcom C/C++ and Borland C/C++ the compiler option that makes
   enums having the size of an int must be enabled.
   This is "-b" for Borland C/C++ and "-ei" for Watcom C/C++ (v11).
*/
/* Enable enums always int in CodeWarrior (for MPW use "-enum int") */
#ifdef __MWERKS__
#pragma enumsalwaysint on
#endif

typedef enum {
	DUMMY_ENUM_VALUE
} SDL_DUMMY_ENUM;

SDL_COMPILE_TIME_ASSERT(enum, sizeof(SDL_DUMMY_ENUM) == sizeof(int));

#undef SDL_COMPILE_TIME_ASSERT

/* General keyboard/mouse state definitions */
enum { SDL_PRESSED = 0x01, SDL_RELEASED = 0x00 };

#endif

--- NEW FILE: SDL_keysym.h ---
/*
    SDL - Simple DirectMedia Layer
    Copyright (C) 1997-2004 Sam Lantinga

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

    Sam Lantinga
    slouken at libsdl.org
*/

#ifdef SAVE_RCSID
static char rcsid =
 "@(#) $Id: SDL_keysym.h,v 1.1 2006/04/26 01:51:19 modemhero Exp $";
#endif

#ifndef _SDL_keysym_h
#define _SDL_keysym_h

/* What we really want is a mapping of every raw key on the keyboard.
   To support international keyboards, we use the range 0xA1 - 0xFF
   as international virtual keycodes.  We'll follow in the footsteps of X11...
   The names of the keys
 */
 
typedef enum {
	/* The keyboard syms have been cleverly chosen to map to ASCII */
	SDLK_UNKNOWN		= 0,
	SDLK_FIRST		= 0,
	SDLK_BACKSPACE		= 8,
	SDLK_TAB		= 9,
	SDLK_CLEAR		= 12,
	SDLK_RETURN		= 13,
	SDLK_PAUSE		= 19,
	SDLK_ESCAPE		= 27,
	SDLK_SPACE		= 32,
	SDLK_EXCLAIM		= 33,
	SDLK_QUOTEDBL		= 34,
	SDLK_HASH		= 35,
	SDLK_DOLLAR		= 36,
	SDLK_AMPERSAND		= 38,
	SDLK_QUOTE		= 39,
	SDLK_LEFTPAREN		= 40,
	SDLK_RIGHTPAREN		= 41,
	SDLK_ASTERISK		= 42,
	SDLK_PLUS		= 43,
	SDLK_COMMA		= 44,
	SDLK_MINUS		= 45,
	SDLK_PERIOD		= 46,
	SDLK_SLASH		= 47,
	SDLK_0			= 48,
	SDLK_1			= 49,
	SDLK_2			= 50,
	SDLK_3			= 51,
	SDLK_4			= 52,
	SDLK_5			= 53,
	SDLK_6			= 54,
	SDLK_7			= 55,
	SDLK_8			= 56,
	SDLK_9			= 57,
	SDLK_COLON		= 58,
	SDLK_SEMICOLON		= 59,
	SDLK_LESS		= 60,
	SDLK_EQUALS		= 61,
	SDLK_GREATER		= 62,
	SDLK_QUESTION		= 63,
	SDLK_AT			= 64,
	/* 
	   Skip uppercase letters
	 */
	SDLK_LEFTBRACKET	= 91,
	SDLK_BACKSLASH		= 92,
	SDLK_RIGHTBRACKET	= 93,
	SDLK_CARET		= 94,
	SDLK_UNDERSCORE		= 95,
	SDLK_BACKQUOTE		= 96,
	SDLK_a			= 97,
	SDLK_b			= 98,
	SDLK_c			= 99,
	SDLK_d			= 100,
	SDLK_e			= 101,
	SDLK_f			= 102,
	SDLK_g			= 103,
	SDLK_h			= 104,
	SDLK_i			= 105,
	SDLK_j			= 106,
	SDLK_k			= 107,
	SDLK_l			= 108,
	SDLK_m			= 109,
	SDLK_n			= 110,
	SDLK_o			= 111,
	SDLK_p			= 112,
	SDLK_q			= 113,
	SDLK_r			= 114,
	SDLK_s			= 115,
	SDLK_t			= 116,
	SDLK_u			= 117,
	SDLK_v			= 118,
	SDLK_w			= 119,
	SDLK_x			= 120,
	SDLK_y			= 121,
	SDLK_z			= 122,
	SDLK_DELETE		= 127,
	/* End of ASCII mapped keysyms */

	/* International keyboard syms */
	SDLK_WORLD_0		= 160,		/* 0xA0 */
	SDLK_WORLD_1		= 161,
	SDLK_WORLD_2		= 162,
	SDLK_WORLD_3		= 163,
	SDLK_WORLD_4		= 164,
	SDLK_WORLD_5		= 165,
	SDLK_WORLD_6		= 166,
	SDLK_WORLD_7		= 167,
	SDLK_WORLD_8		= 168,
	SDLK_WORLD_9		= 169,
	SDLK_WORLD_10		= 170,
	SDLK_WORLD_11		= 171,
	SDLK_WORLD_12		= 172,
	SDLK_WORLD_13		= 173,
	SDLK_WORLD_14		= 174,
	SDLK_WORLD_15		= 175,
	SDLK_WORLD_16		= 176,
	SDLK_WORLD_17		= 177,
	SDLK_WORLD_18		= 178,
	SDLK_WORLD_19		= 179,
	SDLK_WORLD_20		= 180,
	SDLK_WORLD_21		= 181,
	SDLK_WORLD_22		= 182,
	SDLK_WORLD_23		= 183,
	SDLK_WORLD_24		= 184,
	SDLK_WORLD_25		= 185,
	SDLK_WORLD_26		= 186,
	SDLK_WORLD_27		= 187,
	SDLK_WORLD_28		= 188,
	SDLK_WORLD_29		= 189,
	SDLK_WORLD_30		= 190,
	SDLK_WORLD_31		= 191,
	SDLK_WORLD_32		= 192,
	SDLK_WORLD_33		= 193,
	SDLK_WORLD_34		= 194,
	SDLK_WORLD_35		= 195,
	SDLK_WORLD_36		= 196,
	SDLK_WORLD_37		= 197,
	SDLK_WORLD_38		= 198,
	SDLK_WORLD_39		= 199,
	SDLK_WORLD_40		= 200,
	SDLK_WORLD_41		= 201,
	SDLK_WORLD_42		= 202,
	SDLK_WORLD_43		= 203,
	SDLK_WORLD_44		= 204,
	SDLK_WORLD_45		= 205,
	SDLK_WORLD_46		= 206,
	SDLK_WORLD_47		= 207,
	SDLK_WORLD_48		= 208,
	SDLK_WORLD_49		= 209,
	SDLK_WORLD_50		= 210,
	SDLK_WORLD_51		= 211,
	SDLK_WORLD_52		= 212,
	SDLK_WORLD_53		= 213,
	SDLK_WORLD_54		= 214,
	SDLK_WORLD_55		= 215,
	SDLK_WORLD_56		= 216,
	SDLK_WORLD_57		= 217,
	SDLK_WORLD_58		= 218,
	SDLK_WORLD_59		= 219,
	SDLK_WORLD_60		= 220,
	SDLK_WORLD_61		= 221,
	SDLK_WORLD_62		= 222,
	SDLK_WORLD_63		= 223,
	SDLK_WORLD_64		= 224,
	SDLK_WORLD_65		= 225,
	SDLK_WORLD_66		= 226,
	SDLK_WORLD_67		= 227,
	SDLK_WORLD_68		= 228,
	SDLK_WORLD_69		= 229,
	SDLK_WORLD_70		= 230,
	SDLK_WORLD_71		= 231,
	SDLK_WORLD_72		= 232,
	SDLK_WORLD_73		= 233,
	SDLK_WORLD_74		= 234,
	SDLK_WORLD_75		= 235,
	SDLK_WORLD_76		= 236,
	SDLK_WORLD_77		= 237,
	SDLK_WORLD_78		= 238,
	SDLK_WORLD_79		= 239,
	SDLK_WORLD_80		= 240,
	SDLK_WORLD_81		= 241,
	SDLK_WORLD_82		= 242,
	SDLK_WORLD_83		= 243,
	SDLK_WORLD_84		= 244,
	SDLK_WORLD_85		= 245,
	SDLK_WORLD_86		= 246,
	SDLK_WORLD_87		= 247,
	SDLK_WORLD_88		= 248,
	SDLK_WORLD_89		= 249,
	SDLK_WORLD_90		= 250,
	SDLK_WORLD_91		= 251,
	SDLK_WORLD_92		= 252,
	SDLK_WORLD_93		= 253,
	SDLK_WORLD_94		= 254,
	SDLK_WORLD_95		= 255,		/* 0xFF */

	/* Numeric keypad */
	SDLK_KP0		= 256,
	SDLK_KP1		= 257,
	SDLK_KP2		= 258,
	SDLK_KP3		= 259,
	SDLK_KP4		= 260,
	SDLK_KP5		= 261,
	SDLK_KP6		= 262,
	SDLK_KP7		= 263,
	SDLK_KP8		= 264,
	SDLK_KP9		= 265,
	SDLK_KP_PERIOD		= 266,
	SDLK_KP_DIVIDE		= 267,
	SDLK_KP_MULTIPLY	= 268,
	SDLK_KP_MINUS		= 269,
	SDLK_KP_PLUS		= 270,
	SDLK_KP_ENTER		= 271,
	SDLK_KP_EQUALS		= 272,

	/* Arrows + Home/End pad */
	SDLK_UP			= 273,
	SDLK_DOWN		= 274,
	SDLK_RIGHT		= 275,
	SDLK_LEFT		= 276,
	SDLK_INSERT		= 277,
	SDLK_HOME		= 278,
	SDLK_END		= 279,
	SDLK_PAGEUP		= 280,
	SDLK_PAGEDOWN		= 281,

	/* Function keys */
	SDLK_F1			= 282,
	SDLK_F2			= 283,
	SDLK_F3			= 284,
	SDLK_F4			= 285,
	SDLK_F5			= 286,
	SDLK_F6			= 287,
	SDLK_F7			= 288,
	SDLK_F8			= 289,
	SDLK_F9			= 290,
	SDLK_F10		= 291,
	SDLK_F11		= 292,
	SDLK_F12		= 293,
	SDLK_F13		= 294,
	SDLK_F14		= 295,
	SDLK_F15		= 296,

	/* Key state modifier keys */
	SDLK_NUMLOCK		= 300,
	SDLK_CAPSLOCK		= 301,
	SDLK_SCROLLOCK		= 302,
	SDLK_RSHIFT		= 303,
	SDLK_LSHIFT		= 304,
	SDLK_RCTRL		= 305,
	SDLK_LCTRL		= 306,
	SDLK_RALT		= 307,
	SDLK_LALT		= 308,
	SDLK_RMETA		= 309,
	SDLK_LMETA		= 310,
	SDLK_LSUPER		= 311,		/* Left "Windows" key */
	SDLK_RSUPER		= 312,		/* Right "Windows" key */
	SDLK_MODE		= 313,		/* "Alt Gr" key */
	SDLK_COMPOSE		= 314,		/* Multi-key compose key */

	/* Miscellaneous function keys */
	SDLK_HELP		= 315,
	SDLK_PRINT		= 316,
	SDLK_SYSREQ		= 317,
	SDLK_BREAK		= 318,
	SDLK_MENU		= 319,
	SDLK_POWER		= 320,		/* Power Macintosh power key */
	SDLK_EURO		= 321,		/* Some european keyboards */
	SDLK_UNDO		= 322,		/* Atari keyboard has Undo */

	/* Add any other keys here */

	SDLK_LAST
} SDLKey;

/* Enumeration of valid key mods (possibly OR'd together) */
typedef enum {
	KMOD_NONE  = 0x0000,
	KMOD_LSHIFT= 0x0001,
	KMOD_RSHIFT= 0x0002,
	KMOD_LCTRL = 0x0040,
	KMOD_RCTRL = 0x0080,
	KMOD_LALT  = 0x0100,
	KMOD_RALT  = 0x0200,
	KMOD_LMETA = 0x0400,
	KMOD_RMETA = 0x0800,
	KMOD_NUM   = 0x1000,
	KMOD_CAPS  = 0x2000,
	KMOD_MODE  = 0x4000,
	KMOD_RESERVED = 0x8000
} SDLMod;

#define KMOD_CTRL	(KMOD_LCTRL|KMOD_RCTRL)
#define KMOD_SHIFT	(KMOD_LSHIFT|KMOD_RSHIFT)
#define KMOD_ALT	(KMOD_LALT|KMOD_RALT)
#define KMOD_META	(KMOD_LMETA|KMOD_RMETA)

#endif /* _SDL_keysym_h */

--- NEW FILE: SDL_cdrom.h ---
/*
    SDL - Simple DirectMedia Layer
    Copyright (C) 1997-2004 Sam Lantinga

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

    Sam Lantinga
    slouken at libsdl.org
*/

#ifdef SAVE_RCSID
static char rcsid =
 "@(#) $Id: SDL_cdrom.h,v 1.1 2006/04/26 01:51:19 modemhero Exp $";
#endif

/* This is the CD-audio control API for Simple DirectMedia Layer */

#ifndef _SDL_cdrom_h
#define _SDL_cdrom_h

#include "SDL_types.h"

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
extern "C" {
#endif

/* In order to use these functions, SDL_Init() must have been called
   with the SDL_INIT_CDROM flag.  This causes SDL to scan the system
   for CD-ROM drives, and load appropriate drivers.
*/

/* The maximum number of CD-ROM tracks on a disk */
#define SDL_MAX_TRACKS	99

/* The types of CD-ROM track possible */
#define SDL_AUDIO_TRACK	0x00
#define SDL_DATA_TRACK	0x04

/* The possible states which a CD-ROM drive can be in. */
typedef enum {
	CD_TRAYEMPTY,
	CD_STOPPED,
	CD_PLAYING,
	CD_PAUSED,
	CD_ERROR = -1
} CDstatus;

/* Given a status, returns true if there's a disk in the drive */
#define CD_INDRIVE(status)	((int)(status) > 0)

typedef struct SDL_CDtrack {
	Uint8 id;		/* Track number */
	Uint8 type;		/* Data or audio track */
	Uint16 unused;
	Uint32 length;		/* Length, in frames, of this track */
	Uint32 offset;		/* Offset, in frames, from start of disk */
} SDL_CDtrack;

/* This structure is only current as of the last call to SDL_CDStatus() */
typedef struct SDL_CD {
	int id;			/* Private drive identifier */
	CDstatus status;	/* Current drive status */

	/* The rest of this structure is only valid if there's a CD in drive */
	int numtracks;		/* Number of tracks on disk */
	int cur_track;		/* Current track position */
	int cur_frame;		/* Current frame offset within current track */
	SDL_CDtrack track[SDL_MAX_TRACKS+1];
} SDL_CD;

/* Conversion functions from frames to Minute/Second/Frames and vice versa */
#define CD_FPS	75
#define FRAMES_TO_MSF(f, M,S,F)	{					\
	int value = f;							\
	*(F) = value%CD_FPS;						\
	value /= CD_FPS;						\
	*(S) = value%60;						\
	value /= 60;							\
	*(M) = value;							\
}
#define MSF_TO_FRAMES(M, S, F)	((M)*60*CD_FPS+(S)*CD_FPS+(F))

/* CD-audio API functions: */

/* Returns the number of CD-ROM drives on the system, or -1 if
   SDL_Init() has not been called with the SDL_INIT_CDROM flag.
 */
extern DECLSPEC int SDLCALL SDL_CDNumDrives(void);

/* Returns a human-readable, system-dependent identifier for the CD-ROM.
   Example:
	"/dev/cdrom"
	"E:"
	"/dev/disk/ide/1/master"
*/
extern DECLSPEC const char * SDLCALL SDL_CDName(int drive);

/* Opens a CD-ROM drive for access.  It returns a drive handle on success,
   or NULL if the drive was invalid or busy.  This newly opened CD-ROM
   becomes the default CD used when other CD functions are passed a NULL
   CD-ROM handle.
   Drives are numbered starting with 0.  Drive 0 is the system default CD-ROM.
*/
extern DECLSPEC SDL_CD * SDLCALL SDL_CDOpen(int drive);

/* This function returns the current status of the given drive.
   If the drive has a CD in it, the table of contents of the CD and current
   play position of the CD will be stored in the SDL_CD structure.
*/
extern DECLSPEC CDstatus SDLCALL SDL_CDStatus(SDL_CD *cdrom);

/* Play the given CD starting at 'start_track' and 'start_frame' for 'ntracks'
   tracks and 'nframes' frames.  If both 'ntrack' and 'nframe' are 0, play 
   until the end of the CD.  This function will skip data tracks.
   This function should only be called after calling SDL_CDStatus() to 
   get track information about the CD.
   For example:
	// Play entire CD:
	if ( CD_INDRIVE(SDL_CDStatus(cdrom)) )
		SDL_CDPlayTracks(cdrom, 0, 0, 0, 0);
	// Play last track:
	if ( CD_INDRIVE(SDL_CDStatus(cdrom)) ) {
		SDL_CDPlayTracks(cdrom, cdrom->numtracks-1, 0, 0, 0);
	}
	// Play first and second track and 10 seconds of third track:
	if ( CD_INDRIVE(SDL_CDStatus(cdrom)) )
		SDL_CDPlayTracks(cdrom, 0, 0, 2, 10);

   This function returns 0, or -1 if there was an error.
*/
extern DECLSPEC int SDLCALL SDL_CDPlayTracks(SDL_CD *cdrom,
		int start_track, int start_frame, int ntracks, int nframes);

/* Play the given CD starting at 'start' frame for 'length' frames.
   It returns 0, or -1 if there was an error.
*/
extern DECLSPEC int SDLCALL SDL_CDPlay(SDL_CD *cdrom, int start, int length);

/* Pause play -- returns 0, or -1 on error */
extern DECLSPEC int SDLCALL SDL_CDPause(SDL_CD *cdrom);

/* Resume play -- returns 0, or -1 on error */
extern DECLSPEC int SDLCALL SDL_CDResume(SDL_CD *cdrom);

/* Stop play -- returns 0, or -1 on error */
extern DECLSPEC int SDLCALL SDL_CDStop(SDL_CD *cdrom);

/* Eject CD-ROM -- returns 0, or -1 on error */
extern DECLSPEC int SDLCALL SDL_CDEject(SDL_CD *cdrom);

/* Closes the handle for the CD-ROM drive */
extern DECLSPEC void SDLCALL SDL_CDClose(SDL_CD *cdrom);


/* Ends C function definitions when using C++ */
#ifdef __cplusplus
}
#endif
#include "close_code.h"

#endif /* _SDL_video_h */

--- NEW FILE: SDL_video.h ---
/*
    SDL - Simple DirectMedia Layer
    Copyright (C) 1997-2004 Sam Lantinga

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

    Sam Lantinga
    slouken at libsdl.org
*/

#ifdef SAVE_RCSID
static char rcsid =
 "@(#) $Id: SDL_video.h,v 1.1 2006/04/26 01:51:19 modemhero Exp $";
#endif

/* Header file for access to the SDL raw framebuffer window */

#ifndef _SDL_video_h
#define _SDL_video_h

#include 

#include "SDL_types.h"
#include "SDL_mutex.h"
#include "SDL_rwops.h"

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
extern "C" {
#endif

/* Transparency definitions: These define alpha as the opacity of a surface */
#define SDL_ALPHA_OPAQUE 255
#define SDL_ALPHA_TRANSPARENT 0

/* Useful data types */
typedef struct SDL_Rect {
	Sint16 x, y;
	Uint16 w, h;
} SDL_Rect;

typedef struct SDL_Color {
	Uint8 r;
	Uint8 g;
	Uint8 b;
	Uint8 unused;
} SDL_Color;
#define SDL_Colour SDL_Color

typedef struct SDL_Palette {
	int       ncolors;
	SDL_Color *colors;
} SDL_Palette;

/* Everything in the pixel format structure is read-only */
typedef struct SDL_PixelFormat {
	SDL_Palette *palette;
	Uint8  BitsPerPixel;
	Uint8  BytesPerPixel;
	Uint8  Rloss;
	Uint8  Gloss;
	Uint8  Bloss;
	Uint8  Aloss;
	Uint8  Rshift;
	Uint8  Gshift;
	Uint8  Bshift;
	Uint8  Ashift;
	Uint32 Rmask;
	Uint32 Gmask;
	Uint32 Bmask;
	Uint32 Amask;

	/* RGB color key information */
	Uint32 colorkey;
	/* Alpha value information (per-surface alpha) */
	Uint8  alpha;
} SDL_PixelFormat;

/* This structure should be treated as read-only, except for 'pixels',
   which, if not NULL, contains the raw pixel data for the surface.
*/
typedef struct SDL_Surface {
	Uint32 flags;				/* Read-only */
	SDL_PixelFormat *format;		/* Read-only */
	int w, h;				/* Read-only */
	Uint16 pitch;				/* Read-only */
	void *pixels;				/* Read-write */
	int offset;				/* Private */

	/* Hardware-specific surface info */
	struct private_hwdata *hwdata;

	/* clipping information */
	SDL_Rect clip_rect;			/* Read-only */
	Uint32 unused1;				/* for binary compatibility */

	/* Allow recursive locks */
	Uint32 locked;				/* Private */

	/* info for fast blit mapping to other surfaces */
	struct SDL_BlitMap *map;		/* Private */

	/* format version, bumped at every change to invalidate blit maps */
	unsigned int format_version;		/* Private */

	/* Reference count -- used when freeing surface */
	int refcount;				/* Read-mostly */
} SDL_Surface;

/* These are the currently supported flags for the SDL_surface */
/* Available for SDL_CreateRGBSurface() or SDL_SetVideoMode() */
#define SDL_SWSURFACE	0x00000000	/* Surface is in system memory */
#define SDL_HWSURFACE	0x00000001	/* Surface is in video memory */
#define SDL_ASYNCBLIT	0x00000004	/* Use asynchronous blits if possible */
/* Available for SDL_SetVideoMode() */
#define SDL_ANYFORMAT	0x10000000	/* Allow any video depth/pixel-format */
#define SDL_HWPALETTE	0x20000000	/* Surface has exclusive palette */
#define SDL_DOUBLEBUF	0x40000000	/* Set up double-buffered video mode */
#define SDL_FULLSCREEN	0x80000000	/* Surface is a full screen display */
#define SDL_OPENGL      0x00000002      /* Create an OpenGL rendering context */
#define SDL_OPENGLBLIT	0x0000000A	/* Create an OpenGL rendering context and use it for blitting */
#define SDL_RESIZABLE	0x00000010	/* This video mode may be resized */
#define SDL_NOFRAME	0x00000020	/* No window caption or edge frame */
/* Used internally (read-only) */
#define SDL_HWACCEL	0x00000100	/* Blit uses hardware acceleration */
#define SDL_SRCCOLORKEY	0x00001000	/* Blit uses a source color key */
#define SDL_RLEACCELOK	0x00002000	/* Private flag */
#define SDL_RLEACCEL	0x00004000	/* Surface is RLE encoded */
#define SDL_SRCALPHA	0x00010000	/* Blit uses source alpha blending */
#define SDL_PREALLOC	0x01000000	/* Surface uses preallocated memory */

/* Evaluates to true if the surface needs to be locked before access */
#define SDL_MUSTLOCK(surface)	\
  (surface->offset ||		\
  ((surface->flags & (SDL_HWSURFACE|SDL_ASYNCBLIT|SDL_RLEACCEL)) != 0))

/* typedef for private surface blitting functions */
typedef int (*SDL_blit)(struct SDL_Surface *src, SDL_Rect *srcrect,
			struct SDL_Surface *dst, SDL_Rect *dstrect);


/* Useful for determining the video hardware capabilities */
typedef struct SDL_VideoInfo {
	Uint32 hw_available :1;	/* Flag: Can you create hardware surfaces? */
	Uint32 wm_available :1;	/* Flag: Can you talk to a window manager? */
	Uint32 UnusedBits1  :6;
	Uint32 UnusedBits2  :1;
	Uint32 blit_hw      :1;	/* Flag: Accelerated blits HW --> HW */
	Uint32 blit_hw_CC   :1;	/* Flag: Accelerated blits with Colorkey */
	Uint32 blit_hw_A    :1;	/* Flag: Accelerated blits with Alpha */
	Uint32 blit_sw      :1;	/* Flag: Accelerated blits SW --> HW */
	Uint32 blit_sw_CC   :1;	/* Flag: Accelerated blits with Colorkey */
	Uint32 blit_sw_A    :1;	/* Flag: Accelerated blits with Alpha */
	Uint32 blit_fill    :1;	/* Flag: Accelerated color fill */
	Uint32 UnusedBits3  :16;
	Uint32 video_mem;	/* The total amount of video memory (in K) */
	SDL_PixelFormat *vfmt;	/* Value: The format of the video surface */
} SDL_VideoInfo;


/* The most common video overlay formats.
   For an explanation of these pixel formats, see:
	http://www.webartz.com/fourcc/indexyuv.htm

   For information on the relationship between color spaces, see:
   http://www.neuro.sfc.keio.ac.jp/~aly/polygon/info/color-space-faq.html
 */
#define SDL_YV12_OVERLAY  0x32315659	/* Planar mode: Y + V + U  (3 planes) */
#define SDL_IYUV_OVERLAY  0x56555949	/* Planar mode: Y + U + V  (3 planes) */
#define SDL_YUY2_OVERLAY  0x32595559	/* Packed mode: Y0+U0+Y1+V0 (1 plane) */
#define SDL_UYVY_OVERLAY  0x59565955	/* Packed mode: U0+Y0+V0+Y1 (1 plane) */
#define SDL_YVYU_OVERLAY  0x55595659	/* Packed mode: Y0+V0+Y1+U0 (1 plane) */

/* The YUV hardware video overlay */
typedef struct SDL_Overlay {
	Uint32 format;				/* Read-only */
	int w, h;				/* Read-only */
	int planes;				/* Read-only */
	Uint16 *pitches;			/* Read-only */
	Uint8 **pixels;				/* Read-write */

	/* Hardware-specific surface info */
	struct private_yuvhwfuncs *hwfuncs;
	struct private_yuvhwdata *hwdata;

	/* Special flags */
	Uint32 hw_overlay :1;	/* Flag: This overlay hardware accelerated? */
	Uint32 UnusedBits :31;
} SDL_Overlay;


/* Public enumeration for setting the OpenGL window attributes. */
typedef enum {
    SDL_GL_RED_SIZE,
    SDL_GL_GREEN_SIZE,
    SDL_GL_BLUE_SIZE,
    SDL_GL_ALPHA_SIZE,
    SDL_GL_BUFFER_SIZE,
    SDL_GL_DOUBLEBUFFER,
    SDL_GL_DEPTH_SIZE,
    SDL_GL_STENCIL_SIZE,
    SDL_GL_ACCUM_RED_SIZE,
    SDL_GL_ACCUM_GREEN_SIZE,
    SDL_GL_ACCUM_BLUE_SIZE,
    SDL_GL_ACCUM_ALPHA_SIZE,
    SDL_GL_STEREO,
    SDL_GL_MULTISAMPLEBUFFERS,
    SDL_GL_MULTISAMPLESAMPLES
} SDL_GLattr;

/* flags for SDL_SetPalette() */
#define SDL_LOGPAL 0x01
#define SDL_PHYSPAL 0x02

/* Function prototypes */

/* These functions are used internally, and should not be used unless you
 * have a specific need to specify the video driver you want to use.
 * You should normally use SDL_Init() or SDL_InitSubSystem().
 *
 * SDL_VideoInit() initializes the video subsystem -- sets up a connection
 * to the window manager, etc, and determines the current video mode and
 * pixel format, but does not initialize a window or graphics mode.
 * Note that event handling is activated by this routine.
 *
 * If you use both sound and video in your application, you need to call
 * SDL_Init() before opening the sound device, otherwise under Win32 DirectX,
 * you won't be able to set full-screen display modes.
 */
extern DECLSPEC int SDLCALL SDL_VideoInit(const char *driver_name, Uint32 flags);
extern DECLSPEC void SDLCALL SDL_VideoQuit(void);

/* This function fills the given character buffer with the name of the
 * video driver, and returns a pointer to it if the video driver has
 * been initialized.  It returns NULL if no driver has been initialized.
 */
extern DECLSPEC char * SDLCALL SDL_VideoDriverName(char *namebuf, int maxlen);

/*
 * This function returns a pointer to the current display surface.
 * If SDL is doing format conversion on the display surface, this
 * function returns the publicly visible surface, not the real video
 * surface.
 */
extern DECLSPEC SDL_Surface * SDLCALL SDL_GetVideoSurface(void);

/*
 * This function returns a read-only pointer to information about the
 * video hardware.  If this is called before SDL_SetVideoMode(), the 'vfmt'
 * member of the returned structure will contain the pixel format of the
 * "best" video mode.
 */
extern DECLSPEC const SDL_VideoInfo * SDLCALL SDL_GetVideoInfo(void);

/* 
 * Check to see if a particular video mode is supported.
 * It returns 0 if the requested mode is not supported under any bit depth,
 * or returns the bits-per-pixel of the closest available mode with the
 * given width and height.  If this bits-per-pixel is different from the
 * one used when setting the video mode, SDL_SetVideoMode() will succeed,
 * but will emulate the requested bits-per-pixel with a shadow surface.
 *
 * The arguments to SDL_VideoModeOK() are the same ones you would pass to
 * SDL_SetVideoMode()
 */
extern DECLSPEC int SDLCALL SDL_VideoModeOK(int width, int height, int bpp, Uint32 flags);

/*
 * Return a pointer to an array of available screen dimensions for the
 * given format and video flags, sorted largest to smallest.  Returns 
 * NULL if there are no dimensions available for a particular format, 
 * or (SDL_Rect **)-1 if any dimension is okay for the given format.
 *
 * If 'format' is NULL, the mode list will be for the format given 
 * by SDL_GetVideoInfo()->vfmt
 */
extern DECLSPEC SDL_Rect ** SDLCALL SDL_ListModes(SDL_PixelFormat *format, Uint32 flags);

/*
 * Set up a video mode with the specified width, height and bits-per-pixel.
 *
 * If 'bpp' is 0, it is treated as the current display bits per pixel.
 *
 * If SDL_ANYFORMAT is set in 'flags', the SDL library will try to set the
 * requested bits-per-pixel, but will return whatever video pixel format is
 * available.  The default is to emulate the requested pixel format if it
 * is not natively available.
 *
 * If SDL_HWSURFACE is set in 'flags', the video surface will be placed in
 * video memory, if possible, and you may have to call SDL_LockSurface()
 * in order to access the raw framebuffer.  Otherwise, the video surface
 * will be created in system memory.
 *
 * If SDL_ASYNCBLIT is set in 'flags', SDL will try to perform rectangle
 * updates asynchronously, but you must always lock before accessing pixels.
 * SDL will wait for updates to complete before returning from the lock.
 *
 * If SDL_HWPALETTE is set in 'flags', the SDL library will guarantee
 * that the colors set by SDL_SetColors() will be the colors you get.
 * Otherwise, in 8-bit mode, SDL_SetColors() may not be able to set all
 * of the colors exactly the way they are requested, and you should look
 * at the video surface structure to determine the actual palette.
 * If SDL cannot guarantee that the colors you request can be set, 
 * i.e. if the colormap is shared, then the video surface may be created
 * under emulation in system memory, overriding the SDL_HWSURFACE flag.
 *
 * If SDL_FULLSCREEN is set in 'flags', the SDL library will try to set
 * a fullscreen video mode.  The default is to create a windowed mode
 * if the current graphics system has a window manager.
 * If the SDL library is able to set a fullscreen video mode, this flag 
 * will be set in the surface that is returned.
 *
 * If SDL_DOUBLEBUF is set in 'flags', the SDL library will try to set up
 * two surfaces in video memory and swap between them when you call 
 * SDL_Flip().  This is usually slower than the normal single-buffering
 * scheme, but prevents "tearing" artifacts caused by modifying video 
 * memory while the monitor is refreshing.  It should only be used by 
 * applications that redraw the entire screen on every update.
 *
 * If SDL_RESIZABLE is set in 'flags', the SDL library will allow the
 * window manager, if any, to resize the window at runtime.  When this
 * occurs, SDL will send a SDL_VIDEORESIZE event to you application,
 * and you must respond to the event by re-calling SDL_SetVideoMode()
 * with the requested size (or another size that suits the application).
 *
 * If SDL_NOFRAME is set in 'flags', the SDL library will create a window
 * without any title bar or frame decoration.  Fullscreen video modes have
 * this flag set automatically.
 *
 * This function returns the video framebuffer surface, or NULL if it fails.
 *
 * If you rely on functionality provided by certain video flags, check the
 * flags of the returned surface to make sure that functionality is available.
 * SDL will fall back to reduced functionality if the exact flags you wanted
 * are not available.
 */
extern DECLSPEC SDL_Surface * SDLCALL SDL_SetVideoMode
			(int width, int height, int bpp, Uint32 flags);

/*
 * Makes sure the given list of rectangles is updated on the given screen.
 * If 'x', 'y', 'w' and 'h' are all 0, SDL_UpdateRect will update the entire
 * screen.
 * These functions should not be called while 'screen' is locked.
 */
extern DECLSPEC void SDLCALL SDL_UpdateRects
		(SDL_Surface *screen, int numrects, SDL_Rect *rects);
extern DECLSPEC void SDLCALL SDL_UpdateRect
		(SDL_Surface *screen, Sint32 x, Sint32 y, Uint32 w, Uint32 h);

/*
 * On hardware that supports double-buffering, this function sets up a flip
 * and returns.  The hardware will wait for vertical retrace, and then swap
 * video buffers before the next video surface blit or lock will return.
 * On hardware that doesn not support double-buffering, this is equivalent
 * to calling SDL_UpdateRect(screen, 0, 0, 0, 0);
 * The SDL_DOUBLEBUF flag must have been passed to SDL_SetVideoMode() when
 * setting the video mode for this function to perform hardware flipping.
 * This function returns 0 if successful, or -1 if there was an error.
 */
extern DECLSPEC int SDLCALL SDL_Flip(SDL_Surface *screen);

/*
 * Set the gamma correction for each of the color channels.
 * The gamma values range (approximately) between 0.1 and 10.0
 * 
 * If this function isn't supported directly by the hardware, it will
 * be emulated using gamma ramps, if available.  If successful, this
 * function returns 0, otherwise it returns -1.
 */
extern DECLSPEC int SDLCALL SDL_SetGamma(float red, float green, float blue);

/*
 * Set the gamma translation table for the red, green, and blue channels
 * of the video hardware.  Each table is an array of 256 16-bit quantities,
 * representing a mapping between the input and output for that channel.
 * The input is the index into the array, and the output is the 16-bit
 * gamma value at that index, scaled to the output color precision.
 * 
 * You may pass NULL for any of the channels to leave it unchanged.
 * If the call succeeds, it will return 0.  If the display driver or
 * hardware does not support gamma translation, or otherwise fails,
 * this function will return -1.
 */
extern DECLSPEC int SDLCALL SDL_SetGammaRamp(const Uint16 *red, const Uint16 *green, const Uint16 *blue);

/*
 * Retrieve the current values of the gamma translation tables.
 * 
 * You must pass in valid pointers to arrays of 256 16-bit quantities.
 * Any of the pointers may be NULL to ignore that channel.
 * If the call succeeds, it will return 0.  If the display driver or
 * hardware does not support gamma translation, or otherwise fails,
 * this function will return -1.
 */
extern DECLSPEC int SDLCALL SDL_GetGammaRamp(Uint16 *red, Uint16 *green, Uint16 *blue);

/*
 * Sets a portion of the colormap for the given 8-bit surface.  If 'surface'
 * is not a palettized surface, this function does nothing, returning 0.
 * If all of the colors were set as passed to SDL_SetColors(), it will
 * return 1.  If not all the color entries were set exactly as given,
 * it will return 0, and you should look at the surface palette to
 * determine the actual color palette.
 *
 * When 'surface' is the surface associated with the current display, the
 * display colormap will be updated with the requested colors.  If 
 * SDL_HWPALETTE was set in SDL_SetVideoMode() flags, SDL_SetColors()
 * will always return 1, and the palette is guaranteed to be set the way
 * you desire, even if the window colormap has to be warped or run under
 * emulation.
 */
extern DECLSPEC int SDLCALL SDL_SetColors(SDL_Surface *surface, 
			SDL_Color *colors, int firstcolor, int ncolors);

/*
 * Sets a portion of the colormap for a given 8-bit surface.
 * 'flags' is one or both of:
 * SDL_LOGPAL  -- set logical palette, which controls how blits are mapped
 *                to/from the surface,
 * SDL_PHYSPAL -- set physical palette, which controls how pixels look on
 *                the screen
 * Only screens have physical palettes. Separate change of physical/logical
 * palettes is only possible if the screen has SDL_HWPALETTE set.
 *
 * The return value is 1 if all colours could be set as requested, and 0
 * otherwise.
 *
 * SDL_SetColors() is equivalent to calling this function with
 *     flags = (SDL_LOGPAL|SDL_PHYSPAL).
 */
extern DECLSPEC int SDLCALL SDL_SetPalette(SDL_Surface *surface, int flags,
				   SDL_Color *colors, int firstcolor,
				   int ncolors);

/*
 * Maps an RGB triple to an opaque pixel value for a given pixel format
 */
extern DECLSPEC Uint32 SDLCALL SDL_MapRGB
			(SDL_PixelFormat *format, Uint8 r, Uint8 g, Uint8 b);

/*
 * Maps an RGBA quadruple to a pixel value for a given pixel format
 */
extern DECLSPEC Uint32 SDLCALL SDL_MapRGBA(SDL_PixelFormat *format,
				   Uint8 r, Uint8 g, Uint8 b, Uint8 a);

/*
 * Maps a pixel value into the RGB components for a given pixel format
 */
extern DECLSPEC void SDLCALL SDL_GetRGB(Uint32 pixel, SDL_PixelFormat *fmt,
				Uint8 *r, Uint8 *g, Uint8 *b);

/*
 * Maps a pixel value into the RGBA components for a given pixel format
 */
extern DECLSPEC void SDLCALL SDL_GetRGBA(Uint32 pixel, SDL_PixelFormat *fmt,
				 Uint8 *r, Uint8 *g, Uint8 *b, Uint8 *a);

/*
 * Allocate and free an RGB surface (must be called after SDL_SetVideoMode)
 * If the depth is 4 or 8 bits, an empty palette is allocated for the surface.
 * If the depth is greater than 8 bits, the pixel format is set using the
 * flags '[RGB]mask'.
 * If the function runs out of memory, it will return NULL.
 *
 * The 'flags' tell what kind of surface to create.
 * SDL_SWSURFACE means that the surface should be created in system memory.
 * SDL_HWSURFACE means that the surface should be created in video memory,
 * with the same format as the display surface.  This is useful for surfaces
 * that will not change much, to take advantage of hardware acceleration
 * when being blitted to the display surface.
 * SDL_ASYNCBLIT means that SDL will try to perform asynchronous blits with
 * this surface, but you must always lock it before accessing the pixels.
 * SDL will wait for current blits to finish before returning from the lock.
 * SDL_SRCCOLORKEY indicates that the surface will be used for colorkey blits.
 * If the hardware supports acceleration of colorkey blits between
 * two surfaces in video memory, SDL will try to place the surface in
 * video memory. If this isn't possible or if there is no hardware
 * acceleration available, the surface will be placed in system memory.
 * SDL_SRCALPHA means that the surface will be used for alpha blits and 
 * if the hardware supports hardware acceleration of alpha blits between
 * two surfaces in video memory, to place the surface in video memory
 * if possible, otherwise it will be placed in system memory.
 * If the surface is created in video memory, blits will be _much_ faster,
 * but the surface format must be identical to the video surface format,
 * and the only way to access the pixels member of the surface is to use
 * the SDL_LockSurface() and SDL_UnlockSurface() calls.
 * If the requested surface actually resides in video memory, SDL_HWSURFACE
 * will be set in the flags member of the returned surface.  If for some
 * reason the surface could not be placed in video memory, it will not have
 * the SDL_HWSURFACE flag set, and will be created in system memory instead.
 */
#define SDL_AllocSurface    SDL_CreateRGBSurface
extern DECLSPEC SDL_Surface * SDLCALL SDL_CreateRGBSurface
			(Uint32 flags, int width, int height, int depth, 
			Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask);
extern DECLSPEC SDL_Surface * SDLCALL SDL_CreateRGBSurfaceFrom(void *pixels,
			int width, int height, int depth, int pitch,
			Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask);
extern DECLSPEC void SDLCALL SDL_FreeSurface(SDL_Surface *surface);

/*
 * SDL_LockSurface() sets up a surface for directly accessing the pixels.
 * Between calls to SDL_LockSurface()/SDL_UnlockSurface(), you can write
 * to and read from 'surface->pixels', using the pixel format stored in 
 * 'surface->format'.  Once you are done accessing the surface, you should 
 * use SDL_UnlockSurface() to release it.
 *
 * Not all surfaces require locking.  If SDL_MUSTLOCK(surface) evaluates
 * to 0, then you can read and write to the surface at any time, and the
 * pixel format of the surface will not change.  In particular, if the
 * SDL_HWSURFACE flag is not given when calling SDL_SetVideoMode(), you
 * will not need to lock the display surface before accessing it.
 * 
 * No operating system or library calls should be made between lock/unlock
 * pairs, as critical system locks may be held during this time.
 *
 * SDL_LockSurface() returns 0, or -1 if the surface couldn't be locked.
 */
extern DECLSPEC int SDLCALL SDL_LockSurface(SDL_Surface *surface);
extern DECLSPEC void SDLCALL SDL_UnlockSurface(SDL_Surface *surface);

/*
 * Load a surface from a seekable SDL data source (memory or file.)
 * If 'freesrc' is non-zero, the source will be closed after being read.
 * Returns the new surface, or NULL if there was an error.
 * The new surface should be freed with SDL_FreeSurface().
 */
extern DECLSPEC SDL_Surface * SDLCALL SDL_LoadBMP_RW(SDL_RWops *src, int freesrc);

/* Convenience macro -- load a surface from a file */
#define SDL_LoadBMP(file)	SDL_LoadBMP_RW(SDL_RWFromFile(file, "rb"), 1)

/*
 * Save a surface to a seekable SDL data source (memory or file.)
 * If 'freedst' is non-zero, the source will be closed after being written.
 * Returns 0 if successful or -1 if there was an error.
 */
extern DECLSPEC int SDLCALL SDL_SaveBMP_RW
		(SDL_Surface *surface, SDL_RWops *dst, int freedst);

/* Convenience macro -- save a surface to a file */
#define SDL_SaveBMP(surface, file) \
		SDL_SaveBMP_RW(surface, SDL_RWFromFile(file, "wb"), 1)

/*
 * Sets the color key (transparent pixel) in a blittable surface.
 * If 'flag' is SDL_SRCCOLORKEY (optionally OR'd with SDL_RLEACCEL), 
 * 'key' will be the transparent pixel in the source image of a blit.
 * SDL_RLEACCEL requests RLE acceleration for the surface if present,
 * and removes RLE acceleration if absent.
 * If 'flag' is 0, this function clears any current color key.
 * This function returns 0, or -1 if there was an error.
 */
extern DECLSPEC int SDLCALL SDL_SetColorKey
			(SDL_Surface *surface, Uint32 flag, Uint32 key);

/*
 * This function sets the alpha value for the entire surface, as opposed to
 * using the alpha component of each pixel. This value measures the range
 * of transparency of the surface, 0 being completely transparent to 255
 * being completely opaque. An 'alpha' value of 255 causes blits to be
 * opaque, the source pixels copied to the destination (the default). Note
 * that per-surface alpha can be combined with colorkey transparency.
 *
 * If 'flag' is 0, alpha blending is disabled for the surface.
 * If 'flag' is SDL_SRCALPHA, alpha blending is enabled for the surface.
 * OR:ing the flag with SDL_RLEACCEL requests RLE acceleration for the
 * surface; if SDL_RLEACCEL is not specified, the RLE accel will be removed.
 *
 * The 'alpha' parameter is ignored for surfaces that have an alpha channel.
 */
extern DECLSPEC int SDLCALL SDL_SetAlpha(SDL_Surface *surface, Uint32 flag, Uint8 alpha);

/*
 * Sets the clipping rectangle for the destination surface in a blit.
 *
 * If the clip rectangle is NULL, clipping will be disabled.
 * If the clip rectangle doesn't intersect the surface, the function will
 * return SDL_FALSE and blits will be completely clipped.  Otherwise the
 * function returns SDL_TRUE and blits to the surface will be clipped to
 * the intersection of the surface area and the clipping rectangle.
 *
 * Note that blits are automatically clipped to the edges of the source
 * and destination surfaces.
 */
extern DECLSPEC SDL_bool SDLCALL SDL_SetClipRect(SDL_Surface *surface, const SDL_Rect *rect);

/*
 * Gets the clipping rectangle for the destination surface in a blit.
 * 'rect' must be a pointer to a valid rectangle which will be filled
 * with the correct values.
 */
extern DECLSPEC void SDLCALL SDL_GetClipRect(SDL_Surface *surface, SDL_Rect *rect);

/*
 * Creates a new surface of the specified format, and then copies and maps 
 * the given surface to it so the blit of the converted surface will be as 
 * fast as possible.  If this function fails, it returns NULL.
 *
 * The 'flags' parameter is passed to SDL_CreateRGBSurface() and has those 
 * semantics.  You can also pass SDL_RLEACCEL in the flags parameter and
 * SDL will try to RLE accelerate colorkey and alpha blits in the resulting
 * surface.
 *
 * This function is used internally by SDL_DisplayFormat().
 */
extern DECLSPEC SDL_Surface * SDLCALL SDL_ConvertSurface
			(SDL_Surface *src, SDL_PixelFormat *fmt, Uint32 flags);

/*
 * This performs a fast blit from the source surface to the destination
 * surface.  It assumes that the source and destination rectangles are
 * the same size.  If either 'srcrect' or 'dstrect' are NULL, the entire
 * surface (src or dst) is copied.  The final blit rectangles are saved
 * in 'srcrect' and 'dstrect' after all clipping is performed.
 * If the blit is successful, it returns 0, otherwise it returns -1.
 *
 * The blit function should not be called on a locked surface.
 *
 * The blit semantics for surfaces with and without alpha and colorkey
 * are defined as follows:
 *
 * RGBA->RGB:
 *     SDL_SRCALPHA set:
 * 	alpha-blend (using alpha-channel).
 * 	SDL_SRCCOLORKEY ignored.
 *     SDL_SRCALPHA not set:
 * 	copy RGB.
 * 	if SDL_SRCCOLORKEY set, only copy the pixels matching the
 * 	RGB values of the source colour key, ignoring alpha in the
 * 	comparison.
 * 
 * RGB->RGBA:
 *     SDL_SRCALPHA set:
 * 	alpha-blend (using the source per-surface alpha value);
 * 	set destination alpha to opaque.
 *     SDL_SRCALPHA not set:
 * 	copy RGB, set destination alpha to source per-surface alpha value.
 *     both:
 * 	if SDL_SRCCOLORKEY set, only copy the pixels matching the
 * 	source colour key.
 * 
 * RGBA->RGBA:
 *     SDL_SRCALPHA set:
 * 	alpha-blend (using the source alpha channel) the RGB values;
 * 	leave destination alpha untouched. [Note: is this correct?]
 * 	SDL_SRCCOLORKEY ignored.
 *     SDL_SRCALPHA not set:
 * 	copy all of RGBA to the destination.
 * 	if SDL_SRCCOLORKEY set, only copy the pixels matching the
 * 	RGB values of the source colour key, ignoring alpha in the
 * 	comparison.
 * 
 * RGB->RGB: 
 *     SDL_SRCALPHA set:
 * 	alpha-blend (using the source per-surface alpha value).
 *     SDL_SRCALPHA not set:
 * 	copy RGB.
 *     both:
 * 	if SDL_SRCCOLORKEY set, only copy the pixels matching the
 * 	source colour key.
 *
 * If either of the surfaces were in video memory, and the blit returns -2,
 * the video memory was lost, so it should be reloaded with artwork and 
 * re-blitted:
	while ( SDL_BlitSurface(image, imgrect, screen, dstrect) == -2 ) {
		while ( SDL_LockSurface(image) < 0 )
			Sleep(10);
		-- Write image pixels to image->pixels --
		SDL_UnlockSurface(image);
	}
 * This happens under DirectX 5.0 when the system switches away from your
 * fullscreen application.  The lock will also fail until you have access
 * to the video memory again.
 */
/* You should call SDL_BlitSurface() unless you know exactly how SDL
   blitting works internally and how to use the other blit functions.
*/
#define SDL_BlitSurface SDL_UpperBlit

/* This is the public blit function, SDL_BlitSurface(), and it performs
   rectangle validation and clipping before passing it to SDL_LowerBlit()
*/
extern DECLSPEC int SDLCALL SDL_UpperBlit
			(SDL_Surface *src, SDL_Rect *srcrect,
			 SDL_Surface *dst, SDL_Rect *dstrect);
/* This is a semi-private blit function and it performs low-level surface
   blitting only.
*/
extern DECLSPEC int SDLCALL SDL_LowerBlit
			(SDL_Surface *src, SDL_Rect *srcrect,
			 SDL_Surface *dst, SDL_Rect *dstrect);

/*
 * This function performs a fast fill of the given rectangle with 'color'
 * The given rectangle is clipped to the destination surface clip area
 * and the final fill rectangle is saved in the passed in pointer.
 * If 'dstrect' is NULL, the whole surface will be filled with 'color'
 * The color should be a pixel of the format used by the surface, and 
 * can be generated by the SDL_MapRGB() function.
 * This function returns 0 on success, or -1 on error.
 */
extern DECLSPEC int SDLCALL SDL_FillRect
		(SDL_Surface *dst, SDL_Rect *dstrect, Uint32 color);

/* 
 * This function takes a surface and copies it to a new surface of the
 * pixel format and colors of the video framebuffer, suitable for fast
 * blitting onto the display surface.  It calls SDL_ConvertSurface()
 *
 * If you want to take advantage of hardware colorkey or alpha blit
 * acceleration, you should set the colorkey and alpha value before
 * calling this function.
 *
 * If the conversion fails or runs out of memory, it returns NULL
 */
extern DECLSPEC SDL_Surface * SDLCALL SDL_DisplayFormat(SDL_Surface *surface);

/* 
 * This function takes a surface and copies it to a new surface of the
 * pixel format and colors of the video framebuffer (if possible),
 * suitable for fast alpha blitting onto the display surface.
 * The new surface will always have an alpha channel.
 *
 * If you want to take advantage of hardware colorkey or alpha blit
 * acceleration, you should set the colorkey and alpha value before
 * calling this function.
 *
 * If the conversion fails or runs out of memory, it returns NULL
 */
extern DECLSPEC SDL_Surface * SDLCALL SDL_DisplayFormatAlpha(SDL_Surface *surface);


/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* YUV video surface overlay functions                                       */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

/* This function creates a video output overlay
   Calling the returned surface an overlay is something of a misnomer because
   the contents of the display surface underneath the area where the overlay
   is shown is undefined - it may be overwritten with the converted YUV data.
*/
extern DECLSPEC SDL_Overlay * SDLCALL SDL_CreateYUVOverlay(int width, int height,
				Uint32 format, SDL_Surface *display);

/* Lock an overlay for direct access, and unlock it when you are done */
extern DECLSPEC int SDLCALL SDL_LockYUVOverlay(SDL_Overlay *overlay);
extern DECLSPEC void SDLCALL SDL_UnlockYUVOverlay(SDL_Overlay *overlay);

/* Blit a video overlay to the display surface.
   The contents of the video surface underneath the blit destination are
   not defined.  
   The width and height of the destination rectangle may be different from
   that of the overlay, but currently only 2x scaling is supported.
*/
extern DECLSPEC int SDLCALL SDL_DisplayYUVOverlay(SDL_Overlay *overlay, SDL_Rect *dstrect);

/* Free a video overlay */
extern DECLSPEC void SDLCALL SDL_FreeYUVOverlay(SDL_Overlay *overlay);


/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* OpenGL support functions.                                                 */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

/*
 * Dynamically load a GL driver, if SDL is built with dynamic GL.
 *
 * SDL links normally with the OpenGL library on your system by default,
 * but you can compile it to dynamically load the GL driver at runtime.
 * If you do this, you need to retrieve all of the GL functions used in
 * your program from the dynamic library using SDL_GL_GetProcAddress().
 *
 * This is disabled in default builds of SDL.
 */
extern DECLSPEC int SDLCALL SDL_GL_LoadLibrary(const char *path);

/*
 * Get the address of a GL function (for extension functions)
 */
extern DECLSPEC void * SDLCALL SDL_GL_GetProcAddress(const char* proc);

/*
 * Set an attribute of the OpenGL subsystem before intialization.
 */
extern DECLSPEC int SDLCALL SDL_GL_SetAttribute(SDL_GLattr attr, int value);

/*
 * Get an attribute of the OpenGL subsystem from the windowing
 * interface, such as glX. This is of course different from getting
 * the values from SDL's internal OpenGL subsystem, which only
 * stores the values you request before initialization.
 *
 * Developers should track the values they pass into SDL_GL_SetAttribute
 * themselves if they want to retrieve these values.
 */
extern DECLSPEC int SDLCALL SDL_GL_GetAttribute(SDL_GLattr attr, int* value);

/*
 * Swap the OpenGL buffers, if double-buffering is supported.
 */
extern DECLSPEC void SDLCALL SDL_GL_SwapBuffers(void);

/*
 * Internal functions that should not be called unless you have read
 * and understood the source code for these functions.
 */
extern DECLSPEC void SDLCALL SDL_GL_UpdateRects(int numrects, SDL_Rect* rects);
extern DECLSPEC void SDLCALL SDL_GL_Lock(void);
extern DECLSPEC void SDLCALL SDL_GL_Unlock(void);

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* These functions allow interaction with the window manager, if any.        */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

/*
 * Sets/Gets the title and icon text of the display window
 */
extern DECLSPEC void SDLCALL SDL_WM_SetCaption(const char *title, const char *icon);
extern DECLSPEC void SDLCALL SDL_WM_GetCaption(char **title, char **icon);

/*
 * Sets the icon for the display window.
 * This function must be called before the first call to SDL_SetVideoMode().
 * It takes an icon surface, and a mask in MSB format.
 * If 'mask' is NULL, the entire icon surface will be used as the icon.
 */
extern DECLSPEC void SDLCALL SDL_WM_SetIcon(SDL_Surface *icon, Uint8 *mask);

/*
 * This function iconifies the window, and returns 1 if it succeeded.
 * If the function succeeds, it generates an SDL_APPACTIVE loss event.
 * This function is a noop and returns 0 in non-windowed environments.
 */
extern DECLSPEC int SDLCALL SDL_WM_IconifyWindow(void);

/*
 * Toggle fullscreen mode without changing the contents of the screen.
 * If the display surface does not require locking before accessing
 * the pixel information, then the memory pointers will not change.
 *
 * If this function was able to toggle fullscreen mode (change from 
 * running in a window to fullscreen, or vice-versa), it will return 1.
 * If it is not implemented, or fails, it returns 0.
 *
 * The next call to SDL_SetVideoMode() will set the mode fullscreen
 * attribute based on the flags parameter - if SDL_FULLSCREEN is not
 * set, then the display will be windowed by default where supported.
 *
 * This is currently only implemented in the X11 video driver.
 */
extern DECLSPEC int SDLCALL SDL_WM_ToggleFullScreen(SDL_Surface *surface);

/*
 * This function allows you to set and query the input grab state of
 * the application.  It returns the new input grab state.
 */
typedef enum {
	SDL_GRAB_QUERY = -1,
	SDL_GRAB_OFF = 0,
	SDL_GRAB_ON = 1,
	SDL_GRAB_FULLSCREEN	/* Used internally */
} SDL_GrabMode;
/*
 * Grabbing means that the mouse is confined to the application window,
 * and nearly all keyboard input is passed directly to the application,
 * and not interpreted by a window manager, if any.
 */
extern DECLSPEC SDL_GrabMode SDLCALL SDL_WM_GrabInput(SDL_GrabMode mode);

/* Not in public API at the moment - do not use! */
extern DECLSPEC int SDLCALL SDL_SoftStretch(SDL_Surface *src, SDL_Rect *srcrect,
                                    SDL_Surface *dst, SDL_Rect *dstrect);
                    
/* Ends C function definitions when using C++ */
#ifdef __cplusplus
}
#endif
#include "close_code.h"

#endif /* _SDL_video_h */

--- NEW FILE: SDL_mutex.h ---
/*
    SDL - Simple DirectMedia Layer
    Copyright (C) 1997-2004 Sam Lantinga

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

    Sam Lantinga
    slouken at libsdl.org
*/

#ifdef SAVE_RCSID
static char rcsid =
 "@(#) $Id: SDL_mutex.h,v 1.1 2006/04/26 01:51:19 modemhero Exp $";
#endif

#ifndef _SDL_mutex_h
#define _SDL_mutex_h

/* Functions to provide thread synchronization primitives

	These are independent of the other SDL routines.
*/

#include "SDL_main.h"
#include "SDL_types.h"

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
extern "C" {
#endif

/* Synchronization functions which can time out return this value
   if they time out.
*/
#define SDL_MUTEX_TIMEDOUT	1

/* This is the timeout value which corresponds to never time out */
#define SDL_MUTEX_MAXWAIT	(~(Uint32)0)


/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* Mutex functions                                               */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

/* The SDL mutex structure, defined in SDL_mutex.c */
struct SDL_mutex;
typedef struct SDL_mutex SDL_mutex;

/* Create a mutex, initialized unlocked */
extern DECLSPEC SDL_mutex * SDLCALL SDL_CreateMutex(void);

/* Lock the mutex  (Returns 0, or -1 on error) */
#define SDL_LockMutex(m)	SDL_mutexP(m)
extern DECLSPEC int SDLCALL SDL_mutexP(SDL_mutex *mutex);

/* Unlock the mutex  (Returns 0, or -1 on error)
   It is an error to unlock a mutex that has not been locked by
   the current thread, and doing so results in undefined behavior.
 */
#define SDL_UnlockMutex(m)	SDL_mutexV(m)
extern DECLSPEC int SDLCALL SDL_mutexV(SDL_mutex *mutex);

/* Destroy a mutex */
extern DECLSPEC void SDLCALL SDL_DestroyMutex(SDL_mutex *mutex);


/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* Semaphore functions                                           */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

/* The SDL semaphore structure, defined in SDL_sem.c */
struct SDL_semaphore;
typedef struct SDL_semaphore SDL_sem;

/* Create a semaphore, initialized with value, returns NULL on failure. */
extern DECLSPEC SDL_sem * SDLCALL SDL_CreateSemaphore(Uint32 initial_value);

/* Destroy a semaphore */
extern DECLSPEC void SDLCALL SDL_DestroySemaphore(SDL_sem *sem);

/* This function suspends the calling thread until the semaphore pointed 
 * to by sem has a positive count. It then atomically decreases the semaphore
 * count.
 */
extern DECLSPEC int SDLCALL SDL_SemWait(SDL_sem *sem);

/* Non-blocking variant of SDL_SemWait(), returns 0 if the wait succeeds,
   SDL_MUTEX_TIMEDOUT if the wait would block, and -1 on error.
*/
extern DECLSPEC int SDLCALL SDL_SemTryWait(SDL_sem *sem);

/* Variant of SDL_SemWait() with a timeout in milliseconds, returns 0 if
   the wait succeeds, SDL_MUTEX_TIMEDOUT if the wait does not succeed in
   the allotted time, and -1 on error.
   On some platforms this function is implemented by looping with a delay
   of 1 ms, and so should be avoided if possible.
*/
extern DECLSPEC int SDLCALL SDL_SemWaitTimeout(SDL_sem *sem, Uint32 ms);

/* Atomically increases the semaphore's count (not blocking), returns 0,
   or -1 on error.
 */
extern DECLSPEC int SDLCALL SDL_SemPost(SDL_sem *sem);

/* Returns the current count of the semaphore */
extern DECLSPEC Uint32 SDLCALL SDL_SemValue(SDL_sem *sem);


/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* Condition variable functions                                  */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

/* The SDL condition variable structure, defined in SDL_cond.c */
struct SDL_cond;
typedef struct SDL_cond SDL_cond;

/* Create a condition variable */
extern DECLSPEC SDL_cond * SDLCALL SDL_CreateCond(void);

/* Destroy a condition variable */
extern DECLSPEC void SDLCALL SDL_DestroyCond(SDL_cond *cond);

/* Restart one of the threads that are waiting on the condition variable,
   returns 0 or -1 on error.
 */
extern DECLSPEC int SDLCALL SDL_CondSignal(SDL_cond *cond);

/* Restart all threads that are waiting on the condition variable,
   returns 0 or -1 on error.
 */
extern DECLSPEC int SDLCALL SDL_CondBroadcast(SDL_cond *cond);

/* Wait on the condition variable, unlocking the provided mutex.
   The mutex must be locked before entering this function!
   Returns 0 when it is signaled, or -1 on error.
 */
extern DECLSPEC int SDLCALL SDL_CondWait(SDL_cond *cond, SDL_mutex *mut);

/* Waits for at most 'ms' milliseconds, and returns 0 if the condition
   variable is signaled, SDL_MUTEX_TIMEDOUT if the condition is not
   signaled in the allotted time, and -1 on error.
   On some platforms this function is implemented by looping with a delay
   of 1 ms, and so should be avoided if possible.
*/
extern DECLSPEC int SDLCALL SDL_CondWaitTimeout(SDL_cond *cond, SDL_mutex *mutex, Uint32 ms);

/* Ends C function definitions when using C++ */
#ifdef __cplusplus
}
#endif
#include "close_code.h"

#endif /* _SDL_mutex_h */

--- NEW FILE: SDL.h ---
/*
    SDL - Simple DirectMedia Layer
    Copyright (C) 1997-2004 Sam Lantinga

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

    Sam Lantinga
    slouken at libsdl.org
*/

#ifdef SAVE_RCSID
static char rcsid =
 "@(#) $Id: SDL.h,v 1.1 2006/04/26 01:51:19 modemhero Exp $";
#endif

/* Main include header for the SDL library */

#ifndef _SDL_H
#define _SDL_H

#include "SDL_main.h"
#include "SDL_types.h"
#include "SDL_getenv.h"
#include "SDL_error.h"
#include "SDL_rwops.h"
#include "SDL_timer.h"
#include "SDL_audio.h"
#include "SDL_cdrom.h"
#include "SDL_joystick.h"
#include "SDL_events.h"
#include "SDL_video.h"
#include "SDL_byteorder.h"
#include "SDL_version.h"

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
extern "C" {
#endif

/* As of version 0.5, SDL is loaded dynamically into the application */

/* These are the flags which may be passed to SDL_Init() -- you should
   specify the subsystems which you will be using in your application.
*/
#define	SDL_INIT_TIMER		0x00000001
#define SDL_INIT_AUDIO		0x00000010
#define SDL_INIT_VIDEO		0x00000020
#define SDL_INIT_CDROM		0x00000100
#define SDL_INIT_JOYSTICK	0x00000200
#define SDL_INIT_NOPARACHUTE	0x00100000	/* Don't catch fatal signals */
#define SDL_INIT_EVENTTHREAD	0x01000000	/* Not supported on all OS's */
#define SDL_INIT_EVERYTHING	0x0000FFFF

/* This function loads the SDL dynamically linked library and initializes 
 * the subsystems specified by 'flags' (and those satisfying dependencies)
 * Unless the SDL_INIT_NOPARACHUTE flag is set, it will install cleanup
 * signal handlers for some commonly ignored fatal signals (like SIGSEGV)
 */
extern DECLSPEC int SDLCALL SDL_Init(Uint32 flags);

/* This function initializes specific SDL subsystems */
extern DECLSPEC int SDLCALL SDL_InitSubSystem(Uint32 flags);

/* This function cleans up specific SDL subsystems */
extern DECLSPEC void SDLCALL SDL_QuitSubSystem(Uint32 flags);

/* This function returns mask of the specified subsystems which have
   been initialized.
   If 'flags' is 0, it returns a mask of all initialized subsystems.
*/
extern DECLSPEC Uint32 SDLCALL SDL_WasInit(Uint32 flags);

/* This function cleans up all initialized subsystems and unloads the
 * dynamically linked library.  You should call it upon all exit conditions.
 */
extern DECLSPEC void SDLCALL SDL_Quit(void);

/* Ends C function definitions when using C++ */
#ifdef __cplusplus
}
#endif
#include "close_code.h"

#endif /* _SDL_H */

--- NEW FILE: SDL_mixer.h ---
/*
    SDL_mixer:  An audio mixer library based on the SDL library
    Copyright (C) 1997-2004 Sam Lantinga

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

    Sam Lantinga
    slouken at libsdl.org
*/

/* $Id: SDL_mixer.h,v 1.1 2006/04/26 01:51:19 modemhero Exp $ */

#ifndef _SDL_MIXER_H
#define _SDL_MIXER_H

#include "SDL_types.h"
#include "SDL_rwops.h"
#include "SDL_audio.h"
#include "SDL_byteorder.h"
#include "SDL_version.h"
#include "begin_code.h"

/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
extern "C" {
#endif

/* Printable format: "%d.%d.%d", MAJOR, MINOR, PATCHLEVEL
*/
#define SDL_MIXER_MAJOR_VERSION	1
#define SDL_MIXER_MINOR_VERSION	2
#define SDL_MIXER_PATCHLEVEL	6

/* This macro can be used to fill a version structure with the compile-time
 * version of the SDL_mixer library.
 */
#define SDL_MIXER_VERSION(X)						\
{									\
	(X)->major = SDL_MIXER_MAJOR_VERSION;				\
	(X)->minor = SDL_MIXER_MINOR_VERSION;				\
	(X)->patch = SDL_MIXER_PATCHLEVEL;				\
}

/* Backwards compatibility */
#define MIX_MAJOR_VERSION	SDL_MIXER_MAJOR_VERSION
#define MIX_MINOR_VERSION	SDL_MIXER_MINOR_VERSION
#define MIX_PATCHLEVEL		SDL_MIXER_PATCHLEVEL
#define MIX_VERSION(X)		SDL_MIXER_VERSION(X)

/* This function gets the version of the dynamically linked SDL_mixer library.
   it should NOT be used to fill a version structure, instead you should
   use the SDL_MIXER_VERSION() macro.
 */
extern DECLSPEC const SDL_version * SDLCALL Mix_Linked_Version(void);


/* The default mixer has 8 simultaneous mixing channels */
#ifndef MIX_CHANNELS
#define MIX_CHANNELS	8
#endif

/* Good default values for a PC soundcard */
#define MIX_DEFAULT_FREQUENCY	22050
#if SDL_BYTEORDER == SDL_LIL_ENDIAN
#define MIX_DEFAULT_FORMAT	AUDIO_S16LSB
#else
#define MIX_DEFAULT_FORMAT	AUDIO_S16MSB
#endif
#define MIX_DEFAULT_CHANNELS	2
#define MIX_MAX_VOLUME		128	/* Volume of a chunk */

/* The internal format for an audio chunk */
typedef struct {
	int allocated;
	Uint8 *abuf;
	Uint32 alen;
	Uint8 volume;		/* Per-sample volume, 0-128 */
} Mix_Chunk;

/* The different fading types supported */
typedef enum {
	MIX_NO_FADING,
	MIX_FADING_OUT,
	MIX_FADING_IN
} Mix_Fading;

typedef enum {
	MUS_NONE,
	MUS_CMD,
	MUS_WAV,
	MUS_MOD,
	MUS_MID,
	MUS_OGG,
	MUS_MP3
} Mix_MusicType;

/* The internal format for a music chunk interpreted via mikmod */
typedef struct _Mix_Music Mix_Music;

/* Open the mixer with a certain audio format */
extern DECLSPEC int SDLCALL Mix_OpenAudio(int frequency, Uint16 format, int channels,
							int chunksize);

/* Dynamically change the number of channels managed by the mixer.
   If decreasing the number of channels, the upper channels are
   stopped.
   This function returns the new number of allocated channels.
 */
extern DECLSPEC int SDLCALL Mix_AllocateChannels(int numchans);

/* Find out what the actual audio device parameters are.
   This function returns 1 if the audio has been opened, 0 otherwise.
 */
extern DECLSPEC int SDLCALL Mix_QuerySpec(int *frequency,Uint16 *format,int *channels);

/* Load a wave file or a music (.mod .s3m .it .xm) file */
extern DECLSPEC Mix_Chunk * SDLCALL Mix_LoadWAV_RW(SDL_RWops *src, int freesrc);
#define Mix_LoadWAV(file)	Mix_LoadWAV_RW(SDL_RWFromFile(file, "rb"), 1)
extern DECLSPEC Mix_Music * SDLCALL Mix_LoadMUS(const char *file);

#ifdef USE_RWOPS /* This hasn't been hooked into music.c yet */
/* Load a music file from an SDL_RWop object (MikMod-specific currently)
   Matt Campbell (matt at campbellhome.dhs.org) April 2000 */
extern DECLSPEC Mix_Music * SDLCALL Mix_LoadMUS_RW(SDL_RWops *rw);
#endif

/* Load a wave file of the mixer format from a memory buffer */
extern DECLSPEC Mix_Chunk * SDLCALL Mix_QuickLoad_WAV(Uint8 *mem);

/* Load raw audio data of the mixer format from a memory buffer */
extern DECLSPEC Mix_Chunk * SDLCALL Mix_QuickLoad_RAW(Uint8 *mem, Uint32 len);

/* Free an audio chunk previously loaded */
extern DECLSPEC void SDLCALL Mix_FreeChunk(Mix_Chunk *chunk);
extern DECLSPEC void SDLCALL Mix_FreeMusic(Mix_Music *music);

/* Find out the music format of a mixer music, or the currently playing
   music, if 'music' is NULL.
*/
extern DECLSPEC Mix_MusicType SDLCALL Mix_GetMusicType(const Mix_Music *music);

/* Set a function that is called after all mixing is performed.
   This can be used to provide real-time visual display of the audio stream
   or add a custom mixer filter for the stream data.
*/
extern DECLSPEC void SDLCALL Mix_SetPostMix(void (*mix_func)
                             (void *udata, Uint8 *stream, int len), void *arg);

/* Add your own music player or additional mixer function.
   If 'mix_func' is NULL, the default music player is re-enabled.
 */
extern DECLSPEC void SDLCALL Mix_HookMusic(void (*mix_func)
                          (void *udata, Uint8 *stream, int len), void *arg);

/* Add your own callback when the music has finished playing.
   This callback is only called if the music finishes naturally.
 */
extern DECLSPEC void SDLCALL Mix_HookMusicFinished(void (*music_finished)(void));

/* Get a pointer to the user data for the current music hook */
extern DECLSPEC void * SDLCALL Mix_GetMusicHookData(void);

/*
 * Add your own callback when a channel has finished playing. NULL
 *  to disable callback. The callback may be called from the mixer's audio 
 *  callback or it could be called as a result of Mix_HaltChannel(), etc.
 *  do not call SDL_LockAudio() from this callback; you will either be 
 *  inside the audio callback, or SDL_mixer will explicitly lock the audio
 *  before calling your callback.
 */
extern DECLSPEC void SDLCALL Mix_ChannelFinished(void (*channel_finished)(int channel));


/* Special Effects API by ryan c. gordon. (icculus at linuxgames.com) */

#define MIX_CHANNEL_POST  -2

/* This is the format of a special effect callback:
 *
 *   myeffect(int chan, void *stream, int len, void *udata);
 *
 * (chan) is the channel number that your effect is affecting. (stream) is
 *  the buffer of data to work upon. (len) is the size of (stream), and
 *  (udata) is a user-defined bit of data, which you pass as the last arg of
 *  Mix_RegisterEffect(), and is passed back unmolested to your callback.
 *  Your effect changes the contents of (stream) based on whatever parameters
 *  are significant, or just leaves it be, if you prefer. You can do whatever
 *  you like to the buffer, though, and it will continue in its changed state
 *  down the mixing pipeline, through any other effect functions, then finally
 *  to be mixed with the rest of the channels and music for the final output
 *  stream.
 *
 * DO NOT EVER call SDL_LockAudio() from your callback function!
 */
typedef void (*Mix_EffectFunc_t)(int chan, void *stream, int len, void *udata);

/*
 * This is a callback that signifies that a channel has finished all its
 *  loops and has completed playback. This gets called if the buffer
 *  plays out normally, or if you call Mix_HaltChannel(), implicitly stop
 *  a channel via Mix_AllocateChannels(), or unregister a callback while
 *  it's still playing.
 *
 * DO NOT EVER call SDL_LockAudio() from your callback function!
 */
typedef void (*Mix_EffectDone_t)(int chan, void *udata);


/* Register a special effect function. At mixing time, the channel data is
 *  copied into a buffer and passed through each registered effect function.
 *  After it passes through all the functions, it is mixed into the final
 *  output stream. The copy to buffer is performed once, then each effect
 *  function performs on the output of the previous effect. Understand that
 *  this extra copy to a buffer is not performed if there are no effects
 *  registered for a given chunk, which saves CPU cycles, and any given
 *  effect will be extra cycles, too, so it is crucial that your code run
 *  fast. Also note that the data that your function is given is in the
 *  format of the sound device, and not the format you gave to Mix_OpenAudio(),
 *  although they may in reality be the same. This is an unfortunate but
 *  necessary speed concern. Use Mix_QuerySpec() to determine if you can
 *  handle the data before you register your effect, and take appropriate
 *  actions.
 * You may also specify a callback (Mix_EffectDone_t) that is called when
 *  the channel finishes playing. This gives you a more fine-grained control
 *  than Mix_ChannelFinished(), in case you need to free effect-specific
 *  resources, etc. If you don't need this, you can specify NULL.
 * You may set the callbacks before or after calling Mix_PlayChannel().
 * Things like Mix_SetPanning() are just internal special effect functions,
 *  so if you are using that, you've already incurred the overhead of a copy
 *  to a separate buffer, and that these effects will be in the queue with
 *  any functions you've registered. The list of registered effects for a
 *  channel is reset when a chunk finishes playing, so you need to explicitly
 *  set them with each call to Mix_PlayChannel*().
 * You may also register a special effect function that is to be run after
 *  final mixing occurs. The rules for these callbacks are identical to those
 *  in Mix_RegisterEffect, but they are run after all the channels and the
 *  music have been mixed into a single stream, whereas channel-specific
 *  effects run on a given channel before any other mixing occurs. These
 *  global effect callbacks are call "posteffects". Posteffects only have
 *  their Mix_EffectDone_t function called when they are unregistered (since
 *  the main output stream is never "done" in the same sense as a channel).
 *  You must unregister them manually when you've had enough. Your callback
 *  will be told that the channel being mixed is (MIX_CHANNEL_POST) if the
 *  processing is considered a posteffect.
 *
 * After all these effects have finished processing, the callback registered
 *  through Mix_SetPostMix() runs, and then the stream goes to the audio
 *  device. 
 *
 * DO NOT EVER call SDL_LockAudio() from your callback function!
 *
 * returns zero if error (no such channel), nonzero if added.
 *  Error messages can be retrieved from Mix_GetError().
 */
extern DECLSPEC int SDLCALL Mix_RegisterEffect(int chan, Mix_EffectFunc_t f,
					Mix_EffectDone_t d, void *arg);


/* You may not need to call this explicitly, unless you need to stop an
 *  effect from processing in the middle of a chunk's playback.
 * Posteffects are never implicitly unregistered as they are for channels,
 *  but they may be explicitly unregistered through this function by
 *  specifying MIX_CHANNEL_POST for a channel.
 * returns zero if error (no such channel or effect), nonzero if removed.
 *  Error messages can be retrieved from Mix_GetError().
 */
extern DECLSPEC int SDLCALL Mix_UnregisterEffect(int channel, Mix_EffectFunc_t f);


/* You may not need to call this explicitly, unless you need to stop all
 *  effects from processing in the middle of a chunk's playback. Note that
 *  this will also shut off some internal effect processing, since
 *  Mix_SetPanning() and others may use this API under the hood. This is
 *  called internally when a channel completes playback.
 * Posteffects are never implicitly unregistered as they are for channels,
 *  but they may be explicitly unregistered through this function by
 *  specifying MIX_CHANNEL_POST for a channel.
 * returns zero if error (no such channel), nonzero if all effects removed.
 *  Error messages can be retrieved from Mix_GetError().
 */
extern DECLSPEC int SDLCALL Mix_UnregisterAllEffects(int channel);


#define MIX_EFFECTSMAXSPEED  "MIX_EFFECTSMAXSPEED"

/*
 * These are the internally-defined mixing effects. They use the same API that
 *  effects defined in the application use, but are provided here as a
 *  convenience. Some effects can reduce their quality or use more memory in
 *  the name of speed; to enable this, make sure the environment variable
 *  MIX_EFFECTSMAXSPEED (see above) is defined before you call
 *  Mix_OpenAudio().
 */


/* Set the panning of a channel. The left and right channels are specified
 *  as integers between 0 and 255, quietest to loudest, respectively.
 *
 * Technically, this is just individual volume control for a sample with
 *  two (stereo) channels, so it can be used for more than just panning.
 *  If you want real panning, call it like this:
 *
 *   Mix_SetPanning(channel, left, 255 - left);
 *
 * ...which isn't so hard.
 *
 * Setting (channel) to MIX_CHANNEL_POST registers this as a posteffect, and
 *  the panning will be done to the final mixed stream before passing it on
 *  to the audio device.
 *
 * This uses the Mix_RegisterEffect() API internally, and returns without
 *  registering the effect function if the audio device is not configured
 *  for stereo output. Setting both (left) and (right) to 255 causes this
 *  effect to be unregistered, since that is the data's normal state.
 *
 * returns zero if error (no such channel or Mix_RegisterEffect() fails),
 *  nonzero if panning effect enabled. Note that an audio device in mono
 *  mode is a no-op, but this call will return successful in that case.
 *  Error messages can be retrieved from Mix_GetError().
 */
extern DECLSPEC int SDLCALL Mix_SetPanning(int channel, Uint8 left, Uint8 right);


/* Set the position of a channel. (angle) is an integer from 0 to 360, that
 *  specifies the location of the sound in relation to the listener. (angle)
 *  will be reduced as neccesary (540 becomes 180 degrees, -100 becomes 260).
 *  Angle 0 is due north, and rotates clockwise as the value increases.
 *  For efficiency, the precision of this effect may be limited (angles 1
 *  through 7 might all produce the same effect, 8 through 15 are equal, etc).
 *  (distance) is an integer between 0 and 255 that specifies the space
 *  between the sound and the listener. The larger the number, the further
 *  away the sound is. Using 255 does not guarantee that the channel will be
 *  culled from the mixing process or be completely silent. For efficiency,
 *  the precision of this effect may be limited (distance 0 through 5 might
 *  all produce the same effect, 6 through 10 are equal, etc). Setting (angle)
 *  and (distance) to 0 unregisters this effect, since the data would be
 *  unchanged.
 *
 * If you need more precise positional audio, consider using OpenAL for
 *  spatialized effects instead of SDL_mixer. This is only meant to be a
 *  basic effect for simple "3D" games.
 *
 * If the audio device is configured for mono output, then you won't get
 *  any effectiveness from the angle; however, distance attenuation on the
 *  channel will still occur. While this effect will function with stereo
 *  voices, it makes more sense to use voices with only one channel of sound,
 *  so when they are mixed through this effect, the positioning will sound
 *  correct. You can convert them to mono through SDL before giving them to
 *  the mixer in the first place if you like.
 *
 * Setting (channel) to MIX_CHANNEL_POST registers this as a posteffect, and
 *  the positioning will be done to the final mixed stream before passing it
 *  on to the audio device.
 *
 * This is a convenience wrapper over Mix_SetDistance() and Mix_SetPanning().
 *
 * returns zero if error (no such channel or Mix_RegisterEffect() fails),
 *  nonzero if position effect is enabled.
 *  Error messages can be retrieved from Mix_GetError().
 */
extern DECLSPEC int SDLCALL Mix_SetPosition(int channel, Sint16 angle, Uint8 distance);


/* Set the "distance" of a channel. (distance) is an integer from 0 to 255
 *  that specifies the location of the sound in relation to the listener.
 *  Distance 0 is overlapping the listener, and 255 is as far away as possible
 *  A distance of 255 does not guarantee silence; in such a case, you might
 *  want to try changing the chunk's volume, or just cull the sample from the
 *  mixing process with Mix_HaltChannel().
 * For efficiency, the precision of this effect may be limited (distances 1
 *  through 7 might all produce the same effect, 8 through 15 are equal, etc).
 *  (distance) is an integer between 0 and 255 that specifies the space
 *  between the sound and the listener. The larger the number, the further
 *  away the sound is.
 * Setting (distance) to 0 unregisters this effect, since the data would be
 *  unchanged.
 * If you need more precise positional audio, consider using OpenAL for
 *  spatialized effects instead of SDL_mixer. This is only meant to be a
 *  basic effect for simple "3D" games.
 *
 * Setting (channel) to MIX_CHANNEL_POST registers this as a posteffect, and
 *  the distance attenuation will be done to the final mixed stream before
 *  passing it on to the audio device.
 *
 * This uses the Mix_RegisterEffect() API internally.
 *
 * returns zero if error (no such channel or Mix_RegisterEffect() fails),
 *  nonzero if position effect is enabled.
 *  Error messages can be retrieved from Mix_GetError().
 */
extern DECLSPEC int SDLCALL Mix_SetDistance(int channel, Uint8 distance);


/*
 * !!! FIXME : Haven't implemented, since the effect goes past the
 *              end of the sound buffer. Will have to think about this.
 *               --ryan.
 */
#if 0
/* Causes an echo effect to be mixed into a sound. (echo) is the amount
 *  of echo to mix. 0 is no echo, 255 is infinite (and probably not
 *  what you want).
 *
 * Setting (channel) to MIX_CHANNEL_POST registers this as a posteffect, and
 *  the reverbing will be done to the final mixed stream before passing it on
 *  to the audio device.
 *
 * This uses the Mix_RegisterEffect() API internally. If you specify an echo
 *  of zero, the effect is unregistered, as the data is already in that state.
 *
 * returns zero if error (no such channel or Mix_RegisterEffect() fails),
 *  nonzero if reversing effect is enabled.
 *  Error messages can be retrieved from Mix_GetError().
 */
extern no_parse_DECLSPEC int SDLCALL Mix_SetReverb(int channel, Uint8 echo);
#endif

/* Causes a channel to reverse its stereo. This is handy if the user has his
 *  speakers hooked up backwards, or you would like to have a minor bit of
 *  psychedelia in your sound code.  :)  Calling this function with (flip)
 *  set to non-zero reverses the chunks's usual channels. If (flip) is zero,
 *  the effect is unregistered.
 *
 * This uses the Mix_RegisterEffect() API internally, and thus is probably
 *  more CPU intensive than having the user just plug in his speakers
 *  correctly. Mix_SetReverseStereo() returns without registering the effect
 *  function if the audio device is not configured for stereo output.
 *
 * If you specify MIX_CHANNEL_POST for (channel), then this the effect is used
 *  on the final mixed stream before sending it on to the audio device (a
 *  posteffect).
 *
 * returns zero if error (no such channel or Mix_RegisterEffect() fails),
 *  nonzero if reversing effect is enabled. Note that an audio device in mono
 *  mode is a no-op, but this call will return successful in that case.
 *  Error messages can be retrieved from Mix_GetError().
 */
extern DECLSPEC int SDLCALL Mix_SetReverseStereo(int channel, int flip);

/* end of effects API. --ryan. */


/* Reserve the first channels (0 -> n-1) for the application, i.e. don't allocate
   them dynamically to the next sample if requested with a -1 value below.
   Returns the number of reserved channels.
 */
extern DECLSPEC int SDLCALL Mix_ReserveChannels(int num);

/* Channel grouping functions */

/* Attach a tag to a channel. A tag can be assigned to several mixer
   channels, to form groups of channels.
   If 'tag' is -1, the tag is removed (actually -1 is the tag used to
   represent the group of all the channels).
   Returns true if everything was OK.
 */
extern DECLSPEC int SDLCALL Mix_GroupChannel(int which, int tag);
/* Assign several consecutive channels to a group */
extern DECLSPEC int SDLCALL Mix_GroupChannels(int from, int to, int tag);
/* Finds the first available channel in a group of channels,
   returning -1 if none are available.
 */
extern DECLSPEC int SDLCALL Mix_GroupAvailable(int tag);
/* Returns the number of channels in a group. This is also a subtle
   way to get the total number of channels when 'tag' is -1
 */
extern DECLSPEC int SDLCALL Mix_GroupCount(int tag);
/* Finds the "oldest" sample playing in a group of channels */
extern DECLSPEC int SDLCALL Mix_GroupOldest(int tag);
/* Finds the "most recent" (i.e. last) sample playing in a group of channels */
extern DECLSPEC int SDLCALL Mix_GroupNewer(int tag);

/* Play an audio chunk on a specific channel.
   If the specified channel is -1, play on the first free channel.
   If 'loops' is greater than zero, loop the sound that many times.
   If 'loops' is -1, loop inifinitely (~65000 times).
   Returns which channel was used to play the sound.
*/
#define Mix_PlayChannel(channel,chunk,loops) Mix_PlayChannelTimed(channel,chunk,loops,-1)
/* The same as above, but the sound is played at most 'ticks' milliseconds */
extern DECLSPEC int SDLCALL Mix_PlayChannelTimed(int channel, Mix_Chunk *chunk, int loops, int ticks);
extern DECLSPEC int SDLCALL Mix_PlayMusic(Mix_Music *music, int loops);

/* Fade in music or a channel over "ms" milliseconds, same semantics as the "Play" functions */
extern DECLSPEC int SDLCALL Mix_FadeInMusic(Mix_Music *music, int loops, int ms);
extern DECLSPEC int SDLCALL Mix_FadeInMusicPos(Mix_Music *music, int loops, int ms, double position);
#define Mix_FadeInChannel(channel,chunk,loops,ms) Mix_FadeInChannelTimed(channel,chunk,loops,ms,-1)
extern DECLSPEC int SDLCALL Mix_FadeInChannelTimed(int channel, Mix_Chunk *chunk, int loops, int ms, int ticks);

/* Set the volume in the range of 0-128 of a specific channel or chunk.
   If the specified channel is -1, set volume for all channels.
   Returns the original volume.
   If the specified volume is -1, just return the current volume.
*/
extern DECLSPEC int SDLCALL Mix_Volume(int channel, int volume);
extern DECLSPEC int SDLCALL Mix_VolumeChunk(Mix_Chunk *chunk, int volume);
extern DECLSPEC int SDLCALL Mix_VolumeMusic(int volume);

/* Halt playing of a particular channel */
extern DECLSPEC int SDLCALL Mix_HaltChannel(int channel);
extern DECLSPEC int SDLCALL Mix_HaltGroup(int tag);
extern DECLSPEC int SDLCALL Mix_HaltMusic(void);

/* Change the expiration delay for a particular channel.
   The sample will stop playing after the 'ticks' milliseconds have elapsed,
   or remove the expiration if 'ticks' is -1
*/
extern DECLSPEC int SDLCALL Mix_ExpireChannel(int channel, int ticks);

/* Halt a channel, fading it out progressively till it's silent
   The ms parameter indicates the number of milliseconds the fading
   will take.
 */
extern DECLSPEC int SDLCALL Mix_FadeOutChannel(int which, int ms);
extern DECLSPEC int SDLCALL Mix_FadeOutGroup(int tag, int ms);
extern DECLSPEC int SDLCALL Mix_FadeOutMusic(int ms);

/* Query the fading status of a channel */
extern DECLSPEC Mix_Fading SDLCALL Mix_FadingMusic(void);
extern DECLSPEC Mix_Fading SDLCALL Mix_FadingChannel(int which);

/* Pause/Resume a particular channel */
extern DECLSPEC void SDLCALL Mix_Pause(int channel);
extern DECLSPEC void SDLCALL Mix_Resume(int channel);
extern DECLSPEC int SDLCALL Mix_Paused(int channel);

/* Pause/Resume the music stream */
extern DECLSPEC void SDLCALL Mix_PauseMusic(void);
extern DECLSPEC void SDLCALL Mix_ResumeMusic(void);
extern DECLSPEC void SDLCALL Mix_RewindMusic(void);
extern DECLSPEC int SDLCALL Mix_PausedMusic(void);

/* Set the current position in the music stream.
   This returns 0 if successful, or -1 if it failed or isn't implemented.
   This function is only implemented for MOD music formats (set pattern
   order number) and for OGG music (set position in seconds), at the
   moment.
*/
extern DECLSPEC int SDLCALL Mix_SetMusicPosition(double position);

/* Check the status of a specific channel.
   If the specified channel is -1, check all channels.
*/
extern DECLSPEC int SDLCALL Mix_Playing(int channel);
extern DECLSPEC int SDLCALL Mix_PlayingMusic(void);

/* Stop music and set external music playback command */
extern DECLSPEC int SDLCALL Mix_SetMusicCMD(const char *command);

/* Synchro value is set by MikMod from modules while playing */
extern DECLSPEC int SDLCALL Mix_SetSynchroValue(int value);
extern DECLSPEC int SDLCALL Mix_GetSynchroValue(void);

/* Get the Mix_Chunk currently associated with a mixer channel
    Returns NULL if it's an invalid channel, or there's no chunk associated.
*/
extern DECLSPEC Mix_Chunk * SDLCALL Mix_GetChunk(int channel);

/* Close the mixer, halting all playing audio */
extern DECLSPEC void SDLCALL Mix_CloseAudio(void);

/* We'll use SDL for reporting errors */
#define Mix_SetError	SDL_SetError
#define Mix_GetError	SDL_GetError

/* Ends C function definitions when using C++ */
#ifdef __cplusplus
}
#endif
#include "close_code.h"

#endif /* _SDL_MIXER_H */

--- NEW FILE: SDL_version.h ---
/*
    SDL - Simple DirectMedia Layer
    Copyright (C) 1997-2004 Sam Lantinga

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

    Sam Lantinga
    slouken at libsdl.org
*/

#ifdef SAVE_RCSID
static char rcsid =
 "@(#) $Id: SDL_version.h,v 1.1 2006/04/26 01:51:19 modemhero Exp $";
#endif

/* This header defines the current SDL version */

#ifndef _SDL_version_h
#define _SDL_version_h

#include "SDL_types.h"

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
extern "C" {
#endif

/* Printable format: "%d.%d.%d", MAJOR, MINOR, PATCHLEVEL
*/
#define SDL_MAJOR_VERSION	1
#define SDL_MINOR_VERSION	2
#define SDL_PATCHLEVEL		9

typedef struct SDL_version {
	Uint8 major;
	Uint8 minor;
	Uint8 patch;
} SDL_version;

/* This macro can be used to fill a version structure with the compile-time
 * version of the SDL library.
 */
#define SDL_VERSION(X)							\
{									\
	(X)->major = SDL_MAJOR_VERSION;					\
	(X)->minor = SDL_MINOR_VERSION;					\
	(X)->patch = SDL_PATCHLEVEL;					\
}

/* This macro turns the version numbers into a numeric value:
   (1,2,3) -> (1203)
   This assumes that there will never be more than 100 patchlevels
*/
#define SDL_VERSIONNUM(X, Y, Z)						\
	((X)*1000 + (Y)*100 + (Z))

/* This is the version number macro for the current SDL version */
#define SDL_COMPILEDVERSION \
	SDL_VERSIONNUM(SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL)

/* This macro will evaluate to true if compiled with SDL at least X.Y.Z */
#define SDL_VERSION_ATLEAST(X, Y, Z) \
	(SDL_COMPILEDVERSION >= SDL_VERSIONNUM(X, Y, Z))

/* This function gets the version of the dynamically linked SDL library.
   it should NOT be used to fill a version structure, instead you should
   use the SDL_Version() macro.
 */
extern DECLSPEC const SDL_version * SDLCALL SDL_Linked_Version(void);

/* Ends C function definitions when using C++ */
#ifdef __cplusplus
}
#endif
#include "close_code.h"

#endif /* _SDL_version_h */



From modemhero at users.sourceforge.net  Tue Apr 25 20:51:50 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Wed, 26 Apr 2006 01:51:50 +0000
Subject: [netrek-cvs] client/netrekxp/win32/lib/VCC SDL.lib, NONE,
	1.1 SDL_mixer.lib, NONE, 1.1 SDLmain.lib, NONE, 1.1
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/win32/lib/VCC
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29976/win32/lib/VCC

Added Files:
	SDL.lib SDL_mixer.lib SDLmain.lib 
Log Message:
SDL lib files for BCC and VCC

--- NEW FILE: SDL.lib ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: SDLmain.lib ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: SDL_mixer.lib ---
(This appears to be a binary file; contents omitted.)



From modemhero at users.sourceforge.net  Tue Apr 25 20:51:49 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Wed, 26 Apr 2006 01:51:49 +0000
Subject: [netrek-cvs] client/netrekxp/win32/lib/BCC SDL.lib, NONE,
	1.1 SDL_mixer.LIB, NONE, 1.1 SDLmain.lib, NONE,
	1.1 libgmpbcc.lib, NONE, 1.1
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/win32/lib/BCC
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29976/win32/lib/BCC

Added Files:
	SDL.lib SDL_mixer.LIB SDLmain.lib libgmpbcc.lib 
Log Message:
SDL lib files for BCC and VCC

--- NEW FILE: SDL.lib ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: SDL_mixer.LIB ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: SDLmain.lib ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: libgmpbcc.lib ---
(This appears to be a binary file; contents omitted.)



From modemhero at users.sourceforge.net  Tue Apr 25 20:52:48 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Wed, 26 Apr 2006 01:52:48 +0000
Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C,NONE,1.1
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30714

Added Files:
	NetrekXP to do list.C 
Log Message:
My to do list, also serves as project file

--- NEW FILE: NetrekXP to do list.C ---
List for the netrekrc/installer:

1) Change recommendation on metaserver from off to on!
2) there should be some sort of chance to give default resolution in GUI,
which then maps windows accordingly.
3) Default keymap/buttonamp is horrible.
4) Add chance for player to input their default login name - tired of seeing
new-be-nice!!


Things not gonna hapen:
1) Player list messaging doesn't work if you can't see player (cloaked, too far
away, etc).  Don't think this is fixable.
2) Get mkkey working.

Things to do:
1) Add warning hull.
2) resizeable message windows.  Perhaps memory of window positions if you choose
to save settings.  Text in windows should adjust to new window size.
5) A lot of annoying pop up windows (like macro window, default controls) should be
closeable by shift right click.
6) genoed as obs on team with no planets -> you were killed by something not in this
game
7a) red_alert sound sounds kinda static-y
7b) self destruct and enter ship sounds are near identical.
11) Save options 
- name/login/meta stuff needs to be saved
- Default windows placements need to be saved
- uselite options need to be saved
- review window mapping needs to be saved
- option server/servernick/servertype needs to be saved
12) Icon not working under Visual Studio
14) observer sounds slightly messed up
14a) torp_other not working right due to lack of torp fuse info
15) closing hint window at warp 0 turns off the box on the galaxy map.  Also, cloaking/shields
at warp 0 doesn't update someone else's tactical on what you did.
15a) 
16) why is beeplite going on when i'm obsing someone who cloaks after they used a 
beeplite macro that lit themselves up
17) add dll, lib, and header files to repository

Might be done:
3) mouse scroll in message windows gets the up/down coord wrong when main title
bar is turned on.
4) CRASH BUG! Resize main window and try to do mouse scroll, it will crash client.
13) Disable window move stuff still broken.
11) save_options keymap: not saving right
13) if waiting on queue and get in, quit clock missing

Stas's list:
- color coded playerlist.
! change default playerListStlyle to 1 (nah, this won't happen)
- check inl server for behavior
+ add option to parse netrekrc.txt and xtrekrc.txt files
! server: ita won't block RCDs (why not ?)
- add usage on metaserver window (well, what would you write there ?)
! after res if there cloaker around he will be seen briefly (speed 0 bug)
- whydead dies when out of range (not confirmed)
- add "reset to defaults" to options menu
+ add installer
- maybe add two column playerlist
- add bitmap themes option (change default bitmap naming and processing)
- add shiftMouse, controlMouse on/off
- add timestamps for messages (no place for timestamp)
- fix accelerated scroll for microsoft mice
- add msg.phaser to enable formatting of phaser messages
- add geno bitmap
- add detCircle
- add copy/paste possibility from message windows (richtext ?)
- add clickable urls from message windows (richtext ?)
+ fix bug with undefined behavior in case of odd keymap/buttonmap/ckeymap length (partially fixed)
- add "mKeyOnlyToStartMessages: on/off" to ignore keys [0-9][a-z][ATFOKRG] in message window when the messageon=0
- scrollable player list
- parse Announcer messages in hockey games
- check geno/shift-q wrong behavior
- resize documentation window
- pasting multiline prints \r\n instead of splitting lines
- add sortPlayersFirst
- fix makedistress bug that creates 0 instead of empty string when macro starts with conditional




From modemhero at users.sourceforge.net  Tue Apr 25 20:53:52 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Wed, 26 Apr 2006 01:53:52 +0000
Subject: [netrek-cvs] client/netrekxp/win32/lib libgmpbcc.lib,1.1.1.1,NONE
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/win32/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31486/win32/lib

Removed Files:
	libgmpbcc.lib 
Log Message:
Moved to a different folder

--- libgmpbcc.lib DELETED ---



From modemhero at users.sourceforge.net  Tue Apr 25 21:04:26 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Wed, 26 Apr 2006 02:04:26 +0000
Subject: [netrek-cvs] client/netrekxp/include data.h, 1.7, 1.8 defs.h, 1.4,
	1.5 proto.h, 1.8, 1.9 sound.h, 1.2, 1.3 struct.h, 1.3, 1.4
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6804/include

Modified Files:
	data.h defs.h proto.h sound.h struct.h 
Log Message:
This latest series of changes adds stereo quasi-3D sound effects for both players and observers, as well as adding much improved support for observer sounds (previously they were limited as to what sounds they would hear).

Index: defs.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/defs.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- defs.h	21 Apr 2006 12:00:06 -0000	1.4
+++ defs.h	26 Apr 2006 02:04:24 -0000	1.5
@@ -35,6 +35,8 @@
                                  * tactical windows */
 #endif
 
+#define CORNER_DIST (int)(sqrt)(WINSIDE*WINSIDE/2)
+
 #define BORDER 1                /* border width for option
                                  * windows */
 #define THICKBORDER 3           /* Thicker border for windows */
@@ -170,7 +172,8 @@
 
 #define isLockPlanet(p)		((me->p_flags & PFPLLOCK) && (me->p_planet == p->pl_no))
 #define isLockPlayer(p)		((me->p_flags & PFPLOCK) && (me->p_playerl == p->p_no))
-
+#define isObsLockPlayer(p)      ((me->p_flags & PFOBSERV) && (me->p_flags & PFPLOCK) && \
+                                    (me->p_playerl == p->p_no))
 #define torpColor(t)		\
 	(myTorp(t) ? myColor : shipCol[remap[players[(t)->t_owner].p_team]])
 #define plasmatorpColor(t)		\

Index: sound.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/sound.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sound.h	24 Apr 2006 14:13:25 -0000	1.2
+++ sound.h	26 Apr 2006 02:04:24 -0000	1.3
@@ -15,31 +15,32 @@
 #define SHIELD_UP_SOUND         8
 #define TORP_HIT_SOUND          9
 #define WARNING_SOUND           10
-#define ENGINE_SOUND            11
-#define ENTER_SHIP_SOUND        12
-#define SELF_DESTRUCT_SOUND     13
-#define PLASMA_HIT_SOUND        14
-#define MESSAGE_SOUND           15
-#define MESSAGE1_SOUND          16
-#define MESSAGE2_SOUND          17
-#define MESSAGE3_SOUND          18
-#define MESSAGE4_SOUND          19
-#define MESSAGE5_SOUND          10
-#define MESSAGE6_SOUND          21
-#define MESSAGE7_SOUND          22
-#define MESSAGE8_SOUND          23
-#define MESSAGE9_SOUND          24
+#define RED_ALERT_SOUND         11
+#define ENGINE_SOUND            12
+#define ENTER_SHIP_SOUND        13
+#define SELF_DESTRUCT_SOUND     14
+#define PLASMA_HIT_SOUND        15
+#define MESSAGE_SOUND           16
+#define MESSAGE1_SOUND          17
+#define MESSAGE2_SOUND          18
+#define MESSAGE3_SOUND          19
+#define MESSAGE4_SOUND          20
+#define MESSAGE5_SOUND          21
+#define MESSAGE6_SOUND          22
+#define MESSAGE7_SOUND          23
+#define MESSAGE8_SOUND          24
+#define MESSAGE9_SOUND          25
 
-#define OTHER_SOUND_OFFSET      24
+#define OTHER_SOUND_OFFSET      26
 
 /* Other people's sounds; not all of these are currently used */
-#define OTHER_FIRE_TORP_SOUND   25
-#define OTHER_PHASER_SOUND      26
-#define OTHER_FIRE_PLASMA_SOUND 27
-#define OTHER_EXPLOSION_SOUND   28
+#define OTHER_FIRE_TORP_SOUND   27
+#define OTHER_PHASER_SOUND      28
+#define OTHER_FIRE_PLASMA_SOUND 29
+#define OTHER_EXPLOSION_SOUND   30
 
 
-#define NUM_SOUNDS 28
+#define NUM_SOUNDS 30
 
 struct Sound
 {
@@ -54,6 +55,7 @@
 /* extern void soundaction (W_Event * data); */
 
 extern void Play_Sound (int type);
+extern void Play_Sound_Loc (int type, int angle, int distance);
 extern void Abort_Sound (int type);
 extern void Init_Sound (void);
 extern void Exit_Sound (void);
@@ -65,8 +67,9 @@
   EXPLOSION_WAV,
   EXPLOSION_OTHER_WAV,
   FIRE_PLASMA_WAV,
+  OTHER_FIRE_PLASMA_WAV,
   FIRE_TORP_WAV,
-  FIRE_TORP_OTHER_WAV,
+  OTHER_FIRE_TORP_WAV,
   INTRO_WAV,
   MESSAGE_WAV,
   PHASER_WAV,

Index: struct.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/struct.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- struct.h	21 Apr 2006 12:00:06 -0000	1.3
+++ struct.h	26 Apr 2006 02:04:24 -0000	1.4
@@ -312,7 +312,7 @@
     int t_x;
     int t_y;
     short t_fuse;               /* Life left in current state */
-    unsigned char t_updateFuse; /* Updates before torp will expire */
+    short t_updateFuse; /* Updates before torp will expire */
     unsigned char t_dir;        /* direction */
 };
 

Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- proto.h	24 Apr 2006 15:30:37 -0000	1.8
+++ proto.h	26 Apr 2006 02:04:24 -0000	1.9
@@ -23,10 +23,10 @@
 /******************************************************************************/
 /***  beeplite.c                                                            ***/
 /******************************************************************************/
-rcdlite (struct distress *dist);
-litedefaults (void);
-liteplanet (struct planet *l);
-liteplayer (struct player *j);
+void rcdlite (struct distress *dist);
+void litedefaults (void);
+void liteplanet (struct planet *l);
+void liteplayer (struct player *j);
 makelite (struct distress * dist, char *pm);
 
 /******************************************************************************/
@@ -767,6 +767,8 @@
 void loadbitmapsG (void);
 newwin (char *hostmon,
         char *progname);
+newsoundwin (char *hostmon,
+        char *progname);
 mapAll (void);
 savebitmaps (void);
 void entrywindow (int *team,
@@ -1086,6 +1088,8 @@
      extern void Exit_Sound (void);
      extern void Init_Sound (void);
      extern void Play_Sound (int type);
+     extern void Play_Sound_Loc (int type, int angle, int distance);
+     void Group_Sound (int type, int channel);
      extern void Abort_Sound (int type);
      extern void soundwindow (void);
 //static void soundrefresh(int i);

Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- data.h	24 Apr 2006 15:30:37 -0000	1.7
+++ data.h	26 Apr 2006 02:04:24 -0000	1.8
@@ -551,7 +551,7 @@
 
 // Missing global variables
 #include 
-extern time_t autoQuit;
+extern int autoQuit;
 
 extern int forceDisplay;
 extern int forceMono;



From modemhero at users.sourceforge.net  Tue Apr 25 21:04:26 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Wed, 26 Apr 2006 02:04:26 +0000
Subject: [netrek-cvs] client/netrekxp build.cmd, 1.7, 1.8 buildexe.cmd, 1.2,
	1.3 compile.txt, 1.5, 1.6
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6804

Modified Files:
	build.cmd buildexe.cmd compile.txt 
Log Message:
This latest series of changes adds stereo quasi-3D sound effects for both players and observers, as well as adding much improved support for observer sounds (previously they were limited as to what sounds they would hear).

Index: compile.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/compile.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- compile.txt	18 Apr 2006 13:41:48 -0000	1.5
+++ compile.txt	26 Apr 2006 02:04:24 -0000	1.6
@@ -9,9 +9,21 @@
 - Edit clientr.dsp and change \netrek_files to be same as InstCWD (only if using VCC)
 - Edit src\cursors\curslib.dsp and change \netrek_files to be same as InstCWD
   (again only necessary if using VCC)
-
+- Get SDL.dll and SDL_mixer.dll from the SDL website (you will need these to
+  run the client, they must be in the installer package)
 After compilation under BCC, there will be one folder under InstCWD - netrek.
 Netrek contains the ready to distribute netrek client tree.
+After compilation under VCC, there will be an additional directory called 
+tmp which can be deleted.
+
+
+Additional instructions for compiling with Microsoft Visual C++ 2005 Express Edition,
+aka Microsoft Visual Studio 2005
+
+You will need the SDK from the web, as the software doesn't come with the necessary files.
+Additionally, DirectX SDK is probably needed too, for the SDL support.  The build file
+will not work under Visual Studio.
+
 
 Stas Pirogov (keyos at keyos.org)
 

Index: buildexe.cmd
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/buildexe.cmd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- buildexe.cmd	16 Apr 2006 07:58:37 -0000	1.2
+++ buildexe.cmd	26 Apr 2006 02:04:24 -0000	1.3
@@ -75,6 +75,18 @@
 del resources\ships\mono\ori\orishipM.bmp resources\ships\mono\ori\ori_??.bmp
 del resources\ships\mono\rom\romshipM.bmp resources\ships\mono\rom\rom_??.bmp
 
+del resources\ships\grayscale\fed\fedshipG.bmp resources\ships\grayscale\fed\fed_??.bmp
+del resources\ships\grayscale\ind\indshipG.bmp resources\ships\grayscale\ind\ind_??.bmp
+del resources\ships\grayscale\kli\klishipG.bmp resources\ships\grayscale\kli\kli_??.bmp
+del resources\ships\grayscale\ori\orishipG.bmp resources\ships\grayscale\ori\ori_??.bmp
+del resources\ships\grayscale\rom\romshipG.bmp resources\ships\grayscale\rom\rom_??.bmp
+
+del resources\ships\tinted\fed\fedshipT.bmp resources\ships\tinted\fed\fed_??.bmp
+del resources\ships\tinted\ind\indshipT.bmp resources\ships\tinted\ind\ind_??.bmp
+del resources\ships\tinted\kli\klishipT.bmp resources\ships\tinted\kli\kli_??.bmp
+del resources\ships\tinted\ori\orishipT.bmp resources\ships\tinted\ori\ori_??.bmp
+del resources\ships\tinted\rom\romshipT.bmp resources\ships\tinted\rom\rom_??.bmp
+
 del resources\planlibm\bronco\plan.bmp
 del resources\planlibm\rabbit\planR.bmp
 del resources\planlibm\moo\planM.bmp

Index: build.cmd
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/build.cmd,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- build.cmd	24 Apr 2006 14:13:25 -0000	1.7
+++ build.cmd	26 Apr 2006 02:04:24 -0000	1.8
@@ -349,7 +349,7 @@
 
 :CompilerVCC
 pushd src
-%MyCWD%\tools\mkkey -k %RSAKEY%
+%MyCWD%\tools\mkkey -nt -k %RSAKEY%
 popd
 
 pushd src\cursors



From modemhero at users.sourceforge.net  Tue Apr 25 21:04:26 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Wed, 26 Apr 2006 02:04:26 +0000
Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.20,1.21
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6804/resources/docs

Modified Files:
	changes.txt 
Log Message:
This latest series of changes adds stereo quasi-3D sound effects for both players and observers, as well as adding much improved support for observer sounds (previously they were limited as to what sounds they would hear).

Index: changes.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- changes.txt	24 Apr 2006 15:30:37 -0000	1.20
+++ changes.txt	26 Apr 2006 02:04:24 -0000	1.21
@@ -1,7 +1,35 @@
 Version TBA:
+- fixed a bunch of compiler warnings
+- change to warning sounds: changed current "warning" sound to the yellow alert sound, and
+  made the red_alert sound file the red alert sound.  Added additional measures to stop
+  playing the alert sound if you go down in alert status
+- change to plasma_other sounds: currently buggy due to no good way to determine which torp on
+  screen is most recent for sound purposes, however the basic stereo effect mostly works.
+- change to plasma_hit sounds: nothing special other than stereo effect
+- change to phaser sounds: observers now hear phasers!  Also fixed it so observers locked
+  onto a player hear self-phaser sounds rather than phaser_other sounds when that player
+  fire phasers
+- change to shields up/down: observers now hear shields up/down sounds for ship they are
+  locked onto.
+- change to cloak/uncloak sounds: under old sound (not using newSound), observers now hear
+  cloak/uncloak sounds for ship they are locked onto.  For newSound, you now hear
+  cloak/uncloak events for all ships on the tactical.
+- change to torp_other sounds: currently buggy due to no good way to determine which torp on
+  screen is most recent for sound purposes, however the basic stereo effect mostly works.
+- change to torp_explosion sounds: nothing special other than stereo effect.
+- change to explosion sounds:  changed it so observers who are locked onto a player who blows
+  up hear the self-explosion sound rather than the explosion_other sound.
+- added a minimum distance to have the angular/distance modulation of sound effects (so close
+  sounds will sound like they are right on top of you).
+- added sound reduction with distance and stereo effect based on angle, for sound events
+  that occur on the tactical (weapons, explosions, cloaking, etc).  Current list includes
+  cloak, uncloak, torp_other, torp_explosion, explosion_other, phaser_other, plasma_other,
+  plasma_hit
+- fire_plasma_other sound now works
 - added "newSound: (on)/off".  Allows one to choose not to use the new sound system.  Note
   that this option is not settable in game through options menu, only through the .netrekrc
   file.
+- added Mix_CloseAudio calls when exiting to clean up memory
 - initial SDL implementation
 - continuousMouse and continuousMouseFix now default to on
 - fixed the mono fed sb bitmaps so they rotate more cleanly



From modemhero at users.sourceforge.net  Tue Apr 25 21:04:26 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Wed, 26 Apr 2006 02:04:26 +0000
Subject: [netrek-cvs] client/netrekxp/src beeplite.c, 1.5, 1.6 cowmain.c, 1.9,
	1.10 data.c, 1.11, 1.12 dmessage.c, 1.4, 1.5 findslot.c, 1.4,
	1.5 getname.c, 1.3, 1.4 local.c, 1.8, 1.9 makefile, 1.6,
	1.7 newwin.c, 1.11, 1.12 playback.c, 1.10, 1.11 sound.c, 1.4,
	1.5 warning.c, 1.3, 1.4
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6804/src

Modified Files:
	beeplite.c cowmain.c data.c dmessage.c findslot.c getname.c 
	local.c makefile newwin.c playback.c sound.c warning.c 
Log Message:
This latest series of changes adds stereo quasi-3D sound effects for both players and observers, as well as adding much improved support for observer sounds (previously they were limited as to what sounds they would hear).

Index: findslot.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/findslot.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- findslot.c	24 Apr 2006 15:30:38 -0000	1.4
+++ findslot.c	26 Apr 2006 02:04:24 -0000	1.5
@@ -23,6 +23,8 @@
 #include "struct.h"
 #include "data.h"
 #include "proto.h"
+#include "SDL.h"
+#include "SDL_mixer.h"
 
 #define WAITMOTD
 
@@ -115,6 +117,8 @@
 #if defined(SOUND)
             if (!newSound)
                 Exit_Sound();
+            else
+                Mix_CloseAudio();
 #endif
 
             LineToConsole ("Shit!  Ghostbusted!\n");
@@ -162,6 +166,8 @@
 #if defined(SOUND)
             if (!newSound)
                 Exit_Sound();
+            else
+                Mix_CloseAudio();
 #endif
 
             LineToConsole ("Damn, We've been ghostbusted!\n");
@@ -222,6 +228,8 @@
 #if defined(SOUND)
                     if (!newSound)
                         Exit_Sound();
+                    else
+                        Mix_CloseAudio();
 #endif
 
                     LineToConsole ("OK, bye!\n");

Index: dmessage.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/dmessage.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dmessage.c	21 Apr 2006 12:00:06 -0000	1.4
+++ dmessage.c	26 Apr 2006 02:04:24 -0000	1.5
@@ -121,7 +121,7 @@
     register int len;
     W_Color color;
     char timebuf[10];
-    LONG curtime;
+    time_t curtime;
     struct tm *tm;
     int take, destroy, team, kill, killp, killa, bomb, conq;
     struct distress dist;

Index: sound.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/sound.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sound.c	24 Apr 2006 15:30:38 -0000	1.4
+++ sound.c	26 Apr 2006 02:04:24 -0000	1.5
@@ -53,6 +53,7 @@
     {"nt_shield_up", 3, 1},
     {"nt_torp_hit", 8, 1},
     {"nt_warning", 5, 1},
+    {"nt_red_alert", 5, 1},
     {"nt_engine", 0, 0},
     {"nt_enter_ship", 4, 1},
     {"nt_self_destruct", 6, 1},
@@ -97,8 +98,9 @@
   newsounds[EXPLOSION_WAV] = Mix_LoadWAV(DATAFILE("nt_explosion.wav"));
   newsounds[EXPLOSION_OTHER_WAV] = Mix_LoadWAV(DATAFILE("nt_explosion_other.wav"));
   newsounds[FIRE_PLASMA_WAV] = Mix_LoadWAV(DATAFILE("nt_fire_plasma.wav"));
+  newsounds[OTHER_FIRE_PLASMA_WAV] = Mix_LoadWAV(DATAFILE("nt_fire_plasma_other.wav"));
   newsounds[FIRE_TORP_WAV] = Mix_LoadWAV(DATAFILE("nt_fire_torp.wav"));
-  newsounds[FIRE_TORP_OTHER_WAV] = Mix_LoadWAV(DATAFILE("nt_fire_torp_other.wav"));
+  newsounds[OTHER_FIRE_TORP_WAV] = Mix_LoadWAV(DATAFILE("nt_fire_torp_other.wav"));
   newsounds[INTRO_WAV] = Mix_LoadWAV(DATAFILE("nt_intro.wav"));
   newsounds[MESSAGE_WAV] = Mix_LoadWAV(DATAFILE("nt_message.wav"));
   newsounds[PHASER_WAV] = Mix_LoadWAV(DATAFILE("nt_phaser.wav"));
@@ -207,14 +209,18 @@
 {
     if (newSound)
     {
+    	int channel;
+    	
         if (!sound_init)
 	    return;
 
         if ((type >= NUM_WAVES) || (type < 0))
             LineToConsole("Invalid sound type %d\n", type);
 
-        if (Mix_PlayChannel(-1, newsounds[type], 0) < 0)
+        if ((channel = Mix_PlayChannel(-1, newsounds[type], 0)) < 0)
             LineToConsole("Mix_PlayChannel: %s\n", Mix_GetError());
+            
+        Group_Sound(type, channel);
     }
     else
     {
@@ -238,6 +244,58 @@
             current_sound = NO_SOUND;
      }
 }
+extern void Play_Sound_Loc (int type, int angle, int distance)
+{
+    int channel;
+    
+    if (!sound_init)
+        return;
+
+    if ((type >= NUM_WAVES) || (type < 0))
+        LineToConsole("Invalid sound type %d\n", type);
+
+    if ((channel = Mix_PlayChannel(-1, newsounds[type], 0)) < 0)
+    {
+            LineToConsole("Mix_PlayChannel: %s\n", Mix_GetError());
+            return;
+    }
+    /* Make sure distance in boundary range that function accepts */
+    if (distance < 0)
+    	distance = 0;
+    if (distance > 255)
+    	distance = 255;
+    // Adjust volume with distance and angle
+    if (Mix_SetPosition(channel, angle, distance) == 0)
+        LineToConsole("Mix_SetPosition: %s\n", Mix_GetError());
+        
+    Group_Sound(type, channel);
+    return;
+}
+
+void Group_Sound (int type, int channel)
+{
+    // Add channel to group by type, useful for aborting specific sounds
+    // at a later time
+    // Current designations: 
+    // group 1 = cloaked_wav
+    // group 2 = warning_wav
+    // group 3 = red_alert_wav
+    switch(type)
+    {
+    	case CLOAKED_WAV:
+            if(!Mix_GroupChannel(channel,1))
+                LineToConsole("Mix_GroupChannel: %s\n", Mix_GetError());
+            break;
+        case WARNING_WAV:
+            if(!Mix_GroupChannel(channel,2))
+                LineToConsole("Mix_GroupChannel: %s\n", Mix_GetError());
+            break;
+        case RED_ALERT_WAV:
+            if(!Mix_GroupChannel(channel,3))
+                LineToConsole("Mix_GroupChannel: %s\n", Mix_GetError());
+            break;
+    }
+}
 
 extern void Abort_Sound (int type)
 {
@@ -315,6 +373,9 @@
         case WARNING_SOUND:
             sprintf (buf, "Warning sound is %s", flag);
             break;
+        case RED_ALERT_SOUND:
+            sprintf (buf, "Red alert sound is %s", flag);
+            break;
         case SHIELD_DOWN_SOUND:
             sprintf (buf, "Shield down  sound is %s", flag);
             break;

Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- newwin.c	24 Apr 2006 15:30:38 -0000	1.11
+++ newwin.c	26 Apr 2006 02:04:24 -0000	1.12
@@ -9,11 +9,11 @@
 /******************************************************************************/
 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
-
 #include 
 #include 
 
@@ -739,7 +739,7 @@
 /******************************************************************************/
 savebitmaps (void)
 {
-    int i, j, k;
+    int i, k;
     char *Planlib;
     char *MPlanlib;
 
@@ -1058,7 +1058,7 @@
         UpdatePlayerList ();    /* Otherwise */
 
 
-    autoQuit = (time_t) intDefault ("autoQuit", autoQuit);      /* allow extra */
+    autoQuit = intDefault ("autoQuit", autoQuit);      /* allow extra */
     /* quit time -RW */
 
     do
@@ -1089,7 +1089,7 @@
                 readFromServer (&rfds);
             }
             elapsed = time (0) - startTime;
-            if (elapsed > autoQuit)
+            if (elapsed > (time_t)(autoQuit))
             {
                 LineToConsole ("Auto-Quit.\n");
                 *team = 4;

Index: cowmain.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/cowmain.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- cowmain.c	24 Apr 2006 15:30:38 -0000	1.9
+++ cowmain.c	26 Apr 2006 02:04:24 -0000	1.10
@@ -29,6 +29,8 @@
 #include "parsemeta.h"
 #include "map.h"
 #include "proto.h"
+#include "SDL.h"
+#include "SDL_mixer.h"
 
 /******************************************************************************/
 /***  Local Globals                                                         ***/
@@ -583,7 +585,7 @@
     (void) SIGNAL (SIGFPE, handle_exception);
 #endif
 
-    SRANDOM (time (0));
+    SRANDOM ((unsigned int)time (0));
 
     initDefaults (deffile);
 
@@ -603,8 +605,8 @@
         if (!serverName)
             serverName = server;
     }
-
-    SRANDOM (getpid () * time ((LONG *) 0));
+    
+    SRANDOM (getpid () * (unsigned int)time (NULL));
 
     if (!passive)
     {
@@ -964,6 +966,8 @@
 #if defined(SOUND)
         if (!newSound)
             Exit_Sound();
+        else
+            Mix_CloseAudio();
 #endif
 
         sleep (1);

Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- local.c	24 Apr 2006 15:30:38 -0000	1.8
+++ local.c	26 Apr 2006 02:04:24 -0000	1.9
@@ -20,11 +20,12 @@
 #include "data.h"
 #include "local.h"
 #include "proto.h"
-
+#include "SDL.h"
+#include "SDL_mixer.h"
 #include "bitmaps.h"
 
 /* Local Variables */
-
+#define XPI     3.1415926
 static int clearcount = 0;
 static int clearzone[4][(MAXTORP + 1) * MAXPLAYER +
                         (MAXPLASMA + 1) * MAXPLAYER + MAXPLANETS];
@@ -43,9 +44,18 @@
 static int sound_other_torps = 0;
 static int num_other_torps = 0;
 static int sound_plasma = 0;
-static int sound_other_plasma = 0;
+static int sound_other_plasmas = 0;
+static int num_other_plasmas = 0;
 static int sound_other_explode = 0;
 static unsigned int sound_flags = 0;
+static int other_torp_dist = 0;
+static int new_other_torp_dist = 0;
+static int other_torp_angle = 0;
+static int old_t_fuse = 0;
+static int other_plasma_dist = 0;
+static int new_other_plasma_dist = 0;
+static int other_plasma_angle = 0;
+static int old_pt_fuse = 0;
 #endif
 
 /* Background Stars Definitions */
@@ -442,6 +452,7 @@
     const int view = SCALE * WINSIDE / 2 + BMP_SHIELD_WIDTH * SCALE / 2;
     int dx, dy, px, py, wx, wy, tx, ty, lx, ly;
     int new_dx, new_dy;
+    int newdx, newdy, distance, angle; /* For newSound */
 
     W_Icon (*ship_bits)[SHIP_VIEWS];
 
@@ -470,21 +481,47 @@
             if (!(j->p_flags & PFCLOAK))
                 continue;
         }
+        
+        dx = j->p_x - me->p_x;
+        dy = j->p_y - me->p_y;
+        if (dx > view || dx < -view || dy > view || dy < -view)
+            continue;
 
-        /* jmn - observer support.. tried to diplay tractors but no works */
-
+        dx = dx / SCALE + WINSIDE / 2;
+        dy = dy / SCALE + WINSIDE / 2;
+        
         if (j->p_flags & PFCLOAK)
         {
             if (j->p_cloakphase < (CLOAK_PHASES - 1))
             {
-
+            	
 #ifdef SOUND
-                if (myPlayer(j) && (j->p_cloakphase == 0))
+                if (j->p_cloakphase == 0)
                 {
                     if (newSound)
-                        Play_Sound(CLOAKED_WAV);
+                    {               
+                        newdx = dx - WINSIDE/2;
+                        newdy = dy - WINSIDE/2;
+                        
+                        distance = (int) sqrt((newdx)*(newdx) + (newdy)*(newdy));
+                        // Normalize from 0 to 255, 0 being on top of player, 255 being max distance
+                        // which would be a diagonal from player to corner of tactical
+                        // Reason for normalization is Mix_SetDistance requires that range        
+                        distance = (int)((255 * distance)/CORNER_DIST);
+                        // Calculate angle, then adjust as necessary for Mix_SetDistance
+                        angle = (int)(atan2(newdy, newdx)*180/XPI);
+                        angle = 270 - angle;
+                        // At short distances, don't use angular sound
+                        if (distance < 10)
+                            Play_Sound(CLOAKED_WAV);
+                        else
+                            Play_Sound_Loc(CLOAKED_WAV, angle, distance);
+                    }
                     else
-                        Play_Sound(CLOAK_SOUND);
+                    {
+                        if (myPlayer(j) || isObsLockPlayer(j))
+                            Play_Sound(CLOAK_SOUND);
+                    }
                 }
 #endif
 
@@ -497,32 +534,47 @@
             {
             	
 #ifdef SOUND
-                if (myPlayer(j))
+                if (newSound)
+                {
                     if (j->p_cloakphase == CLOAK_PHASES - 1)
                     {
-                        if (newSound)
+                        newdx = dx - WINSIDE/2;
+                        newdy = dy - WINSIDE/2;
+                        
+                        distance = (int) sqrt((newdx)*(newdx) + (newdy)*(newdy));
+                        // Normalize from 0 to 255, 0 being on top of player, 255 being max distance
+                        // which would be a diagonal from player to corner of tactical
+                        // Reason for normalization is Mix_SetDistance requires that range        
+                        distance = (int)((255 * distance)/CORNER_DIST);
+                        // Calculate angle, then adjust as necessary for Mix_SetDistance
+                        angle = (int)(atan2(newdy, newdx)*180/XPI);
+                        angle = 270 - angle;
+                        // At short distances, don't use angular sound
+                        if (distance < 10)
                             Play_Sound(UNCLOAK_WAV);
                         else
-                            Play_Sound(UNCLOAK_SOUND);
+                            Play_Sound_Loc(UNCLOAK_WAV, angle, distance);
                     }
-                    else
+                    else    // Kill any channels with CLOAKED_WAV on them (group 1)
+			Mix_HaltGroup(1);
+
+                }
+                else
+                {
+                    if (myPlayer(j) || isObsLockPlayer(j))
                     {
-                        if (!newSound)
-                             Abort_Sound(CLOAK_SOUND);
-                    } 	
+                        if (j->p_cloakphase == CLOAK_PHASES - 1)
+                            Play_Sound(UNCLOAK_SOUND);
+                        else
+                            Abort_Sound(CLOAK_SOUND);
+                    }
+                }
+                    
 #endif
             	
                 j->p_cloakphase--;
             }
         }
-        dx = j->p_x - me->p_x;
-        dy = j->p_y - me->p_y;
-        if (dx > view || dx < -view || dy > view || dy < -view)
-            continue;
-
-        dx = dx / SCALE + WINSIDE / 2;
-        dy = dy / SCALE + WINSIDE / 2;
-
 
         if (j->p_flags & PFCLOAK && (j->p_cloakphase == (CLOAK_PHASES - 1)))
         {
@@ -714,7 +766,7 @@
 #endif
 
 #ifdef SOUND
-            if (j->p_no == me->p_no)
+            if (myPlayer(j) || isObsLockPlayer(j))
             {
                 if ((sound_flags & PFSHIELD) && !(j->p_flags & PFSHIELD))
                 {
@@ -881,9 +933,34 @@
             if (i == 1)
             {
                 if (newSound)
-                    Play_Sound(j == me ? EXPLOSION_WAV : EXPLOSION_OTHER_WAV);
+                {
+                    if (myPlayer(j) || isObsLockPlayer(j))
+                        Play_Sound(EXPLOSION_WAV);
+                    else
+                    {
+                        int newdx, newdy, distance, angle;
+                    
+                        newdx = dx - WINSIDE/2;
+                        newdy = dy - WINSIDE/2;
+                        
+                        distance = (int) sqrt((newdx)*(newdx) + (newdy)*(newdy));
+                        // Normalize from 0 to 255, 0 being on top of player, 255 being max distance
+                        // which would be a diagonal from player to corner of tactical
+                        // Reason for normalization is Mix_SetDistance requires that range        
+                        distance = (int)((255 * distance)/CORNER_DIST);
+                        // Calculate angle, then adjust as necessary for Mix_SetDistance
+                        angle = (int)(atan2(newdy, newdx)*180/XPI);
+                        angle = 270 - angle;
+                        // At short distances, don't use angular sound
+                        if (distance < 10)
+                            Play_Sound(EXPLOSION_OTHER_WAV);
+                        else
+                            Play_Sound_Loc(EXPLOSION_OTHER_WAV, angle, distance);
+                    }
+                }
                 else
-                    Play_Sound(j == me ? EXPLOSION_SOUND : OTHER_EXPLOSION_SOUND);
+                    Play_Sound((myPlayer(j) || isObsLockPlayer(j)) 
+                               ? EXPLOSION_SOUND : OTHER_EXPLOSION_SOUND);
             }
 #endif
 
@@ -930,11 +1007,37 @@
         	
 #ifdef SOUND
             if (!sound_phaser)
-            {
+            {           
                 if (newSound)
-                    Play_Sound(j == me ? PHASER_WAV : PHASER_OTHER_WAV);
+                {
+                    if (myPlayer(j) || isObsLockPlayer(j))
+                        Play_Sound(PHASER_WAV);
+                    else
+                    {
+                        int newdx, newdy, distance, angle;
+                    
+                        newdx = dx - WINSIDE/2;
+                        newdy = dy - WINSIDE/2;
+                        
+                        distance = (int) sqrt((newdx)*(newdx) + (newdy)*(newdy));
+                        // Normalize from 0 to 255, 0 being on top of player, 255 being max distance
+                        // which would be a diagonal from player to corner of tactical
+                        // Reason for normalization is Mix_SetDistance requires that range        
+                        distance = (int)((255 * distance)/CORNER_DIST);
+                        // Calculate angle, then adjust as necessary for Mix_SetDistance
+                        angle = (int)(atan2(newdy, newdx)*180/XPI);
+                        angle = 270 - angle;
+                        // At short distances, don't use angular sound
+                        if (distance < 10)
+                            Play_Sound(PHASER_OTHER_WAV);
+                        else
+                            Play_Sound_Loc(PHASER_OTHER_WAV, angle, distance);
+                    }
+                }
                 else
-                    Play_Sound(j == me ? PHASER_SOUND : OTHER_PHASER_SOUND);
+                    Play_Sound((myPlayer(j) || isObsLockPlayer(j))
+                               ? PHASER_SOUND : OTHER_PHASER_SOUND);
+                
                 sound_phaser++;
             }
 #endif
@@ -1116,11 +1219,9 @@
 #ifdef SHORT_PACKETS
                         if (php->ph_status != PHMISS)   /* KOC 10/20/95  */
                         {       /* hack for SP_2 */
-#define XPI     3.1415926
                             dir = (unsigned char) 
                                   nint (atan2((double) (ty - py),
                                        (double) (tx - px)) / XPI * 128.0);
-#undef XPI
                         }
                         else
 #endif
@@ -1170,7 +1271,7 @@
         }
 
 #ifdef SOUND
-        else if (j->p_no == me->p_no)
+        else if (myPlayer(j) || isObsLockPlayer(j))
             sound_phaser = 0;
 #endif
 
@@ -1215,7 +1316,6 @@
                         continue;       /* this had better be last
                                          * in for(..) */
 
-#define XPI     3.1415926
                     theta = atan2 ((double) (px - dx),
                                    (double) (dy - py)) + XPI / 2.0;
                     dir = (unsigned char) nint (theta / XPI * 128.0);
@@ -1229,7 +1329,6 @@
                     ly[0] = (int) (py + (Sin[dir] * (target_width / 2)));
                     lx[1] = (int) (px - (Cos[dir] * (target_width / 2)));
                     ly[1] = (int) (py - (Sin[dir] * (target_width / 2)));
-#undef XPI
                     if (j->p_flags & PFPRESS)
                     {
                         W_MakeTractLine (w, dx, dy, lx[0], ly[0], W_Yellow);
@@ -1354,9 +1453,50 @@
                 continue;
             }
 
+#ifdef SOUND
+            if (j != me && newSound)
+            {
+            	int new_t_fuse;
+            	int new_angle;
+		int newdy, newdx;
+		
+		newdy = dy / SCALE;
+		newdx = dx / SCALE;
+                // Store location of torp.
+                new_other_torp_dist = (int) sqrt((newdx)*(newdx) + (newdy)*(newdy));
+                // Normalize from 0 to 255, 0 being on top of player, 255 being max distance
+                // which would be a diagonal from player to corner of tactical
+                // Reason for normalization is Mix_SetDistance requires that range        
+                new_other_torp_dist = (int)((255 * new_other_torp_dist)/CORNER_DIST);
+                // Find how long till torp expires...BROKEN!
+                new_t_fuse = k->t_updateFuse;
+                // Calculate angle, then adjust as necessary for Mix_SetDistance
+                new_angle = (int)(atan2(newdy, newdx)*180/XPI);
+                new_angle = 270 - new_angle;
+                // Find torp that has been around the least time, that is the one to play
+                // the sound from.  In case of tie, choose closest one.
+                if (new_t_fuse > old_t_fuse)
+                {
+                    other_torp_dist = new_other_torp_dist;
+                    old_t_fuse = new_t_fuse;
+                    other_torp_angle = new_angle;
+                }
+                else if (new_t_fuse == old_t_fuse)
+                {
+                    if (new_other_torp_dist < other_torp_dist)
+                    {
+                        other_torp_dist = new_other_torp_dist;
+                        old_t_fuse = new_t_fuse;
+                        other_torp_angle = new_angle;
+                    }
+                }
+                	
+            }
+#endif         
             dx = dx / SCALE + WINSIDE / 2;
             dy = dy / SCALE + WINSIDE / 2;
 
+  
             if (k->t_status == TEXPLODE)
             {
 
@@ -1376,7 +1516,26 @@
                 if (k->t_fuse == BMP_TORPDET_FRAMES - 1)
                 {
                     if (newSound)
-                        Play_Sound(TORP_HIT_WAV);
+                    {
+                        int newdx, newdy, distance, angle;
+                    
+                        newdx = dx - WINSIDE/2;
+                        newdy = dy - WINSIDE/2;
+                        
+                        distance = (int) sqrt((newdx)*(newdx) + (newdy)*(newdy));
+                        // Normalize from 0 to 255, 0 being on top of player, 255 being max distance
+                        // which would be a diagonal from player to corner of tactical
+                        // Reason for normalization is Mix_SetDistance requires that range        
+                        distance = (int)((255 * distance)/CORNER_DIST);
+                        // Calculate angle, then adjust as necessary for Mix_SetDistance
+                        angle = (int)(atan2(newdy, newdx)*180/XPI);
+                        angle = 270 - angle;
+                        // At short distances, don't use angular sound
+                        if (distance < 10)
+                            Play_Sound(TORP_HIT_WAV);
+                        else
+                            Play_Sound_Loc(TORP_HIT_WAV, angle, distance);
+                    }
                     else
                         Play_Sound(TORP_HIT_SOUND);
                 }
@@ -1509,7 +1668,10 @@
     {
         if (!pt->pt_status)
             continue;
-
+#ifdef SOUND
+        if (pt->pt_owner != me->p_no)
+            num_other_plasmas++;
+#endif
         if ((pt->pt_updateFuse -= weaponUpdate) == 0)
         {
             if (pt->pt_status != PTEXPLODE)
@@ -1537,6 +1699,47 @@
         if (dx > view || dx < -view || dy > view || dy < -view)
             continue;
 
+
+#ifdef SOUND
+        if (pt->pt_owner != me->p_no && newSound)
+        {
+            int new_pt_fuse;
+            int new_angle;
+	    int newdy, newdx;
+		
+	    newdy = dy / SCALE;
+	    newdx = dx / SCALE;
+            // Store location of plasma.
+            new_other_plasma_dist = (int) sqrt((newdx)*(newdx) + (newdy)*(newdy));
+            // Normalize from 0 to 255, 0 being on top of player, 255 being max distance
+            // which would be a diagonal from player to corner of tactical
+            // Reason for normalization is Mix_SetDistance requires that range        
+            new_other_plasma_dist = (int)((255 * new_other_plasma_dist)/CORNER_DIST);
+            // Find how long till torp expires...BROKEN!
+            new_pt_fuse = pt->pt_updateFuse;
+            // Calculate angle, then adjust as necessary for Mix_SetDistance
+            new_angle = (int)(atan2(newdy, newdx)*180/XPI);
+            new_angle = 270 - new_angle;
+            // Find plasma that has been around the least time, that is the one to play
+            // the sound from.  In case of tie, choose closest one.
+            if (new_pt_fuse > old_pt_fuse)
+            {
+                other_plasma_dist = new_other_plasma_dist;
+                old_pt_fuse = new_pt_fuse;
+                other_plasma_angle = new_angle;
+            }
+            else if (new_pt_fuse == old_pt_fuse)
+            {
+                if (new_other_torp_dist < other_torp_dist)
+                {
+                    other_plasma_dist = new_other_plasma_dist;
+                    old_pt_fuse = new_pt_fuse;
+                    other_plasma_angle = new_angle;
+                 }
+             }     	
+        }
+#endif   
+
         dx = dx / SCALE + WINSIDE / 2;
         dy = dy / SCALE + WINSIDE / 2;
 
@@ -1559,7 +1762,26 @@
             if (pt->pt_fuse == BMP_TORPDET_FRAMES - 1)
             {
                 if (newSound)
-                    Play_Sound(PLASMA_HIT_WAV);
+                {
+                    int newdx, newdy, distance, angle;
+                    
+                    newdx = dx - WINSIDE/2;
+                    newdy = dy - WINSIDE/2;
+                        
+                    distance = (int) sqrt((newdx)*(newdx) + (newdy)*(newdy));
+                    // Normalize from 0 to 255, 0 being on top of player, 255 being max distance
+                    // which would be a diagonal from player to corner of tactical
+                    // Reason for normalization is Mix_SetDistance requires that range        
+                    distance = (int)((255 * distance)/CORNER_DIST);
+                    // Calculate angle, then adjust as necessary for Mix_SetDistance
+                    angle = (int)(atan2(newdy, newdx)*180/XPI);
+                    angle = 270 - angle;
+                    // At short distances, don't use angular sound
+                    if (distance < 10)
+                        Play_Sound(PLASMA_HIT_WAV);
+                    else
+                        Play_Sound_Loc(PLASMA_HIT_WAV, angle, distance);
+                }
                 else
                     Play_Sound(PLASMA_HIT_SOUND);
             }
@@ -1865,8 +2087,18 @@
             W_ChangeBorder (baseWin, gColor);
 
 #if defined(SOUND)
-            if (!newSound)
+            if (newSound)
+            {   // Kill any channels with WARNING_WAV on them (group 2)
+                // or RED_ALERT_WAV (group 3)
+		Mix_HaltGroup(2);
+		Mix_HaltGroup(3);
+	    }
+            else
+            {
                 Abort_Sound(WARNING_SOUND);
+                Abort_Sound(RED_ALERT_SOUND);
+            }
+                
 #endif
 
             break;
@@ -1881,8 +2113,18 @@
             W_ChangeBorder (baseWin, yColor);
 
 #if defined(SOUND)
-            if (!newSound)
-                Abort_Sound(WARNING_SOUND);
+
+            if (newSound) // Kill any channels with RED_ALERT_WAV on them (group 3)
+            {
+            	Mix_HaltGroup(3);
+                Play_Sound(WARNING_WAV);
+            }
+            else
+            {
+            	Abort_Sound(RED_ALERT_SOUND);
+                Play_Sound(WARNING_SOUND);
+            }
+
 #endif
 
             break;
@@ -1896,26 +2138,47 @@
             }
             W_ChangeBorder (baseWin, rColor);
             
-#ifdef SOUND
+#if defined(SOUND)
             if (newSound)
-                Play_Sound(WARNING_WAV);
+                Play_Sound(RED_ALERT_WAV);
             else
-                Play_Sound(WARNING_SOUND);
+                Play_Sound(RED_ALERT_SOUND);
 #endif
 
             break;
         }
     }
 
-#ifdef SOUND
+#if defined(SOUND)
     if (newSound)
     {
         if (sound_torps < me->p_ntorp)
             Play_Sound(FIRE_TORP_WAV);
         if (sound_other_torps < num_other_torps)
-            Play_Sound(FIRE_TORP_OTHER_WAV);
+        {
+            if (other_torp_dist < 10)
+                Play_Sound(OTHER_FIRE_TORP_WAV);
+            else
+                Play_Sound_Loc(OTHER_FIRE_TORP_WAV, other_torp_angle, other_torp_dist);
+        }
         if (sound_plasma < me->p_nplasmatorp)
             Play_Sound(FIRE_PLASMA_WAV);
+        if (sound_other_plasmas < num_other_plasmas)
+        {
+            if (other_plasma_dist < 10)
+                Play_Sound(OTHER_FIRE_PLASMA_WAV);
+            else
+                Play_Sound_Loc(OTHER_FIRE_PLASMA_WAV, other_plasma_angle, other_plasma_dist);
+        }
+        // Reset locations and fuses of other's closest torps and plasmas
+        other_torp_dist = CORNER_DIST;
+        new_other_torp_dist = 0;
+        old_t_fuse = 0;
+        other_torp_angle = 0;
+        other_plasma_dist = CORNER_DIST;
+        new_other_plasma_dist = 0;
+        old_pt_fuse = 0;
+        other_plasma_angle = 0;
     }
     else
     {
@@ -1925,6 +2188,8 @@
             Play_Sound(OTHER_FIRE_TORP_SOUND);
         if (sound_plasma < me->p_nplasmatorp)
             Play_Sound(FIRE_PLASMA_SOUND);
+        if (sound_other_plasmas < num_other_plasmas)
+            Play_Sound(OTHER_FIRE_PLASMA_SOUND);
     }
 
     sound_flags = me->p_flags;
@@ -1932,6 +2197,8 @@
     sound_other_torps = num_other_torps;
     num_other_torps = 0;
     sound_plasma = me->p_nplasmatorp;
+    sound_other_plasmas = num_other_plasmas;
+    num_other_plasmas = 0;
 #endif
 
     /* show 'lock' icon on local map (Actually an EM hack ) */

Index: makefile
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- makefile	24 Apr 2006 14:13:25 -0000	1.6
+++ makefile	26 Apr 2006 02:04:24 -0000	1.7
@@ -65,19 +65,19 @@
 #        wsock32.lib kernel32.lib shell32.lib winmm.lib mpr.lib
 
 # Borland Libs
-LIBOPTS = /LC:\Borland\bcc55\lib;c:\Borland\bcc55\lib\psdk /Tpe
+LIBOPTS = /LC:\Borland\bcc55\lib;c:\Borland\bcc55\lib\psdk;..\Win32\lib\BCC /Tpe
 
 !IFDEF RSA
-GMPLIB = ..\Win32\lib\libgmpbcc.lib 
-#..\Win32\lib\libmpbcc.lib
+GMPLIB = ..\Win32\lib\BCC\libgmpbcc.lib 
+#..\Win32\lib\BCC\libmpbcc.lib
 !ENDIF
 
-LIBS = SDL.LIB SDL_mixer.LIB SDL_main.LIB CW32mt.LIB IMPORT32.LIB user32.lib gdi32.lib wsock32.lib kernel32.lib shell32.lib winmm.lib mpr.lib $(GMPLIB)
+LIBS = SDL.LIB SDL_mixer.LIB SDLmain.LIB CW32mt.LIB IMPORT32.LIB user32.lib gdi32.lib wsock32.lib kernel32.lib shell32.lib winmm.lib mpr.lib $(GMPLIB)
 
 # ---------------------------------------------------------------------------
 # - Start of makefile proper
 
-INCS = -I..\win32 -I..\win32\h -I..\win32\h\gmp -I..\include
+INCS = -I..\win32 -I..\win32\h -I..\win32\SDL -I..\win32\h\gmp -I..\include
 ARCH = Intel/Win32
 
 !IFDEF RSA

Index: getname.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/getname.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- getname.c	21 Apr 2006 12:00:07 -0000	1.3
+++ getname.c	26 Apr 2006 02:04:24 -0000	1.4
@@ -403,7 +403,7 @@
     W_Event event;
     unsigned char ch;
     char tempstr[40];
-    long lasttime;
+    time_t lasttime;
     int j;
     struct timeval tv;
     fd_set mask;

Index: playback.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/playback.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- playback.c	24 Apr 2006 15:30:38 -0000	1.10
+++ playback.c	26 Apr 2006 02:04:24 -0000	1.11
@@ -32,6 +32,8 @@
 #include "defs.h"
 #include "playerlist.h"
 #include "proto.h"
+#include "SDL.h"
+#include "SDL_mixer.h"
 
 #ifdef RECORDGAME
 
@@ -69,11 +71,11 @@
         outmessage[i] = '\0';
     }
 
-    SRANDOM (time (0));
+    SRANDOM ((unsigned int)time (0));
 
     initDefaults (deffile);
-
-    SRANDOM (getpid () * time ((LONG *) 0));
+    
+    SRANDOM (getpid () * (unsigned int)time (NULL));
 
     fed_ship_bmp = "bitmaps/shiplib/fedship.bmp";
     if ((stringDefault ("fedshipbmpfile")) != NULL)

Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- data.c	24 Apr 2006 15:30:38 -0000	1.11
+++ data.c	26 Apr 2006 02:04:24 -0000	1.12
@@ -81,7 +81,7 @@
 int delay = 0;                  /* delay for decaring war */
 int rdelay = 0;                 /* delay for refitting */
 int showPlanetNames = 1;
-time_t autoQuit = 60;
+int autoQuit = 60;
 int showStats = 0;
 int showHints = 1;
 int warnShields = 0;

Index: beeplite.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/beeplite.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- beeplite.c	24 Apr 2006 15:30:38 -0000	1.5
+++ beeplite.c	26 Apr 2006 02:04:24 -0000	1.6
@@ -20,8 +20,10 @@
 #include "data.h"
 #include "map.h"
 #include "proto.h"
+#include "SDL.h"
+#include "SDL_mixer.h"
 
-rcdlite(struct distress *dist)
+void rcdlite(struct distress *dist)
 /* the info */
 {
     char    message[100];
@@ -43,7 +45,7 @@
 }
 
 
-litedefaults(void)
+void litedefaults(void)
 {
     if (distlite[take] == NULL)
       distlite[take] = "/c/l";
@@ -55,7 +57,7 @@
       distlite[generic] = "%?%S=SB%{/c%}";
 }
 
-liteplanet(struct planet *l)
+void liteplanet(struct planet *l)
 {
     emph_planet_seq_n[l->pl_no] = beep_lite_cycle_time_planet;
     l->pl_flags |= PLREDRAW;			 /* Leave redraw on until * * 
@@ -64,7 +66,7 @@
 						  * done highlighting */
 }
 
-liteplayer(struct player *j)
+void liteplayer(struct player *j)
 {
     if (!j || (j->p_flags & PFCLOAK))
       return;

Index: warning.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/warning.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- warning.c	15 Apr 2006 09:58:25 -0000	1.3
+++ warning.c	26 Apr 2006 02:04:24 -0000	1.4
@@ -27,7 +27,7 @@
 warning (char *text)
 {
     int doPhaser;
-    LONG curtime;
+    time_t curtime;
     struct tm *tm;
     char newtext[128];
     char newtext2[128];



From quozl at users.sourceforge.net  Wed Apr 26 04:52:45 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Wed, 26 Apr 2006 09:52:45 +0000
Subject: [netrek-cvs] server/Vanilla/ntserv data.c, 1.5, 1.6 daemonII.c, 1.11,
	1.12 commands.c, 1.4, 1.5 enter.c, 1.3, 1.4 gencmds.c, 1.2,
	1.3 ntscmds.c, 1.8, 1.9 slotmaint.c, 1.2, 1.3 sysdefaults.c,
	1.1, 1.2 main.c, 1.7, 1.8
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/ntserv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3547/ntserv

Modified Files:
	data.c daemonII.c commands.c enter.c gencmds.c ntscmds.c 
	slotmaint.c sysdefaults.c main.c 
Log Message:
voting site policy

Index: sysdefaults.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/sysdefaults.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sysdefaults.c	21 Mar 2005 05:23:44 -0000	1.1
+++ sysdefaults.c	26 Apr 2006 09:52:43 -0000	1.2
@@ -2,12 +2,8 @@
  */
 
 #include 
-#include 
-#include 
-#include 
 #include 
 #include "defs.h"
-#include INC_STRINGS
 #include "struct.h"
 #include "data.h"
 #include "copyright2.h"

Index: ntscmds.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/ntscmds.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ntscmds.c	24 Apr 2006 12:35:17 -0000	1.8
+++ ntscmds.c	26 Apr 2006 09:52:43 -0000	1.9
@@ -26,13 +26,8 @@
 
 #define C_PR_INPICKUP    C_PR_1
 
-#if defined (ALLOW_EJECT)
 void do_player_eject(int who, int player, int mflags, int sendto);
-#endif
-
-#if defined (ALLOW_BAN)
 void do_player_ban(int who, int player, int mflags, int sendto);
-#endif
 
 #if defined (AUTO_INL)
 void do_start_inl(void);
@@ -72,12 +67,8 @@
 #ifdef GENO_COUNT
 void do_genos_query(char *comm, struct message *mess, int who);
 #endif
-#if defined (ALLOW_EJECT)
 void eject_player(int who);
-#endif
-#if defined (ALLOW_BAN)
 void ban_player(int who);
-#endif
 void do_client_query(char *comm, struct message *mess, int who);
 void do_ping_query(char *comm, struct message *mess, int who);
 void do_stats_query(char *comm, struct message *mess, int who);
@@ -183,26 +174,18 @@
 		"Show player's genocides      e.g. 'GENOS 0'",
 		do_genos_query },                       /* GENOS */
 #endif
-#ifdef VOTING
-
     { "The following votes can be used:  (M=Majority, T=Team vote)",
       C_DESC  | C_PR_INPICKUP},
-    { "Ejection Votes are recorded for the god to review.",
-      C_DESC  | C_PR_INPICKUP},
-#if defined(ALLOW_EJECT)
     { "EJECT",
 	C_VC_TEAM | C_GLOG | C_PLAYER | C_PR_INPICKUP,
 	"Eject a player               e.g. 'EJECT 0 IDLE'", 
 	do_player_eject,				/* EJECT */
 	2, PV_EJECT, 120, 600},
-#endif
-#if defined(ALLOW_BAN)
     { "BAN",
 	C_VC_TEAM | C_GLOG | C_PLAYER | C_PR_INPICKUP,
 	"Eject and ban a player       e.g. 'BAN 0'", 
 	do_player_ban,					/* BAN */
 	2, PV_BAN, 120, 600},
-#endif
 #if defined(TRIPLE_PLANET_MAYHEM)
     { "TRIPLE",
         C_VC_ALL | C_GLOG | C_PR_INPICKUP,
@@ -243,7 +226,6 @@
 	do_start_mars,
 	1, PV_OTHER+5, 0 },
 #endif
-#endif /* VOTING */
 
     /* crosscheck, last voting array element used (PV_OTHER+n) must
        not exceed PV_TOTAL, see include/defs.h */
@@ -257,7 +239,6 @@
 			 (status->gameup & GU_INROBOT) ? 0 : C_PR_INPICKUP);
 }
 
-#if defined (ALLOW_EJECT)
 void do_player_eject(int who, int player, int mflags, int sendto)
 {
     register struct player *j;
@@ -265,17 +246,18 @@
 
     j = &players[player];
 
-    if (j->p_status == PFREE) {
+    if (!eject_vote_enable) {
+      reason = "Eject voting disabled in server configuration.";
+    } else if (j->p_status == PFREE) {
       reason = "You may not eject a free slot.";
     } else if (j->p_flags & PFROBOT) {
       reason = "You may not eject a robot.";
     } else if (j->p_team != players[who].p_team) {
       reason = "You may not eject players of the other team.";
-#ifdef EJECT_ONLY_IF_QUEUE
-    } else if ((queues[QU_PICKUP].q_flags & QU_OPEN) &&
-	      (queues[QU_PICKUP].count == 0)){
+    } else if (eject_vote_only_if_queue && 
+	       (queues[QU_PICKUP].q_flags & QU_OPEN) &&
+	       (queues[QU_PICKUP].count == 0)){
       reason = "You may not eject if there is no queue.";
-#endif
     }
 
     if (reason != NULL) {
@@ -299,12 +281,12 @@
   j->p_ship.s_type = STARBASE;
   j->p_whydead=KQUIT;
   j->p_explode=10;
-  /* note VICIOUS_EJECT prevents animation of ship explosion */
+  /* note vicious eject prevents animation of ship explosion */
   j->p_status=PEXPLODE;
   j->p_whodead=me->p_no;
   bay_release(j);
 
-#if defined(VICIOUS_EJECT)
+  if (eject_vote_vicious) {
                                       /* Eject AND free the slot. I am sick
                                          of the idiots who login and just
                                          make the game less playable. And
@@ -316,12 +298,9 @@
     } else {
       freeslot(j);
     }
-#endif
-
+  }
 }
-#endif /* ALLOW_EJECT */
 
-#if defined (ALLOW_BAN)
 void do_player_ban(int who, int player, int mflags, int sendto)
 {
     struct player *j;
@@ -329,7 +308,9 @@
 
     j = &players[player];
 
-    if (j->p_status == PFREE) {
+    if (!ban_vote_enable) {
+      reason = "Ban voting disabled in server configuration.";
+    } else if (j->p_status == PFREE) {
       reason = "You may not ban a free slot.";
     } else if (j->p_flags & PFROBOT) {
       reason = "You may not ban a robot.";
@@ -359,7 +340,7 @@
     struct ban *b = &bans[i];
     if (b->b_expire == 0) {
       strcpy(b->b_ip, j->p_ip);
-      b->b_expire = 100;
+      b->b_expire = ban_vote_length;
       ERROR(2,( "ban of %s was voted\n", b->b_ip));
       return;
     }
@@ -367,7 +348,6 @@
   pmessage(0, MALL, addr_mess(who,MALL), 
 	   " temporary ban list is full, ban ineffective");
 }
-#endif /* ALLOW_BAN */
 
 #if defined(AUTO_PRACTICE)
 void do_start_basep(void)

Index: slotmaint.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/slotmaint.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- slotmaint.c	21 Mar 2005 10:17:17 -0000	1.2
+++ slotmaint.c	26 Apr 2006 09:52:43 -0000	1.3
@@ -40,11 +40,7 @@
     who->p_stats.st_tticks=1;
 */
     queues[who->w_queue].free_slots++;
-
-#ifdef VOTING
     MZERO(who->voting, sizeof(time_t) * PV_TOTAL);
-#endif
-
     who->p_process     = 0;
     
     return retvalue;
@@ -105,13 +101,8 @@
 	    }
 	    players[i].p_stats.st_keymap[95]=0;
 	    players[i].p_stats.st_flags=ST_INITIAL;
-
 	    players[i].p_process     = 0;
-
-#ifdef VOTING
 	    MZERO(players[i].voting, sizeof(time_t) * PV_TOTAL);
-#endif
-
 #ifdef OBSERVERS
 	    if (queues[w_queue].q_flags & QU_OBSERVER) Observer++;
 #endif

Index: enter.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/enter.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- enter.c	10 Apr 2006 10:56:32 -0000	1.3
+++ enter.c	26 Apr 2006 09:52:43 -0000	1.4
@@ -190,13 +190,11 @@
       me->p_war = me->p_hostile;
     }
 
-#ifdef VOTING
     /* reset eject voting to avoid inheriting this slot's last occupant's */
     /* escaped fate just in case the last vote comes through after the    */
     /* old guy quit and the new guy joined  -Villalpando req. by Cameron  */
     for (i = 0, j = &players[i]; i < MAXPLAYER; i++, j++) 
       j->voting[me->p_no] = -1;
-#endif
 
     /* join message stuff */
     sprintf(me->p_mapchars,"%c%c",teamlet[me->p_team], shipnos[me->p_no]);

Index: daemonII.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/daemonII.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- daemonII.c	24 Apr 2006 10:12:17 -0000	1.11
+++ daemonII.c	26 Apr 2006 09:52:43 -0000	1.12
@@ -188,9 +188,7 @@
 #endif
         players[i].p_no=i;
 	players[i].p_timerdelay = defskip;
-#ifdef VOTING
         MZERO(players[i].voting, sizeof(time_t) * PV_TOTAL);
-#endif
     }
 
 #ifdef NEUTRAL

Index: data.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/data.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- data.c	24 Apr 2006 12:35:17 -0000	1.5
+++ data.c	26 Apr 2006 09:52:43 -0000	1.6
@@ -407,3 +407,11 @@
 int whitelisted = 0;
 int blacklisted = 0;
 int ignored[MAXPLAYER];
+
+int voting=0;
+int ban_vote_enable=0;
+int ban_vote_length=10;
+int ban_vote_offset=0;
+int eject_vote_enable=0;
+int eject_vote_only_if_queue=0;
+int eject_vote_vicious=0;

Index: commands.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/commands.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- commands.c	23 Apr 2006 10:39:10 -0000	1.4
+++ commands.c	26 Apr 2006 09:52:43 -0000	1.5
@@ -50,13 +50,10 @@
 int do_help();
 char *check_possible(char *line, char *command);
 int getplayer(int from, char *line);
-
-#ifdef VOTING
 int do_generic_vote(char *comm, int who);
 int do_start_robot();
-#endif
 
-#if defined (ALLOW_EJECT) && !defined(INL)
+#if !defined(INL)
 int do_player_eject();
 #endif
 
@@ -378,8 +375,6 @@
 
 
 
-#ifdef VOTING
-
 /*********** VOTING LIST ***********
       Note: The vote list *must* must be in upper case.
 
@@ -399,7 +394,7 @@
 
 struct vote_handler votes[] = {
     { NULL, 0, 0, 0, NULL, 0, NULL},         			/* record 0 */
-#if defined(ALLOW_EJECT) && !defined(INL)
+#if !defined(INL)
     { "EJECT",  
 	VC_TEAM | VC_GLOG | VC_PLAYER,
 	2,
@@ -492,8 +487,6 @@
 
 #define NUM_VOTES (sizeof(votes) / sizeof(votes[0]) )
 
-#endif /* VOTING */
-
 
 /*	Using just strstr is not enough to ensure uniqueness. There are 
 	commands such as STATS and SBSTATS that could be matched in two
@@ -564,9 +557,8 @@
         }
     }
     i = 0;
-#ifdef VOTING
-    i = do_generic_vote(upper,mess->m_from);	/* maybe it's a vote? */
-#endif
+    if (voting)
+      i = do_generic_vote(upper,mess->m_from);	/* maybe it's a vote? */
     free (upper);
     return (i);
 }
@@ -1003,7 +995,7 @@
 #endif /* TRIPLE_PLANET_MAYHEM */
 
 
-#if defined (ALLOW_EJECT)
+#if !defined(INL)
 int do_player_eject(int who, int player, int mflags, int sendto)
 {
     register struct player *j;
@@ -1052,9 +1044,7 @@
   j->p_status=PEXPLODE;
   j->p_whodead=me->p_no;
 }
-#endif /* ALLOW_EJECT */
-
-#ifdef VOTING
+#endif
 
 check_listing(comm)
 char *comm;
@@ -1206,7 +1196,6 @@
     }
     return 1;
 }
-#endif /* VOTING */
 
 #if defined(AUTO_PRACTICE) && !defined(BASEP)
 int do_start_basep(who, mflags, sendto)
@@ -1332,8 +1321,7 @@
 	}
     }
     
-#ifdef VOTING
-    if (NUM_VOTES > 1) {
+    if (voting && (NUM_VOTES > 1)) {
 	char ch;
         pmessage(who,MINDIV,addr,
 		"The following votes can be used:  (M=Majority, T=Team vote)");
@@ -1347,7 +1335,6 @@
 		votes[i].type, ch, votes[i].desc);
 	}
     }
-#endif
 }
 
 #ifndef INL

Index: main.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/main.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- main.c	24 Apr 2006 12:35:17 -0000	1.7
+++ main.c	26 Apr 2006 09:52:43 -0000	1.8
@@ -832,7 +832,7 @@
     if (b->b_expire) {
       if (!strcmp(b->b_ip, ip)) {
 	ERROR(2,( "ban of %s has been probed\n", b->b_ip));
-	b->b_expire += 10;
+	b->b_expire += ban_vote_offset;
 	return TRUE;
       }
       b->b_expire--;

Index: gencmds.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/gencmds.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gencmds.c	22 Apr 2006 11:31:53 -0000	1.2
+++ gencmds.c	26 Apr 2006 09:52:43 -0000	1.3
@@ -105,24 +105,16 @@
 	}
       } /* !C_GLOG */
 
-#ifdef VOTING
-      if (cmds[i].tag & (C_VC_ALL | C_VC_TEAM))
-      {
-	if (do_vote(comm, mess, cmds, i))
-	{
+      if ((voting) && (cmds[i].tag & (C_VC_ALL | C_VC_TEAM))) {
+	if (do_vote(comm, mess, cmds, i)) {
 	  if ( cmds[i].tag & C_GLOG ) {
-
 	    if (glog_open() == 0) {	/* Log pass for God to see */
 	      glog_printf("VOTE: The motion %s passes\n", comm);
 	    }
           }
 	}
-      }
-      else
-#endif
-      {
-	if (cmds[i].tag & C_PLAYER)
-	{
+      } else {
+	if (cmds[i].tag & C_PLAYER) {
 	  int who;
 
 	  /* This is really not that useful - If the calling
@@ -131,13 +123,11 @@
 	  who = getplayer(mess->m_from, comm);
 	  if (who >= 0)
 	    (*cmds[i].handler)(comm, mess, who, cmds, i, prereqs);
-	  else
-	  {
+	  else {
 	    free(comm);
 	    return 0;
 	  }
-	}
-	else
+	} else
 	  (*cmds[i].handler)(comm, mess, cmds, i, prereqs);
       }
       free(comm);
@@ -179,7 +169,6 @@
   return what;
 }
 
-#ifdef VOTING
 int do_vote(char *comm, struct message *mess, struct command_handler_2 *votes,
             int num)
 {
@@ -316,7 +305,6 @@
     return 0;
   }
 }
-#endif /* VOTING */
 
 /* ARGSUSED */
 int do_help(char *comm, struct message *mess, struct command_handler_2 *cmds,
@@ -344,8 +332,7 @@
 	   (its description has a value of NULL, not "")
 	   Use this hack to make a command hidden */
 	continue;
-#ifdef VOTING
-      else if (cmds[i].tag & (C_VC_TEAM | C_VC_ALL))
+      else if ((voting)&&(cmds[i].tag & (C_VC_TEAM | C_VC_ALL)))
       {
 	char ch;
 
@@ -358,7 +345,6 @@
 	pmessage(who,MINDIV,addr, "|%10s - %c: %s",
 		 cmds[i].command, ch, cmds[i].desc);
       }
-#endif /* VOTING */
       else
 	pmessage(who,MINDIV,addr, "|%10s - %s",
 		 cmds[i].command, cmds[i].desc);



From quozl at users.sourceforge.net  Wed Apr 26 04:52:45 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Wed, 26 Apr 2006 09:52:45 +0000
Subject: [netrek-cvs] server/Vanilla/robots puckmove.c,1.3,1.4
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/robots
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3547/robots

Modified Files:
	puckmove.c 
Log Message:
voting site policy

Index: puckmove.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/robots/puckmove.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- puckmove.c	22 Apr 2006 02:16:46 -0000	1.3
+++ puckmove.c	26 Apr 2006 09:52:43 -0000	1.4
@@ -1185,12 +1185,7 @@
     for (i = 0, j = &players[i]; 
 	i < MAXPLAYER; i++, j++) {
 	if (j == me)  continue;
-
-#ifdef VOTING
-	for (l=0; l < PV_TOTAL; l++)
-		j->voting[l] = -1;
-#endif
-
+	for (l=0; l < PV_TOTAL; l++) j->voting[l] = -1;
     }
     me->p_speed = 0;
     me->p_desspeed = 0;
@@ -1272,11 +1267,7 @@
 		track->t_seconds = 0;
 		track->t_x = 0;
 		track->t_y = 0;
-#ifdef VOTING
-                for (l = 0; l < PV_TOTAL; l++) {
-                   j->voting[l]=-1;
-          	 }
-#endif
+                for (l = 0; l < PV_TOTAL; l++) j->voting[l] = -1;
                 track->t_flags = 0;
 	    }
 	    continue;		/* do nothing else for dead players */



From quozl at users.sourceforge.net  Wed Apr 26 04:52:45 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Wed, 26 Apr 2006 09:52:45 +0000
Subject: [netrek-cvs] server/Vanilla/docs sample_sysdef.in,1.2,1.3
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3547/docs

Modified Files:
	sample_sysdef.in 
Log Message:
voting site policy

Index: sample_sysdef.in
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/docs/sample_sysdef.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sample_sysdef.in	21 Mar 2005 10:17:16 -0000	1.2
+++ sample_sysdef.in	26 Apr 2006 09:52:42 -0000	1.3
@@ -5,6 +5,35 @@
 #	Edit this file to meet your requirements, or use the program gum to
 #	view and update it graphically.
 #
+#	Enable voting by players
+VOTING=0
+#
+#	Enable vote for temporary ban
+#	(requires VOTING=1)
+BAN_VOTE_ENABLE=0
+#
+#	Length of ban in number of non-banned logins
+#	(requires BAN_VOTE_ENABLE=1)
+BAN_VOTE_LENGTH=10
+#
+#	Offset to change ban length by on each retry during ban period
+#	(positive values penalise people who return before their ban is up,
+#	and negative values adjust their ban length down)
+#	(requires BAN_VOTE_ENABLE=1)
+BAN_VOTE_OFFSET=0
+#
+#	Enable vote for ejection
+#	(requires VOTING=1)
+EJECT_VOTE_ENABLE=0
+#
+#	Only allow ejection if there is a queue of players
+#	(requires EJECT_VOTE_ENABLE=1)
+EJECT_VOTE_ONLY_IF_QUEUE=0
+#
+#	Kill ntserv process to eject, causes some client problems
+#	(requires EJECT_VOTE_ENABLE=1)
+EJECT_VOTE_VICIOUS=0
+#
 #	Maximum client update rate per second
 MAXUPDATE=10
 #



From quozl at users.sourceforge.net  Wed Apr 26 04:52:45 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Wed, 26 Apr 2006 09:52:45 +0000
Subject: [netrek-cvs] server/Vanilla/include config.h.in, 1.5,
	1.6 sysdefaults.h, 1.2, 1.3 data.h, 1.4, 1.5 struct.h, 1.7,
	1.8 defs.h, 1.6, 1.7 gencmds.h, 1.1, 1.2
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3547/include

Modified Files:
	config.h.in sysdefaults.h data.h struct.h defs.h gencmds.h 
Log Message:
voting site policy

Index: config.h.in
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/config.h.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- config.h.in	24 Apr 2006 12:35:17 -0000	1.5
+++ config.h.in	26 Apr 2006 09:52:43 -0000	1.6
@@ -341,32 +341,6 @@
                                 /* OBSERVERS       - allow players to watch */
 #define OBSERVERS
 
-                                /* VOTING          - allow voting mode */
-#define VOTING
-
-                                /* ALLOW_EJECT     - define to allow players to
-                                                     eject others */
-                                
-                                /* ALLOW_BAN       - define to allow players to
-                                                     eject and ban others */
-                                
-				/* VICIOUS_EJECT   - free's the players slot
-						     after ejection,
-						     causes some clients to 
-						     hang */
-
-				/* EJECT_ONLY_IF_QUEUE - refuses to eject
-							 unless queue != 0 */
-
-#ifdef VOTING
-#define ALLOW_EJECT
-#ifdef ALLOW_EJECT
-#define ALLOW_BAN
-#undef VICIOUS_EJECT
-#undef EJECT_ONLY_IF_QUEUE
-#endif
-#endif
-
 #define NODOCK          /* NODOCK allow per-slot docking priveledges */
 
 #define NOTRANSWARP	/* NOTRANSWARP	- allow starbase to set transwarp
@@ -391,7 +365,6 @@
 						     this define. */
 #undef GENO_COUNT
 
-#ifdef VOTING
                                 /* AUTO_INL        - starts up INL robot
                                                      by majority vote   */
 
@@ -427,7 +400,6 @@
 #define BALANCE_PLANET  100
 #define BALANCE_DEFENSE   0
 #define BALANCE_OFFENSE 100
-#endif
                                 /* MESSAGES_ALL_TIME - allow messaging during
                                 freezes like twarp, refit, and war decl. 
 				required to be set for INL robot use. */

Index: defs.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/defs.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- defs.h	24 Apr 2006 12:35:17 -0000	1.6
+++ defs.h	26 Apr 2006 09:52:43 -0000	1.7
@@ -64,14 +64,12 @@
                                    by default have 16 player slots and make
                                    the rest obs slots */
 
-#ifdef VOTING
 #define PV_EXTRA 8			/* # of non-eject vote types      */
 #define PV_TOTAL MAXPLAYER*2+PV_EXTRA	/* total number of voting slots   */
 #define PV_EJECT 0*MAXPLAYER		/* array base for eject votes     */
 #define PV_BAN   1*MAXPLAYER		/* array base for eject votes     */
 #define PV_OTHER 2*MAXPLAYER		/* array base for non-eject votes */
-/* see ntserv/ntscmds.c for array */
-#endif
+/* see ntserv/ntscmds.c for voting array */
 
 #if defined(NEWBIESERVER) || defined(PRETSERVER)
 #define MAXQUEUE 13	/* Number of different  waitqueues */

Index: sysdefaults.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/sysdefaults.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sysdefaults.h	21 Mar 2005 10:17:16 -0000	1.2
+++ sysdefaults.h	26 Apr 2006 09:52:43 -0000	1.3
@@ -196,6 +196,20 @@
     "No bombing out of t-mode"				},
   { "NO_UNWARRING_BOMBING",	SYSDEF_INT,	&no_unwarring_bombing,
     "No 3rd space bombing"				},
+  { "VOTING",		SYSDEF_INT,	&voting,
+    "Enable voting"			},
+  { "BAN_VOTE_ENABLE",	SYSDEF_INT,	&ban_vote_enable,
+    "Enable vote for temporary ban"			},
+  { "BAN_VOTE_LENGTH",	SYSDEF_INT,	&ban_vote_length,
+    "Length of ban in number of non-banned logins"	},
+  { "BAN_VOTE_OFFSET",	SYSDEF_INT,	&ban_vote_offset,
+    "Offset to change ban length by on each retry during ban period"	},
+  { "EJECT_VOTE_ENABLE",	SYSDEF_INT,	&eject_vote_enable,
+    "Enable vote for ejection"				},
+  { "EJECT_VOTE_ONLY_IF_QUEUE",	SYSDEF_INT,	&eject_vote_only_if_queue,
+    "Only allow ejection if there is a queue of players"	},
+  { "EJECT_VOTE_VICIOUS",	SYSDEF_INT,	&eject_vote_vicious,
+    "Kill ntserv process to eject, causes some client problems"	},
   { "",			SYSDEF_END,	NULL		}
 };
 

Index: struct.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/struct.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- struct.h	24 Apr 2006 12:35:17 -0000	1.7
+++ struct.h	26 Apr 2006 09:52:43 -0000	1.8
@@ -399,9 +399,7 @@
     int p_df;			/* defense (0 unknown, 1 worst, 100 best) */
     int p_tg;			/* target+1 */
 #endif
-#ifdef VOTING
     time_t voting[PV_TOTAL];	/* voting array */
-#endif
     int p_candock;              /* is this player allowed to dock onto SB */
     int p_transwarp;		/* flags base must have to allow transwarp */
 };
@@ -703,7 +701,6 @@
     int (*handler)();
 };
 
-#ifdef VOTING
 struct vote_handler {
     char *type;
     int tag;
@@ -719,9 +716,6 @@
 #define VC_GLOG    0x0010   /* Write Votes to God Log */
 #define VC_PLAYER  0x0020   /* Each player can be voted on, like eject */
 
-
-#endif
-
 #endif /* __INCLUDED_struct_h__ */
 
 /*  Hey Emacs!

Index: gencmds.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/gencmds.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gencmds.h	21 Mar 2005 05:23:36 -0000	1.1
+++ gencmds.h	26 Apr 2006 09:52:43 -0000	1.2
@@ -22,11 +22,9 @@
 #define C_PR_5          0x4000
 #define C_PR_6          0x8000
 
-#ifdef VOTING
 #define C_VC_ALL        0x0020   /* Command only passes with Majority concensus */
 #define C_VC_TEAM       0x0040   /* Command passes with agreement from Team */
 /*#define C_VC_PLAYER     0x0080 */  /* Each player can be voted on, like eject */
-#endif /* VOTING */
 
 /* Integrate Voting commands and generic commands into the same
    structure.  The two only differ slightly */

Index: data.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/data.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- data.h	24 Apr 2006 12:35:17 -0000	1.4
+++ data.h	26 Apr 2006 09:52:43 -0000	1.5
@@ -347,4 +347,12 @@
 extern int whitelisted;
 extern int blacklisted;
 
+extern int voting;
+extern int ban_vote_enable;
+extern int ban_vote_length;
+extern int ban_vote_offset;
+extern int eject_vote_enable;
+extern int eject_vote_only_if_queue;
+extern int eject_vote_vicious;
+
 #endif /* _h_data */



From quozl at users.sourceforge.net  Wed Apr 26 04:52:45 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Wed, 26 Apr 2006 09:52:45 +0000
Subject: [netrek-cvs] server/Vanilla/tools message.c, 1.1, 1.2 setplanet.c,
	1.1, 1.2
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3547/tools

Modified Files:
	message.c setplanet.c 
Log Message:
voting site policy

Index: message.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/tools/message.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- message.c	21 Mar 2005 05:23:47 -0000	1.1
+++ message.c	26 Apr 2006 09:52:43 -0000	1.2
@@ -1,15 +1,5 @@
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
 #include 
-#include 
 #include "defs.h"
 #include "struct.h"
 #include "data.h"

Index: setplanet.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/tools/setplanet.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- setplanet.c	23 Apr 2006 11:22:53 -0000	1.1
+++ setplanet.c	26 Apr 2006 09:52:43 -0000	1.2
@@ -369,5 +369,10 @@
       goto state_1;
     }
 
+    if (!strcmp(argv[i], "is-flat")) {
+      if (pl->pl_armies < 5) return 0;
+      return 1;
+    }
+
     goto state_0;
 }



From quozl at users.sourceforge.net  Wed Apr 26 04:52:45 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Wed, 26 Apr 2006 09:52:45 +0000
Subject: [netrek-cvs] server/Vanilla ChangeLog,1.33,1.34 NEWS,1.17,1.18
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3547

Modified Files:
	ChangeLog NEWS 
Log Message:
voting site policy

Index: NEWS
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/NEWS,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- NEWS	24 Apr 2006 12:35:17 -0000	1.17
+++ NEWS	26 Apr 2006 09:52:42 -0000	1.18
@@ -1,3 +1,4 @@
+- convert voting, ejecting and banning to site policy in sysdef [Cameron]
 - add vote to temporarily ban a player [Cameron]
 - change to conquest sequence to add a parade [Cameron]
 - fix unrealistic robot boredom timer [Cameron]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- ChangeLog	24 Apr 2006 12:35:17 -0000	1.33
+++ ChangeLog	26 Apr 2006 09:52:42 -0000	1.34
@@ -1,3 +1,12 @@
+Wed Apr 26 19:37:40 2006  James Cameron  
+
+	* *.h, *.c: make voting a site policy, by moving the configuration
+	settings from config.h.in to etc/sysdef.
+
+Wed Apr 26 18:34:58 2006  James Cameron  
+
+	* ntserv/sysdefaults.c: trim includes to minimum.
+
 Mon Apr 24 22:30:47 2006  James Cameron  
 
 	* ntserv/ntscmds.c: add a vote to temporarily ban, which requires



From quozl at users.sourceforge.net  Wed Apr 26 08:10:06 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Wed, 26 Apr 2006 13:10:06 +0000
Subject: [netrek-cvs] server/Vanilla ChangeLog,1.34,1.35 NEWS,1.18,1.19
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4356

Modified Files:
	ChangeLog NEWS 
Log Message:
sndFlags called with uninitialised pointer

Index: NEWS
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/NEWS,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- NEWS	26 Apr 2006 09:52:42 -0000	1.18
+++ NEWS	26 Apr 2006 13:10:04 -0000	1.19
@@ -1,3 +1,4 @@
+- fix cambot regression [Cameron]
 - convert voting, ejecting and banning to site policy in sysdef [Cameron]
 - add vote to temporarily ban a player [Cameron]
 - change to conquest sequence to add a parade [Cameron]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- ChangeLog	26 Apr 2006 09:52:42 -0000	1.34
+++ ChangeLog	26 Apr 2006 13:10:04 -0000	1.35
@@ -1,3 +1,8 @@
+Wed Apr 26 22:58:34 2006  James Cameron  
+
+	* tools/cambot.c (cb_updt): fix regression which caused cambot to
+	corrupt server state when started.
+
 Wed Apr 26 19:37:40 2006  James Cameron  
 
 	* *.h, *.c: make voting a site policy, by moving the configuration



From quozl at users.sourceforge.net  Wed Apr 26 08:10:06 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Wed, 26 Apr 2006 13:10:06 +0000
Subject: [netrek-cvs] server/Vanilla/tools cambot.c,1.2,1.3
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4356/tools

Modified Files:
	cambot.c 
Log Message:
sndFlags called with uninitialised pointer

Index: cambot.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/tools/cambot.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cambot.c	21 Mar 2005 10:17:18 -0000	1.2
+++ cambot.c	26 Apr 2006 13:10:04 -0000	1.3
@@ -4,20 +4,9 @@
  */
 
 #include 
-#include 
-#include 
 #include 
 #include 
-#include 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
 #include "defs.h"
 #include "struct.h"
 #include "data.h"
@@ -33,6 +22,7 @@
 
 struct you_short_spacket clientSelfs[MAXPLAYER];
 struct youss_spacket clientSelfShips[MAXPLAYER];
+struct flags_spacket clientFlags[MAXPLAYER];
 struct player cambot_me;
 struct itimerval udt;
 char	*cb_from = {"GOD->ALL"};
@@ -173,7 +163,8 @@
 	for (i=0, pl=players, cpli=clientPlayersInfo, cpl=clientPlayers,
 		 kills=clientKills, pstatus=clientPStatus,
 		 login=clientLogin, stats=clientStats,
-		 self=clientSelfs, self2=clientSelfShips;
+		 self=clientSelfs, self2=clientSelfShips,
+		 flags=clientFlags;
 	     i

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31921/src

Modified Files:
	dashboard3.c local.c sound.c 
Log Message:
Some sound bug fixes, also fixed LAB dashboard for observers with armies/kills not being displayed.

Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- local.c	26 Apr 2006 02:04:24 -0000	1.9
+++ local.c	26 Apr 2006 15:54:04 -0000	1.10
@@ -512,7 +512,7 @@
                         angle = (int)(atan2(newdy, newdx)*180/XPI);
                         angle = 270 - angle;
                         // At short distances, don't use angular sound
-                        if (distance < 10)
+                        if (distance < SCALE/2)
                             Play_Sound(CLOAKED_WAV);
                         else
                             Play_Sound_Loc(CLOAKED_WAV, angle, distance);
@@ -550,13 +550,15 @@
                         angle = (int)(atan2(newdy, newdx)*180/XPI);
                         angle = 270 - angle;
                         // At short distances, don't use angular sound
-                        if (distance < 10)
+                        if (distance < SCALE/2)
                             Play_Sound(UNCLOAK_WAV);
                         else
                             Play_Sound_Loc(UNCLOAK_WAV, angle, distance);
+      
+                            
                     }
                     else    // Kill any channels with CLOAKED_WAV on them (group 1)
-			Mix_HaltGroup(1);
+		        Mix_HaltGroup(1);
 
                 }
                 else
@@ -771,14 +773,22 @@
                 if ((sound_flags & PFSHIELD) && !(j->p_flags & PFSHIELD))
                 {
                     if (newSound)
-                        Play_Sound(SHIELD_DOWN_WAV);
+                    {
+                        // Kill any channels with SHIELD_UP/DOWN_WAV on them (group 4)
+			Mix_HaltGroup(4);
+		        Play_Sound(SHIELD_DOWN_WAV);
+		    }
                     else
                         Play_Sound(SHIELD_DOWN_SOUND);
                 }
                 if (!(sound_flags & PFSHIELD) && (j->p_flags & PFSHIELD))
                 {
                     if (newSound)
-                        Play_Sound(SHIELD_UP_WAV);
+                    {
+                        // Kill any channels with SHIELD_UP/DOWN_WAV on them (group 4)
+			Mix_HaltGroup(4);
+			Play_Sound(SHIELD_UP_WAV);
+		    }
                     else
                         Play_Sound(SHIELD_UP_SOUND);
                 }
@@ -952,7 +962,7 @@
                         angle = (int)(atan2(newdy, newdx)*180/XPI);
                         angle = 270 - angle;
                         // At short distances, don't use angular sound
-                        if (distance < 10)
+                        if (distance < SCALE/2)
                             Play_Sound(EXPLOSION_OTHER_WAV);
                         else
                             Play_Sound_Loc(EXPLOSION_OTHER_WAV, angle, distance);
@@ -1028,7 +1038,7 @@
                         angle = (int)(atan2(newdy, newdx)*180/XPI);
                         angle = 270 - angle;
                         // At short distances, don't use angular sound
-                        if (distance < 10)
+                        if (distance < SCALE/2)
                             Play_Sound(PHASER_OTHER_WAV);
                         else
                             Play_Sound_Loc(PHASER_OTHER_WAV, angle, distance);
@@ -1531,7 +1541,7 @@
                         angle = (int)(atan2(newdy, newdx)*180/XPI);
                         angle = 270 - angle;
                         // At short distances, don't use angular sound
-                        if (distance < 10)
+                        if (distance < SCALE/2)
                             Play_Sound(TORP_HIT_WAV);
                         else
                             Play_Sound_Loc(TORP_HIT_WAV, angle, distance);
@@ -1777,7 +1787,7 @@
                     angle = (int)(atan2(newdy, newdx)*180/XPI);
                     angle = 270 - angle;
                     // At short distances, don't use angular sound
-                    if (distance < 10)
+                    if (distance < SCALE/2)
                         Play_Sound(PLASMA_HIT_WAV);
                     else
                         Play_Sound_Loc(PLASMA_HIT_WAV, angle, distance);
@@ -2156,7 +2166,7 @@
             Play_Sound(FIRE_TORP_WAV);
         if (sound_other_torps < num_other_torps)
         {
-            if (other_torp_dist < 10)
+            if (other_torp_dist < SCALE/2)
                 Play_Sound(OTHER_FIRE_TORP_WAV);
             else
                 Play_Sound_Loc(OTHER_FIRE_TORP_WAV, other_torp_angle, other_torp_dist);
@@ -2165,7 +2175,7 @@
             Play_Sound(FIRE_PLASMA_WAV);
         if (sound_other_plasmas < num_other_plasmas)
         {
-            if (other_plasma_dist < 10)
+            if (other_plasma_dist < SCALE/2)
                 Play_Sound(OTHER_FIRE_PLASMA_WAV);
             else
                 Play_Sound_Loc(OTHER_FIRE_PLASMA_WAV, other_plasma_angle, other_plasma_dist);

Index: dashboard3.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/dashboard3.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dashboard3.c	12 Apr 2006 04:20:03 -0000	1.2
+++ dashboard3.c	26 Apr 2006 15:54:04 -0000	1.3
@@ -342,53 +342,32 @@
     static float old_kills = -1;
     int cur_max, cur_arm, label_len;
     char label[32];
-
-
-    if (me->p_ship.s_type == ASSAULT)
-    {
-        cur_arm = (int) (3 * me->p_kills);
-    }
+    float kills; 
+        
+    if ((me->p_flags & (PFPLOCK | PFOBSERV)) == (PFPLOCK | PFOBSERV))
+        kills = players[me->p_playerl].p_kills;
     else
-    {
-        cur_arm = (int) (2 * me->p_kills);
-    }
+        kills = me->p_kills;
 
-    if (cur_arm < 0)
-    {
-        cur_arm = 0;
-    }
-    else if ((cur_arm > me->p_ship.s_maxarmies) ||
-             (me->p_ship.s_type == STARBASE))
-    {
-        cur_arm = me->p_ship.s_maxarmies;
-    }
+    if (fr)
+        W_ClearWindow (tstatw);
 
+    db_flags (fr);
+
+    /* TIMER */
+    db_timer (fr, WINSIDE - 12 * W_Textwidth, 32);
+        
     // SRS - inserted some additional casts to clear up compiler warnings
     cur_max = (int) ((me->p_ship.s_maxspeed + 2) -
                      ((me->p_ship.s_maxspeed + 1) *
                       ((float) me->p_damage /
                        (float) (me->p_ship.s_maxdamage))));
 
-
     if (cur_max < 0)
-    {
         cur_max = 0;
-    }
     else if (cur_max > me->p_ship.s_maxspeed)
-    {
         cur_max = me->p_ship.s_maxspeed;
-    }
-
-    if (fr)
-    {
-        W_ClearWindow (tstatw);
-    }
-
-    db_flags (fr);
-
-    /* TIMER */
-    db_timer (fr, WINSIDE - 12 * W_Textwidth, 32);
-
+    
     if (fr || (me->p_speed != old_spd) || (old_cur_max != cur_max))
     {
         db_bar ("Spd", 2, 2, 75, 25,
@@ -487,7 +466,17 @@
             }
         }
     }
-
+    
+    if (me->p_ship.s_type == ASSAULT)
+        cur_arm = (((kills * 3) > me->p_ship.s_maxarmies) ?
+                   me->p_ship.s_maxarmies : (int) (kills * 3));
+    else if (me->p_ship.s_type == STARBASE)
+        cur_arm = me->p_ship.s_maxarmies;
+    else
+        cur_arm = (((kills * 2) > me->p_ship.s_maxarmies) ?
+                   me->p_ship.s_maxarmies : (int) (kills * 2));
+    
+        
     if (fr || (old_arm != me->p_armies) || (old_cur_arm != cur_arm))
     {
         W_ClearArea (tstatw, 402, 2, 98, W_Textheight);
@@ -524,11 +513,11 @@
         }
     }
 
-    if (fr || (old_kills != me->p_kills))
+    if (fr || (old_kills != kills))
     {
         W_ClearArea (tstatw, 402, 4 + W_Textheight, 98, W_Textheight);
 
-        if (me->p_kills > 0.0)
+        if (kills > 0.0)
         {
             label[0] = ' ';
             label[1] = 'K';
@@ -538,7 +527,7 @@
             label[5] = 's';
             label[6] = ':';
             label[7] = ' ';
-            label_len = 8 + db_ftoa (&label[8], me->p_kills);
+            label_len = 8 + db_ftoa (&label[8], kills);
 
             if (cur_arm > 4)
             {
@@ -560,7 +549,7 @@
             }
         }
 
-        old_kills = me->p_kills;
+        old_kills = kills;
     }
 
     old_spd = me->p_speed;

Index: sound.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/sound.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sound.c	26 Apr 2006 02:04:24 -0000	1.5
+++ sound.c	26 Apr 2006 15:54:04 -0000	1.6
@@ -215,10 +215,16 @@
 	    return;
 
         if ((type >= NUM_WAVES) || (type < 0))
+        {
             LineToConsole("Invalid sound type %d\n", type);
+            return;
+        }
 
         if ((channel = Mix_PlayChannel(-1, newsounds[type], 0)) < 0)
+        {
             LineToConsole("Mix_PlayChannel: %s\n", Mix_GetError());
+            return;
+        }
             
         Group_Sound(type, channel);
     }
@@ -252,7 +258,10 @@
         return;
 
     if ((type >= NUM_WAVES) || (type < 0))
+    {
         LineToConsole("Invalid sound type %d\n", type);
+        return;
+    }
 
     if ((channel = Mix_PlayChannel(-1, newsounds[type], 0)) < 0)
     {
@@ -266,7 +275,10 @@
     	distance = 255;
     // Adjust volume with distance and angle
     if (Mix_SetPosition(channel, angle, distance) == 0)
+    {
         LineToConsole("Mix_SetPosition: %s\n", Mix_GetError());
+        return;
+    }
         
     Group_Sound(type, channel);
     return;
@@ -280,6 +292,7 @@
     // group 1 = cloaked_wav
     // group 2 = warning_wav
     // group 3 = red_alert_wav
+    // group 4 = shield_down_wav and shield_up_wav
     switch(type)
     {
     	case CLOAKED_WAV:
@@ -294,6 +307,15 @@
             if(!Mix_GroupChannel(channel,3))
                 LineToConsole("Mix_GroupChannel: %s\n", Mix_GetError());
             break;
+        case SHIELD_UP_WAV:
+        case SHIELD_DOWN_WAV:
+            if(!Mix_GroupChannel(channel,4))
+                LineToConsole("Mix_GroupChannel: %s\n", Mix_GetError());
+            break;
+        default: // Reset tag
+            if(!Mix_GroupChannel(channel,-1))
+                LineToConsole("Mix_GroupChannel: %s\n", Mix_GetError());
+            break;
     }
 }
 



From modemhero at users.sourceforge.net  Wed Apr 26 10:54:06 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Wed, 26 Apr 2006 15:54:06 +0000
Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C,1.1,1.2
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31921

Modified Files:
	NetrekXP to do list.C 
Log Message:
Some sound bug fixes, also fixed LAB dashboard for observers with armies/kills not being displayed.

Index: NetrekXP to do list.C
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- NetrekXP to do list.C	26 Apr 2006 01:52:46 -0000	1.1
+++ NetrekXP to do list.C	26 Apr 2006 15:54:04 -0000	1.2
@@ -31,13 +31,13 @@
 - option server/servernick/servertype needs to be saved
 12) Icon not working under Visual Studio
 14) observer sounds slightly messed up
-14a) torp_other not working right due to lack of torp fuse info
+14a) torp_other and plasma_other not working right due to lack of torp fuse info
 15) closing hint window at warp 0 turns off the box on the galaxy map.  Also, cloaking/shields
 at warp 0 doesn't update someone else's tactical on what you did.
 15a) 
 16) why is beeplite going on when i'm obsing someone who cloaks after they used a 
 beeplite macro that lit themselves up
-17) add dll, lib, and header files to repository
+17) right click on all_review window, get message "obsolete!"
 
 Might be done:
 3) mouse scroll in message windows gets the up/down coord wrong when main title
@@ -78,3 +78,7 @@
 - add sortPlayersFirst
 - fix makedistress bug that creates 0 instead of empty string when macro starts with conditional
 
+Simple in-game, realtime variable checking:
+   char text[120];
+   sprintf (text, "Variable has value %d.", variable);
+   W_MessageAllowedWindows (WAM_ALL, 0, 0, textColor, text, 120, 0);
\ No newline at end of file



From modemhero at users.sourceforge.net  Wed Apr 26 10:54:06 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Wed, 26 Apr 2006 15:54:06 +0000
Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.21,1.22
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31921/resources/docs

Modified Files:
	changes.txt 
Log Message:
Some sound bug fixes, also fixed LAB dashboard for observers with armies/kills not being displayed.

Index: changes.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- changes.txt	26 Apr 2006 02:04:24 -0000	1.21
+++ changes.txt	26 Apr 2006 15:54:04 -0000	1.22
@@ -1,4 +1,5 @@
 Version TBA:
+- fixed LAB dashboard to properly display armies/kills for observers
 - fixed a bunch of compiler warnings
 - change to warning sounds: changed current "warning" sound to the yellow alert sound, and
   made the red_alert sound file the red alert sound.  Added additional measures to stop



From modemhero at users.sourceforge.net  Wed Apr 26 17:12:55 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Wed, 26 Apr 2006 22:12:55 +0000
Subject: [netrek-cvs] client/netrekxp/resources/sounds nt_enter_warp.wav,
	NONE, 1.1 nt_exit_warp.wav, NONE, 1.1 nt_message2.wav, NONE,
	1.1 nt_message3.wav, NONE, 1.1 nt_red_alert.wav, 1.1,
	1.2 nt_self_destruct.wav, 1.1, 1.2
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/sounds
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21412/resources/sounds

Modified Files:
	nt_red_alert.wav nt_self_destruct.wav 
Added Files:
	nt_enter_warp.wav nt_exit_warp.wav nt_message2.wav 
	nt_message3.wav 
Log Message:
Added a different red alert and self-destruct sound.  Added 2 new message sounds (can be called by beeplite).  Added enter/exit transwarp sounds.

--- NEW FILE: nt_exit_warp.wav ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nt_enter_warp.wav ---
(This appears to be a binary file; contents omitted.)

Index: nt_red_alert.wav
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/sounds/nt_red_alert.wav,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvs5AKimf and /tmp/cvsZgG0gc differ

--- NEW FILE: nt_message3.wav ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nt_message2.wav ---
(This appears to be a binary file; contents omitted.)

Index: nt_self_destruct.wav
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/sounds/nt_self_destruct.wav,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvs9KWx2g and /tmp/cvsDUlG1d differ



From modemhero at users.sourceforge.net  Wed Apr 26 18:18:16 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Wed, 26 Apr 2006 23:18:16 +0000
Subject: [netrek-cvs] client/netrekxp/include sound.h,1.3,1.4
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12047/include

Modified Files:
	sound.h 
Log Message:
 2 new sounds for enter/exiting transwarp, and observer support for hearing these as well
Fixed beeplite observer bug
Fixed up viewbox so map refreshes properly when toggled

Index: sound.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/sound.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sound.h	26 Apr 2006 02:04:24 -0000	1.3
+++ sound.h	26 Apr 2006 23:18:14 -0000	1.4
@@ -20,27 +20,29 @@
 #define ENTER_SHIP_SOUND        13
 #define SELF_DESTRUCT_SOUND     14
 #define PLASMA_HIT_SOUND        15
-#define MESSAGE_SOUND           16
-#define MESSAGE1_SOUND          17
-#define MESSAGE2_SOUND          18
-#define MESSAGE3_SOUND          19
-#define MESSAGE4_SOUND          20
-#define MESSAGE5_SOUND          21
-#define MESSAGE6_SOUND          22
-#define MESSAGE7_SOUND          23
-#define MESSAGE8_SOUND          24
-#define MESSAGE9_SOUND          25
+#define ENTER_WARP_SOUND        16
+#define EXIT_WARP_SOUND         17
+#define MESSAGE_SOUND           18
+#define MESSAGE1_SOUND          19
+#define MESSAGE2_SOUND          20
+#define MESSAGE3_SOUND          21
+#define MESSAGE4_SOUND          22
+#define MESSAGE5_SOUND          23
+#define MESSAGE6_SOUND          24
+#define MESSAGE7_SOUND          25
+#define MESSAGE8_SOUND          26
+#define MESSAGE9_SOUND          27
 
-#define OTHER_SOUND_OFFSET      26
+#define OTHER_SOUND_OFFSET      28
 
 /* Other people's sounds; not all of these are currently used */
-#define OTHER_FIRE_TORP_SOUND   27
-#define OTHER_PHASER_SOUND      28
-#define OTHER_FIRE_PLASMA_SOUND 29
-#define OTHER_EXPLOSION_SOUND   30
+#define OTHER_FIRE_TORP_SOUND   29
+#define OTHER_PHASER_SOUND      30
+#define OTHER_FIRE_PLASMA_SOUND 31
+#define OTHER_EXPLOSION_SOUND   32
 
 
-#define NUM_SOUNDS 30
+#define NUM_SOUNDS 32
 
 struct Sound
 {
@@ -64,6 +66,8 @@
   CLOAKED_WAV,
   ENGINE_WAV,
   ENTER_SHIP_WAV,
+  ENTER_WARP_WAV,
+  EXIT_WARP_WAV,
   EXPLOSION_WAV,
   EXPLOSION_OTHER_WAV,
   FIRE_PLASMA_WAV,



From modemhero at users.sourceforge.net  Wed Apr 26 18:18:16 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Wed, 26 Apr 2006 23:18:16 +0000
Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.22,1.23
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12047/resources/docs

Modified Files:
	changes.txt 
Log Message:
 2 new sounds for enter/exiting transwarp, and observer support for hearing these as well
Fixed beeplite observer bug
Fixed up viewbox so map refreshes properly when toggled

Index: changes.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- changes.txt	26 Apr 2006 15:54:04 -0000	1.22
+++ changes.txt	26 Apr 2006 23:18:14 -0000	1.23
@@ -1,4 +1,11 @@
 Version TBA:
+- changed self destruct sound so it doesn't sound like enter ship sound
+- added 2 new message sounds (they can be called by beeplite)
+- add 2 new sounds for enter/exiting transwarp, and observer support for hearing these as
+  well
+- replaced red alert sound with one less staticy
+- fixed beeplite observer bug
+- fixed up viewbox so map refreshes properly when toggled
 - fixed LAB dashboard to properly display armies/kills for observers
 - fixed a bunch of compiler warnings
 - change to warning sounds: changed current "warning" sound to the yellow alert sound, and



From modemhero at users.sourceforge.net  Wed Apr 26 18:18:16 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Wed, 26 Apr 2006 23:18:16 +0000
Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C,1.2,1.3
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12047

Modified Files:
	NetrekXP to do list.C 
Log Message:
 2 new sounds for enter/exiting transwarp, and observer support for hearing these as well
Fixed beeplite observer bug
Fixed up viewbox so map refreshes properly when toggled

Index: NetrekXP to do list.C
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- NetrekXP to do list.C	26 Apr 2006 15:54:04 -0000	1.2
+++ NetrekXP to do list.C	26 Apr 2006 23:18:13 -0000	1.3
@@ -17,35 +17,36 @@
 1) Add warning hull.
 2) resizeable message windows.  Perhaps memory of window positions if you choose
 to save settings.  Text in windows should adjust to new window size.
-5) A lot of annoying pop up windows (like macro window, default controls) should be
-closeable by shift right click.
-6) genoed as obs on team with no planets -> you were killed by something not in this
-game
-7a) red_alert sound sounds kinda static-y
-7b) self destruct and enter ship sounds are near identical.
-11) Save options 
+3) flipping through options menus clears too large a path to the right on the galactic,
+noticeable with viewbox disappearing at low speeds , depending on what length of menu you
+flip to.  Also, closing hint window has same effect
+4) Save options 
 - name/login/meta stuff needs to be saved
 - Default windows placements need to be saved
 - uselite options need to be saved
 - review window mapping needs to be saved
 - option server/servernick/servertype needs to be saved
-12) Icon not working under Visual Studio
-14) observer sounds slightly messed up
-14a) torp_other and plasma_other not working right due to lack of torp fuse info
-15) closing hint window at warp 0 turns off the box on the galaxy map.  Also, cloaking/shields
-at warp 0 doesn't update someone else's tactical on what you did.
-15a) 
-16) why is beeplite going on when i'm obsing someone who cloaks after they used a 
-beeplite macro that lit themselves up
-17) right click on all_review window, get message "obsolete!"
+5) A lot of annoying pop up windows (like macro window, default controls) should be
+closeable by shift right click.
+6) genoed as obs on team with no planets -> you were killed by something not in this
+game
+7) Icon not working under Visual Studio
+8) torp_other and plasma_other not working right due to lack of torp fuse info
+9) cloaking/shields at warp 0 doesn't update someone else's tactical on what you did.
+9a) observer sound messes up when someone flips shields at warp 0
+9b) the whole 'cloak when approaching base during twarp' thing is causing artifical cloak
+sounds to play
+
+
 
 Might be done:
-3) mouse scroll in message windows gets the up/down coord wrong when main title
+1) mouse scroll in message windows gets the up/down coord wrong when main title
 bar is turned on.
-4) CRASH BUG! Resize main window and try to do mouse scroll, it will crash client.
-13) Disable window move stuff still broken.
-11) save_options keymap: not saving right
-13) if waiting on queue and get in, quit clock missing
+2) CRASH BUG! Resize main window and try to do mouse scroll, it will crash client.
+3) Disable window move stuff still broken.
+4) save_options keymap: not saving right
+5) if waiting on queue and get in, quit clock missing
+6) right click on all_review window, get message "obsolete!"
 
 Stas's list:
 - color coded playerlist.



From modemhero at users.sourceforge.net  Wed Apr 26 18:18:16 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Wed, 26 Apr 2006 23:18:16 +0000
Subject: [netrek-cvs] client/netrekxp/src beeplite.c, 1.6, 1.7 local.c, 1.10,
	1.11 map.c, 1.4, 1.5 sound.c, 1.6, 1.7
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12047/src

Modified Files:
	beeplite.c local.c map.c sound.c 
Log Message:
 2 new sounds for enter/exiting transwarp, and observer support for hearing these as well
Fixed beeplite observer bug
Fixed up viewbox so map refreshes properly when toggled

Index: beeplite.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/beeplite.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- beeplite.c	26 Apr 2006 02:04:24 -0000	1.6
+++ beeplite.c	26 Apr 2006 23:18:14 -0000	1.7
@@ -68,7 +68,7 @@
 
 void liteplayer(struct player *j)
 {
-    if (!j || (j->p_flags & PFCLOAK))
+    if (!j || (j->p_flags & PFCLOAK) || (j->p_flags & PFOBSERV))
       return;
 
     redrawPlayer[j->p_no] = 1;

Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- local.c	26 Apr 2006 15:54:04 -0000	1.10
+++ local.c	26 Apr 2006 23:18:14 -0000	1.11
@@ -56,6 +56,8 @@
 static int new_other_plasma_dist = 0;
 static int other_plasma_angle = 0;
 static int old_pt_fuse = 0;
+static int warpchange = 0;
+static unsigned int twarpflag = 0; 
 #endif
 
 /* Background Stars Definitions */
@@ -467,6 +469,50 @@
         if ((j->p_status != PALIVE) && (j->p_status != PEXPLODE))
             continue;
 
+/* Twarp sounds put up here so observers can hear them */            
+#ifdef SOUND
+
+       /* Have to use me->p_flags because server doesn't send us twarp flag info
+        on other players.  Current Vanilla does not let observer change players
+        if the player they are observing is transwarping. */
+	if (twarpflag != (me->p_flags & PFTWARP))
+	{
+	    /* change in warp state */
+	    warpchange = 1;
+            twarpflag = (me->p_flags & PFTWARP);
+        }
+        
+        if (myPlayer(j) || isObsLockPlayer(j))
+        {     
+                if (warpchange && (j->p_flags & PFTWARP))
+	        {   
+                    
+	    	    if (newSound) // Kill any channels with ENTER_WARP_WAV or EXIT_WARP_WAV (group 3)
+		    {
+		        Mix_HaltGroup(3);
+	                Play_Sound(ENTER_WARP_WAV);
+	            }
+	            else
+	                Play_Sound(ENTER_WARP_SOUND);
+	                
+	            warpchange = 0;
+	
+	        }
+	        if (warpchange && !(j->p_flags & PFTWARP))
+	        { 
+	     	    if (newSound) // Kill any channels with ENTER_WARP_WAV or EXIT_WARP_WAV (group 3)
+		    {
+		        Mix_HaltGroup(3);
+	                Play_Sound(EXIT_WARP_WAV);
+	            }
+	            else
+	                Play_Sound(EXIT_WARP_SOUND);
+	                
+	            warpchange = 0;
+	        }
+        }
+#endif
+
         if (j->p_flags & PFOBSERV)
         {
             /* observer and NOT locked onto a player (ie. locked onto planet or
@@ -2097,12 +2143,8 @@
             W_ChangeBorder (baseWin, gColor);
 
 #if defined(SOUND)
-            if (newSound)
-            {   // Kill any channels with WARNING_WAV on them (group 2)
-                // or RED_ALERT_WAV (group 3)
+            if (newSound) // Kill any channels with WARNING_WAV or RED_ALERT_WAV (group 2)
 		Mix_HaltGroup(2);
-		Mix_HaltGroup(3);
-	    }
             else
             {
                 Abort_Sound(WARNING_SOUND);
@@ -2124,9 +2166,9 @@
 
 #if defined(SOUND)
 
-            if (newSound) // Kill any channels with RED_ALERT_WAV on them (group 3)
+            if (newSound) // Kill any channels with RED_ALERT_WAV (group 2)
             {
-            	Mix_HaltGroup(3);
+            	Mix_HaltGroup(2);
                 Play_Sound(WARNING_WAV);
             }
             else

Index: map.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- map.c	21 Apr 2006 12:00:07 -0000	1.4
+++ map.c	26 Apr 2006 23:18:14 -0000	1.5
@@ -549,6 +549,7 @@
 
     static int viewx = 0, viewy = 0;
     static char clearviewbox = 0;
+    static char viewboxcleared = 0;
     int viewdist = (WINSIDE / 2 * SCALE) / (GWIDTH / WINSIDE);
     int view = WINSIDE * SCALE / 2;
     int mvx, mvy;
@@ -577,6 +578,7 @@
         //W_ClearWindowDB (mapSDB);
         clearlock = 0;
         clearviewbox = 0;
+        viewboxcleared = 0;
 
         for (i = 0; i < MAXPLAYER; i++)
         {
@@ -603,41 +605,29 @@
 
         if (clearviewbox)
         {
-            if (viewBox)
-            {
-                if (viewx != dx || viewy != dy)
-                {
-                    /* clear old dots - placed here for less flicker */
-                    if (viewx + viewdist < WINSIDE && viewy + viewdist < WINSIDE)
-                        W_MakePoint (mapw, viewx + viewdist, viewy + viewdist, backColor);
-                        /*W_MakeLine (mapw, viewx + viewdist, viewy + viewdist,
-                                    viewx - viewdist, viewy + viewdist, backColor);*/
-                        //W_MakePointDB (mapSDB, viewx + viewdist, viewy + viewdist, backColor);
-                    if (viewx + viewdist < WINSIDE && viewy - viewdist > 0)
-                        W_MakePoint (mapw, viewx + viewdist, viewy - viewdist, backColor);
-                        /*W_MakeLine (mapw, viewx + viewdist, viewy - viewdist,
-                                    viewx + viewdist, viewy + viewdist, backColor);*/
-                        //W_MakePointDB (mapSDB, viewx + viewdist, viewy - viewdist, backColor);
-                    if (viewx - viewdist > 0 && viewy + viewdist < WINSIDE)
-                        W_MakePoint (mapw, viewx - viewdist, viewy + viewdist, backColor);
-                        /*W_MakeLine (mapw, viewx - viewdist, viewy + viewdist,
-                                    viewx - viewdist, viewy - viewdist, backColor);*/
-                        //W_MakePointDB (mapSDB, viewx - viewdist, viewy + viewdist, backColor);
-                    if (viewx - viewdist > 0 && viewy - viewdist > 0)
-                        W_MakePoint (mapw, viewx - viewdist, viewy - viewdist, backColor);
-                        /*W_MakeLine (mapw, viewx - viewdist, viewy - viewdist,
-                                    viewx + viewdist, viewy - viewdist, backColor);*/
-                        //W_MakePointDB (mapSDB, viewx - viewdist, viewy - viewdist, backColor);
+            clearviewbox = 0;
+            /* clear old dots - placed here for less flicker */
+            if (viewx + viewdist < WINSIDE && viewy + viewdist < WINSIDE)
+                  W_MakePoint (mapw, viewx + viewdist, viewy + viewdist, backColor);
+                   
+            if (viewx + viewdist < WINSIDE && viewy - viewdist > 0)
+                  W_MakePoint (mapw, viewx + viewdist, viewy - viewdist, backColor);
 
-                    /* redraw any planets they overwrote */
-                    mvx = viewx * (GWIDTH / WINSIDE); /* correct from view scale */
-                    mvy = viewy * (GWIDTH / WINSIDE);
-                    checkRedraw(mvx + view, mvy + view);
-                    checkRedraw(mvx + view, mvy - view);
-                    checkRedraw(mvx - view, mvy + view);
-                    checkRedraw(mvx - view, mvy - view);
-                }
-            }
+            if (viewx - viewdist > 0 && viewy + viewdist < WINSIDE)
+                  W_MakePoint (mapw, viewx - viewdist, viewy + viewdist, backColor);
+
+            if (viewx - viewdist > 0 && viewy - viewdist > 0)
+                  W_MakePoint (mapw, viewx - viewdist, viewy - viewdist, backColor);
+
+
+            /* redraw any planets they overwrote */
+            mvx = viewx * (GWIDTH / WINSIDE); /* correct from view scale */
+            mvy = viewy * (GWIDTH / WINSIDE);
+            checkRedraw(mvx + view, mvy + view);
+            checkRedraw(mvx + view, mvy - view);
+            checkRedraw(mvx - view, mvy + view);
+            checkRedraw(mvx - view, mvy - view);
+            viewboxcleared = 1;
         }
 
         /* Erase the ships */
@@ -691,7 +681,7 @@
     /* draw viewBox */
     if (viewBox)
     {
-        if (viewx != dx || viewy != dy)
+        if (viewboxcleared || viewx != dx || viewy != dy)
         {
             /* draw the new points */
             if (dx + viewdist < WINSIDE && dy + viewdist < WINSIDE)

Index: sound.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/sound.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sound.c	26 Apr 2006 15:54:04 -0000	1.6
+++ sound.c	26 Apr 2006 23:18:14 -0000	1.7
@@ -58,6 +58,8 @@
     {"nt_enter_ship", 4, 1},
     {"nt_self_destruct", 6, 1},
     {"nt_plasma_hit", 8, 1},
+    {"nt_enter_warp", 4, 1},
+    {"nt_exit_warp", 4, 1},
     {"nt_message", 4, 1},
     {"nt_message1", 4, 1},
     {"nt_message2", 4, 1},
@@ -95,6 +97,8 @@
   newsounds[CLOAKED_WAV] = Mix_LoadWAV(DATAFILE("nt_cloaked.wav"));
   newsounds[ENGINE_WAV] = Mix_LoadWAV(DATAFILE("nt_engine.wav"));
   newsounds[ENTER_SHIP_WAV] = Mix_LoadWAV(DATAFILE("nt_enter_ship.wav"));
+  newsounds[ENTER_WARP_WAV] = Mix_LoadWAV(DATAFILE("nt_enter_warp.wav"));
+  newsounds[EXIT_WARP_WAV] = Mix_LoadWAV(DATAFILE("nt_exit_warp.wav"));
   newsounds[EXPLOSION_WAV] = Mix_LoadWAV(DATAFILE("nt_explosion.wav"));
   newsounds[EXPLOSION_OTHER_WAV] = Mix_LoadWAV(DATAFILE("nt_explosion_other.wav"));
   newsounds[FIRE_PLASMA_WAV] = Mix_LoadWAV(DATAFILE("nt_fire_plasma.wav"));
@@ -290,8 +294,8 @@
     // at a later time
     // Current designations: 
     // group 1 = cloaked_wav
-    // group 2 = warning_wav
-    // group 3 = red_alert_wav
+    // group 2 = warning_wav and red_alert_wav
+    // group 3 = enter_warp_wav and exit_warp_wav
     // group 4 = shield_down_wav and shield_up_wav
     switch(type)
     {
@@ -300,10 +304,12 @@
                 LineToConsole("Mix_GroupChannel: %s\n", Mix_GetError());
             break;
         case WARNING_WAV:
+        case RED_ALERT_WAV:
             if(!Mix_GroupChannel(channel,2))
                 LineToConsole("Mix_GroupChannel: %s\n", Mix_GetError());
             break;
-        case RED_ALERT_WAV:
+        case ENTER_WARP_WAV:
+        case EXIT_WARP_WAV:
             if(!Mix_GroupChannel(channel,3))
                 LineToConsole("Mix_GroupChannel: %s\n", Mix_GetError());
             break;
@@ -380,6 +386,12 @@
         case ENTER_SHIP_SOUND:
             sprintf (buf, "Enter ship sound is %s", flag);
             break;
+        case ENTER_WARP_SOUND:
+            sprintf (buf, "Enter warp sound is %s", flag);
+            break;
+        case EXIT_WARP_SOUND:
+            sprintf (buf, "Exit warp sound is %s", flag);
+            break;
         case EXPLOSION_SOUND:
             sprintf (buf, "Explosion sound is %s", flag);
             break;



From quozl at users.sourceforge.net  Wed Apr 26 19:24:09 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Thu, 27 Apr 2006 00:24:09 +0000
Subject: [netrek-cvs] server/Vanilla ChangeLog,1.35,1.36
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1416

Modified Files:
	ChangeLog 
Log Message:
cambot compilation fixes

Index: ChangeLog
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ChangeLog,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- ChangeLog	26 Apr 2006 13:10:04 -0000	1.35
+++ ChangeLog	27 Apr 2006 00:24:07 -0000	1.36
@@ -1,3 +1,10 @@
+Thu Apr 27 09:32:33 2006  James Cameron  
+
+	* 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  
 
 	* tools/cambot.c (cb_updt): fix regression which caused cambot to



From quozl at users.sourceforge.net  Wed Apr 26 19:24:09 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Thu, 27 Apr 2006 00:24:09 +0000
Subject: [netrek-cvs] server/Vanilla/include genspkt.h,NONE,1.1
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1416/include

Added Files:
	genspkt.h 
Log Message:
cambot compilation fixes

--- NEW FILE: genspkt.h ---
/* genspkt.c functions, in separate proto due to packet structs */
int sndFlags( struct flags_spacket *flags, struct player *pl, int howmuch);
int sndKills( struct kills_spacket *kills, struct player *pl);
int sndLogin( struct plyr_login_spacket* login, struct player* pl);
int sndPStatus( struct pstatus_spacket *pstatus, struct player *pl);
int sndPhaser(struct phaser_spacket *ph, struct phaser_s_spacket *phs, struct phaser *phase, int i, int howmuch);
int sndPlanet(struct planet_spacket *pl, struct planet *plan, int howmuch);
int sndPlanetLoc(struct planet_loc_spacket *pll, struct planet *plan);
int sndPlasma(struct plasma_info_spacket *tpi, struct plasma_spacket *tp, struct torp *t, int i, int howmuch);
int sndPlayerInfo( struct plyr_info_spacket *cpli, struct player *pl);
int sndSSelf(struct you_short_spacket *youp, struct player* pl, int howmuch);
int sndSelfShip(struct youss_spacket *self, struct player *pl);
int updtMessageSMessage(struct message *cur);
int updtPlayer( struct player_spacket *cpl, struct player *pl, int howmuch);
void sendVKills(void);
void sendVKills(void);
void sendVPlanets(void);
void updtMessage(struct mesg_spacket *msg, struct message *cur);



From quozl at users.sourceforge.net  Wed Apr 26 19:24:09 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Thu, 27 Apr 2006 00:24:09 +0000
Subject: [netrek-cvs] server/Vanilla/ntserv genspkt.c,1.3,1.4
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/ntserv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1416/ntserv

Modified Files:
	genspkt.c 
Log Message:
cambot compilation fixes

Index: genspkt.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/genspkt.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- genspkt.c	27 Sep 2005 12:26:37 -0000	1.3
+++ genspkt.c	27 Apr 2006 00:24:07 -0000	1.4
@@ -24,6 +24,7 @@
 #include "data.h"
 #include "packets.h"
 #include "proto.h"
+#include "genspkt.h"
 
 #define FALSE 0
 #define TRUE 1
@@ -304,8 +305,7 @@
 
 }
 
-int
-sndFlags( struct flags_spacket *flags, struct player *pl, int howmuch)
+int sndFlags( struct flags_spacket *flags, struct player *pl, int howmuch)
 {
 /*#define FLAGMASK (PFSHIELD|PFBOMB|PFORBIT|PFCLOAK|PFROBOT|PFBEAMUP|PFBEAMDOWN|PFPRACTR|PFDOCK|PFTRACT|PFPRESS|PFDOCKOK) aieee, too much.  7/27/91 TC */ 
 /*#define FLAGMASK (PFSHIELD|PFBOMB|PFORBIT|PFCLOAK|PFROBOT|                    PFPRACTR|PFDOCK|PFTRACT|PFPRESS|PFDOCKOK) still more than needed */



From quozl at users.sourceforge.net  Wed Apr 26 19:24:09 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Thu, 27 Apr 2006 00:24:09 +0000
Subject: [netrek-cvs] server/Vanilla/tools cambot.c,1.3,1.4
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1416/tools

Modified Files:
	cambot.c 
Log Message:
cambot compilation fixes

Index: cambot.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/tools/cambot.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cambot.c	26 Apr 2006 13:10:04 -0000	1.3
+++ cambot.c	27 Apr 2006 00:24:07 -0000	1.4
@@ -6,12 +6,15 @@
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
 #include "defs.h"
 #include "struct.h"
 #include "data.h"
 #include "packets.h"
 #include "proto.h"
+#include "genspkt.h"
 
 #define UPDT_ALL 0
 #define UPDT_MOST 1



From modemhero at users.sourceforge.net  Wed Apr 26 19:57:57 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Thu, 27 Apr 2006 00:57:57 +0000
Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.23,1.24
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29008/resources/docs

Modified Files:
	changes.txt 
Log Message:
Giving up on getting torp/plasma fuse, going by closest torp/plasma for sound.

Index: changes.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- changes.txt	26 Apr 2006 23:18:14 -0000	1.23
+++ changes.txt	27 Apr 2006 00:57:54 -0000	1.24
@@ -11,8 +11,8 @@
 - change to warning sounds: changed current "warning" sound to the yellow alert sound, and
   made the red_alert sound file the red alert sound.  Added additional measures to stop
   playing the alert sound if you go down in alert status
-- change to plasma_other sounds: currently buggy due to no good way to determine which torp on
-  screen is most recent for sound purposes, however the basic stereo effect mostly works.
+- change to plasma_other sounds: uses closest other_plasma for sound location, as there is no
+  good way to determine which torp on screen is most recent for sound purposes.
 - change to plasma_hit sounds: nothing special other than stereo effect
 - change to phaser sounds: observers now hear phasers!  Also fixed it so observers locked
   onto a player hear self-phaser sounds rather than phaser_other sounds when that player
@@ -22,8 +22,8 @@
 - change to cloak/uncloak sounds: under old sound (not using newSound), observers now hear
   cloak/uncloak sounds for ship they are locked onto.  For newSound, you now hear
   cloak/uncloak events for all ships on the tactical.
-- change to torp_other sounds: currently buggy due to no good way to determine which torp on
-  screen is most recent for sound purposes, however the basic stereo effect mostly works.
+- change to torp_other sounds: uses closest other_torp for sound location, as there is no
+  good way to determine which torp on screen is most recent for sound purposes.
 - change to torp_explosion sounds: nothing special other than stereo effect.
 - change to explosion sounds:  changed it so observers who are locked onto a player who blows
   up hear the self-explosion sound rather than the explosion_other sound.



From modemhero at users.sourceforge.net  Wed Apr 26 19:57:56 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Thu, 27 Apr 2006 00:57:56 +0000
Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C,1.3,1.4
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29008

Modified Files:
	NetrekXP to do list.C 
Log Message:
Giving up on getting torp/plasma fuse, going by closest torp/plasma for sound.

Index: NetrekXP to do list.C
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- NetrekXP to do list.C	26 Apr 2006 23:18:13 -0000	1.3
+++ NetrekXP to do list.C	27 Apr 2006 00:57:54 -0000	1.4
@@ -8,10 +8,15 @@
 new-be-nice!!
 
 
-Things not gonna hapen:
+Things not gonna happen:
 1) Player list messaging doesn't work if you can't see player (cloaked, too far
 away, etc).  Don't think this is fixable.
 2) Get mkkey working.
+3) torp_other and plasma_other not working right due to lack of torp fuse info
+4) cloaking/shields at warp 0 doesn't update someone else's tactical on what you did.
+5) observer sound messes up when someone flips shields at warp 0
+6) the whole 'cloak when approaching base during twarp' thing is causing artifical cloak
+sounds to play
 
 Things to do:
 1) Add warning hull.
@@ -31,11 +36,7 @@
 6) genoed as obs on team with no planets -> you were killed by something not in this
 game
 7) Icon not working under Visual Studio
-8) torp_other and plasma_other not working right due to lack of torp fuse info
-9) cloaking/shields at warp 0 doesn't update someone else's tactical on what you did.
-9a) observer sound messes up when someone flips shields at warp 0
-9b) the whole 'cloak when approaching base during twarp' thing is causing artifical cloak
-sounds to play
+
 
 
 



From modemhero at users.sourceforge.net  Wed Apr 26 19:57:57 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Thu, 27 Apr 2006 00:57:57 +0000
Subject: [netrek-cvs] client/netrekxp/src local.c,1.11,1.12
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29008/src

Modified Files:
	local.c 
Log Message:
Giving up on getting torp/plasma fuse, going by closest torp/plasma for sound.

Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- local.c	26 Apr 2006 23:18:14 -0000	1.11
+++ local.c	27 Apr 2006 00:57:54 -0000	1.12
@@ -51,11 +51,9 @@
 static int other_torp_dist = 0;
 static int new_other_torp_dist = 0;
 static int other_torp_angle = 0;
-static int old_t_fuse = 0;
 static int other_plasma_dist = 0;
 static int new_other_plasma_dist = 0;
 static int other_plasma_angle = 0;
-static int old_pt_fuse = 0;
 static int warpchange = 0;
 static unsigned int twarpflag = 0; 
 #endif
@@ -600,8 +598,7 @@
                             Play_Sound(UNCLOAK_WAV);
                         else
                             Play_Sound_Loc(UNCLOAK_WAV, angle, distance);
-      
-                            
+                   
                     }
                     else    // Kill any channels with CLOAKED_WAV on them (group 1)
 		        Mix_HaltGroup(1);
@@ -1447,7 +1444,6 @@
     register struct torp *k, *t;
     register int dx, dy;
     struct player *j;
-
     int torpCount;
     const int view = SCALE * WINSIDE / 2;
 
@@ -1512,10 +1508,9 @@
 #ifdef SOUND
             if (j != me && newSound)
             {
-            	int new_t_fuse;
             	int new_angle;
 		int newdy, newdx;
-		
+
 		newdy = dy / SCALE;
 		newdx = dx / SCALE;
                 // Store location of torp.
@@ -1525,28 +1520,15 @@
                 // Reason for normalization is Mix_SetDistance requires that range        
                 new_other_torp_dist = (int)((255 * new_other_torp_dist)/CORNER_DIST);
                 // Find how long till torp expires...BROKEN!
-                new_t_fuse = k->t_updateFuse;
                 // Calculate angle, then adjust as necessary for Mix_SetDistance
                 new_angle = (int)(atan2(newdy, newdx)*180/XPI);
                 new_angle = 270 - new_angle;
-                // Find torp that has been around the least time, that is the one to play
-                // the sound from.  In case of tie, choose closest one.
-                if (new_t_fuse > old_t_fuse)
+                // Choose closest torp - yes this sucks sometimes, but better than nothing
+                if (new_other_torp_dist < other_torp_dist)
                 {
                     other_torp_dist = new_other_torp_dist;
-                    old_t_fuse = new_t_fuse;
                     other_torp_angle = new_angle;
-                }
-                else if (new_t_fuse == old_t_fuse)
-                {
-                    if (new_other_torp_dist < other_torp_dist)
-                    {
-                        other_torp_dist = new_other_torp_dist;
-                        old_t_fuse = new_t_fuse;
-                        other_torp_angle = new_angle;
-                    }
-                }
-                	
+                }	
             }
 #endif         
             dx = dx / SCALE + WINSIDE / 2;
@@ -1759,9 +1741,8 @@
 #ifdef SOUND
         if (pt->pt_owner != me->p_no && newSound)
         {
-            int new_pt_fuse;
             int new_angle;
-	    int newdy, newdx;
+            int newdy, newdx;
 		
 	    newdy = dy / SCALE;
 	    newdx = dx / SCALE;
@@ -1772,27 +1753,15 @@
             // Reason for normalization is Mix_SetDistance requires that range        
             new_other_plasma_dist = (int)((255 * new_other_plasma_dist)/CORNER_DIST);
             // Find how long till torp expires...BROKEN!
-            new_pt_fuse = pt->pt_updateFuse;
             // Calculate angle, then adjust as necessary for Mix_SetDistance
             new_angle = (int)(atan2(newdy, newdx)*180/XPI);
             new_angle = 270 - new_angle;
-            // Find plasma that has been around the least time, that is the one to play
-            // the sound from.  In case of tie, choose closest one.
-            if (new_pt_fuse > old_pt_fuse)
+            // Choose closest plasma - yes this sucks sometimes, but better than nothing
+            if (new_other_plasma_dist < other_plasma_dist)
             {
                 other_plasma_dist = new_other_plasma_dist;
-                old_pt_fuse = new_pt_fuse;
                 other_plasma_angle = new_angle;
-            }
-            else if (new_pt_fuse == old_pt_fuse)
-            {
-                if (new_other_torp_dist < other_torp_dist)
-                {
-                    other_plasma_dist = new_other_plasma_dist;
-                    old_pt_fuse = new_pt_fuse;
-                    other_plasma_angle = new_angle;
-                 }
-             }     	
+            }   	
         }
 #endif   
 
@@ -2225,11 +2194,9 @@
         // Reset locations and fuses of other's closest torps and plasmas
         other_torp_dist = CORNER_DIST;
         new_other_torp_dist = 0;
-        old_t_fuse = 0;
         other_torp_angle = 0;
         other_plasma_dist = CORNER_DIST;
         new_other_plasma_dist = 0;
-        old_pt_fuse = 0;
         other_plasma_angle = 0;
     }
     else



From netrek at gmail.com  Wed Apr 26 21:57:26 2006
From: netrek at gmail.com (Zach)
Date: Wed, 26 Apr 2006 22:57:26 -0400
Subject: [netrek-cvs] test
Message-ID: 

1
2
3


From quozl at users.sourceforge.net  Thu Apr 27 00:25:07 2006
From: quozl at users.sourceforge.net (James Cameron)
Date: Thu, 27 Apr 2006 05:25:07 +0000
Subject: [netrek-cvs] server/Vanilla system.mk.in,1.2,1.3
Message-ID: 

Update of /cvsroot/netrek/server/Vanilla
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20107

Modified Files:
	system.mk.in 
Log Message:
add -Wall

Index: system.mk.in
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/system.mk.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- system.mk.in	28 Sep 2005 12:14:04 -0000	1.2
+++ system.mk.in	27 Apr 2006 05:25:04 -0000	1.3
@@ -86,4 +86,4 @@
 RSA_INCS = @NORSA@ @MPINC@
 RSA_LIB = @NORSA@ @RSALIB@ @MPLIB@
 
-FLAGS = @CFLAGS@ $(EXTRAFLAGS) $(RSA_FLAGS)
+FLAGS = @CFLAGS@ -Wall $(EXTRAFLAGS) $(RSA_FLAGS)



From modemhero at users.sourceforge.net  Thu Apr 27 11:48:25 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Thu, 27 Apr 2006 16:48:25 +0000
Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C,1.4,1.5
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5429

Modified Files:
	NetrekXP to do list.C 
Log Message:
Made it so cloak sounds not played at twarp cloakflash events.

Index: NetrekXP to do list.C
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- NetrekXP to do list.C	27 Apr 2006 00:57:54 -0000	1.4
+++ NetrekXP to do list.C	27 Apr 2006 16:48:23 -0000	1.5
@@ -14,9 +14,7 @@
 2) Get mkkey working.
 3) torp_other and plasma_other not working right due to lack of torp fuse info
 4) cloaking/shields at warp 0 doesn't update someone else's tactical on what you did.
-5) observer sound messes up when someone flips shields at warp 0
-6) the whole 'cloak when approaching base during twarp' thing is causing artifical cloak
-sounds to play
+4a) observer sound messes up when someone flips shields at warp 0
 
 Things to do:
 1) Add warning hull.
@@ -36,9 +34,9 @@
 6) genoed as obs on team with no planets -> you were killed by something not in this
 game
 7) Icon not working under Visual Studio
-
-
-
+8) Colorize weapons
+9) Resolve curslib and winkey dll issues
+10) Option menus too long
 
 Might be done:
 1) mouse scroll in message windows gets the up/down coord wrong when main title



From modemhero at users.sourceforge.net  Thu Apr 27 11:48:26 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Thu, 27 Apr 2006 16:48:26 +0000
Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.24,1.25
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5429/resources/docs

Modified Files:
	changes.txt 
Log Message:
Made it so cloak sounds not played at twarp cloakflash events.

Index: changes.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- changes.txt	27 Apr 2006 00:57:54 -0000	1.24
+++ changes.txt	27 Apr 2006 16:48:23 -0000	1.25
@@ -1,4 +1,5 @@
 Version TBA:
+- made it so cloak sounds don't play at the twarp flash event (happens at warp 15, 31, 46)
 - changed self destruct sound so it doesn't sound like enter ship sound
 - added 2 new message sounds (they can be called by beeplite)
 - add 2 new sounds for enter/exiting transwarp, and observer support for hearing these as



From modemhero at users.sourceforge.net  Thu Apr 27 11:48:26 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Thu, 27 Apr 2006 16:48:26 +0000
Subject: [netrek-cvs] client/netrekxp/src defaults.c, 1.9, 1.10 local.c, 1.12,
	1.13
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5429/src

Modified Files:
	defaults.c local.c 
Log Message:
Made it so cloak sounds not played at twarp cloakflash events.

Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- local.c	27 Apr 2006 00:57:54 -0000	1.12
+++ local.c	27 Apr 2006 16:48:24 -0000	1.13
@@ -536,7 +536,9 @@
         
         if (j->p_flags & PFCLOAK)
         {
-            if (j->p_cloakphase < (CLOAK_PHASES - 1))
+            // To avoid sounds at twarp "cloak" speed and the speed below it ("decloak" speed)
+            if (j->p_cloakphase < (CLOAK_PHASES - 1)
+            && (F_cloak_maxwarp ? (j->p_speed != 0xf && j->p_speed != 0xe): 1))
             {
             	
 #ifdef SOUND
@@ -574,7 +576,9 @@
         }
         else
         {
-            if (j->p_cloakphase)
+            // To avoid sounds at twarp "cloak" speed and the speed below it ("decloak" speed)
+            if (j->p_cloakphase
+            && (F_cloak_maxwarp ? (j->p_speed != 0xf && j->p_speed != 0xe): 1))
             {
             	
 #ifdef SOUND

Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- defaults.c	24 Apr 2006 15:30:38 -0000	1.9
+++ defaults.c	27 Apr 2006 16:48:24 -0000	1.10
@@ -125,7 +125,10 @@
     },
     {"dynamicBitmaps", &dynamicBitmaps, RC_BOOL,
     	{
-    	    "Allow switching of ship bitmaps in game",
+    	    "Allow switching of ship bitmaps in game.  With this option disabled",
+    	    "not all bitmaps load into memory.  This option is thus not changeable",
+    	    "in game.  Do not attempt to edit your netrekrc to turn dynamic bitmaps",
+    	    "on and then reload the netrekrc with the & key - restart the client instead.",
     	    NULL
     	}
     },



From modemhero at users.sourceforge.net  Thu Apr 27 16:22:07 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Thu, 27 Apr 2006 21:22:07 +0000
Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.25,1.26
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27332/resources/docs

Modified Files:
	changes.txt 
Log Message:
Twarp cloak fix.

Index: changes.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- changes.txt	27 Apr 2006 16:48:23 -0000	1.25
+++ changes.txt	27 Apr 2006 21:22:05 -0000	1.26
@@ -1,5 +1,5 @@
 Version TBA:
-- made it so cloak sounds don't play at the twarp flash event (happens at warp 15, 31, 46)
+- made it so cloak sounds don't play at your twarp flash event (happens at warp 15, 31, 46)
 - changed self destruct sound so it doesn't sound like enter ship sound
 - added 2 new message sounds (they can be called by beeplite)
 - add 2 new sounds for enter/exiting transwarp, and observer support for hearing these as



From modemhero at users.sourceforge.net  Thu Apr 27 16:22:07 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Thu, 27 Apr 2006 21:22:07 +0000
Subject: [netrek-cvs] client/netrekxp/src local.c,1.13,1.14
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27332/src

Modified Files:
	local.c 
Log Message:
Twarp cloak fix.

Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- local.c	27 Apr 2006 16:48:24 -0000	1.13
+++ local.c	27 Apr 2006 21:22:05 -0000	1.14
@@ -536,37 +536,39 @@
         
         if (j->p_flags & PFCLOAK)
         {
-            // To avoid sounds at twarp "cloak" speed and the speed below it ("decloak" speed)
-            if (j->p_cloakphase < (CLOAK_PHASES - 1)
-            && (F_cloak_maxwarp ? (j->p_speed != 0xf && j->p_speed != 0xe): 1))
+            if (j->p_cloakphase < (CLOAK_PHASES - 1))
             {
             	
 #ifdef SOUND
                 if (j->p_cloakphase == 0)
                 {
-                    if (newSound)
-                    {               
-                        newdx = dx - WINSIDE/2;
-                        newdy = dy - WINSIDE/2;
+                    // To avoid hearing twarp cloak sounds as the twarper/observer
+                    if ( (myPlayer(j) || isObsLockPlayer(j)) ? ((me->p_flags & PFTWARP) ? 0 : 1) : 1 )
+                    {
+                        if (newSound)
+                        {               
+                            newdx = dx - WINSIDE/2;
+                            newdy = dy - WINSIDE/2;
                         
-                        distance = (int) sqrt((newdx)*(newdx) + (newdy)*(newdy));
-                        // Normalize from 0 to 255, 0 being on top of player, 255 being max distance
-                        // which would be a diagonal from player to corner of tactical
-                        // Reason for normalization is Mix_SetDistance requires that range        
-                        distance = (int)((255 * distance)/CORNER_DIST);
-                        // Calculate angle, then adjust as necessary for Mix_SetDistance
-                        angle = (int)(atan2(newdy, newdx)*180/XPI);
-                        angle = 270 - angle;
-                        // At short distances, don't use angular sound
-                        if (distance < SCALE/2)
-                            Play_Sound(CLOAKED_WAV);
+                            distance = (int) sqrt((newdx)*(newdx) + (newdy)*(newdy));
+                            // Normalize from 0 to 255, 0 being on top of player, 255 being max distance
+                            // which would be a diagonal from player to corner of tactical
+                            // Reason for normalization is Mix_SetDistance requires that range        
+                            distance = (int)((255 * distance)/CORNER_DIST);
+                            // Calculate angle, then adjust as necessary for Mix_SetDistance
+                            angle = (int)(atan2(newdy, newdx)*180/XPI);
+                            angle = 270 - angle;
+                            // At short distances, don't use angular sound
+                            if (distance < SCALE/2)
+                                Play_Sound(CLOAKED_WAV);
+                            else
+                                Play_Sound_Loc(CLOAKED_WAV, angle, distance);
+                        }
                         else
-                            Play_Sound_Loc(CLOAKED_WAV, angle, distance);
-                    }
-                    else
-                    {
-                        if (myPlayer(j) || isObsLockPlayer(j))
-                            Play_Sound(CLOAK_SOUND);
+                        {
+                            if (myPlayer(j) || isObsLockPlayer(j))
+                                Play_Sound(CLOAK_SOUND);
+                        }
                     }
                 }
 #endif
@@ -576,49 +578,48 @@
         }
         else
         {
-            // To avoid sounds at twarp "cloak" speed and the speed below it ("decloak" speed)
-            if (j->p_cloakphase
-            && (F_cloak_maxwarp ? (j->p_speed != 0xf && j->p_speed != 0xe): 1))
+            if (j->p_cloakphase)
             {
             	
 #ifdef SOUND
-                if (newSound)
+                // To avoid twarp cloak sounds as the twarper/observer
+                if ( (myPlayer(j) || isObsLockPlayer(j)) ? ((me->p_flags & PFTWARP) ? 0 : 1) : 1 )
                 {
-                    if (j->p_cloakphase == CLOAK_PHASES - 1)
+                    if (newSound)
                     {
-                        newdx = dx - WINSIDE/2;
-                        newdy = dy - WINSIDE/2;
+                        if (j->p_cloakphase == CLOAK_PHASES - 1)
+                            {
+                            newdx = dx - WINSIDE/2;
+                            newdy = dy - WINSIDE/2;
                         
-                        distance = (int) sqrt((newdx)*(newdx) + (newdy)*(newdy));
-                        // Normalize from 0 to 255, 0 being on top of player, 255 being max distance
-                        // which would be a diagonal from player to corner of tactical
-                        // Reason for normalization is Mix_SetDistance requires that range        
-                        distance = (int)((255 * distance)/CORNER_DIST);
-                        // Calculate angle, then adjust as necessary for Mix_SetDistance
-                        angle = (int)(atan2(newdy, newdx)*180/XPI);
-                        angle = 270 - angle;
-                        // At short distances, don't use angular sound
-                        if (distance < SCALE/2)
-                            Play_Sound(UNCLOAK_WAV);
-                        else
-                            Play_Sound_Loc(UNCLOAK_WAV, angle, distance);
-                   
+                            distance = (int) sqrt((newdx)*(newdx) + (newdy)*(newdy));
+                            // Normalize from 0 to 255, 0 being on top of player, 255 being max distance
+                            // which would be a diagonal from player to corner of tactical
+                            // Reason for normalization is Mix_SetDistance requires that range        
+                            distance = (int)((255 * distance)/CORNER_DIST);
+                            // Calculate angle, then adjust as necessary for Mix_SetDistance
+                            angle = (int)(atan2(newdy, newdx)*180/XPI);
+                            angle = 270 - angle;
+                             // At short distances, don't use angular sound
+                            if (distance < SCALE/2)
+                                Play_Sound(UNCLOAK_WAV);
+                            else
+                                Play_Sound_Loc(UNCLOAK_WAV, angle, distance);
+                        }
+                        else    // Kill any channels with CLOAKED_WAV on them (group 1)
+		            Mix_HaltGroup(1);
                     }
-                    else    // Kill any channels with CLOAKED_WAV on them (group 1)
-		        Mix_HaltGroup(1);
-
-                }
-                else
-                {
-                    if (myPlayer(j) || isObsLockPlayer(j))
+                    else
                     {
-                        if (j->p_cloakphase == CLOAK_PHASES - 1)
-                            Play_Sound(UNCLOAK_SOUND);
-                        else
-                            Abort_Sound(CLOAK_SOUND);
+                        if (myPlayer(j) || isObsLockPlayer(j))
+                        {
+                            if (j->p_cloakphase == CLOAK_PHASES - 1)
+                                Play_Sound(UNCLOAK_SOUND);
+                            else
+                                Abort_Sound(CLOAK_SOUND);
+                        }
                     }
-                }
-                    
+                }            
 #endif
             	
                 j->p_cloakphase--;



From modemhero at users.sourceforge.net  Thu Apr 27 17:38:44 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Thu, 27 Apr 2006 22:38:44 +0000
Subject: [netrek-cvs] client/netrekxp/src data.c, 1.12, 1.13 defaults.c, 1.10,
	1.11 sound.c, 1.7, 1.8
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30949/src

Modified Files:
	data.c defaults.c sound.c 
Log Message:
New rc option, newSoundAngles on/off, to lose the stereo 3D component but still keep the layered, scaling with distance SDL sound.

Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- data.c	26 Apr 2006 02:04:24 -0000	1.12
+++ data.c	27 Apr 2006 22:38:42 -0000	1.13
@@ -722,4 +722,5 @@
 
 int richText = 0;   /* temporary variable to select rich text message windows */
 
-int newSound = 1;   /* use new SDL sound */
\ No newline at end of file
+int newSound = 1;   /* use new SDL sound */
+int newSoundAngles = 1; /* use new SDL sound with angular 3d component */
\ No newline at end of file

Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- defaults.c	27 Apr 2006 16:48:24 -0000	1.10
+++ defaults.c	27 Apr 2006 22:38:42 -0000	1.11
@@ -287,6 +287,12 @@
             NULL
         }
     },
+    {"newSoundAngles", &newSoundAngles, RC_BOOL,
+        {
+            "Use 3D sound effects (only works if newSound is on)",
+            NULL
+        }
+    },
     {"omitTeamLetter", &omitTeamLetter, RC_BOOL,
         {
             "Omit team letter on galaxy",
@@ -1358,6 +1364,7 @@
 
     allowWheelActions = booleanDefault ("allowWheelActions", allowWheelActions);
     newSound = booleanDefault ("newSound", newSound);
+    newSoundAngles = booleanDefault ("newSoundAngles", newSoundAngles);
     tpDotDist = intDefault ("tpDotDist", tpDotDist);
     omitTeamLetter = booleanDefault ("omitTeamLetter", omitTeamLetter);
 	beepOnPrivateMessage = booleanDefault ("beepOnPrivateMessage", beepOnPrivateMessage);

Index: sound.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/sound.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- sound.c	26 Apr 2006 23:18:14 -0000	1.7
+++ sound.c	27 Apr 2006 22:38:42 -0000	1.8
@@ -277,11 +277,23 @@
     	distance = 0;
     if (distance > 255)
     	distance = 255;
-    // Adjust volume with distance and angle
-    if (Mix_SetPosition(channel, angle, distance) == 0)
+    if (newSoundAngles)
     {
-        LineToConsole("Mix_SetPosition: %s\n", Mix_GetError());
-        return;
+        // Adjust volume with distance and angle
+        if (Mix_SetPosition(channel, angle, distance) == 0)
+        {
+           LineToConsole("Mix_SetPosition: %s\n", Mix_GetError());
+            return;
+        }
+    }
+    else
+    {
+        // Adjust volume with distance
+        if (Mix_SetDistance(channel, distance) == 0)
+        {
+           LineToConsole("Mix_SetDistance: %s\n", Mix_GetError());
+            return;
+        }
     }
         
     Group_Sound(type, channel);



From modemhero at users.sourceforge.net  Thu Apr 27 17:38:44 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Thu, 27 Apr 2006 22:38:44 +0000
Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp netrek.chm, 1.3, 1.4
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30949/resources/htmlhelp

Modified Files:
	netrek.chm 
Log Message:
New rc option, newSoundAngles on/off, to lose the stereo 3D component but still keep the layered, scaling with distance SDL sound.

Index: netrek.chm
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/netrek.chm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsEDS4sx and /tmp/cvs92WjgX differ



From modemhero at users.sourceforge.net  Thu Apr 27 17:38:44 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Thu, 27 Apr 2006 22:38:44 +0000
Subject: [netrek-cvs] client/netrekxp/include data.h,1.8,1.9
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30949/include

Modified Files:
	data.h 
Log Message:
New rc option, newSoundAngles on/off, to lose the stereo 3D component but still keep the layered, scaling with distance SDL sound.

Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- data.h	26 Apr 2006 02:04:24 -0000	1.8
+++ data.h	27 Apr 2006 22:38:41 -0000	1.9
@@ -622,5 +622,5 @@
 extern int richText;    /* temporary variable to enable/disable rich text windows */
 
 extern int newSound;	/* Use new SDL sound interface */
-
+extern int newSoundAngles; /* Use SDL with angular 3D sound */
 #endif /* _h_data */



From modemhero at users.sourceforge.net  Thu Apr 27 17:38:44 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Thu, 27 Apr 2006 22:38:44 +0000
Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html
	generalconfig.html, 1.4, 1.5
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30949/resources/htmlhelp/html

Modified Files:
	generalconfig.html 
Log Message:
New rc option, newSoundAngles on/off, to lose the stereo 3D component but still keep the layered, scaling with distance SDL sound.

Index: generalconfig.html
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/generalconfig.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- generalconfig.html	24 Apr 2006 15:30:38 -0000	1.4
+++ generalconfig.html	27 Apr 2006 22:38:42 -0000	1.5
@@ -531,6 +531,16 @@
 
 
 
+newSoundAngles
+Use 3D sound effects (only works if newSound is on)
+
+	
                      
+	
                    • on(default)
                      • 
+	
                    • off
                      • 
+	
                    
+
+
+
 omitTeamLetter
 Don't draw team letter on galaxy
 



From modemhero at users.sourceforge.net  Thu Apr 27 17:38:44 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Thu, 27 Apr 2006 22:38:44 +0000
Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.26,
	1.27 netrekrc_options.txt, 1.2, 1.3
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30949/resources/docs

Modified Files:
	changes.txt netrekrc_options.txt 
Log Message:
New rc option, newSoundAngles on/off, to lose the stereo 3D component but still keep the layered, scaling with distance SDL sound.

Index: netrekrc_options.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc_options.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- netrekrc_options.txt	24 Apr 2006 15:30:37 -0000	1.2
+++ netrekrc_options.txt	27 Apr 2006 22:38:42 -0000	1.3
@@ -108,6 +108,7 @@
 # off - old style
 
 newSound:                 (on/off) use layered, stereo sound   
+newSoundAngles:           (on/off) use 3D sound effects (only works if newSound is on)
 omitTeamLetter:           (on/off) omit team letter on galaxy
 orishipbmpfile:           (path) - old color bitmaps
 oriship1bmpfile:          (path) - new color bitmaps

Index: changes.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- changes.txt	27 Apr 2006 21:22:05 -0000	1.26
+++ changes.txt	27 Apr 2006 22:38:42 -0000	1.27
@@ -1,4 +1,7 @@
 Version TBA:
+- added "newSoundAngles: (on)/off" so one can choose to use SDL sound but lose the
+  directionality component (sounds will still be toned down in volume with distance, but
+  there will be no 3d sound component)
 - made it so cloak sounds don't play at your twarp flash event (happens at warp 15, 31, 46)
 - changed self destruct sound so it doesn't sound like enter ship sound
 - added 2 new message sounds (they can be called by beeplite)



From modemhero at users.sourceforge.net  Thu Apr 27 17:52:14 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Thu, 27 Apr 2006 22:52:14 +0000
Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.27,1.28
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10395/resources/docs

Modified Files:
	changes.txt 
Log Message:
New playerlist options menu

Index: changes.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- changes.txt	27 Apr 2006 22:38:42 -0000	1.27
+++ changes.txt	27 Apr 2006 22:52:12 -0000	1.28
@@ -1,4 +1,6 @@
 Version TBA:
+- added a new Playerlist menu to the Options Menus, so the other menus are not as
+  cluttered, and all playerlist options are now on the same menu page.
 - added "newSoundAngles: (on)/off" so one can choose to use SDL sound but lose the
   directionality component (sounds will still be toned down in volume with distance, but
   there will be no 3d sound component)



From modemhero at users.sourceforge.net  Thu Apr 27 17:52:14 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Thu, 27 Apr 2006 22:52:14 +0000
Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C,1.5,1.6
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10395

Modified Files:
	NetrekXP to do list.C 
Log Message:
New playerlist options menu

Index: NetrekXP to do list.C
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- NetrekXP to do list.C	27 Apr 2006 16:48:23 -0000	1.5
+++ NetrekXP to do list.C	27 Apr 2006 22:52:11 -0000	1.6
@@ -33,10 +33,8 @@
 closeable by shift right click.
 6) genoed as obs on team with no planets -> you were killed by something not in this
 game
-7) Icon not working under Visual Studio
+7) Icon not working under Visual Studio.  Also must resolve curslib, winkey and build issues
 8) Colorize weapons
-9) Resolve curslib and winkey dll issues
-10) Option menus too long
 
 Might be done:
 1) mouse scroll in message windows gets the up/down coord wrong when main title



From modemhero at users.sourceforge.net  Thu Apr 27 17:52:14 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Thu, 27 Apr 2006 22:52:14 +0000
Subject: [netrek-cvs] client/netrekxp/src option.c,1.8,1.9
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10395/src

Modified Files:
	option.c 
Log Message:
New playerlist options menu

Index: option.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- option.c	22 Apr 2006 12:09:19 -0000	1.8
+++ option.c	27 Apr 2006 22:52:12 -0000	1.9
@@ -260,7 +260,6 @@
     {-1, NULL, 0, 0, 0, 0, NULL, NULL}
 };
 
-
 struct option Planet_Menu[] = {
     {0, "Planet Menu", &MenuPage, 0, 0, 0, NULL, &Menus_Range},
     {1, "Page %d (click to change)", &MenuPage, 0, 0, 0, NULL, &Menus_Range},
@@ -278,7 +277,6 @@
     {-1, NULL, 0, 0, 0, 0, NULL, NULL}
 };
 
-
 struct option Control_Menu[] = {
     {0, "Control Menu", &MenuPage, 0, 0, 0, NULL, &Menus_Range},
     {1, "Page %d (click to change)", &MenuPage, 0, 0, 0, NULL, &Menus_Range},
@@ -296,13 +294,12 @@
      &redraw_updates_range},
     {1, "", &windowMove, 0, 0, 0, windowmovemess, NULL},
     {1, "avoid message kludge", &niftyNewMessages, 0, 0, 0, NULL, NULL},
-	{1, "", &playerListMessaging, 0, 0, 0, plistmessagingmess, NULL},
-	{1, "beep on private message", &beepOnPrivateMessage, 0, 0, 0, NULL, NULL},
+    {1, "", &playerListMessaging, 0, 0, 0, plistmessagingmess, NULL},
+    {1, "beep on private message", &beepOnPrivateMessage, 0, 0, 0, NULL, NULL},
     {1, "done", ¬done, 0, 0, 0, NULL, NULL},
     {-1, NULL, 0, 0, 0, 0, NULL, NULL}
 };
 
-
 struct option Window_Menu[] = {
     {0, "Info Menu", &MenuPage, 0, 0, 0, NULL, &Menus_Range},
     {1, "Page %d (click to change)", &MenuPage, 0, 0, 0, NULL, &Menus_Range},
@@ -313,7 +310,6 @@
     {1, "show \"total\" message window", 0, &reviewWin, 0, 0, NULL, NULL},
     {1, "show phaser log window", 0, &phaserwin, 0, 0, NULL},
     {1, "show statistic window", 0, &statwin, 0, 0, NULL, NULL},
-    {1, "show alternate player list", 0, &playerw2, 0, 0, NULL, NULL},
     {1, "show help window", 0, &helpWin, 0, 0, NULL, NULL},
     {1, "show hints window", &showHints, &hintWin, 0, 0, NULL, NULL},
 #ifdef XTREKRC_HELP
@@ -338,16 +334,23 @@
     {-1, NULL, 0, 0, 0, 0, NULL, NULL}
 };
 
-
-struct option Visual_Menu[] = {
-    {0, "Visuals Menu", &MenuPage, 0, 0, 0, NULL, &Menus_Range},
+struct option Playerlist_Menu[] = {
+    {0, "Playerlist Menu", &MenuPage, 0, 0, 0, NULL, &Menus_Range},
     {1, "Page %d (click to change)", &MenuPage, 0, 0, 0, NULL, &Menus_Range},
     {1, "", &playerListStyle, 0, 0, 0, plistoptions, NULL},
+    {1, "show alternate player list", 0, &playerw2, 0, 0, NULL, NULL},
     {1, "sort the playerlist", &sortPlayers, 0, 0, 0, NULL, 0},
     {1, "put my team first in the list", &sortMyTeamFirst, 0, 0, 0, NULL, 0},
     {1, "partition the playerlist", &partitionPlist, 0, 0, 0, NULL, 0},
     {1, "", &playerListObserver, 0, 0, 0, playerlistobservermess, &playerlistobserver_range},
     {1, "hack player list", &playerListHack, 0, 0, 0, NULL, 0},
+    {1, "done", ¬done, 0, 0, 0, NULL, NULL},
+    {-1, NULL, 0, 0, 0, 0, NULL, NULL}
+};
+
+struct option Visual_Menu[] = {
+    {0, "Visuals Menu", &MenuPage, 0, 0, 0, NULL, &Menus_Range},
+    {1, "Page %d (click to change)", &MenuPage, 0, 0, 0, NULL, &Menus_Range},
     {1, "", &newDashboard, 0, 0, 0, dashboardoptions, NULL},
     {1, "", &timerType, 0, 0, 0, timermess, NULL},
     {1, "keep info %d upds (0=don't remove)", &keepInfo, 0, 0, 0, 0, &keepInfo_range},
@@ -361,7 +364,7 @@
 #ifdef HOCKEY_LINES
     {1, "show hockey lines on local", &showHockeyLinesLocal, 0, 0, 0, NULL, NULL},
     {1, "show hockey lines on map", &showHockeyLinesMap, 0, 0, 0, NULL, NULL},
-	{1, "show hockey score on map", &showHockeyScore, 0, 0, 0, NULL, NULL},
+    {1, "show hockey score on map", &showHockeyScore, 0, 0, 0, NULL, NULL},
 #endif
     {1, "alert on extra border(s)", &extraAlertBorder, 0, 0, 0, NULL, NULL},
 #ifdef PHASER_STATS
@@ -973,6 +976,7 @@
     AddOptMenu (Planet_Menu, 0);
     AddOptMenu (Visual_Menu, 0);
     AddOptMenu (Window_Menu, 0);
+    AddOptMenu (Playerlist_Menu, 0);
     AddOptMenu (Save_Menu, 0);
 
 



From modemhero at users.sourceforge.net  Sat Apr 29 14:20:26 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 29 Apr 2006 19:20:26 +0000
Subject: [netrek-cvs] client/netrekxp/resources/weaplibm/mono - New directory
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/weaplibm/mono
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1433/mono

Log Message:
Directory /cvsroot/netrek/client/netrekxp/resources/weaplibm/mono added to the repository




From modemhero at users.sourceforge.net  Sat Apr 29 14:21:10 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 29 Apr 2006 19:21:10 +0000
Subject: [netrek-cvs] client/netrekxp/resources/weaplibm/color - New
	directory
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/weaplibm/color
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2026/color

Log Message:
Directory /cvsroot/netrek/client/netrekxp/resources/weaplibm/color added to the repository




From modemhero at users.sourceforge.net  Sat Apr 29 14:22:40 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 29 Apr 2006 19:22:40 +0000
Subject: [netrek-cvs] client/netrekxp/src data.c, 1.13, 1.14 defaults.c, 1.11,
	1.12 local.c, 1.14, 1.15 mswindow.c, 1.7, 1.8 newwin.c, 1.12,
	1.13 option.c, 1.9, 1.10
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3021/src

Modified Files:
	data.c defaults.c local.c mswindow.c newwin.c option.c 
Log Message:
Addition of color weapons, based on COW/TedTurner, but made better :).

Index: mswindow.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mswindow.c	21 Apr 2006 12:00:07 -0000	1.7
+++ mswindow.c	29 Apr 2006 19:22:38 -0000	1.8
@@ -444,18 +444,39 @@
     // Free other bitmaps
     free (clockpic);
 
+    for (j = 0; j < NUM_CTORP_TYPES; j++)
+    {
+        for (i = 0; i < BMP_TORPDET_FRAMES; i++)
+        {
+            free (cloudC[j][i]);
+            free (plcloudC[j][i]);
+        }
+        for (i = 0; i < BMP_TORP_FRAMES; i++)
+        {
+            free (torpC[j][i]);
+            free (mtorpC[j][i]);
+            free (plasmaC[j][i]);
+            free (mplasmaC[j][i]);
+        }
+
+    }
+    free (torp_cloud_bitmaps);
+    free (plasma_cloud_bitmaps);
+    free (mtorp_bitmaps);
+    free (torp_bitmaps);
+    free (mplasma_bitmaps);
+    free (plasma_bitmaps);
+
     for (i = 0; i < BMP_TORPDET_FRAMES; i++)
     {
         free (cloud[i]);
         free (plasmacloud[i]);
     }
-
-#ifdef COLORIZEWEAPON
     free (etorp);
     free (mtorp);
     free (eplasmatorp);
     free (mplasmatorp);
-#endif /* COLORIZEWEAPON */
+
 
     for (i = 0; i < PLANET_VIEWS; i++)
         free (bplanets[i]);
@@ -3548,8 +3569,7 @@
     HBITMAP temp = 0;
 
     FNHEADER;
-    //Allocate memory for the bitmap structure and convert the
-    //X11 bitmap into a useful form
+    //Allocate memory for the bitmap structure
     if (!(bitmap = (struct Icon *) malloc (sizeof (struct Icon))))
         goto memfail;
 
@@ -3609,8 +3629,7 @@
     HBITMAP temp = 0;
 
     FNHEADER;
-    //Allocate memory for the bitmap structure and convert the
-    //X11 bitmap into a useful form
+    //Allocate memory for the bitmap structure
     if (!(bitmap = (struct Icon *) malloc (sizeof (struct Icon))))
         goto memfail;
 

Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- newwin.c	26 Apr 2006 02:04:24 -0000	1.12
+++ newwin.c	29 Apr 2006 19:22:38 -0000	1.13
@@ -419,6 +419,87 @@
         }
     }               
 }
+
+/******************************************************************************/
+/***  loadweaponsC() - colorized weapons
+/******************************************************************************/
+void loadweaponsC()
+{    
+    int j,k;
+
+    /* Load the four 6x8 weapon bitmaps */
+    torp_bitmaps =
+        W_StoreBitmap3 ("bitmaps/weaplibm/color/torpC.bmp",
+                        BMP_CTORP_WIDTH * NUM_CTORP_TYPES,
+                        BMP_CTORP_HEIGHT * BMP_TORP_FRAMES, BMP_TORPC, w,
+                        LR_DEFAULTCOLOR);
+    mtorp_bitmaps =
+        W_StoreBitmap3 ("bitmaps/weaplibm/color/mtorpC.bmp",
+                        BMP_CTORP_WIDTH * NUM_CTORP_TYPES,
+                        BMP_CTORP_HEIGHT * BMP_TORP_FRAMES, BMP_MTORPC, w,
+                        LR_DEFAULTCOLOR);
+    plasma_bitmaps =
+        W_StoreBitmap3 ("bitmaps/weaplibm/color/plasmaC.bmp",
+                        BMP_CPLASMATORP_WIDTH * NUM_CTORP_TYPES,
+                        BMP_CPLASMATORP_HEIGHT * BMP_TORP_FRAMES, BMP_PLASMAC, w,
+                        LR_DEFAULTCOLOR);
+    mplasma_bitmaps =
+        W_StoreBitmap3 ("bitmaps/weaplibm/color/mplasmaC.bmp",
+                        BMP_CPLASMATORP_WIDTH * NUM_CTORP_TYPES,
+                        BMP_CPLASMATORP_HEIGHT * BMP_TORP_FRAMES, BMP_MPLASMAC, w,
+                        LR_DEFAULTCOLOR);
+                        
+    /* Make pointers to the four 6x8 weapon bitmaps */
+    for (j = 0; j < NUM_CTORP_TYPES; j++)
+    {        
+    	for (k = 0; k < BMP_TORP_FRAMES; k++)
+        {
+            torpC[j][k] =
+                W_PointBitmap2 (torp_bitmaps, j, k, BMP_CTORP_WIDTH,
+                                BMP_CTORP_HEIGHT);
+                            
+            mtorpC[j][k] =
+                W_PointBitmap2 (mtorp_bitmaps, j, k, BMP_CTORP_WIDTH,
+                                BMP_CTORP_HEIGHT);
+                            
+            plasmaC[j][k] =
+                 W_PointBitmap2 (plasma_bitmaps, j, k, BMP_CPLASMATORP_WIDTH,
+                                BMP_CPLASMATORP_HEIGHT);
+                            
+            mplasmaC[j][k] =
+                W_PointBitmap2 (mplasma_bitmaps, j, k, BMP_CPLASMATORP_WIDTH,
+                                BMP_CPLASMATORP_HEIGHT);
+        }
+    }
+        
+           
+    /* Load the two 6x5 cloud bitmaps */
+    torp_cloud_bitmaps =
+         W_StoreBitmap3 ("bitmaps/weaplibm/color/cloudC.bmp",
+                        BMP_CTORPDET_WIDTH * NUM_CTORP_TYPES,
+                        BMP_CTORPDET_HEIGHT * BMP_TORPDET_FRAMES, BMP_CLOUDC, w,
+                        LR_DEFAULTCOLOR);
+    plasma_cloud_bitmaps = 
+         W_StoreBitmap3 ("bitmaps/weaplibm/color/plcloudC.bmp",
+                        BMP_CPLASMATORPDET_WIDTH * NUM_CTORP_TYPES,
+                        BMP_CPLASMATORPDET_HEIGHT * BMP_TORPDET_FRAMES, BMP_PLCLOUDC, w,
+                        LR_DEFAULTCOLOR);
+                        
+    /* Make pointers to the two 6x5 cloud bitmaps */
+    for (j = 0; j < NUM_CTORP_TYPES; j++)
+    {
+        for (k = 0; k < BMP_TORPDET_FRAMES; k++)
+        {
+            cloudC[j][k] =
+                W_PointBitmap2 (torp_cloud_bitmaps, j, k, BMP_CTORPDET_WIDTH,
+                                BMP_CTORPDET_HEIGHT);
+            plcloudC[j][k] =
+                W_PointBitmap2 (plasma_cloud_bitmaps, j, k, BMP_CPLASMATORPDET_WIDTH,
+                                BMP_CPLASMATORPDET_HEIGHT);
+        }
+    }            
+}
+
 /******************************************************************************/
 /***  handleMessageWindowKeyDown()
 /******************************************************************************/
@@ -813,101 +894,59 @@
     }
 #endif
 
-/* Experimental weapons */
-#ifdef COLORIZEWEAPON
-/* Not implemented... have to redo code with StoreBitmap3
-  for (i = 0; i < BMP_TORPDET_FRAMES; i++)
-    {
-     cloud[0][i] = W_StoreBitmap2(hWeapLibrary, BMP_TORPDET_WIDTH, BMP_TORPDET_HEIGHT,
-                       BMP_FED_TORP_DET + i, w, LR_DEFAULTCOLOR);
-     cloud[1][i] = W_StoreBitmap2(hWeapLibrary, BMP_TORPDET_WIDTH, BMP_TORPDET_HEIGHT,
-                       BMP_ORI_TORP_DET + i, w, LR_DEFAULTCOLOR);
-     cloud[2][i] = W_StoreBitmap2(hWeapLibrary, BMP_TORPDET_WIDTH, BMP_TORPDET_HEIGHT,
-                       BMP_KLI_TORP_DET + i, w, LR_DEFAULTCOLOR);
-     cloud[3][i] = W_StoreBitmap2(hWeapLibrary, BMP_TORPDET_WIDTH, BMP_TORPDET_HEIGHT,
-                       BMP_ROM_TORP_DET + i, w, LR_DEFAULTCOLOR);
-     cloud[4][i] = W_StoreBitmap2(hWeapLibrary, BMP_TORPDET_WIDTH, BMP_TORPDET_HEIGHT,
-                       BMP_IND_TORP_DET + i, w, LR_DEFAULTCOLOR);
 
-     plasmacloud[0][i] = W_StoreBitmap2(hWeapLibrary, BMP_PLASMATORPDET_WIDTH, BMP_PLASMATORPDET_HEIGHT,
-                        BMP_FED_PLASMA_DET + i, w, LR_DEFAULTCOLOR);
-     plasmacloud[1][i] = W_StoreBitmap2(hWeapLibrary, BMP_PLASMATORPDET_WIDTH, BMP_PLASMATORPDET_HEIGHT,
-                        BMP_ORI_PLASMA_DET + i, w, LR_DEFAULTCOLOR);
-     plasmacloud[2][i] = W_StoreBitmap2(hWeapLibrary, BMP_PLASMATORPDET_WIDTH, BMP_PLASMATORPDET_HEIGHT,
-                        BMP_KLI_PLASMA_DET + i, w, LR_DEFAULTCOLOR);
-     plasmacloud[3][i] = W_StoreBitmap2(hWeapLibrary, BMP_PLASMATORPDET_WIDTH, BMP_PLASMATORPDET_HEIGHT,
-                        BMP_ROM_PLASMA_DET + i, w, LR_DEFAULTCOLOR);
-     plasmacloud[4][i] = W_StoreBitmap2(hWeapLibrary, BMP_PLASMATORPDET_WIDTH, BMP_PLASMATORPDET_HEIGHT,
-                        BMP_IND_PLASMA_DET + i, w, LR_DEFAULTCOLOR);
+    loadweaponsC();
 
-     }
-  for (i = 0; i < BMP_TORP_FRAMES; i++)
-    {
-    	torpIcon[0][i] = W_StoreBitmap2(hWeapLibrary, BMP_TORP_WIDTH, BMP_TORP_HEIGHT, BMP_FED_TORP+i, w, LR_DEFAULTCOLOR);
-    	torpIcon[1][i] = W_StoreBitmap2(hWeapLibrary, BMP_TORP_WIDTH, BMP_TORP_HEIGHT, BMP_ORI_TORP+i, w, LR_DEFAULTCOLOR);
-    	torpIcon[2][i] = W_StoreBitmap2(hWeapLibrary, BMP_TORP_WIDTH, BMP_TORP_HEIGHT, BMP_KLI_TORP+i, w, LR_DEFAULTCOLOR);
-    	torpIcon[3][i] = W_StoreBitmap2(hWeapLibrary, BMP_TORP_WIDTH, BMP_TORP_HEIGHT, BMP_ROM_TORP+i, w, LR_DEFAULTCOLOR);
-    	torpIcon[4][i] = W_StoreBitmap2(hWeapLibrary, BMP_TORP_WIDTH, BMP_TORP_HEIGHT, BMP_IND_TORP+i, w, LR_DEFAULTCOLOR);
-    	plasmatorpIcon[0][i] = W_StoreBitmap2(hWeapLibrary, BMP_PLASMATORP_WIDTH, BMP_PLASMATORP_HEIGHT, BMP_FED_PLASMA+i, w, LR_DEFAULTCOLOR);
-    	plasmatorpIcon[1][i] = W_StoreBitmap2(hWeapLibrary, BMP_PLASMATORP_WIDTH, BMP_PLASMATORP_HEIGHT, BMP_ORI_PLASMA+i, w, LR_DEFAULTCOLOR);
-    	plasmatorpIcon[2][i] = W_StoreBitmap2(hWeapLibrary, BMP_PLASMATORP_WIDTH, BMP_PLASMATORP_HEIGHT, BMP_KLI_PLASMA+i, w, LR_DEFAULTCOLOR);
-    	plasmatorpIcon[3][i] = W_StoreBitmap2(hWeapLibrary, BMP_PLASMATORP_WIDTH, BMP_PLASMATORP_HEIGHT, BMP_ROM_PLASMA+i, w, LR_DEFAULTCOLOR);
-    	plasmatorpIcon[4][i] = W_StoreBitmap2(hWeapLibrary, BMP_PLASMATORP_WIDTH, BMP_PLASMATORP_HEIGHT, BMP_IND_PLASMA+i, w, LR_DEFAULTCOLOR);
-    }
-*/
-#else /* COLORIZEWEAPON */
     cloud[0] =
-        W_StoreBitmap3 ("bitmaps/weaplibm/cloud1.bmp", BMP_TORPDET_WIDTH,
+        W_StoreBitmap3 ("bitmaps/weaplibm/mono/cloud1.bmp", BMP_TORPDET_WIDTH,
                         BMP_TORPDET_HEIGHT, BMP_CLOUD, w, LR_MONOCHROME);
     cloud[1] =
-        W_StoreBitmap3 ("bitmaps/weaplibm/cloud2.bmp", BMP_TORPDET_WIDTH,
+        W_StoreBitmap3 ("bitmaps/weaplibm/mono/cloud2.bmp", BMP_TORPDET_WIDTH,
                         BMP_TORPDET_HEIGHT, BMP_CLOUD, w, LR_MONOCHROME);
     cloud[2] =
-        W_StoreBitmap3 ("bitmaps/weaplibm/cloud3.bmp", BMP_TORPDET_WIDTH,
+        W_StoreBitmap3 ("bitmaps/weaplibm/mono/cloud3.bmp", BMP_TORPDET_WIDTH,
                         BMP_TORPDET_HEIGHT, BMP_CLOUD, w, LR_MONOCHROME);
     cloud[3] =
-        W_StoreBitmap3 ("bitmaps/weaplibm/cloud4.bmp", BMP_TORPDET_WIDTH,
+        W_StoreBitmap3 ("bitmaps/weaplibm/mono/cloud4.bmp", BMP_TORPDET_WIDTH,
                         BMP_TORPDET_HEIGHT, BMP_CLOUD, w, LR_MONOCHROME);
     cloud[4] =
-        W_StoreBitmap3 ("bitmaps/weaplibm/cloud5.bmp", BMP_TORPDET_WIDTH,
+        W_StoreBitmap3 ("bitmaps/weaplibm/mono/cloud5.bmp", BMP_TORPDET_WIDTH,
                         BMP_TORPDET_HEIGHT, BMP_CLOUD, w, LR_MONOCHROME);
 
     plasmacloud[0] =
-        W_StoreBitmap3 ("bitmaps/weaplibm/plcloud1.bmp",
+        W_StoreBitmap3 ("bitmaps/weaplibm/mono/plcloud1.bmp",
                         BMP_PLASMATORPDET_WIDTH, BMP_PLASMATORPDET_HEIGHT,
                         BMP_PLCLOUD, w, LR_MONOCHROME);
     plasmacloud[1] =
-        W_StoreBitmap3 ("bitmaps/weaplibm/plcloud1.bmp",
+        W_StoreBitmap3 ("bitmaps/weaplibm/mono/plcloud2.bmp",
                         BMP_PLASMATORPDET_WIDTH, BMP_PLASMATORPDET_HEIGHT,
                         BMP_PLCLOUD, w, LR_MONOCHROME);
     plasmacloud[2] =
-        W_StoreBitmap3 ("bitmaps/weaplibm/plcloud1.bmp",
+        W_StoreBitmap3 ("bitmaps/weaplibm/mono/plcloud3.bmp",
                         BMP_PLASMATORPDET_WIDTH, BMP_PLASMATORPDET_HEIGHT,
                         BMP_PLCLOUD, w, LR_MONOCHROME);
     plasmacloud[3] =
-        W_StoreBitmap3 ("bitmaps/weaplibm/plcloud1.bmp",
+        W_StoreBitmap3 ("bitmaps/weaplibm/mono/plcloud4.bmp",
                         BMP_PLASMATORPDET_WIDTH, BMP_PLASMATORPDET_HEIGHT,
                         BMP_PLCLOUD, w, LR_MONOCHROME);
     plasmacloud[4] =
-        W_StoreBitmap3 ("bitmaps/weaplibm/plcloud1.bmp",
+        W_StoreBitmap3 ("bitmaps/weaplibm/mono/plcloud5.bmp",
                         BMP_PLASMATORPDET_WIDTH, BMP_PLASMATORPDET_HEIGHT,
                         BMP_PLCLOUD, w, LR_MONOCHROME);
 
     etorp =
-        W_StoreBitmap3 ("bitmaps/weaplibm/etorp.bmp", BMP_TORP_WIDTH,
+        W_StoreBitmap3 ("bitmaps/weaplibm/mono/etorp.bmp", BMP_TORP_WIDTH,
                         BMP_TORP_HEIGHT, BMP_ETORP, w, LR_MONOCHROME);
     mtorp =
-        W_StoreBitmap3 ("bitmaps/weaplibm/mtorp.bmp", BMP_TORP_WIDTH,
+        W_StoreBitmap3 ("bitmaps/weaplibm/mono/mtorp.bmp", BMP_TORP_WIDTH,
                         BMP_TORP_HEIGHT, BMP_MTORP, w, LR_MONOCHROME);
     eplasmatorp =
-        W_StoreBitmap3 ("bitmaps/weaplibm/eplasma.bmp", BMP_EPLASMA_WIDTH,
+        W_StoreBitmap3 ("bitmaps/weaplibm/mono/eplasma.bmp", BMP_EPLASMA_WIDTH,
                         BMP_EPLASMA_HEIGHT, BMP_EPLASMA, w, LR_MONOCHROME);
     mplasmatorp =
-        W_StoreBitmap3 ("bitmaps/weaplibm/mplasma.bmp", BMP_MPLASMA_WIDTH,
+        W_StoreBitmap3 ("bitmaps/weaplibm/mono/mplasma.bmp", BMP_MPLASMA_WIDTH,
                         BMP_MPLASMA_HEIGHT, BMP_MPLASMA, w, LR_MONOCHROME);
 
-#endif /* COLORIZEWEAPON */
-
     base_planets =
         W_StoreBitmap3 (Planlib, BMP_PLANET_WIDTH, BMP_PLANET_HEIGHT * 9,
                         BMP_PLANET000, w, LR_MONOCHROME);

Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- local.c	27 Apr 2006 21:22:05 -0000	1.14
+++ local.c	29 Apr 2006 19:22:38 -0000	1.15
@@ -1450,6 +1450,7 @@
     register int dx, dy;
     struct player *j;
     int torpCount;
+    int torpTeam;
     const int view = SCALE * WINSIDE / 2;
 
     for (t = torps, j = players; j != players + MAXPLAYER; t += MAXTORP, ++j)
@@ -1584,117 +1585,145 @@
                 }
 #endif
 
-#ifdef COLORIZEWEAPON
-                switch (j->p_team)
+                if (colorWeapons)
                 {
-                case FED:
-                    torpTeam = 0;
-                    break;
-                case ORI:
-                    torpTeam = 1;
-                    break;
-                case KLI:
-                    torpTeam = 2;
-                    break;
-                case ROM:
-                    torpTeam = 3;
-                    break;
-                default:
-                    torpTeam = 4;
+                    if (myPlayer(j))
+                        torpTeam = 0;
+                    else
+                    {
+                        switch (j->p_team)
+                        {
+                        case FED:
+                            torpTeam = 1;
+                            break;
+                        case IND:
+                            torpTeam = 2;
+                            break;
+                        case KLI:
+                            torpTeam = 3;
+                            break;
+                        case ORI:
+                            torpTeam = 4;
+                            break;
+                        case ROM:
+                            torpTeam = 5;
+                            break;
+                        default:
+                            torpTeam = 0;
+                        }
+                    }
+                    W_WriteBitmap (dx - (BMP_CTORPDET_WIDTH / 2),
+                                   dy - (BMP_CTORPDET_HEIGHT / 2),
+                                   cloudC[torpTeam][k->t_fuse], torpColor (k));
+                    clearzone[0][clearcount] = dx - (BMP_CTORPDET_WIDTH / 2);
+                    clearzone[1][clearcount] = dy - (BMP_CTORPDET_HEIGHT / 2);
+                    clearzone[2][clearcount] = BMP_CTORPDET_WIDTH;
+                    clearzone[3][clearcount] = BMP_CTORPDET_HEIGHT;
+                    clearcount++;
+                }
+                else
+                {
+                    W_WriteBitmap (dx - (BMP_TORPDET_WIDTH / 2),
+                                   dy - (BMP_TORPDET_HEIGHT / 2),
+                                   cloud[k->t_fuse], torpColor (k));
+                    clearzone[0][clearcount] = dx - (BMP_TORPDET_WIDTH / 2);
+                    clearzone[1][clearcount] = dy - (BMP_TORPDET_HEIGHT / 2);
+                    clearzone[2][clearcount] = BMP_TORPDET_WIDTH;
+                    clearzone[3][clearcount] = BMP_TORPDET_HEIGHT;
+                    clearcount++;
                 }
-
-                W_WriteBitmap (dx - (BMP_TORPDET_WIDTH / 2),
-                               dy - (BMP_TORPDET_HEIGHT / 2),
-                               cloud[torpTeam][k->t_fuse], torpColor (k));
-                /*W_WriteBitmapDB (localSDB, dx - (BMP_TORPDET_WIDTH / 2),
-                                 dy - (BMP_TORPDET_HEIGHT / 2),
-                                 cloud[torpTeam][k->t_fuse], torpColor (k));*/
-#else /* COLORIZEWEAPON */
-                W_WriteBitmap (dx - (BMP_TORPDET_WIDTH / 2),
-                               dy - (BMP_TORPDET_HEIGHT / 2),
-                               cloud[k->t_fuse], torpColor (k));
-                /*W_WriteBitmapDB (localSDB, dx - (BMP_TORPDET_WIDTH / 2),
-                                 dy - (BMP_TORPDET_HEIGHT / 2),
-                                 cloud[k->t_fuse], torpColor (k));*/
-                clearzone[0][clearcount] = dx - (BMP_TORPDET_WIDTH / 2);
-                clearzone[1][clearcount] = dy - (BMP_TORPDET_HEIGHT / 2);
-                clearzone[2][clearcount] = BMP_TORPDET_WIDTH;
-                clearzone[3][clearcount] = BMP_TORPDET_HEIGHT;
-                clearcount++;
-#endif
-            }
-            else
-#ifndef COLORIZEWEAPON
-            if (j != me && ((k->t_war & me->p_team) ||
-                                (j->p_team & (me->p_hostile | me->p_swar))))
-            {
-                /* solid.  Looks strange. W_FillArea(w, dx - (etorp_width/2),
-                 * dy - (etorp_height/2), etorp_width, etorp_height,
-                 * torpColor(k)); */
-
-                /* XFIX */
-                W_WriteBitmap (dx - (etorp_width / 2),
-                               dy - (etorp_height / 2), etorp, torpColor (k));
-                /*W_WriteBitmapDB (localSDB, dx - (etorp_width / 2),
-                                 dy - (etorp_height / 2), etorp, torpColor (k));*/
-                clearzone[0][clearcount] = dx - (etorp_width / 2);
-                clearzone[1][clearcount] = dy - (etorp_height / 2);
-                clearzone[2][clearcount] = etorp_width;
-                clearzone[3][clearcount] = etorp_height;
-                clearcount++;
             }
             else
             {
-                W_WriteBitmap (dx - (mtorp_width / 2),
-                               dy - (mtorp_height / 2), mtorp, torpColor (k));
-                /*W_WriteBitmapDB (localSDB, dx - (mtorp_width / 2),
-                                 dy - (mtorp_height / 2), mtorp, torpColor (k));*/
-
-                clearzone[0][clearcount] = dx - (mtorp_width / 2);
-                clearzone[1][clearcount] = dy - (mtorp_height / 2);
-                clearzone[2][clearcount] = mtorp_width;
-                clearzone[3][clearcount] = mtorp_height;
-                clearcount++;
-            }
-#else
-// Experimental weapons SRS 5/17/98
-            if ((k->t_fuse++ >= BMP_TORP_FRAMES - 1) || (k->t_fuse < 0))
-                k->t_fuse = 0;
-            switch (j->p_team)
-            {
-            case FED:
-                torpTeam = 0;
-                break;
-            case ORI:
-                torpTeam = 1;
-                break;
-            case KLI:
-                torpTeam = 2;
-                break;
-            case ROM:
-                torpTeam = 3;
-                break;
-            default:
-                torpTeam = 4;
+            	if (colorWeapons)
+            	{
+                    if ((k->t_fuse++ >= BMP_TORP_FRAMES - 1) || (k->t_fuse < 0))
+                        k->t_fuse = 0;
+        
+                    if (myPlayer(j))
+                        torpTeam = 0;
+                    else
+                    {
+                        switch (j->p_team)
+                        {
+                        case FED:
+                            torpTeam = 1;
+                            break;
+                        case IND:
+                            torpTeam = 2;
+                            break;
+                        case KLI:
+                            torpTeam = 3;
+                            break;
+                        case ORI:
+                            torpTeam = 4;
+                            break;
+                        case ROM:
+                            torpTeam = 5;
+                            break;
+                        default:
+                            torpTeam = 0;
+                        }
+                    }
+                    
+                    if (j != me && ((k->t_war & me->p_team) ||
+                                        (j->p_team & (me->p_hostile | me->p_swar))))
+                    {
+                        W_WriteBitmap (dx - (BMP_CTORP_WIDTH / 2),
+                                       dy - (BMP_CTORP_HEIGHT / 2),
+                                       torpC[torpTeam][k->t_fuse], torpColor (k));
+                    }
+                    else
+                    {
+                        W_WriteBitmap (dx - (BMP_CTORP_WIDTH / 2),
+                                       dy - (BMP_CTORP_HEIGHT / 2),
+                                       mtorpC[torpTeam][k->t_fuse], torpColor (k));
+                    }
+                    
+                    clearzone[0][clearcount] = dx - (BMP_CTORP_WIDTH / 2);
+                    clearzone[1][clearcount] = dy - (BMP_CTORP_HEIGHT / 2);
+                    clearzone[2][clearcount] = BMP_CTORP_WIDTH;
+                    clearzone[3][clearcount] = BMP_CTORP_HEIGHT;
+                    clearcount++;
+                }
+                else
+                {
+                    if (j != me && ((k->t_war & me->p_team) ||
+                                        (j->p_team & (me->p_hostile | me->p_swar))))
+                    {
+                        /* solid.  Looks strange. W_FillArea(w, dx - (etorp_width/2),
+                         * dy - (etorp_height/2), etorp_width, etorp_height,
+                         * torpColor(k)); */
+        
+                        /* XFIX */
+                        W_WriteBitmap (dx - (etorp_width / 2),
+                                       dy - (etorp_height / 2), etorp, torpColor (k));
+                        /*W_WriteBitmapDB (localSDB, dx - (etorp_width / 2),
+                                         dy - (etorp_height / 2), etorp, torpColor (k));*/
+                        clearzone[0][clearcount] = dx - (etorp_width / 2);
+                        clearzone[1][clearcount] = dy - (etorp_height / 2);
+                        clearzone[2][clearcount] = etorp_width;
+                        clearzone[3][clearcount] = etorp_height;
+                        clearcount++;
+                    }
+                    else
+                    {
+                        W_WriteBitmap (dx - (mtorp_width / 2),
+                                       dy - (mtorp_height / 2), mtorp, torpColor (k));
+                        /*W_WriteBitmapDB (localSDB, dx - (mtorp_width / 2),
+                                         dy - (mtorp_height / 2), mtorp, torpColor (k));*/
+        
+                        clearzone[0][clearcount] = dx - (mtorp_width / 2);
+                        clearzone[1][clearcount] = dy - (mtorp_height / 2);
+                        clearzone[2][clearcount] = mtorp_width;
+                        clearzone[3][clearcount] = mtorp_height;
+                        clearcount++;
+                    }
+                }
             }
-
-            W_WriteBitmap (dx - (BMP_TORP_WIDTH / 2),
-                           dy - (BMP_TORP_HEIGHT / 2),
-                           torpIcon[torpTeam][k->t_fuse], torpColor (k));
-            /*W_WriteBitmapDB (localSDB, dx - (BMP_TORP_WIDTH / 2),
-                             dy - (BMP_TORP_HEIGHT / 2),
-                             torpIcon[torpTeam][k->t_fuse], torpColor (k));*/
-
-            clearzone[0][clearcount] = dx - (BMP_TORP_WIDTH / 2);
-            clearzone[1][clearcount] = dy - (BMP_TORP_HEIGHT / 2);
-            clearzone[2][clearcount] = BMP_TORP_WIDTH;
-            clearzone[3][clearcount] = BMP_TORP_HEIGHT;
-            clearcount++;
         }
-#endif
     }
 }
-}
 
 
 void
@@ -1703,6 +1732,7 @@
     register struct plasmatorp *pt;
     register int dx, dy;
     const int view = SCALE * WINSIDE / 2;
+    int ptorpTeam;
 
     /* MAXPLASMA is small so work through all the plasmas rather than
        look at the number of outstanding plasma torps for each player. */
@@ -1817,125 +1847,142 @@
             }
 #endif
 
-#ifdef COLORIZEWEAPON
-            switch (players[pt->pt_owner].p_team)
+            if (colorWeapons)
             {
-            case FED:
-                ptorpTeam = 0;
-                break;
-            case ORI:
-                ptorpTeam = 1;
-                break;
-            case KLI:
-                ptorpTeam = 2;
-                break;
-            case ROM:
-                ptorpTeam = 3;
-                break;
-            default:
-                ptorpTeam = 4;
+                if (pt->pt_owner == me->p_no)
+                    ptorpTeam = 0;
+                else
+                {
+                    switch (players[pt->pt_owner].p_team)
+                    {
+                    case FED:
+                        ptorpTeam = 1;
+                        break;
+                    case IND:
+                        ptorpTeam = 2;
+                        break;
+                    case KLI:
+                        ptorpTeam = 3;
+                        break;
+                    case ORI:
+                        ptorpTeam = 4;
+                        break;
+                    case ROM:
+                        ptorpTeam = 5;
+                        break;
+                    default:
+                        ptorpTeam = 0;
+                    }
+                }
+    
+                W_WriteBitmap (dx - (BMP_CPLASMATORPDET_WIDTH / 2),
+                               dy - (BMP_CPLASMATORPDET_HEIGHT / 2),
+                               plcloudC[ptorpTeam][pt->pt_fuse],
+                               plasmatorpColor (pt));
+                clearzone[0][clearcount] = dx - (BMP_CPLASMATORPDET_WIDTH / 2);
+                clearzone[1][clearcount] = dy - (BMP_CPLASMATORPDET_HEIGHT / 2);
+                clearzone[2][clearcount] = BMP_CPLASMATORPDET_WIDTH;
+                clearzone[3][clearcount] = BMP_CPLASMATORPDET_HEIGHT;
+                clearcount++;
+            }
+            else
+            {
+                W_WriteBitmap (dx - (BMP_PLASMATORPDET_WIDTH / 2),
+                               dy - (BMP_PLASMATORPDET_HEIGHT / 2),
+                               plasmacloud[pt->pt_fuse], plasmatorpColor (pt));
+                clearzone[0][clearcount] = dx - (BMP_PLASMATORPDET_WIDTH / 2);
+                clearzone[1][clearcount] = dy - (BMP_PLASMATORPDET_HEIGHT / 2);
+                clearzone[2][clearcount] = BMP_PLASMATORPDET_WIDTH;
+                clearzone[3][clearcount] = BMP_PLASMATORPDET_HEIGHT;
+                clearcount++;
             }
-
-            W_WriteBitmap (dx - (BMP_PLASMATORPDET_WIDTH / 2),
-                           dy - (BMP_PLASMATORPDET_HEIGHT / 2),
-                           plasmacloud[ptorpTeam][pt->pt_fuse],
-                           plasmatorpColor (pt));
-            /*W_WriteBitmapDB (localSDB, dx - (BMP_PLASMATORPDET_WIDTH / 2),
-                             dy - (BMP_PLASMATORPDET_HEIGHT / 2),
-                             plasmacloud[ptorpTeam][pt->pt_fuse],
-                             plasmatorpColor (pt));*/
-            clearzone[0][clearcount] = dx - (BMP_PLASMATORPDET_WIDTH / 2);
-            clearzone[1][clearcount] = dy - (BMP_PLASMATORPDET_HEIGHT / 2);
-            clearzone[2][clearcount] = BMP_PLASMATORPDET_WIDTH;
-            clearzone[3][clearcount] = BMP_PLASMATORPDET_HEIGHT;
-            clearcount++;
-#else
-            W_WriteBitmap (dx - (BMP_PLASMATORPDET_WIDTH / 2),
-                           dy - (BMP_PLASMATORPDET_HEIGHT / 2),
-                           plasmacloud[pt->pt_fuse], plasmatorpColor (pt));
-            /*W_WriteBitmapDB (localSDB, dx - (BMP_PLASMATORPDET_WIDTH / 2),
-                             dy - (BMP_PLASMATORPDET_HEIGHT / 2),
-                             plasmacloud[pt->pt_fuse], plasmatorpColor (pt));*/
-            clearzone[0][clearcount] = dx - (BMP_PLASMATORPDET_WIDTH / 2);
-            clearzone[1][clearcount] = dy - (BMP_PLASMATORPDET_HEIGHT / 2);
-            clearzone[2][clearcount] = BMP_PLASMATORPDET_WIDTH;
-            clearzone[3][clearcount] = BMP_PLASMATORPDET_HEIGHT;
-            clearcount++;
-#endif /* COLORIZEWEAPON */
-        }
-
-#ifndef COLORIZEWEAPON
-        /* needmore: if(pt->pt_war & me->p_team) */
-        else if (pt->pt_owner != me->p_no && ((pt->pt_war & me->p_team) ||
-                                              (players[pt->pt_owner].
-                                               p_team & (me->p_hostile | me->
-                                                         p_swar))))
-        {
-            W_WriteBitmap (dx - (eplasmatorp_width / 2),
-                           dy - (eplasmatorp_height / 2),
-                           eplasmatorp, plasmatorpColor (pt));
-            /*W_WriteBitmapDB (localSDB, dx - (eplasmatorp_width / 2),
-                             dy - (eplasmatorp_height / 2),
-                             eplasmatorp, plasmatorpColor (pt));*/
-            clearzone[0][clearcount] = dx - (eplasmatorp_width / 2);
-            clearzone[1][clearcount] = dy - (eplasmatorp_height / 2);
-            clearzone[2][clearcount] = eplasmatorp_width;
-            clearzone[3][clearcount] = eplasmatorp_height;
-            clearcount++;
         }
         else
         {
-            W_WriteBitmap (dx - (mplasmatorp_width / 2),
-                           dy - (mplasmatorp_height / 2),
-                           mplasmatorp, plasmatorpColor (pt));
-            /*W_WriteBitmapDB (localSDB, dx - (mplasmatorp_width / 2),
-                             dy - (mplasmatorp_height / 2),
-                             mplasmatorp, plasmatorpColor (pt));*/
-            clearzone[0][clearcount] = dx - (mplasmatorp_width / 2);
-            clearzone[1][clearcount] = dy - (mplasmatorp_height / 2);
-            clearzone[2][clearcount] = mplasmatorp_width;
-            clearzone[3][clearcount] = mplasmatorp_height;
-            clearcount++;
-        }
-#else /*COLORIZEWEAPON */
-
-        {
-            if ((pt->pt_fuse++ >= BMP_TORP_FRAMES - 1) || (pt->pt_fuse < 0))
-                pt->pt_fuse = 0;
-            switch (players[pt->pt_owner].p_team)
+            if (colorWeapons)
             {
-            case FED:
-                ptorpTeam = 0;
-                break;
-            case ORI:
-                ptorpTeam = 1;
-                break;
-            case KLI:
-                ptorpTeam = 2;
-                break;
-            case ROM:
-                ptorpTeam = 3;
-                break;
-            default:
-                ptorpTeam = 4;
+                if ((pt->pt_fuse++ >= BMP_TORP_FRAMES - 1) || (pt->pt_fuse < 0))
+                    pt->pt_fuse = 0;
+        
+                if (pt->pt_owner == me->p_no)
+                    ptorpTeam = 0;
+                else
+                {
+                    switch (players[pt->pt_owner].p_team)
+                    {
+                    case FED:
+                        ptorpTeam = 1;
+                        break;
+                    case IND:
+                        ptorpTeam = 2;
+                        break;
+                    case KLI:
+                        ptorpTeam = 3;
+                        break;
+                    case ORI:
+                        ptorpTeam = 4;
+                        break;
+                    case ROM:
+                        ptorpTeam = 5;
+                        break;
+                    default:
+                        ptorpTeam = 0;
+                    }
+                }
+                if (pt->pt_owner != me->p_no && ((pt->pt_war & me->p_team) ||
+                                                      (players[pt->pt_owner].
+                                                       p_team & (me->p_hostile | me->
+                                                                 p_swar))))
+                {
+                    W_WriteBitmap (dx - (BMP_CPLASMATORP_WIDTH / 2),
+                                   dy - (BMP_CPLASMATORP_HEIGHT / 2),
+                                   plasmaC[ptorpTeam][pt->pt_fuse],
+                                   plasmatorpColor (pt));
+                }
+                else
+                {
+                    W_WriteBitmap (dx - (BMP_CPLASMATORP_WIDTH / 2),
+                                   dy - (BMP_CPLASMATORP_HEIGHT / 2),
+                                   mplasmaC[ptorpTeam][pt->pt_fuse],
+                                   plasmatorpColor (pt));
+                }
+                clearzone[0][clearcount] = dx - (BMP_CPLASMATORP_WIDTH / 2);
+                clearzone[1][clearcount] = dy - (BMP_CPLASMATORP_HEIGHT / 2);
+                clearzone[2][clearcount] = BMP_CPLASMATORP_WIDTH;
+                clearzone[3][clearcount] = BMP_CPLASMATORP_HEIGHT;
+                clearcount++;
+             }
+             else
+             {   
+                /* needmore: if(pt->pt_war & me->p_team) */
+                if (pt->pt_owner != me->p_no && ((pt->pt_war & me->p_team) ||
+                                                      (players[pt->pt_owner].
+                                                       p_team & (me->p_hostile | me->
+                                                                 p_swar))))
+                {
+                    W_WriteBitmap (dx - (eplasmatorp_width / 2),
+                                   dy - (eplasmatorp_height / 2),
+                                   eplasmatorp, plasmatorpColor (pt));
+                    clearzone[0][clearcount] = dx - (eplasmatorp_width / 2);
+                    clearzone[1][clearcount] = dy - (eplasmatorp_height / 2);
+                    clearzone[2][clearcount] = eplasmatorp_width;
+                    clearzone[3][clearcount] = eplasmatorp_height;
+                    clearcount++;
+                }
+                else
+                {
+                    W_WriteBitmap (dx - (mplasmatorp_width / 2),
+                                   dy - (mplasmatorp_height / 2),
+                                   mplasmatorp, plasmatorpColor (pt));
+        
+                    clearzone[0][clearcount] = dx - (mplasmatorp_width / 2);
+                    clearzone[1][clearcount] = dy - (mplasmatorp_height / 2);
+                    clearzone[2][clearcount] = mplasmatorp_width;
+                    clearzone[3][clearcount] = mplasmatorp_height;
+                    clearcount++;
+                }
             }
-
-            W_WriteBitmap (dx - (BMP_PLASMATORP_WIDTH / 2),
-                           dy - (BMP_PLASMATORP_HEIGHT / 2),
-                           plasmatorpIcon[ptorpTeam][pt->pt_fuse],
-                           plasmatorpColor (pt));
-            /*W_WriteBitmapDB (localSDB, dx - (BMP_PLASMATORP_WIDTH / 2),
-                             dy - (BMP_PLASMATORP_HEIGHT / 2),
-                             plasmatorpIcon[ptorpTeam][pt->pt_fuse],
-                             plasmatorpColor (pt));*/
-
-            clearzone[0][clearcount] = dx - (BMP_PLASMATORP_WIDTH / 2);
-            clearzone[1][clearcount] = dy - (BMP_PLASMATORP_HEIGHT / 2);
-            clearzone[2][clearcount] = BMP_PLASMATORP_WIDTH;
-            clearzone[3][clearcount] = BMP_PLASMATORP_HEIGHT;
-            clearcount++;
         }
-#endif /* COLORIZEWEAPON */
     }
 }
 

Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- defaults.c	27 Apr 2006 22:38:42 -0000	1.11
+++ defaults.c	29 Apr 2006 19:22:38 -0000	1.12
@@ -96,6 +96,12 @@
         }
     },
 #endif
+    {"colorWeapons", &colorWeapons, RC_BOOL,
+        {
+            "Use colored bitmaps for torps and plasmas",
+            NULL
+        }
+    },
     {"continueTractor", &continueTractor, RC_BOOL,
         {
             "Show tractor/pressor after lock",
@@ -1454,6 +1460,7 @@
     keepPeace = booleanDefault ("keepPeace", keepPeace);
     colorClient = intDefault ("colorClient", colorClient);
     dynamicBitmaps = booleanDefault ("dynamicBitmaps", dynamicBitmaps);
+    colorWeapons = booleanDefault ("colorWeapons", colorWeapons);
     continueTractor = booleanDefault ("continueTractor", continueTractor);
     showTractorPressor = booleanDefault ("showTractorPressor", showTractorPressor);
     showAllTractorPressor = booleanDefault ("showAllTractorPressor", showAllTractorPressor);

Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- data.c	27 Apr 2006 22:38:42 -0000	1.13
+++ data.c	29 Apr 2006 19:22:38 -0000	1.14
@@ -47,6 +47,7 @@
 
 int colorClient = 1;            /* Use new colorized bitmaps SRS 11/12/99 */
 int dynamicBitmaps = 1;         /* in game switching of ship bitmaps, default to on */
+int colorWeapons = 1;           /* Use color bitmaps for torps and plasmas */
 int newDashboard = 2;           /* use new graphic
                                  * dashboard, 6/2/93 LAB */
 int old_db = 0;                 /* should be same as
@@ -56,7 +57,8 @@
                                  * system support */
 int niftyNewMessages = 1;
 unsigned int oldalert = 0;
-int remap[16] = { 0, 1, 2, 0, 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0 };
+int remap[32] = { 0, 1, 2, 0, 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0,
+                  5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 int messpend = 0;
 #ifdef XTRA_MESSAGE_UI
 int messageHUD = 0;             /* Show message being typed on the local display           */
@@ -243,17 +245,24 @@
 W_Icon expview[BMP_SHIPEXPL_FRAMES];
 W_Icon base_sbexpview;
 W_Icon sbexpview[BMP_SBEXPL_FRAMES];
-#ifdef COLORIZE
-W_Icon cloud[5][BMP_TORPDET_FRAMES];
-W_Icon plasmacloud[5][BMP_TORPDET_FRAMES];
-W_Icon torpIcon[5][BMP_TORP_FRAMES];
-W_Icon plasmatorpIcon[5][BMP_TORP_FRAMES];
-#else
+
+W_Icon torp_cloud_bitmaps;
+W_Icon cloudC[NUM_CTORP_TYPES][BMP_TORPDET_FRAMES];
+W_Icon plasma_cloud_bitmaps;
+W_Icon plcloudC[NUM_CTORP_TYPES][BMP_TORPDET_FRAMES];
+W_Icon mtorp_bitmaps;
+W_Icon mtorpC[NUM_CTORP_TYPES][BMP_TORP_FRAMES];
+W_Icon torp_bitmaps;
+W_Icon torpC[NUM_CTORP_TYPES][BMP_TORP_FRAMES];
+W_Icon mplasma_bitmaps;
+W_Icon mplasmaC[NUM_CTORP_TYPES][BMP_TORP_FRAMES];
+W_Icon plasma_bitmaps;
+W_Icon plasmaC[NUM_CTORP_TYPES][BMP_TORP_FRAMES];
+
 W_Icon cloud[BMP_TORPDET_FRAMES];
 W_Icon plasmacloud[BMP_TORPDET_FRAMES];
 W_Icon etorp, mtorp;
 W_Icon eplasmatorp, mplasmatorp;
-#endif
 
 #ifdef VSHIELD_BITMAPS
 W_Icon base_vshield;

Index: option.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- option.c	27 Apr 2006 22:52:12 -0000	1.9
+++ option.c	29 Apr 2006 19:22:38 -0000	1.10
@@ -238,6 +238,7 @@
     {0, "Ship Menu", &MenuPage, 0, 0, 0, NULL, &Menus_Range},
     {1, "Page %d (click to change)", &MenuPage, 0, 0, 0, NULL, &Menus_Range},
     {1, "", &colorClient, 0, 0, 0, bitmaptypemess, &bitmap_range},
+    {1, "use color weapon bitmaps", &colorWeapons, 0, 0, 0, NULL, NULL},
 #ifdef VSHIELD_BITMAPS
     {1, "vary shields bitmap", &varyShields, 0, 0, 0, NULL, NULL},
 #endif



From modemhero at users.sourceforge.net  Sat Apr 29 14:22:40 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 29 Apr 2006 19:22:40 +0000
Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.6,
	1.7 build.cmd, 1.8, 1.9
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3021

Modified Files:
	NetrekXP to do list.C build.cmd 
Log Message:
Addition of color weapons, based on COW/TedTurner, but made better :).

Index: NetrekXP to do list.C
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- NetrekXP to do list.C	27 Apr 2006 22:52:11 -0000	1.6
+++ NetrekXP to do list.C	29 Apr 2006 19:22:38 -0000	1.7
@@ -34,7 +34,8 @@
 6) genoed as obs on team with no planets -> you were killed by something not in this
 game
 7) Icon not working under Visual Studio.  Also must resolve curslib, winkey and build issues
-8) Colorize weapons
+9) playerlist not loading right on startup
+10) add sb_explosion sound
 
 Might be done:
 1) mouse scroll in message windows gets the up/down coord wrong when main title

Index: build.cmd
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/build.cmd,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- build.cmd	26 Apr 2006 02:04:24 -0000	1.8
+++ build.cmd	29 Apr 2006 19:22:38 -0000	1.9
@@ -412,7 +412,16 @@
 copy resources\ships\tinted\rom\romshipT.bmp %InstCWD%\netrek\bitmaps\shiplib
 
 mkdir %InstCWD%\netrek\bitmaps\weaplibm
-copy resources\weaplibm\*.bmp %InstCWD%\netrek\bitmaps\weaplibm
+mkdir %InstCWD%\netrek\bitmaps\weaplibm\mono
+copy resources\weaplibm\mono\*.bmp %InstCWD%\netrek\bitmaps\weaplibm\mono
+
+mkdir %InstCWD%\netrek\bitmaps\weaplibm\color
+copy resources\weaplibm\color\mtorpC.bmp %InstCWD%\netrek\bitmaps\weaplibm\color
+copy resources\weaplibm\color\torpC.bmp %InstCWD%\netrek\bitmaps\weaplibm\color
+copy resources\weaplibm\color\mplasmaC.bmp %InstCWD%\netrek\bitmaps\weaplibm\color
+copy resources\weaplibm\color\plasmaC.bmp %InstCWD%\netrek\bitmaps\weaplibm\color
+copy resources\weaplibm\color\cloudC.bmp %InstCWD%\netrek\bitmaps\weaplibm\color
+copy resources\weaplibm\color\plcloudC.bmp %InstCWD%\netrek\bitmaps\weaplibm\color
 
 mkdir %InstCWD%\netrek\bitmaps\planlibm
 copy resources\planlibm\bronco\plan.bmp %InstCWD%\netrek\bitmaps\planlibm



From modemhero at users.sourceforge.net  Sat Apr 29 14:22:40 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 29 Apr 2006 19:22:40 +0000
Subject: [netrek-cvs] client/netrekxp/include bitmaps.h, 1.4, 1.5 data.h, 1.9,
	1.10 defs.h, 1.5, 1.6
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3021/include

Modified Files:
	bitmaps.h data.h defs.h 
Log Message:
Addition of color weapons, based on COW/TedTurner, but made better :).

Index: defs.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/defs.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- defs.h	26 Apr 2006 02:04:24 -0000	1.5
+++ defs.h	29 Apr 2006 19:22:38 -0000	1.6
@@ -124,9 +124,10 @@
 #define ROM 0x2
 #define KLI 0x4
 #define ORI 0x8
-#define ALLTEAM (FED|ROM|KLI|ORI)
-#define MAXTEAM (ORI)
-#define NUMTEAM 4
+#define IND 0x16
+#define ALLTEAM (FED|ROM|KLI|ORI|IND)
+#define MAXTEAM (IND)
+#define NUMTEAM 5
 /* * These are random configuration variables */
 #define VICTORY 3               /* Number of systems needed
                                  * to conquer the galaxy */

Index: bitmaps.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/bitmaps.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- bitmaps.h	21 Apr 2006 12:00:06 -0000	1.4
+++ bitmaps.h	29 Apr 2006 19:22:38 -0000	1.5
@@ -27,41 +27,11 @@
 // Weapons
 // -------
 
-#ifdef COLORIZE
-#define BMP_FED_TORP   1
-#define BMP_FED_TORP_DET   9
-#define BMP_FED_PLASMA   14
-#define BMP_FED_PLASMA_DET   22
-#define BMP_ORI_TORP   27
-#define BMP_ORI_TORP_DET   35
-#define BMP_ORI_PLASMA   40
-#define BMP_ORI_PLASMA_DET   48
-#define BMP_KLI_TORP   53
-#define BMP_KLI_TORP_DET   61
-#define BMP_KLI_PLASMA   66
-#define BMP_KLI_PLASMA_DET   74
-#define BMP_ROM_TORP   79
-#define BMP_ROM_TORP_DET   87
-#define BMP_ROM_PLASMA   92
-#define BMP_ROM_PLASMA_DET   100
-#define BMP_IND_TORP   105
-#define BMP_IND_TORP_DET   113
-#define BMP_IND_PLASMA   118
-#define BMP_IND_PLASMA_DET   126
+#define NUM_CTORP_TYPES   6
 
 #define BMP_TORPDET_FRAMES 5
 #define BMP_TORP_FRAMES 8
 
-#define BMP_TORP_WIDTH             5
-#define BMP_TORP_HEIGHT            5
-#define BMP_PLASMATORP_WIDTH       7
-#define BMP_PLASMATORP_HEIGHT      7
-
-#define BMP_TORPDET_WIDTH 9
-#define BMP_TORPDET_HEIGHT 9
-#define BMP_PLASMATORPDET_WIDTH 15
-#define BMP_PLASMATORPDET_HEIGHT 15
-#else /* COLORIZE */
 #define BMP_EPLASMA 6
 #define BMP_ETORP 7
 #define BMP_MPLASMA 8
@@ -69,26 +39,33 @@
 #define BMP_CLOUD 1
 #define BMP_PLCLOUD 10
 
-#define BMP_TORPDET_FRAMES 5
-#define BMP_TORP_FRAMES 8
+#define BMP_PLASMAC 6
+#define BMP_TORPC 7
+#define BMP_MPLASMAC 8
+#define BMP_MTORPC 9
+#define BMP_CLOUDC 1
+#define BMP_PLCLOUDC 10
 
 #define BMP_TORP_WIDTH             3
 #define BMP_TORP_HEIGHT            3
+#define BMP_CTORP_WIDTH             5
+#define BMP_CTORP_HEIGHT            5
+#define BMP_TORPDET_WIDTH 8
+#define BMP_TORPDET_HEIGHT 8
+#define BMP_CTORPDET_WIDTH 9
+#define BMP_CTORPDET_HEIGHT 9
+
 #define BMP_EPLASMA_WIDTH       7
 #define BMP_EPLASMA_HEIGHT      7
 #define BMP_MPLASMA_WIDTH       5
 #define BMP_MPLASMA_HEIGHT      5
+#define BMP_PLASMATORPDET_WIDTH 13
+#define BMP_PLASMATORPDET_HEIGHT 13
+#define BMP_CPLASMATORP_WIDTH       7
+#define BMP_CPLASMATORP_HEIGHT      7
+#define BMP_CPLASMATORPDET_WIDTH 15
+#define BMP_CPLASMATORPDET_HEIGHT 15
 
-#define BMP_TORPDET_WIDTH 9
-#define BMP_TORPDET_HEIGHT 9
-#define BMP_PLASMATORPDET_WIDTH 15
-#define BMP_PLASMATORPDET_HEIGHT 15
-
-#define BMP_TORPDET_WIDTH 9
-#define BMP_TORPDET_HEIGHT 9
-#define BMP_PLASMATORPDET_WIDTH 15
-#define BMP_PLASMATORPDET_HEIGHT 15
-#endif /* COLORIZE */
 
 // Miscellaneous
 // ----------

Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- data.h	27 Apr 2006 22:38:41 -0000	1.9
+++ data.h	29 Apr 2006 19:22:38 -0000	1.10
@@ -20,7 +20,6 @@
 #define cloak_width             20
 #define cloak_height            20
 
-#ifndef COLORIZE
 #define etorp_width             3
 #define etorp_height            3
 #define eplasmatorp_width       7
@@ -29,7 +28,6 @@
 #define mplasmatorp_height      5
 #define mtorp_width             3
 #define mtorp_height            3
-#endif
 
 extern struct player *players;
 extern struct player *me;
@@ -162,6 +160,7 @@
 extern int shrinkPhaserOnMiss;
 extern int colorClient;
 extern int dynamicBitmaps;
+extern int colorWeapons;
 extern int newDashboard, old_db;
 extern int niftyNewMessages;
 extern int fastQuit;
@@ -239,17 +238,24 @@
 extern W_Icon expview[BMP_SHIPEXPL_FRAMES];
 extern W_Icon base_sbexpview;
 extern W_Icon sbexpview[BMP_SBEXPL_FRAMES];
-#ifdef COLORIZE
-extern W_Icon cloud[5][BMP_TORPDET_FRAMES];
-extern W_Icon plasmacloud[5][BMP_TORPDET_FRAMES];
-extern W_Icon torpIcon[5][BMP_TORP_FRAMES];
-extern W_Icon plasmatorpIcon[5][BMP_TORP_FRAMES];
-#else
+
+extern W_Icon torp_cloud_bitmaps;
+extern W_Icon cloudC[NUM_CTORP_TYPES][BMP_TORPDET_FRAMES];
+extern W_Icon plasma_cloud_bitmaps;
+extern W_Icon plcloudC[NUM_CTORP_TYPES][BMP_TORPDET_FRAMES];
+extern W_Icon mtorp_bitmaps;
+extern W_Icon mtorpC[NUM_CTORP_TYPES][BMP_TORP_FRAMES];
+extern W_Icon torp_bitmaps;
+extern W_Icon torpC[NUM_CTORP_TYPES][BMP_TORP_FRAMES];
+extern W_Icon mplasma_bitmaps;
+extern W_Icon mplasmaC[NUM_CTORP_TYPES][BMP_TORP_FRAMES];
+extern W_Icon plasma_bitmaps;
+extern W_Icon plasmaC[NUM_CTORP_TYPES][BMP_TORP_FRAMES];
+
 extern W_Icon cloud[BMP_TORPDET_FRAMES];
 extern W_Icon plasmacloud[BMP_TORPDET_FRAMES];
 extern W_Icon etorp, mtorp;
 extern W_Icon eplasmatorp, mplasmatorp;
-#endif
 
 #ifdef VSHIELD_BITMAPS
 #define SHIELD_FRAMES 5



From modemhero at users.sourceforge.net  Sat Apr 29 14:22:41 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 29 Apr 2006 19:22:41 +0000
Subject: [netrek-cvs] client/netrekxp/resources/weaplibm cloud1.bmp, 1.1.1.1,
	NONE cloud2.bmp, 1.1.1.1, NONE cloud3.bmp, 1.1.1.1,
	NONE cloud4.bmp, 1.1.1.1, NONE cloud5.bmp, 1.1.1.1,
	NONE eplasma.bmp, 1.1.1.1, NONE etorp.bmp, 1.1.1.1,
	NONE mplasma.bmp, 1.1.1.1, NONE mtorp.bmp, 1.1.1.1,
	NONE plcloud1.bmp, 1.1.1.1, NONE plcloud2.bmp, 1.1.1.1,
	NONE plcloud3.bmp, 1.1.1.1, NONE plcloud4.bmp, 1.1.1.1,
	NONE plcloud5.bmp, 1.1.1.1, NONE
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/weaplibm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3021/resources/weaplibm

Removed Files:
	cloud1.bmp cloud2.bmp cloud3.bmp cloud4.bmp cloud5.bmp 
	eplasma.bmp etorp.bmp mplasma.bmp mtorp.bmp plcloud1.bmp 
	plcloud2.bmp plcloud3.bmp plcloud4.bmp plcloud5.bmp 
Log Message:
Addition of color weapons, based on COW/TedTurner, but made better :).

--- cloud2.bmp DELETED ---

--- cloud1.bmp DELETED ---

--- mtorp.bmp DELETED ---

--- eplasma.bmp DELETED ---

--- plcloud3.bmp DELETED ---

--- cloud4.bmp DELETED ---

--- plcloud4.bmp DELETED ---

--- cloud3.bmp DELETED ---

--- plcloud1.bmp DELETED ---

--- plcloud2.bmp DELETED ---

--- cloud5.bmp DELETED ---

--- plcloud5.bmp DELETED ---

--- etorp.bmp DELETED ---

--- mplasma.bmp DELETED ---



From modemhero at users.sourceforge.net  Sat Apr 29 14:22:40 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 29 Apr 2006 19:22:40 +0000
Subject: [netrek-cvs] client/netrekxp/win32 config.h,1.6,1.7
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3021/win32

Modified Files:
	config.h 
Log Message:
Addition of color weapons, based on COW/TedTurner, but made better :).

Index: config.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/win32/config.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- config.h	24 Apr 2006 15:30:38 -0000	1.6
+++ config.h	29 Apr 2006 19:22:38 -0000	1.7
@@ -108,7 +108,7 @@
 /*      SMALL_SCREEN            - for 800x600 resolution screens                */
 #undef SMALL_SCREEN
 
-/*	    BEEPLITE		        - player and planets highlighting		*/
+/*      BEEPLITE                - player and planets highlighting		*/
 #define BEEPLITE
 
 /*      VSHIELD_BITMAPS         - damage dependent shields (hull)               */



From modemhero at users.sourceforge.net  Sat Apr 29 14:22:40 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 29 Apr 2006 19:22:40 +0000
Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp netrek.chm, 1.4, 1.5
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3021/resources/htmlhelp

Modified Files:
	netrek.chm 
Log Message:
Addition of color weapons, based on COW/TedTurner, but made better :).

Index: netrek.chm
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/netrek.chm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
Binary files /tmp/cvsmBtl7U and /tmp/cvss7JxDE differ



From modemhero at users.sourceforge.net  Sat Apr 29 14:22:41 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 29 Apr 2006 19:22:41 +0000
Subject: [netrek-cvs] client/netrekxp/resources/weaplibm/color cloudC.bmp,
	NONE, 1.1 mplasmaC.bmp, NONE, 1.1 mtorpC.bmp, NONE,
	1.1 plasmaC.bmp, NONE, 1.1 plcloudC.bmp, NONE, 1.1 torpC.bmp,
	NONE, 1.1
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/weaplibm/color
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3021/resources/weaplibm/color

Added Files:
	cloudC.bmp mplasmaC.bmp mtorpC.bmp plasmaC.bmp plcloudC.bmp 
	torpC.bmp 
Log Message:
Addition of color weapons, based on COW/TedTurner, but made better :).

--- NEW FILE: mtorpC.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: cloudC.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: mplasmaC.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: torpC.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: plasmaC.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: plcloudC.bmp ---
(This appears to be a binary file; contents omitted.)



From modemhero at users.sourceforge.net  Sat Apr 29 14:22:40 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 29 Apr 2006 19:22:40 +0000
Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html
	generalconfig.html, 1.5, 1.6
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3021/resources/htmlhelp/html

Modified Files:
	generalconfig.html 
Log Message:
Addition of color weapons, based on COW/TedTurner, but made better :).

Index: generalconfig.html
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/generalconfig.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- generalconfig.html	27 Apr 2006 22:38:42 -0000	1.5
+++ generalconfig.html	29 Apr 2006 19:22:38 -0000	1.6
@@ -150,6 +150,16 @@
 
 
 
+colorWeapons
+use colored bitmaps for torps and plasmas
+
+	
                      
+	
                    • on (default)
                      • 
+	
                    • off
                      • 
+	
                    
+
+
+
 continueTractor
 Show tractor/pressor beams after they are locked on player
 



From modemhero at users.sourceforge.net  Sat Apr 29 14:22:40 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 29 Apr 2006 19:22:40 +0000
Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.28,
	1.29 netrekrc_options.txt, 1.3, 1.4
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3021/resources/docs

Modified Files:
	changes.txt netrekrc_options.txt 
Log Message:
Addition of color weapons, based on COW/TedTurner, but made better :).

Index: netrekrc_options.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc_options.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- netrekrc_options.txt	27 Apr 2006 22:38:42 -0000	1.3
+++ netrekrc_options.txt	29 Apr 2006 19:22:38 -0000	1.4
@@ -30,6 +30,7 @@
 # 3 - shaded old color bitmaps
 
 colorfulPhasers:          (on/off) make your phasers multicolored
+colorWeapons:             (on/off) use colored bitmaps for torps and plasmas
 continueTractor:          (on/off) show tractors after lock
 continuousMouse:          (on/off) use continuous mouse mode
 continuousMouseFix:       (on/off) fix continuous mouse behavior

Index: changes.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- changes.txt	27 Apr 2006 22:52:12 -0000	1.28
+++ changes.txt	29 Apr 2006 19:22:38 -0000	1.29
@@ -1,4 +1,11 @@
 Version TBA:
+- added "colorWeapons: (on)/off" to use color weapon bitmaps for torps and plasmas!  The
+  bitmaps are a blend of COW/Ted Turner bitmaps, with some improvements in the area of
+  torp/plasma size and color ratio, the addition of a separate color bitmap for your own
+  weapons fire, and the addition of separate bitmaps for "friendly" and "enemy" weapons,
+  so you can tell who is at peace with you visually by the shading of their weapons.
+  This option can be toggled in game from the Ships Menu.
+- improved mono plasma explosion animation bitmaps
 - added a new Playerlist menu to the Options Menus, so the other menus are not as
   cluttered, and all playerlist options are now on the same menu page.
 - added "newSoundAngles: (on)/off" so one can choose to use SDL sound but lose the



From modemhero at users.sourceforge.net  Sat Apr 29 14:22:41 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 29 Apr 2006 19:22:41 +0000
Subject: [netrek-cvs] client/netrekxp/resources/weaplibm/mono cloud1.bmp,
	NONE, 1.1 cloud2.bmp, NONE, 1.1 cloud3.bmp, NONE,
	1.1 cloud4.bmp, NONE, 1.1 cloud5.bmp, NONE, 1.1 eplasma.bmp,
	NONE, 1.1 etorp.bmp, NONE, 1.1 mplasma.bmp, NONE,
	1.1 mtorp.bmp, NONE, 1.1 plcloud1.bmp, NONE, 1.1 plcloud2.bmp,
	NONE, 1.1 plcloud3.bmp, NONE, 1.1 plcloud4.bmp, NONE,
	1.1 plcloud5.bmp, NONE, 1.1
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/weaplibm/mono
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3021/resources/weaplibm/mono

Added Files:
	cloud1.bmp cloud2.bmp cloud3.bmp cloud4.bmp cloud5.bmp 
	eplasma.bmp etorp.bmp mplasma.bmp mtorp.bmp plcloud1.bmp 
	plcloud2.bmp plcloud3.bmp plcloud4.bmp plcloud5.bmp 
Log Message:
Addition of color weapons, based on COW/TedTurner, but made better :).

--- NEW FILE: cloud2.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: cloud1.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: mtorp.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: eplasma.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: plcloud3.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: cloud4.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: plcloud4.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: cloud3.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: plcloud1.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: plcloud2.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: cloud5.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: plcloud5.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: etorp.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: mplasma.bmp ---
(This appears to be a binary file; contents omitted.)



From modemhero at users.sourceforge.net  Sat Apr 29 16:00:45 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 29 Apr 2006 21:00:45 +0000
Subject: [netrek-cvs] client/netrekxp/src local.c, 1.15, 1.16 sound.c, 1.8,
	1.9
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10053/src

Modified Files:
	local.c sound.c 
Log Message:
New sound for starbases exploding.

Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- local.c	29 Apr 2006 19:22:38 -0000	1.15
+++ local.c	29 Apr 2006 21:00:43 -0000	1.16
@@ -46,7 +46,6 @@
 static int sound_plasma = 0;
 static int sound_other_plasmas = 0;
 static int num_other_plasmas = 0;
-static int sound_other_explode = 0;
 static unsigned int sound_flags = 0;
 static int other_torp_dist = 0;
 static int new_other_torp_dist = 0;
@@ -993,7 +992,12 @@
                 if (newSound)
                 {
                     if (myPlayer(j) || isObsLockPlayer(j))
-                        Play_Sound(EXPLOSION_WAV);
+                    {
+                    	if (j->p_ship.s_type == STARBASE)
+                    	    Play_Sound(BASE_EXPLOSION_WAV);
+                    	else
+                            Play_Sound(EXPLOSION_WAV);
+                    }
                     else
                     {
                         int newdx, newdy, distance, angle;
@@ -1011,14 +1015,30 @@
                         angle = 270 - angle;
                         // At short distances, don't use angular sound
                         if (distance < SCALE/2)
-                            Play_Sound(EXPLOSION_OTHER_WAV);
+                        {
+                            if (j->p_ship.s_type == STARBASE)
+                    	        Play_Sound(BASE_EXPLOSION_WAV);
+                    	    else
+                                Play_Sound(EXPLOSION_OTHER_WAV);
+                        }
                         else
-                            Play_Sound_Loc(EXPLOSION_OTHER_WAV, angle, distance);
+                        {
+                            if (j->p_ship.s_type == STARBASE)
+                    	        Play_Sound_Loc(BASE_EXPLOSION_WAV, angle, distance);
+                    	    else
+                                Play_Sound_Loc(EXPLOSION_OTHER_WAV, angle, distance);
+                        }
                     }
                 }
                 else
-                    Play_Sound((myPlayer(j) || isObsLockPlayer(j)) 
-                               ? EXPLOSION_SOUND : OTHER_EXPLOSION_SOUND);
+                {
+                    if (j->p_ship.s_type == STARBASE)
+                        Play_Sound(BASE_EXPLOSION_SOUND);
+                    else if (myPlayer(j) || isObsLockPlayer(j))
+                        Play_Sound(EXPLOSION_SOUND);
+                    else
+                        Play_Sound(OTHER_EXPLOSION_SOUND);
+                }
             }
 #endif
 

Index: sound.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/sound.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- sound.c	27 Apr 2006 22:38:42 -0000	1.8
+++ sound.c	29 Apr 2006 21:00:43 -0000	1.9
@@ -47,6 +47,7 @@
     {"nt_phaser", 9, 1},
     {"nt_fire_plasma", 9, 1},
     {"nt_explosion", 10, 1},
+    {"nt_base_explosion", 10, 1},
     {"nt_cloaked", 7, 1},
     {"nt_uncloak", 7, 1},
     {"nt_shield_down", 3, 1},
@@ -100,6 +101,7 @@
   newsounds[ENTER_WARP_WAV] = Mix_LoadWAV(DATAFILE("nt_enter_warp.wav"));
   newsounds[EXIT_WARP_WAV] = Mix_LoadWAV(DATAFILE("nt_exit_warp.wav"));
   newsounds[EXPLOSION_WAV] = Mix_LoadWAV(DATAFILE("nt_explosion.wav"));
+  newsounds[BASE_EXPLOSION_WAV] = Mix_LoadWAV(DATAFILE("nt_base_explosion.wav"));
   newsounds[EXPLOSION_OTHER_WAV] = Mix_LoadWAV(DATAFILE("nt_explosion_other.wav"));
   newsounds[FIRE_PLASMA_WAV] = Mix_LoadWAV(DATAFILE("nt_fire_plasma.wav"));
   newsounds[OTHER_FIRE_PLASMA_WAV] = Mix_LoadWAV(DATAFILE("nt_fire_plasma_other.wav"));
@@ -407,6 +409,9 @@
         case EXPLOSION_SOUND:
             sprintf (buf, "Explosion sound is %s", flag);
             break;
+        case BASE_EXPLOSION_SOUND:
+            sprintf (buf, "Base explosion sound is %s", flag);
+            break;
         case FIRE_TORP_SOUND:
             sprintf (buf, "Fire torp sound is %s", flag);
             break;



From modemhero at users.sourceforge.net  Sat Apr 29 16:00:44 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 29 Apr 2006 21:00:44 +0000
Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C,1.7,1.8
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10053

Modified Files:
	NetrekXP to do list.C 
Log Message:
New sound for starbases exploding.

Index: NetrekXP to do list.C
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- NetrekXP to do list.C	29 Apr 2006 19:22:38 -0000	1.7
+++ NetrekXP to do list.C	29 Apr 2006 21:00:42 -0000	1.8
@@ -35,7 +35,6 @@
 game
 7) Icon not working under Visual Studio.  Also must resolve curslib, winkey and build issues
 9) playerlist not loading right on startup
-10) add sb_explosion sound
 
 Might be done:
 1) mouse scroll in message windows gets the up/down coord wrong when main title



From modemhero at users.sourceforge.net  Sat Apr 29 16:00:44 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 29 Apr 2006 21:00:44 +0000
Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.29,1.30
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10053/resources/docs

Modified Files:
	changes.txt 
Log Message:
New sound for starbases exploding.

Index: changes.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- changes.txt	29 Apr 2006 19:22:38 -0000	1.29
+++ changes.txt	29 Apr 2006 21:00:42 -0000	1.30
@@ -1,4 +1,5 @@
 Version TBA:
+- added a special explosion sound just for starbase explosions
 - added "colorWeapons: (on)/off" to use color weapon bitmaps for torps and plasmas!  The
   bitmaps are a blend of COW/Ted Turner bitmaps, with some improvements in the area of
   torp/plasma size and color ratio, the addition of a separate color bitmap for your own



From modemhero at users.sourceforge.net  Sat Apr 29 16:00:44 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 29 Apr 2006 21:00:44 +0000
Subject: [netrek-cvs] client/netrekxp/include sound.h,1.4,1.5
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10053/include

Modified Files:
	sound.h 
Log Message:
New sound for starbases exploding.

Index: sound.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/sound.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sound.h	26 Apr 2006 23:18:14 -0000	1.4
+++ sound.h	29 Apr 2006 21:00:42 -0000	1.5
@@ -9,29 +9,30 @@
 #define PHASER_SOUND            2
 #define FIRE_PLASMA_SOUND       3
 #define EXPLOSION_SOUND         4
-#define CLOAK_SOUND             5
-#define UNCLOAK_SOUND           6
-#define SHIELD_DOWN_SOUND       7
-#define SHIELD_UP_SOUND         8
-#define TORP_HIT_SOUND          9
-#define WARNING_SOUND           10
-#define RED_ALERT_SOUND         11
-#define ENGINE_SOUND            12
-#define ENTER_SHIP_SOUND        13
-#define SELF_DESTRUCT_SOUND     14
-#define PLASMA_HIT_SOUND        15
-#define ENTER_WARP_SOUND        16
-#define EXIT_WARP_SOUND         17
-#define MESSAGE_SOUND           18
-#define MESSAGE1_SOUND          19
-#define MESSAGE2_SOUND          20
-#define MESSAGE3_SOUND          21
-#define MESSAGE4_SOUND          22
-#define MESSAGE5_SOUND          23
-#define MESSAGE6_SOUND          24
-#define MESSAGE7_SOUND          25
-#define MESSAGE8_SOUND          26
-#define MESSAGE9_SOUND          27
+#define BASE_EXPLOSION_SOUND    5
+#define CLOAK_SOUND             6
+#define UNCLOAK_SOUND           7
+#define SHIELD_DOWN_SOUND       8
+#define SHIELD_UP_SOUND         9
+#define TORP_HIT_SOUND          10
+#define WARNING_SOUND           11
+#define RED_ALERT_SOUND         12
+#define ENGINE_SOUND            13
+#define ENTER_SHIP_SOUND        14
+#define SELF_DESTRUCT_SOUND     15
+#define PLASMA_HIT_SOUND        16
+#define ENTER_WARP_SOUND        17
+#define EXIT_WARP_SOUND         18
+#define MESSAGE_SOUND           19
+#define MESSAGE1_SOUND          20
+#define MESSAGE2_SOUND          21
+#define MESSAGE3_SOUND          22
+#define MESSAGE4_SOUND          23
+#define MESSAGE5_SOUND          24
+#define MESSAGE6_SOUND          25
+#define MESSAGE7_SOUND          26
+#define MESSAGE8_SOUND          27
+#define MESSAGE9_SOUND          28
 
 #define OTHER_SOUND_OFFSET      28
 
@@ -69,6 +70,7 @@
   ENTER_WARP_WAV,
   EXIT_WARP_WAV,
   EXPLOSION_WAV,
+  BASE_EXPLOSION_WAV,
   EXPLOSION_OTHER_WAV,
   FIRE_PLASMA_WAV,
   OTHER_FIRE_PLASMA_WAV,



From modemhero at users.sourceforge.net  Sat Apr 29 16:00:45 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 29 Apr 2006 21:00:45 +0000
Subject: [netrek-cvs] client/netrekxp/resources/sounds nt_base_explosion.wav,
	NONE, 1.1 nt_red_alert.wav, 1.2, 1.3
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/sounds
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10053/resources/sounds

Modified Files:
	nt_red_alert.wav 
Added Files:
	nt_base_explosion.wav 
Log Message:
New sound for starbases exploding.

Index: nt_red_alert.wav
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/sounds/nt_red_alert.wav,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsN8Dxzg and /tmp/cvsNfRYr4 differ

--- NEW FILE: nt_base_explosion.wav ---
(This appears to be a binary file; contents omitted.)



From modemhero at users.sourceforge.net  Sat Apr 29 17:48:09 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 29 Apr 2006 22:48:09 +0000
Subject: [netrek-cvs] client/netrekxp/src newwin.c, 1.13, 1.14 sound.c, 1.9,
	1.10
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28867/src

Modified Files:
	newwin.c sound.c 
Log Message:
Added simplified version of sound window for SDL (can toggle sound on or off).

Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- newwin.c	29 Apr 2006 19:22:38 -0000	1.13
+++ newwin.c	29 Apr 2006 22:48:07 -0000	1.14
@@ -742,7 +742,13 @@
         char *progname)
 {
     if (newSound)
-        soundWin = W_MakeMenu("sound", WINSIDE + 20, -BORDER + 10, 40, 1, NULL, 2);
+    {
+        soundWin = W_MakeMenu("sound", WINSIDE + 20, -BORDER + 10, 30,
+                        2, NULL, 2);
+        W_SetWindowKeyDownHandler(soundWin, sdlsoundaction);
+        W_SetWindowButtonHandler(soundWin, sdlsoundaction);
+        W_DefineArrowCursor(soundWin);
+    }
     else
     {
         soundWin = W_MakeMenu("sound", WINSIDE + 20, -BORDER + 10, 30,

Index: sound.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/sound.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sound.c	29 Apr 2006 21:00:43 -0000	1.9
+++ sound.c	29 Apr 2006 22:48:07 -0000	1.10
@@ -158,8 +158,8 @@
                 sounddir = "./sounds";
         }
         
-       if (newSound)
-       {
+        if (newSound)
+        {
 #ifdef DEBUG
 	    LineToConsole ("Init_Sound using SDL\n");
 #endif
@@ -182,6 +182,7 @@
      	        if (Mix_PlayChannel(-1, newsounds[INTRO_WAV], 0) < 0)
 		    LineToConsole("Mix_PlayChannel: %s\n", Mix_GetError());
       	    }
+      	    sound_toggle = 1;
       	    /* Default of 8 channels not enough */
        	    Mix_AllocateChannels(16);
         }
@@ -217,7 +218,7 @@
     {
     	int channel;
     	
-        if (!sound_init)
+        if (!sound_init || !sound_toggle)
 	    return;
 
         if ((type >= NUM_WAVES) || (type < 0))
@@ -260,7 +261,7 @@
 {
     int channel;
     
-    if (!sound_init)
+    if (!sound_init || !sound_toggle)
         return;
 
     if ((type >= NUM_WAVES) || (type < 0))
@@ -353,19 +354,21 @@
 #define SOUND_INIT    MESSAGE_SOUND + 2
 #define SOUND_DONE    MESSAGE_SOUND + 3
 
+#define SDL_SOUND_DONE 1
+
 static void soundrefresh (int i);
+static void sdlsoundrefresh (int i);
 
 extern void soundwindow (void)
 {
+    int i;
     if (newSound)
     {
-        char *buf="All or nothing with SDL sound. Sorry";
-        W_WriteText(soundWin, 0, 0, textColor, buf, strlen(buf), 0);
+        for (i = 0; i <= SDL_SOUND_DONE; i++)
+            sdlsoundrefresh (i);
     }
     else
     {
-        int i;
-
         for (i = 0; i <= SOUND_DONE; i++)
             soundrefresh (i);
     }
@@ -373,6 +376,28 @@
     W_MapWindow (soundWin);
 }
 
+
+static void sdlsoundrefresh (int i)
+{
+    char buf[BUFSIZ];
+
+    if (i == SOUND_TOGGLE)
+    {
+        sprintf (buf, "Sound is turned %s",
+                 (sound_toggle == 1) ? "ON" : "OFF");
+    }
+    else if (i == SDL_SOUND_DONE)
+    {
+        strcpy (buf, "Done");
+    }
+    else
+    {
+        LineToConsole ("Uh oh, bogus refresh number in sdlsoundrefresh\n");
+    }
+
+    W_WriteText (soundWin, 0, i, textColor, buf, strlen (buf), 0);
+}
+
 static void soundrefresh (int i)
 {
     char buf[BUFSIZ], *flag;
@@ -428,7 +453,7 @@
             sprintf (buf, "Red alert sound is %s", flag);
             break;
         case SHIELD_DOWN_SOUND:
-            sprintf (buf, "Shield down  sound is %s", flag);
+            sprintf (buf, "Shield down sound is %s", flag);
             break;
         case SHIELD_UP_SOUND:
             sprintf (buf, "Shield up sound is %s", flag);
@@ -473,10 +498,27 @@
     W_WriteText (soundWin, 0, i, textColor, buf, strlen (buf), 0);
 }
 
+void sdlsoundaction (W_Event * data)
+{
+    int i;
+
+    i = data->y;
+
+    if (i == SOUND_TOGGLE)
+    {
+        if (sound_init)
+            sound_toggle = (sound_toggle == 1) ? 0 : 1;
+        soundrefresh (SOUND_TOGGLE);
+    }
+    else
+    {
+        sounddone ();
+    }
+}
+
+
 void soundaction (W_Event * data)
 {
-  if (!newSound)
-  {
     int i, j;
 
     i = data->y;
@@ -530,7 +572,6 @@
     {
         sounddone ();
     }
-  }
 }
 
 extern void sounddone (void)



From modemhero at users.sourceforge.net  Sat Apr 29 17:48:08 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 29 Apr 2006 22:48:08 +0000
Subject: [netrek-cvs] client/netrekxp/include proto.h, 1.9, 1.10 sound.h, 1.5,
	1.6
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28867/include

Modified Files:
	proto.h sound.h 
Log Message:
Added simplified version of sound window for SDL (can toggle sound on or off).

Index: sound.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/sound.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sound.h	29 Apr 2006 21:00:42 -0000	1.5
+++ sound.h	29 Apr 2006 22:48:06 -0000	1.6
@@ -55,8 +55,6 @@
 extern void sounddone (void);
 extern void soundwindow (void);
 
-/* extern void soundaction (W_Event * data); */
-
 extern void Play_Sound (int type);
 extern void Play_Sound_Loc (int type, int angle, int distance);
 extern void Abort_Sound (int type);

Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- proto.h	26 Apr 2006 02:04:24 -0000	1.9
+++ proto.h	29 Apr 2006 22:48:06 -0000	1.10
@@ -1095,6 +1095,7 @@
 //static void soundrefresh(int i);
 #if defined(SOUND)
      void soundaction (W_Event * data);
+     void sdlsoundaction (W_Event * data);
 #endif
      extern void sounddone (void);
 



From modemhero at users.sourceforge.net  Sat Apr 29 17:48:09 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 29 Apr 2006 22:48:09 +0000
Subject: [netrek-cvs] client/netrekxp/resources/sounds nt_red_alert.wav, 1.3,
	1.4
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/sounds
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28867/resources/sounds

Modified Files:
	nt_red_alert.wav 
Log Message:
Added simplified version of sound window for SDL (can toggle sound on or off).

Index: nt_red_alert.wav
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/sounds/nt_red_alert.wav,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsuWMENK and /tmp/cvsGJiv7c differ



From modemhero at users.sourceforge.net  Sat Apr 29 17:48:08 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 29 Apr 2006 22:48:08 +0000
Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.30,1.31
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28867/resources/docs

Modified Files:
	changes.txt 
Log Message:
Added simplified version of sound window for SDL (can toggle sound on or off).

Index: changes.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- changes.txt	29 Apr 2006 21:00:42 -0000	1.30
+++ changes.txt	29 Apr 2006 22:48:06 -0000	1.31
@@ -1,4 +1,5 @@
 Version TBA:
+- added sound window for SDL so one can toggle sound on/off
 - added a special explosion sound just for starbase explosions
 - added "colorWeapons: (on)/off" to use color weapon bitmaps for torps and plasmas!  The
   bitmaps are a blend of COW/Ted Turner bitmaps, with some improvements in the area of



From modemhero at users.sourceforge.net  Sat Apr 29 17:48:08 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sat, 29 Apr 2006 22:48:08 +0000
Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C,1.8,1.9
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28867

Modified Files:
	NetrekXP to do list.C 
Log Message:
Added simplified version of sound window for SDL (can toggle sound on or off).

Index: NetrekXP to do list.C
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- NetrekXP to do list.C	29 Apr 2006 21:00:42 -0000	1.8
+++ NetrekXP to do list.C	29 Apr 2006 22:48:06 -0000	1.9
@@ -33,8 +33,7 @@
 closeable by shift right click.
 6) genoed as obs on team with no planets -> you were killed by something not in this
 game
-7) Icon not working under Visual Studio.  Also must resolve curslib, winkey and build issues
-9) playerlist not loading right on startup
+7) Resolve curslib, winkey, and version build issues under Visual Studio
 
 Might be done:
 1) mouse scroll in message windows gets the up/down coord wrong when main title



From modemhero at users.sourceforge.net  Sun Apr 30 10:59:42 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sun, 30 Apr 2006 15:59:42 +0000
Subject: [netrek-cvs] client/netrekxp/src vccnetrek.rc, NONE, 1.1 beeplite.c,
	1.7, 1.8 input.c, 1.6, 1.7 mswindow.c, 1.8, 1.9 newwin.c, 1.14,
	1.15 playerlist.c, 1.3, 1.4
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22426/src

Modified Files:
	beeplite.c input.c mswindow.c newwin.c playerlist.c 
Added Files:
	vccnetrek.rc 
Log Message:
Spacing fixes, updated build and compile files, added new resource file that works with Visual Studio, new clock bmp.

Index: mswindow.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- mswindow.c	29 Apr 2006 19:22:38 -0000	1.8
+++ mswindow.c	30 Apr 2006 15:59:40 -0000	1.9
@@ -2605,29 +2605,28 @@
         // If we're not in message windows then we'll map wheel up and
 		// wheel down events as regular mouse events
         if (win->type == WIN_GRAPH || win->type == WIN_TEXT || win->type == WIN_MENU)
-		{
+	{
 	        //BringWindowToTop (hwnd);
 			//GET_STRUCT_PTR;
 
             /* Let's see whether we should process wheel messages */
             if (!allowWheelActions)
                 return (1);
+            STORE_EVENT_MOUSE;
+            LastPressHwnd = hwnd;
 
-			STORE_EVENT_MOUSE;
-			LastPressHwnd = hwnd;
-
-			if (wheel > 0)
-			{
-				EventQueue[EventTail].key = W_WHEELUP;
-				EventQueue[EventTail].type = W_EV_BUTTON;
-			}
-			else if (wheel < 0)
-			{
-				EventQueue[EventTail].key = W_WHEELDOWN;
-				EventQueue[EventTail].type = W_EV_BUTTON;
-			}
+            if (wheel > 0)
+            {
+                EventQueue[EventTail].key = W_WHEELUP;
+                EventQueue[EventTail].type = W_EV_BUTTON;
+            }
+            else if (wheel < 0)
+            {
+            	EventQueue[EventTail].key = W_WHEELDOWN;
+            	EventQueue[EventTail].type = W_EV_BUTTON;
+            }
             return (0);
-		}
+	}
         else if (win->type == WIN_SCROLL)
         {
             i = GetScrollPos (hwnd, SB_VERT);
@@ -3728,6 +3727,7 @@
     border = bitmap->ClipRectAddr->top;
     x += border;
     y += border;
+    
     if (x < border)
     {
         width = bitmap->width - (border - x);
@@ -5792,12 +5792,12 @@
                                int border)
 {
     Window *newwin;
-	int orig_x, orig_y, orig_width, orig_height;
+    int orig_x, orig_y, orig_width, orig_height;
 
     orig_x = x;
-	orig_y = y;
-	orig_width = width;
-	orig_height = height;
+    orig_y = y;
+    orig_width = width;
+    orig_height = height;
 
     //Get the default position, etc.
     checkGeometry (name, &x, &y, &width, &height);
@@ -5824,11 +5824,11 @@
     newwin->TextHeight = height;
     newwin->TextWidth = width;
 
-	/* Set original coordinates, so we will be able to restore to them */
-	newwin->orig_x = orig_x;
-	newwin->orig_y = orig_y;
-	newwin->orig_width = orig_width;
-	newwin->orig_height = orig_height;
+    /* Set original coordinates, so we will be able to restore to them */
+    newwin->orig_x = orig_x;
+    newwin->orig_y = orig_y;
+    newwin->orig_width = orig_width;
+    newwin->orig_height = orig_height;
 
     //Map (show) the window if the user spec'd it
     if (checkMapped (name))

Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- newwin.c	29 Apr 2006 22:48:07 -0000	1.14
+++ newwin.c	30 Apr 2006 15:59:40 -0000	1.15
@@ -1740,7 +1740,7 @@
 /******************************************************************************/
 redrawQuit (void)
 {
-    W_WriteText (qwin, 5, 5, textColor, "Quit COW  ", 10, W_RegularFont);
+    W_WriteText (qwin, 5, 5, textColor, "Quit NetrekXP", 13, W_RegularFont);
 }
 
 

Index: input.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/input.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- input.c	24 Apr 2006 15:30:38 -0000	1.6
+++ input.c	30 Apr 2006 15:59:40 -0000	1.7
@@ -1490,72 +1490,71 @@
         && data->Window != infow
 		&& data->Window != playerw)
         return;
-
-	if (data->Window == playerw)
-	{
-		int x, y;
-
-        if (findMouseInWin (&x, &y, playerw))
-	    {
-		    data->Window = playerw;
-			data->x = x;
-			data->y = y;
-		}
-		if (data->key == W_LBUTTON)
-		{
-			target = gettarget (data->Window, data->x, data->y, TARG_PLAYER);
-			if (target->o_num == -1 || messageon || !playerListMessaging)
-				return;
-
-			/* Here we will have to enter message_on () followed by
-			   smessage to player */
+    
+    if (data->Window == playerw)
+    {
+    	int x, y;
+    	
+    	if (findMouseInWin (&x, &y, playerw))
+    	{
+    	    data->Window = playerw;
+            data->x = x;
+            data->y = y;
+        }
+        if (data->key == W_LBUTTON)
+        {
+            target = gettarget (data->Window, data->x, data->y, TARG_PLAYER);
+            if (target->o_num == -1 || messageon || !playerListMessaging)
+                return;
+            /* Here we will have to enter message_on () followed by
+               smessage to player */
 #ifdef SOUND
-                        if (newSound)
-  			    Play_Sound(MESSAGE_WAV);
-                        else
-  			    Play_Sound(MESSAGE_SOUND);
+            if (newSound)
+                Play_Sound(MESSAGE_WAV);
+            else
+                Play_Sound(MESSAGE_SOUND);
 #endif
-			message_on ();
-			data->key = players[target->o_num].p_mapchars[1];
-			smessage (data->key);
-			return;
-		}
-		else if (data->key == W_RBUTTON)
-		{
-			if (messageon || !playerListMessaging)
-				return;
-			/* Here we will have to enter message_on () followed by
-			   smessage to player */
+            message_on ();
+            data->key = players[target->o_num].p_mapchars[1];
+            smessage (data->key);
+	    return;
+	}
+        else if (data->key == W_RBUTTON)
+	{
+            if (messageon || !playerListMessaging)
+		return;
+            /* Here we will have to enter message_on () followed by
+               smessage to player */
 #ifdef SOUND
-                        if (newSound)
-  			    Play_Sound(MESSAGE_WAV);
-                        else
-  			    Play_Sound(MESSAGE_SOUND);
+            if (newSound)
+                Play_Sound(MESSAGE_WAV);
+            else
+                Play_Sound(MESSAGE_SOUND);
 #endif
-			message_on ();
-			data->key = 'T';
-			smessage (data->key);
-			return;
-		}
-		else if (data->key == W_MBUTTON)
-		{
-			if (messageon || !playerListMessaging)
-				return;
-			/* Here we will have to enter message_on () followed by
-			   smessage to player */
+            message_on ();
+            data->key = 'T';
+            smessage (data->key);
+	    return;
+	}
+        else if (data->key == W_MBUTTON)
+	{
+            if (messageon || !playerListMessaging)
+		return;
+           /* Here we will have to enter message_on () followed by
+              smessage to player */
 #ifdef SOUND
-                        if (newSound)
-  			    Play_Sound(MESSAGE_WAV);
-                        else
-  			    Play_Sound(MESSAGE_SOUND);
+           if (newSound)
+               Play_Sound(MESSAGE_WAV);
+           else
+               Play_Sound(MESSAGE_SOUND);
 #endif
-			message_on ();
-			data->key = 'A';
-			smessage (data->key);
-			return;
-		}
-		return;
+           message_on ();
+           data->key = 'A';
+           smessage (data->key);
+	    return;
 	}
+        return;
+    }
 
     if (messageon)
         message_off ();         /* ATM */

--- NEW FILE: vccnetrek.rc ---
#include "resource.h"

MAIN ICON DISCARDABLE "main.ico"

VS_VERSION_INFO VERSIONINFO
 FILEVERSION 1,0,0,1
 PRODUCTVERSION 1,0,0,1
 FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
 FILEFLAGS 0x3L
#else
 FILEFLAGS 0x2L
#endif
 FILEOS 0x10004L
 FILETYPE 0x1L
 FILESUBTYPE 0x0L
BEGIN
    BLOCK "StringFileInfo"
    BEGIN
        BLOCK "040904b0"
        BEGIN
            VALUE "Comments", "\0"
            VALUE "CompanyName", "Netrek\0"
            VALUE "FileDescription", "Netrek XP Mod (Colorized) Client\0"
            VALUE "FileVersion", "1, 0, 0, 1\0"
            VALUE "InternalName", "Netrek XP Mod\0"
            VALUE "LegalCopyright", "Copyright ? 1986-2004\0"
            VALUE "LegalTrademarks", "\0"
            VALUE "OriginalFilename", "netrek.rc\0"
            VALUE "PrivateBuild", "\0"
            VALUE "ProductName", "Netrek XP Mod Client\0"
            VALUE "ProductVersion", "1, 0, 0, 1\0"
            VALUE "SpecialBuild", "\0"
        END
    END
    BLOCK "VarFileInfo"
    BEGIN
        VALUE "Translation", 0x409, 1200
    END
END
Index: playerlist.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/playerlist.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- playerlist.c	21 Apr 2006 12:00:07 -0000	1.3
+++ playerlist.c	30 Apr 2006 15:59:40 -0000	1.4
@@ -5,7 +5,7 @@
  * rewrite for demand driven updates -> huge speedup: Oct. 94 [007] Major
  * rewrite to fix some bugs and speed things up     : Jan. 95 [Zork]
  * 
- * Sort observers separatly: opserver if (pl->p_flags & PFOBSERV) is true.  : Jul 01 [SRS]
+ * Sort observers separately: observer if (pl->p_flags & PFOBSERV) is true.  : Jul 01 [SRS]
  *
  */
 

Index: beeplite.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/beeplite.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- beeplite.c	26 Apr 2006 23:18:14 -0000	1.7
+++ beeplite.c	30 Apr 2006 15:59:39 -0000	1.8
@@ -26,10 +26,9 @@
 void rcdlite(struct distress *dist)
 /* the info */
 {
-    char    message[100];
-    int     len = 0;
-
-
+    char message[100];
+    int len = 0;
+    
     if ((dist == NULL) ||
     /* (dist->sender == me->p_no) || */
         (distlite[dist->distype] == NULL))



From modemhero at users.sourceforge.net  Sun Apr 30 10:59:41 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sun, 30 Apr 2006 15:59:41 +0000
Subject: [netrek-cvs] client/netrekxp/resources/misclib/mono clock.bmp,
	1.1.1.1, 1.2
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/misclib/mono
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22426/resources/misclib/mono

Modified Files:
	clock.bmp 
Log Message:
Spacing fixes, updated build and compile files, added new resource file that works with Visual Studio, new clock bmp.

Index: clock.bmp
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/misclib/mono/clock.bmp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvs6FpJCN and /tmp/cvs9X5DAh differ



From modemhero at users.sourceforge.net  Sun Apr 30 10:59:41 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sun, 30 Apr 2006 15:59:41 +0000
Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.31,1.32
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22426/resources/docs

Modified Files:
	changes.txt 
Log Message:
Spacing fixes, updated build and compile files, added new resource file that works with Visual Studio, new clock bmp.

Index: changes.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- changes.txt	29 Apr 2006 22:48:06 -0000	1.31
+++ changes.txt	30 Apr 2006 15:59:39 -0000	1.32
@@ -100,7 +100,7 @@
 - fixed hint messages so they properly loop
 - added Maximize button to title bar
 - added buildexe script for compiling solely the source code and not the bitmaps
-- made BCC default compiler and disabled RSA mkkey check (-nt) until I get a valid one
+- disabled RSA mkkey check (-nt) until I get a valid one
 
 Version 4.4.0.4: (changes by stas, added 18-Apr-2006 )
 - added "allowWheelActions: (on)/off" to be able to disable wheel in non-scrolling windows



From modemhero at users.sourceforge.net  Sun Apr 30 10:59:41 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sun, 30 Apr 2006 15:59:41 +0000
Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.9,
	1.10 build.cmd, 1.9, 1.10 buildexe.cmd, 1.3, 1.4 compile.txt,
	1.6, 1.7
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22426

Modified Files:
	NetrekXP to do list.C build.cmd buildexe.cmd compile.txt 
Log Message:
Spacing fixes, updated build and compile files, added new resource file that works with Visual Studio, new clock bmp.

Index: NetrekXP to do list.C
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- NetrekXP to do list.C	29 Apr 2006 22:48:06 -0000	1.9
+++ NetrekXP to do list.C	30 Apr 2006 15:59:37 -0000	1.10
@@ -33,7 +33,7 @@
 closeable by shift right click.
 6) genoed as obs on team with no planets -> you were killed by something not in this
 game
-7) Resolve curslib, winkey, and version build issues under Visual Studio
+7) Explore how changing SCALE breaks the client, and fix it: for future bitmap upgrades.
 
 Might be done:
 1) mouse scroll in message windows gets the up/down coord wrong when main title
@@ -43,6 +43,7 @@
 4) save_options keymap: not saving right
 5) if waiting on queue and get in, quit clock missing
 6) right click on all_review window, get message "obsolete!"
+7) winkey working with BCC
 
 Stas's list:
 - color coded playerlist.

Index: compile.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/compile.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- compile.txt	26 Apr 2006 02:04:24 -0000	1.6
+++ compile.txt	30 Apr 2006 15:59:39 -0000	1.7
@@ -21,8 +21,11 @@
 aka Microsoft Visual Studio 2005
 
 You will need the SDK from the web, as the software doesn't come with the necessary files.
-Additionally, DirectX SDK is probably needed too, for the SDL support.  The build file
-will not work under Visual Studio.
+Additionally, DirectX SDK is probably needed too, for the SDL support.
+Compile the entire project in studio (which includes clientr, curslib, and winkey),
+then run the build script from DOS prompt.  I (Bill) have commented out the build lines
+that used cscript to compile the source since that command doesn't work with Visual
+Studio.
 
 
 Stas Pirogov (keyos at keyos.org)

Index: buildexe.cmd
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/buildexe.cmd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- buildexe.cmd	26 Apr 2006 02:04:24 -0000	1.3
+++ buildexe.cmd	30 Apr 2006 15:59:38 -0000	1.4
@@ -23,15 +23,15 @@
 %MyCWD%\tools\mkkey -k %RSAKEY%
 popd
 
-pushd src\cursors
-cscript %MyCWD%\tools\vcmake.vbs curslib.dsw "Win32 Release"
-popd
+rem pushd src\cursors
+rem cscript %MyCWD%\tools\vcmake.vbs curslib.dsw "Win32 Release"
+rem popd
 
-pushd src\winkey
-cscript %MyCWD%\tools\vcmake.vbs winkey.dsw "Win32 Release"
-popd
+rem pushd src\winkey
+rem cscript %MyCWD%\tools\vcmake.vbs winkey.dsw "Win32 Release"
+rem popd
 
-cscript %MyCWD%\tools\vcmake.vbs clientr.dsw "Win32 Release"
+rem cscript %MyCWD%\tools\vcmake.vbs clientr.dsw "Win32 Release"
 
 pushd %InstCWD%\netrek
 %MyCWD%\tools\stampver -v%MyCWD%\src\stampver.inf netrek.exe

Index: build.cmd
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/build.cmd,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- build.cmd	29 Apr 2006 19:22:38 -0000	1.9
+++ build.cmd	30 Apr 2006 15:59:38 -0000	1.10
@@ -352,15 +352,15 @@
 %MyCWD%\tools\mkkey -nt -k %RSAKEY%
 popd
 
-pushd src\cursors
-cscript %MyCWD%\tools\vcmake.vbs curslib.dsw "Win32 Release"
-popd
+rem pushd src\cursors
+rem cscript %MyCWD%\tools\vcmake.vbs curslib.dsw "Win32 Release"
+rem popd
 
-pushd src\winkey
-cscript %MyCWD%\tools\vcmake.vbs winkey.dsw "Win32 Release"
-popd
+rem pushd src\winkey
+rem cscript %MyCWD%\tools\vcmake.vbs winkey.dsw "Win32 Release"
+rem popd
 
-cscript %MyCWD%\tools\vcmake.vbs clientr.dsw "Win32 Release"
+rem cscript %MyCWD%\tools\vcmake.vbs clientr.dsw "Win32 Release"
 
 pushd %InstCWD%\netrek
 %MyCWD%\tools\stampver -v%MyCWD%\src\stampver.inf netrek.exe



From modemhero at users.sourceforge.net  Sun Apr 30 15:17:50 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sun, 30 Apr 2006 20:17:50 +0000
Subject: [netrek-cvs] client/netrekxp/src defaults.c, 1.12, 1.13 input.c, 1.7,
	1.8 option.c, 1.10, 1.11 playerlist.c, 1.4, 1.5
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8425/src

Modified Files:
	defaults.c input.c option.c playerlist.c 
Log Message:
Some playerlist fixes, including new playerlist option to show all players, but put all observers on the bottom of the playerlist.

Index: playerlist.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/playerlist.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- playerlist.c	30 Apr 2006 15:59:40 -0000	1.4
+++ playerlist.c	30 Apr 2006 20:17:48 -0000	1.5
@@ -366,7 +366,7 @@
             {
                 if (players[count].p_status != PFREE)
                 {
-                    if (playerListObserver == 0)
+                    if (playerListObserver == 0 || playerListObserver == 3)
                     {
                         PlistLine (playerw, players + count, plistPos[count]);
                         PlistLine (playerw2, players + count, plistPos[count]);
@@ -388,7 +388,7 @@
             else
             {
                 if ((players[count].p_status != PFREE) &&
-                    ((playerListObserver == 0) ||
+                    ((playerListObserver == 0 || playerListObserver == 3) ||
                     ((playerListObserver == 1) &&
                     !(players[count].p_flags & PFOBSERV)) ||
                     ((playerListObserver == 2) &&
@@ -423,6 +423,7 @@
     struct player *current;
     int teamPos[NUMTEAM + 1];
     int *pos;
+    int obscount = 0;
 
     static int plistLastRow = -1;
     static int blankLine = -1;
@@ -450,7 +451,7 @@
     }
 
 
-    /* Count the number of players in each team. */
+    /* Count the number of players in each team, and total number of in game players. */
 
     for (i = NUMTEAM; i >= 0; --i)
         teamPos[i] = 0;
@@ -463,22 +464,31 @@
             {
                 if (playerListObserver == 0)
                     ++teamPos[remap[current->p_team]];
-                else if (playerListObserver == 1 &&
-                         current->p_mapchars[1] <= 'f')
+                else if ((playerListObserver == 1 || playerListObserver == 3)
+                        && current->p_mapchars[1] <= 'f')
                     ++teamPos[remap[current->p_team]];
-                else if (playerListObserver == 2 &&
-                        !(current->p_mapchars[1] <= 'f'))
+                else if (playerListObserver == 2
+                        && !(current->p_mapchars[1] <= 'f'))
                     ++teamPos[remap[current->p_team]];
+                    
+                if (!(current->p_mapchars[1] <= 'f'))
+                    obscount++;
             }
         }
         else
         {
-            if ((current->p_status != PFREE) &&
-                ((playerListObserver == 0) ||
-                ((playerListObserver == 1) && !(current->p_flags & PFOBSERV))
-                || ((playerListObserver == 2)
-                && (current->p_flags & PFOBSERV))))
-                ++teamPos[remap[current->p_team]];
+            if (current->p_status != PFREE)
+            {
+            	if ( (playerListObserver == 0)
+                 || ((playerListObserver == 1 || playerListObserver == 3)
+            	   && !(current->p_flags & PFOBSERV))
+                 || ((playerListObserver == 2)
+                   && (current->p_flags & PFOBSERV)) )
+                   ++teamPos[remap[current->p_team]];
+                   
+                if (current->p_flags & PFOBSERV)
+                    obscount++;
+            }
         }
     }
 
@@ -562,8 +572,8 @@
     }
 
     plistLastRow = last;
-
-
+    if (playerListObserver == 3)
+        plistLastRow += obscount;
 
     /* Write out each player that has either changed position or has
      * new stats. */
@@ -578,8 +588,12 @@
         }
         if (playerListHack)
         {
-            if (playerListObserver == 0)
+            if (playerListObserver == 0 || playerListObserver == 3)
             {
+            	if (playerListObserver == 3 && !(current->p_mapchars[1] <= 'f'))
+            	    row = --plistLastRow;
+            	else
+                    row = --(teamPos[remap[current->p_team]]);
                 row = --(teamPos[remap[current->p_team]]);
                 if ((!updatePlayer[i]) && plistPos[i] == row)
                     continue;
@@ -616,14 +630,30 @@
                 PlistLine (playerw, current, row);
                 PlistLine (playerw2, current, row);
             }
+            else if (playerListObserver == 3)
+            {
+            	row = --(teamPos[remap[current->p_team]]);
+                if ((!updatePlayer[i]) && plistPos[i] == row)
+                    continue;
+
+                plistPos[i] = row;
+                updatePlayer[i] = FALSE;
+
+                PlistLine (playerw, current, row);
+                PlistLine (playerw2, current, row);
+            }
         }            
         else
         {
-            if ((playerListObserver == 0) ||
+            if ((playerListObserver == 0) || 
                 ((playerListObserver == 1) && !(current->p_flags & PFOBSERV)) ||
-                ((playerListObserver == 2) && (current->p_flags & PFOBSERV)))
+                ((playerListObserver == 2) && (current->p_flags & PFOBSERV)) ||
+                (playerListObserver == 3))
             {
-                row = --(teamPos[remap[current->p_team]]);
+            	if (playerListObserver == 3 && (current->p_flags & PFOBSERV))
+            	    row = --plistLastRow;
+            	else
+                    row = --(teamPos[remap[current->p_team]]);
                 if ((!updatePlayer[i]) && plistPos[i] == row)
                     continue;
 
@@ -694,7 +724,10 @@
         pos = count + 1;
         plistPos[count] = pos;
 
-        if (players[count].p_status != PFREE)
+        if ( players[count].p_status != PFREE &&
+           (((playerListObserver == 0) || (playerListObserver == 3)) ||
+           ((playerListObserver == 1) && !(players[count].p_flags & PFOBSERV)) ||
+           ((playerListObserver == 2) && (players[count].p_flags & PFOBSERV))) )
         {
             PlistLine (playerw, players + count, pos);
             PlistLine (playerw2, players + count, pos);
@@ -1376,7 +1409,7 @@
         {
             if (playerListHack)
             {
-                if (playerListObserver == 0)
+                if (playerListObserver == 0 || playerListObserver == 3)
                 {
                     player_no = i;
                     break;
@@ -1396,7 +1429,7 @@
             }
             else
             {
-                if (playerListObserver == 0)
+                if (playerListObserver == 0 || playerListObserver == 3)
                 {
                     player_no = i;
                     break;
@@ -1420,7 +1453,7 @@
     {
         if (playerListHack)
         {
-            if (playerListObserver == 0)
+            if (playerListObserver == 0 || playerListObserver == 3)
                 flag = 1;
             else if (playerListObserver == 1 &&
                     (players[player_no].p_mapchars[1] <= 'f'))
@@ -1431,7 +1464,7 @@
         }
         else
         {
-            if (playerListObserver == 0)
+            if (playerListObserver == 0 || playerListObserver == 3)
                 flag = 1;
             else if (playerListObserver == 1 &&
                    !(players[player_no].p_flags & PFOBSERV))

Index: input.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/input.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- input.c	30 Apr 2006 15:59:40 -0000	1.7
+++ input.c	30 Apr 2006 20:17:47 -0000	1.8
@@ -2634,19 +2634,25 @@
 
     if (sortPlayers)
     {
-        playerListObserver++;
         switch (playerListObserver)
         {
         case (0):
-            W_MapWindow (playerw);
+            playerListObserver++;
             break;
         case (1):
+            playerListObserver++;
             break;
         case (2):
+            playerListObserver++;
             break;
         case (3):
-            playerListObserver = -1;
+            playerListObserver++;
             W_UnmapWindow (playerw);
+            break;
+        case (4):
+            playerListObserver = 0;
+            W_MapWindow (playerw);
+            break;
         }
 
         if (W_IsMapped (playerw))

Index: option.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- option.c	29 Apr 2006 19:22:38 -0000	1.10
+++ option.c	30 Apr 2006 20:17:48 -0000	1.11
@@ -113,6 +113,8 @@
 static char *playerlistobservermess[] = { "Display all players in playerlist",
                                           "Display in game players only",
                                           "Display observers only",
+                                          "Display players, then observers",
+                                          "Playerlist is off",
                                           ""
 };
 
@@ -226,7 +228,7 @@
 struct int_range messagehud_range = { 0, 2, 1 };
 #endif
 
-struct int_range playerlistobserver_range = { 0, 2, 1 };
+struct int_range playerlistobserver_range = { 0, 4, 1 };
 
 struct int_range planetbitmaprange = { 0, 2, 1 };
 

Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- defaults.c	29 Apr 2006 19:22:38 -0000	1.12
+++ defaults.c	30 Apr 2006 20:17:47 -0000	1.13
@@ -368,6 +368,7 @@
             "0 - all (default)",
             "1 - players",
             "2 - observers",
+            "3 - players, then observers",
             NULL
         }
     },



From modemhero at users.sourceforge.net  Sun Apr 30 15:17:49 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sun, 30 Apr 2006 20:17:49 +0000
Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C,1.10,1.11
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8425

Modified Files:
	NetrekXP to do list.C 
Log Message:
Some playerlist fixes, including new playerlist option to show all players, but put all observers on the bottom of the playerlist.

Index: NetrekXP to do list.C
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- NetrekXP to do list.C	30 Apr 2006 15:59:37 -0000	1.10
+++ NetrekXP to do list.C	30 Apr 2006 20:17:45 -0000	1.11
@@ -34,6 +34,9 @@
 6) genoed as obs on team with no planets -> you were killed by something not in this
 game
 7) Explore how changing SCALE breaks the client, and fix it: for future bitmap upgrades.
+8) Locking onto iggy caues the observer sound to mess up for shields up/down (this is
+server side problem)
+
 
 Might be done:
 1) mouse scroll in message windows gets the up/down coord wrong when main title



From modemhero at users.sourceforge.net  Sun Apr 30 15:17:49 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sun, 30 Apr 2006 20:17:49 +0000
Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.32,1.33
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8425/resources/docs

Modified Files:
	changes.txt 
Log Message:
Some playerlist fixes, including new playerlist option to show all players, but put all observers on the bottom of the playerlist.

Index: changes.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- changes.txt	30 Apr 2006 15:59:39 -0000	1.32
+++ changes.txt	30 Apr 2006 20:17:47 -0000	1.33
@@ -1,4 +1,16 @@
 Version TBA:
+- Added new value (choice 3) for playerListObserver so that observers appear
+  at the bottom of the playerlist.  Options are:
+   # What kind of players to list
+   # 0 - all (default)
+   # 1 - players
+   # 2 - observers
+   # 3 - players, then observers
+- If sortPlayers is off, toggling playerListObserver now properly shows the correct players
+  (ie all, in game players only, observers only).  Furthermore, turning player list off
+  with the L key (or whatever key you have mapped to toggle player list) will now correctly
+  update the options menu to say "Playerlist is off" in the box corresponding to
+  playerListObserver options.
 - added sound window for SDL so one can toggle sound on/off
 - added a special explosion sound just for starbase explosions
 - added "colorWeapons: (on)/off" to use color weapon bitmaps for torps and plasmas!  The



From modemhero at users.sourceforge.net  Sun Apr 30 15:29:36 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Sun, 30 Apr 2006 20:29:36 +0000
Subject: [netrek-cvs] client/netrekxp/src playerlist.c,1.5,1.6
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16434/src

Modified Files:
	playerlist.c 
Log Message:
Quick fix.

Index: playerlist.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/playerlist.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- playerlist.c	30 Apr 2006 20:17:48 -0000	1.5
+++ playerlist.c	30 Apr 2006 20:29:33 -0000	1.6
@@ -451,7 +451,7 @@
     }
 
 
-    /* Count the number of players in each team, and total number of in game players. */
+    /* Count the number of players in each team, and total number of observers. */
 
     for (i = NUMTEAM; i >= 0; --i)
         teamPos[i] = 0;
@@ -630,18 +630,6 @@
                 PlistLine (playerw, current, row);
                 PlistLine (playerw2, current, row);
             }
-            else if (playerListObserver == 3)
-            {
-            	row = --(teamPos[remap[current->p_team]]);
-                if ((!updatePlayer[i]) && plistPos[i] == row)
-                    continue;
-
-                plistPos[i] = row;
-                updatePlayer[i] = FALSE;
-
-                PlistLine (playerw, current, row);
-                PlistLine (playerw2, current, row);
-            }
         }            
         else
         {



From modemhero at users.sourceforge.net  Sun Apr 30 19:55:13 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Mon, 01 May 2006 00:55:13 +0000
Subject: [netrek-cvs] client/netrekxp/include sound.h,1.6,1.7
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7632/include

Modified Files:
	sound.h 
Log Message:
Added sound for when someone dies to plasma (SMACK FATALITY!)

Index: sound.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/sound.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sound.h	29 Apr 2006 22:48:06 -0000	1.6
+++ sound.h	1 May 2006 00:55:10 -0000	1.7
@@ -21,29 +21,30 @@
 #define ENTER_SHIP_SOUND        14
 #define SELF_DESTRUCT_SOUND     15
 #define PLASMA_HIT_SOUND        16
-#define ENTER_WARP_SOUND        17
-#define EXIT_WARP_SOUND         18
-#define MESSAGE_SOUND           19
-#define MESSAGE1_SOUND          20
-#define MESSAGE2_SOUND          21
-#define MESSAGE3_SOUND          22
-#define MESSAGE4_SOUND          23
-#define MESSAGE5_SOUND          24
-#define MESSAGE6_SOUND          25
-#define MESSAGE7_SOUND          26
-#define MESSAGE8_SOUND          27
-#define MESSAGE9_SOUND          28
+#define PLASMA_KILL_SOUND       17
+#define ENTER_WARP_SOUND        18
+#define EXIT_WARP_SOUND         19
+#define MESSAGE_SOUND           20
+#define MESSAGE1_SOUND          21
+#define MESSAGE2_SOUND          22
+#define MESSAGE3_SOUND          23
+#define MESSAGE4_SOUND          24
+#define MESSAGE5_SOUND          25
+#define MESSAGE6_SOUND          26
+#define MESSAGE7_SOUND          27
+#define MESSAGE8_SOUND          28
+#define MESSAGE9_SOUND          29
 
-#define OTHER_SOUND_OFFSET      28
+#define OTHER_SOUND_OFFSET      29
 
 /* Other people's sounds; not all of these are currently used */
-#define OTHER_FIRE_TORP_SOUND   29
-#define OTHER_PHASER_SOUND      30
-#define OTHER_FIRE_PLASMA_SOUND 31
-#define OTHER_EXPLOSION_SOUND   32
+#define OTHER_FIRE_TORP_SOUND   30
+#define OTHER_PHASER_SOUND      31
+#define OTHER_FIRE_PLASMA_SOUND 32
+#define OTHER_EXPLOSION_SOUND   33
 
 
-#define NUM_SOUNDS 32
+#define NUM_SOUNDS 33
 
 struct Sound
 {
@@ -79,6 +80,7 @@
   PHASER_WAV,
   PHASER_OTHER_WAV,
   PLASMA_HIT_WAV,
+  PLASMA_KILL_WAV,
   RED_ALERT_WAV,
   SELF_DESTRUCT_WAV,
   SHIELD_DOWN_WAV,



From modemhero at users.sourceforge.net  Sun Apr 30 19:55:13 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Mon, 01 May 2006 00:55:13 +0000
Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.33,1.34
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7632/resources/docs

Modified Files:
	changes.txt 
Log Message:
Added sound for when someone dies to plasma (SMACK FATALITY!)

Index: changes.txt
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- changes.txt	30 Apr 2006 20:17:47 -0000	1.33
+++ changes.txt	1 May 2006 00:55:11 -0000	1.34
@@ -1,4 +1,7 @@
 Version TBA:
+- Added new plasma_kill sound (Fatality!) for when someone dies to plasma (note the
+  sound fires based on kill messages, so if reportKills is off, you won't hear it).
+- fixed the reportKills option, it wasn't working, now it does.
 - Added new value (choice 3) for playerListObserver so that observers appear
   at the bottom of the playerlist.  Options are:
    # What kind of players to list



From modemhero at users.sourceforge.net  Sun Apr 30 19:55:12 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Mon, 01 May 2006 00:55:12 +0000
Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C,1.11,1.12
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7632

Modified Files:
	NetrekXP to do list.C 
Log Message:
Added sound for when someone dies to plasma (SMACK FATALITY!)

Index: NetrekXP to do list.C
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- NetrekXP to do list.C	30 Apr 2006 20:17:45 -0000	1.11
+++ NetrekXP to do list.C	1 May 2006 00:55:10 -0000	1.12
@@ -8,13 +8,17 @@
 new-be-nice!!
 
 
-Things not gonna happen:
+Things not gonna happen, or server problems:
 1) Player list messaging doesn't work if you can't see player (cloaked, too far
 away, etc).  Don't think this is fixable.
 2) Get mkkey working.
 3) torp_other and plasma_other not working right due to lack of torp fuse info
-4) cloaking/shields at warp 0 doesn't update someone else's tactical on what you did.
-4a) observer sound messes up when someone flips shields at warp 0
+4) cloaking/shields at warp 0 doesn't update someone else's tactical on what you did -
+server not sending right info.
+4a) observer sound messes up when someone flips shields at warp 0, again a server problem
+4b) Locking onto iggy caues the observer sound to mess up for shields up/down (this is
+server side problem, both for the not being able to lock back onto your team, and
+the shield packet not being sent)
 
 Things to do:
 1) Add warning hull.
@@ -34,9 +38,6 @@
 6) genoed as obs on team with no planets -> you were killed by something not in this
 game
 7) Explore how changing SCALE breaks the client, and fix it: for future bitmap upgrades.
-8) Locking onto iggy caues the observer sound to mess up for shields up/down (this is
-server side problem)
-
 
 Might be done:
 1) mouse scroll in message windows gets the up/down coord wrong when main title



From modemhero at users.sourceforge.net  Sun Apr 30 19:55:13 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Mon, 01 May 2006 00:55:13 +0000
Subject: [netrek-cvs] client/netrekxp/src dmessage.c, 1.5, 1.6 short.c, 1.4,
	1.5 sound.c, 1.10, 1.11
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7632/src

Modified Files:
	dmessage.c short.c sound.c 
Log Message:
Added sound for when someone dies to plasma (SMACK FATALITY!)

Index: short.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/short.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- short.c	21 Apr 2006 12:00:07 -0000	1.4
+++ short.c	1 May 2006 00:55:11 -0000	1.5
@@ -1526,7 +1526,7 @@
             }
             if (why_dead)
             {
-				add_whydead (msg.mesg, karg5);
+		add_whydead (msg.mesg, karg5);
                 karg5 = 0;
             }
 #endif

Index: dmessage.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/dmessage.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- dmessage.c	26 Apr 2006 02:04:24 -0000	1.5
+++ dmessage.c	1 May 2006 00:55:11 -0000	1.6
@@ -209,9 +209,22 @@
         else if ((flags == kill) || (flags == killp) ||
                  (flags == killa) || (flags == bomb))
         {
-            W_MessageAllowedWindows (WAM_KILL, 0, 0, color, message, len, 0);
             if (!reportKills)
                 return;         /* HW */
+                
+            W_MessageAllowedWindows (WAM_KILL, 0, 0, color, message, len, 0);
+            
+#ifdef SOUND          
+            if (why_dead &&
+               (instr (message, "[plasma]") || instr (message, "[zapped plasma]")))
+            {
+            	if (newSound)
+            	    Play_Sound(PLASMA_KILL_WAV);
+            	else          	
+            	    Play_Sound(PLASMA_KILL_SOUND);
+            }
+#endif
+
         }
 
         else if (flags & MINDIV)
@@ -258,9 +271,22 @@
               instr (message, "Credit for")) ||
             (*message != ' ' && instr (message, "We are being attacked")))
         {
-            W_MessageAllowedWindows (WAM_KILL, 0, 0, color, message, len, 0);
             if (!reportKills)
                 return;
+            
+            W_MessageAllowedWindows (WAM_KILL, 0, 0, color, message, len, 0);
+            
+#ifdef SOUND          
+            if (why_dead &&
+               (instr (message, "[plasma]") || instr (message, "[zapped plasma]")))
+            {
+            	if (newSound)
+            	    Play_Sound(PLASMA_KILL_WAV);
+            	else          	
+            	    Play_Sound(PLASMA_KILL_SOUND);
+            }
+#endif
+
             if (logging)
             {
                 if (logFile != NULL)

Index: sound.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/sound.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sound.c	29 Apr 2006 22:48:07 -0000	1.10
+++ sound.c	1 May 2006 00:55:11 -0000	1.11
@@ -32,6 +32,7 @@
 /* Each sound has a priority which controls what can override what
    Currently these are set as follows:
 
+   11: death sounds
    10: explosion
    9: phaser,plasma
    8: torp/plasma hit
@@ -59,6 +60,7 @@
     {"nt_enter_ship", 4, 1},
     {"nt_self_destruct", 6, 1},
     {"nt_plasma_hit", 8, 1},
+    {"nt_plasma_kill", 11, 1},
     {"nt_enter_warp", 4, 1},
     {"nt_exit_warp", 4, 1},
     {"nt_message", 4, 1},
@@ -112,6 +114,7 @@
   newsounds[PHASER_WAV] = Mix_LoadWAV(DATAFILE("nt_phaser.wav"));
   newsounds[PHASER_OTHER_WAV] = Mix_LoadWAV(DATAFILE("nt_phaser_other.wav"));
   newsounds[PLASMA_HIT_WAV] = Mix_LoadWAV(DATAFILE("nt_plasma_hit.wav"));
+  newsounds[PLASMA_KILL_WAV] = Mix_LoadWAV(DATAFILE("nt_plasma_kill.wav"));
   newsounds[RED_ALERT_WAV] = Mix_LoadWAV(DATAFILE("nt_red_alert.wav"));
   newsounds[SELF_DESTRUCT_WAV] = Mix_LoadWAV(DATAFILE("nt_self_destruct.wav"));
   newsounds[SHIELD_DOWN_WAV] = Mix_LoadWAV(DATAFILE("nt_shield_down.wav"));
@@ -470,6 +473,9 @@
         case PLASMA_HIT_SOUND:
             sprintf (buf, "Plasma hit sound is %s", flag);
             break;
+        case PLASMA_KILL_SOUND:
+            sprintf (buf, "Plasma kill sound is %s", flag);
+            break;
         }
     }
     else if (i == SOUND_OTHER)



From modemhero at users.sourceforge.net  Sun Apr 30 19:56:10 2006
From: modemhero at users.sourceforge.net (Bill Balcerski)
Date: Mon, 01 May 2006 00:56:10 +0000
Subject: [netrek-cvs] client/netrekxp/resources/sounds nt_plasma_kill.wav,
	NONE, 1.1
Message-ID: 

Update of /cvsroot/netrek/client/netrekxp/resources/sounds
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8376/resources/sounds

Added Files:
	nt_plasma_kill.wav 
Log Message:


--- NEW FILE: nt_plasma_kill.wav ---
(This appears to be a binary file; contents omitted.)