-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
That's embarassing.
- Loading branch information
Showing
58 changed files
with
106 additions
and
94 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,7 +7,7 @@ | |
# information. This file is offered as-is, without any warranty. | ||
|
||
AC_PREREQ([2.69]) | ||
AC_INIT([Project: Starfighter], [2.1], [[email protected]], [starfighter]) | ||
AC_INIT([Project: Starfighter], [2.1.1], [[email protected]], [starfighter]) | ||
AM_INIT_AUTOMAKE([foreign -Wall -Werror]) | ||
AC_CONFIG_SRCDIR([src/Starfighter.c]) | ||
AC_CONFIG_HEADERS([config.h]) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
Project: Starfighter | ||
Copyright (C) 2003 Parallel Realities | ||
Copyright (C) 2011, 2012 Guus Sliepen | ||
Copyright (C) 2015-2019 Layla Marchant <[email protected]> | ||
Copyright (C) 2015-2020 Layla Marchant <[email protected]> | ||
This program is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU General Public License | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
Copyright (C) 2003 Parallel Realities | ||
Copyright (C) 2011, 2012 Guus Sliepen | ||
Copyright (C) 2012, 2015-2019 Layla Marchant <[email protected]> | ||
Copyright (C) 2012, 2015-2020 Layla Marchant <[email protected]> | ||
This program is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU General Public License | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
Copyright (C) 2003 Parallel Realities | ||
Copyright (C) 2011 Guus Sliepen | ||
Copyright (C) 2015-2019 Layla Marchant <[email protected]> | ||
Copyright (C) 2015-2020 Layla Marchant <[email protected]> | ||
This program is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU General Public License | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
Copyright (C) 2003 Parallel Realities | ||
Copyright (C) 2011, 2012 Guus Sliepen | ||
Copyright (C) 2015-2019 Layla Marchant <[email protected]> | ||
Copyright (C) 2015-2020 Layla Marchant <[email protected]> | ||
This program is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU General Public License | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
Copyright (C) 2003 Parallel Realities | ||
Copyright (C) 2011, 2012 Guus Sliepen | ||
Copyright (C) 2015-2019 Layla Marchant <[email protected]> | ||
Copyright (C) 2015-2020 Layla Marchant <[email protected]> | ||
This program is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU General Public License | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
Copyright (C) 2003 Parallel Realities | ||
Copyright (C) 2011, 2012 Guus Sliepen | ||
Copyright (C) 2015-2019 Layla Marchant <[email protected]> | ||
Copyright (C) 2015-2020 Layla Marchant <[email protected]> | ||
This program is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU General Public License | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
Copyright (C) 2003 Parallel Realities | ||
Copyright (C) 2011 Guus Sliepen | ||
Copyright (C) 2015-2019 Layla Marchant <[email protected]> | ||
Copyright (C) 2015-2020 Layla Marchant <[email protected]> | ||
This program is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU General Public License | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
Copyright (C) 2003 Parallel Realities | ||
Copyright (C) 2011 Guus Sliepen | ||
Copyright (C) 2015-2019 Layla Marchant <[email protected]> | ||
Copyright (C) 2015-2020 Layla Marchant <[email protected]> | ||
This program is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU General Public License | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
Copyright (C) 2003 Parallel Realities | ||
Copyright (C) 2011 Guus Sliepen | ||
Copyright (C) 2015-2019 Layla Marchant <[email protected]> | ||
Copyright (C) 2015-2020 Layla Marchant <[email protected]> | ||
This program is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU General Public License | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
Copyright (C) 2003 Parallel Realities | ||
Copyright (C) 2011, 2012 Guus Sliepen | ||
Copyright (C) 2015-2019 Layla Marchant <[email protected]> | ||
Copyright (C) 2015-2020 Layla Marchant <[email protected]> | ||
This program is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU General Public License | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
Copyright (C) 2003 Parallel Realities | ||
Copyright (C) 2011 Guus Sliepen | ||
Copyright (C) 2015-2019 Layla Marchant <[email protected]> | ||
Copyright (C) 2015-2020 Layla Marchant <[email protected]> | ||
This program is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU General Public License | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
Copyright (C) 2003 Parallel Realities | ||
Copyright (C) 2011, 2012, 2013 Guus Sliepen | ||
Copyright (C) 2015-2019 Layla Marchant <[email protected]> | ||
Copyright (C) 2015-2020 Layla Marchant <[email protected]> | ||
This program is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU General Public License | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
Copyright (C) 2003 Parallel Realities | ||
Copyright (C) 2011 Guus Sliepen | ||
Copyright (C) 2015-2019 Layla Marchant <[email protected]> | ||
Copyright (C) 2015-2020 Layla Marchant <[email protected]> | ||
This program is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU General Public License | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
Copyright (C) 2003 Parallel Realities | ||
Copyright (C) 2011, 2012, 2013 Guus Sliepen | ||
Copyright (C) 2012, 2015-2019 Layla Marchant <[email protected]> | ||
Copyright (C) 2012, 2015-2020 Layla Marchant <[email protected]> | ||
This program is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU General Public License | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
Copyright (C) 2003 Parallel Realities | ||
Copyright (C) 2011 Guus Sliepen | ||
Copyright (C) 2015-2019 Layla Marchant <[email protected]> | ||
Copyright (C) 2015-2020 Layla Marchant <[email protected]> | ||
This program is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU General Public License | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
Copyright (C) 2003 Parallel Realities | ||
Copyright (C) 2011, 2012 Guus Sliepen | ||
Copyright (C) 2012, 2015-2019 Layla Marchant <[email protected]> | ||
Copyright (C) 2012, 2015-2020 Layla Marchant <[email protected]> | ||
This program is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU General Public License | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
Copyright (C) 2003 Parallel Realities | ||
Copyright (C) 2011, 2012 Guus Sliepen | ||
Copyright (C) 2012, 2015-2019 Layla Marchant <[email protected]> | ||
Copyright (C) 2012, 2015-2020 Layla Marchant <[email protected]> | ||
This program is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU General Public License | ||
|
@@ -802,6 +802,14 @@ enum { | |
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 int rate2reload[6]; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
Copyright (C) 2003 Parallel Realities | ||
Copyright (C) 2011, 2012, 2013 Guus Sliepen | ||
Copyright (C) 2015-2019 Layla Marchant <[email protected]> | ||
Copyright (C) 2015-2020 Layla Marchant <[email protected]> | ||
This program is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU General Public License | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
Copyright (C) 2003 Parallel Realities | ||
Copyright (C) 2011 Guus Sliepen | ||
Copyright (C) 2015-2019 Layla Marchant <[email protected]> | ||
Copyright (C) 2015-2020 Layla Marchant <[email protected]> | ||
This program is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU General Public License | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
Copyright (C) 2003 Parallel Realities | ||
Copyright (C) 2011, 2012, 2013 Guus Sliepen | ||
Copyright (C) 2012, 2015-2019 Layla Marchant <[email protected]> | ||
Copyright (C) 2012, 2015-2020 Layla Marchant <[email protected]> | ||
This program is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU General Public License | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
Copyright (C) 2003 Parallel Realities | ||
Copyright (C) 2011 Guus Sliepen | ||
Copyright (C) 2015-2019 Layla Marchant <[email protected]> | ||
Copyright (C) 2015-2020 Layla Marchant <[email protected]> | ||
This program is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU General Public License | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
Copyright (C) 2003 Parallel Realities | ||
Copyright (C) 2011 Guus Sliepen | ||
Copyright (C) 2015-2019 Layla Marchant <[email protected]> | ||
Copyright (C) 2015-2020 Layla Marchant <[email protected]> | ||
This program is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU General Public License | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
Copyright (C) 2003 Parallel Realities | ||
Copyright (C) 2011 Guus Sliepen | ||
Copyright (C) 2015-2019 Layla Marchant <[email protected]> | ||
Copyright (C) 2015-2020 Layla Marchant <[email protected]> | ||
This program is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU General Public License | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
Copyright (C) 2003 Parallel Realities | ||
Copyright (C) 2011, 2012, 2013 Guus Sliepen | ||
Copyright (C) 2012, 2014-2019 Layla Marchant <[email protected]> | ||
Copyright (C) 2012, 2014-2020 Layla Marchant <[email protected]> | ||
This program is free software; you can redistribute it and/or | ||
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.done == 0) && (engine.gameSection == SECTION_GAME) && | ||
if ((engine.done == ENGINE_RUNNING) && | ||
(engine.gameSection == SECTION_GAME) && | ||
(mission.remainingObjectives1 == 0)) | ||
{ | ||
audio_playSound(SFX_FLY, screen->w / 2, screen->h / 2); | ||
engine.done = 2; | ||
engine.done = ENGINE_SYSEXIT; | ||
engine.missionCompleteTimer = (SDL_GetTicks() - 1); | ||
} | ||
} | ||
|
@@ -1467,7 +1468,7 @@ static void game_doPlayer() | |
ymoved = 1; | ||
} | ||
|
||
if (engine.done == 0) | ||
if (engine.done == ENGINE_RUNNING) | ||
{ | ||
if (game.difficulty == DIFFICULTY_ORIGINAL) | ||
{ | ||
|
@@ -2541,7 +2542,7 @@ int game_mainLoop() | |
engine.smx = 0; | ||
engine.smy = 0; | ||
|
||
engine.done = 0; | ||
engine.done = ENGINE_RUNNING; | ||
|
||
engine.counter = (SDL_GetTicks() + 1000); | ||
engine.counter2 = (SDL_GetTicks() + 1000); | ||
|
@@ -2581,7 +2582,7 @@ int game_mainLoop() | |
engine.keyState[KEY_ALTFIRE] = 0; | ||
player_flushInput(); | ||
|
||
while (engine.done != 1) | ||
while (engine.done != ENGINE_CLOSING) | ||
{ | ||
renderer_update(); | ||
|
||
|
@@ -2605,13 +2606,16 @@ int game_mainLoop() | |
((game.difficulty == DIFFICULTY_ORIGINAL) || | ||
(game.difficulty == DIFFICULTY_NIGHTMARE) || | ||
(game.area == MISN_INTERCEPTION) || | ||
(game.area == MISN_ELLESH) || (game.area == MISN_MARS) || | ||
(mission_checkFailed()) || (collectable_numGood() <= 0))) | ||
(game.area == MISN_ELLESH) || | ||
(game.area == MISN_MARS) || | ||
(mission_checkFailed()) || | ||
(collectable_numGood() <= 0) || | ||
(engine.done == ENGINE_SYSEXIT))) | ||
{ | ||
if ((!mission_checkFailed()) && (game.area != MISN_VENUS)) | ||
{ | ||
player_leaveSector(); | ||
if ((engine.done == 2) && | ||
if ((engine.done == ENGINE_SYSEXIT) && | ||
(game.area != MISN_DORIM) && | ||
(game.area != MISN_SIVEDI)) | ||
{ | ||
|
@@ -2654,7 +2658,7 @@ int game_mainLoop() | |
} | ||
else | ||
{ | ||
engine.done = 1; | ||
engine.done = ENGINE_CLOSING; | ||
} | ||
} | ||
else | ||
|
@@ -2668,7 +2672,7 @@ int game_mainLoop() | |
audio_setMusicVolume(engine.musicVolume); | ||
if (SDL_GetTicks() >= engine.missionCompleteTimer) | ||
{ | ||
engine.done = 1; | ||
engine.done = ENGINE_CLOSING; | ||
} | ||
} | ||
} | ||
|
@@ -2716,7 +2720,7 @@ int game_mainLoop() | |
game_delayFrame(); | ||
} | ||
|
||
if (!engine.done) | ||
if (engine.done == ENGINE_RUNNING) | ||
audio_resumeMusic(); | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
Copyright (C) 2003 Parallel Realities | ||
Copyright (C) 2011 Guus Sliepen | ||
Copyright (C) 2015-2019 Layla Marchant <[email protected]> | ||
Copyright (C) 2015-2020 Layla Marchant <[email protected]> | ||
This program is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU General Public License | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
Copyright (C) 2003 Parallel Realities | ||
Copyright (C) 2011, 2012, 2013 Guus Sliepen | ||
Copyright (C) 2015-2019 Layla Marchant <[email protected]> | ||
Copyright (C) 2015-2020 Layla Marchant <[email protected]> | ||
This program is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU General Public License | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
Copyright (C) 2003 Parallel Realities | ||
Copyright (C) 2011 Guus Sliepen | ||
Copyright (C) 2015-2019 Layla Marchant <[email protected]> | ||
Copyright (C) 2015-2020 Layla Marchant <[email protected]> | ||
This program is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU General Public License | ||
|
Oops, something went wrong.