Update copyright notices, bump version to 1.2.

code/Starfighter.cpp

@@ -33,11 +33,12 @@ int main(int argc, char *argv[])
 		if (strcmp("--help", argv[1]) == 0)
 		{
 			printf("\nProject: Starfighter %s\n", VERSION);
-			printf("Copyright Parallel Realities 2003\n\n");
+			printf("Copyright Parallel Realities 2003\n");
+			printf("Copyright Guus Sliepen, Astrid S. de Wijn and others 2012\n");
 			printf("Additional Commands\n");
 			printf("\t-noaudio     Disables sound and music\n");
 			printf("\t-mono        Mono sound output (best for headphones)\n\n");
-			printf("www.parallelrealities.co.uk\n");
+			printf("http://sourceforge.net/projects/pr-starfighter/\n");
 			printf("\n");
 			exit(0);
 		}

code/init.cpp

@@ -77,7 +77,7 @@ void showErrorAndExit(int errorId, const char *name)
 			strcpy(string, "");
 			sprintf(string, "%s was not found in the Starfighter data package", name);
 			drawString(string, -1, 250, FONT_WHITE);
-			drawString("Please try again. If this error persists, contact Parallel Realities", -1, 275, FONT_WHITE);
+			drawString("Please try again. If this error persists, contact the authors", -1, 275, FONT_WHITE);
 			drawString("or reinstall the game", -1, 300, FONT_WHITE);
 			break;
 		case 1:
@@ -88,7 +88,7 @@ void showErrorAndExit(int errorId, const char *name)
 		case 2:
 			drawString("Project: Starfighter encountered a critical error", -1, 250, FONT_WHITE);
 			drawString("while attempting to perform a required program function.", -1, 275, FONT_WHITE);
-			drawString("Please contact Parallel Realities with details", -1, 300, FONT_WHITE);
+			drawString("Please contact the authors with details.", -1, 300, FONT_WHITE);
 			break;
 	}
 

code/title.cpp

@@ -331,9 +331,10 @@ int doTitle()
 
 				if (!skip)
 				{
-					drawString("Copyright Parallel Realities 2003", 5, 580, FONT_WHITE, background);
+					drawString("Copyright Parallel Realities 2003", 5, 560, FONT_WHITE, background);
+					drawString("Copyright Guus Sliepen, Astrid S. de Wijn and others 2012", 5, 580, FONT_WHITE, background);
 					drawString(buildVersion, 794 - strlen(buildVersion) * 9, 580, FONT_WHITE, background);
-					addBuffer(0, 580, 800, 20);
+					addBuffer(0, 560, 800, 40);
 					skip = true;
 				}
 			}
