walkero
/
starfighter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed the warp escape delay bug. 

That's embarassing.
This commit is contained in:
Layla Marchant 2020-05-23 21:10:45 -04:00
parent 7ef5382576
commit 9863aef0ba
58 changed files with 106 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -7,7 +7,7 @@
# information. This file is offered as-is, without any warranty. # information. This file is offered as-is, without any warranty.
AC_PREREQ([2.69]) AC_PREREQ([2.69])
AC_INIT([Project: Starfighter], [2.1], [diligentcircle@riseup.net], [starfighter]) AC_INIT([Project: Starfighter], [2.1.1], [diligentcircle@riseup.net], [starfighter])
AM_INIT_AUTOMAKE([foreign -Wall -Werror]) AM_INIT_AUTOMAKE([foreign -Wall -Werror])
AC_CONFIG_SRCDIR([src/Starfighter.c]) AC_CONFIG_SRCDIR([src/Starfighter.c])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])

2
data/credits.txt
View File

@ -65,5 +65,5 @@
350 Project: Starfighter 350 Project: Starfighter
020 Copyright 2003 Parallel Realities 020 Copyright 2003 Parallel Realities
020 Copyright 2012 Guus Sliepen, Astrid S. de Wijn and others 020 Copyright 2012 Guus Sliepen, Astrid S. de Wijn and others
020 Copyright 2015-2019 Layla Marchant 020 Copyright 2015-2020 Layla Marchant
120 pr-starfighter.github.io 120 pr-starfighter.github.io

4
locale/en.po
View File

@ -1,7 +1,7 @@
# Project: Starfighter Translatable Text # Project: Starfighter Translatable Text
# Copyright (C) 2003 Parallel Relaities # Copyright (C) 2003 Parallel Relaities
# Copyright (C) 2011, 2012, 2013 Guus Sliepen # Copyright (C) 2011, 2012, 2013 Guus Sliepen
# Copyright (C) 2012, 2015-2019 Layla Marchant # Copyright (C) 2012, 2015-2020 Layla Marchant
# #
# This program is free software: you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
@ -20,7 +20,7 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2.0.1\n" "Project-Id-Version: 2.1.1\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-03-06 19:09-0500\n" "POT-Creation-Date: 2020-03-06 19:09-0500\n"
"PO-Revision-Date: 2020-03-06 19:22-0500\n" "PO-Revision-Date: 2020-03-06 19:22-0500\n"

4
locale/pr-starfighter.pot
View File

@ -1,7 +1,7 @@
# Project: Starfighter Translatable Text # Project: Starfighter Translatable Text
# Copyright (C) 2003 Parallel Relaities # Copyright (C) 2003 Parallel Relaities
# Copyright (C) 2011, 2012, 2013 Guus Sliepen # Copyright (C) 2011, 2012, 2013 Guus Sliepen
# Copyright (C) 2012, 2015-2019 Layla Marchant # Copyright (C) 2012, 2015-2020 Layla Marchant
# #
# This program is free software: you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
@ -21,7 +21,7 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2.0.1\n" "Project-Id-Version: 2.1.1\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-03-06 19:09-0500\n" "POT-Creation-Date: 2020-03-06 19:09-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

2
src/Starfighter.c
View File

@ -2,7 +2,7 @@
Project: Starfighter Project: Starfighter
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012 Guus Sliepen Copyright (C) 2011, 2012 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/alien.c
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012 Guus Sliepen Copyright (C) 2011, 2012 Guus Sliepen
Copyright (C) 2012, 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2012, 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/alien.h
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011 Guus Sliepen Copyright (C) 2011 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/audio.c
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012 Guus Sliepen Copyright (C) 2011, 2012 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/audio.h
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012 Guus Sliepen Copyright (C) 2011, 2012 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/bullet.c
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012 Guus Sliepen Copyright (C) 2011, 2012 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/bullet.h
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011 Guus Sliepen Copyright (C) 2011 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/cargo.c
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011 Guus Sliepen Copyright (C) 2011 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/cargo.h
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011 Guus Sliepen Copyright (C) 2011 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/collectable.c
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012 Guus Sliepen Copyright (C) 2011, 2012 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/collectable.h
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011 Guus Sliepen Copyright (C) 2011 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/colors.c
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012, 2013 Guus Sliepen Copyright (C) 2011, 2012, 2013 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/colors.h
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011 Guus Sliepen Copyright (C) 2011 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/cutscene.c
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012, 2013 Guus Sliepen Copyright (C) 2011, 2012, 2013 Guus Sliepen
Copyright (C) 2012, 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2012, 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/cutscene.h
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011 Guus Sliepen Copyright (C) 2011 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/defs.c
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012 Guus Sliepen Copyright (C) 2011, 2012 Guus Sliepen
Copyright (C) 2012, 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2012, 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

