diff --git a/data/credits.txt b/data/credits.txt index cdc3601..b2b1820 100644 --- a/data/credits.txt +++ b/data/credits.txt @@ -65,5 +65,5 @@ 350 Project: Starfighter 020 Copyright 2003 Parallel Realities 020 Copyright 2012 Guus Sliepen, Astrid S. de Wijn and others -020 Copyright 2015, 2016 onpon4 +020 Copyright 2015, 2016 Julie Marchant 120 starfighter.nongnu.org diff --git a/data/intro.txt b/data/intro.txt deleted file mode 100644 index 0be315d..0000000 --- a/data/intro.txt +++ /dev/null @@ -1,9 +0,0 @@ -00 2579AD -60 After decades of war the intergalatic weapons corportation, WEAPCO, -20 has defeated all opposition itself and now rules the known universe -20 with an iron fist. Using a huge number of powerful AI driven craft -20 the company was completely unstoppable. -40 Under WEAPCO's rule, millions suffered and died. -40 The people cried out for a saviour... for someone to come and -20 light this dark hour... -80 ... and someone did. diff --git a/docs/index.html b/docs/index.html index 3ab1dbf..b17b3c3 100644 --- a/docs/index.html +++ b/docs/index.html @@ -28,7 +28,7 @@

Copyright © 2003 Parallel Realities
Copyright © 2012 Guus Sliepen, Astrid S. de Wijn and others
- Copyright © 2015, 2016 onpon4

+ Copyright © 2015, 2016 Julie Marchant

Project: Starfighter 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 3 of the License, or (at your option) any later version.

@@ -379,7 +379,7 @@ Copyright © 2003 Parallel Realities
Copyright © 2012 Guus Sliepen, Astrid S. de Wijn and others
- Copyright © 2015, 2016 onpon4

+ Copyright © 2015, 2016 Julie Marchant

Created using the SDL library.

diff --git a/src/Starfighter.cpp b/src/Starfighter.cpp index e65daa6..a125f62 100644 --- a/src/Starfighter.cpp +++ b/src/Starfighter.cpp @@ -134,8 +134,6 @@ int main(int argc, char **argv) colors_init(); - showStory(); - // Determine which part of the game we will go to... section = 0; diff --git a/src/title.cpp b/src/title.cpp index be92e21..1d9baa9 100644 --- a/src/title.cpp +++ b/src/title.cpp @@ -602,70 +602,6 @@ int doTitle() return selectedOption; } -/* -Scrolls the intro text up the screen and nothing else. -*/ -void showStory() -{ - gfx_free(); - - int y = screen->h + 20; - - FILE *fp; - - fp = fopen("data/intro.txt", "rb"); - - int index = 0; - int nextPos = -1; - char string[255]; - - while (fscanf(fp, "%d %[^\n]%*c", &nextPos, string) == 2) - { - y += nextPos; - gfx_createTextObject(index, string, -1, y, FONT_WHITE); - - index++; - } - - fclose(fp); - - loadBackground("gfx/startUp.jpg"); - screen_drawBackground(); - screen_flushBuffer(); - - flushInput(); - engine.keyState[KEY_FIRE] = engine.keyState[KEY_ALTFIRE] = 0; - - while (true) - { - renderer_update(); - screen_unBuffer(); - - getPlayerInput(); - - if ((engine.keyState[KEY_FIRE] || engine.keyState[KEY_ALTFIRE])) - break; - - // XXX: The fact that it's line 8 that's watched is completely - // arbitrary. It might be prudent to replace this with something else. - if (gfx_textSprites[8].y > (screen->h / 2) + 150) - { - for (int i = 0 ; i < 9 ; i++) - { - gfx_textSprites[i].y -= 0.33333; - screen_blitText(i); - } - } - else - { - SDL_Delay(3000); - break; - } - - game_delayFrame(); - } -} - /* The game over screen :( */ diff --git a/src/title.h b/src/title.h index 6214029..8d56d63 100644 --- a/src/title.h +++ b/src/title.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define TITLE_H extern int doTitle(); -extern void showStory(); extern void gameover(); extern void doCredits();