Bug#582398: Sopwith starting level
Package: sopwith
Version: 1.7.1
When starting a game of sopwith, there isn't any option to jump to a
higher level of difficulty when playing against the AI. The attached
patch adds the ability to specify a higher level of difficulty from the
command line. For example, applying this patch allows the user to run
sopwith -g2
to begin at difficulty 2. By default, the game begins at level 0 (zero).
This patch also modifies the help screen to let the user know the option
is available.
--- sopwith-1.7.1/src/swinit.c 2003-06-08 15:20:30.0 -0300
+++ sopwith-1.7.2/src/swinit.c 2010-05-19 20:15:57.0 -0300
@@ -53,6 +53,7 @@
static int savescore; /* save players score on restart */
static BOOL ghost; /* ghost display flag */
+static starting_level = 0;
static char helptxt[] =
"\n"
@@ -67,6 +68,7 @@
"-c : single player against computer\n"
"-x : enable missiles\n"
"-q : begin game with sound off\n"
+"-g#: start at level #\n"
"\n"
"Video:\n"
"-f : fullscreen\n"
@@ -1034,7 +1036,8 @@
++gamenum;
savescore = ob->ob_score;
} else {
- gamenum = 0;
+ // gamenum = 0;
+gamenum = starting_level;
savescore = 0;
// sh 28/10/2001: go back to the title screen
@@ -1108,6 +,11 @@
c = 1;
else if (!strcasecmp(argv[i], "-f"))
vid_fullscreen = 1;
+else if (!strncasecmp(argv[i], "-g", 2))
+{
+sscanf(& (argv[i][2]), "%d", &starting_level);
+gamenum = starting_level;
+}
else if (!strcasecmp(argv[i], "-2"))
vid_double_size = 1;
else if (!strcasecmp(argv[i], "-q"))
Bug#582399: Sopwith doesn't compile properly on Ubuntu 9.10
Package: sopwith Version: 1.7.1 The sopwith source code doesn't compile properly on Ubuntu with gcc 4.4.1. Specifically, there is a header call to string.h missing from the vga code and a variable which is declared static in one source file and extern in a header file. The attached patch fixes these bugs to allow sopwith to compile on downstream Ubuntu. diff -au sopwith-1.7.1/src/swmain.h sopwith-1.7.2/src/swmain.h --- sopwith-1.7.1/src/swmain.h 2003-06-08 15:20:30.0 -0300 +++ sopwith-1.7.2/src/swmain.h 2010-05-19 19:47:07.0 -0300 @@ -46,7 +46,8 @@ extern int targrnge; extern BOOLhires; extern BOOLdisppos; -extern BOOLtitleflg; +// extern BOOLtitleflg; +static BOOL titleflg; extern int dispdbg; extern BOOLsoundflg; extern BOOLrepflag; diff -au sopwith-1.7.1/src/swsound.c sopwith-1.7.2/src/swsound.c --- sopwith-1.7.1/src/swsound.c 2003-06-08 15:20:30.0 -0300 +++ sopwith-1.7.2/src/swsound.c 2010-05-19 19:46:58.0 -0300 @@ -79,7 +79,8 @@ }; #endif -static BOOL titleflg; /* Playing title tune */ +// static BOOL titleflg; /* Playing title tune */ +extern BOOL titleflg; static int titlplace; /* Place in title tune;*/ static int titlline; /* Line in title tune */ static unsigned titltone; /* Current title tone */ diff -au sopwith-1.7.1/src/vid_vga.c sopwith-1.7.2/src/vid_vga.c --- sopwith-1.7.1/src/vid_vga.c 2003-06-08 15:20:30.0 -0300 +++ sopwith-1.7.2/src/vid_vga.c 2010-05-19 19:37:36.0 -0300 @@ -22,6 +22,8 @@ // //--- +#include + #include "video.h" #include "sw.h"
Bug#582399: Sopwith doesn't compile properly on Ubuntu 9.10
I'm glad it compiles on Debian as is. However, if you patch the Debian code with the patch I submitted, does it still compile? If it does, then I think it would be of benefit to update the code to support downstream. Admittedly, I'm biased being a downstream user. -Original Message- From: Ralf Treinen To: Jesse Smith , 582...@bugs.debian.org Subject: Re: Bug#582399: Sopwith doesn't compile properly on Ubuntu 9.10 Date: Thu, 20 May 2010 19:57:37 +0200 On Thu, May 20, 2010 at 11:28:13AM -0300, Jesse Smith wrote: > Package: sopwith > Version: 1.7.1 > > The sopwith source code doesn't compile properly on Ubuntu with gcc > 4.4.1. Specifically, there is a header call to string.h missing from the > vga code and a variable which is declared static in one source file and > extern in a header file. The attached patch fixes these bugs to allow > sopwith to compile on downstream Ubuntu. sopwith compiles fine on debian using gcc 4.4.4. -Ralf. - -- To UNSUBSCRIBE, email to debian-qa-packages-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1274378866.2491.56.ca...@hp-laptop
Bug#585929: New version
I would like to add that there is now a newer version, 1.7.3 out. It closes the following Debian bugs upstream: Range check and missile firing bug fixed. (224518 and 258751) Mouse pointer no longer appears over the game window. (187930) Throttle now goes up and down smoothly. (188391) Cleaned up compiler warnings and errors. (582399) -- To UNSUBSCRIBE, email to debian-qa-packages-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1276823890.2471.15.ca...@hp-laptop