10
src/defs.h
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012 Guus Sliepen Copyright (C) 2011, 2012 Guus Sliepen
Copyright (C) 2012, 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2012, 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License
@ -802,6 +802,14 @@ enum {
DIFFICULTY_MAX DIFFICULTY_MAX
}; };
// Engine state values (used for engine.done)
enum {
ENGINE_RUNNING = 0,
ENGINE_CLOSING,
ENGINE_SYSEXIT,
ENGINE_FORMATION
};
extern const char * const systemBackground[]; extern const char * const systemBackground[];
extern const int rate2reload[6]; extern const int rate2reload[6];

2
src/engine.c
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012, 2013 Guus Sliepen Copyright (C) 2011, 2012, 2013 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/engine.h
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011 Guus Sliepen Copyright (C) 2011 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/event.c
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012, 2013 Guus Sliepen Copyright (C) 2011, 2012, 2013 Guus Sliepen
Copyright (C) 2012, 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2012, 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/event.h
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011 Guus Sliepen Copyright (C) 2011 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/explosion.c
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011 Guus Sliepen Copyright (C) 2011 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/explosion.h
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011 Guus Sliepen Copyright (C) 2011 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

28
src/game.c
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012, 2013 Guus Sliepen Copyright (C) 2011, 2012, 2013 Guus Sliepen
Copyright (C) 2012, 2014-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2012, 2014-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License
@ -1444,11 +1444,12 @@ static void game_doPlayer()
if (engine.keyState[KEY_ESCAPE]) if (engine.keyState[KEY_ESCAPE])
{ {
if ((engine.done == 0) && (engine.gameSection == SECTION_GAME) && if ((engine.done == ENGINE_RUNNING) &&
(engine.gameSection == SECTION_GAME) &&
(mission.remainingObjectives1 == 0)) (mission.remainingObjectives1 == 0))
{ {
audio_playSound(SFX_FLY, screen->w / 2, screen->h / 2); audio_playSound(SFX_FLY, screen->w / 2, screen->h / 2);
engine.done = 2; engine.done = ENGINE_SYSEXIT;
engine.missionCompleteTimer = (SDL_GetTicks() - 1); engine.missionCompleteTimer = (SDL_GetTicks() - 1);
} }
} }
@ -1467,7 +1468,7 @@ static void game_doPlayer()
ymoved = 1; ymoved = 1;
} }
if (engine.done == 0) if (engine.done == ENGINE_RUNNING)
{ {
if (game.difficulty == DIFFICULTY_ORIGINAL) if (game.difficulty == DIFFICULTY_ORIGINAL)
{ {
@ -2541,7 +2542,7 @@ int game_mainLoop()
engine.smx = 0; engine.smx = 0;
engine.smy = 0; engine.smy = 0;
engine.done = 0; engine.done = ENGINE_RUNNING;
engine.counter = (SDL_GetTicks() + 1000); engine.counter = (SDL_GetTicks() + 1000);
engine.counter2 = (SDL_GetTicks() + 1000); engine.counter2 = (SDL_GetTicks() + 1000);
@ -2581,7 +2582,7 @@ int game_mainLoop()
engine.keyState[KEY_ALTFIRE] = 0; engine.keyState[KEY_ALTFIRE] = 0;
player_flushInput(); player_flushInput();
while (engine.done != 1) while (engine.done != ENGINE_CLOSING)
{ {
renderer_update(); renderer_update();
@ -2605,13 +2606,16 @@ int game_mainLoop()
((game.difficulty == DIFFICULTY_ORIGINAL) || ((game.difficulty == DIFFICULTY_ORIGINAL) ||
(game.difficulty == DIFFICULTY_NIGHTMARE) || (game.difficulty == DIFFICULTY_NIGHTMARE) ||
(game.area == MISN_INTERCEPTION) || (game.area == MISN_INTERCEPTION) ||
(game.area == MISN_ELLESH) || (game.area == MISN_MARS) || (game.area == MISN_ELLESH) ||
(mission_checkFailed()) || (collectable_numGood() <= 0))) (game.area == MISN_MARS) ||
(mission_checkFailed()) ||
(collectable_numGood() <= 0) ||
(engine.done == ENGINE_SYSEXIT)))
{ {
if ((!mission_checkFailed()) && (game.area != MISN_VENUS)) if ((!mission_checkFailed()) && (game.area != MISN_VENUS))
{ {
player_leaveSector(); player_leaveSector();
if ((engine.done == 2) && if ((engine.done == ENGINE_SYSEXIT) &&
(game.area != MISN_DORIM) && (game.area != MISN_DORIM) &&
(game.area != MISN_SIVEDI)) (game.area != MISN_SIVEDI))
{ {
@ -2654,7 +2658,7 @@ int game_mainLoop()
} }
else else
{ {
engine.done = 1; engine.done = ENGINE_CLOSING;
} }
} }
else else
@ -2668,7 +2672,7 @@ int game_mainLoop()
audio_setMusicVolume(engine.musicVolume); audio_setMusicVolume(engine.musicVolume);
if (SDL_GetTicks() >= engine.missionCompleteTimer) if (SDL_GetTicks() >= engine.missionCompleteTimer)
{ {
engine.done = 1; engine.done = ENGINE_CLOSING;
} }
} }
} }
@ -2716,7 +2720,7 @@ int game_mainLoop()
game_delayFrame(); game_delayFrame();
} }
if (!engine.done) if (engine.done == ENGINE_RUNNING)
audio_resumeMusic(); audio_resumeMusic();
} }

