v1.8.4

Updated man page (doc/sopwith.6) to match Debian's manual page. Provided by Kenneth Pronovici. Applied patches from Adrian Reber to bring Sopwith up to date with bug fixes provided by Fedora. This should avoid crash on start-up problems and makes compiling more robust. [This has been modified as part of the 2022 Git conversion to squash the Id and Log CVS tags]
fragglet · Apr 12, 2022 · 4259bb8 · 4259bb8
1 parent 764e1c5
commit 4259bb8
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 15 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -2,5 +2,5 @@ BMB Compuscience Canada
 David L. Clark
 Andrew Jenner
 Simon Howard <[email protected]>
-Jesse Smith <[email protected]>
+Jesse Smith <[email protected]> (current maintainer)
 
diff --git a/COPYING b/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,13 @@
+v1.8.4
+Updated man page (doc/sopwith.6) to match Debian's manual page.
+Provided by Kenneth Pronovici.
+
+Applied patches from Adrian Reber to bring
+Sopwith up to date with bug fixes provided by Fedora.
+This should avoid crash on start-up problems and makes
+compiling more robust.
+
+
 v1.8.3
 The function asynclos() in swasynio.c includes a parameter
 which is never used. Calling functions do not bother passing

diff --git a/NEWS b/NEWS
@@ -1,3 +1,8 @@
+v1.8.4
+Updated manual page to match Debian's.
+Applied all known fixes from Debian and Fedora.
+
+
 v1.8.0
 
 Dropped support for GTK-2 as toolkit is being obsolete.

diff --git a/README b/README
@@ -30,4 +30,6 @@ Feedback
   If you like SDL Sopwith, email me and let me know!
 
   Simon Howard <[email protected]>
+  Jesse smith <[email protected]> (current maintainer)
+
 
diff --git a/configure.in b/configure.in
@@ -1,7 +1,7 @@
 AC_INIT(src/swmain.c)
 AC_CONFIG_AUX_DIR(autotools)
 
-VERSION=1.8.3
+VERSION=1.8.4
 AC_SUBST(VERSION)
 
 AC_CANONICAL_SYSTEM

diff --git a/doc/sopwith.6 b/doc/sopwith.6
@@ -5,7 +5,7 @@ sopwith \- classic aerial combat shoot em up game
 
 .SH SYNOPSIS
 .B sopwith 
-[ \-n | \-s | \-c | \-l | \-j \fIhost\fR ] [-f] [-2] [-x] [-q]
+[ \-n | \-s | \-c | \-l | \-j \fIhost\fR ] [\-f] [\-g\fIlevel\fR] [\-2] [\-x] [\-q] [\-p] [\-e]
 
 .SH DESCRIPTION
 Sopwith is a classic 1980s shoot 'em up originally developed by BMB
@@ -16,8 +16,13 @@ include emulation of the original PC speaker sound effects using digital
 sound output, working networking and various extra features that were
 included by the author in the released sources.
 
+.SH AUDIO
+As of version 1.7.3, audio is disabled by default.  Audio can be enabled
+using the \-p switch.  Once you're in the game, you will also have to
+use the S key to turn on sound effects.
+
 .SH CONTROLS
-The keys for controling the player's plane are defined
+The keys for controlling the player's plane are defined
 in the file ~/.sopwith/keys.
 The standard controls are as follows:
 .TP 
@@ -45,14 +50,20 @@ drop bomb
 H
 autopilot plane to home base
 .TP
-C
-launch flare
-.TP
 V
-fire missile
+launch starburst/flare (if missiles are enabled with \-x)
+.TP
+M
+fire missile (if missiles are enabled with \-x)
+.TP
+S
+turn on sound effects (if sound is enabled with \-p)
 .TP
 Ctrl+C
 quit
+.TP
+Ctrl+C Ctrl+C Ctrl+C
+quit immediately
 
 .SH OPTIONS
 .TP
@@ -75,8 +86,12 @@ by \fIhost\fR
 \-f
 Start in full screen mode if possible.
 .TP
+\-g\fIlevel\fR
+Start the game on the indicated difficulty level.  For instance, use \-g2 to start
+the game on level 2.  The default is level 0.
+.TP
 \-2
-Double-size the display window
+Double\-size the display window
 .TP
 \-x
 Enable missiles

diff --git a/src/gtk/video.c b/src/gtk/video.c
@@ -39,6 +39,8 @@
 
 #include "vid_vga.c"
 
+#include <string.>
+
 BOOL vid_fullscreen = FALSE;
 BOOL vid_double_size = TRUE;
 
@@ -579,11 +581,11 @@ static void Vid_UpdateScaled()
 			pixels2 += SCR_WDTH;
 		}
 	} else if(screen->bpp == 4) {
-		register unsigned long *pixels = (unsigned long *) screen->mem;
+		register unsigned int *pixels = (unsigned int *) screen->mem;
 		register unsigned char *pixels2 = screenbuf;
 
 		for (y = 0; y < SCR_HGHT; ++y) {
-			register unsigned long *p = pixels;
+			register unsigned int *p = pixels;
 			register unsigned char *p2 = pixels2;
 
 			for (x = 0; x < SCR_WDTH; ++x) {
@@ -663,11 +665,11 @@ static void Vid_UpdateUnscaled()
 			pixels2 += SCR_WDTH;
 		}
 	} else if(screen->bpp == 4) {
-		register unsigned long *pixels = (unsigned long *) screen->mem;
+		register unsigned int *pixels = (unsigned int *) screen->mem;
 		register unsigned char *pixels2 = screenbuf;
 
 		for (y = 0; y < SCR_HGHT; ++y) {
-			register unsigned long *p = pixels;
+			register unsigned int *p = pixels;
 			register unsigned char *p2 = pixels2;
 
 			for (x = 0; x < SCR_WDTH; ++x)

diff --git a/src/swinit.c b/src/swinit.c
@@ -324,7 +324,8 @@ void initdisp(BOOL reset)
 //
 
 
-static int inits[2] = { 0, 7 };
+// static int inits[2] = { 0, 7 };
+static int inits[4] = { 0, 7, 1, 6 };
 static int initc[4] = { 0, 7, 1, 6 };
 static int initm[8] = { 0, 7, 3, 4, 2, 5, 1, 6 };