@@ -352,9 +353,10 @@ int doTitle()
 		{
 			if ((now - then <= 27500) && (!skip))
 			{
-				drawString("Copyright Parallel Realities 2003", 5, 580, FONT_WHITE, background);
+				drawString("Copyright Parallel Realities 2003", 5, 560, FONT_WHITE, background);
+				drawString("Copyright Guus Sliepen, Astrid S. de Wijn and others 2012", 5, 580, FONT_WHITE, background);
 				drawString(buildVersion, 794 - strlen(buildVersion) * 9, 580, FONT_WHITE, background);
-				addBuffer(0, 580, 800, 20);
+				addBuffer(0, 560, 800, 40);
 				skip = true;
 			}
 			else

data/credits.txt

@@ -161,5 +161,5 @@ human history as Project: Starfighter
 020 All Rights Reserved
 350 Project: Starfighter
 020 Copyright Parallel Realities 2003
-020 All Rights Reserved
+020 Copyright Guus Sliepen, Astrid S. de Wijn and others 2012
-120 http://www.parallelrealities.co.uk
+120 http://sourceforge.net/projects/pr-starfighter/

data/weapons.dat

@@ -1,5 +1,5 @@
 1 1 1 15 10 0 0 0
-1 1 1 15 10 0 0 0
+0 0 0 0 0 0 0 0
 1 1 1 15 10 0 1 0
 1 2 1 15 10 0 1 0
 1 3 1 15 10 0 1 0

docs/LICENSE

@@ -1,8 +1,8 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 
- Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+ 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.
 
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
                     GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,62 +278,3 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
                      END OF TERMS AND CONDITIONS
-
-	Appendix: How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program 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 General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

docs/index.html

@@ -2,10 +2,6 @@
 <HTML>
 <HEAD>
 <TITLE></TITLE>
-<META NAME="Generator" CONTENT="TextPad 4.0">
-<META NAME="Author" CONTENT="?">
-<META NAME="Keywords" CONTENT="?">
-<META NAME="Description" CONTENT="?">
 
 <STYLE>
 a {color: #499FFF; text-decoration: none; font-family: helvetica;}
@@ -28,7 +24,7 @@ td {color: #FFFFFF;}
 <TABLE BGCOLOR="#000099" WIDTH="100%"><TR><TD><B>License Agreement</B></TR></TR></TABLE>
 <P>Project: Starfighter<BR>
 Copyright Parallel Realities 2003<BR>
-All Rights Reserved
+Copyright Guus Sliepen, Astrid S. de Wijn and others 2012<BR>
 </P>
 
 <P>
@@ -49,9 +45,9 @@ See the GNU General Public License for more details.<BR>
 </P>
 
 <P>
-You should have received a copy of the GNU General Public License<BR>
+You should have received a copy of the GNU General Public License along<BR>
-along with this program; if not, write to the Free Software<BR>
+with this program; if not, write to the Free Software Foundation, Inc.,<BR>
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.<BR>
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.<BR>
 </P>
 
 <TABLE BGCOLOR="#000099" WIDTH="100%"><TR><TD><B>Introduction</B></TR></TR></TABLE>
@@ -66,19 +62,11 @@ game opens with Chris attempting to escape a Weapco patrol that has intercepted
 
 <P>
 <TABLE BGCOLOR="#000099" WIDTH="100%"><TR><TD><B>Installation</B></TD></TR></TABLE>
-<P>Binary files are provided for both Windows and Linux*.</P>
-<P>Installation under Windows</P>
-
-<P>
-	Unzip the archive into a suitable directory and then double click the Starfighter.exe
-	file to begin. Games and settings will be saved into this directory.
-</P>
-
 <P>Installation under Linux</P>
 
 <PRE>
-tar zxf starfighter.tar.gz
+tar zxf starfighter-1.2.tar.gz
-cd Starfighter
+cd starfighter-1.2
 make
 make install
 </PRE>
@@ -91,9 +79,6 @@ make install
 
 <P>Should this fail the game will not run.</P>
 
-<P><I>* x86 binary compiled with g++ on Mandrake 9. Source and makefile are provided for Linux users 
-who need to recompile</I></P>
-
 <P>
 <TABLE BGCOLOR="#000099" WIDTH="100%"><TR><TD><B>Controls</B></TD></TR></TABLE>
 
@@ -359,10 +344,10 @@ product. We do hope you enjoy playing it.</P>
 
 <P>Project: Starfighter<BR>
 Copyright Parallel Realities 2003<BR>
-All Rights Reserved</P>
+Copyright Guus Sliepen, Astrid S. de Wijn and others 2012<BR>
 <P>Created using the <A HREF="http://www.libsdl.org">SDL library</A></P>
 
-<P ALIGN="RIGHT"><A HREF="http://www.parallelrealities.co.uk">www.parallelrealities.co.uk</A></P>
+<P ALIGN="RIGHT"><A HREF="http://sourceforge.net/projects/pr-starfighter/">http://sourceforge.net/projects/pr-starfighter/</A></P>
 
 </BODY>
 </HTML>

makefile

@@ -3,12 +3,12 @@ CFLAGS += `sdl-config --cflags` -DLINUX
 LIBS = `sdl-config --libs` -lSDL_mixer -lSDL_image
 OBJS = ai.o aliens.o audio.o bullets.o cargo.o collectable.o comms.o debris.o events.o explosions.o game.o globals.o graphics.o init.o intermission.o loadSave.o messages.o misc.o missions.o player.o resources.o script.o shop.o Starfighter.o title.o unpack.o weapons.o
 
-VERSION = 1.1
+VERSION = 1.2
 PROG = starfighter
 PACK = starfighter.pak
 DOCS = docs/*
-DATA = data gfx music sound
+DATA = data gfx sound
-DATAFILES = data/* gfx/* music/* sound/*
+DATAFILES = data/* gfx/* sound/*
 
 USEPACK ?= 1
 
@@ -61,4 +61,12 @@ optimise:
 	advpng -z gfx/*.png
 	jpegoptim --strip-all gfx/*.jpg
 
-.PHONY: all clean install optimise unpack
+dist:
+	rm -rf starfighter-$(VERSION)
+	mkdir starfighter-$(VERSION)
+	cp --parents -lt starfighter-$(VERSION) `git ls-files`
+	git log >starfighter-$(VERSION)/ChangeLog
+	tar czf starfighter-$(VERSION).tar.gz starfighter-$(VERSION)
+	rm -rf starfighter-$(VERSION)
+
+.PHONY: all clean install optimise unpack dist