2
src/game.h
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011 Guus Sliepen Copyright (C) 2011 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/gfx.c
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012, 2013 Guus Sliepen Copyright (C) 2011, 2012, 2013 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/gfx.h
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011 Guus Sliepen Copyright (C) 2011 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/info.c
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012, 2013 Guus Sliepen Copyright (C) 2011, 2012, 2013 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/info.h
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011 Guus Sliepen Copyright (C) 2011 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

14
src/intermission.c
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012, 2013 Guus Sliepen Copyright (C) 2011, 2012, 2013 Guus Sliepen
Copyright (C) 2012, 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2012, 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License
@ -1442,7 +1442,7 @@ int intermission()
gfx_faceSprites[FS_KLINE] = gfx_loadImage("gfx/face_kline.png"); gfx_faceSprites[FS_KLINE] = gfx_loadImage("gfx/face_kline.png");
gfx_faceSprites[FS_CREW] = gfx_loadImage("gfx/face_crew.png"); gfx_faceSprites[FS_CREW] = gfx_loadImage("gfx/face_crew.png");
engine.done = 0; engine.done = ENGINE_RUNNING;
engine.keyState[KEY_FIRE] = 0; engine.keyState[KEY_FIRE] = 0;
engine.ssx = 0; engine.ssx = 0;
engine.ssy = 0; engine.ssy = 0;
@ -1539,9 +1539,9 @@ int intermission()
player_flushInput(); player_flushInput();
engine.keyState[KEY_FIRE] = engine.keyState[KEY_ALTFIRE] = 0; engine.keyState[KEY_FIRE] = engine.keyState[KEY_ALTFIRE] = 0;
engine.done = 0; engine.done = ENGINE_RUNNING;
while (!engine.done) while (engine.done == ENGINE_RUNNING)
{ {
renderer_update(); renderer_update();
@ -1595,7 +1595,7 @@ int intermission()
{ {
game.area = intermission_planets[game.stationedPlanet].missionNumber; game.area = intermission_planets[game.stationedPlanet].missionNumber;
rtn = 2; rtn = 2;
engine.done = 1; engine.done = ENGINE_CLOSING;
} }
else else
{ {
@ -1679,7 +1679,7 @@ int intermission()
case 7: case 7:
rtn = 0; rtn = 0;
engine.done = 1; engine.done = ENGINE_CLOSING;
break; break;
case 8: case 8:
@ -1714,7 +1714,7 @@ int intermission()
{ {
game.area = MISN_INTERCEPTION; game.area = MISN_INTERCEPTION;
rtn = 2; rtn = 2;
engine.done = 1; engine.done = ENGINE_CLOSING;
} }
} }

2
src/intermission.h
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011 Guus Sliepen Copyright (C) 2011 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

6
src/mission.c
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012, 2013 Guus Sliepen Copyright (C) 2011, 2012, 2013 Guus Sliepen
Copyright (C) 2012, 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2012, 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License
@ -1174,7 +1174,7 @@ void mission_showStartScreen()
renderer_update(); renderer_update();
player_flushInput(); player_flushInput();
engine.done = 0; engine.done = ENGINE_RUNNING;
engine.keyState[KEY_FIRE] = 0; engine.keyState[KEY_FIRE] = 0;
engine.keyState[KEY_ALTFIRE] = 0; engine.keyState[KEY_ALTFIRE] = 0;
engine.keyState[KEY_ESCAPE] = 0; engine.keyState[KEY_ESCAPE] = 0;
@ -1293,7 +1293,7 @@ void mission_showFinishedScreen()
renderer_update(); renderer_update();
player_flushInput(); player_flushInput();
engine.done = 0; engine.done = ENGINE_RUNNING;
engine.keyState[KEY_FIRE] = 0; engine.keyState[KEY_FIRE] = 0;
while (1) while (1)

2
src/mission.h
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011 Guus Sliepen Copyright (C) 2011 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

14
src/player.c
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012, 2013 Guus Sliepen Copyright (C) 2011, 2012, 2013 Guus Sliepen
Copyright (C) 2012, 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2012, 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License
@ -392,10 +392,10 @@ void player_leaveSector()
engine.keyState[KEY_FIRE] = 0; engine.keyState[KEY_FIRE] = 0;
engine.keyState[KEY_ALTFIRE] = 0; engine.keyState[KEY_ALTFIRE] = 0;
if (engine.done == 0) if (engine.done == ENGINE_RUNNING)
engine.done = 3; engine.done = ENGINE_FORMATION;
if (engine.done == 3) if (engine.done == ENGINE_FORMATION)
{ {
player.face = 0; player.face = 0;
if (player.x > -100) if (player.x > -100)
@ -410,18 +410,18 @@ void player_leaveSector()
if (player.x <= -100) if (player.x <= -100)
{ {
engine.done = 2; engine.done = ENGINE_SYSEXIT;
audio_playSound(SFX_FLY, screen->w / 2, screen->h / 2); audio_playSound(SFX_FLY, screen->w / 2, screen->h / 2);
} }
} }
if (engine.done == 2) if (engine.done == ENGINE_SYSEXIT)
{ {
player.face = 0; player.face = 0;
player.x += WARP_SPEED; player.x += WARP_SPEED;
engine.ssx -= 0.2; engine.ssx -= 0.2;
if (player.x > (2 * screen->w)) if (player.x > (2 * screen->w))
engine.done = 1; engine.done = ENGINE_CLOSING;
} }
} }

