Merge for 1.6.1 release

benmwebb · Dec 12, 2020 · a9ff2aa · a9ff2aa
2 parents 629acf4 + f91e785
commit a9ff2aa
Show file tree

Hide file tree

Showing 40 changed files with 8,974 additions and 4,918 deletions.
diff --git a/ChangeLog b/ChangeLog
diff --git a/ChangeLog.md b/ChangeLog.md
diff --git a/Makefile.am b/Makefile.am
@@ -5,7 +5,7 @@ SCOREDIR       = ${DESTDIR}${localstatedir}
 SCORE          = ${SCOREDIR}/dopewars.sco
 EXTRA_DIST     = ABOUT-NLS LICENCE dopewars.desktop rpm/dopewars.spec.in \
                  runindent.sh win32/README.md win32/install.nsi.in README.md \
-		 win32/mingw/Dockerfile
+		 win32/mingw/Dockerfile ChangeLog.md
 CLEANFILES     = dopewars.sco dopewars-log.txt dopewars-config.txt
 DISTCLEANFILES = rpm/dopewars.spec
 ACLOCAL_AMFLAGS= -I m4

diff --git a/NEWS b/NEWS
@@ -1,3 +1,8 @@
+11th December 2020
+     dopewars-1.6.1 released. This improves the appearance of the text-mode
+client, adds a British English translation, and fixes a bug selecting sounds
+from the options dialog of the Windows client.
+
 6th December 2020
      dopewars-1.6.0 released. The metaserver, broken since SourceForge moved
 to HTTPS, should work again. This release also adds support for modern 64-bit

