From 60783849e4978c2e4a42a54c35cf7d185c75677e Mon Sep 17 00:00:00 2001
From: onpon4 <onpon4@riseup.net>
Date: Wed, 4 Mar 2015 08:20:11 -0500
Subject: [PATCH] Removed the extro text from the credits.

I don't feel it's really necessary, and besides, it's annoying that
due to the way it's implemented it prevents you from doing anything
while it's shown.
---
 data/credits.txt |  7 ++++---
 data/extro.txt   |  4 ----
 src/game.cpp     |  2 +-
 src/title.cpp    | 22 ++--------------------
 src/title.h      |  2 +-
 5 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100644 data/extro.txt

diff --git a/data/credits.txt b/data/credits.txt
index fd69653..5a56e3f 100644
--- a/data/credits.txt
+++ b/data/credits.txt
@@ -1,4 +1,4 @@
-000 +++ CAST +++
+050 +++ CAST +++
 030 Chris Bainfield
 020 Krass Tylar
 020 Sid Wilson
@@ -62,6 +62,7 @@
 020 Torbjorn Andersson  Atrix Wolfe
 020 and all on the SDL mailing list
 350 Project: Starfighter
-020 Copyright Parallel Realities 2003
-020 Copyright Guus Sliepen, Astrid S. de Wijn and others 2012
+020 Copyright 2003 Parallel Realities
+020 Copyright 2012 Guus Sliepen, Astrid S. de Wijn and others
+020 Copyright 2015 Julian Marchant
 120 http://sourceforge.net/projects/pr-starfighter/
diff --git a/data/extro.txt b/data/extro.txt
deleted file mode 100644
index f423c83..0000000
--- a/data/extro.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-And so it was that in the year 2579 the galactic weapons corporation
-WEAPCO was defeated thanks to the valiant efforts of a few determined
-individuals; A cause that would be remembered throughout the rest of
-human history as Project: Starfighter.
\ No newline at end of file
diff --git a/src/game.cpp b/src/game.cpp
index 2c0cf93..163038e 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -328,7 +328,7 @@ int mainGameLoop()
 				doCutscene(6);
 				break;
 			case 26:
-				doCredits(true);
+				doCredits();
 				break;
 		}
 		
diff --git a/src/title.cpp b/src/title.cpp
index 11fcb62..645f9a6 100644
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -377,7 +377,7 @@ int doTitle()
 		// if someone has invoked the credits cheat
 		if (engine.cheatCredits)
 		{
-			doCredits(false);
+			doCredits();
 			engine.cheatCredits = false;
 		}
 
@@ -674,7 +674,7 @@ void gameover()
 	flushBuffer();
 }
 
-void doCredits(bool show_extro)
+void doCredits()
 {
 	loadBackground("gfx/credits.jpg");
 	flushBuffer();
@@ -705,24 +705,6 @@ void doCredits(bool show_extro)
 		Mix_PlayMusic(engine.music, 1);
 	}
 
-	if (show_extro)
-	{
-		fp = fopen("data/extro.txt", "rb");
-
-		i = 0;
-		while (fscanf(fp, "%[^\n]%*c", text) == 1)
-		{
-			drawString(text, -1, 240 + (i * 20), FONT_WHITE);
-			i++;
-		}
-
-		fclose(fp);
-
-		updateScreen();
- 		SDL_Delay(20000);
-		drawBackGround();
-	}
-
 	fp = fopen("data/credits.txt", "rb");
 	// FIXME: It would be nice for the size of this array to be determined
 	// by the number of lines in the text file. I'm not sure how to do
diff --git a/src/title.h b/src/title.h
index 5d51de7..21af1a1 100644
--- a/src/title.h
+++ b/src/title.h
@@ -20,4 +20,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 extern int doTitle();
 extern void showStory();
 extern void gameover();
-extern void doCredits(bool show_extro);
+extern void doCredits();