2
src/player.h
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011 Guus Sliepen Copyright (C) 2011 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/radio.c
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012, 2013 Guus Sliepen Copyright (C) 2011, 2012, 2013 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/radio.h
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011 Guus Sliepen Copyright (C) 2011 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/renderer.c
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012, 2013 Guus Sliepen Copyright (C) 2011, 2012, 2013 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/renderer.h
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011 Guus Sliepen Copyright (C) 2011 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/save.c
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012, 2013 Guus Sliepen Copyright (C) 2011, 2012, 2013 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/save.h
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011 Guus Sliepen Copyright (C) 2011 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/screen.c
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012, 2013 Guus Sliepen Copyright (C) 2011, 2012, 2013 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/screen.h
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011 Guus Sliepen Copyright (C) 2011 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/ship.c
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012 Guus Sliepen Copyright (C) 2011, 2012 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/ship.h
View File

@ -1,5 +1,5 @@
/* /*
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/shop.c
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012, 2013 Guus Sliepen Copyright (C) 2011, 2012, 2013 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/shop.h
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011 Guus Sliepen Copyright (C) 2011 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/structs.h
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012, 2013 Guus Sliepen Copyright (C) 2011, 2012, 2013 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

20
src/title.c
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012, 2013 Guus Sliepen Copyright (C) 2011, 2012, 2013 Guus Sliepen
Copyright (C) 2012, 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2012, 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License
@ -252,7 +252,7 @@ int title_show()
5, 0, FONT_WHITE, 0, copyrightText); 5, 0, FONT_WHITE, 0, copyrightText);
gfx_renderString("Copyright Guus Sliepen, Astrid S. de Wijn and others 2012", gfx_renderString("Copyright Guus Sliepen, Astrid S. de Wijn and others 2012",
5, MENU_SPACING, FONT_WHITE, 0, copyrightText); 5, MENU_SPACING, FONT_WHITE, 0, copyrightText);
gfx_renderString("Copyright 2015-2019 Layla Marchant", gfx_renderString("Copyright 2015-2020 Layla Marchant",
5, 2 * MENU_SPACING, FONT_WHITE, 0, copyrightText); 5, 2 * MENU_SPACING, FONT_WHITE, 0, copyrightText);
snprintf(buildVersion, STRMAX_SHORT, "Version %s", VERSION ); snprintf(buildVersion, STRMAX_SHORT, "Version %s", VERSION );
@ -295,7 +295,7 @@ int title_show()
screen_drawBackground(); screen_drawBackground();
engine.done = 0; engine.done = ENGINE_RUNNING;
player_flushInput(); player_flushInput();
engine.keyState[KEY_FIRE] = engine.keyState[KEY_ALTFIRE] = 0; engine.keyState[KEY_FIRE] = engine.keyState[KEY_ALTFIRE] = 0;
@ -431,7 +431,7 @@ int title_show()
selectedOption = 1; selectedOption = 1;
} }
else if (selectedOption == 3) else if (selectedOption == 3)
engine.done = 1; engine.done = ENGINE_CLOSING;
else if (selectedOption == 4) else if (selectedOption == 4)
{ {
menuType = MENU_OPTIONS; menuType = MENU_OPTIONS;
@ -439,7 +439,7 @@ int title_show()
} }
else if (selectedOption == 5) else if (selectedOption == 5)
{ {
engine.done = 1; engine.done = ENGINE_CLOSING;
} }
else if (selectedOption == 6) else if (selectedOption == 6)
{ {
@ -449,15 +449,15 @@ int title_show()
selectedOption = 1; selectedOption = 1;
} }
else else
engine.done = 1; engine.done = ENGINE_CLOSING;
} }
else if (selectedOption == 7) else if (selectedOption == 7)
engine.done = 1; engine.done = ENGINE_CLOSING;
break; break;
case MENU_DIFFICULTY: case MENU_DIFFICULTY:
if (selectedOption == 1) if (selectedOption == 1)
engine.done = 1; engine.done = ENGINE_CLOSING;
else if (selectedOption == 2) else if (selectedOption == 2)
{ {
game.difficulty++; game.difficulty++;
@ -474,7 +474,7 @@ int title_show()
case MENU_LOAD: case MENU_LOAD:
if (selectedOption != listLength) if (selectedOption != listLength)
{ {
engine.done = 1; engine.done = ENGINE_CLOSING;
continueSaveSlot = selectedOption - 1; continueSaveSlot = selectedOption - 1;
selectedOption = 3; selectedOption = 3;
} }
@ -653,7 +653,7 @@ void title_showCredits()
fclose(fp); fclose(fp);
engine.done = 0; engine.done = ENGINE_RUNNING;
engine.keyState[KEY_ESCAPE] = 0; engine.keyState[KEY_ESCAPE] = 0;
engine.keyState[KEY_FIRE] = 0; engine.keyState[KEY_FIRE] = 0;

2
src/title.h
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011 Guus Sliepen Copyright (C) 2011 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/weapons.c
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2013 Guus Sliepen Copyright (C) 2011, 2013 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/weapons.h
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011 Guus Sliepen Copyright (C) 2011 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/window.c
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012, 2013 Guus Sliepen Copyright (C) 2011, 2012, 2013 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2
src/window.h
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011 Guus Sliepen Copyright (C) 2011 Guus Sliepen
Copyright (C) 2015-2019 Layla Marchant <diligentcircle@riseup.net> Copyright (C) 2015-2020 Layla Marchant <diligentcircle@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License