diff --git a/README.md b/README.md
@@ -1,15 +1,15 @@
 [![Build Status](https://travis-ci.com/benmwebb/dopewars.svg?branch=develop)](https://travis-ci.com/benmwebb/dopewars)
 
-This is dopewars 1.6.0, a game simulating the life of a drug dealer in
+This is dopewars 1.6.1, a game simulating the life of a drug dealer in
 New York. The aim of the game is to make lots and lots of money...
 unfortunately, you start the game with a hefty debt, accumulating interest,
 and the cops take a rather dim view of drug dealing...
 
 These are brief instructions; see the HTML documentation for full information.
 
-dopewars 1.6.0 servers should handle clients as old as version 1.4.3 with
+dopewars 1.6.1 servers should handle clients as old as version 1.4.3 with
 hardly any visible problems (the reverse is also true). However, it is
-recommended that both clients and servers are upgraded to 1.6.0!
+recommended that both clients and servers are upgraded to 1.6.1!
 
 ## Installation
 
@@ -19,10 +19,10 @@ Either...
 
 Or...
 
-1. Get the tarball `dopewars-1.6.0.tar.gz` from the same URL
-2. Extract it via `tar -xvzf dopewars-1.6.0.tar.gz`
+1. Get the tarball `dopewars-1.6.1.tar.gz` from the same URL
+2. Extract it via `tar -xvzf dopewars-1.6.1.tar.gz`
 3. Follow the instructions in the `INSTALL` file in the newly-created
-   `dopewars-1.6.0` directory
+   `dopewars-1.6.1` directory
 
 Once you're done, you can safely delete the RPM, tarball and dopewars
 directory. The dopewars binary is all you need!
@@ -97,7 +97,7 @@ if I can fix 'em... of course, a
 [working patch](https://github.com/benmwebb/dopewars/pulls) would be even
 nicer! ;)
 
-## Licence
+## License
 
 dopewars is released under the GNU General Public License; see the text file
 LICENCE for further information. dopewars is copyright (C) Ben Webb 1998-2020.

diff --git a/auxbuild/README-release b/auxbuild/README-release
@@ -1,9 +1,12 @@
 New version checklist:
 
 - cd po; rm dopewars.pot; make dopewars.pot; make update-po; ./check-cformat.sh
-- Add version number, date to ChangeLog
+- Add version number, date to ChangeLog.md
 - Change stable version number in NEWS README.md doc/installation.html doc/index.html doc/windows.html
 - git checkout -b release/x.y.z
 - Change SVN to x.y.z in configure.ac and commit
-- Merge into master, git tag -s x.y.z, git push
-- make dist, upload tar.gz plus RPMs and .exes
+- Merge into master, tag, and push:
+  git checkout master; git merge --no-ff -m 'Merge for x.y.z release' origin/release/x.y.z; git tag -s -u 22A3BF2B vx.y.z; git push origin vx.y.z
+- Delete temporary branch:
+  git branch -d release/x.y.z; git push origin :release/x.y.z
+- make dist, upload tar.gz plus RPMs and .exes to GitHub and SourceForge
diff --git a/configure.ac b/configure.ac
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([dopewars], [1.6.0])
+AC_INIT([dopewars], [1.6.1])
 AC_CONFIG_SRCDIR([src/dopewars.c])
 AC_CONFIG_AUX_DIR(auxbuild)
 
@@ -8,7 +8,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_TARGET
 AC_USE_SYSTEM_EXTENSIONS
 
-dnl Initialise automake
+dnl Initialize automake
 dnl 'foreign' because we have README.md instead of README
 AM_INIT_AUTOMAKE([foreign])
 
@@ -309,7 +309,7 @@ if test "$CURSES_CLIENT" = "probe"; then
 fi
 
 dnl Do i18n stuff
-ALL_LINGUAS="de pl pt_BR fr fr_CA nn es es_ES"
+ALL_LINGUAS="de pl pt_BR fr fr_CA nn es es_ES en_GB"
 AM_GNU_GETTEXT([external])
 if test "$gt_cv_func_gettext_libintl" = "yes"; then
     LIBS="-lintl $LIBS"

diff --git a/doc/configfile.html b/doc/configfile.html
@@ -371,16 +371,16 @@ <h2><a id="combat">Basic configuration: guns and fighting</a></h2>
 <dt><b>Gun[<i>3</i>].Damage=<i>4</i></b></dt>
 <dd>Defines gun number <i>3</i> to do up to <i>4</i> points of damage.</dd>
 
-<dt><b>PlayerArmour=<i>100</i></b></dt>
-<dd>Sets the percentage armour rating of each player to <i>100</i> - this
+<dt><b>PlayerArmor=<i>100</i></b> or <b>PlayerArmour=<i>100</i></b></dt>
+<dd>Sets the percentage armor rating of each player to <i>100</i> - this
 defines the amount of health that you lose when you are successfully hit.
 If 100, you lose the same number of health points as the gun's damage.
 If more than 100, you lose fewer health points, and if less than 100, you lose
 <b>more</b> health points than the gun's damage. This rating applies only
 when you have no bitches.</dd>
 
-<dt><b>BitchArmour=<i>50</i></b></dt>
-<dd>Sets the percentage armour rating of each bitch to <i>50</i>.</dd>
+<dt><b>BitchArmor=<i>50</i></b> or <b>BitchArmour=<i>50</i></b></dt>
+<dd>Sets the percentage armor rating of each bitch to <i>50</i>.</dd>
 
 <dt><b>NumCop=<i>3</i></b></dt>
 <dd>Configures the game to have <i>3</i> cops. If you kill the first one, you
@@ -398,11 +398,11 @@ <h2><a id="combat">Basic configuration: guns and fighting</a></h2>
 <dd>Names more than one deputy accompanying the first cop
 <i>"deputies"</i>.</dd>
 
-<dt><b>Cop[<i>1</i>].Armour=<i>4</i></b></dt>
-<dd>Sets the armour rating of the first cop to <i>4%</i>.</dd>
+<dt><b>Cop[<i>1</i>].Armor=<i>4</i></b> or <b>Cop[<i>1</i>].Armour=<i>4</i></b></dt>
+<dd>Sets the armor rating of the first cop to <i>4%</i>.</dd>
 
-<dt><b>Cop[<i>1</i>].DeputyArmour=<i>3</i></b></dt>
-<dd>Sets the armour rating of the first cop's deputies to <i>3%</i>.</dd>
+<dt><b>Cop[<i>1</i>].DeputyArmor=<i>3</i></b> or <b>Cop[<i>1</i>].DeputyArmour=<i>3</i></b></dt>
+<dd>Sets the armor rating of the first cop's deputies to <i>3%</i>.</dd>
 
 <dt><b>Cop[<i>1</i>].AttackPenalty=<i>30</i></b></dt>
 <dd>When attacking another player, whether you successfully hit them depends

diff --git a/doc/developer.html b/doc/developer.html
@@ -19,7 +19,7 @@ <h1>Notes for developers</h1>
 documentation and concept, and particularly welcome suggested improvements.</p>
 
 <p>You are free to distribute modified versions of the code,
-again subject to the licence, but I also additions to the code
+again subject to the license, but I also welcome additions to the code
 via <a href="https://github.com/benmwebb/dopewars/pulls">pull requests</a>.
 If I choose to include this code in a new dopewars version, you will of
 course be credited in the changelog (unless, of course, you don't want to

diff --git a/doc/example-igneous b/doc/example-igneous
@@ -368,14 +368,14 @@ Cop[1].DeputiesName = "deputies"
 Cop[2].DeputiesName = "deputies"
 Cop[3].DeputiesName = "cops"
 Cop[4].DeputiesName = "Thugs"
-Cop[1].Armour = 4
-Cop[2].Armour = 15
-Cop[3].Armour = 50
-Cop[4].Armour = 36
-Cop[1].DeputyArmour = 3
-Cop[2].DeputyArmour = 4
-Cop[3].DeputyArmour = 6
-Cop[4].DeputyArmour = 12
+Cop[1].Armor = 4
+Cop[2].Armor = 15
+Cop[3].Armor = 50
+Cop[4].Armor = 36
+Cop[1].DeputyArmor = 3
+Cop[2].DeputyArmor = 4
+Cop[3].DeputyArmor = 6
+Cop[4].DeputyArmor = 12
 Cop[1].MinDeputies = 2
 Cop[2].MinDeputies = 4
 Cop[3].MinDeputies = 6

diff --git a/doc/help/cops.html b/doc/help/cops.html
@@ -36,12 +36,12 @@ <h1>dopewars: Cops Options</h1>
 <li><b>Maximum no. of deputies</b>: The highest number of deputies that can
 accompany this cop.<p /></li>
 
-<li><b>Cop armour</b>: A percentage value to determine how much damage the cop
+<li><b>Cop armor</b>: A percentage value to determine how much damage the cop
 takes when he is shot. A value of 100 means that if you do 10 damage, the cop
 loses 10 health. A value of 200 means that he only loses 5 health, and a value
 of 50 results in a loss of 20.<p /></li>
 
-<li><b>Deputy armour</b>: A percentage value to determine how much damage each
+<li><b>Deputy armor</b>: A percentage value to determine how much damage each
 deputy takes when he is shot.<p /></li>
 
 </ul>

diff --git a/doc/help/guns.html b/doc/help/guns.html
@@ -34,7 +34,7 @@ <h1>dopewars: Guns Options</h1>
 <p /></li>
 
 <li><b>Damage</b>: The maximum damage done by this gun, if you hit an enemy.
-(The actual amount of health that they lose is also dependent on their armour
+(The actual amount of health that they lose is also dependent on their armor
 rating.)
 <p /></li>
 

diff --git a/doc/i18n.html b/doc/i18n.html
@@ -194,6 +194,13 @@ <h2><a id="current">Currently available translations</a></h2>
    </ul>
 </li>
 
+<li>English (Britain) (<tt>en_GB.po</tt>)
+   <ul>
+   <li>Maintained by: Ben Webb</li>
+   <li>Version required: <b>1.6.1</b> or later</li>
+   </ul>
+</li>
+
 <li>Polish (<tt>pl.po</tt>)
    <ul>
    <li>Maintained by: Slawomir Molenda</li>
@@ -228,7 +235,7 @@ <h2><a id="current">Currently available translations</a></h2>
 <li><a href="index.html">Main index</a></li>
 </ul>
 <p>
-  Last update: <b>05-12-2020</b><br />
+  Last update: <b>09-12-2020</b><br />
   Valid <a href="http://validator.w3.org/check/referer">XHTML 1.1</a>
 </p>
 

diff --git a/doc/index.html b/doc/index.html
@@ -12,11 +12,11 @@
 td.linklist     { vertical-align: top }
 -->
 </style>
-<title>dopewars 1.6.0: Main Index</title>
+<title>dopewars 1.6.1: Main Index</title>
 </head>
 
 <body>
-<h1>dopewars 1.6.0: Main Index</h1>
+<h1>dopewars 1.6.1: Main Index</h1>
 
 <table>
 <col class="linklist" />

diff --git a/doc/installation.html b/doc/installation.html
@@ -56,7 +56,7 @@ <h2><a id="rpmbinary">RPM binary installation</a></h2>
 
 <ol>
 <li>Download the 
-<a href="http://prdownloads.sourceforge.net/dopewars/dopewars-1.6.0-1.el7.x86_64.rpm">
+<a href="http://prdownloads.sourceforge.net/dopewars/dopewars-1.6.1-1.el7.x86_64.rpm">
 x86_64 (64-bit Intel for RedHat Enterprise 7)</a> RPM with your web browser.</li>
 
 <li>Become root on your Unix box (if you cannot become root, then you will
@@ -65,7 +65,7 @@ <h2><a id="rpmbinary">RPM binary installation</a></h2>
 
 <li>Change to the directory containing the dopewars rpm, and install it with
 the command<br />
-<tt><b>rpm -Uvh dopewars-1.6.0-1.el7.x86_64.rpm</b></tt><br /> This will replace any
+<tt><b>rpm -Uvh dopewars-1.6.1-1.el7.x86_64.rpm</b></tt><br /> This will replace any
 already-installed earlier version.</li>
 </ol>
 
@@ -77,21 +77,21 @@ <h2><a id="rpmsource">RPM source installation</a></h2>
 
 <ol>
 <li>Download the
-<a href="http://prdownloads.sourceforge.net/dopewars/dopewars-1.6.0-1.el7.src.rpm">
+<a href="http://prdownloads.sourceforge.net/dopewars/dopewars-1.6.1-1.el7.src.rpm">
 source code RPM</a>.</li>
 
 <li>Become root and change to the directory containing the new rpm.</li>
 
 <li>Build a binary rpm with the command<br />
-<tt><b>rpmbuild --rebuild dopewars-1.6.0-1.el7.src.rpm</b></tt></li>
+<tt><b>rpmbuild --rebuild dopewars-1.6.1-1.el7.src.rpm</b></tt></li>
 
 <li>Change to the directory which the binary rpm has been written to (check
 the output of the above - usually /usr/src/redhat/RPMS/<i>xxx</i>, where
 <i>xxx</i> is your machine type - for example, "i386" on Intel machines,
 "alpha" on Alphas, "x86_64" on AMD64 or EM64T machines)</li>
 
 <li>Install the binary rpm with the command<br />
-<tt><b>rpm -Uvh dopewars-1.6.0-1.el7.<i>xxx</i>.rpm</b></tt></li>
+<tt><b>rpm -Uvh dopewars-1.6.1-1.el7.<i>xxx</i>.rpm</b></tt></li>
 </ol>
 
 <h2><a id="tarball">Tarball installation</a></h2>
@@ -109,15 +109,15 @@ <h2><a id="tarball">Tarball installation</a></h2>
 
 <ol>
 <li>Download the
-<a href="http://prdownloads.sourceforge.net/dopewars/dopewars-1.6.0.tar.gz">
+<a href="http://prdownloads.sourceforge.net/dopewars/dopewars-1.6.1.tar.gz">
 source code tarball</a>.</li>
 
 <li>Change to the directory containing the tarball and extract the contents
 with the command <br />
-<tt><b>tar -xvzf dopewars-1.6.0.tar.gz</b></tt><br />
+<tt><b>tar -xvzf dopewars-1.6.1.tar.gz</b></tt><br />
 (or similar).</li>
 
-<li>Change into the dopewars-1.6.0 directory, and read all the important
+<li>Change into the dopewars-1.6.1 directory, and read all the important
 documentation in there ;) Most notably, the INSTALL file gives more details
 on setup and installation.</li>
 
@@ -130,7 +130,7 @@ <h2><a id="tarball">Tarball installation</a></h2>
 <p>The configure script will test your system and set up dopewars so that it
 should compile cleanly.  The configure script supports a number of
 configurable options; for more details, read the INSTALL file in the
-dopewars-1.6.0 directory.</p>
+dopewars-1.6.1 directory.</p>
 
 <p>If you cannot become root, run the configure script specifying directories
 for which you have write access for the dopewars files, with a command

diff --git a/doc/protocol.html b/doc/protocol.html
@@ -179,7 +179,7 @@ <h2><a id="refserver">Server to client message reference</a></h2>
 
 <dt><b>C_SUBWAYFLASH</b> ('<tt>I</tt>')</dt>
 <dd>Used by the server to tell a client that it has just moved to a new
-location. (The client is not told where this location is, since this is
+location. (The client is not told where this location is, since this
 information is contained in a C_UPDATE message.) Clients usually reset any
 location-dependent state (e.g. fights) on receiving this message, and flash
 a "subway" indicator or similar<br />

diff --git a/doc/windows.html b/doc/windows.html
@@ -40,7 +40,7 @@ <h1>dopewars and Microsoft Windows</h1>
 the <tt>-N</tt> flag. One way to set this up is to use the
 <a href="https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/sc-create">sc create</a> utility from a command prompt, e.g.</p>
 
-<p><tt>sc create dopewars binpath= "C:\Program Files\dopewars-1.6.0\dopewars.exe -N"</tt></p>
+<p><tt>sc create dopewars binpath= "C:\Program Files\dopewars-1.6.1\dopewars.exe -N"</tt></p>
 
 <p>Note that this will run dopewars as the Local System user, so will look for
 high score/config files (and create a log file) in the corresponding AppData