diff -Nru starfighter-2.3.3/configure starfighter-2.4/configure --- starfighter-2.3.3/configure 2020-09-20 16:07:31.000000000 +0000 +++ starfighter-2.4/configure 2020-12-26 23:19:11.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Project: Starfighter 2.3.3. +# Generated by GNU Autoconf 2.69 for Project: Starfighter 2.4. # # Report bugs to . # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='Project: Starfighter' PACKAGE_TARNAME='starfighter' -PACKAGE_VERSION='2.3.3' -PACKAGE_STRING='Project: Starfighter 2.3.3' +PACKAGE_VERSION='2.4' +PACKAGE_STRING='Project: Starfighter 2.4' PACKAGE_BUGREPORT='diligentcircle@riseup.net' PACKAGE_URL='' @@ -634,9 +634,11 @@ RUN_IN_PLACE_FALSE RUN_IN_PLACE_TRUE SF_RUN_IN_PLACE +SF_OLD_MUSIC SF_NOFONT SF_SCREEN_HEIGHT SF_SCREEN_WIDTH +SF_UNHARDEN SF_WARN PANGO_LIBS PANGO_CFLAGS @@ -758,9 +760,11 @@ PANGO_CFLAGS PANGO_LIBS SF_WARN +SF_UNHARDEN SF_SCREEN_WIDTH SF_SCREEN_HEIGHT SF_NOFONT +SF_OLD_MUSIC SF_RUN_IN_PLACE CPP' @@ -1313,7 +1317,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Project: Starfighter 2.3.3 to adapt to many kinds of systems. +\`configure' configures Project: Starfighter 2.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1384,7 +1388,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Project: Starfighter 2.3.3:";; + short | recursive ) echo "Configuration of Project: Starfighter 2.4:";; esac cat <<\_ACEOF @@ -1418,12 +1422,19 @@ C compiler flags for PANGO, overriding pkg-config PANGO_LIBS linker flags for PANGO, overriding pkg-config SF_WARN Set to 1 to enable compiler warnings + SF_UNHARDEN Set to 1 to disable hardening flags (for compatibility) SF_SCREEN_WIDTH The width of the game window in pixels SF_SCREEN_HEIGHT The height of the game window in pixels SF_NOFONT Set to 1 to manually force the compiler not to include font/Unicode support + SF_OLD_MUSIC + Set to 1 to compile for use with the MOD-based music originally + packaged with the game by Parallel Realities (note: you must + supply said music if you use this option; all files must have + the same name and format as distributed with Project: + Starfighter 1.1) SF_RUN_IN_PLACE Set to 1 to compile Starfighter to run in-place (instead of installing) @@ -1495,7 +1506,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Project: Starfighter configure 2.3.3 +Project: Starfighter configure 2.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1864,7 +1875,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Project: Starfighter $as_me 2.3.3, which was +It was created by Project: Starfighter $as_me 2.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2727,7 +2738,7 @@ # Define the identity of the package. PACKAGE='starfighter' - VERSION='2.3.3' + VERSION='2.4' cat >>confdefs.h <<_ACEOF @@ -3987,7 +3998,6 @@ STARFIGHTER_CPPFLAGS="-DVERSION=\\\"$PACKAGE_VERSION\\\"" -STARFIGHTER_LDADD="" # Detect MacOS # Make sure we can run config.sub. @@ -4618,11 +4628,22 @@ + + if test -n "$SF_WARN"; then : STARFIGHTER_CPPFLAGS="$STARFIGHTER_CPPFLAGS -Wall -Wformat-truncation=0" fi +if test -n "$SF_UNHARDEN"; then : + + echo "Building without hardening flags" + +else + + STARFIGHTER_LDADD="-Wl,-z,now" + +fi if test -n "$SF_SCREEN_WIDTH"; then : STARFIGHTER_CPPFLAGS="$STARFIGHTER_CPPFLAGS -DSCREEN_WIDTH=$SF_SCREEN_WIDTH" @@ -4651,6 +4672,13 @@ fi +if test -n "$SF_OLD_MUSIC"; then : + + STARFIGHTER_CPPFLAGS="$STARFIGHTER_CPPFLAGS -DOLD_MUSIC" + echo "Building for use with old music" + +fi + if test -n "$SF_RUN_IN_PLACE"; then : echo "Preparing a run-in-place build" @@ -5707,7 +5735,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Project: Starfighter $as_me 2.3.3, which was +This file was extended by Project: Starfighter $as_me 2.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5773,7 +5801,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Project: Starfighter config.status 2.3.3 +Project: Starfighter config.status 2.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru starfighter-2.3.3/configure.ac starfighter-2.4/configure.ac --- starfighter-2.3.3/configure.ac 2020-09-20 16:05:21.000000000 +0000 +++ starfighter-2.4/configure.ac 2020-12-26 23:03:43.000000000 +0000 @@ -7,7 +7,7 @@ # information. This file is offered as-is, without any warranty. AC_PREREQ([2.69]) -AC_INIT([Project: Starfighter], [2.3.3], [diligentcircle@riseup.net], [starfighter]) +AC_INIT([Project: Starfighter], [2.4], [diligentcircle@riseup.net], [starfighter]) AM_INIT_AUTOMAKE([foreign -Wall -Werror]) AC_CONFIG_SRCDIR([src/Starfighter.c]) AC_CONFIG_HEADERS([config.h]) @@ -18,7 +18,6 @@ AC_PROG_INSTALL STARFIGHTER_CPPFLAGS="-DVERSION=\\\"$PACKAGE_VERSION\\\"" -STARFIGHTER_LDADD="" # Detect MacOS AC_CANONICAL_HOST @@ -59,13 +58,20 @@ ]) AC_ARG_VAR([SF_WARN], [Set to 1 to enable compiler warnings]) +AC_ARG_VAR([SF_UNHARDEN], [Set to 1 to disable hardening flags (for compatibility)]) AC_ARG_VAR([SF_SCREEN_WIDTH], [The width of the game window in pixels]) AC_ARG_VAR([SF_SCREEN_HEIGHT], [The height of the game window in pixels]) AC_ARG_VAR([SF_NOFONT], [Set to 1 to manually force the compiler not to include font/Unicode support]) +AC_ARG_VAR([SF_OLD_MUSIC], [Set to 1 to compile for use with the MOD-based music originally packaged with the game by Parallel Realities (note: you must supply said music if you use this option; all files must have the same name and format as distributed with Project: Starfighter 1.1)]) AC_ARG_VAR([SF_RUN_IN_PLACE], [Set to 1 to compile Starfighter to run in-place (instead of installing)]) AS_IF([test -n "$SF_WARN"], [ STARFIGHTER_CPPFLAGS="$STARFIGHTER_CPPFLAGS -Wall -Wformat-truncation=0" ]) +AS_IF([test -n "$SF_UNHARDEN"], [ + echo "Building without hardening flags" +], [ + STARFIGHTER_LDADD="-Wl,-z,now" +]) AS_IF([test -n "$SF_SCREEN_WIDTH"], [ STARFIGHTER_CPPFLAGS="$STARFIGHTER_CPPFLAGS -DSCREEN_WIDTH=$SF_SCREEN_WIDTH" echo "Using default screen width of $SF_SCREEN_WIDTH" @@ -84,6 +90,11 @@ echo "Font/Unicode support manually disabled" ]) +AS_IF([test -n "$SF_OLD_MUSIC"], [ + STARFIGHTER_CPPFLAGS="$STARFIGHTER_CPPFLAGS -DOLD_MUSIC" + echo "Building for use with old music" +]) + AS_IF([test -n "$SF_RUN_IN_PLACE"], [ echo "Preparing a run-in-place build" ]) diff -Nru starfighter-2.3.3/data/credits.txt starfighter-2.4/data/credits.txt --- starfighter-2.3.3/data/credits.txt 2020-05-24 01:02:15.000000000 +0000 +++ starfighter-2.4/data/credits.txt 2020-12-26 05:08:50.000000000 +0000 @@ -10,7 +10,7 @@ 030 +++ ADDITIONAL PROGRAMMING +++ 020 Richard Sweeney 020 Guus Sliepen -020 Layla Marchant +020 The Diligent Circle 050 +++ QUALITY ASSURANCE AND ADVICE +++ 030 Sam Lantinga Ian Bissett 020 Chris Taylor Xan Christoph Reichenbach @@ -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-2020 Layla Marchant +020 Copyright 2015-2020 The Diligent Circle 120 pr-starfighter.github.io diff -Nru starfighter-2.3.3/debian/changelog starfighter-2.4/debian/changelog --- starfighter-2.3.3/debian/changelog 2020-08-27 01:05:10.000000000 +0000 +++ starfighter-2.4/debian/changelog 2022-08-25 13:39:00.000000000 +0000 @@ -1,3 +1,14 @@ +starfighter (2.4-1) unstable; urgency=medium + + * New upstream version: 2.4. + * debian/control: Bumped Standards version to 4.6.1. + * debian/source: created lintian-overrides file, to account for lintian + false positive for very-long-line-length-in-source-file. + * Removed patch 010_fix-autoconf-flags.patch; changes were incorporated + by upstream. + + -- Francisco M Neto Thu, 25 Aug 2022 13:39:00 +0000 + starfighter (2.3.3-1) unstable; urgency=medium * New maintainer; thanks to Guus Sliepen for all your work! (Closes: #963930) diff -Nru starfighter-2.3.3/debian/clean starfighter-2.4/debian/clean --- starfighter-2.3.3/debian/clean 2020-08-27 01:05:10.000000000 +0000 +++ starfighter-2.4/debian/clean 2021-06-10 02:07:15.000000000 +0000 @@ -1,5 +1,6 @@ locale/en/ locale/ja/ +locale/nl/ Makefile.in gfx/Makefile.in locale/Makefile.in diff -Nru starfighter-2.3.3/debian/control starfighter-2.4/debian/control --- starfighter-2.3.3/debian/control 2020-08-27 01:05:10.000000000 +0000 +++ starfighter-2.4/debian/control 2022-08-25 11:55:04.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Francisco M Neto Build-Depends: debhelper-compat (= 13), libsdl2-dev, libsdl2-image-dev, libsdl2-mixer-dev -Standards-Version: 4.5.1 +Standards-Version: 4.6.1 Homepage: http://pr-starfighter.github.io/ Rules-Requires-Root: no Vcs-Browser: https://salsa.debian.org/fmneto-guest/starfighter diff -Nru starfighter-2.3.3/debian/copyright starfighter-2.4/debian/copyright --- starfighter-2.3.3/debian/copyright 2020-08-27 01:05:10.000000000 +0000 +++ starfighter-2.4/debian/copyright 2021-06-10 02:06:35.000000000 +0000 @@ -62,7 +62,7 @@ Files: debian/* Copyright: 2012 Guus Sliepen - 2020 Francisco M Neto + 2021 Francisco M Neto License: GPL-2+ License: GPL-2+ diff -Nru starfighter-2.3.3/debian/patches/010_fix-autoconf-flags.patch starfighter-2.4/debian/patches/010_fix-autoconf-flags.patch --- starfighter-2.3.3/debian/patches/010_fix-autoconf-flags.patch 2020-08-27 01:05:10.000000000 +0000 +++ starfighter-2.4/debian/patches/010_fix-autoconf-flags.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Description: Fix missing linking flags - Upstream's build system (autotools) was not respecting DEB_BUILD_MAINT_OPTIONS. - This changes configure.ac to add the bindnow flags directly into Makefiles. -Author: Francisco M Neto -Bug: https://github.com/pr-starfighter/starfighter/issues/21 -Last-Update: 2020-11-20 ---- a/configure.ac -+++ b/configure.ac -@@ -18,7 +18,7 @@ - AC_PROG_INSTALL - - STARFIGHTER_CPPFLAGS="-DVERSION=\\\"$PACKAGE_VERSION\\\"" --STARFIGHTER_LDADD="" -+STARFIGHTER_LDADD="-Wl,-z,now" - - # Detect MacOS - AC_CANONICAL_HOST diff -Nru starfighter-2.3.3/debian/patches/series starfighter-2.4/debian/patches/series --- starfighter-2.3.3/debian/patches/series 2020-08-27 01:05:10.000000000 +0000 +++ starfighter-2.4/debian/patches/series 2021-06-10 01:49:26.000000000 +0000 @@ -1 +0,0 @@ -010_fix-autoconf-flags.patch diff -Nru starfighter-2.3.3/debian/salsa-ci.yml starfighter-2.4/debian/salsa-ci.yml --- starfighter-2.3.3/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ starfighter-2.4/debian/salsa-ci.yml 2021-06-10 02:05:20.000000000 +0000 @@ -0,0 +1,5 @@ +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml +variables: + RELEASE: unstable diff -Nru starfighter-2.3.3/debian/source/lintian-overrides starfighter-2.4/debian/source/lintian-overrides --- starfighter-2.3.3/debian/source/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ starfighter-2.4/debian/source/lintian-overrides 2022-08-25 12:20:12.000000000 +0000 @@ -0,0 +1,2 @@ +# False positives +starfighter source: very-long-line-length-in-source-file diff -Nru starfighter-2.3.3/debian/starfighter-data.install starfighter-2.4/debian/starfighter-data.install --- starfighter-2.3.3/debian/starfighter-data.install 2020-08-27 01:05:10.000000000 +0000 +++ starfighter-2.4/debian/starfighter-data.install 2021-06-10 01:58:29.000000000 +0000 @@ -1,9 +1,10 @@ usr/share/starfighter/locale/*.po usr/share/starfighter/locale/ usr/share/starfighter/locale/en/* usr/share/starfighter/locale/en/ usr/share/starfighter/locale/ja/* usr/share/starfighter/locale/ja/ +usr/share/starfighter/locale/nl/* usr/share/starfighter/locale/nl/ usr/share/starfighter/gfx/* usr/share/starfighter/gfx/ usr/share/starfighter/music/* usr/share/starfighter/music/ usr/share/starfighter/data/*.txt usr/share/doc/starfighter/ - +usr/share/starfighter/sound/* usr/share/starfighter/sound/ diff -Nru starfighter-2.3.3/debian/watch starfighter-2.4/debian/watch --- starfighter-2.3.3/debian/watch 2020-08-27 01:05:10.000000000 +0000 +++ starfighter-2.4/debian/watch 2022-08-25 12:35:30.000000000 +0000 @@ -1,4 +1,4 @@ version=4 -opts=filenamemangle=s/.*@PACKAGE@@ANY_VERSION@-src@ARCHIVE_EXT@/@PACKAGE@-$1\.tar\.gz/,\ -pgpsigurlmangle=s/@PACKAGE@@ANY_VERSION@-src\.tar\.gz/starfighter-$1-src\.tar\.gz\.sig/ \ - https://github.com/pr-starfighter/starfighter/releases/latest .*/@PACKAGE@@ANY_VERSION@-src\.tar\.gz +#opts="filenamemangle=s/.*@PACKAGE@@ANY_VERSION@-src@ARCHIVE_EXT@/@PACKAGE@-$1\.tar\.gz/, \ +opts="pgpmode=auto" \ +https://github.com/pr-starfighter/starfighter/releases/latest .*/@PACKAGE@@ANY_VERSION@-src\.tar\.gz diff -Nru starfighter-2.3.3/gfx/Makefile.in starfighter-2.4/gfx/Makefile.in --- starfighter-2.3.3/gfx/Makefile.in 2020-09-20 16:07:31.000000000 +0000 +++ starfighter-2.4/gfx/Makefile.in 2020-12-26 23:19:11.000000000 +0000 @@ -205,9 +205,11 @@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SF_NOFONT = @SF_NOFONT@ +SF_OLD_MUSIC = @SF_OLD_MUSIC@ SF_RUN_IN_PLACE = @SF_RUN_IN_PLACE@ SF_SCREEN_HEIGHT = @SF_SCREEN_HEIGHT@ SF_SCREEN_WIDTH = @SF_SCREEN_WIDTH@ +SF_UNHARDEN = @SF_UNHARDEN@ SF_WARN = @SF_WARN@ SHELL = @SHELL@ STARFIGHTER_CPPFLAGS = @STARFIGHTER_CPPFLAGS@ Binary files /tmp/tmpttdb6bwr/ACoX2Ly0we/starfighter-2.3.3/locale/en/LC_MESSAGES/pr-starfighter.mo and /tmp/tmpttdb6bwr/DVwpc4iO3O/starfighter-2.4/locale/en/LC_MESSAGES/pr-starfighter.mo differ diff -Nru starfighter-2.3.3/locale/en.po starfighter-2.4/locale/en.po --- starfighter-2.3.3/locale/en.po 2020-09-15 17:11:30.000000000 +0000 +++ starfighter-2.4/locale/en.po 2020-12-25 19:06:31.000000000 +0000 @@ -20,10 +20,10 @@ # msgid "" msgstr "" -"Project-Id-Version: 2.3.3\n" +"Project-Id-Version: 2.3.4\n" "Report-Msgid-Bugs-To: diligentcircle@riseup.net\n" -"POT-Creation-Date: 2020-09-15 13:07-0400\n" -"PO-Revision-Date: 2020-09-15 13:11-0400\n" +"POT-Creation-Date: 2020-12-25 14:04-0500\n" +"PO-Revision-Date: 2020-10-24 14:44-0400\n" "Last-Translator: Layla \n" "Language-Team: English\n" "Language: en\n" @@ -50,11 +50,11 @@ msgid "Very good, Bainfield. Now let's get a little more serious..." msgstr "Very good, Bainfield. Now let's get a little more serious..." -#: ../src/alien.c:1998 +#: ../src/alien.c:2002 msgid ">> Ally has ejected! <<" msgstr ">> Ally has ejected! <<" -#: ../src/alien.c:2000 +#: ../src/alien.c:2004 msgid ">> Friendly craft has been destroyed! <<" msgstr ">> Friendly craft has been destroyed! <<" @@ -65,7 +65,7 @@ #. / with brag messages that work well in the target language, #. / following the English version only as a general guideline. Any #. / number of brag messages is permitted. -#: ../src/alien.c:2029 +#: ../src/alien.c:2033 msgid "" "Take that, robot oppressors!\n" "Come on, WEAPCO, give me a challenge already!\n" @@ -106,7 +106,7 @@ #. / with brag messages that work well in the target language, #. / following the English version only as a general guideline. Any #. / number of brag messages is permitted. -#: ../src/alien.c:2062 +#: ../src/alien.c:2066 msgid "" "I got another one!\n" "Target destroyed!\n" @@ -139,7 +139,7 @@ #. / with brag messages that work well in the target language, #. / following the English version only as a general guideline. Any #. / number of brag messages is permitted. -#: ../src/alien.c:2091 +#: ../src/alien.c:2095 msgid "" "Kicked your ass!\n" "You ain't so tough!\n" @@ -173,25 +173,25 @@ #. / Dialog (Chris Bainfield) #. / Used when Krass Tyler is beaten in the Jupiter mission. -#: ../src/alien.c:2154 +#: ../src/alien.c:2158 msgid "The name's CHRIS, old-timer." msgstr "The name's CHRIS, old-timer." #. / Dialog (Kline Kethlan) #. / Used when Kline is killed in the Venus mission. -#: ../src/alien.c:2161 +#: ../src/alien.c:2165 msgid "It was an honor... to have fought you..." msgstr "It was an honor... to have fought you..." #. / Dialog (Kline Kethlan) #. / Used when Kline is beaten in the Elamale mission. -#: ../src/alien.c:2204 +#: ../src/alien.c:2207 msgid "Seems I underestimated you, Bainfield. We'll meet again!" msgstr "Seems I underestimated you, Bainfield. We'll meet again!" #. / Dialog (Sid Wilson) #. / Used when Kline is beaten in the Earth mission. -#: ../src/alien.c:2221 +#: ../src/alien.c:2223 msgid "Chris, Kethlan is getting away!" msgstr "Chris, Kethlan is getting away!" @@ -923,7 +923,7 @@ #. / with messages that work well in the target language, #. / following the English version only as a general guideline. Any #. / number of messages is permitted. -#: ../src/game.c:840 +#: ../src/game.c:841 msgid "" "Oops! Sorry!\n" "Whoops! Are you OK, Chris?\n" @@ -940,7 +940,7 @@ #. / with messages that work well in the target language, #. / following the English version only as a general guideline. Any #. / number of messages is permitted. -#: ../src/game.c:856 +#: ../src/game.c:857 msgid "" "Get out of the way!\n" "Don't fly into my missiles!\n" @@ -957,13 +957,13 @@ #. / with insults that work well in the target language, #. / following the English version only as a general guideline. Any #. / number of insults is permitted. -#: ../src/game.c:1603 +#: ../src/game.c:1608 msgid "" "Fool.\n" -"And now you're nothing but a DEAD hero.\n" +"And now you're nothing but a DEAD hero." msgstr "" "Fool.\n" -"And now you're nothing but a DEAD hero.\n" +"And now you're nothing but a DEAD hero." #. / Kline insult messages #. / This is a list of insults separated by "\n". They are randomly @@ -972,7 +972,7 @@ #. / with insults that work well in the target language, #. / following the English version only as a general guideline. Any #. / number of insults is permitted. -#: ../src/game.c:1618 +#: ../src/game.c:1623 msgid "" "Pathetic.\n" "How very disappointing...\n" @@ -984,7 +984,7 @@ #. / Dialog: Krass Tyler #. / Used when the player is killed in the Jupiter mission. -#: ../src/game.c:1629 +#: ../src/game.c:1634 msgid "That was the easiest $90,000,000 I've ever earned! Bwah! Ha! Ha! Ha!" msgstr "That was the easiest $90,000,000 I've ever earned! Bwah! Ha! Ha! Ha!" @@ -996,37 +996,37 @@ #. / timer to use single-digit numbers. #. / The ":" can also be replaced just like any text. For example, this would be fine: #. / "Time Remaining - %d minutes and %d seconds" -#: ../src/game.c:1942 +#: ../src/game.c:1947 #, c-format msgid "Time Remaining - %.2d:%.2d" msgstr "Time Remaining - %.2d:%.2d" #. / "%d" must be retained. It is replaced with the number of mission objectives remaining. -#: ../src/game.c:1950 +#: ../src/game.c:1955 #, c-format msgid "Objectives Remaining: %d" msgstr "Objectives Remaining: %d" #. / "%d" must be retained. It is replaced with the player's current total cash. #. / Retain "%d" as-is. It is replaced with the player's current cash. -#: ../src/game.c:1956 ../src/shop.c:352 +#: ../src/game.c:1961 ../src/shop.c:353 #, c-format msgid "Cash: $%d" msgstr "Cash: $%d" #. / "%.3d" must be retained. It is replaced with the amount of plasma ammo. -#: ../src/game.c:1993 +#: ../src/game.c:1998 #, c-format msgid "Plasma: %.3d" msgstr "Plasma: %.3d" #. / Used to indicate the charge meter for the charger cannon in the HUD. -#: ../src/game.c:2000 +#: ../src/game.c:2005 msgid "Charge" msgstr "Charge" #. / Used to indicate the heat meter for the laser cannon in the HUD. -#: ../src/game.c:2005 +#: ../src/game.c:2010 msgid "Heat" msgstr "Heat" @@ -1034,38 +1034,38 @@ #. / Retain "%.2d". It is replaced with the ship's current number of rockets. #. / "%.2d" can be changed to "%d" if you wish to not fill in space with zeroes, #. / e.g. render the number 3 as "3" rather than "03". -#: ../src/game.c:2010 ../src/shop.c:362 +#: ../src/game.c:2015 ../src/shop.c:363 #, c-format msgid "Rockets: %.2d" msgstr "Rockets: %.2d" #. / DIFFICULTY_SUPEREASY -#: ../src/game.c:2420 +#: ../src/game.c:2425 msgid "Super-Easy" msgstr "Super-Easy" #. / DIFFICULTY_EASY -#: ../src/game.c:2424 +#: ../src/game.c:2429 msgid "Easy" msgstr "Easy" #. / DIFFICULTY_NORMAL -#: ../src/game.c:2428 +#: ../src/game.c:2433 msgid "Normal" msgstr "Normal" #. / DIFFICULTY_HARD -#: ../src/game.c:2432 +#: ../src/game.c:2437 msgid "Hard" msgstr "Hard" #. / DIFFICULTY_NIGHTMARE -#: ../src/game.c:2436 +#: ../src/game.c:2441 msgid "Nightmare!" msgstr "Nightmare!" #. / DIFFICULTY_ORIGINAL (Classic) -#: ../src/game.c:2440 +#: ../src/game.c:2445 msgid "Classic" msgstr "Classic" @@ -2301,7 +2301,7 @@ msgid "Destroy WEAPCO frontline forces" msgstr "Destroy WEAPCO frontline forces" -#: ../src/mission.c:610 ../src/mission.c:980 +#: ../src/mission.c:610 ../src/mission.c:984 msgid "*** All Primary Objectives Completed ***" msgstr "*** All Primary Objectives Completed ***" @@ -2554,82 +2554,82 @@ msgid "That's one less surprise that WEAPCO can spring on us!" msgstr "That's one less surprise that WEAPCO can spring on us!" -#: ../src/mission.c:967 +#: ../src/mission.c:971 msgid "*** Primary Objective Completed ***" msgstr "*** Primary Objective Completed ***" -#: ../src/mission.c:969 +#: ../src/mission.c:973 msgid ">>> Primary Objective Failed <<<" msgstr ">>> Primary Objective Failed <<<" -#: ../src/mission.c:976 +#: ../src/mission.c:980 msgid "Emergency warp drive activated. Press button to engage." msgstr "Emergency warp drive activated. Press button to engage." -#: ../src/mission.c:982 +#: ../src/mission.c:986 msgid "*** Interception Destroyed ***" msgstr "*** Interception Destroyed ***" #. / Dialog (Chris Bainfield) #. / Used when the Earth mission is completed. -#: ../src/mission.c:1002 +#: ../src/mission.c:1006 msgid "" "You guys stay here and keep things under control. I'm going after Kethlan!" msgstr "" "You guys stay here and keep things under control. I'm going after Kethlan!" -#: ../src/mission.c:1011 +#: ../src/mission.c:1015 msgid "*** Secondary Objective Completed ***" msgstr "*** Secondary Objective Completed ***" -#: ../src/mission.c:1016 +#: ../src/mission.c:1020 msgid "*** All Secondary Objectives Completed ***" msgstr "*** All Secondary Objectives Completed ***" -#: ../src/mission.c:1031 +#: ../src/mission.c:1035 msgid ">>> MISSION FAILED <<<" msgstr ">>> MISSION FAILED <<<" -#: ../src/mission.c:1037 +#: ../src/mission.c:1041 msgid ">>> Secondary Objective Failed <<<" msgstr ">>> Secondary Objective Failed <<<" -#: ../src/mission.c:1116 +#: ../src/mission.c:1120 msgid "Primary Objectives" msgstr "Primary Objectives" -#: ../src/mission.c:1130 +#: ../src/mission.c:1134 msgid "Secondary Objectives" msgstr "Secondary Objectives" -#: ../src/mission.c:1144 +#: ../src/mission.c:1148 msgid "Additional Information" msgstr "Additional Information" #. / Used to indicate the player's shield meter in the HUD. -#: ../src/mission.c:1161 +#: ../src/mission.c:1165 msgid "Shield" msgstr "Shield" -#: ../src/mission.c:1163 +#: ../src/mission.c:1167 msgid "Target" msgstr "Target" -#: ../src/mission.c:1164 +#: ../src/mission.c:1168 msgid "Sid" msgstr "Sid" -#: ../src/mission.c:1165 +#: ../src/mission.c:1169 msgid "Phoebe" msgstr "Phoebe" -#: ../src/mission.c:1166 +#: ../src/mission.c:1170 msgid "Kline" msgstr "Kline" #. / "%d" must be retained. It is replaced with the mission required #. / survival time in minutes. -#: ../src/mission.c:1194 +#: ../src/mission.c:1198 #, c-format msgid "SURVIVAL FOR %d minute" msgid_plural "SURVIVAL FOR %d minutes" @@ -2638,36 +2638,36 @@ #. / "%d" must be retained. It is replaced with the mission time #. / limit in minutes. -#: ../src/mission.c:1203 +#: ../src/mission.c:1207 #, c-format msgid "TIME LIMIT: %d minute" msgid_plural "TIME LIMIT: %d minutes" msgstr[0] "TIME LIMIT: %d minute" msgstr[1] "TIME LIMIT: %d minutes" -#: ../src/mission.c:1219 +#: ../src/mission.c:1223 msgid "Phoebe Lexx will not be present" msgstr "Phoebe Lexx will not be present" -#: ../src/mission.c:1221 +#: ../src/mission.c:1225 msgid "Ursula Lexx will not be present" msgstr "Ursula Lexx will not be present" -#: ../src/mission.c:1228 +#: ../src/mission.c:1232 msgid "Sid Wilson will join you on this mission" msgstr "Sid Wilson will join you on this mission" -#: ../src/mission.c:1316 ../src/mission.c:1336 +#: ../src/mission.c:1320 ../src/mission.c:1340 msgid "COMPLETED" msgstr "COMPLETED" -#: ../src/mission.c:1321 ../src/mission.c:1341 +#: ../src/mission.c:1325 ../src/mission.c:1345 msgid "FAILED" msgstr "FAILED" #. / "%d" must be retained. It is replaced with the money earned #. / from the shield bonus. -#: ../src/mission.c:1352 +#: ../src/mission.c:1356 #, c-format msgid "Shield Bonus: $%d" msgstr "Shield Bonus: $%d" @@ -2684,7 +2684,7 @@ #. / the "%02ld" sequences may be changed to "%ld" if you wish to #. / not force two digits to be filled in (e.g. to render the number #. / 3 as "3" instead of "03"). -#: ../src/mission.c:1368 +#: ../src/mission.c:1372 #, c-format msgid "Mission Time: %02ld:%02ld" msgstr "Mission Time: %02ld:%02ld" @@ -2796,86 +2796,86 @@ msgstr "Mcr Homing Missiles" #. / Retain "%d" as-is. It is replaced with the rocket capacity of the Firefly. -#: ../src/shop.c:104 +#: ../src/shop.c:105 #, c-format msgid "Capacity : %d" msgstr "Capacity : %d" -#: ../src/shop.c:285 +#: ../src/shop.c:286 msgid "Primary Weapon" msgstr "Primary Weapon" #. / Shop info: min plasma output #. / Retain "%d" as-is. It is replaced with the min plasma output. -#: ../src/shop.c:288 +#: ../src/shop.c:289 #, c-format msgid "Cannons: %d" msgstr "Cannons: %d" #. / Shop info: min plasma damage #. / Retain "%d" as-is. It is replaced with the min plasma damage. -#: ../src/shop.c:292 +#: ../src/shop.c:293 #, c-format msgid "Power: Stage %d" msgstr "Power: Stage %d" #. / Shop info: min plasma rate #. / Retain "%d" as-is. It is replaced with the min plasma cooling. -#: ../src/shop.c:297 +#: ../src/shop.c:298 #, c-format msgid "Cooling: Stage %d" msgstr "Cooling: Stage %d" -#: ../src/shop.c:301 +#: ../src/shop.c:302 msgid "Powerup Weapon" msgstr "Powerup Weapon" #. / Shop info: max plasma output #. / Retain "%d" as-is. It is replaced with the max plasma output. -#: ../src/shop.c:304 +#: ../src/shop.c:305 #, c-format msgid "Splitter: Stage %d" msgstr "Splitter: Stage %d" #. / Shop info: max plasma damage #. / Retain "%d" as-is. It is replaced with the max plasma damage. -#: ../src/shop.c:309 +#: ../src/shop.c:310 #, c-format msgid "Condensor: Stage %d" msgstr "Condensor: Stage %d" #. / Shop info: max plasma rate #. / Retain "%d" as-is. It is replaced with the max plasma cooling. -#: ../src/shop.c:314 +#: ../src/shop.c:315 #, c-format msgid "L.Nitrogen: Stage %d" msgstr "L.Nitrogen: Stage %d" #. / Shop info: max plasma ammo #. / Retain "%d" as-is. It is replaced with the Firefly's plasma ammo capacity. -#: ../src/shop.c:319 +#: ../src/shop.c:320 #, c-format msgid "Capacity: %d" msgstr "Capacity: %d" -#: ../src/shop.c:328 +#: ../src/shop.c:329 msgid "Temporary Weapons" msgstr "Temporary Weapons" -#: ../src/shop.c:329 +#: ../src/shop.c:330 msgid "Ammo and Storage" msgstr "Ammo and Storage" -#: ../src/shop.c:331 +#: ../src/shop.c:332 msgid "Primary Weapons" msgstr "Primary Weapons" -#: ../src/shop.c:333 +#: ../src/shop.c:334 msgid "Secondary Weapons" msgstr "Secondary Weapons" #. / Retain "%d" as-is. It is replaced with the Firefly's max shield. -#: ../src/shop.c:349 +#: ../src/shop.c:350 #, c-format msgid "Shield: %d" msgstr "Shield: %d" @@ -2883,246 +2883,246 @@ #. / Retain "%.3d". It is replaced with the ship's current number of plasma cells. #. / "%.3d" can be changed to "%d" if you wish to not fill in space with zeroes, #. / e.g. render the number 5 as "5" rather than "005". -#: ../src/shop.c:357 +#: ../src/shop.c:358 #, c-format msgid "Plasma Cells: %.3d" msgstr "Plasma Cells: %.3d" -#: ../src/shop.c:368 +#: ../src/shop.c:369 msgid "Information" msgstr "Information" #. / For when the player attempts to buy something they can't afford. -#: ../src/shop.c:376 +#: ../src/shop.c:377 msgid "You don't have enough money" msgstr "You don't have enough money" #. / For when the player attempts an upgrade beyond the maximum (line 1 of 2). -#: ../src/shop.c:380 +#: ../src/shop.c:381 msgid "Cannot upgrade ship" msgstr "Cannot upgrade ship" #. / For when the player attempts an upgrade beyond the maximum (line 2 of 2). -#: ../src/shop.c:383 +#: ../src/shop.c:384 msgid "Hardware capacity has been reached" msgstr "Hardware capacity has been reached" #. / For when the player attempts to buy more ammo than the ship can hold. -#: ../src/shop.c:387 +#: ../src/shop.c:388 msgid "Ammunition limit reached" msgstr "Ammunition limit reached" #. / For when the player attempts to sell an item they aren't allowed to sell. -#: ../src/shop.c:391 +#: ../src/shop.c:392 msgid "You cannot sell that item" msgstr "You cannot sell that item" #. / For when the player attempts to sell an item they don't have any of. -#: ../src/shop.c:395 +#: ../src/shop.c:396 msgid "Nothing to sell" msgstr "Nothing to sell" #. / For when the player attempts to buy rockets or rocket capacity #. / while secondary weapon is either laser or charge cannon. -#: ../src/shop.c:400 +#: ../src/shop.c:401 msgid "Rockets cannot be bought for Laser or Charger Cannon" msgstr "Rockets cannot be bought for Laser or Charger Cannon" #. / For when the player attempts to buy a weapon they already have. -#: ../src/shop.c:404 +#: ../src/shop.c:405 msgid "You already have that weapon" msgstr "You already have that weapon" #. / For when the player attempts to increase rocket capacity beyond #. / what is allowed for the weapon (used for homing missiles). -#: ../src/shop.c:409 +#: ../src/shop.c:410 msgid "This weapon's ammo limit has been reached" msgstr "This weapon's ammo limit has been reached" #. / Used to put a shop item's name next to its price. #. / "%s" is replaced with the item name, and "%d" is replaced #. / with the item price. -#: ../src/shop.c:417 +#: ../src/shop.c:418 #, c-format msgid "%s ($%d)" msgstr "%s ($%d)" #. / Used for shop items that cannot be bought. #. / "%s" is replaced with the item name. -#: ../src/shop.c:425 +#: ../src/shop.c:426 #, c-format msgid "%s (N/A)" msgstr "%s (N/A)" #. ----------- Temporary Items ----------- #. Overwritten later -#: ../src/shop.c:440 +#: ../src/shop.c:441 msgid "Plasma Channel Splitter" msgstr "Plasma Channel Splitter" #. / Shop item description: Plasma Channel Splitter (PLASMA_MAX_OUTPUT) -#: ../src/shop.c:442 +#: ../src/shop.c:443 msgid "Improves poweredup plasma output" msgstr "Improves poweredup plasma output" #. Overwritten later -#: ../src/shop.c:446 +#: ../src/shop.c:447 msgid "Plasma Capacity Condensor" msgstr "Plasma Capacity Condensor" #. / Shop item description: Plasma Capacity Condensor (PLASMA_MAX_DAMAGE) -#: ../src/shop.c:448 +#: ../src/shop.c:449 msgid "Increases poweredup plasma damage" msgstr "Increases poweredup plasma damage" #. Overwritten later -#: ../src/shop.c:452 +#: ../src/shop.c:453 msgid "Liquid Nitrogen Capsules" msgstr "Liquid Nitrogen Capsules" #. / Shop item description: Liquid Nitrogen Capsules (PLASMA_MAX_RATE) -#: ../src/shop.c:454 +#: ../src/shop.c:455 msgid "Increases plasma firing rate" msgstr "Increases plasma firing rate" -#: ../src/shop.c:462 +#: ../src/shop.c:463 msgid "Plasma Cells" msgstr "Plasma Cells" #. / Shop item description: Plasma Cells -#: ../src/shop.c:464 +#: ../src/shop.c:465 msgid "Plasma ammunition (10 cells each)" msgstr "Plasma ammunition (10 cells each)" -#: ../src/shop.c:472 +#: ../src/shop.c:473 msgid "Rocket Ammo" msgstr "Rocket Ammo" #. / Shop item description: Rocket Ammo -#: ../src/shop.c:474 +#: ../src/shop.c:475 msgid "High velocity dumb fire rocket" msgstr "High velocity dumb fire rocket" #. ----------- Permanent Items ----------- #. Overwritten later -#: ../src/shop.c:480 +#: ../src/shop.c:481 msgid "Additional Plasma Cannon" msgstr "Additional Plasma Cannon" #. / Shop item description: Additional Plasma Cannon (PLASMA_MIN_OUTPUT) -#: ../src/shop.c:482 +#: ../src/shop.c:483 msgid "Adds an extra plasma cannon to the Firefly" msgstr "Adds an extra plasma cannon to the Firefly" #. Overwritten later -#: ../src/shop.c:486 +#: ../src/shop.c:487 msgid "Plasma Power Booster" msgstr "Plasma Power Booster" #. / Shop item description: Plasma Power Booster (PLASMA_MIN_DAMAGE) -#: ../src/shop.c:488 +#: ../src/shop.c:489 msgid "Increases power of plasma shots" msgstr "Increases power of plasma shots" #. Overwritten later -#: ../src/shop.c:492 +#: ../src/shop.c:493 msgid "Plasma Cooling Booster" msgstr "Plasma Cooling Booster" #. / Shop item description: Plasma Cooling Booster (PLASMA_MIN_RATE) -#: ../src/shop.c:494 +#: ../src/shop.c:495 msgid "Permanently increases firing rate" msgstr "Permanently increases firing rate" #. ----------- Ammo Items -------------- #. Overwritten later -#: ../src/shop.c:500 +#: ../src/shop.c:501 msgid "Plasma Compressor" msgstr "Plasma Compressor" #. / Shop item description: Plasma Compressor (PLASMA_MAX_AMMO) -#: ../src/shop.c:502 +#: ../src/shop.c:503 msgid "Increases plasma ammo capacity" msgstr "Increases plasma ammo capacity" #. Overwritten later -#: ../src/shop.c:506 +#: ../src/shop.c:507 msgid "Rocket Pod" msgstr "Rocket Pod" #. / Shop item description: Rocket Pod (ROCKET_MAX_AMMO) -#: ../src/shop.c:508 +#: ../src/shop.c:509 msgid "Allows for an additional 5 rockets to be carried" msgstr "Allows for an additional 5 rockets to be carried" -#: ../src/shop.c:514 +#: ../src/shop.c:515 msgid "Dual Rocket Launcher" msgstr "Dual Rocket Launcher" #. / Shop item description: Dual Rocket Launcher -#: ../src/shop.c:516 +#: ../src/shop.c:517 msgid "Launches two rockets at once" msgstr "Launches two rockets at once" -#: ../src/shop.c:520 +#: ../src/shop.c:521 msgid "Micro Rocket Launcher" msgstr "Micro Rocket Launcher" #. / Shop item description: Micro Rocket Launcher -#: ../src/shop.c:522 +#: ../src/shop.c:523 msgid "Launches several less powerful rockets at once" msgstr "Launches several less powerful rockets at once" -#: ../src/shop.c:526 +#: ../src/shop.c:527 msgid "Laser Cannon" msgstr "Laser Cannon" #. / Shop item description: Laser Cannon -#: ../src/shop.c:528 +#: ../src/shop.c:529 msgid "Fires a continuous stream of energy particles" msgstr "Fires a continuous stream of energy particles" -#: ../src/shop.c:532 +#: ../src/shop.c:533 msgid "Homing Missile Launcher" msgstr "Homing Missile Launcher" #. / Shop item description: Homing Missile Launcher #. / %i must be retained. It is replaced by the maximum missile #. / capacity of the weapon. -#: ../src/shop.c:536 +#: ../src/shop.c:537 #, c-format msgid "Fires homing missile (max %i missiles)" msgstr "Fires homing missile (max %i missiles)" -#: ../src/shop.c:540 +#: ../src/shop.c:541 msgid "Charge Cannon" msgstr "Charge Cannon" #. / Shop item description: Charge Cannon -#: ../src/shop.c:542 +#: ../src/shop.c:543 msgid "Compacts plasma into clusters for greater damage" msgstr "Compacts plasma into clusters for greater damage" -#: ../src/shop.c:546 +#: ../src/shop.c:547 msgid "Dual Homing Missile Launcher" msgstr "Dual Homing Missile Launcher" #. / Shop item description: Dual Homing Missile Launcher #. / %i must be retained. It is replaced by the maximum missile #. / capacity of the weapon. -#: ../src/shop.c:550 +#: ../src/shop.c:551 #, c-format msgid "Fires two homing missiles (max %i missiles)" msgstr "Fires two homing missiles (max %i missiles)" -#: ../src/shop.c:554 +#: ../src/shop.c:555 msgid "Micro Homing Missile Launcher" msgstr "Micro Homing Missile Launcher" #. / Shop item description: Micro Homing Missile Launcher #. / %i must be retained. It is replaced by the maximum missile #. / capacity of the weapon. -#: ../src/shop.c:558 +#: ../src/shop.c:559 #, c-format msgid "Fires several small homing missiles (max %i missiles)" msgstr "Fires several small homing missiles (max %i missiles)" Binary files /tmp/tmpttdb6bwr/ACoX2Ly0we/starfighter-2.3.3/locale/ja/LC_MESSAGES/pr-starfighter.mo and /tmp/tmpttdb6bwr/DVwpc4iO3O/starfighter-2.4/locale/ja/LC_MESSAGES/pr-starfighter.mo differ diff -Nru starfighter-2.3.3/locale/ja.po starfighter-2.4/locale/ja.po --- starfighter-2.3.3/locale/ja.po 2020-09-20 16:06:53.000000000 +0000 +++ starfighter-2.4/locale/ja.po 2020-12-25 19:06:31.000000000 +0000 @@ -20,10 +20,10 @@ # msgid "" msgstr "" -"Project-Id-Version: 2.3.2\n" +"Project-Id-Version: 2.3.4\n" "Report-Msgid-Bugs-To: diligentcircle@riseup.net\n" -"POT-Creation-Date: 2020-09-15 13:07-0400\n" -"PO-Revision-Date: 2020-07-27 13:19-0400\n" +"POT-Creation-Date: 2020-12-25 14:04-0500\n" +"PO-Revision-Date: 2020-10-24 14:41-0400\n" "Last-Translator: maruhiro \n" "Language-Team: Japanese\n" "Language: ja\n" @@ -50,11 +50,11 @@ msgid "Very good, Bainfield. Now let's get a little more serious..." msgstr "すばらしいぞバンフィールド。少し本気を出してやろう…" -#: ../src/alien.c:1998 +#: ../src/alien.c:2002 msgid ">> Ally has ejected! <<" msgstr ">> 仲間は離脱した! <<" -#: ../src/alien.c:2000 +#: ../src/alien.c:2004 msgid ">> Friendly craft has been destroyed! <<" msgstr ">> 友軍の艦船が破壊された! <<" @@ -65,7 +65,7 @@ #. / with brag messages that work well in the target language, #. / following the English version only as a general guideline. Any #. / number of brag messages is permitted. -#: ../src/alien.c:2029 +#: ../src/alien.c:2033 msgid "" "Take that, robot oppressors!\n" "Come on, WEAPCO, give me a challenge already!\n" @@ -104,7 +104,7 @@ #. / with brag messages that work well in the target language, #. / following the English version only as a general guideline. Any #. / number of brag messages is permitted. -#: ../src/alien.c:2062 +#: ../src/alien.c:2066 msgid "" "I got another one!\n" "Target destroyed!\n" @@ -136,7 +136,7 @@ #. / with brag messages that work well in the target language, #. / following the English version only as a general guideline. Any #. / number of brag messages is permitted. -#: ../src/alien.c:2091 +#: ../src/alien.c:2095 msgid "" "Kicked your ass!\n" "You ain't so tough!\n" @@ -168,25 +168,25 @@ #. / Dialog (Chris Bainfield) #. / Used when Krass Tyler is beaten in the Jupiter mission. -#: ../src/alien.c:2154 +#: ../src/alien.c:2158 msgid "The name's CHRIS, old-timer." msgstr "俺の名はクリスだ、ジジイ。" #. / Dialog (Kline Kethlan) #. / Used when Kline is killed in the Venus mission. -#: ../src/alien.c:2161 +#: ../src/alien.c:2165 msgid "It was an honor... to have fought you..." msgstr "光栄に思うぞ…貴様と戦えたことを…" #. / Dialog (Kline Kethlan) #. / Used when Kline is beaten in the Elamale mission. -#: ../src/alien.c:2204 +#: ../src/alien.c:2207 msgid "Seems I underestimated you, Bainfield. We'll meet again!" msgstr "お前を見くびっていたようだ、バンフィールド。また会うことになるだろう!" #. / Dialog (Sid Wilson) #. / Used when Kline is beaten in the Earth mission. -#: ../src/alien.c:2221 +#: ../src/alien.c:2223 msgid "Chris, Kethlan is getting away!" msgstr "クリス、ケスランが逃げるぞ!" @@ -888,7 +888,7 @@ #. / with messages that work well in the target language, #. / following the English version only as a general guideline. Any #. / number of messages is permitted. -#: ../src/game.c:840 +#: ../src/game.c:841 msgid "" "Oops! Sorry!\n" "Whoops! Are you OK, Chris?\n" @@ -905,7 +905,7 @@ #. / with messages that work well in the target language, #. / following the English version only as a general guideline. Any #. / number of messages is permitted. -#: ../src/game.c:856 +#: ../src/game.c:857 msgid "" "Get out of the way!\n" "Don't fly into my missiles!\n" @@ -922,13 +922,13 @@ #. / with insults that work well in the target language, #. / following the English version only as a general guideline. Any #. / number of insults is permitted. -#: ../src/game.c:1603 +#: ../src/game.c:1608 msgid "" "Fool.\n" -"And now you're nothing but a DEAD hero.\n" +"And now you're nothing but a DEAD hero." msgstr "" "ばかばかしい。\n" -"君はもはや過去の英雄にすぎない。\n" +"君はもはや過去の英雄にすぎない。" #. / Kline insult messages #. / This is a list of insults separated by "\n". They are randomly @@ -937,7 +937,7 @@ #. / with insults that work well in the target language, #. / following the English version only as a general guideline. Any #. / number of insults is permitted. -#: ../src/game.c:1618 +#: ../src/game.c:1623 msgid "" "Pathetic.\n" "How very disappointing...\n" @@ -949,7 +949,7 @@ #. / Dialog: Krass Tyler #. / Used when the player is killed in the Jupiter mission. -#: ../src/game.c:1629 +#: ../src/game.c:1634 msgid "That was the easiest $90,000,000 I've ever earned! Bwah! Ha! Ha! Ha!" msgstr "これで$90,000,000とはチョロいもんだ! ガハハハハハッ!!" @@ -961,37 +961,37 @@ #. / timer to use single-digit numbers. #. / The ":" can also be replaced just like any text. For example, this would be fine: #. / "Time Remaining - %d minutes and %d seconds" -#: ../src/game.c:1942 +#: ../src/game.c:1947 #, c-format msgid "Time Remaining - %.2d:%.2d" msgstr "Time Remaining - %.2d:%.2d" #. / "%d" must be retained. It is replaced with the number of mission objectives remaining. -#: ../src/game.c:1950 +#: ../src/game.c:1955 #, c-format msgid "Objectives Remaining: %d" msgstr "残りの作戦: %d" #. / "%d" must be retained. It is replaced with the player's current total cash. #. / Retain "%d" as-is. It is replaced with the player's current cash. -#: ../src/game.c:1956 ../src/shop.c:352 +#: ../src/game.c:1961 ../src/shop.c:353 #, c-format msgid "Cash: $%d" msgstr "キャッシュ: $%d" #. / "%.3d" must be retained. It is replaced with the amount of plasma ammo. -#: ../src/game.c:1993 +#: ../src/game.c:1998 #, c-format msgid "Plasma: %.3d" msgstr "プラズマ: %.3d" #. / Used to indicate the charge meter for the charger cannon in the HUD. -#: ../src/game.c:2000 +#: ../src/game.c:2005 msgid "Charge" msgstr "チャージ" #. / Used to indicate the heat meter for the laser cannon in the HUD. -#: ../src/game.c:2005 +#: ../src/game.c:2010 msgid "Heat" msgstr "ヒート" @@ -999,38 +999,38 @@ #. / Retain "%.2d". It is replaced with the ship's current number of rockets. #. / "%.2d" can be changed to "%d" if you wish to not fill in space with zeroes, #. / e.g. render the number 3 as "3" rather than "03". -#: ../src/game.c:2010 ../src/shop.c:362 +#: ../src/game.c:2015 ../src/shop.c:363 #, c-format msgid "Rockets: %.2d" msgstr "ロケット: %.2d" #. / DIFFICULTY_SUPEREASY -#: ../src/game.c:2420 +#: ../src/game.c:2425 msgid "Super-Easy" msgstr "とても簡単" #. / DIFFICULTY_EASY -#: ../src/game.c:2424 +#: ../src/game.c:2429 msgid "Easy" msgstr "簡単" #. / DIFFICULTY_NORMAL -#: ../src/game.c:2428 +#: ../src/game.c:2433 msgid "Normal" msgstr "普通" #. / DIFFICULTY_HARD -#: ../src/game.c:2432 +#: ../src/game.c:2437 msgid "Hard" msgstr "難しい" #. / DIFFICULTY_NIGHTMARE -#: ../src/game.c:2436 +#: ../src/game.c:2441 msgid "Nightmare!" msgstr "悪夢!" #. / DIFFICULTY_ORIGINAL (Classic) -#: ../src/game.c:2440 +#: ../src/game.c:2445 msgid "Classic" msgstr "旧版" @@ -2247,7 +2247,7 @@ msgid "Destroy WEAPCO frontline forces" msgstr "WEAPCOの前線部隊を破壊する" -#: ../src/mission.c:610 ../src/mission.c:980 +#: ../src/mission.c:610 ../src/mission.c:984 msgid "*** All Primary Objectives Completed ***" msgstr "*** 主要な任務を完了 ***" @@ -2454,81 +2454,81 @@ msgid "That's one less surprise that WEAPCO can spring on us!" msgstr "WEAPCOの奇襲攻撃など、たいしたことはないな!" -#: ../src/mission.c:967 +#: ../src/mission.c:971 msgid "*** Primary Objective Completed ***" msgstr "*** 主要な任務を完了 ***" -#: ../src/mission.c:969 +#: ../src/mission.c:973 msgid ">>> Primary Objective Failed <<<" msgstr ">>> 主要な任務を失敗 <<<" -#: ../src/mission.c:976 +#: ../src/mission.c:980 msgid "Emergency warp drive activated. Press button to engage." msgstr "脱出ワープエンジンが利用可能 ESCボタンで始動する" -#: ../src/mission.c:982 +#: ../src/mission.c:986 msgid "*** Interception Destroyed ***" msgstr "*** 迎撃部隊を撃破 ***" #. / Dialog (Chris Bainfield) #. / Used when the Earth mission is completed. -#: ../src/mission.c:1002 +#: ../src/mission.c:1006 msgid "" "You guys stay here and keep things under control. I'm going after Kethlan!" msgstr "ここを抑えていてくれ。俺はケスランを追う!" -#: ../src/mission.c:1011 +#: ../src/mission.c:1015 msgid "*** Secondary Objective Completed ***" msgstr "*** 補助的な任務を完了 ***" -#: ../src/mission.c:1016 +#: ../src/mission.c:1020 msgid "*** All Secondary Objectives Completed ***" msgstr "*** 全ての補助的な任務を完了 ***" -#: ../src/mission.c:1031 +#: ../src/mission.c:1035 msgid ">>> MISSION FAILED <<<" msgstr ">>> 作戦失敗 <<<" -#: ../src/mission.c:1037 +#: ../src/mission.c:1041 msgid ">>> Secondary Objective Failed <<<" msgstr ">>> 補助的な任務を失敗 <<<" -#: ../src/mission.c:1116 +#: ../src/mission.c:1120 msgid "Primary Objectives" msgstr "主要な任務" -#: ../src/mission.c:1130 +#: ../src/mission.c:1134 msgid "Secondary Objectives" msgstr "補助的な任務" -#: ../src/mission.c:1144 +#: ../src/mission.c:1148 msgid "Additional Information" msgstr "追加の情報" #. / Used to indicate the player's shield meter in the HUD. -#: ../src/mission.c:1161 +#: ../src/mission.c:1165 msgid "Shield" msgstr "シールド" -#: ../src/mission.c:1163 +#: ../src/mission.c:1167 msgid "Target" msgstr "ターゲット" -#: ../src/mission.c:1164 +#: ../src/mission.c:1168 msgid "Sid" msgstr "シド" -#: ../src/mission.c:1165 +#: ../src/mission.c:1169 msgid "Phoebe" msgstr "フェーベ" -#: ../src/mission.c:1166 +#: ../src/mission.c:1170 msgid "Kline" msgstr "クライン" #. / "%d" must be retained. It is replaced with the mission required #. / survival time in minutes. -#: ../src/mission.c:1194 +#: ../src/mission.c:1198 #, c-format msgid "SURVIVAL FOR %d minute" msgid_plural "SURVIVAL FOR %d minutes" @@ -2536,35 +2536,35 @@ #. / "%d" must be retained. It is replaced with the mission time #. / limit in minutes. -#: ../src/mission.c:1203 +#: ../src/mission.c:1207 #, c-format msgid "TIME LIMIT: %d minute" msgid_plural "TIME LIMIT: %d minutes" msgstr[0] "制限時間: %d分" -#: ../src/mission.c:1219 +#: ../src/mission.c:1223 msgid "Phoebe Lexx will not be present" msgstr "フェーベ・レックスは参加しない" -#: ../src/mission.c:1221 +#: ../src/mission.c:1225 msgid "Ursula Lexx will not be present" msgstr "ウーシュラ・レックスは参加しない" -#: ../src/mission.c:1228 +#: ../src/mission.c:1232 msgid "Sid Wilson will join you on this mission" msgstr "シド・ウィルソンが作戦に参加する" -#: ../src/mission.c:1316 ../src/mission.c:1336 +#: ../src/mission.c:1320 ../src/mission.c:1340 msgid "COMPLETED" msgstr "完了" -#: ../src/mission.c:1321 ../src/mission.c:1341 +#: ../src/mission.c:1325 ../src/mission.c:1345 msgid "FAILED" msgstr "失敗" #. / "%d" must be retained. It is replaced with the money earned #. / from the shield bonus. -#: ../src/mission.c:1352 +#: ../src/mission.c:1356 #, c-format msgid "Shield Bonus: $%d" msgstr "シールドボーナス: $%d" @@ -2581,7 +2581,7 @@ #. / the "%02ld" sequences may be changed to "%ld" if you wish to #. / not force two digits to be filled in (e.g. to render the number #. / 3 as "3" instead of "03"). -#: ../src/mission.c:1368 +#: ../src/mission.c:1372 #, c-format msgid "Mission Time: %02ld:%02ld" msgstr "作戦時間: %2ld:%02ld:%02ld" @@ -2693,86 +2693,86 @@ msgstr "マイクロ誘導ミサイル" #. / Retain "%d" as-is. It is replaced with the rocket capacity of the Firefly. -#: ../src/shop.c:104 +#: ../src/shop.c:105 #, c-format msgid "Capacity : %d" msgstr "最大数：%d" -#: ../src/shop.c:285 +#: ../src/shop.c:286 msgid "Primary Weapon" msgstr "主装備" #. / Shop info: min plasma output #. / Retain "%d" as-is. It is replaced with the min plasma output. -#: ../src/shop.c:288 +#: ../src/shop.c:289 #, c-format msgid "Cannons: %d" msgstr "プラズマカノン：%d門" #. / Shop info: min plasma damage #. / Retain "%d" as-is. It is replaced with the min plasma damage. -#: ../src/shop.c:292 +#: ../src/shop.c:293 #, c-format msgid "Power: Stage %d" msgstr "プラズマ火力：レベル %d" #. / Shop info: min plasma rate #. / Retain "%d" as-is. It is replaced with the min plasma cooling. -#: ../src/shop.c:297 +#: ../src/shop.c:298 #, c-format msgid "Cooling: Stage %d" msgstr "冷却装置：レベル %d" -#: ../src/shop.c:301 +#: ../src/shop.c:302 msgid "Powerup Weapon" msgstr "一時強化" #. / Shop info: max plasma output #. / Retain "%d" as-is. It is replaced with the max plasma output. -#: ../src/shop.c:304 +#: ../src/shop.c:305 #, c-format msgid "Splitter: Stage %d" msgstr "出力範囲：レベル %d" #. / Shop info: max plasma damage #. / Retain "%d" as-is. It is replaced with the max plasma damage. -#: ../src/shop.c:309 +#: ../src/shop.c:310 #, c-format msgid "Condensor: Stage %d" msgstr "コンデンサー：レベル %d" #. / Shop info: max plasma rate #. / Retain "%d" as-is. It is replaced with the max plasma cooling. -#: ../src/shop.c:314 +#: ../src/shop.c:315 #, c-format msgid "L.Nitrogen: Stage %d" msgstr "液体窒素：レベル %d" #. / Shop info: max plasma ammo #. / Retain "%d" as-is. It is replaced with the Firefly's plasma ammo capacity. -#: ../src/shop.c:319 +#: ../src/shop.c:320 #, c-format msgid "Capacity: %d" msgstr "プラズマ容量：%d" -#: ../src/shop.c:328 +#: ../src/shop.c:329 msgid "Temporary Weapons" msgstr "一時強化" -#: ../src/shop.c:329 +#: ../src/shop.c:330 msgid "Ammo and Storage" msgstr "爆薬とコンテナ" -#: ../src/shop.c:331 +#: ../src/shop.c:332 msgid "Primary Weapons" msgstr "主装備" -#: ../src/shop.c:333 +#: ../src/shop.c:334 msgid "Secondary Weapons" msgstr "副装備" #. / Retain "%d" as-is. It is replaced with the Firefly's max shield. -#: ../src/shop.c:349 +#: ../src/shop.c:350 #, c-format msgid "Shield: %d" msgstr "シールド: %d" @@ -2780,246 +2780,246 @@ #. / Retain "%.3d". It is replaced with the ship's current number of plasma cells. #. / "%.3d" can be changed to "%d" if you wish to not fill in space with zeroes, #. / e.g. render the number 5 as "5" rather than "005". -#: ../src/shop.c:357 +#: ../src/shop.c:358 #, c-format msgid "Plasma Cells: %.3d" msgstr "プラズマセル: %.3d" -#: ../src/shop.c:368 +#: ../src/shop.c:369 msgid "Information" msgstr "説明" #. / For when the player attempts to buy something they can't afford. -#: ../src/shop.c:376 +#: ../src/shop.c:377 msgid "You don't have enough money" msgstr "代金が足りない" #. / For when the player attempts an upgrade beyond the maximum (line 1 of 2). -#: ../src/shop.c:380 +#: ../src/shop.c:381 msgid "Cannot upgrade ship" msgstr "強化できない" #. / For when the player attempts an upgrade beyond the maximum (line 2 of 2). -#: ../src/shop.c:383 +#: ../src/shop.c:384 msgid "Hardware capacity has been reached" msgstr "機体の限界に達している" #. / For when the player attempts to buy more ammo than the ship can hold. -#: ../src/shop.c:387 +#: ../src/shop.c:388 msgid "Ammunition limit reached" msgstr "容量の限界に達している" #. / For when the player attempts to sell an item they aren't allowed to sell. -#: ../src/shop.c:391 +#: ../src/shop.c:392 msgid "You cannot sell that item" msgstr "それは売却できない" #. / For when the player attempts to sell an item they don't have any of. -#: ../src/shop.c:395 +#: ../src/shop.c:396 msgid "Nothing to sell" msgstr "売却できるものがない" #. / For when the player attempts to buy rockets or rocket capacity #. / while secondary weapon is either laser or charge cannon. -#: ../src/shop.c:400 +#: ../src/shop.c:401 msgid "Rockets cannot be bought for Laser or Charger Cannon" msgstr "レーザーまたはチャージャーの場合はロケット弾を購入できない" #. / For when the player attempts to buy a weapon they already have. -#: ../src/shop.c:404 +#: ../src/shop.c:405 msgid "You already have that weapon" msgstr "既に装備している" #. / For when the player attempts to increase rocket capacity beyond #. / what is allowed for the weapon (used for homing missiles). -#: ../src/shop.c:409 +#: ../src/shop.c:410 msgid "This weapon's ammo limit has been reached" msgstr "その装備の限界に達している" #. / Used to put a shop item's name next to its price. #. / "%s" is replaced with the item name, and "%d" is replaced #. / with the item price. -#: ../src/shop.c:417 +#: ../src/shop.c:418 #, c-format msgid "%s ($%d)" msgstr "%s ($%d)" #. / Used for shop items that cannot be bought. #. / "%s" is replaced with the item name. -#: ../src/shop.c:425 +#: ../src/shop.c:426 #, c-format msgid "%s (N/A)" msgstr "%s (N/A)" #. ----------- Temporary Items ----------- #. Overwritten later -#: ../src/shop.c:440 +#: ../src/shop.c:441 msgid "Plasma Channel Splitter" msgstr "プラズマチャネルスプリッター" #. / Shop item description: Plasma Channel Splitter (PLASMA_MAX_OUTPUT) -#: ../src/shop.c:442 +#: ../src/shop.c:443 msgid "Improves poweredup plasma output" msgstr "一時強化時のプラズマ出力範囲が増加する" #. Overwritten later -#: ../src/shop.c:446 +#: ../src/shop.c:447 msgid "Plasma Capacity Condensor" msgstr "プラズマキャパシティーコンデンサー" #. / Shop item description: Plasma Capacity Condensor (PLASMA_MAX_DAMAGE) -#: ../src/shop.c:448 +#: ../src/shop.c:449 msgid "Increases poweredup plasma damage" msgstr "一時強化時のプラズマ火力が増加する" #. Overwritten later -#: ../src/shop.c:452 +#: ../src/shop.c:453 msgid "Liquid Nitrogen Capsules" msgstr "液体窒素カプセル" #. / Shop item description: Liquid Nitrogen Capsules (PLASMA_MAX_RATE) -#: ../src/shop.c:454 +#: ../src/shop.c:455 msgid "Increases plasma firing rate" msgstr "一時強化時の連射速度が増加する" -#: ../src/shop.c:462 +#: ../src/shop.c:463 msgid "Plasma Cells" msgstr "プラズマセル" #. / Shop item description: Plasma Cells -#: ../src/shop.c:464 +#: ../src/shop.c:465 msgid "Plasma ammunition (10 cells each)" msgstr "プラズマ火薬 (1つ10セル)" -#: ../src/shop.c:472 +#: ../src/shop.c:473 msgid "Rocket Ammo" msgstr "ロケット弾" #. / Shop item description: Rocket Ammo -#: ../src/shop.c:474 +#: ../src/shop.c:475 msgid "High velocity dumb fire rocket" msgstr "無誘導高速ロケット弾" #. ----------- Permanent Items ----------- #. Overwritten later -#: ../src/shop.c:480 +#: ../src/shop.c:481 msgid "Additional Plasma Cannon" msgstr "プラズマカノンの増設" #. / Shop item description: Additional Plasma Cannon (PLASMA_MIN_OUTPUT) -#: ../src/shop.c:482 +#: ../src/shop.c:483 msgid "Adds an extra plasma cannon to the Firefly" msgstr "ファイアフライに新たなプラズマカノン砲を増設する" #. Overwritten later -#: ../src/shop.c:486 +#: ../src/shop.c:487 msgid "Plasma Power Booster" msgstr "プラズマパワーブースター" #. / Shop item description: Plasma Power Booster (PLASMA_MIN_DAMAGE) -#: ../src/shop.c:488 +#: ../src/shop.c:489 msgid "Increases power of plasma shots" msgstr "プラズマ弾の火力を増大させる" #. Overwritten later -#: ../src/shop.c:492 +#: ../src/shop.c:493 msgid "Plasma Cooling Booster" msgstr "プラズマ冷却ブースター" #. / Shop item description: Plasma Cooling Booster (PLASMA_MIN_RATE) -#: ../src/shop.c:494 +#: ../src/shop.c:495 msgid "Permanently increases firing rate" msgstr "連射速度を増大させる" #. ----------- Ammo Items -------------- #. Overwritten later -#: ../src/shop.c:500 +#: ../src/shop.c:501 msgid "Plasma Compressor" msgstr "プラズマコンプレッサー" #. / Shop item description: Plasma Compressor (PLASMA_MAX_AMMO) -#: ../src/shop.c:502 +#: ../src/shop.c:503 msgid "Increases plasma ammo capacity" msgstr "プラズマ火薬の容量が増加する" #. Overwritten later -#: ../src/shop.c:506 +#: ../src/shop.c:507 msgid "Rocket Pod" msgstr "ロケットポッド" #. / Shop item description: Rocket Pod (ROCKET_MAX_AMMO) -#: ../src/shop.c:508 +#: ../src/shop.c:509 msgid "Allows for an additional 5 rockets to be carried" msgstr "装備できるロケット弾が 5本 増加する" -#: ../src/shop.c:514 +#: ../src/shop.c:515 msgid "Dual Rocket Launcher" msgstr "2連装ロケットランチャー" #. / Shop item description: Dual Rocket Launcher -#: ../src/shop.c:516 +#: ../src/shop.c:517 msgid "Launches two rockets at once" msgstr "一度に2本のロケット弾を発射する" -#: ../src/shop.c:520 +#: ../src/shop.c:521 msgid "Micro Rocket Launcher" msgstr "マイクロロケットランチャー" #. / Shop item description: Micro Rocket Launcher -#: ../src/shop.c:522 +#: ../src/shop.c:523 msgid "Launches several less powerful rockets at once" msgstr "多数の小型ロケット弾を一度に発射する" -#: ../src/shop.c:526 +#: ../src/shop.c:527 msgid "Laser Cannon" msgstr "レーザーカノン" #. / Shop item description: Laser Cannon -#: ../src/shop.c:528 +#: ../src/shop.c:529 msgid "Fires a continuous stream of energy particles" msgstr "エネルギー粒子を連続して発射する" -#: ../src/shop.c:532 +#: ../src/shop.c:533 msgid "Homing Missile Launcher" msgstr "誘導ミサイルランチャー" #. / Shop item description: Homing Missile Launcher #. / %i must be retained. It is replaced by the maximum missile #. / capacity of the weapon. -#: ../src/shop.c:536 +#: ../src/shop.c:537 #, c-format msgid "Fires homing missile (max %i missiles)" msgstr "誘導ミサイルを発射する (最大 %i本)" -#: ../src/shop.c:540 +#: ../src/shop.c:541 msgid "Charge Cannon" msgstr "チャージカノン" #. / Shop item description: Charge Cannon -#: ../src/shop.c:542 +#: ../src/shop.c:543 msgid "Compacts plasma into clusters for greater damage" msgstr "プラズマを圧縮して大ダメージを与える" -#: ../src/shop.c:546 +#: ../src/shop.c:547 msgid "Dual Homing Missile Launcher" msgstr "2連装誘導ミサイルランチャー" #. / Shop item description: Dual Homing Missile Launcher #. / %i must be retained. It is replaced by the maximum missile #. / capacity of the weapon. -#: ../src/shop.c:550 +#: ../src/shop.c:551 #, c-format msgid "Fires two homing missiles (max %i missiles)" msgstr "一度に2発の誘導ミサイルを発射する (最大 %i本)" -#: ../src/shop.c:554 +#: ../src/shop.c:555 msgid "Micro Homing Missile Launcher" msgstr "誘導マイクロミサイルランチャー" #. / Shop item description: Micro Homing Missile Launcher #. / %i must be retained. It is replaced by the maximum missile #. / capacity of the weapon. -#: ../src/shop.c:558 +#: ../src/shop.c:559 #, c-format msgid "Fires several small homing missiles (max %i missiles)" msgstr "多数の小型誘導ミサイルを一度に発射する (最大 %i本)" diff -Nru starfighter-2.3.3/locale/Makefile.am starfighter-2.4/locale/Makefile.am --- starfighter-2.3.3/locale/Makefile.am 2020-09-16 02:42:14.000000000 +0000 +++ starfighter-2.4/locale/Makefile.am 2020-12-26 23:18:41.000000000 +0000 @@ -14,5 +14,7 @@ pr-starfighter.pot \ en.po \ ja.po \ + nl.po \ en/LC_MESSAGES/pr-starfighter.mo \ - ja/LC_MESSAGES/pr-starfighter.mo + ja/LC_MESSAGES/pr-starfighter.mo \ + nl/LC_MESSAGES/pr-starfighter.mo diff -Nru starfighter-2.3.3/locale/Makefile.in starfighter-2.4/locale/Makefile.in --- starfighter-2.3.3/locale/Makefile.in 2020-09-20 16:07:31.000000000 +0000 +++ starfighter-2.4/locale/Makefile.in 2020-12-26 23:19:11.000000000 +0000 @@ -205,9 +205,11 @@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SF_NOFONT = @SF_NOFONT@ +SF_OLD_MUSIC = @SF_OLD_MUSIC@ SF_RUN_IN_PLACE = @SF_RUN_IN_PLACE@ SF_SCREEN_HEIGHT = @SF_SCREEN_HEIGHT@ SF_SCREEN_WIDTH = @SF_SCREEN_WIDTH@ +SF_UNHARDEN = @SF_UNHARDEN@ SF_WARN = @SF_WARN@ SHELL = @SHELL@ STARFIGHTER_CPPFLAGS = @STARFIGHTER_CPPFLAGS@ @@ -276,8 +278,10 @@ pr-starfighter.pot \ en.po \ ja.po \ + nl.po \ en/LC_MESSAGES/pr-starfighter.mo \ - ja/LC_MESSAGES/pr-starfighter.mo + ja/LC_MESSAGES/pr-starfighter.mo \ + nl/LC_MESSAGES/pr-starfighter.mo all: all-am Binary files /tmp/tmpttdb6bwr/ACoX2Ly0we/starfighter-2.3.3/locale/nl/LC_MESSAGES/pr-starfighter.mo and /tmp/tmpttdb6bwr/DVwpc4iO3O/starfighter-2.4/locale/nl/LC_MESSAGES/pr-starfighter.mo differ diff -Nru starfighter-2.3.3/locale/nl.po starfighter-2.4/locale/nl.po --- starfighter-2.3.3/locale/nl.po 1970-01-01 00:00:00.000000000 +0000 +++ starfighter-2.4/locale/nl.po 2020-12-25 19:06:31.000000000 +0000 @@ -0,0 +1,3267 @@ +# Project: Starfighter Translatable Text +# Copyright (C) 2003 Parallel Relaities +# Copyright (C) 2011, 2012, 2013 Guus Sliepen +# Copyright (C) 2012, 2015-2020 Layla Marchant +# +# 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 3 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, see . +# +# Heimen Stoffels , 2020. +# +msgid "" +msgstr "" +"Project-Id-Version: 2.3.4\n" +"Report-Msgid-Bugs-To: diligentcircle@riseup.net\n" +"POT-Creation-Date: 2020-12-25 14:04-0500\n" +"PO-Revision-Date: 2020-10-25 12:10+0100\n" +"Last-Translator: Heimen Stoffels \n" +"Language-Team: Dutch\n" +"Language: nl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 2.4.1\n" + +#. / Dialog (Kline Kethlan) +#. / Used when the final "stage" of the Venus fight is entered. +#: ../src/alien.c:1593 +msgid "ENOUGH! THIS ENDS NOW!" +msgstr "GENOEG! HET IS KLAAR NU!" + +#. / Dialog (Kline Kethlan) +#. / Used when the third "stage" of the Vinus fight is entered. +#: ../src/alien.c:1604 +msgid "Your ability to stay alive irritates me! Try dodging some of these!" +msgstr "" +"Het irriteert me mateloos dat je nog steeds leeft, dus probeer deze maar " +"eens te ontwijken!" + +#. / Dialog (Kline Kethlan) +#. / Used when the second "stage" of the Venus fight is entered. +#: ../src/alien.c:1618 +msgid "Very good, Bainfield. Now let's get a little more serious..." +msgstr "Erg goed, Bainfield, maar nu wordt het menens..." + +#: ../src/alien.c:2002 +msgid ">> Ally has ejected! <<" +msgstr ">> Je bondgenoot heeft de springstoel gebruikt! <<" + +#: ../src/alien.c:2004 +msgid ">> Friendly craft has been destroyed! <<" +msgstr ">> Je hebt een goedaardig schip vernietigd! <<" + +#. / Chris brag messages +#. / This is a list of brags separated by "\n". They are randomly +#. / broadcast when Chris successfully kills an enemy. +#. / Instead of directly translating these, please populate the list +#. / with brag messages that work well in the target language, +#. / following the English version only as a general guideline. Any +#. / number of brag messages is permitted. +#: ../src/alien.c:2033 +msgid "" +"Take that, robot oppressors!\n" +"Come on, WEAPCO, give me a challenge already!\n" +"Is that all you've got?\n" +"I could kill these robots with my hands tied behind my back!\n" +"And now you're nothing but a pile of scrap metal!\n" +"Who else wants some?!\n" +"Humans do it better!\n" +"A century of AI research is no match for me!\n" +"What's the matter, WEAPCO? Can't keep up?\n" +"I eat robots like you for breakfast!\n" +"Target destroyed!\n" +"Bring it on, WEAPCO!\n" +"I wish the guys back at home could see this!\n" +"How do you like that, WEAPCO?\n" +"Maybe you should change your name to WEEPCO!" +msgstr "" +"Pak aan, robothaters!\n" +"Kom, WEAPCO, daag me nu eens écht uit!\n" +"Was dat alles?!\n" +"Ik kan deze robots nog verslaan met mijn handen achter mijn rug!\n" +"Zo, nu ben je niks meer dan een stuk oud ijzer!\n" +"Wie volgt?!\n" +"Mensen zijn beter dan jij!\n" +"Een eeuw lang kunstmatige intelligentie is niet opgewassen tegen mij!\n" +"Wat scheelt er, WEAPCO? Kun je het niet bijbenen?\n" +"Robots als jij zijn mijn ontbijt!\n" +"Doel vernietigd!\n" +"Kom maar op, WEAPCO!\n" +"Ik wou dat mijn vrienden me konden zien!\n" +"Hoe vind je dat, WEAPCO?\n" +"Verander je naam maar in MIETJECO!" + +#. / Phoebe brag messages +#. / This is a list of brags separated by "\n". They are randomly +#. / broadcast when Phoebe successfully kills an enemy. +#. / Instead of directly translating these, please populate the list +#. / with brag messages that work well in the target language, +#. / following the English version only as a general guideline. Any +#. / number of brag messages is permitted. +#: ../src/alien.c:2066 +msgid "" +"I got another one!\n" +"Target destroyed!\n" +"One more for me!\n" +"Yes! Did you see that, Chris?\n" +"Hey Chris, remind me to check my kill count later!\n" +"Bring it on, WEAPCO!\n" +"Take that, WEAPCO!\n" +"My kill count is going up!\n" +"Another one bites the dust!\n" +"Yeah! Nothing can stand in our way!\n" +"I got it!" +msgstr "" +"Ik heb er nog een te pakken!\n" +"Doel vernietigd!\n" +"Nóg één voor mij!\n" +"Yes! Zag je dat, Chris?\n" +"Hé Chris, herinner me later dat ik het dodenaantal nakijk!\n" +"Kom maar op, WEAPCO!\n" +"Pak aan, WEAPCO!\n" +"Mijn dodenaantal schiet omhoog!\n" +"Hap maar lekker stof!\n" +"Yeah! Niks staat ons in de weg!\n" +"Ik heb het!" + +#. / Ursula brag messages +#. / This is a list of brags separated by "\n". They are randomly +#. / broadcast when Ursula successfully kills an enemy. +#. / Instead of directly translating these, please populate the list +#. / with brag messages that work well in the target language, +#. / following the English version only as a general guideline. Any +#. / number of brag messages is permitted. +#: ../src/alien.c:2095 +msgid "" +"Kicked your ass!\n" +"You ain't so tough!\n" +"I was always a better WEAPCO pilot than you!\n" +"Target destroyed!\n" +"That'll teach you!\n" +"Take that, you cruddy robots!\n" +"Is that all you've got?\n" +"Who else wants some?!\n" +"I'm not letting you beat me, Phoebe!\n" +"Bring it on, you mindless drones!\n" +"Oh, I'm sorry, are you getting your metal asses handed to you?\n" +"No one messes with the Lexx family!\n" +"Die, damned WEAPCO drones!\n" +"Don't think you can get away from me!" +msgstr "" +"Ik heb je ingemaakt!\n" +"Je bent niet zo sterk!\n" +"Ik was altijd al een betere WEAPCO-piloot dan jij!\n" +"Doel vernietigd!\n" +"Dat zal je leren!\n" +"Pak aan, stinkrobots!\n" +"Is dat alles wat je in huis hebt?\n" +"Wie volgt?!\n" +"Je gaat me niet pakken, Phoebe!\n" +"Kom maar op, hersenloze zombies!\n" +"O, sorry, jullie metalen reten gaan eraan.\n" +"Niemand pakt de Lexx-familie!\n" +"Sterf, verdomde WEAPCO-drones!\n" +"Jullie komen hier niet mee weg!" + +#. / Dialog (Chris Bainfield) +#. / Used when Krass Tyler is beaten in the Jupiter mission. +#: ../src/alien.c:2158 +msgid "The name's CHRIS, old-timer." +msgstr "Mijn naam is Chris, bejaarde." + +#. / Dialog (Kline Kethlan) +#. / Used when Kline is killed in the Venus mission. +#: ../src/alien.c:2165 +msgid "It was an honor... to have fought you..." +msgstr "Het was een eer... om tegen je te mogen vechten..." + +#. / Dialog (Kline Kethlan) +#. / Used when Kline is beaten in the Elamale mission. +#: ../src/alien.c:2207 +msgid "Seems I underestimated you, Bainfield. We'll meet again!" +msgstr "" +"Ik heb je onderschat, Bainfield. Onze sporen zullen nog wel eens kruisen!" + +#. / Dialog (Sid Wilson) +#. / Used when Kline is beaten in the Earth mission. +#: ../src/alien.c:2223 +msgid "Chris, Kethlan is getting away!" +msgstr "Chris, Kethlan gaat ervandoor!" + +#. / Dialog (Phoebe Lexx) +#. / Used when Phoebe is freed in the Nerod mission. +#: ../src/cargo.c:89 +msgid "Thanks! Watch out, WEAPCO! Phoebe's loose and she's ANGRY!" +msgstr "Dank! Pas maar op, WEAPCO - Phoebe is losgebroken en ze is KWAAD!" + +#. / Cutscene (narration) +#: ../src/cutscene.c:105 +msgid "" +"While escaping with his newly acquired Firefly, Chris Bainfield is " +"intercepted by a WEAPCO patrol..." +msgstr "" +"Chris Bainfield vliegt weg met zijn nieuwe Firefly, maar wordt onderschept " +"hoor een WEAPCO-patrouille..." + +#. / Cutscene (Chris Bainfield) +#: ../src/cutscene.c:109 +msgid "These things just won't give up, will they?" +msgstr "Ze geven maar niet op, hè?" + +#. / Cutscene (Chris Bainfield) +#: ../src/cutscene.c:113 +msgid "" +"What a dilemma! I'm not all that familiar with this ship's controls, but I " +"can't let this patrol reach my rendezvous point..." +msgstr "" +"Wat een dilemma! Ik ben niet zo bekend met de besturing van dit schip, maar " +"ik kan ze niet zo dichtbij laten komen..." + +#. / Cutscene (Chris Bainfield) +#: ../src/cutscene.c:117 +msgid "I guess I'll have to fight them, then. Let's see what this ship can do!" +msgstr "" +"Er zit niks anders op dan tegen ze te vechten. Eens zien wat dit schip " +"allemaal kan!" + +#. / Cutscene (narration) +#: ../src/cutscene.c:143 +msgid "" +"A few hours later, in the Sol system, news has already spread of Chris " +"Bainfield's heroic actions. The commander of WEAPCO's navy considers his " +"options." +msgstr "" +"Een paar uur later is in de Sol-sterrengordel het nieuws al aangekomen dat " +"Chris Bainfield heldendaden heeft verricht. De aanvoerder van WEAPCO's leger " +"bekijkt nu de opties." + +#. / Cutscene (Kline Kethlan) +#: ../src/cutscene.c:147 +msgid "" +"The Emperor will not be pleased. Spirit is now a free star system thanks to " +"that interfering rebel pilot." +msgstr "" +"De keizer zal hier niet blij mee zijn. Spirit is voortaan een vrije " +"sterrengordel, met dank aan die stokende rebelpiloot." + +#. / Cutscene (Kline Kethlan) +#: ../src/cutscene.c:151 +msgid "" +"It was reported that he was able to take down one of our most powerful " +"frigates in under 3 minutes!" +msgstr "" +"Er werd gezegd dat hij één van onze beste fregatten in minder dan 3 minuten " +"neerhaalde!" + +#. / Cutscene (Kline Kethlan) +#: ../src/cutscene.c:155 +msgid "" +"Talent like that does not appear every day. He would be a perfect candidate " +"for our new AI training program!" +msgstr "" +"Zulk talent kom je niet elke dag tegen. Hij zou een perfecte kandidaat zijn " +"voor ons nieuwe KI-trainingsprogramma!" + +#. / Cutscene (Kline Kethlan) +#: ../src/cutscene.c:159 +msgid "What a pity I must kill him..." +msgstr "Het is jammer dat ik hem moet vermoorden..." + +#. / Cutscene (Sid Wilson) +#: ../src/cutscene.c:182 +msgid "We're nearly ready to make the jump to Eyananth." +msgstr "We kunnen bijna doorschieten naar Eyananth." + +#. / Cutscene (Chris Bainfield) +#: ../src/cutscene.c:186 +msgid "Aren't there a lot of WEAPCO slaves in this system?" +msgstr "Zijn er hier niet veel WEAPCO-slaven?" + +#. / Cutscene (Sid Wilson) +#: ../src/cutscene.c:190 +msgid "Yes. It's got one of the highest mortality rates in the galaxy." +msgstr "" +"Ja. Dit gedeelde heeft één van de hoogste dodenaantallen van het universum." + +#. / Cutscene (Chris Bainfield) +#: ../src/cutscene.c:194 +msgid "You think we can use that to our advantage?" +msgstr "Denk je dat we dat in ons voordeel kunnen gebruiken?" + +#. / Cutscene (Sid Wilson) +#: ../src/cutscene.c:198 +msgid "I think so. I'll come up with a plan of action." +msgstr "Wellicht. Ik maak een plan van aanpak." + +#. / Cutscene (Phoebe Lexx) +#: ../src/cutscene.c:227 +msgid "Nice head gear! You shop at the same place as me, huh?" +msgstr "Mooie hoofdtooi! Winkel je bij dezelfde winkel als ik?" + +#. / Cutscene (Chris Bainfield) +#: ../src/cutscene.c:231 +msgid "" +"More importantly, what were you doing out there? You're lucky I was around!" +msgstr "Maar belangrijker: wat deed je daar? Als ik er niet was geweest..." + +#. / Cutscene (Phoebe Lexx) +#: ../src/cutscene.c:235 +msgid "I'm looking for my sister. She vanished about a week ago." +msgstr "Ik zocht naar mijn zus. Ze is al een week vermist." + +#. / Cutscene (Phoebe Lexx) +#: ../src/cutscene.c:239 +msgid "" +"Hey! Wait a moment! You're that rebel from Spirit! I think you're so cool! " +"Can I come with you?" +msgstr "" +"Wacht eens even! Ben jij niet die rebel van Spirit? Ik bewonder je enorm! " +"Mag ik meereizen?" + +#. / Cutscene (Chris Bainfield) +#: ../src/cutscene.c:243 +msgid "Extra firepower? I wouldn't mind one bit! What do you think, Sid?" +msgstr "Ik zeg nooit nee tegen extra mankracht. Wat vind jij, Sid?" + +#. / Cutscene (Sid Wilson) +#: ../src/cutscene.c:247 +msgid "" +"I agree. I'm also interested in studying her homing missile launcher; it " +"could come in handy." +msgstr "" +"Ik ben het met je eens. Bovendien wil ik haar raketwerper bestuderen - die " +"kan nog van pas komen." + +#. / Cutscene (Chris Bainfield) +#: ../src/cutscene.c:251 +msgid "In that case, welcome aboard, Phoebe!" +msgstr "In dat geval heet ik je welkom, Phoebe!" + +#. / Cutscene (Sid Wilson) +#: ../src/cutscene.c:280 +msgid "What happened back there, Chris? The video feed was jammed." +msgstr "Wat gebeurde er daar, Chris? De videostream hield ermee op." + +#. / Cutscene (Chris Bainfield) +#: ../src/cutscene.c:284 +msgid "" +"We took down the WEAPCO mining vessel and then I was jumped by a man " +"claiming to be Kline Kethlan." +msgstr "" +"We haalden een WEAPCO-mijnschip neer. Daarna werd ik besprongen door een man " +"die zich \"Kline Kethlan\" noemt." + +#. / Cutscene (Sid Wilson) +#: ../src/cutscene.c:288 +msgid "" +"I've heard of him. He's the Commander of WEAPCO's naval forces. One of the " +"best pilots they ever had." +msgstr "" +"Ik wel eens van hem gehoord. Hij is de aanvoerder van WEAPCO's legertroepen, " +"één van de beste piloten die ze ooit hadden." + +#. / Cutscene (Chris Bainfield) +#: ../src/cutscene.c:292 +msgid "" +"He did put up one hell of a fight! He didn't stick around for long, though." +msgstr "Hij was reusachtig sterk, maar bleef niet lang." + +#. / Cutscene (Chris Bainfield) +#: ../src/cutscene.c:296 +msgid "Anyway, what's the scoop on Mordor, Sid?" +msgstr "Maar goed, hoe staat Mordor er voor, Sid?" + +#. / Cutscene (Sid Wilson) +#: ../src/cutscene.c:300 +msgid "" +"I've learned from the scientist we captured that WEAPCO is testing a new " +"fighter craft there." +msgstr "" +"De door ons gevangengenomen wetenschapper vertelde me dat WEAPCO een nieuw " +"gevechtsvliegtuig aan het testen is." + +#. / Cutscene (Chris Bainfield) +#: ../src/cutscene.c:304 +msgid "" +"We should probably destroy that craft, then. We might be able to thwart its " +"development somewhat." +msgstr "" +"In dat geval moeten me het vernietigen zodat we de ontwikkeling ervan " +"stagneren." + +#. / Cutscene (Sid Wilson) +#: ../src/cutscene.c:308 +msgid "" +"Agreed. Capturing it would be better, but that's probably not going to " +"happen." +msgstr "" +"Inderdaad. Overnemen zou nóg beter zijn, maar dit zit er waarschijnlijk niet " +"in." + +#. / Cutscene (Phoebe Lexx) +#: ../src/cutscene.c:312 +msgid "I wonder if my sister will be here..." +msgstr "Ik ben benieuwd of mijn zus daar ook is..." + +#. / Cutscene (Phoebe Lexx) +#: ../src/cutscene.c:341 +msgid "Will she be okay?" +msgstr "Hoe zou het met haar gaan?" + +#. / Cutscene (Sid Wilson) +#: ../src/cutscene.c:345 +msgid "" +"I've had a look at the implants and they should be easy to remove. She'll " +"just have a headache for a while." +msgstr "" +"Ik heb de implantaten bekeken en ze zouden eenvoudig te verwijderen moeten " +"zijn. Ze zal alleen een tijdje hoofdpijn hebben." + +#. / Cutscene (Chris Bainfield) +#: ../src/cutscene.c:349 +msgid "Will she be able to tell us anything useful?" +msgstr "Kan ze ons daarna iets zinnigs vertellen?" + +#. / Cutscene (Sid Wilson) +#: ../src/cutscene.c:353 +msgid "" +"We'll have to wait for her memory to come back. She might not be able to " +"remember anything she did while the implants were in." +msgstr "" +"We moeten wachten tot haar geheugen terugkeert. Ze herinnert zich mogelijk " +"niks van de periode dat ze de implantaten droeg." + +#. / Cutscene (Sid Wilson) +#: ../src/cutscene.c:357 +msgid "She'll still be able to pilot a ship though." +msgstr "Maar ze kan nog wel een schip besturen." + +#. / Cutscene (Chris Bainfield) +#: ../src/cutscene.c:392 +msgid "Sorry folks, we just lost our bargaining chip." +msgstr "Sorry mensen, we zijn onze chip kwijt." + +#. / Cutscene (Sid Wilson) +#: ../src/cutscene.c:396 +msgid "" +"Don't worry about it. It's not what I hoped for, but it should still make it " +"easier to defeat WEAPCO." +msgstr "" +"Geen zorgen. Het is niet hoe ik het me had voorgesteld, maar het moet nog " +"steeds mogelijk zijn om WEAPCO te verslaan." + +#. / Cutscene (Ursula Lexx) +#: ../src/cutscene.c:400 +msgid "" +"Sol is going to be difficult. I've heard they have a lot of heavy defenses " +"on the outer planets." +msgstr "" +"Sol gaat echter moeilijk worden. Ik heb vernomen dat ze een hoop zwaar " +"geschut hebben op de buitenste planeten." + +#. / Cutscene (Sid Wilson) +#: ../src/cutscene.c:404 +msgid "We'll have to start there, then." +msgstr "Dan moeten we daar beginnen." + +#. / Cutscene (Sid Wilson) +#: ../src/cutscene.c:408 +msgid "" +"The forces here will be unlike anything we've met so far. Just be careful, " +"everyone." +msgstr "" +"De legertroepen zijn totaal niet vergelijkbaar met hier. Wees voorzichtig." + +#. / Instructions for how to skip the current cutscene +#: ../src/cutscene.c:497 +msgid "Press [Escape] to skip" +msgstr "Druk op [Escape] om over te slaan" + +#. / This is a list of taunts broadcast by Kline Kethlan when he shows +#. / up at interceptions. Taunts are separated by a single "\n". Instead +#. / of directly translating these, please populate the list with taunts +#. / that work well in the target language, following the English +#. / version only as a general guideline. Any number of taunts is +#. / permitted. +#: ../src/event.c:63 +msgid "" +"How nice to see you again, Bainfield!\n" +"It all ends here, rebel!\n" +"I hope you won't disappoint me this time...\n" +"Do you really think you can defeat us?!" +msgstr "" +"Wat fijn je weer te zien, Bainfield!\n" +"Je avontuur eindigt hier, rebel!\n" +"Ik hoop dat je me ditmaal niet teleurstelt...\n" +"Denk je nu werkelijk dat je óns kunt verslaan?!" + +#. / Dialog (Sid Wilson) +#: ../src/event.c:76 +msgid "You should try and destroy some of the frigate's weaponry, it'll help!" +msgstr "Probeer de wapenkamer van hun schip te vernietigen." + +#. / Dialog (Sid Wilson) +#: ../src/event.c:81 +msgid "Chris, get a move on! The frigate is almost in range!" +msgstr "Schiet nou eens op, Chris! Hun schip is bijna in positie." + +#. / Dialog (Sid Wilson) +#: ../src/event.c:86 +msgid "The frigate is charging its cannon!" +msgstr "Het schip laad zijn kanon!" + +#. / Dialog (Sid Wilson) +#: ../src/event.c:91 +msgid "Chris, HURRY!" +msgstr "Chris, SCHIET OP!" + +#. / Dialog (Sid Wilson) +#: ../src/event.c:96 +msgid "Oh my god..." +msgstr "Goeienacht, pater!" + +#. / Dialog (Phoebe Lexx) +#: ../src/event.c:106 +msgid "Hey, over here! Destroy this tug so I can break free!" +msgstr "Hé, hierheen! Maak dit tuig kort en klein zodat ik uit kan breken." + +#. / Dialog (friendly transport from Eyananth, Allez mission) +#: ../src/event.c:114 +msgid "Thank God! Please, help us! If they destroy this ship..." +msgstr "De hemel zij dank! Help ons, want als ze dit schip vernietigen..." + +#. / Dialog (Chris Bainfield) +#: ../src/event.c:119 +msgid "How long do you need?" +msgstr "Hoe lang gaat het duren?" + +#. / Dialog (friendly transport from Eyananth, Allez mission) +#: ../src/event.c:124 +msgid "Just a few minutes!" +msgstr "Een paar minuten." + +#. / Dialog (friendly transport from Eyananth, Allez mission) +#: ../src/event.c:129 +msgid "" +"Alright! We've got the weapons working again! Now to look at the engines..." +msgstr "Gelukkig, onze wapens werken weer! Nu de motoren nog..." + +#. / Dialog (friendly transport from Eyananth, Allez mission) +#: ../src/event.c:136 +msgid "DAMN! The guns are offline again! What you guys doing back there?!" +msgstr "" +"VERDORIE! De wapens zijn wederom buiten gebruik. Wat zijn jullie daar toch " +"aan het doen?!" + +#. / Dialog (friendly transport from Eyananth, Allez mission) +#: ../src/event.c:143 +msgid "" +"Chris, HELP! We've lost all system power! We're a sitting duck out here!" +msgstr "" +"Chris, HELP! Alle systemen zijn offline! Op deze manier zijn we een " +"makkelijk doelwit..." + +#. / Dialog (friendly transport from Eyananth, Allez mission) +#: ../src/event.c:150 +msgid "Just a little longer..." +msgstr "Nog even geduld..." + +#. / Dialog (friendly transport from Eyananth, Allez mission) +#: ../src/event.c:155 +msgid "" +"Okay! We've fixed that one. We think we've found the problem with the " +"engines too..." +msgstr "" +"Oké, dit is opgelost. En we hebben waarschijnlijk ook het motorische " +"probleem gevonden..." + +#. / Dialog (friendly transport from Eyananth, Allez mission) +#: ../src/event.c:162 +msgid "Engines fixed! Let's move!" +msgstr "De motoren zijn gemaakt. Tijd om te gaan!" + +#. / Dialog (Phoebe Lexx) +#: ../src/event.c:183 +msgid "" +"Ummm... something about this doesn't look right! They should be offering " +"more resistance than this!" +msgstr "" +"Eh... er lijkt iets niet te kloppen. Ze zouden meer weerstand moeten " +"bieden..." + +#. / Dialog (Phoebe Lexx) +#: ../src/event.c:188 +msgid "DAMMIT! It's a trap! Come on, Chris, we have to leave NOW!" +msgstr "POTJANDORIE - het is een valstrik! Chris, we moeten weg. NU!" + +#. / Dialog (Sid Wilson) +#: ../src/event.c:197 +msgid "Chris, wh..." +msgstr "Chris, wa..." + +#. / Dialog (Kline Kethlan) +#: ../src/event.c:202 +msgid "So finally I meet the man who has been causing us so much trouble!" +msgstr "" +"Eindelijk sta ik oog in oog met de man die ons zo veel ellende heeft bezorgd." + +#. / Dialog (Chris Bainfield) +#: ../src/event.c:207 +msgid "I see you've jammed up my warp drive. Who are you?" +msgstr "Je hebt de warpaandrijving geblokt. Wie ben jij?" + +#. / Dialog (Kline Kethlan) +#: ../src/event.c:212 +msgid "" +"I am Kline Kethlan. And I am here to put to a stop to your worthless little " +"crusade!" +msgstr "Ik ben Kline Kethlan en ik kom jullie waardeloze schip vernietigen!" + +#. / Dialog (Chris Bainfield) +#: ../src/event.c:217 +msgid "Kline Kethlan, huh? You sure sound confident." +msgstr "Kline Kethlan, zeg je? Je klinkt zeker van je zaak." + +#. / Dialog (Kline Kethlan) +#: ../src/event.c:222 +msgid "" +"Nowhere to run, nowhere to hide, and no one to help you! This will certainly " +"be interesting..." +msgstr "" +"Je kunt nergens heen en nergens schuilen, en niemand gaat je redden! Dit " +"wordt interessant..." + +#. / Dialog (Ursula Lexx under mind control) +#. / Translation note: This should appear robotic or at least monotone. +#: ../src/event.c:235 +msgid "Unidentified craft sighted. Will proceed to destroy all targets." +msgstr "Onbekend vaartuig gespot. Alle doelen worden vernietigd." + +#. / Dialog (Chris Bainfield) +#: ../src/event.c:240 +msgid "" +"Looks like she's got one of those homing missile launchers too! Any advice, " +"Phoebe?" +msgstr "" +"Het lijkt er op dat ze óók één van die geleide raketwerpers heeft! Heb je " +"advies voor ons, Phoebe?" + +#. / Dialog (Phoebe Lexx) +#: ../src/event.c:245 +msgid "Just try and dodge them!" +msgstr "Probeer ze gewoon te ontwijken!" + +#. / Dialog (Chris Bainfield) +#: ../src/event.c:253 +msgid "That's a nice ship you got there, old-timer!" +msgstr "Mooi schip, opa!" + +#. / Dialog (Krass Tyler) +#: ../src/event.c:258 +msgid "Thanks, boy. Made it myself!" +msgstr "Dank je, knul. Helemaal zelfgebouwd!" + +#. / Dialog (Krass Tyler) +#: ../src/event.c:263 +msgid "" +"Hey, boy, we've got company! Looks like your friends didn't do a very good " +"job after all!" +msgstr "" +"Kom, knul, we hebben bezoek. Het lijkt er op dat je vrienden iets niet goed " +"hebben gedaan!" + +#. / Dialog (Krass Tyler) +#: ../src/event.c:274 +msgid "Keep those things off my back or it'll cost you extra!" +msgstr "Hou die dingen tegen, anders zal het je bezuren!" + +#. / Dialog (Phoebe Lexx) +#: ../src/event.c:283 +msgid "Hey! Did we miss anything exciting?" +msgstr "Hé! Hebben we iets gemist?" + +#. / Dialog (Krass Tyler) +#: ../src/event.c:294 +msgid "I've earned my fee. I'll see you around, boy!" +msgstr "Ik heb wat ik moest hebben. Tot een andere keer, knul!" + +#. / Dialog (Sid Wilson) +#: ../src/event.c:304 +msgid "DAMMIT! It's getting away! We've got to stop it!" +msgstr "MIERENKRIEBELS - ze gaan ervandoor! We moeten ze tegenhouden!" + +#. / Dialog (Sid Wilson) +#: ../src/event.c:314 +msgid "Chris! Another two of those ray cannons just arrived in your sector!" +msgstr "Chris, er zijn nog eens twee straalkanonnen aangekomen in je sector!" + +#. / Dialog (Sid Wilson) +#: ../src/event.c:325 +msgid "Two more!" +msgstr "Nóg twee!" + +#. / Dialog (Ursula Lexx) +#: ../src/event.c:343 +msgid "It's a trap! My God! It's Tyler!" +msgstr "Het is een valstrik! Goeie god, het is Tyler!" + +#. / Dialog (Krass Tyler) +#: ../src/event.c:348 +msgid "" +"I'm a mercenary, what do you expect?! WEAPCO hired me to do a job, just like " +"you have been doing." +msgstr "" +"Wat verwachtte je dan? Ik ben een huurling. WEAPCO heeft me ingehuurd om een " +"taak uit te voeren, net als jij." + +#. / Dialog (Chris Bainfield) +#: ../src/event.c:353 +msgid "Good point. It would be foolish to expect anything else." +msgstr "Je hebt gelijk. Ik had eigenlijk niks anders moeten verwachten." + +#. / Dialog (Krass Tyler) +#: ../src/event.c:362 +msgid "" +"Now if you'll assist me in dying quickly, I have a cheque to earn, boy..." +msgstr "Sterf nu snel, want ik heb een cheque te innen, knul..." + +#. / Dialog (Chris Bainfield) +#: ../src/event.c:367 +msgid "I have a name, you know. Do you remember it?" +msgstr "Ik heb een naam, hoor. Herinner je je dat niet meer?" + +#. / Dialog (Kline Kethlan) +#: ../src/event.c:383 +msgid "" +"That's far enough, Bainfield. You've been lucky so far, but your luck is " +"about to run out!" +msgstr "" +"Genoeg, Bainfield! Tot dusverre heb je geluk gehad, maar dat houdt een keer " +"op!" + +#. / Dialog (Chris Bainfield) +#: ../src/event.c:388 +msgid "Yeah, right! Like I'd lose to you after coming this far!" +msgstr "Tuurlijk, jôh. Alsof ik nu nog van je ga verliezen..." + +#. / Dialog (Chris Bainfield) +#: ../src/event.c:396 +msgid "" +"WEAPCO is finished, Kethlan! You have nowhere to run, nowhere to hide, and " +"no one to help you." +msgstr "" +"WEAPCO is niet meer, Kethlan! Je kunt nergens heen, nergens schuilen en " +"niemand gaat je redden." + +#. / Dialog (Kline Kethlan) +#: ../src/event.c:401 +msgid "You underestimate me, Bainfield." +msgstr "Je onderschat me, Bainfield." + +#: ../src/game.c:71 +msgid "Spirit" +msgstr "Spirit" + +#: ../src/game.c:72 +msgid "Eyananth" +msgstr "Eyananth" + +#: ../src/game.c:73 +msgid "Mordor" +msgstr "Mordor" + +#: ../src/game.c:74 +msgid "Sol" +msgstr "Sol" + +#. / "%d" must be retained. It is replaced with the amount of money that +#. / was picked up. +#: ../src/game.c:320 +#, c-format +msgid "Got $%d" +msgid_plural "Got $%d" +msgstr[0] "$%d gevonden" +msgstr[1] "$%d gevonden" + +#: ../src/game.c:329 +msgid "Rocket Ammo at Maximum" +msgstr "Maximale raketmunitie" + +#. / "%d" must be retained. It is replaced with the number of rockets +#. / picked up. +#: ../src/game.c:335 +#, c-format +msgid "Got %d rocket" +msgid_plural "Got %d rockets" +msgstr[0] "%d raket gevonden" +msgstr[1] "%d raketten gevonden" + +#: ../src/game.c:345 +msgid "Restored 10 shield points" +msgstr "10 schildpunten hersteld" + +#: ../src/game.c:358 ../src/game.c:377 +msgid "Firing rate already at maximum" +msgstr "De vuursnelheid is al maximaal" + +#: ../src/game.c:362 ../src/game.c:381 +msgid "Firing rate increased" +msgstr "Vuursnelheid verhoogd" + +#: ../src/game.c:386 ../src/game.c:427 ../src/game.c:468 +msgid "Upgrade failed (no plasma ammo)" +msgstr "Opwaarderen mislukt (geen plasmamunitie)" + +#: ../src/game.c:399 ../src/game.c:418 +msgid "Plasma output already at maximum" +msgstr "De plasmamunitie is al maximaal" + +#: ../src/game.c:403 ../src/game.c:422 +msgid "Plasma output increased" +msgstr "Plasma-uitvoer verhoogd" + +#: ../src/game.c:440 ../src/game.c:459 +msgid "Plasma damage already at maximum" +msgstr "De plasmaschade is al maximaal" + +#: ../src/game.c:444 ../src/game.c:463 +msgid "Plasma damage increased" +msgstr "Plasmaschade verhoogd" + +#: ../src/game.c:493 +msgid "Picked up a Super Charge!" +msgstr "Superoplader opgepakt!" + +#. / Rare case of grabbing the super charge when you have no ammo at an +#. / interception (which means it won't take effect). The "Damn!" serves +#. / as a little sympathetic easter egg for players unfortunate enough to +#. / have this happen to them. +#: ../src/game.c:501 +msgid "Damn! Upgrade failed (no plasma ammo)" +msgstr "Verdorie! Opwaarderen mislukt (geen plasmamunitie)" + +#: ../src/game.c:507 +msgid "Plasma cells already at Maximum" +msgstr "De plasmacellen zijn al maximaal" + +#. / "%d" must be retained. It is replaced with the number of plasma +#. / cells picked up. +#: ../src/game.c:515 +#, c-format +msgid "Got %d plasma cell" +msgid_plural "Got %d plasma cells" +msgstr[0] "%d plasmacel gevonden" +msgstr[1] "%d plasmacellen gevonden" + +#: ../src/game.c:523 +msgid "Picked up some Cargo" +msgstr "Cargo gevonden" + +#: ../src/game.c:529 +#, c-format +msgid "Rescued %d slave" +msgid_plural "Rescued %d slaves" +msgstr[0] "%d slaaf bevrijd" +msgstr[1] "%d slaven bevrijd" + +#: ../src/game.c:536 +msgid "Picked up an Escape Pod" +msgstr "Reddingscapsule gevonden" + +#: ../src/game.c:540 +msgid "Picked up some Ore" +msgstr "Erts gevonden" + +#. / Chris: Phoebe Hit Messages +#. / This is a list of messages separated by "\n". They are randomly +#. / broadcast by Phoebe when Chris (the player) damages her. +#. / Instead of directly translating these, please populate the list +#. / with messages that work well in the target language, +#. / following the English version only as a general guideline. Any +#. / number of messages is permitted. +#: ../src/game.c:737 +msgid "" +"OW! I hope that was an accident!\n" +"Chris, please be more careful!\n" +"Ouch! What are you shooting at me for?" +msgstr "" +"OEPS! Ik hoop dat dat een ongelukje was?\n" +"Chris, je moet voorzichtiger te werk gaan!\n" +"AU! Waarom schiet je op me?" + +#. / Chris: Ursula Hit Messages +#. / This is a list of messages separated by "\n". They are randomly +#. / broadcast by Phoebe when Chris (the player) damages her. +#. / Instead of directly translating these, please populate the list +#. / with messages that work well in the target language, +#. / following the English version only as a general guideline. Any +#. / number of messages is permitted. +#: ../src/game.c:753 +msgid "" +"I am NOT your enemy!\n" +"Hey! Watch it!\n" +"What are you doing?! Shoot THEM!\n" +"Pay some damn attention!" +msgstr "" +"Ik ben GEEN vijand!\n" +"Hé, kijk uit!\n" +"Wat ben je toch aan het doen? Schiet op HEN!\n" +"Kijk toch eens uit je doppen!" + +#. / Phoebe: Player Hit Messages +#. / This is a list of messages separated by "\n". They are randomly +#. / broadcast when Phoebe accidentally damages Chris (the player). +#. / Instead of directly translating these, please populate the list +#. / with messages that work well in the target language, +#. / following the English version only as a general guideline. Any +#. / number of messages is permitted. +#: ../src/game.c:841 +msgid "" +"Oops! Sorry!\n" +"Whoops! Are you OK, Chris?\n" +"Oh, sorry! I didn't see you there!" +msgstr "" +"Oeps, sorry!\n" +"Oeps, gaat het, Chris?\n" +"Sorry, ik zag je niet!" + +#. / Ursula: Player Hit Messages +#. / This is a list of messages separated by "\n". They are randomly +#. / broadcast when Ursula accidentally damages Chris (the player). +#. / Instead of directly translating these, please populate the list +#. / with messages that work well in the target language, +#. / following the English version only as a general guideline. Any +#. / number of messages is permitted. +#: ../src/game.c:857 +msgid "" +"Get out of the way!\n" +"Don't fly into my missiles!\n" +"Dammit, Chris, you made me miss!" +msgstr "" +"Uit de weg!\n" +"Vlieg niet langs mijn raketten!\n" +"Verdorie, Chris, dankzij jou schoot ik mis!" + +#. / Kline Venus insult messages +#. / This is a list of insults separated by "\n". They are randomly +#. / broadcast when the player dies in the Venus mission. +#. / Instead of directly translating these, please populate the list +#. / with insults that work well in the target language, +#. / following the English version only as a general guideline. Any +#. / number of insults is permitted. +#: ../src/game.c:1608 +msgid "" +"Fool.\n" +"And now you're nothing but a DEAD hero." +msgstr "" +"Dwaas.\n" +"Je bent gewoon een held op sokken.\n" +"En dat noemt zich een held...\n" +"Ik dacht dat je meer in je mars had...\n" +"Sukkel.\n" +"Miserie, miserie, miserie.\n" +"Mijn gedacht!" + +#. / Kline insult messages +#. / This is a list of insults separated by "\n". They are randomly +#. / broadcast when the player dies in a mission Kline is in (except Venus). +#. / Instead of directly translating these, please populate the list +#. / with insults that work well in the target language, +#. / following the English version only as a general guideline. Any +#. / number of insults is permitted. +#: ../src/game.c:1623 +msgid "" +"Pathetic.\n" +"How very disappointing...\n" +"Heroic. And foolish." +msgstr "" +"Zielig, hoor.\n" +"Je stelt me teleur...\n" +"Heroïsch én dwaas.\n" +"FC Knudde.\n" +"Je bent een zachtgekookt ei.\n" +"Bamibal." + +#. / Dialog: Krass Tyler +#. / Used when the player is killed in the Jupiter mission. +#: ../src/game.c:1634 +msgid "That was the easiest $90,000,000 I've ever earned! Bwah! Ha! Ha! Ha!" +msgstr "Zó makkelijk heb ik nog nooit $90.000.000 verdiend! MUAHAHA!" + +#. / Each "%.2d" must be retained. They are replaced with the minutes and seconds left +#. / to complete the mission, respectively (or, in the case of the Mars mission, the +#. / minutes and seconds, respectively, until the mission is completed). +#. / If you are familiar with C string formatting, they can be modified as long as +#. / the "d" type remains. For example, you can replace "%.2d" with "%d" to allow the +#. / timer to use single-digit numbers. +#. / The ":" can also be replaced just like any text. For example, this would be fine: +#. / "Time Remaining - %d minutes and %d seconds" +#: ../src/game.c:1947 +#, c-format +msgid "Time Remaining - %.2d:%.2d" +msgstr "Resterende tijd: %.2d:%.2d" + +#. / "%d" must be retained. It is replaced with the number of mission objectives remaining. +#: ../src/game.c:1955 +#, c-format +msgid "Objectives Remaining: %d" +msgstr "Resterende doelen: %d" + +#. / "%d" must be retained. It is replaced with the player's current total cash. +#. / Retain "%d" as-is. It is replaced with the player's current cash. +#: ../src/game.c:1961 ../src/shop.c:353 +#, c-format +msgid "Cash: $%d" +msgstr "Geld: $%d" + +#. / "%.3d" must be retained. It is replaced with the amount of plasma ammo. +#: ../src/game.c:1998 +#, c-format +msgid "Plasma: %.3d" +msgstr "Plasma: %.3d" + +#. / Used to indicate the charge meter for the charger cannon in the HUD. +#: ../src/game.c:2005 +msgid "Charge" +msgstr "Oplaadniveau" + +#. / Used to indicate the heat meter for the laser cannon in the HUD. +#: ../src/game.c:2010 +msgid "Heat" +msgstr "Hitte" + +#. / "%.2d" must be retained. It is replaced with the amount of rocket ammo. +#. / Retain "%.2d". It is replaced with the ship's current number of rockets. +#. / "%.2d" can be changed to "%d" if you wish to not fill in space with zeroes, +#. / e.g. render the number 3 as "3" rather than "03". +#: ../src/game.c:2015 ../src/shop.c:363 +#, c-format +msgid "Rockets: %.2d" +msgstr "Raketten: %.2d" + +#. / DIFFICULTY_SUPEREASY +#: ../src/game.c:2425 +msgid "Super-Easy" +msgstr "Héél makkelijk" + +#. / DIFFICULTY_EASY +#: ../src/game.c:2429 +msgid "Easy" +msgstr "Makkelijk" + +#. / DIFFICULTY_NORMAL +#: ../src/game.c:2433 +msgid "Normal" +msgstr "Gemiddeld" + +#. / DIFFICULTY_HARD +#: ../src/game.c:2437 +msgid "Hard" +msgstr "Moeilijk" + +#. / DIFFICULTY_NIGHTMARE +#: ../src/game.c:2441 +msgid "Nightmare!" +msgstr "Nachtmerrie!" + +#. / DIFFICULTY_ORIGINAL (Classic) +#: ../src/game.c:2445 +msgid "Classic" +msgstr "Klassiek" + +#. / If the TakaoGothic font is able to display the text of the language +#. / being translated to, DO NOT CHANGE THIS! If, however, the language +#. / requires characters not available in the default font, you can +#. / place that font in the "data" directory and indicate the name of the +#. / alternate font as a translation to "TakaoPGothic.ttf" (leaving the +#. / rest of the string unchanged). Please ensure that the font displays +#. / correctly with ALL text (space is limited and some fonts take up +#. / more space than others), and also check the license of the font +#. / before distributing to make sure you are allowed to do so. +#: ../src/gfx.c:116 +msgid "data/TakaoPGothic.ttf" +msgstr "" + +#: ../src/intermission.c:212 +msgid "No Destination" +msgstr "Geen bestemming" + +#. / Status Screen text +#. / Retain "%s" as-is. It is replaced with the current difficulty. +#: ../src/intermission.c:243 +#, c-format +msgid "Difficulty : %s" +msgstr "Moeilijkheidsgraad: %s" + +#. / Status Screen text +#. / Retain "%d" as-is. It is replaced with the number of shots fired. +#: ../src/intermission.c:248 +#, c-format +msgid "Shots Fired : %d" +msgstr "Afgevuurde schoten: %d" + +#. / Status Screen text +#. / Retain "%d" as-is. It is replaced with the number of hits scored. +#: ../src/intermission.c:253 +#, c-format +msgid "Hits Scored : %d" +msgstr "Geraakt: %d" + +#. / Status Screen text +#. / Retain "%d" as-is. It is replaced with the firing accuracy as a percentage. +#. / Note: To use the "%" symbol, you must enter "%%", as you can see in +#. / the English version. +#: ../src/intermission.c:260 +#, c-format +msgid "Accuracy : %d%%" +msgstr "Nauwkeurigheid: %d%%" + +#. / Status Screen text +#. / Retain "%d" as-is. It is replaced with the number of kills. +#: ../src/intermission.c:265 +#, c-format +msgid "Enemies Killed by Others : %d" +msgstr "Door anderen gedode vijanden: %d" + +#. / Retain "%d" as-is. It is replaced with the amount of cash earned. +#: ../src/intermission.c:269 +#, c-format +msgid "Total Cash Earned : %d" +msgstr "Totaal verdiend: %d" + +#: ../src/intermission.c:272 +msgid "*** Chris ***" +msgstr "*** Chris ***" + +#. / Status Screen text +#. / Retain "%d" as-is. It is replaced with the number of kills. +#: ../src/intermission.c:276 ../src/intermission.c:315 +#: ../src/intermission.c:337 +#, c-format +msgid "Enemies Killed : %d" +msgstr "Gedode vijanden: %d" + +#. / Status Screen text +#. / Retain "%d" as-is. It is replaced with the number of shield restores picked up. +#: ../src/intermission.c:281 +#, c-format +msgid "Shield Restores Picked Up : %d" +msgstr "Gevonden schildherstelkits: %d" + +#. / Status Screen text +#. / Retain "%d" as-is. It is replaced with the number of plasma cells picked up. +#: ../src/intermission.c:286 +#, c-format +msgid "Plasma Cells Picked Up : %d" +msgstr "Gevonden plasmacellen: %d" + +#. / Status Screen text +#. / Retain "%d" as-is. It is replaced with the number of rockets picked up. +#: ../src/intermission.c:291 +#, c-format +msgid "Rockets Picked Up : %d" +msgstr "Gevonden raketten: %d" + +#. / Status Screen text +#. / Retain "%d" as-is. It is replaced with the number of powerups picked up. +#: ../src/intermission.c:296 +#, c-format +msgid "Powerups Picked Up : %d" +msgstr "Gevonden bonusitems: %d" + +#. / Status Screen text +#. / Retain "%d" as-is. It is replaced with the number of mines destroyed. +#: ../src/intermission.c:301 +#, c-format +msgid "Mines Destroyed : %d" +msgstr "Vernietigde mijnen: %d" + +#. / Status Screen text +#. / Retain "%d" as-is. It is replaced with the number of slaves rescued. +#: ../src/intermission.c:306 +#, c-format +msgid "Slaves Rescued : %d" +msgstr "Bevrijde slaven: %d" + +#: ../src/intermission.c:311 +msgid "*** Phoebe ***" +msgstr "*** Phoebe ***" + +#. / Retain +#. / Status Screen text "%d" as-is. It is replaced with the number of ejections. +#. / Status Screen text +#. / Retain "%d" as-is. It is replaced with the number of ejections. +#: ../src/intermission.c:320 ../src/intermission.c:342 +#, c-format +msgid "Ejections : %d" +msgstr "Uitwerpingen: %d" + +#. / Status Screen text +#: ../src/intermission.c:333 +msgid "*** Ursula ***" +msgstr "*** Ursula ***" + +#: ../src/intermission.c:352 ../src/intermission.c:1512 +msgid "Current Status" +msgstr "Huidige status" + +#. / Status Screen footer (indicates the total time the game has been played) +#. / "%ld" (which represents hours) and "%02ld" sequences (which +#. / represent minutes and seconds, respectively) must remain and +#. / stay in the same order relative to each other. The ":"s +#. / between them can be changed to other characters if desired, +#. / e.g. this would be acceptable: +#. / +#. / "Total Time : %ld hours, %02ld minutes, %02ld seconds" +#. / +#. / If you are familiar with printf formatting, you may also change +#. / the formatting of any of these as long as the "ld" type remains. +#. / For example, the "%02ld" sequences may be changed to "%ld" if +#. / you wish to not force two digits to be filled in (e.g. to render +#. / the number 3 as "3" instead of "03"). +#: ../src/intermission.c:368 +#, c-format +msgid "Total Time : %ld:%02ld:%02ld" +msgstr "In totaal gespeeld: %ld:%02ld:%02ld" + +#: ../src/intermission.c:392 +msgid "Hail" +msgstr "Hail" + +#: ../src/intermission.c:396 +msgid "Ceradse" +msgstr "Ceradse" + +#: ../src/intermission.c:400 +msgid "Hinstag" +msgstr "Hinstag" + +#: ../src/intermission.c:404 +msgid "Joldar" +msgstr "Joldar" + +#: ../src/intermission.c:408 +msgid "Moebo" +msgstr "Moebo" + +#. / Spirit, Hail mission summary +#: ../src/intermission.c:415 +msgid "Destroy WEAPCO training ground" +msgstr "Vernietig het WEAPCO-oefenterrein" + +#. / Spirit, Ceradse mission summary +#: ../src/intermission.c:421 +msgid "Collect 6 cargo pods" +msgstr "Verzamel 6 cargocapsules" + +#. / Spirit, Hinstag mission summary +#: ../src/intermission.c:427 +msgid "Destroy 5 WEAPCO missile boats" +msgstr "Vernietig 5 WEAPCO-raketschepen" + +#. / Spirit, Joldar mission summary +#: ../src/intermission.c:433 +msgid "Clear the mine field around Joldar" +msgstr "Ruim de mijnen rond Joldar op" + +#. / Spirit, Moebo mission summary +#: ../src/intermission.c:439 +msgid "Destroy WEAPCO frigate" +msgstr "Vernietig het WEAPCO-schip" + +#: ../src/intermission.c:444 ../src/intermission.c:505 +msgid "WEAPCO interceptions" +msgstr "WEAPCO-onderscheppingen" + +#: ../src/intermission.c:447 +msgid "Nerod" +msgstr "Nerod" + +#: ../src/intermission.c:451 +msgid "Allez" +msgstr "Allez" + +#: ../src/intermission.c:455 +msgid "Urusor" +msgstr "Urusor" + +#: ../src/intermission.c:459 +msgid "Dorim" +msgstr "Dorim" + +#: ../src/intermission.c:463 +msgid "Elamale" +msgstr "Elamale" + +#. / Eyananth, interception mission summary +#: ../src/intermission.c:470 +msgid "Rescue slaves" +msgstr "Bevrijd de slaven" + +#. / Eyananth, Nerod mission summary +#: ../src/intermission.c:476 +msgid "SOS" +msgstr "SOS" + +#. / Eyananth, Allez mission summary +#. / Mission objective (Allez) +#: ../src/intermission.c:482 ../src/mission.c:205 +msgid "Assist medical supply craft" +msgstr "Begeleid het medische bevoorradingsschip" + +#. / Eyananth, Urusor mission summary +#: ../src/intermission.c:488 +msgid "Capture five WEAPCO supply craft" +msgstr "Onderschep 5 WEAPCO-bevoorradingsschepen" + +#. / Eyananth, Dorim mission summary +#: ../src/intermission.c:494 +msgid "Find WEAPCO scientist" +msgstr "Zoek de WEAPCO-wetenschapper" + +#. / Eyananth, Elamale mission summary +#: ../src/intermission.c:500 +msgid "Destroy WEAPCO Ore Mining craft" +msgstr "Vernietig het WEAPCO-mijnschip" + +#: ../src/intermission.c:508 +msgid "Odeon" +msgstr "Odeon" + +#: ../src/intermission.c:512 +msgid "Fellon" +msgstr "Fellon" + +#: ../src/intermission.c:516 +msgid "Sivedi" +msgstr "Sivedi" + +#: ../src/intermission.c:520 +msgid "Almartha" +msgstr "Almartha" + +#: ../src/intermission.c:524 +msgid "Poswic" +msgstr "Poswic" + +#: ../src/intermission.c:528 +msgid "Ellesh" +msgstr "Ellesh" + +#. / Mordor, incerception mission summary +#: ../src/intermission.c:535 +msgid "Destroy experimental fighter" +msgstr "Vernietig het experimentele gevechtsschip" + +#. / Mordor, Odeon mission summary +#: ../src/intermission.c:541 +msgid "Rescue Ursula" +msgstr "Bevrijd Ursula" + +#. / Mordor, Fellon mission summary +#: ../src/intermission.c:547 +msgid "Assist rebel forces" +msgstr "Begeleid de rebellenlegers" + +#. / Mordor, Sivedi mission summary +#: ../src/intermission.c:553 +msgid "Mine ore from asteroid belt" +msgstr "Mijn erts in de asteroïdengordel" + +#. / Mordor, Almartha mission summary +#: ../src/intermission.c:559 +msgid "Create a diversion" +msgstr "Zorg voor afleiding" + +#. / Mordor, Poswic mission summary +#: ../src/intermission.c:565 +msgid "Capture WEAPCO executive transport" +msgstr "Onderschep het WEAPCO-leidersschip" + +#. / Mordor, Ellesh mission summary +#: ../src/intermission.c:571 +msgid "Destroy WEAPCO executive transport" +msgstr "Vernietig het WEAPCO-leidersschip" + +#: ../src/intermission.c:577 +msgid "Mercury" +msgstr "Mercurius" + +#: ../src/intermission.c:581 +msgid "Venus" +msgstr "Venus" + +#: ../src/intermission.c:585 +msgid "Earth" +msgstr "Aarde" + +#: ../src/intermission.c:589 +msgid "Mars" +msgstr "Mars" + +#: ../src/intermission.c:593 +msgid "Jupiter" +msgstr "Jupiter" + +#: ../src/intermission.c:597 +msgid "Saturn" +msgstr "Saturnus" + +#: ../src/intermission.c:601 +msgid "Uranus" +msgstr "Uranus" + +#: ../src/intermission.c:605 +msgid "Neptune" +msgstr "Neptunus" + +#: ../src/intermission.c:609 +msgid "Pluto" +msgstr "Pluto" + +#. / Sol, Pluto mission summary +#: ../src/intermission.c:616 +msgid "Secure Pluto" +msgstr "Stel Pluto veilig" + +#. / Sol, Neptune mission summary +#: ../src/intermission.c:622 +msgid "Secure Neptune" +msgstr "Stel Neptunus veilig" + +#. / Sol, Uranus mission summary +#: ../src/intermission.c:628 +msgid "Secure Uranus" +msgstr "Stel Uranus veilig" + +#. / Sol, Saturn mission summary +#: ../src/intermission.c:634 +msgid "Destroy outer defense system" +msgstr "Vernietig de buitenste verdedigingslinie" + +#. / Sol, Jupiter mission summary +#. / Mission objective (Jupiter) +#: ../src/intermission.c:640 ../src/mission.c:471 +msgid "Investigate distress call" +msgstr "Onderzoek de noodoproep" + +#. / Sol, Mars mission summary +#. / Mission objective (Mars) +#: ../src/intermission.c:646 ../src/mission.c:493 +msgid "Navigate asteroid belt" +msgstr "Reis door de asteroïdengordel" + +#. / Sol, Earth mission summary +#: ../src/intermission.c:652 +msgid "Take back Earth" +msgstr "Neem de aarde weer over" + +#. / Sol, Venus mission summary +#. / Mission objective (Venus) +#: ../src/intermission.c:658 ../src/mission.c:515 +msgid "Defeat Kline" +msgstr "Versla Kline" + +#: ../src/intermission.c:782 +msgid "+++ CURRENT MISSIONS +++" +msgstr "+++ HUIDIGE MISSIES +++" + +#. / Brief instructions for how to review a mission conversation, shown below the +#. / CURRENT MISSIONS header. +#: ../src/intermission.c:785 +msgid "click for info" +msgstr "klik voor informatie" + +#. / Mission dialog: Spirit, Hail (Krass Tyler) +#: ../src/intermission.c:835 +msgid "" +"Hey, boy! You still owe me money for the Firefly I stole for you! But " +"instead, I want you to go to the WEAPCO training ground and destroy all the " +"craft there." +msgstr "" +"Hé, knul! Eigenlijk krijg ik nog geld van je voor de Firefly die ik voor je " +"stal! Maar in plaats daarvan wil ik dat je naar het WEAPCO-trainingskamp " +"gaat en alle schepen vernietigt." + +#. / Mission dialog: Spirit, Hail (Chris Bainfield) +#: ../src/intermission.c:839 +msgid "Oh? That's the job I contracted you to do, was it not?" +msgstr "O? Is dat niet waar ik jóu voor ingehuurd heb?" + +#. / Mission dialog: Spirit, Hail (Krass Tyler) +#: ../src/intermission.c:843 +msgid "" +"I know, but this way we can resolve your debt right now. Do this job, and " +"also collect $500, and we will call it quits. And if you die... well, I " +"guess the ship was not worth stealing! HA HA HA!" +msgstr "" +"Klopt, maar op deze manier kunnen we je schuld direct incasseren. Doe het, " +"verzamel $500 en dan staan we quitte. En als je sterft... ach, dan was het " +"het stelen niet waard. HAHAHA!" + +#. / Mission dialog: Spirit, Hail (Chris Bainfield) +#: ../src/intermission.c:847 +msgid "As usual, you take me too lightly, Krass." +msgstr "Zoals gewoonlijk schat je me té laag in, Krass." + +#. / Mission dialog: Spirit, Ceradse (Chris Bainfield) +#: ../src/intermission.c:854 +msgid "Hey, Sid, what's up?" +msgstr "Hé, Sid! Alles goed?" + +#. / Mission dialog: Spirit, Ceradse (Sid Wilson) +#: ../src/intermission.c:858 +msgid "" +"Chris, I've intercepted a communication from WEAPCO. Seems they're " +"transporting some medical supplies around Ceradse. We need to get hold of " +"those pods to save some lives!" +msgstr "" +"Chris, ik heb communicatie van WEAPCO onderschept. Het lijkt er op dat ze " +"medische goederen transporteren op Ceradse. We moeten die capsules " +"bemachtigen om levens te redden!" + +#. / Mission dialog: Spirit, Ceradse (Chris Bainfield) +#: ../src/intermission.c:862 +msgid "How many do we need?" +msgstr "Hoe veel hebben we er nodig?" + +#. / Mission dialog: Spirit, Ceradse (Sid Wilson) +#: ../src/intermission.c:866 +msgid "" +"All six, Chris! If you lose even a single one, thousands of people could " +"perish in Spirit within the next few months." +msgstr "" +"Alle zes, Chris! Als we er ook maar één kwijtraken, dan zijn duizenden " +"mensenlevens op Spirit in gevaar." + +#. / Mission dialog: Spirit, Hinstag (Chris Bainfield) +#: ../src/intermission.c:873 +msgid "Wow! Missile boats?" +msgstr "Wauw! Raketschepen?" + +#. / Mission dialog: Spirit, Hinstag (Sid Wilson) +#: ../src/intermission.c:877 +msgid "Yup. Looks like WEAPCO is starting to take notice of your actions." +msgstr "Ja. Het ziet er naar uit dat WEAPCO nu weet wat je allemaal uitvreet." + +#. / Mission dialog: Spirit, Hinstag (Chris Bainfield) +#: ../src/intermission.c:881 +msgid "" +"Awesome! This will really put the Firefly's fighting ability to the test!" +msgstr "" +"Geweldig! Zo kunnen we meteen de vliegkunsten van de Firefly aan de tand " +"voelen!" + +#. / Mission dialog: Spirit, Hinstag (Sid Wilson) +#: ../src/intermission.c:885 +msgid "" +"Please be careful, Chris. A single missile boat carries enough rockets to " +"level most major cities. Try not to face them head-on, and keep your " +"distance." +msgstr "" +"Wees voorzichtig, Chris. Eén raketschip heeft genoeg raketten aan boord om " +"de grootste steden met de grond gelijk te maken. Kom niet in hun vizier en " +"houd afstand." + +#. / Mission dialog: Spirit, Joldar (Sid Wilson) +#: ../src/intermission.c:892 +msgid "" +"We're going to have to get rid of the mine deployment unit around Joldar. " +"The minefield is stopping interplanetary traffic." +msgstr "" +"We moeten stoppen met het leggen van mijnen op Joldar. Het mijnenveld houd " +"interplanetair verkeer tegen." + +#. / Mission dialog: Spirit, Joldar (Chris Bainfield) +#: ../src/intermission.c:896 +msgid "Are any fighters around to keep me entertained?" +msgstr "Zijn er vechters aan boord die me kunnen vermaken?" + +#. / Mission dialog: Spirit, Joldar (Sid Wilson) +#: ../src/intermission.c:900 +msgid "" +"Not at the moment, but that doesn't mean they won't turn up. Be very careful " +"of those mines! They'll only explode when they encounter a ship that's not " +"transmitting a WEAPCO signal. Shoot them down if they get in your way." +msgstr "" +"Momenteel niet, maar ze kunnen nog komen. Let goed op de mijnen! Ze gaan " +"alleen af als ze een schip ontdekken dat geen WEAPCO-signaal afgeeft. Schiet " +"ze desnoods af." + +#. / Mission dialog: Spirit, Moebo (Sid Wilson) +#: ../src/intermission.c:907 +msgid "" +"We've got a major problem here! WEAPCO has decided to stop our resistance by " +"destroying Spirit! The explosion will incinerate everything in the system! " +"You've got to destroy that frigate before it gets in range!" +msgstr "" +"We zitten met een enorm probleem! WEAPCO heeft besloten om ons verzet tegen " +"te werken door Spirit te vernietigen! De explosie zal alles in het stelsel " +"verbranden. Vernietig het fregat voordat het té dichtbij komt!" + +#. / Mission dialog: Spirit, Moebo (Chris Bainfield) +#: ../src/intermission.c:911 +msgid "Damn! I'll get right on it, then!" +msgstr "Mozeskriebel! Ik ga er meteen voor zitten!" + +#. / Mission dialog: Spirit, Moebo (Sid Wilson) +#: ../src/intermission.c:915 +msgid "" +"We're all counting on you, Chris! But remember, they didn't call that thing " +"\"Star Killer\" just because it sounded nice!" +msgstr "" +"We rekenen op je, Chris! Maar denk eraan: ze hebben dat ding niet voor niets " +"\"Star Killer\" genoemd!" + +#. / Mission dialog: Eyananth, interceptions (Sid Wilson) +#. / "%d" must be retained as-is. It is replaced with the number of slaves that +#. / need to be rescued. +#: ../src/intermission.c:924 +#, c-format +msgid "" +"As you know, WEAPCO has many slaves in this system. If we free a large " +"number of them, it might help to spark a rebellion. I estimate that we will " +"need to rescue around %d to make a difference." +msgstr "" +"Zoals je weet heeft WEAPCO hier vele slaven. Als we een groot aantal van hun " +"bevrijden, kan het leiden tot een opstand. Ik schat dat me ongeveer %d " +"slaven moeten bevrijden om iets op gang te brengen." + +#. / Mission dialog: Eyananth, interceptions (Chris Bainfield) +#: ../src/intermission.c:928 +msgid "Most of the slaves are working in ore mines, aren't they?" +msgstr "De meeste slaven werken in de ertsmijnen, toch?" + +#. / Mission dialog: Eyananth, interceptions (Sid Wilson) +#: ../src/intermission.c:932 +msgid "" +"Yes, but attacking the mines directly would be dangerous. You'd be better " +"off intercepting slave transports. What you'll have to do is fly around and " +"see if you can intercept a WEAPCO patrol. Of course, they might not be " +"escorting any slave units, so be careful!" +msgstr "" +"Ja, maar we kunnen niet zomaar de mijnen aanvallen. Het is beter om de " +"slaaftransporten te onderscheppen. Vlieg rond en probeer een WEAPCO-" +"patrouille te onderscheppen. Maar wees voorzichtig, want het kunnen ook lege " +"patrouilles zijn!" + +#. / Mission dialog: Eyananth, Nerod (Phoebe Lexx) +#: ../src/intermission.c:939 +msgid "Help! This is an SOS! Can anyone hear me?!" +msgstr "Help! SOS! Kan iemand me horen?!" + +#. / Mission dialog: Eyananth, Nerod (Chris Bainfield) +#: ../src/intermission.c:943 +msgid "I'm hearing you loud and clear! What's up?" +msgstr "Ik hoor je luid en duidelijk! Wat is er loos?" + +#. / Mission dialog: Eyananth, Nerod (Phoebe Lexx) +#: ../src/intermission.c:947 +msgid "" +"Oh, thank God! I was intercepted by a large WEAPCO force near Nerod! I'm in " +"need of assistance!" +msgstr "" +"O, gelukkig! Ik ben onderschept door een grote WEAPO-troep bij Nerod! Ik heb " +"dringend hulp nodig!" + +#. / Mission dialog: Eyananth, Nerod (Chris Bainfield) +#: ../src/intermission.c:951 +msgid "I'm on my way!" +msgstr "Ik kom eraan!" + +#. / Mission dialog: Eyananth, Allez (Sid Wilson) +#: ../src/intermission.c:958 +msgid "" +"I've just received another SOS. This one is coming from a supply craft " +"carrying essential medical supplies." +msgstr "" +"Ik heb nog een SOS ontvangen, ditmaal van een bevoorradingsvaartuig met " +"medisch spul." + +#. / Mission dialog: Eyananth, Allez (Chris Bainfield) +#: ../src/intermission.c:962 +msgid "Alright, tell 'em I'm on my way." +msgstr "Oké, zeg ze dat ik eraan kom." + +#. / Mission dialog: Eyananth, Urusor (Sid Wilson) +#: ../src/intermission.c:969 +msgid "" +"I need some resources before we leave. It'll make life a lot easier in " +"Mordor. Problem is that WEAPCO hoards these parts." +msgstr "" +"Voor we gaan heb ik wat spullen nodig om ons te helpen op Mordor. Het enige " +"probleem is dat WEAPCO deze spullen verzamelt." + +#. / Mission dialog: Eyananth, Urusor (Chris Bainfield) +#: ../src/intermission.c:973 +msgid "Where can we get them, then?" +msgstr "Waar kunnen we ze dan vinden?" + +#. / Mission dialog: Eyananth, Urusor (Sid Wilson) +#: ../src/intermission.c:977 +msgid "" +"There's a big shipment of them nearby. I can disable the supply craft " +"carrying them; I just need you to give me some cover while I do it." +msgstr "" +"Er komt hier vlakbij een grote voorraad binnen. Ik kan het " +"bevoorradingsvaartuig onschadelijk maken, maar dan moet je me wel wat " +"dekking geven." + +#. / Mission dialog: Eyananth, Urusor (Chris Bainfield) +#: ../src/intermission.c:981 +msgid "You got it!" +msgstr "Komt voor de bakker!" + +#. / Mission dialog: Eyananth, Dorim (Sid Wilson) +#: ../src/intermission.c:988 +msgid "" +"A WEAPCO scientist just ran off in an escape pod and hid in the asteroid " +"belt. If we capture him, we may be able to get some information about Mordor." +msgstr "" +"Een WEAPCO-wetenschapper is er zojuist vandoor gegaan met een " +"reddingscapsule en houdt zich nu verborgen in de asteroïdengordel. Als we " +"hem te pakken krijgen, kunnen we wellicht wat informatie over Mordor " +"ontfutselen." + +#. / Mission dialog: Eyananth, Dorim (Chris Bainfield) +#: ../src/intermission.c:992 +msgid "" +"Alright, I'll go look for him. I guess I'll grab some ore along the way." +msgstr "Prima, ik ga naar hem op zoek. Onderweg neem ik gelijk wat erts mee." + +#. / Mission dialog: Eyananth, Elamale (Sid Wilson) +#: ../src/intermission.c:999 +msgid "" +"I've received word that the slaves we rescued have started a rebellion. " +"Looks like the plan worked." +msgstr "" +"Ik heb gehoord dat de door ons geredde slaven in opstand zijn gekomen. Ons " +"plan lijkt dus gewerkt te hebben." + +#. / Mission dialog: Eyananth, Elamale (Phoebe Lexx) +#: ../src/intermission.c:1003 +msgid "" +"WEAPCO has an automated mining ship in orbit around Elamale. How about we " +"take it out and cause some confusion?" +msgstr "" +"WEAPCO heeft een automatisch mijnschip rondom Elamale. Zullen we het " +"neerhalen om wat verwarring te scheppen?" + +#. / Mission dialog: Eyananth, Elamale (Chris Bainfield) +#: ../src/intermission.c:1007 +msgid "I like that idea!" +msgstr "Prima idee!" + +#. / Mission dialog: Eyananth, Elamale (Sid Wilson) +#: ../src/intermission.c:1011 +msgid "It'll work, but be careful." +msgstr "Het gaat werken, maar ga voorzichtig te werk." + +#. / Mission dialog: Mordor, interceptions (Chris Bainfield) +#: ../src/intermission.c:1018 +msgid "What have you found out about that experimental fighter?" +msgstr "Wat heb je vernomen over de experimentele vechtmachine?" + +#. / Mission dialog: Mordor, interceptions (Sid Wilson) +#: ../src/intermission.c:1022 +msgid "" +"It's got some kind of cloaking device that makes it invisible to radar. " +"Could prove hard to track down." +msgstr "" +"Het is een soort van camouflage-apparaat dat onzichtbaar is voor radars en " +"daardoor moeilijk te vinden." + +#. / Mission dialog: Mordor, interceptions (Chris Bainfield) +#: ../src/intermission.c:1026 +msgid "I'll just have to run around the system until I find it." +msgstr "In dat geval moet ik de hele gordel afzoeken." + +#. / Mission dialog: Mordor, interceptions (Sid Wilson) +#: ../src/intermission.c:1030 +msgid "" +"It's likely to run away if you engage it in battle, so try and do as much " +"damage to it as possible." +msgstr "" +"Het gaat er mogelijk vandoor als je het aanvalt, dus probeer zo veel " +"mogelijk schade te berokkenen." + +#. / Mission dialog: Mordor, Odeon (Phoebe Lexx) +#: ../src/intermission.c:1037 +msgid "" +"I've located my sister's ship currently in orbit around Odeon. She's " +"ignoring my hails though." +msgstr "" +"Ik heb het schip van zus gevonden. Het is momenteel rondom Odeon, maar ze " +"negeert me." + +#. / Mission dialog: Mordor, Odeon (Sid Wilson) +#: ../src/intermission.c:1041 +msgid "" +"Something's off here. She seems to be travelling freely with a WEAPCO group." +msgstr "Er is iets niet pluis - ze reist uit vrije wil met een WEAPCO-groep." + +#. / Mission dialog: Mordor, Odeon (Chris Bainfield) +#: ../src/intermission.c:1045 +msgid "Do you think she's turned traitor?" +msgstr "Denk je dat ze is overgelopen?" + +#. / Mission dialog: Mordor, Odeon (Phoebe Lexx) +#: ../src/intermission.c:1049 +msgid "No way. She hates WEAPCO with a passion." +msgstr "Onmogelijk - ze haat WEAPCO heel erg." + +#. / Mission dialog: Mordor, Odeon (Sid Wilson) +#: ../src/intermission.c:1053 +msgid "" +"She must be under some kind of mind control. I've heard of WEAPCO developing " +"a new \"AI training program\" recently. We'd better rescue her!" +msgstr "" +"Dan moet ze gehersenspoeld zijn. Ik heb gehoord dat WEAPCO een nieuw 'KI-" +"trainingsprogramma' heeft opgezet. We moeten haar redden!" + +#. / Mission dialog: Mordor, Fellon (Sid Wilson) +#: ../src/intermission.c:1060 +msgid "" +"A rebel group has organized a counter strike. If we can help them secure a " +"victory it will be a real boost to morale." +msgstr "" +"Een rebellengroep heeft een tegenaanval gepland. Als we ze kunnen helpen, " +"zou dat enorm helpen." + +#. / Mission dialog: Mordor, Fellon (Chris Bainfield) +#: ../src/intermission.c:1064 +msgid "Awesome! Let's do it!" +msgstr "Prima - aan de slag dan maar!" + +#. / Mission dialog: Mordor, Fellon (Sid Wilson) +#: ../src/intermission.c:1068 +msgid "Just make sure the rebel ships don't all get destroyed." +msgstr "Zorg er wel voor dat de rebellenvloot niet vernietigd wordt." + +#. / Mission dialog: Mordor, Sivedi (Sid Wilson) +#: ../src/intermission.c:1075 +msgid "" +"Seems like taking out that WEAPCO mining ship wasn't such a good idea. The " +"ore it collected is needed in weapons production." +msgstr "" +"Het ziet er naar uit dat het vernietigen van het WEAPCO-mijnschip geen goed " +"idee was. De verzamelde erts is nodig voor wapenproductie." + +#. / Mission dialog: Mordor, Sivedi (Chris Bainfield) +#: ../src/intermission.c:1079 +msgid "Damn! I guess that means I'll have to mine some myself, then, huh?" +msgstr "Drommels! In dat geval moet ik zelf maar gaan mijnen, of niet?" + +#. / Mission dialog: Mordor, Sivedi (Sid Wilson) +#: ../src/intermission.c:1083 +msgid "" +"Yes. Be careful, Chris. Your weapons weren't designed for that sort of work, " +"after all." +msgstr "" +"Ja, maar wees voorzichtig, Chris. Je wapens zijn niet ontworpen voor dat " +"soort werk." + +#. / Mission dialog: Mordor, Almartha (Chris Bainfield) +#: ../src/intermission.c:1090 +msgid "" +"Hey, Krass! I need you to help us out with something. Phoebe and Ursula are " +"taking out key WEAPCO plants. Can you help me create a diversion by wreaking " +"havoc a little bit away from that?" +msgstr "" +"Hé, Krass! Je moet ons helpen. Phoebe en Ursula zijn bezig WEAPCO-fabrieken " +"te vernietigen. Kun jij zorgen voor afleiding door verderop chaos te creëren?" + +#. / Mission dialog: Mordor, Almartha (Krass Tyler) +#: ../src/intermission.c:1094 +msgid "Sure, I can help you out, boy. But I'll be needing my fee..." +msgstr "Tuurlijk, knul. Maar daar staat wel een vergoeding tegenover..." + +#. / Mission dialog: Mordor, Poswic (Ursula Lexx) +#: ../src/intermission.c:1101 +msgid "" +"My memory is finally back. Here's something interesting: just before I was " +"captured, I found out that WEAPCO is transporting several important " +"executives to Poswic." +msgstr "" +"Mijn geheugen is terug! Net voordat ik gevangen werd genomen, vernam ik dat " +"WEAPCO belangrijke bazen vervoert naar Poswic." + +#. / Mission dialog: Mordor, Poswic (Sid Wilson) +#: ../src/intermission.c:1105 +msgid "" +"We can't let a rare opportunity like this slip through our fingers! I'll " +"need some cover so I can disable that ship." +msgstr "" +"We kunnen dit niet door onze vingers laten glijden! Bescherm me tijdens het " +"ontmantelen van het schip." + +#. / Mission dialog: Mordor, Poswic (Chris Bainfield) +#: ../src/intermission.c:1109 +msgid "I've got you covered, Sid!" +msgstr "Komt in orde, Sid!" + +#. / Mission dialog: Mordor, Ellesh (Chris Bainfield) +#: ../src/intermission.c:1116 +msgid "" +"Phoebe, I need you to keep an eye on things here. I'm going after that ship!" +msgstr "" +"Phoebe, jij moet hier de boel in de gaten houden. Ik ga achter dat schip aan!" + +#. / Mission dialog: Mordor, Ellesh (Phoebe Lexx) +#: ../src/intermission.c:1120 +msgid "Are you sure you can catch up to it?" +msgstr "Weet je zeker dat het je gaat lukken?" + +#. / Mission dialog: Mordor, Ellesh (Chris Bainfield) +#: ../src/intermission.c:1124 +msgid "" +"Absolutely. One thing that's really nice about the Firefly is its speed. " +"I'll see you in a bit!" +msgstr "100% - de Firefly is een snel schip. Tot straks!" + +#. / Mission dialog: Sol, Pluto/Neptune/Uranus (Sid Wilson) +#: ../src/intermission.c:1133 +msgid "" +"We've got to start from the outside and work our way in. That will give us " +"less chance of being flanked during the final operation." +msgstr "" +"We beginnen buitenaf en gaan langzaam naar binnen. Zo verkleinen we de kans " +"dat ze ons zien tijdens het laatste deel." + +#. / Mission dialog: Sol, Pluto/Neptune/Uranus (Phoebe Lexx) +#: ../src/intermission.c:1137 +msgid "Sounds like a plan, Sid!" +msgstr "Klinkt goed, Sid!" + +#. / Mission dialog: Sol, Pluto/Neptune/Uranus (Ursula Lexx) +#: ../src/intermission.c:1141 +msgid "Better safe than sorry, I guess." +msgstr "Het zekere voor het onzekere." + +#. / Mission dialog: Sol, Pluto/Neptune/Uranus (Chris Bainfield) +#: ../src/intermission.c:1145 +msgid "Boring, but I guess you're right, Sid, as usual." +msgstr "Saai, maar je hebt gelijk Sid. Zoals altijd." + +#. / Mission dialog: Sol, Saturn (Chris Bainfield) +#: ../src/intermission.c:1152 +msgid "" +"WEAPCO has set up a highly dangerous defense line between Saturn and Uranus. " +"We'll need to take it out." +msgstr "" +"WEAPCO heeft een gevaarlijke verdedigingslinie opgebouwd tussen Saturnus en " +"Uranus. Daar moeten we eerst vanaf zien te geraken." + +#. / Mission dialog: Sol, Saturn (Ursula Lexx) +#: ../src/intermission.c:1156 +msgid "What kind of defense system?" +msgstr "Wat voor soort verdedigingslinie?" + +#. / Mission dialog: Sol, Saturn (Chris Bainfield) +#: ../src/intermission.c:1160 +msgid "" +"Several mobile Energy Ray cannons, not unlike the weapon used by the Star " +"Killer back in Spirit." +msgstr "" +"Verschillende mobiele energiestraalkanonnen, zoals die van de Star Killer op " +"Spirit." + +#. / Mission dialog: Sol, Saturn (Phoebe Lexx) +#: ../src/intermission.c:1164 +msgid "Best check my ejection system, then!" +msgstr "Even de springstoel controleren!" + +#. / Mission dialog: Sol, Jupiter (Sid Wilson) +#: ../src/intermission.c:1171 +msgid "" +"While you were gone I picked up a distress call coming from around Jupiter." +msgstr "" +"Tijdens je afwezigheid heb ik een noodoproep ontvangen van bij Jupiter." + +#. / Mission dialog: Sol, Jupiter (Ursula Lexx) +#: ../src/intermission.c:1175 +msgid "Who would be sending out a distress call within Sol?" +msgstr "Wie stuurt er nu een noodoproep binnen Sol?" + +#. / Mission dialog: Sol, Jupiter (Chris Bainfield) +#: ../src/intermission.c:1179 +msgid "Let's check it out. Even if it's a trap, I think we can handle it." +msgstr "Dat gaan we zien. Als het een valstrik is, kunnen we het aan." + +#. / Mission dialog: Sol, Mars (Sid Wilson) +#: ../src/intermission.c:1186 +msgid "" +"Chris, we've got a small problem. WEAPCO has deployed a minefield in the " +"asteroid belt. We'll need you to clear a way through." +msgstr "" +"Chris, we hebben een klein probleem. WEAPCO heeft een mijnenveld gelegd in " +"de asteroïdengordel. Je moet ons een weg banen door het veld." + +#. / Mission dialog: Sol, Mars (Chris Bainfield) +#: ../src/intermission.c:1190 +msgid "Alright. I'll radio in once I've cleared a safe path." +msgstr "Okidoki. Ik laat weten zodra het veilig is." + +#. / Mission dialog: Sol, Earth (Chris Bainfield) +#: ../src/intermission.c:1197 +msgid "" +"Okay people, this is the big one. We go in fast and we go in hard. Don't " +"hold back and hit them with everything we've got!" +msgstr "" +"Oké, mensen, dit is de grote. We gaan snel en hard naar binnen. Hou je niet " +"in en raak ze met alles wat je hebt!" + +#. / Mission dialog: Sol, Earth (Sid Wilson) +#: ../src/intermission.c:1201 +msgid "We've come too far to turn back now. None of us better die out there!" +msgstr "" +"We kunnen nu niet meer terug, dus niemand van ons moet het loodje leggen!" + +#. / Mission dialog: Sol, Earth (Phoebe Lexx) +#: ../src/intermission.c:1205 +msgid "Right with you, Chris!" +msgstr "Ik ben bij je, Chris!" + +#. / Mission dialog: Sol, Earth (Ursula Lexx) +#: ../src/intermission.c:1209 +msgid "WEAPCO'll regret sticking probes into my head!" +msgstr "WEAPCO gaat spijt krijgen van wat ze me hebben aangedaan!" + +#. / Mission dialog: Sol, Venus (Chris Bainfield) +#: ../src/intermission.c:1216 +msgid "Kethlan has run off to Venus. I'm going after him." +msgstr "Kethlan is gevlucht naar Venus - ik ga achter hem aan." + +#. / Mission dialog: Sol, Venus (Sid Wilson) +#: ../src/intermission.c:1220 +msgid "" +"Be careful, Chris. We've won the war, but it would be a real shame if you " +"died now!" +msgstr "" +"Wees voorzichtig, Chris. We hebben de oorlog gewonnen, maar we willen je " +"niet kwijt!" + +#: ../src/intermission.c:1271 +msgid "++ OPTIONS ++" +msgstr "++ OPTIES ++" + +#: ../src/intermission.c:1280 ../src/intermission.c:1291 +#: ../src/intermission.c:1302 +msgid "ON" +msgstr "AAN" + +#: ../src/intermission.c:1281 ../src/intermission.c:1292 +#: ../src/intermission.c:1303 +msgid "OFF" +msgstr "UIT" + +#: ../src/intermission.c:1282 +msgid "SOUND" +msgstr "GELUID" + +#: ../src/intermission.c:1293 +msgid "MUSIC" +msgstr "MUZIEK" + +#: ../src/intermission.c:1304 +msgid "FULLSCREEN" +msgstr "BEELDVULLEND" + +#. / Retain "%s" as-is. It is replaced with the current system name. +#: ../src/intermission.c:1506 +#, c-format +msgid "System : %s" +msgstr "Stelsel: %s" + +#: ../src/intermission.c:1509 +msgid "Start Next Mission" +msgstr "Volgende misse starten" + +#: ../src/intermission.c:1510 +msgid "Go to Destination Planet" +msgstr "Ga naar bestemmingsplaneet" + +#: ../src/intermission.c:1511 +msgid "View System Map" +msgstr "Stelselmap tonen" + +#: ../src/intermission.c:1513 +msgid "Save Game" +msgstr "Spel opslaan" + +#: ../src/intermission.c:1514 +msgid "Upgrade FIREFLY" +msgstr "FIREFLY opwaarderen" + +#: ../src/intermission.c:1515 +msgid "Missions" +msgstr "Missies" + +#: ../src/intermission.c:1516 +msgid "Options" +msgstr "Opties" + +#: ../src/intermission.c:1517 +msgid "Exit to Title Screen" +msgstr "Terug naar beginscherm" + +#. / Retain "%s" as-is. It is replaced with the name of the planet +#. / the player is currently stationed on. +#. / Retain "%s" as-is. It is replaced with the name of the planet +#. / the player's destination is currently set to. +#: ../src/intermission.c:1521 ../src/intermission.c:1705 +#, c-format +msgid "Stationed At: %s" +msgstr "Gestationeerd op: %s" + +#. / Retain "%s" as-is. It is replaced with the name of the planet +#. / the player's destination is currently set to. +#: ../src/intermission.c:1528 ../src/intermission.c:1643 +#, c-format +msgid "Destination: %s" +msgstr "Bestemming: %s" + +#: ../src/intermission.c:1532 +msgid "Destination: None" +msgstr "Bestemming: geen" + +#. / Mission objective +#: ../src/mission.c:96 +msgid "Destroy all remaining WEAPCO fighters" +msgstr "Vernietig alle resterende WEAPCO-eenheden" + +#. / Mission objective (start) +#: ../src/mission.c:101 +msgid "Escape from WEAPCO Pursuit" +msgstr "Loos de WEAPCO-achtervolgers" + +#. / Mission objective (Hail) +#: ../src/mission.c:107 +msgid "Collect $500 to pay Mercenary for FIREFLY" +msgstr "Verzamel $500 om de FIREFLY van de huurling te kopen" + +#. / Mission objective (Ceradse) +#: ../src/mission.c:121 +msgid "Collect 6 Cargo Pods" +msgstr "Verzamel 6 cargocapsules" + +#. / Mission objective (Ceradse) +#: ../src/mission.c:128 +msgid "Do not destroy *ANY* Cargo Pods" +msgstr "Vernietig *GEEN* cargocapsules" + +#. / Mission objective (Hinstag) +#: ../src/mission.c:142 +msgid "Destroy 5 WEAPCO Missile Boats" +msgstr "Vernietig 5 WEAPCO-raketschepen" + +#. / Mission objective (Joldar) +#: ../src/mission.c:156 +msgid "Destroy 9 WEAPCO Mine-droppers" +msgstr "Vernietig 9 WEAPCO-mijnenleggers" + +#. / Mission objective (Moebo) +#: ../src/mission.c:170 +msgid "Destroy WEAPCO Frigate" +msgstr "Vernietig het WEAPCO-schip" + +#. / Mission objective (Nerod) +#: ../src/mission.c:182 +msgid "Rescue Phoebe Lexx" +msgstr "Bevrijd Phoebe Lexx" + +#. / Mission objective (Nerod) +#: ../src/mission.c:189 +msgid "Do not allow Phoebe to be killed" +msgstr "Laat Phoebe niet omkomen" + +#. / Mission objective (Allez) +#: ../src/mission.c:212 +msgid "Do not allow supply craft to be destroyed" +msgstr "Verdedig het bevoorradingsvaartuig" + +#. / Mission objective (Urusor) +#: ../src/mission.c:226 +msgid "Disable five WEAPCO supply craft" +msgstr "Ontmantel 5 WEAPCO-bevoorradingsschepen" + +#. / Mission objective (Urusor) +#: ../src/mission.c:237 +msgid "Protect supply craft AND Sid Wilson" +msgstr "Verdedig het bevoorradingsvaartuig EN Sid Wilson" + +#. / Mission objective (Dorim) +#: ../src/mission.c:247 +msgid "Locate doctor's escape pod" +msgstr "Lokaliseer de reddingscapsule van de dokter" + +#. / Mission objective (Dorim) +#: ../src/mission.c:254 +msgid "Do not destroy doctor's escape pod" +msgstr "Verdedig de reddingscapsule van de dokter" + +#. / Mission objective (Dorim) +#: ../src/mission.c:261 +msgid "Collect 10 pieces of Ore" +msgstr "Verzamel 10 erts" + +#. / Mission objective (Elamale) +#: ../src/mission.c:274 +msgid "Destroy WEAPCO ore mining craft" +msgstr "Vernietig het WEAPCO-mijnschip" + +#. / Mission objective (Elamale) +#: ../src/mission.c:281 +msgid "Save present slaves" +msgstr "Bevrijd de slaven" + +#. / Mission objective (Elamale) +#: ../src/mission.c:287 +msgid "Battle Kline" +msgstr "Versla Kline" + +#. / Mission objective (Odeon) +#: ../src/mission.c:297 +msgid "Destroy Ursula's ship" +msgstr "Vernietig Ursula's schip" + +#. / Mission objective (Odeon) +#: ../src/mission.c:304 +msgid "Capture Ursula's escape pod" +msgstr "Onderschep Ursula's reddingscapsule" + +#. / Mission objective (Odeon) +#: ../src/mission.c:311 +msgid "Do not kill Ursula" +msgstr "Laat Ursula niet omkomen" + +#. / Mission objective (Fellon) +#: ../src/mission.c:325 +msgid "Assist attack on WEAPCO ore mining craft" +msgstr "Begeleid de aanval op het WEAPCO-mijnschip" + +#. / Mission objective (Fellon) +#: ../src/mission.c:332 +msgid "At least 1 rebel craft must survive" +msgstr "Zorg dat minimaal 1 rebellenschip intact blijft" + +#. / Mission objective (Sivedi) +#: ../src/mission.c:346 +msgid "Collect 25 pieces of Ore" +msgstr "Verzamel 25 erts" + +#. / Mission objective (Sivedi) +#: ../src/mission.c:353 +msgid "Collect 50 pieces of Ore" +msgstr "Verzamel 50 erts" + +#. / Mission objective (Almartha) +#: ../src/mission.c:363 +msgid "Collect $2000 to pay mercenary" +msgstr "Verzamel $2000 om de huurling af te betalen" + +#. / Mission objective (Poswic) +#: ../src/mission.c:377 +msgid "Destroy escorts" +msgstr "Vernietig de escortschepen" + +#. / Mission objective (Poswic) +#: ../src/mission.c:384 +msgid "Disable executive transport" +msgstr "Ontmantel het leidersschip" + +#. / Mission objective (Ellesh) +#: ../src/mission.c:398 +msgid "Destroy executive transport" +msgstr "Vernietig het leidersschip" + +#. / Mission objective (Pluto, Neptune, Uranus) +#: ../src/mission.c:408 +msgid "Destroy planetary guardian" +msgstr "Vernietig de planeetbewaking" + +#. / Mission objective (Saturn) +#: ../src/mission.c:457 +msgid "Destroy outer defence systems" +msgstr "Vernietig de buitenste verdedigingslinies" + +#. / Mission objective (Jupiter) +#: ../src/mission.c:476 +msgid "Defeat Krass Tyler" +msgstr "Versla Krass Tyler" + +#. / Mission objective (Jupiter) +#: ../src/mission.c:483 +msgid "Destroy Krass' support group" +msgstr "Vernietig Krass' ondersteuningsgroep" + +#. / Mission objective (Earth) +#: ../src/mission.c:505 +msgid "Destroy WEAPCO frontline forces" +msgstr "Vernietig de WEAPCO-frontlinietroepen" + +#: ../src/mission.c:610 ../src/mission.c:984 +msgid "*** All Primary Objectives Completed ***" +msgstr "*** Alle hoofddoelen zijn behaald ***" + +#. / Dialog (Sid Wilson) +#. / Used when Sid disables the last target in the Urusor mission. +#: ../src/mission.c:628 +msgid "All vessels disabled!" +msgstr "Alle vaartuigen zijn ontmanteld!" + +#. / Info line messages for remaining cash to collect +#. / This is a "\n"-separated list of possible choices to make. Please feel free +#. / to add as many as you like. Each entry must have one instance of "%d", which +#. / is replaced with the number remaining. +#: ../src/mission.c:645 +#, c-format +msgid "" +"Collect $%d more...\n" +"$%d more to collect...\n" +"Just $%d more needed...\n" +"Collect just $%d more..." +msgid_plural "" +"Collect $%d more...\n" +"$%d more to collect...\n" +"$%d more needed..." +msgstr[0] "" +"Verzamel nog $%d...\n" +"Nog $%d te gaan...\n" +"Nog maar $%d te gaan...\n" +"Nog maar $%d te gaan..." +msgstr[1] "" +"Verzamel nog $%d...\n" +"Nog $%d te gaan...\n" +"Nog $%d benodigd..." + +#. / Info line messages for remaining cargo pods to collect +#. / This is a "\n"-separated list of possible choices to make. Please feel free +#. / to add as many as you like. Each entry must have one instance of "%d", which +#. / is replaced with the number remaining. +#: ../src/mission.c:662 +#, c-format +msgid "" +"Collect %d more cargo pod...\n" +"%d more cargo pod to collect...\n" +"%d more cargo pod needed...\n" +"Collect just %d more cargo pod...\n" +"Only %d cargo pod left to collect..." +msgid_plural "" +"Collect %d more cargo pods...\n" +"%d more cargo pods to collect...\n" +"%d more cargo pods needed...\n" +"Collect %d remaining cargo pods..." +msgstr[0] "" +"Verzamel nog %d cargocapsule...\n" +"Nog %d cargocapsule te gaan...\n" +"Nog maar %d cargocapsule te gaan..." +msgstr[1] "" +"Verzamel nog %d cargocapsules...\n" +"Nog %d cargocapsules te gaan...\n" +"Nog maar %d cargocapsules te gaan...\n" +"Verzamel de %d resterende reddingscapsules..." + +#. / Info line messages for remaining ore to collect +#. / This is a "\n"-separated list of possible choices to make. Please feel free +#. / to add as many as you like. Each entry must have one instance of "%d", which +#. / is replaced with the number remaining. +#: ../src/mission.c:681 +#, c-format +msgid "" +"Collect %d more piece of ore...\n" +"%d more piece of ore to collect...\n" +"%d more piece of ore needed...\n" +"Collect just %d more piece..." +msgid_plural "" +"Collect %d more pieces of ore...\n" +"%d more pieces of ore to collect...\n" +"%d more pieces of ore needed..." +msgstr[0] "" +"Verzamel nog %d erts...\n" +"Nog %d erts te gaan...\n" +"Nog maar %d erts te gaan..." +msgstr[1] "" +"Verzamel nog %d erts...\n" +"Nog %d erts te gaan...\n" +"Nog maar %d erts te gaan..." + +#: ../src/mission.c:699 +msgid "Cargo pod destroyed!" +msgstr "De cargocapsule is vernietigd!" + +#. Get lectured by Sid +#. / Dialog (Sid Wilson) +#. / Used when a cargo pod is destroyed in the Ceradse mission. +#: ../src/mission.c:703 +msgid "" +"Chris, we needed that pod! I told you that we couldn't afford to lose a " +"single one!" +msgstr "" +"Chris, we hebben die capsule nodig! Ik zei toch dat we er niet nóg één " +"konden kwijtraken?!" + +#: ../src/mission.c:706 +msgid "Escape Pod lost!" +msgstr "Reddingscapsule verloren!" + +#. / Dialog (Phoebe Lexx) +#. / Used when Ursula is lost in the Odeon mission. +#: ../src/mission.c:711 +msgid "No... Ursula..." +msgstr "Nee... Ursula..." + +#. / Dialog (Sid Wilson) +#. / Used when Phoebe is killed in the Nerod mission. +#: ../src/mission.c:725 +msgid "Dammit, Chris! We just lost her!" +msgstr "Kanonne, Chris! We zijn haar kwijt!" + +#. / Dialog (friendly transport from Eyananth, Allez mission) +#. / Used when the friendly transport in the Allez mission is destroyed. +#: ../src/mission.c:730 +msgid "No no no no no! Hull bre-..." +msgstr "Nee, nee, nee, nee, nee! De romp is..." + +#. / Dialog (Sid Wilson) +#. / Used when a target transport is destroyed in the Urusor mission. +#: ../src/mission.c:735 +msgid "Chris, we've got to disable them, not destroy them!!" +msgstr "Chris, we moeten ze ontmantelen, niet vernietigen!!" + +#. / Info line messages for remaining enemies to destroy +#. / This is a "\n"-separated list of possible choices to make. Please feel free +#. / to add as many as you like. Each entry must have one instance of "%d", which +#. / is replaced with the number remaining. +#: ../src/mission.c:748 +#, c-format +msgid "" +"Destroy %d more target...\n" +"%d more target to destroy...\n" +"%d target remains...\n" +"Destroy just %d more...\n" +"Only %d target left...\n" +"Destroy %d last target..." +msgid_plural "" +"Destroy %d more targets...\n" +"%d more targets to destroy...\n" +"%d targets remain...\n" +"Destroy %d remaining targets..." +msgstr[0] "" +"Vernietig nog %d doel...\n" +"Nog %d doel te gaan...\n" +"Er is nog %d doel...\n" +"Nog maar %d doel te gaan...\n" +"Vernietig het laatste doel..." +msgstr[1] "" +"Vernietig nog %d doelen...\n" +"Nog %d doelen te gaan...\n" +"Er zijn nog %d doelen...\n" +"Nog maar %d doelen te gaan...\n" +"Vernietig de laatste %d doelen..." + +#. / Info line messages for remaining enemies to disable +#. / This is a "\n"-separated list of possible choices to make. Please feel free +#. / to add as many as you like. Each entry must have one instance of "%d", which +#. / is replaced with the number remaining. +#: ../src/mission.c:769 +#, c-format +msgid "" +"Disable %d more target...\n" +"%d more target to disable...\n" +"Disable just %d more...\n" +"Disable %d last target..." +msgid_plural "" +"Disable %d more targets...\n" +"%d more targets to disable...\n" +"Disable %d remaining targets..." +msgstr[0] "" +"Ontmantel nog %d doel...\n" +"Nog %d doel te gaan...\n" +"Er is nog %d doel...\n" +"Nog maar %d doel te gaan...\n" +"Ontmantel het laatste doel..." +msgstr[1] "" +"Ontmantel nog %d doelen...\n" +"Nog %d doelen te gaan...\n" +"Er zijn nog %d doelen...\n" +"Nog maar %d doelen te gaan...\n" +"Ontmantel de laatste doelen..." + +#: ../src/mission.c:802 +msgid "Sid has been killed!" +msgstr "Sid is omgekomen!" + +#. / Dialog (Sid Wilson) +#. / Used when Sid is killed. +#. / Translation note: the end is Sid trying to say "FUCK" and getting cut +#. / out because of the failure of his communication system, so please +#. / translate that to the start of a similar curse word in the target +#. / language being similarly cut out. +#: ../src/mission.c:810 +msgid "HULL BREACHED! SYSTEMS FAILING! F-..." +msgstr "DE ROMP IS BESCHADIGD! HET SYSTEEM LIGT PLAT! FU-..." + +#: ../src/mission.c:856 +msgid "*** Slaves Rescued - Mission Completed ***" +msgstr "*** De slaven zijn bevrijd - MISSIE VOLBRACHT ***" + +#. / Dialog (Chris Bainfield) +#. / Used when you rescue enough slaves for the Eyananth slave rescue mission. +#: ../src/mission.c:860 +msgid "" +"Alright, I think I've rescued enough slaves to stir up some trouble for " +"WEAPCO!" +msgstr "Oké, ik denk dan ik genoeg slaven bevrijd heb om chaos te creëren!" + +#. / Info line messages for remaining slaves to rescue +#. / This is a "\n"-separated list of possible choices to make. Please feel free +#. / to add as many as you like. Each entry must have one instance of "%d", which +#. / is replaced with the number remaining. +#: ../src/mission.c:870 +#, c-format +msgid "" +"Rescue %d more slave...\n" +"Rescue at least %d more slave...\n" +"At least %d more slave to rescue...\n" +"At least %d more rescued slave needed..." +msgid_plural "" +"Rescue %d more slaves...\n" +"Rescue at least %d more slaves...\n" +"At least %d more slaves to rescue...\n" +"At least %d more rescued slaves needed..." +msgstr[0] "" +"Bevrijd nog %d slaaf...\n" +"Nog %d slaaf te gaan...\n" +"Bevrijd nog minimaal %d slaaf..." +msgstr[1] "" +"Bevrijd nog %d slaven...\n" +"Nog %d slaven te gaan...\n" +"Bevrijd nog minimaal %d slaven..." + +#: ../src/mission.c:888 +msgid "*** Experimental Fighter Destroyed - Mission Completed ***" +msgstr "" +"*** Het experimentele gevechtsvaartuig is vernietigd - MISSIE VOLBRACHT ***" + +#. / Dialog (Chris Bainfield) +#. / Used when the Mordor cloak ship is destroyed. +#: ../src/mission.c:892 +msgid "That's one less surprise that WEAPCO can spring on us!" +msgstr "WEAPCO kan ons nu minder verrassen..." + +#: ../src/mission.c:971 +msgid "*** Primary Objective Completed ***" +msgstr "*** Het hoofddoel is behaald ***" + +#: ../src/mission.c:973 +msgid ">>> Primary Objective Failed <<<" +msgstr ">>> Het hoofddoel is niet behaald <<<" + +#: ../src/mission.c:980 +msgid "Emergency warp drive activated. Press button to engage." +msgstr "De noodwarpaandrijving is geactiveerd. Druk op de knop." + +#: ../src/mission.c:986 +msgid "*** Interception Destroyed ***" +msgstr "*** De onderschepping is vernietigd ***" + +#. / Dialog (Chris Bainfield) +#. / Used when the Earth mission is completed. +#: ../src/mission.c:1006 +msgid "" +"You guys stay here and keep things under control. I'm going after Kethlan!" +msgstr "Blijf hier en hou alles onder controle, dan ga ik achter Kethlan aan!" + +#: ../src/mission.c:1015 +msgid "*** Secondary Objective Completed ***" +msgstr "*** Het secundaire doel is behaald ***" + +#: ../src/mission.c:1020 +msgid "*** All Secondary Objectives Completed ***" +msgstr "*** Alle secundaire doelen zijn behaald ***" + +#: ../src/mission.c:1035 +msgid ">>> MISSION FAILED <<<" +msgstr ">>> DE MISSIE IS NIET VOLBRACHT <<<" + +#: ../src/mission.c:1041 +msgid ">>> Secondary Objective Failed <<<" +msgstr ">>> Het secundaire doel is niet behaald <<<" + +#: ../src/mission.c:1120 +msgid "Primary Objectives" +msgstr "Hoofddoelen" + +#: ../src/mission.c:1134 +msgid "Secondary Objectives" +msgstr "Secundaire doelen" + +#: ../src/mission.c:1148 +msgid "Additional Information" +msgstr "Aanvullende informatie" + +#. / Used to indicate the player's shield meter in the HUD. +#: ../src/mission.c:1165 +msgid "Shield" +msgstr "Schild" + +#: ../src/mission.c:1167 +msgid "Target" +msgstr "Doel" + +#: ../src/mission.c:1168 +msgid "Sid" +msgstr "Sid" + +#: ../src/mission.c:1169 +msgid "Phoebe" +msgstr "Phoebe" + +#: ../src/mission.c:1170 +msgid "Kline" +msgstr "Kline" + +#. / "%d" must be retained. It is replaced with the mission required +#. / survival time in minutes. +#: ../src/mission.c:1198 +#, c-format +msgid "SURVIVAL FOR %d minute" +msgid_plural "SURVIVAL FOR %d minutes" +msgstr[0] "OVERLEEF %d minuut" +msgstr[1] "OVERLEEF %d minuten" + +#. / "%d" must be retained. It is replaced with the mission time +#. / limit in minutes. +#: ../src/mission.c:1207 +#, c-format +msgid "TIME LIMIT: %d minute" +msgid_plural "TIME LIMIT: %d minutes" +msgstr[0] "TIJDSLIMIET: %d minuut" +msgstr[1] "TIJDSLIMIET: %d minuten" + +#: ../src/mission.c:1223 +msgid "Phoebe Lexx will not be present" +msgstr "Phoebe Lexx gaat niet mee" + +#: ../src/mission.c:1225 +msgid "Ursula Lexx will not be present" +msgstr "Ursula Lexx gaat niet mee" + +#: ../src/mission.c:1232 +msgid "Sid Wilson will join you on this mission" +msgstr "Sid Wilson gaat met je mee" + +#: ../src/mission.c:1320 ../src/mission.c:1340 +msgid "COMPLETED" +msgstr "VOLBRACHT" + +#: ../src/mission.c:1325 ../src/mission.c:1345 +msgid "FAILED" +msgstr "NIET VOLBRACHT" + +#. / "%d" must be retained. It is replaced with the money earned +#. / from the shield bonus. +#: ../src/mission.c:1356 +#, c-format +msgid "Shield Bonus: $%d" +msgstr "Schildbonus: $%d" + +#. / "%02ld" sequences (which represent minutes and seconds, +#. / respectively) must remain and stay in the same order relative +#. / to each other. The ":"s between them can be changed to other +#. / characters if desired, e.g. this would be acceptable: +#. / +#. / "Mission time: %02ldm %02lds" +#. / +#. / If you are familiar with printf formatting, you may also change +#. / the formatting as long as the "ld" type remains. For example, +#. / the "%02ld" sequences may be changed to "%ld" if you wish to +#. / not force two digits to be filled in (e.g. to render the number +#. / 3 as "3" instead of "03"). +#: ../src/mission.c:1372 +#, c-format +msgid "Mission Time: %02ld:%02ld" +msgstr "Missietijd: %02ld:%02ld" + +#: ../src/save.c:77 +msgid "AUTOSAVE" +msgstr "AUTOMATISCH OPSLAAN" + +#: ../src/save.c:94 ../src/save.c:108 +msgid "Corrupt Game Data" +msgstr "Beschadigde spelgegevens" + +#. / Used for empty save slots. +#: ../src/save.c:127 +msgid "AUTOSAVE (Empty)" +msgstr "AUTOMATISCH OPSLAAN (leeg)" + +#: ../src/save.c:127 +msgid "Empty" +msgstr "Leeg" + +#: ../src/save.c:343 +msgid "*** HELP ***" +msgstr "*** HULP ***" + +#: ../src/save.c:355 +msgid "SAVE" +msgstr "OPSLAAN" + +#: ../src/save.c:356 +msgid "CANCEL" +msgstr "ANNULEREN" + +#: ../src/save.c:357 +msgid "DELETE" +msgstr "VERWIJDEREN" + +#: ../src/save.c:358 +msgid "SAVE will save the game" +msgstr "Met OPSLAAN sla je het spel op" + +#: ../src/save.c:359 +msgid "CANCEL will unselect that slot" +msgstr "Met ANNULEREN deselecteer je het slot" + +#: ../src/save.c:360 +msgid "DELETE will remove the save" +msgstr "Met VERWIJDEREN verwijder je het opgeslagen spel" + +#: ../src/save.c:363 +msgid "First click a Save game slot to use" +msgstr "Klik eerst op een slot" + +#: ../src/save.c:366 +msgid "Game Saved" +msgstr "Het spel is opgeslagen" + +#: ../src/save.c:369 +msgid "Save Deleted" +msgstr "Het opgeslagen spel is verwijderd" + +#: ../src/shop.c:57 +msgid "Secondary Weapon" +msgstr "Secundair wapen" + +#. / Shop info: current secondary: none +#: ../src/shop.c:63 +msgid "Uninstalled" +msgstr "Niet aangebracht" + +#. / Shop info: current secondary: rockets +#: ../src/shop.c:67 +msgid "Rockets" +msgstr "Raketten" + +#. / Shop info: current secondary: double rockets +#: ../src/shop.c:71 +msgid "Dbl Rockets" +msgstr "Dubbele raketten" + +#. / Shop info: current secondary: micro rockets +#: ../src/shop.c:75 +msgid "Micro Rockets" +msgstr "Microraketten" + +#. / Shop info: current secondary: laser +#: ../src/shop.c:79 +msgid "Laser" +msgstr "Laser" + +#. / Shop info: current secondary: charger +#: ../src/shop.c:83 +msgid "Charger" +msgstr "Oplader" + +#. / Shop info: current secondary: homing missile +#: ../src/shop.c:87 +msgid "Homing Missile" +msgstr "Doelzoekende raket" + +#. / Shop info: current secondary: double homing missiles +#: ../src/shop.c:91 +msgid "Dbl Homing Missiles" +msgstr "Dubbele doelzoekende raketten" + +#. / Shop info: current secondary: micro homing missiles +#: ../src/shop.c:95 +msgid "Mcr Homing Missiles" +msgstr "Doelzoekende microraketten" + +#. / Retain "%d" as-is. It is replaced with the rocket capacity of the Firefly. +#: ../src/shop.c:105 +#, c-format +msgid "Capacity : %d" +msgstr "Capaciteit: %d" + +#: ../src/shop.c:286 +msgid "Primary Weapon" +msgstr "Hoofdwapen" + +#. / Shop info: min plasma output +#. / Retain "%d" as-is. It is replaced with the min plasma output. +#: ../src/shop.c:289 +#, c-format +msgid "Cannons: %d" +msgstr "Kanonnen: %d" + +#. / Shop info: min plasma damage +#. / Retain "%d" as-is. It is replaced with the min plasma damage. +#: ../src/shop.c:293 +#, c-format +msgid "Power: Stage %d" +msgstr "Kracht: niveau %d" + +#. / Shop info: min plasma rate +#. / Retain "%d" as-is. It is replaced with the min plasma cooling. +#: ../src/shop.c:298 +#, c-format +msgid "Cooling: Stage %d" +msgstr "Afkoeling: niveau %d" + +#: ../src/shop.c:302 +msgid "Powerup Weapon" +msgstr "Bonuswapen" + +#. / Shop info: max plasma output +#. / Retain "%d" as-is. It is replaced with the max plasma output. +#: ../src/shop.c:305 +#, c-format +msgid "Splitter: Stage %d" +msgstr "Splitter: niveau %d" + +#. / Shop info: max plasma damage +#. / Retain "%d" as-is. It is replaced with the max plasma damage. +#: ../src/shop.c:310 +#, c-format +msgid "Condensor: Stage %d" +msgstr "Condensator: niveau %d" + +#. / Shop info: max plasma rate +#. / Retain "%d" as-is. It is replaced with the max plasma cooling. +#: ../src/shop.c:315 +#, c-format +msgid "L.Nitrogen: Stage %d" +msgstr "Vlb. stikstof: niveau %d" + +#. / Shop info: max plasma ammo +#. / Retain "%d" as-is. It is replaced with the Firefly's plasma ammo capacity. +#: ../src/shop.c:320 +#, c-format +msgid "Capacity: %d" +msgstr "Capaciteit: %d" + +#: ../src/shop.c:329 +msgid "Temporary Weapons" +msgstr "Tijdelijke wapens" + +#: ../src/shop.c:330 +msgid "Ammo and Storage" +msgstr "Munitie en opslag" + +#: ../src/shop.c:332 +msgid "Primary Weapons" +msgstr "Hoofdwapens" + +#: ../src/shop.c:334 +msgid "Secondary Weapons" +msgstr "Secundaire wapens" + +#. / Retain "%d" as-is. It is replaced with the Firefly's max shield. +#: ../src/shop.c:350 +#, c-format +msgid "Shield: %d" +msgstr "Schild: %d" + +#. / Retain "%.3d". It is replaced with the ship's current number of plasma cells. +#. / "%.3d" can be changed to "%d" if you wish to not fill in space with zeroes, +#. / e.g. render the number 5 as "5" rather than "005". +#: ../src/shop.c:358 +#, c-format +msgid "Plasma Cells: %.3d" +msgstr "Plasmacellen: %.3d" + +#: ../src/shop.c:369 +msgid "Information" +msgstr "Informatie" + +#. / For when the player attempts to buy something they can't afford. +#: ../src/shop.c:377 +msgid "You don't have enough money" +msgstr "Je hebt niet genoeg geld" + +#. / For when the player attempts an upgrade beyond the maximum (line 1 of 2). +#: ../src/shop.c:381 +msgid "Cannot upgrade ship" +msgstr "Het schip kan niet worden opgewaardeerd" + +#. / For when the player attempts an upgrade beyond the maximum (line 2 of 2). +#: ../src/shop.c:384 +msgid "Hardware capacity has been reached" +msgstr "De hardwarecapaciteit is bereikt" + +#. / For when the player attempts to buy more ammo than the ship can hold. +#: ../src/shop.c:388 +msgid "Ammunition limit reached" +msgstr "Het munitielimiet is bereikt" + +#. / For when the player attempts to sell an item they aren't allowed to sell. +#: ../src/shop.c:392 +msgid "You cannot sell that item" +msgstr "Je kunt dit item niet verkopen" + +#. / For when the player attempts to sell an item they don't have any of. +#: ../src/shop.c:396 +msgid "Nothing to sell" +msgstr "Er is niks om te verkopen" + +#. / For when the player attempts to buy rockets or rocket capacity +#. / while secondary weapon is either laser or charge cannon. +#: ../src/shop.c:401 +msgid "Rockets cannot be bought for Laser or Charger Cannon" +msgstr "Raketten kunnen niet worden aangeschaft voor lasers of oplaadkanonnen" + +#. / For when the player attempts to buy a weapon they already have. +#: ../src/shop.c:405 +msgid "You already have that weapon" +msgstr "Je beschikt al over dit wapen" + +#. / For when the player attempts to increase rocket capacity beyond +#. / what is allowed for the weapon (used for homing missiles). +#: ../src/shop.c:410 +msgid "This weapon's ammo limit has been reached" +msgstr "Het munitielimiet van dit wapen is bereikt" + +#. / Used to put a shop item's name next to its price. +#. / "%s" is replaced with the item name, and "%d" is replaced +#. / with the item price. +#: ../src/shop.c:418 +#, c-format +msgid "%s ($%d)" +msgstr "%s ($%d)" + +#. / Used for shop items that cannot be bought. +#. / "%s" is replaced with the item name. +#: ../src/shop.c:426 +#, c-format +msgid "%s (N/A)" +msgstr "%s (n/b)" + +#. ----------- Temporary Items ----------- +#. Overwritten later +#: ../src/shop.c:441 +msgid "Plasma Channel Splitter" +msgstr "Plasma-kanaalsplitter" + +#. / Shop item description: Plasma Channel Splitter (PLASMA_MAX_OUTPUT) +#: ../src/shop.c:443 +msgid "Improves poweredup plasma output" +msgstr "Verbetert de bonusplasma-uitvoer" + +#. Overwritten later +#: ../src/shop.c:447 +msgid "Plasma Capacity Condensor" +msgstr "Plasma-capaciteitcondensator" + +#. / Shop item description: Plasma Capacity Condensor (PLASMA_MAX_DAMAGE) +#: ../src/shop.c:449 +msgid "Increases poweredup plasma damage" +msgstr "Verhoogt de plasmaschade" + +#. Overwritten later +#: ../src/shop.c:453 +msgid "Liquid Nitrogen Capsules" +msgstr "Vloeibarestikstofcapsules" + +#. / Shop item description: Liquid Nitrogen Capsules (PLASMA_MAX_RATE) +#: ../src/shop.c:455 +msgid "Increases plasma firing rate" +msgstr "Verhoogt de plasma-afvuursnelheid" + +#: ../src/shop.c:463 +msgid "Plasma Cells" +msgstr "Plasmacellen" + +#. / Shop item description: Plasma Cells +#: ../src/shop.c:465 +msgid "Plasma ammunition (10 cells each)" +msgstr "Plasmamunitie (10 cellen)" + +#: ../src/shop.c:473 +msgid "Rocket Ammo" +msgstr "Raketmunitie" + +#. / Shop item description: Rocket Ammo +#: ../src/shop.c:475 +msgid "High velocity dumb fire rocket" +msgstr "Hogesnelheidsraket" + +#. ----------- Permanent Items ----------- +#. Overwritten later +#: ../src/shop.c:481 +msgid "Additional Plasma Cannon" +msgstr "Aanvullend plasmakanon" + +#. / Shop item description: Additional Plasma Cannon (PLASMA_MIN_OUTPUT) +#: ../src/shop.c:483 +msgid "Adds an extra plasma cannon to the Firefly" +msgstr "Voegt een extra plasmakanon toe aan de Firefly" + +#. Overwritten later +#: ../src/shop.c:487 +msgid "Plasma Power Booster" +msgstr "Plasma-krachtbooster" + +#. / Shop item description: Plasma Power Booster (PLASMA_MIN_DAMAGE) +#: ../src/shop.c:489 +msgid "Increases power of plasma shots" +msgstr "Verhoogt de kracht van plasmacellen" + +#. Overwritten later +#: ../src/shop.c:493 +msgid "Plasma Cooling Booster" +msgstr "Plasma-afkoelbooster" + +#. / Shop item description: Plasma Cooling Booster (PLASMA_MIN_RATE) +#: ../src/shop.c:495 +msgid "Permanently increases firing rate" +msgstr "Verhoogt de afvuursnelheid" + +#. ----------- Ammo Items -------------- +#. Overwritten later +#: ../src/shop.c:501 +msgid "Plasma Compressor" +msgstr "Plasmacompressor" + +#. / Shop item description: Plasma Compressor (PLASMA_MAX_AMMO) +#: ../src/shop.c:503 +msgid "Increases plasma ammo capacity" +msgstr "Verhoogt de plasma-munitiecapaciteit" + +#. Overwritten later +#: ../src/shop.c:507 +msgid "Rocket Pod" +msgstr "Raketcapsule" + +#. / Shop item description: Rocket Pod (ROCKET_MAX_AMMO) +#: ../src/shop.c:509 +msgid "Allows for an additional 5 rockets to be carried" +msgstr "Voegt 5 aanvullende raketsloten toe" + +#: ../src/shop.c:515 +msgid "Dual Rocket Launcher" +msgstr "Dubbele raketwerper" + +#. / Shop item description: Dual Rocket Launcher +#: ../src/shop.c:517 +msgid "Launches two rockets at once" +msgstr "Vuurt twee raketten tegelijk af" + +#: ../src/shop.c:521 +msgid "Micro Rocket Launcher" +msgstr "Microraketwerper" + +#. / Shop item description: Micro Rocket Launcher +#: ../src/shop.c:523 +msgid "Launches several less powerful rockets at once" +msgstr "Vuurt verschillende kleine raketten tegelijk af" + +#: ../src/shop.c:527 +msgid "Laser Cannon" +msgstr "Laserkanon" + +#. / Shop item description: Laser Cannon +#: ../src/shop.c:529 +msgid "Fires a continuous stream of energy particles" +msgstr "Vuurt een constante stroom energiedeeltjes af" + +#: ../src/shop.c:533 +msgid "Homing Missile Launcher" +msgstr "Doelzoekenderaketwerper" + +#. / Shop item description: Homing Missile Launcher +#. / %i must be retained. It is replaced by the maximum missile +#. / capacity of the weapon. +#: ../src/shop.c:537 +#, c-format +msgid "Fires homing missile (max %i missiles)" +msgstr "Vuurt een doelzoekende raket af (max. %i raketten)" + +#: ../src/shop.c:541 +msgid "Charge Cannon" +msgstr "Oplaadkanon" + +#. / Shop item description: Charge Cannon +#: ../src/shop.c:543 +msgid "Compacts plasma into clusters for greater damage" +msgstr "Verdeelt plasma in clusters om meer schade te berokkenen" + +#: ../src/shop.c:547 +msgid "Dual Homing Missile Launcher" +msgstr "Dubbele doelzoekenderaketwerper" + +#. / Shop item description: Dual Homing Missile Launcher +#. / %i must be retained. It is replaced by the maximum missile +#. / capacity of the weapon. +#: ../src/shop.c:551 +#, c-format +msgid "Fires two homing missiles (max %i missiles)" +msgstr "Vuurt twee doelzoekende raketten tegelijk af (max. %i raketten)" + +#: ../src/shop.c:555 +msgid "Micro Homing Missile Launcher" +msgstr "Micro-doelzoekenderaketwerper" + +#. / Shop item description: Micro Homing Missile Launcher +#. / %i must be retained. It is replaced by the maximum missile +#. / capacity of the weapon. +#: ../src/shop.c:559 +#, c-format +msgid "Fires several small homing missiles (max %i missiles)" +msgstr "" +"Vuurt verschillende doelzoekende raketten tegelijk af (max. %i raketten)" + +#: ../src/title.c:93 +msgid "START GAME" +msgstr "SPEL STARTEN" + +#. / Difficulty menu option. +#. / Retain "%s" as-is. It is replaced with the difficulty chosen. +#: ../src/title.c:99 +#, c-format +msgid "DIFFICULTY - %s" +msgstr "MOEILIJKHEIDSGRAAD: %s" + +#: ../src/title.c:116 +msgid "SOUND - ON" +msgstr "GELUID: AAN" + +#: ../src/title.c:118 +msgid "SOUND - OFF" +msgstr "GELUID: UIT" + +#: ../src/title.c:121 +msgid "MUSIC - ON" +msgstr "MUZIEK: AAN" + +#: ../src/title.c:123 +msgid "MUSIC - OFF" +msgstr "MUZIEK: UIT" + +#: ../src/title.c:126 +msgid "FULLSCREEN - ON" +msgstr "BEELDVULLEND: AAN" + +#: ../src/title.c:128 +msgid "FULLSCREEN - OFF" +msgstr "BEELDVULLEND: UIT" + +#: ../src/title.c:131 +msgid "AUTOPAUSE - ON" +msgstr "AUTOMATISCH ONDERBREKEN: AAN" + +#: ../src/title.c:133 +msgid "AUTOPAUSE - OFF" +msgstr "AUTOMATISCH ONDERBREKEN: UIT" + +#: ../src/title.c:136 +msgid "MESSAGE SPEED - INSTANT" +msgstr "BERICHTSNELHEID: ONMIDDELIJK" + +#: ../src/title.c:138 +msgid "MESSAGE SPEED - FAST" +msgstr "BERICHTSNELHEID: SNEL" + +#: ../src/title.c:140 +msgid "MESSAGE SPEED - NORMAL" +msgstr "BERICHTSNELHEID: NORMAAL" + +#: ../src/title.c:142 +msgid "MESSAGE SPEED - SLOW" +msgstr "BERICHTSNELHEID: TRAAG" + +#: ../src/title.c:144 +msgid "MESSAGE SPEED - SLOTH" +msgstr "BERICHTSNELHEID: SLAKKENGANG" + +#. Shouldn't happen, but adding this just in case +#: ../src/title.c:146 +msgid "MESSAGE SPEED - ERROR" +msgstr "BERICHTSNELHEID: FOUT" + +#: ../src/title.c:165 +msgid "UNLIMITED SHIELD - ON" +msgstr "ONVERWOESTBAAR SCHILD: AAN" + +#: ../src/title.c:167 +msgid "UNLIMITED SHIELD - OFF" +msgstr "ONVERWOESTBAAR SCHILD: UIT" + +#: ../src/title.c:170 +msgid "UNLIMITED AMMO - ON" +msgstr "ONBEPERKTE MUNITIE: AAN" + +#: ../src/title.c:172 +msgid "UNLIMITED AMMO - OFF" +msgstr "ONBEPERKTE MUNITIE: UIT" + +#: ../src/title.c:175 +msgid "UNLIMITED CASH - ON" +msgstr "ONBEPERKT GELD: AAN" + +#: ../src/title.c:177 +msgid "UNLIMITED CASH - OFF" +msgstr "ONBEPERKT GELD: UIT" + +#: ../src/title.c:180 +msgid "UNLIMITED TIME - ON" +msgstr "ONBEPERKTE TIJD: AAN" + +#: ../src/title.c:182 +msgid "UNLIMITED TIME - OFF" +msgstr "ONBEPERKTE TIJD: UIT" + +#: ../src/title.c:250 +msgid "START NEW GAME" +msgstr "NIEUW SPEL STARTEN" + +#: ../src/title.c:251 +msgid "LOAD GAME" +msgstr "SPEL LADEN" + +#: ../src/title.c:252 +msgid "CONTINUE CURRENT GAME" +msgstr "HUIDIGE SPEL HERVATTEN" + +#: ../src/title.c:253 +msgid "OPTIONS" +msgstr "OPTIES" + +#: ../src/title.c:254 +msgid "CREDITS" +msgstr "MET DANK AAN" + +#: ../src/title.c:255 +msgid "CHEAT OPTIONS" +msgstr "CHEATOPTIES" + +#: ../src/title.c:256 +msgid "QUIT" +msgstr "AFSLUITEN" + +#: ../src/title.c:260 +msgid "BACK TO MAIN MENU" +msgstr "TERUG NAAR HOOFDMENU" diff -Nru starfighter-2.3.3/locale/pr-starfighter.pot starfighter-2.4/locale/pr-starfighter.pot --- starfighter-2.3.3/locale/pr-starfighter.pot 2020-09-15 17:09:10.000000000 +0000 +++ starfighter-2.4/locale/pr-starfighter.pot 2020-12-25 19:05:30.000000000 +0000 @@ -21,9 +21,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.3.3\n" +"Project-Id-Version: 2.4\n" "Report-Msgid-Bugs-To: diligentcircle@riseup.net\n" -"POT-Creation-Date: 2020-09-15 13:07-0400\n" +"POT-Creation-Date: 2020-12-25 14:04-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -51,11 +51,11 @@ msgid "Very good, Bainfield. Now let's get a little more serious..." msgstr "" -#: ../src/alien.c:1998 +#: ../src/alien.c:2002 msgid ">> Ally has ejected! <<" msgstr "" -#: ../src/alien.c:2000 +#: ../src/alien.c:2004 msgid ">> Friendly craft has been destroyed! <<" msgstr "" @@ -66,7 +66,7 @@ #. / with brag messages that work well in the target language, #. / following the English version only as a general guideline. Any #. / number of brag messages is permitted. -#: ../src/alien.c:2029 +#: ../src/alien.c:2033 msgid "" "Take that, robot oppressors!\n" "Come on, WEAPCO, give me a challenge already!\n" @@ -92,7 +92,7 @@ #. / with brag messages that work well in the target language, #. / following the English version only as a general guideline. Any #. / number of brag messages is permitted. -#: ../src/alien.c:2062 +#: ../src/alien.c:2066 msgid "" "I got another one!\n" "Target destroyed!\n" @@ -114,7 +114,7 @@ #. / with brag messages that work well in the target language, #. / following the English version only as a general guideline. Any #. / number of brag messages is permitted. -#: ../src/alien.c:2091 +#: ../src/alien.c:2095 msgid "" "Kicked your ass!\n" "You ain't so tough!\n" @@ -134,25 +134,25 @@ #. / Dialog (Chris Bainfield) #. / Used when Krass Tyler is beaten in the Jupiter mission. -#: ../src/alien.c:2154 +#: ../src/alien.c:2158 msgid "The name's CHRIS, old-timer." msgstr "" #. / Dialog (Kline Kethlan) #. / Used when Kline is killed in the Venus mission. -#: ../src/alien.c:2161 +#: ../src/alien.c:2165 msgid "It was an honor... to have fought you..." msgstr "" #. / Dialog (Kline Kethlan) #. / Used when Kline is beaten in the Elamale mission. -#: ../src/alien.c:2204 +#: ../src/alien.c:2207 msgid "Seems I underestimated you, Bainfield. We'll meet again!" msgstr "" #. / Dialog (Sid Wilson) #. / Used when Kline is beaten in the Earth mission. -#: ../src/alien.c:2221 +#: ../src/alien.c:2223 msgid "Chris, Kethlan is getting away!" msgstr "" @@ -812,7 +812,7 @@ #. / with messages that work well in the target language, #. / following the English version only as a general guideline. Any #. / number of messages is permitted. -#: ../src/game.c:840 +#: ../src/game.c:841 msgid "" "Oops! Sorry!\n" "Whoops! Are you OK, Chris?\n" @@ -826,7 +826,7 @@ #. / with messages that work well in the target language, #. / following the English version only as a general guideline. Any #. / number of messages is permitted. -#: ../src/game.c:856 +#: ../src/game.c:857 msgid "" "Get out of the way!\n" "Don't fly into my missiles!\n" @@ -840,10 +840,10 @@ #. / with insults that work well in the target language, #. / following the English version only as a general guideline. Any #. / number of insults is permitted. -#: ../src/game.c:1603 +#: ../src/game.c:1608 msgid "" "Fool.\n" -"And now you're nothing but a DEAD hero.\n" +"And now you're nothing but a DEAD hero." msgstr "" #. / Kline insult messages @@ -853,7 +853,7 @@ #. / with insults that work well in the target language, #. / following the English version only as a general guideline. Any #. / number of insults is permitted. -#: ../src/game.c:1618 +#: ../src/game.c:1623 msgid "" "Pathetic.\n" "How very disappointing...\n" @@ -862,7 +862,7 @@ #. / Dialog: Krass Tyler #. / Used when the player is killed in the Jupiter mission. -#: ../src/game.c:1629 +#: ../src/game.c:1634 msgid "That was the easiest $90,000,000 I've ever earned! Bwah! Ha! Ha! Ha!" msgstr "" @@ -874,37 +874,37 @@ #. / timer to use single-digit numbers. #. / The ":" can also be replaced just like any text. For example, this would be fine: #. / "Time Remaining - %d minutes and %d seconds" -#: ../src/game.c:1942 +#: ../src/game.c:1947 #, c-format msgid "Time Remaining - %.2d:%.2d" msgstr "" #. / "%d" must be retained. It is replaced with the number of mission objectives remaining. -#: ../src/game.c:1950 +#: ../src/game.c:1955 #, c-format msgid "Objectives Remaining: %d" msgstr "" #. / "%d" must be retained. It is replaced with the player's current total cash. #. / Retain "%d" as-is. It is replaced with the player's current cash. -#: ../src/game.c:1956 ../src/shop.c:352 +#: ../src/game.c:1961 ../src/shop.c:353 #, c-format msgid "Cash: $%d" msgstr "" #. / "%.3d" must be retained. It is replaced with the amount of plasma ammo. -#: ../src/game.c:1993 +#: ../src/game.c:1998 #, c-format msgid "Plasma: %.3d" msgstr "" #. / Used to indicate the charge meter for the charger cannon in the HUD. -#: ../src/game.c:2000 +#: ../src/game.c:2005 msgid "Charge" msgstr "" #. / Used to indicate the heat meter for the laser cannon in the HUD. -#: ../src/game.c:2005 +#: ../src/game.c:2010 msgid "Heat" msgstr "" @@ -912,38 +912,38 @@ #. / Retain "%.2d". It is replaced with the ship's current number of rockets. #. / "%.2d" can be changed to "%d" if you wish to not fill in space with zeroes, #. / e.g. render the number 3 as "3" rather than "03". -#: ../src/game.c:2010 ../src/shop.c:362 +#: ../src/game.c:2015 ../src/shop.c:363 #, c-format msgid "Rockets: %.2d" msgstr "" #. / DIFFICULTY_SUPEREASY -#: ../src/game.c:2420 +#: ../src/game.c:2425 msgid "Super-Easy" msgstr "" #. / DIFFICULTY_EASY -#: ../src/game.c:2424 +#: ../src/game.c:2429 msgid "Easy" msgstr "" #. / DIFFICULTY_NORMAL -#: ../src/game.c:2428 +#: ../src/game.c:2433 msgid "Normal" msgstr "" #. / DIFFICULTY_HARD -#: ../src/game.c:2432 +#: ../src/game.c:2437 msgid "Hard" msgstr "" #. / DIFFICULTY_NIGHTMARE -#: ../src/game.c:2436 +#: ../src/game.c:2441 msgid "Nightmare!" msgstr "" #. / DIFFICULTY_ORIGINAL (Classic) -#: ../src/game.c:2440 +#: ../src/game.c:2445 msgid "Classic" msgstr "" @@ -2093,7 +2093,7 @@ msgid "Destroy WEAPCO frontline forces" msgstr "" -#: ../src/mission.c:610 ../src/mission.c:980 +#: ../src/mission.c:610 ../src/mission.c:984 msgid "*** All Primary Objectives Completed ***" msgstr "" @@ -2294,81 +2294,81 @@ msgid "That's one less surprise that WEAPCO can spring on us!" msgstr "" -#: ../src/mission.c:967 +#: ../src/mission.c:971 msgid "*** Primary Objective Completed ***" msgstr "" -#: ../src/mission.c:969 +#: ../src/mission.c:973 msgid ">>> Primary Objective Failed <<<" msgstr "" -#: ../src/mission.c:976 +#: ../src/mission.c:980 msgid "Emergency warp drive activated. Press button to engage." msgstr "" -#: ../src/mission.c:982 +#: ../src/mission.c:986 msgid "*** Interception Destroyed ***" msgstr "" #. / Dialog (Chris Bainfield) #. / Used when the Earth mission is completed. -#: ../src/mission.c:1002 +#: ../src/mission.c:1006 msgid "" "You guys stay here and keep things under control. I'm going after Kethlan!" msgstr "" -#: ../src/mission.c:1011 +#: ../src/mission.c:1015 msgid "*** Secondary Objective Completed ***" msgstr "" -#: ../src/mission.c:1016 +#: ../src/mission.c:1020 msgid "*** All Secondary Objectives Completed ***" msgstr "" -#: ../src/mission.c:1031 +#: ../src/mission.c:1035 msgid ">>> MISSION FAILED <<<" msgstr "" -#: ../src/mission.c:1037 +#: ../src/mission.c:1041 msgid ">>> Secondary Objective Failed <<<" msgstr "" -#: ../src/mission.c:1116 +#: ../src/mission.c:1120 msgid "Primary Objectives" msgstr "" -#: ../src/mission.c:1130 +#: ../src/mission.c:1134 msgid "Secondary Objectives" msgstr "" -#: ../src/mission.c:1144 +#: ../src/mission.c:1148 msgid "Additional Information" msgstr "" #. / Used to indicate the player's shield meter in the HUD. -#: ../src/mission.c:1161 +#: ../src/mission.c:1165 msgid "Shield" msgstr "" -#: ../src/mission.c:1163 +#: ../src/mission.c:1167 msgid "Target" msgstr "" -#: ../src/mission.c:1164 +#: ../src/mission.c:1168 msgid "Sid" msgstr "" -#: ../src/mission.c:1165 +#: ../src/mission.c:1169 msgid "Phoebe" msgstr "" -#: ../src/mission.c:1166 +#: ../src/mission.c:1170 msgid "Kline" msgstr "" #. / "%d" must be retained. It is replaced with the mission required #. / survival time in minutes. -#: ../src/mission.c:1194 +#: ../src/mission.c:1198 #, c-format msgid "SURVIVAL FOR %d minute" msgid_plural "SURVIVAL FOR %d minutes" @@ -2377,36 +2377,36 @@ #. / "%d" must be retained. It is replaced with the mission time #. / limit in minutes. -#: ../src/mission.c:1203 +#: ../src/mission.c:1207 #, c-format msgid "TIME LIMIT: %d minute" msgid_plural "TIME LIMIT: %d minutes" msgstr[0] "" msgstr[1] "" -#: ../src/mission.c:1219 +#: ../src/mission.c:1223 msgid "Phoebe Lexx will not be present" msgstr "" -#: ../src/mission.c:1221 +#: ../src/mission.c:1225 msgid "Ursula Lexx will not be present" msgstr "" -#: ../src/mission.c:1228 +#: ../src/mission.c:1232 msgid "Sid Wilson will join you on this mission" msgstr "" -#: ../src/mission.c:1316 ../src/mission.c:1336 +#: ../src/mission.c:1320 ../src/mission.c:1340 msgid "COMPLETED" msgstr "" -#: ../src/mission.c:1321 ../src/mission.c:1341 +#: ../src/mission.c:1325 ../src/mission.c:1345 msgid "FAILED" msgstr "" #. / "%d" must be retained. It is replaced with the money earned #. / from the shield bonus. -#: ../src/mission.c:1352 +#: ../src/mission.c:1356 #, c-format msgid "Shield Bonus: $%d" msgstr "" @@ -2423,7 +2423,7 @@ #. / the "%02ld" sequences may be changed to "%ld" if you wish to #. / not force two digits to be filled in (e.g. to render the number #. / 3 as "3" instead of "03"). -#: ../src/mission.c:1368 +#: ../src/mission.c:1372 #, c-format msgid "Mission Time: %02ld:%02ld" msgstr "" @@ -2535,86 +2535,86 @@ msgstr "" #. / Retain "%d" as-is. It is replaced with the rocket capacity of the Firefly. -#: ../src/shop.c:104 +#: ../src/shop.c:105 #, c-format msgid "Capacity : %d" msgstr "" -#: ../src/shop.c:285 +#: ../src/shop.c:286 msgid "Primary Weapon" msgstr "" #. / Shop info: min plasma output #. / Retain "%d" as-is. It is replaced with the min plasma output. -#: ../src/shop.c:288 +#: ../src/shop.c:289 #, c-format msgid "Cannons: %d" msgstr "" #. / Shop info: min plasma damage #. / Retain "%d" as-is. It is replaced with the min plasma damage. -#: ../src/shop.c:292 +#: ../src/shop.c:293 #, c-format msgid "Power: Stage %d" msgstr "" #. / Shop info: min plasma rate #. / Retain "%d" as-is. It is replaced with the min plasma cooling. -#: ../src/shop.c:297 +#: ../src/shop.c:298 #, c-format msgid "Cooling: Stage %d" msgstr "" -#: ../src/shop.c:301 +#: ../src/shop.c:302 msgid "Powerup Weapon" msgstr "" #. / Shop info: max plasma output #. / Retain "%d" as-is. It is replaced with the max plasma output. -#: ../src/shop.c:304 +#: ../src/shop.c:305 #, c-format msgid "Splitter: Stage %d" msgstr "" #. / Shop info: max plasma damage #. / Retain "%d" as-is. It is replaced with the max plasma damage. -#: ../src/shop.c:309 +#: ../src/shop.c:310 #, c-format msgid "Condensor: Stage %d" msgstr "" #. / Shop info: max plasma rate #. / Retain "%d" as-is. It is replaced with the max plasma cooling. -#: ../src/shop.c:314 +#: ../src/shop.c:315 #, c-format msgid "L.Nitrogen: Stage %d" msgstr "" #. / Shop info: max plasma ammo #. / Retain "%d" as-is. It is replaced with the Firefly's plasma ammo capacity. -#: ../src/shop.c:319 +#: ../src/shop.c:320 #, c-format msgid "Capacity: %d" msgstr "" -#: ../src/shop.c:328 +#: ../src/shop.c:329 msgid "Temporary Weapons" msgstr "" -#: ../src/shop.c:329 +#: ../src/shop.c:330 msgid "Ammo and Storage" msgstr "" -#: ../src/shop.c:331 +#: ../src/shop.c:332 msgid "Primary Weapons" msgstr "" -#: ../src/shop.c:333 +#: ../src/shop.c:334 msgid "Secondary Weapons" msgstr "" #. / Retain "%d" as-is. It is replaced with the Firefly's max shield. -#: ../src/shop.c:349 +#: ../src/shop.c:350 #, c-format msgid "Shield: %d" msgstr "" @@ -2622,246 +2622,246 @@ #. / Retain "%.3d". It is replaced with the ship's current number of plasma cells. #. / "%.3d" can be changed to "%d" if you wish to not fill in space with zeroes, #. / e.g. render the number 5 as "5" rather than "005". -#: ../src/shop.c:357 +#: ../src/shop.c:358 #, c-format msgid "Plasma Cells: %.3d" msgstr "" -#: ../src/shop.c:368 +#: ../src/shop.c:369 msgid "Information" msgstr "" #. / For when the player attempts to buy something they can't afford. -#: ../src/shop.c:376 +#: ../src/shop.c:377 msgid "You don't have enough money" msgstr "" #. / For when the player attempts an upgrade beyond the maximum (line 1 of 2). -#: ../src/shop.c:380 +#: ../src/shop.c:381 msgid "Cannot upgrade ship" msgstr "" #. / For when the player attempts an upgrade beyond the maximum (line 2 of 2). -#: ../src/shop.c:383 +#: ../src/shop.c:384 msgid "Hardware capacity has been reached" msgstr "" #. / For when the player attempts to buy more ammo than the ship can hold. -#: ../src/shop.c:387 +#: ../src/shop.c:388 msgid "Ammunition limit reached" msgstr "" #. / For when the player attempts to sell an item they aren't allowed to sell. -#: ../src/shop.c:391 +#: ../src/shop.c:392 msgid "You cannot sell that item" msgstr "" #. / For when the player attempts to sell an item they don't have any of. -#: ../src/shop.c:395 +#: ../src/shop.c:396 msgid "Nothing to sell" msgstr "" #. / For when the player attempts to buy rockets or rocket capacity #. / while secondary weapon is either laser or charge cannon. -#: ../src/shop.c:400 +#: ../src/shop.c:401 msgid "Rockets cannot be bought for Laser or Charger Cannon" msgstr "" #. / For when the player attempts to buy a weapon they already have. -#: ../src/shop.c:404 +#: ../src/shop.c:405 msgid "You already have that weapon" msgstr "" #. / For when the player attempts to increase rocket capacity beyond #. / what is allowed for the weapon (used for homing missiles). -#: ../src/shop.c:409 +#: ../src/shop.c:410 msgid "This weapon's ammo limit has been reached" msgstr "" #. / Used to put a shop item's name next to its price. #. / "%s" is replaced with the item name, and "%d" is replaced #. / with the item price. -#: ../src/shop.c:417 +#: ../src/shop.c:418 #, c-format msgid "%s ($%d)" msgstr "" #. / Used for shop items that cannot be bought. #. / "%s" is replaced with the item name. -#: ../src/shop.c:425 +#: ../src/shop.c:426 #, c-format msgid "%s (N/A)" msgstr "" #. ----------- Temporary Items ----------- #. Overwritten later -#: ../src/shop.c:440 +#: ../src/shop.c:441 msgid "Plasma Channel Splitter" msgstr "" #. / Shop item description: Plasma Channel Splitter (PLASMA_MAX_OUTPUT) -#: ../src/shop.c:442 +#: ../src/shop.c:443 msgid "Improves poweredup plasma output" msgstr "" #. Overwritten later -#: ../src/shop.c:446 +#: ../src/shop.c:447 msgid "Plasma Capacity Condensor" msgstr "" #. / Shop item description: Plasma Capacity Condensor (PLASMA_MAX_DAMAGE) -#: ../src/shop.c:448 +#: ../src/shop.c:449 msgid "Increases poweredup plasma damage" msgstr "" #. Overwritten later -#: ../src/shop.c:452 +#: ../src/shop.c:453 msgid "Liquid Nitrogen Capsules" msgstr "" #. / Shop item description: Liquid Nitrogen Capsules (PLASMA_MAX_RATE) -#: ../src/shop.c:454 +#: ../src/shop.c:455 msgid "Increases plasma firing rate" msgstr "" -#: ../src/shop.c:462 +#: ../src/shop.c:463 msgid "Plasma Cells" msgstr "" #. / Shop item description: Plasma Cells -#: ../src/shop.c:464 +#: ../src/shop.c:465 msgid "Plasma ammunition (10 cells each)" msgstr "" -#: ../src/shop.c:472 +#: ../src/shop.c:473 msgid "Rocket Ammo" msgstr "" #. / Shop item description: Rocket Ammo -#: ../src/shop.c:474 +#: ../src/shop.c:475 msgid "High velocity dumb fire rocket" msgstr "" #. ----------- Permanent Items ----------- #. Overwritten later -#: ../src/shop.c:480 +#: ../src/shop.c:481 msgid "Additional Plasma Cannon" msgstr "" #. / Shop item description: Additional Plasma Cannon (PLASMA_MIN_OUTPUT) -#: ../src/shop.c:482 +#: ../src/shop.c:483 msgid "Adds an extra plasma cannon to the Firefly" msgstr "" #. Overwritten later -#: ../src/shop.c:486 +#: ../src/shop.c:487 msgid "Plasma Power Booster" msgstr "" #. / Shop item description: Plasma Power Booster (PLASMA_MIN_DAMAGE) -#: ../src/shop.c:488 +#: ../src/shop.c:489 msgid "Increases power of plasma shots" msgstr "" #. Overwritten later -#: ../src/shop.c:492 +#: ../src/shop.c:493 msgid "Plasma Cooling Booster" msgstr "" #. / Shop item description: Plasma Cooling Booster (PLASMA_MIN_RATE) -#: ../src/shop.c:494 +#: ../src/shop.c:495 msgid "Permanently increases firing rate" msgstr "" #. ----------- Ammo Items -------------- #. Overwritten later -#: ../src/shop.c:500 +#: ../src/shop.c:501 msgid "Plasma Compressor" msgstr "" #. / Shop item description: Plasma Compressor (PLASMA_MAX_AMMO) -#: ../src/shop.c:502 +#: ../src/shop.c:503 msgid "Increases plasma ammo capacity" msgstr "" #. Overwritten later -#: ../src/shop.c:506 +#: ../src/shop.c:507 msgid "Rocket Pod" msgstr "" #. / Shop item description: Rocket Pod (ROCKET_MAX_AMMO) -#: ../src/shop.c:508 +#: ../src/shop.c:509 msgid "Allows for an additional 5 rockets to be carried" msgstr "" -#: ../src/shop.c:514 +#: ../src/shop.c:515 msgid "Dual Rocket Launcher" msgstr "" #. / Shop item description: Dual Rocket Launcher -#: ../src/shop.c:516 +#: ../src/shop.c:517 msgid "Launches two rockets at once" msgstr "" -#: ../src/shop.c:520 +#: ../src/shop.c:521 msgid "Micro Rocket Launcher" msgstr "" #. / Shop item description: Micro Rocket Launcher -#: ../src/shop.c:522 +#: ../src/shop.c:523 msgid "Launches several less powerful rockets at once" msgstr "" -#: ../src/shop.c:526 +#: ../src/shop.c:527 msgid "Laser Cannon" msgstr "" #. / Shop item description: Laser Cannon -#: ../src/shop.c:528 +#: ../src/shop.c:529 msgid "Fires a continuous stream of energy particles" msgstr "" -#: ../src/shop.c:532 +#: ../src/shop.c:533 msgid "Homing Missile Launcher" msgstr "" #. / Shop item description: Homing Missile Launcher #. / %i must be retained. It is replaced by the maximum missile #. / capacity of the weapon. -#: ../src/shop.c:536 +#: ../src/shop.c:537 #, c-format msgid "Fires homing missile (max %i missiles)" msgstr "" -#: ../src/shop.c:540 +#: ../src/shop.c:541 msgid "Charge Cannon" msgstr "" #. / Shop item description: Charge Cannon -#: ../src/shop.c:542 +#: ../src/shop.c:543 msgid "Compacts plasma into clusters for greater damage" msgstr "" -#: ../src/shop.c:546 +#: ../src/shop.c:547 msgid "Dual Homing Missile Launcher" msgstr "" #. / Shop item description: Dual Homing Missile Launcher #. / %i must be retained. It is replaced by the maximum missile #. / capacity of the weapon. -#: ../src/shop.c:550 +#: ../src/shop.c:551 #, c-format msgid "Fires two homing missiles (max %i missiles)" msgstr "" -#: ../src/shop.c:554 +#: ../src/shop.c:555 msgid "Micro Homing Missile Launcher" msgstr "" #. / Shop item description: Micro Homing Missile Launcher #. / %i must be retained. It is replaced by the maximum missile #. / capacity of the weapon. -#: ../src/shop.c:558 +#: ../src/shop.c:559 #, c-format msgid "Fires several small homing missiles (max %i missiles)" msgstr "" diff -Nru starfighter-2.3.3/Makefile.in starfighter-2.4/Makefile.in --- starfighter-2.3.3/Makefile.in 2020-09-20 16:07:31.000000000 +0000 +++ starfighter-2.4/Makefile.in 2020-12-26 23:19:11.000000000 +0000 @@ -287,9 +287,11 @@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SF_NOFONT = @SF_NOFONT@ +SF_OLD_MUSIC = @SF_OLD_MUSIC@ SF_RUN_IN_PLACE = @SF_RUN_IN_PLACE@ SF_SCREEN_HEIGHT = @SF_SCREEN_HEIGHT@ SF_SCREEN_WIDTH = @SF_SCREEN_WIDTH@ +SF_UNHARDEN = @SF_UNHARDEN@ SF_WARN = @SF_WARN@ SHELL = @SHELL@ STARFIGHTER_CPPFLAGS = @STARFIGHTER_CPPFLAGS@ diff -Nru starfighter-2.3.3/misc/Makefile starfighter-2.4/misc/Makefile --- starfighter-2.3.3/misc/Makefile 2020-09-20 16:08:02.000000000 +0000 +++ starfighter-2.4/misc/Makefile 2020-12-26 23:19:14.000000000 +0000 @@ -194,10 +194,10 @@ PACKAGE = starfighter PACKAGE_BUGREPORT = diligentcircle@riseup.net PACKAGE_NAME = Project: Starfighter -PACKAGE_STRING = Project: Starfighter 2.3.3 +PACKAGE_STRING = Project: Starfighter 2.4 PACKAGE_TARNAME = starfighter PACKAGE_URL = -PACKAGE_VERSION = 2.3.3 +PACKAGE_VERSION = 2.4 PANGO_CFLAGS = -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include PANGO_LIBS = -lpango-1.0 -lgobject-2.0 -lglib-2.0 PATH_SEPARATOR = : @@ -208,15 +208,17 @@ SDL_LIBS = -lSDL2_image -lSDL2_mixer -lSDL2_ttf -lSDL2 SET_MAKE = SF_NOFONT = +SF_OLD_MUSIC = SF_RUN_IN_PLACE = SF_SCREEN_HEIGHT = SF_SCREEN_WIDTH = +SF_UNHARDEN = SF_WARN = SHELL = /bin/bash -STARFIGHTER_CPPFLAGS = -DVERSION=\"2.3.3\" -STARFIGHTER_LDADD = +STARFIGHTER_CPPFLAGS = -DVERSION=\"2.4\" +STARFIGHTER_LDADD = -Wl,-z,now STRIP = -VERSION = 2.3.3 +VERSION = 2.4 abs_builddir = /home/layla/projects/starfighter/misc abs_srcdir = /home/layla/projects/starfighter/misc abs_top_builddir = /home/layla/projects/starfighter diff -Nru starfighter-2.3.3/misc/Makefile.in starfighter-2.4/misc/Makefile.in --- starfighter-2.3.3/misc/Makefile.in 2020-09-20 16:07:32.000000000 +0000 +++ starfighter-2.4/misc/Makefile.in 2020-12-26 23:19:11.000000000 +0000 @@ -208,9 +208,11 @@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SF_NOFONT = @SF_NOFONT@ +SF_OLD_MUSIC = @SF_OLD_MUSIC@ SF_RUN_IN_PLACE = @SF_RUN_IN_PLACE@ SF_SCREEN_HEIGHT = @SF_SCREEN_HEIGHT@ SF_SCREEN_WIDTH = @SF_SCREEN_WIDTH@ +SF_UNHARDEN = @SF_UNHARDEN@ SF_WARN = @SF_WARN@ SHELL = @SHELL@ STARFIGHTER_CPPFLAGS = @STARFIGHTER_CPPFLAGS@ diff -Nru starfighter-2.3.3/misc/starfighter.sh starfighter-2.4/misc/starfighter.sh --- starfighter-2.3.3/misc/starfighter.sh 1970-01-01 00:00:00.000000000 +0000 +++ starfighter-2.4/misc/starfighter.sh 2020-12-26 22:26:40.000000000 +0000 @@ -0,0 +1,13 @@ +#!/bin/sh +# This file has been dedicated to the public domain, to the extent +# possible under applicable law, via CC0. See +# http://creativecommons.org/publicdomain/zero/1.0/ for more +# information. This file is offered as-is, without any warranty. +# +# Script which can be used to easily run Starfighter in-place without +# installing on POSIX systems, but not on MacOS. + +SCRIPT=$(readlink -f "$0") +SCRIPTPATH=$(dirname "$SCRIPT") +cd $SCRIPTPATH +./src/starfighter "$@" \ No newline at end of file diff -Nru starfighter-2.3.3/music/Makefile.am starfighter-2.4/music/Makefile.am --- starfighter-2.3.3/music/Makefile.am 2020-09-16 02:41:37.000000000 +0000 +++ starfighter-2.4/music/Makefile.am 2020-12-26 17:18:18.000000000 +0000 @@ -17,4 +17,3 @@ space_dimensions.ogg \ through_space.ogg \ walking_among_androids.ogg - diff -Nru starfighter-2.3.3/music/Makefile.in starfighter-2.4/music/Makefile.in --- starfighter-2.3.3/music/Makefile.in 2020-09-20 16:07:32.000000000 +0000 +++ starfighter-2.4/music/Makefile.in 2020-12-26 23:19:11.000000000 +0000 @@ -205,9 +205,11 @@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SF_NOFONT = @SF_NOFONT@ +SF_OLD_MUSIC = @SF_OLD_MUSIC@ SF_RUN_IN_PLACE = @SF_RUN_IN_PLACE@ SF_SCREEN_HEIGHT = @SF_SCREEN_HEIGHT@ SF_SCREEN_WIDTH = @SF_SCREEN_WIDTH@ +SF_UNHARDEN = @SF_UNHARDEN@ SF_WARN = @SF_WARN@ SHELL = @SHELL@ STARFIGHTER_CPPFLAGS = @STARFIGHTER_CPPFLAGS@ diff -Nru starfighter-2.3.3/README.txt starfighter-2.4/README.txt --- starfighter-2.3.3/README.txt 2020-09-20 16:12:55.000000000 +0000 +++ starfighter-2.4/README.txt 2020-12-26 22:32:58.000000000 +0000 @@ -24,19 +24,16 @@ project completed that work by adding music and replacing one non-libre graphic that got into version 1.2 by mistake. -* There are several gameplay changes. These changes were mostly done to - balance the game better. However, if you want the original experience, - "Classic" difficulty emulates it as closely as possible. - * Much of the dialog has been changed. There are various reasons for this; some of these include fixing bad writing, making the dialog match new music queues, and giving the characters more personality. -* In many places, the interface has been considerably improved. As an - example, the simplistic target arrow of the original has been replaced - with a system of several arrows, one for each ship. - -* Unicode and gettext translation support have been added. +* There are several gameplay changes. These changes were mostly done to + balance the game better. The original game is contained in the Classic + difficulty option, which is nearly identical to the original + experience. A few small differences (mainly old bugs that were not + left in) do exist, and they are explained on the following page: + https://pr-starfighter.github.io/old.html * Typing "humansdoitbetter" in the title screen no longer enables cheats. This is actually because the switch to SDL2 broke the original @@ -109,6 +106,17 @@ required; in particular, failure to do so under MacOS leads to a failure to load data (images, sounds, fonts) needed by Starfighter. +On Linux and most other POSIX systems, you can instead build a run in +place build with the following commands: + + ./configure SF_RUN_IN_PLACE=1 + make + mv misc/starfighter.sh . + +For Linux, this method is preferred as the binary itself often cannot be +run by double-clicking, and the starfighter.sh script also automatically +sets the current working directory, making it suitable for launchers. + Run "./configure --help" to see all options for compiling. ------------------------------------------------------------------------ diff -Nru starfighter-2.3.3/sound/Makefile.am starfighter-2.4/sound/Makefile.am --- starfighter-2.3.3/sound/Makefile.am 2020-09-16 03:03:15.000000000 +0000 +++ starfighter-2.4/sound/Makefile.am 2020-12-25 18:58:06.000000000 +0000 @@ -3,7 +3,7 @@ # http://creativecommons.org/publicdomain/zero/1.0/ for more # information. This file is offered as-is, without any warranty. -sounddir = $(pkgdatadir)/music +sounddir = $(pkgdatadir)/sound nobase_dist_sound_DATA = \ beamLaser.ogg \ diff -Nru starfighter-2.3.3/sound/Makefile.in starfighter-2.4/sound/Makefile.in --- starfighter-2.3.3/sound/Makefile.in 2020-09-20 16:07:32.000000000 +0000 +++ starfighter-2.4/sound/Makefile.in 2020-12-26 23:19:11.000000000 +0000 @@ -205,9 +205,11 @@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SF_NOFONT = @SF_NOFONT@ +SF_OLD_MUSIC = @SF_OLD_MUSIC@ SF_RUN_IN_PLACE = @SF_RUN_IN_PLACE@ SF_SCREEN_HEIGHT = @SF_SCREEN_HEIGHT@ SF_SCREEN_WIDTH = @SF_SCREEN_WIDTH@ +SF_UNHARDEN = @SF_UNHARDEN@ SF_WARN = @SF_WARN@ SHELL = @SHELL@ STARFIGHTER_CPPFLAGS = @STARFIGHTER_CPPFLAGS@ @@ -265,7 +267,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -sounddir = $(pkgdatadir)/music +sounddir = $(pkgdatadir)/sound nobase_dist_sound_DATA = \ beamLaser.ogg \ cloak.ogg \ diff -Nru starfighter-2.3.3/src/alien.c starfighter-2.4/src/alien.c --- starfighter-2.3.3/src/alien.c 2020-07-27 04:35:48.000000000 +0000 +++ starfighter-2.4/src/alien.c 2020-12-26 05:09:28.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011, 2012 Guus Sliepen -Copyright (C) 2012, 2015-2020 Layla Marchant +Copyright (C) 2012, 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1110,8 +1110,8 @@ barrierSpeed++; } - if ((game.area == MISN_POSWIC) && - (aliens[i].classDef == CD_BOSS)) + if ((game.area == MISN_POSWIC) + && (aliens[i].classDef == CD_BOSS)) { aliens[i].flags |= FL_IMMORTAL; } @@ -1144,8 +1144,8 @@ aliens[ALIEN_BOSS_PART2].dx = -20; aliens[ALIEN_BOSS_PART2].dy = 37; } - else if ((game.area == MISN_ELAMALE) || - (game.area == MISN_FELLON)) + else if ((game.area == MISN_ELAMALE) + || (game.area == MISN_FELLON)) { aliens[ALIEN_BOSS].target = &player; aliens[ALIEN_BOSS].x = -screen->w / 2; @@ -1194,8 +1194,8 @@ { int index = alien_getFreeIndex(); - if ((index == -1) || (game.area == MISN_JUPITER) || - (game.area == MISN_VENUS)) + if ((index == -1) || (game.area == MISN_JUPITER) + || (game.area == MISN_VENUS)) return 0; int *alienArray; @@ -1663,8 +1663,8 @@ switch(RANDRANGE(0, 9)) { case 0: - if ((alien->weaponType[0] != W_DIRSHOCKMISSILE) && - (alien->weaponType[1] != W_MICRO_HOMING_MISSILES)) + if ((alien->weaponType[0] != W_DIRSHOCKMISSILE) + && (alien->weaponType[1] != W_MICRO_HOMING_MISSILES)) alien->flags |= FL_CONTINUOUS_FIRE; alien->dx = ((alien->x - alien->target->x) / ((300 / alien->speed) + RANDRANGE(0, 100))); @@ -1674,9 +1674,9 @@ case 1: case 2: // Kline only attacks when he is ready! - if ((!(alien->flags & FL_NOFIRE)) && - ((game.area == MISN_ELAMALE) || - game.difficulty != DIFFICULTY_ORIGINAL)) + if ((!(alien->flags & FL_NOFIRE)) + && ((game.area == MISN_ELAMALE) + || game.difficulty != DIFFICULTY_ORIGINAL)) alien->flags |= FL_DROPMINES; break; case 3: @@ -1726,8 +1726,8 @@ } else { - if ((targetEnemy->classDef != CD_CARGOSHIP) && - (targetEnemy->classDef != CD_BOSS)) + if ((targetEnemy->classDef != CD_CARGOSHIP) + && (targetEnemy->classDef != CD_BOSS)) { badTarget = 1; } @@ -1743,8 +1743,8 @@ if (targetEnemy->classDef == CD_BOSS) return; - if ((targetEnemy->flags & FL_DISABLED) || - (targetEnemy->flags & FL_NOFIRE)) + if ((targetEnemy->flags & FL_DISABLED) + || (targetEnemy->flags & FL_NOFIRE)) badTarget = 1; } } @@ -1815,8 +1815,8 @@ return 1; // Not at the correct vertical height - if ((alien->y < alien->target->y - 15) || - (alien->y > alien->target->y + alien->target->image[0]->h + 15)) + if ((alien->y < alien->target->y - 15) + || (alien->y > alien->target->y + alien->target->image[0]->h + 15)) return 0; return 1; @@ -1830,11 +1830,11 @@ { for (int i = 0 ; i < ALIEN_MAX ; i++) { - if ((alien != &aliens[i]) && (aliens[i].flags & FL_WEAPCO) && - (aliens[i].shield > 0)) + if ((alien != &aliens[i]) && (aliens[i].flags & FL_WEAPCO) + && (aliens[i].shield > 0)) { - if ((alien->y > aliens[i].y - 15) && - (alien->y < aliens[i].y + aliens[i].image[0]->h + 15)) + if ((alien->y > aliens[i].y - 15) + && (alien->y < aliens[i].y + aliens[i].image[0]->h + 15)) { if ((alien->face == 1) && (aliens[i].x < alien->x)) return 1; @@ -1859,7 +1859,7 @@ if (alien->owner == alien) { - if (alien->flags & FL_CIRCLES) + if ((alien->flags & FL_CIRCLES) && (!(alien->flags & FL_LEAVESECTOR))) { if (alien->face == 0) { @@ -1886,14 +1886,18 @@ { for (int i = 0 ; i < ALIEN_MAX ; i++) { - if ((aliens[i].owner != alien) && (aliens[i].active) && - (aliens[i].shield > 0) && (!(aliens[i].flags & FL_LEAVESECTOR)) && - (alien->classDef != CD_BARRIER) && - ship_collision(alien, &aliens[i])) - { - if ((game.difficulty == DIFFICULTY_ORIGINAL) && (alien->classDef != CD_DRONE) && - (alien->classDef != CD_ASTEROID) && (alien->classDef != CD_ASTEROID2) && - (alien->owner == alien) && (game.area != MISN_ELLESH)) + if ((aliens[i].owner != alien) && (aliens[i].active) + && (aliens[i].shield > 0) + && (!(aliens[i].flags & FL_LEAVESECTOR)) + && (alien->classDef != CD_BARRIER) + && ship_collision(alien, &aliens[i])) + { + if ((game.difficulty == DIFFICULTY_ORIGINAL) + && (alien->classDef != CD_DRONE) + && (alien->classDef != CD_ASTEROID) + && (alien->classDef != CD_ASTEROID2) + && (alien->owner == alien) + && (game.area != MISN_ELLESH)) { collided = 1; } @@ -1978,8 +1982,8 @@ audio_playSound(SFX_EXPLOSION, alien->x, alien->y); // Chain reaction damage if needed (Classic Difficulty version) - if ((game.difficulty == DIFFICULTY_ORIGINAL) && - (alien->owner != alien) && (alien->flags & FL_DAMAGEOWNER)) + if ((game.difficulty == DIFFICULTY_ORIGINAL) + && (alien->owner != alien) && (alien->flags & FL_DAMAGEOWNER)) { alien_hurt(alien->owner, attacker, alien->maxShield, 0); } @@ -2015,8 +2019,8 @@ } } - if (CHANCE(1 / 16.) && (alien->flags & FL_WEAPCO) && - (!(alien->flags & FL_NOBANTER))) + if (CHANCE(1 / 16.) && (alien->flags & FL_WEAPCO) + && (!(alien->flags & FL_NOBANTER))) { radio_getRandomMessage(msg, _( /// Chris brag messages @@ -2048,8 +2052,8 @@ else if (attacker->classDef == CD_PHOEBE) { game.wingMate1Kills++; - if (CHANCE(1 / 8.) && (alien-> flags & FL_WEAPCO) && - (!(alien->flags & FL_NOBANTER))) + if (CHANCE(1 / 8.) && (alien-> flags & FL_WEAPCO) + && (!(alien->flags & FL_NOBANTER))) { radio_getRandomMessage(msg, _( /// Phoebe brag messages @@ -2077,8 +2081,8 @@ else if (attacker->classDef == CD_URSULA) { game.wingMate2Kills++; - if (CHANCE(1 / 8.) && (alien-> flags & FL_WEAPCO) && - (!(alien->flags & FL_NOBANTER))) + if (CHANCE(1 / 8.) && (alien-> flags & FL_WEAPCO) + && (!(alien->flags & FL_NOBANTER))) { radio_getRandomMessage(msg, _( /// Ursula brag messages @@ -2190,15 +2194,14 @@ if (game.area == MISN_ELAMALE) { if (game.difficulty == DIFFICULTY_ORIGINAL) - stage1_shield = alien->maxShield * 3 / 8; + stage1_shield = KLINE_SHIELD_MEDIUM; else - stage1_shield = alien->maxShield / 4; + stage1_shield = KLINE_SHIELD_SMALL; if ((alien->shield <= alien->maxShield - stage1_shield) && !(alien->flags & FL_LEAVESECTOR)) { alien->flags |= FL_LEAVESECTOR; - alien->flags &= ~FL_CIRCLES; /// Dialog (Kline Kethlan) /// Used when Kline is beaten in the Elamale mission. radio_setMessage(FS_KLINE, _("Seems I underestimated you, Bainfield. We'll meet again!"), 1); @@ -2207,15 +2210,14 @@ else if (game.area == MISN_EARTH) { if (game.difficulty == DIFFICULTY_ORIGINAL) - stage1_shield = alien->maxShield / 4; + stage1_shield = KLINE_SHIELD_SMALL; else - stage1_shield = alien->maxShield * 3 / 8; + stage1_shield = KLINE_SHIELD_MEDIUM; if ((alien->shield <= alien->maxShield - stage1_shield) && !(alien->flags & FL_LEAVESECTOR)) { alien->flags |= FL_LEAVESECTOR; - alien->flags &= ~FL_CIRCLES; /// Dialog (Sid Wilson) /// Used when Kline is beaten in the Earth mission. radio_setMessage(FS_SID, _("Chris, Kethlan is getting away!"), 1); @@ -2223,9 +2225,9 @@ } else if (game.area == MISN_VENUS) { - stage1_shield = alien->maxShield * 3 / 4; - stage2_shield = alien->maxShield / 2; - stage3_shield = alien->maxShield / 4; + stage1_shield = KLINE_STAGE1_SHIELD; + stage2_shield = KLINE_STAGE2_SHIELD; + stage3_shield = KLINE_STAGE3_SHIELD; if (alien->shield + damage > stage1_shield && alien->shield <= stage1_shield) @@ -2251,13 +2253,12 @@ } else { - stage1_shield = alien->maxShield / 20; + stage1_shield = KLINE_SHIELD_TINY; if ((alien->shield <= alien->maxShield - stage1_shield) && !(alien->flags & FL_LEAVESECTOR)) { alien->flags |= FL_LEAVESECTOR; - alien->flags &= ~FL_CIRCLES; } } } diff -Nru starfighter-2.3.3/src/alien.h starfighter-2.4/src/alien.h --- starfighter-2.3.3/src/alien.h 2020-05-26 21:56:37.000000000 +0000 +++ starfighter-2.4/src/alien.h 2020-12-26 05:09:29.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/audio.c starfighter-2.4/src/audio.c --- starfighter-2.3.3/src/audio.c 2020-05-24 00:55:33.000000000 +0000 +++ starfighter-2.4/src/audio.c 2020-12-26 18:33:00.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011, 2012 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -109,8 +109,8 @@ } else { - if (Mix_Playing(channel) && (volume <= MIX_MAX_VOLUME / 4) && - (channelVolume[channel] >= MIX_MAX_VOLUME * 3 / 4)) + if (Mix_Playing(channel) && (volume <= MIX_MAX_VOLUME / 4) + && (channelVolume[channel] >= MIX_MAX_VOLUME * 3 / 4)) return; else channelVolume[channel] = volume; @@ -188,25 +188,60 @@ if ((!engine.useMusic) || (!engine.useAudio)) return; +#ifdef OLD_MUSIC + int tracks = 0; + char track[][PATH_MAX] = { + "music/Frantic.mod", "music/Artificial.mod", "music/Lunatic.mod", + "music/ToxicFriend.mod", "music/DigitalInferno.mod", + "music/TempoTrance.mod", "music/IntoTheMachine.mod" + }; + + switch (game.system) + { + case SYSTEM_SPIRIT: + tracks = 3; + break; + case SYSTEM_EYANANTH: + tracks = 5; + break; + case SYSTEM_MORDOR: + case SYSTEM_SOL: + tracks = 7; + break; + default: + tracks = 3; + } +#else int tracks = 4; - char track[][64] = { + char track[][PATH_MAX] = { "music/railjet_short.ogg", "music/space_dimensions.ogg", "music/frozen_jam.ogg", "music/sound_and_silence.ogg" }; +#endif - switch(game.area) + switch (game.area) { +#ifndef OLD_MUSIC case MISN_START: audio_playMusic("music/railjet_short.ogg", -1); break; +#endif case MISN_MOEBO: case MISN_ELAMALE: case MISN_ELLESH: case MISN_EARTH: +#ifdef OLD_MUSIC + audio_playMusic("music/HardTranceDub.mod", -1); +#else audio_playMusic("music/orbital_colossus.ogg", -1); +#endif break; case MISN_VENUS: +#ifdef OLD_MUSIC + audio_playMusic("music/LoopsAndTings.mod", -1); +#else audio_playMusic("music/RE.ogg", -1); +#endif break; default: audio_playMusic(track[rand() % tracks], -1); diff -Nru starfighter-2.3.3/src/audio.h starfighter-2.4/src/audio.h --- starfighter-2.3.3/src/audio.h 2020-05-24 00:55:32.000000000 +0000 +++ starfighter-2.4/src/audio.h 2020-12-26 05:09:29.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011, 2012 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/bullet.c starfighter-2.4/src/bullet.c --- starfighter-2.3.3/src/bullet.c 2020-05-26 17:35:56.000000000 +0000 +++ starfighter-2.4/src/bullet.c 2020-12-26 19:25:03.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011, 2012 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -94,6 +94,15 @@ bullet->damage = theWeapon->damage; + // Adjustments to damage for Classic difficulty (to match original) + if (game.difficulty == DIFFICULTY_ORIGINAL) + { + if (bullet->id == WT_MICROROCKET) + bullet->damage = 3; + else if (bullet->id == WT_SPREAD) + bullet->damage = 1; + } + if (bullet->id == WT_CHARGER) { if (game.difficulty == DIFFICULTY_ORIGINAL) diff -Nru starfighter-2.3.3/src/bullet.h starfighter-2.4/src/bullet.h --- starfighter-2.3.3/src/bullet.h 2020-05-24 00:55:32.000000000 +0000 +++ starfighter-2.4/src/bullet.h 2020-12-26 05:09:29.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/cargo.c starfighter-2.4/src/cargo.c --- starfighter-2.3.3/src/cargo.c 2020-05-24 00:55:33.000000000 +0000 +++ starfighter-2.4/src/cargo.c 2020-12-26 05:09:28.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/cargo.h starfighter-2.4/src/cargo.h --- starfighter-2.3.3/src/cargo.h 2020-05-24 00:55:32.000000000 +0000 +++ starfighter-2.4/src/cargo.h 2020-12-26 05:09:29.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/collectable.c starfighter-2.4/src/collectable.c --- starfighter-2.3.3/src/collectable.c 2020-05-27 00:34:15.000000000 +0000 +++ starfighter-2.4/src/collectable.c 2020-12-26 05:09:28.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011, 2012 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -45,8 +45,8 @@ && (weapons[W_PLAYER_WEAPON].damage <= game.minPlasmaDamage)) || (player.ammo[0] >= game.maxPlasmaAmmo)); - shield_useless = ((game.difficulty == DIFFICULTY_NIGHTMARE) || - (player.shield >= player.maxShield)); + shield_useless = ((game.difficulty == DIFFICULTY_NIGHTMARE) + || (player.shield >= player.maxShield)); rockets_useless = ((player.weaponType[1] == W_CHARGER) || (player.weaponType[1] == W_LASER) @@ -187,8 +187,8 @@ // Shield bonus is useless if you can't heal; give cash instead. if ((type == P_SHIELD) && (game.difficulty != DIFFICULTY_ORIGINAL)) { - if ((game.difficulty == DIFFICULTY_NIGHTMARE) || - (player.shield >= player.maxShield)) + if ((game.difficulty == DIFFICULTY_NIGHTMARE) + || (player.shield >= player.maxShield)) { type = P_CASH; } @@ -338,24 +338,27 @@ while (col != NULL) { - if ((col->type != P_MINE) && (col->type != P_ORE) && - ((col->type != P_SHIELD) || (player.shield < player.maxShield)) && - ((col->type != P_ROCKET) || (player.ammo[1] < game.maxRocketAmmo)) && - ((col->type != P_PLASMA_AMMO) || (player.ammo[0] < game.maxPlasmaAmmo)) && - ((col->type != P_PLASMA_SHOT) || - (player.ammo[0] < game.maxPlasmaAmmo) || - (weapons[W_PLAYER_WEAPON].ammo[0] < game.maxPlasmaOutput)) && - ((col->type != P_PLASMA_DAMAGE) || - (player.ammo[0] < game.maxPlasmaAmmo) || - (weapons[W_PLAYER_WEAPON].damage < game.maxPlasmaDamage)) && - ((col->type != P_PLASMA_RATE) || - (player.ammo[0] < game.maxPlasmaAmmo) || - (weapons[W_PLAYER_WEAPON].reload[0] > rate2reload[game.maxPlasmaRate])) && - ((col->type != P_SUPER) || - (player.ammo[0] < game.maxPlasmaAmmo) || - (weapons[W_PLAYER_WEAPON].ammo[0] < game.maxPlasmaOutput) || - (weapons[W_PLAYER_WEAPON].damage < game.maxPlasmaDamage) || - (weapons[W_PLAYER_WEAPON].reload[0] > rate2reload[game.maxPlasmaRate]))) + if ((col->type != P_MINE) && (col->type != P_ORE) + && ((col->type != P_SHIELD) + || (player.shield < player.maxShield)) + && ((col->type != P_ROCKET) + || (player.ammo[1] < game.maxRocketAmmo)) + && ((col->type != P_PLASMA_AMMO) + || (player.ammo[0] < game.maxPlasmaAmmo)) + && ((col->type != P_PLASMA_SHOT) + || (player.ammo[0] < game.maxPlasmaAmmo) + || (weapons[W_PLAYER_WEAPON].ammo[0] < game.maxPlasmaOutput)) + && ((col->type != P_PLASMA_DAMAGE) + || (player.ammo[0] < game.maxPlasmaAmmo) + || (weapons[W_PLAYER_WEAPON].damage < game.maxPlasmaDamage)) + && ((col->type != P_PLASMA_RATE) + || (player.ammo[0] < game.maxPlasmaAmmo) + || (weapons[W_PLAYER_WEAPON].reload[0] > rate2reload[game.maxPlasmaRate])) + && ((col->type != P_SUPER) + || (player.ammo[0] < game.maxPlasmaAmmo) + || (weapons[W_PLAYER_WEAPON].ammo[0] < game.maxPlasmaOutput) + || (weapons[W_PLAYER_WEAPON].damage < game.maxPlasmaDamage) + || (weapons[W_PLAYER_WEAPON].reload[0] > rate2reload[game.maxPlasmaRate]))) { n++; } diff -Nru starfighter-2.3.3/src/collectable.h starfighter-2.4/src/collectable.h --- starfighter-2.3.3/src/collectable.h 2020-05-24 00:55:32.000000000 +0000 +++ starfighter-2.4/src/collectable.h 2020-12-26 05:09:29.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/colors.c starfighter-2.4/src/colors.c --- starfighter-2.3.3/src/colors.c 2020-05-24 00:55:33.000000000 +0000 +++ starfighter-2.4/src/colors.c 2020-12-26 05:09:28.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011, 2012, 2013 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/colors.h starfighter-2.4/src/colors.h --- starfighter-2.3.3/src/colors.h 2020-05-24 00:55:32.000000000 +0000 +++ starfighter-2.4/src/colors.h 2020-12-26 05:09:29.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/cutscene.c starfighter-2.4/src/cutscene.c --- starfighter-2.3.3/src/cutscene.c 2020-07-16 17:16:47.000000000 +0000 +++ starfighter-2.4/src/cutscene.c 2020-12-26 05:09:28.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011, 2012, 2013 Guus Sliepen -Copyright (C) 2012, 2015-2020 Layla Marchant +Copyright (C) 2012, 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/cutscene.h starfighter-2.4/src/cutscene.h --- starfighter-2.3.3/src/cutscene.h 2020-05-24 00:55:32.000000000 +0000 +++ starfighter-2.4/src/cutscene.h 2020-12-26 05:09:29.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/defs.c starfighter-2.4/src/defs.c --- starfighter-2.3.3/src/defs.c 2020-05-24 00:55:33.000000000 +0000 +++ starfighter-2.4/src/defs.c 2020-12-26 05:09:28.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011, 2012 Guus Sliepen -Copyright (C) 2012, 2015-2020 Layla Marchant +Copyright (C) 2012, 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/defs.h starfighter-2.4/src/defs.h --- starfighter-2.3.3/src/defs.h 2020-07-27 17:05:48.000000000 +0000 +++ starfighter-2.4/src/defs.h 2020-12-26 05:09:29.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011, 2012 Guus Sliepen -Copyright (C) 2012, 2015-2020 Layla Marchant +Copyright (C) 2012, 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -107,6 +107,13 @@ #define JS_DEADZONE 0.05 #define JS_MAX (32767 - JS_DEADZONE*32767) +#define KLINE_STAGE1_SHIELD (aliens[ALIEN_KLINE].maxShield * 3 / 4) +#define KLINE_STAGE2_SHIELD (aliens[ALIEN_KLINE].maxShield / 2) +#define KLINE_STAGE3_SHIELD (aliens[ALIEN_KLINE].maxShield / 4) +#define KLINE_SHIELD_TINY (aliens[ALIEN_KLINE].maxShield / 20) +#define KLINE_SHIELD_SMALL (aliens[ALIEN_KLINE].maxShield / 4) +#define KLINE_SHIELD_MEDIUM (aliens[ALIEN_KLINE].maxShield * 3 / 8) + // Radio life/speed #define RADIO_LIFE_INSTANT 60 #define RADIO_LIFE_FAST 120 diff -Nru starfighter-2.3.3/src/engine.c starfighter-2.4/src/engine.c --- starfighter-2.3.3/src/engine.c 2020-08-04 16:23:29.000000000 +0000 +++ starfighter-2.4/src/engine.c 2020-12-26 05:09:28.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011, 2012, 2013 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -376,7 +376,7 @@ LinkedRect *r1, *r2; ob = engine.bulletHead->next; - while(ob != NULL) + while (ob != NULL) { ob2 = ob; ob = ob->next; @@ -386,7 +386,7 @@ engine.bulletTail = engine.bulletHead; ob = engine.explosionHead->next; - while(ob != NULL) + while (ob != NULL) { ob2 = ob; ob = ob->next; @@ -418,7 +418,7 @@ screen_bufferTail = screen_bufferHead; ob = engine.debrisHead->next; - while(ob != NULL) + while (ob != NULL) { ob2 = ob; ob = ob->next; diff -Nru starfighter-2.3.3/src/engine.h starfighter-2.4/src/engine.h --- starfighter-2.3.3/src/engine.h 2020-07-27 17:05:48.000000000 +0000 +++ starfighter-2.4/src/engine.h 2020-12-26 05:09:29.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/event.c starfighter-2.4/src/event.c --- starfighter-2.3.3/src/event.c 2020-08-27 14:10:49.000000000 +0000 +++ starfighter-2.4/src/event.c 2020-12-26 05:09:28.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011, 2012, 2013 Guus Sliepen -Copyright (C) 2012, 2015-2020 Layla Marchant +Copyright (C) 2012, 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -48,8 +48,8 @@ switch (game.area) { case MISN_INTERCEPTION: - if ((aliens[ALIEN_KLINE].classDef == CD_KLINE) && - (aliens[ALIEN_KLINE].active)) + if ((aliens[ALIEN_KLINE].classDef == CD_KLINE) + && (aliens[ALIEN_KLINE].active)) { events[0].time = 2; events[0].face = FS_KLINE; @@ -399,6 +399,10 @@ events[1].face = FS_KLINE; /// Dialog (Kline Kethlan) strcpy(events[1].message, _("You underestimate me, Bainfield.")); + if (game.difficulty == DIFFICULTY_ORIGINAL) { + events[1].entity = ALIEN_KLINE; + events[1].flag = -(FL_IMMORTAL | FL_NOMOVE | FL_NOFIRE); + } break; } diff -Nru starfighter-2.3.3/src/event.h starfighter-2.4/src/event.h --- starfighter-2.3.3/src/event.h 2020-05-24 00:55:32.000000000 +0000 +++ starfighter-2.4/src/event.h 2020-12-26 05:09:29.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/explosion.c starfighter-2.4/src/explosion.c --- starfighter-2.3.3/src/explosion.c 2020-05-24 00:55:33.000000000 +0000 +++ starfighter-2.4/src/explosion.c 2020-12-26 05:09:28.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/explosion.h starfighter-2.4/src/explosion.h --- starfighter-2.3.3/src/explosion.h 2020-05-24 00:55:32.000000000 +0000 +++ starfighter-2.4/src/explosion.h 2020-12-26 05:09:29.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/game.c starfighter-2.4/src/game.c --- starfighter-2.3.3/src/game.c 2020-09-15 17:07:13.000000000 +0000 +++ starfighter-2.4/src/game.c 2020-12-26 16:58:49.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011, 2012, 2013 Guus Sliepen -Copyright (C) 2012, 2014-2020 Layla Marchant +Copyright (C) 2012, 2014-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -175,12 +175,7 @@ player.weaponType[0] = W_PLAYER_WEAPON; player.weaponType[1] = W_ROCKETS; - for (int i = 0 ; i < STARS_NUM ; i++) - { - stars[i].x = rand() % screen->w; - stars[i].y = rand() % screen->h; - stars[i].speed = 1 + (rand() % 3); - } + game_setStars(); weapons_init(); mission_init(); @@ -229,6 +224,19 @@ } /* +Sets star positions. Must do this any time the window size changes. +*/ +void game_setStars() +{ + for (int i = 0 ; i < STARS_NUM ; i++) + { + stars[i].x = rand() % screen->w; + stars[i].y = rand() % screen->h; + stars[i].speed = 1 + (rand() % 3); + } +} + +/* Simply draws the stars in their positions on screen and moves them around. */ @@ -294,10 +302,10 @@ if (collectable->active) { - if ((collectable->x + collectable->image->w > 0) && - (collectable->x < screen->w) && - (collectable->y + collectable->image->h > 0) && - (collectable->y < screen->h)) + if ((collectable->x + collectable->image->w > 0) + && (collectable->x < screen->w) + && (collectable->y + collectable->image->h > 0) + && (collectable->y < screen->h)) screen_blit(collectable->image, (int)collectable->x, (int)collectable->y); collectable->x += engine.ssx + engine.smx; @@ -567,9 +575,9 @@ if (collectable->life < 1) { collectable->active = 0; - if ((collectable->type == P_CARGO) || - (collectable->type == P_ESCAPEPOD) || - (collectable->type == P_SLAVES)) + if ((collectable->type == P_CARGO) + || (collectable->type == P_ESCAPEPOD) + || (collectable->type == P_SLAVES)) mission_updateRequirements(M_PROTECT_PICKUP, collectable->type, 1); } @@ -580,9 +588,9 @@ } else { - if ((collectable->type == P_MINE) && (collectable->x >= 0) && - (collectable->x <= screen->w) && (collectable->y >= 0) && - (collectable->y <= screen->h)) + if ((collectable->type == P_MINE) && (collectable->x >= 0) + && (collectable->x <= screen->w) && (collectable->y >= 0) + && (collectable->y <= screen->h)) collectable_explode(collectable); prevCollectable->next = collectable->next; free(collectable); @@ -708,8 +716,8 @@ okayToHit = 1; if ((bullet->flags & WF_WEAPCO) && (aliens[i].flags & FL_FRIEND)) okayToHit = 1; - if ((bullet->id == WT_ROCKET) || (bullet->id == WT_LASER) || - (bullet->id == WT_CHARGER)) + if ((bullet->id == WT_ROCKET) || (bullet->id == WT_LASER) + || (bullet->id == WT_CHARGER)) okayToHit = 1; if (bullet->owner == aliens[i].owner) @@ -815,11 +823,12 @@ } // Check for bullets hitting player - if ((bullet->flags & WF_WEAPCO) || (bullet->id == WT_ROCKET) || - (bullet->id == WT_LASER) || (bullet->id == WT_CHARGER)) + if ((bullet->flags & WF_WEAPCO) || (bullet->id == WT_ROCKET) + || (bullet->id == WT_LASER) || (bullet->id == WT_CHARGER)) { - if (bullet->active && (player.shield > 0) && - (bullet->owner != &player) && bullet_collision(bullet, &player)) + if (bullet->active && (player.shield > 0) + && (bullet->owner != &player) + && bullet_collision(bullet, &player)) { old_shield = player.shield; @@ -1024,14 +1033,16 @@ if (aliens[i].face == 0) aliens[i].x = aliens[i].owner->x - aliens[i].dx; else - aliens[i].x = aliens[i].owner->x + aliens[i].owner->image[0]->w + aliens[i].dx - aliens[i].image[0]->w; + aliens[i].x = (aliens[i].owner->x + aliens[i].dx + + aliens[i].owner->image[0]->w + - aliens[i].image[0]->w); aliens[i].y = (aliens[i].owner->y + aliens[i].dy); if (aliens[i].owner->shield < 1) { - if ((aliens[i].classDef != CD_URANUSBOSSWING1) && - (aliens[i].classDef != CD_URANUSBOSSWING2)) + if ((aliens[i].classDef != CD_URANUSBOSSWING1) + && (aliens[i].classDef != CD_URANUSBOSSWING2)) { aliens[i].shield = 0; } @@ -1052,8 +1063,8 @@ aliens[i].target = &aliens[i]; // Specific to Sid to stop him pissing about(!) - if ((aliens[i].classDef == CD_SID) && - (aliens[i].target->flags & FL_DISABLED)) + if ((aliens[i].classDef == CD_SID) + && (aliens[i].target->flags & FL_DISABLED)) aliens[i].target = &aliens[i]; if (aliens[i].target == &aliens[i]) @@ -1072,9 +1083,9 @@ } } - if ((!(aliens[i].flags & FL_DISABLED)) && - (aliens[i].thinktime == 0) && (aliens[i].target != &aliens[i]) && - (aliens[i].owner == &aliens[i])) + if ((!(aliens[i].flags & FL_DISABLED)) + && (aliens[i].thinktime == 0) && (aliens[i].target != &aliens[i]) + && (aliens[i].owner == &aliens[i])) { if (aliens[i].classDef == CD_KLINE) alien_setKlineAI(&aliens[i]); @@ -1101,9 +1112,9 @@ if (aliens[i].x > aliens[i].target->x) aliens[i].face = 1; } - if ((game.area == MISN_ELLESH) && - ((aliens[i].classDef == CD_BOSS) || - (game.difficulty != DIFFICULTY_ORIGINAL))) + if ((game.area == MISN_ELLESH) + && ((aliens[i].classDef == CD_BOSS) + || (game.difficulty != DIFFICULTY_ORIGINAL))) aliens[i].face = 0; if ((aliens[i].flags & FL_DEPLOYDRONES) && ((rand() % 300) == 0)) @@ -1122,8 +1133,8 @@ if (aliens[i].x >= 5000) { - aliens[i].flags -= FL_LEAVESECTOR; - aliens[i].flags += FL_ESCAPED; + aliens[i].flags &= ~FL_LEAVESECTOR; + aliens[i].flags |= FL_ESCAPED; aliens[i].active = 0; if (aliens[i].classDef == CD_CLOAKFIGHTER) @@ -1163,9 +1174,9 @@ aliens[i].dy = 20 + (cosf(barrierLoop + aliens[i].speed) * 40); } - if ((aliens[i].classDef == CD_MOBILESHIELD) && - (aliens[ALIEN_BOSS].active) && - (aliens[ALIEN_BOSS].shield > 0)) + if ((aliens[i].classDef == CD_MOBILESHIELD) + && (aliens[ALIEN_BOSS].active) + && (aliens[ALIEN_BOSS].shield > 0)) { LIMIT_ADD(aliens[ALIEN_BOSS].shield, 1, 0, aliens[ALIEN_BOSS].maxShield); @@ -1174,14 +1185,14 @@ LIMIT_ADD(aliens[i].reload[0], -1, 0, 999); LIMIT_ADD(aliens[i].reload[1], -1, 0, 999); - if ((!(aliens[i].flags & FL_DISABLED)) && - (!(aliens[i].flags & FL_NOFIRE))) + if ((!(aliens[i].flags & FL_DISABLED)) + && (!(aliens[i].flags & FL_NOFIRE))) { if ((aliens[i].target->shield > 0)) canFire = alien_checkTarget(&aliens[i]); - if (((aliens[i].thinktime % 2) == 0) && - (aliens[i].flags & FL_FRIEND)) + if (((aliens[i].thinktime % 2) == 0) + && (aliens[i].flags & FL_FRIEND)) canFire = alien_enemiesInFront(&aliens[i]); } else @@ -1193,12 +1204,12 @@ { for (int j = 0 ; j < 2 ; j++) { - if ((aliens[i].reload[j] == 0) && - ((rand() % 1000 < aliens[i].chance[j]) || - (aliens[i].flags & FL_CONTINUOUS_FIRE))) + if ((aliens[i].reload[j] == 0) + && ((rand() % 1000 < aliens[i].chance[j]) + || (aliens[i].flags & FL_CONTINUOUS_FIRE))) { - if ((aliens[i].weaponType[j] != W_ENERGYRAY) && - (aliens[i].weaponType[j] != W_LASER)) + if ((aliens[i].weaponType[j] != W_ENERGYRAY) + && (aliens[i].weaponType[j] != W_LASER)) { if (aliens[i].weaponType[j] == W_CHARGER) aliens[i].ammo[j] = 50 + rand() % 150; @@ -1211,8 +1222,8 @@ // Note: ammo[0] is required whether the ray is primary // or secondary because futher below, ammo[0] increases on // any alien that isn't currently firing a ray. - else if ((aliens[i].weaponType[j] == W_ENERGYRAY) && - (aliens[i].ammo[0] >= RAY_INTERVAL)) + else if ((aliens[i].weaponType[j] == W_ENERGYRAY) + && (aliens[i].ammo[0] >= RAY_INTERVAL)) { aliens[i].flags += FL_FIRERAY; audio_playSound(SFX_ENERGYRAY, aliens[i].x, aliens[i].y); @@ -1259,16 +1270,17 @@ LIMIT_ADD(aliens[i].hit, -1, 0, 100); - if ((aliens[i].x + aliens[i].image[0]->w > 0) && - (aliens[i].x < screen->w) && - (aliens[i].y + aliens[i].image[0]->h > 0) && - (aliens[i].y < screen->h)) - { - if ((!(aliens[i].flags & FL_DISABLED)) && - (aliens[i].classDef != CD_ASTEROID) && - (aliens[i].classDef != CD_ASTEROID2)) + if ((aliens[i].x + aliens[i].image[0]->w > 0) + && (aliens[i].x < screen->w) + && (aliens[i].y + aliens[i].image[0]->h > 0) + && (aliens[i].y < screen->h)) + { + if ((!(aliens[i].flags & FL_DISABLED)) + && (aliens[i].classDef != CD_ASTEROID) + && (aliens[i].classDef != CD_ASTEROID2)) explosion_addEngine(&aliens[i]); - if ((!(aliens[i].flags & FL_ISCLOAKED)) || (aliens[i].hit > 0)) + if ((!(aliens[i].flags & FL_ISCLOAKED)) + || (aliens[i].hit > 0)) screen_blit(gfx_shipSprites[shapeToUse], (int)aliens[i].x, (int)aliens[i].y); if (aliens[i].flags & FL_DISABLED) @@ -1320,8 +1332,8 @@ } // Adjust the movement even whilst exploding - if ((!(aliens[i].flags & FL_NOMOVE)) && - (!(aliens[i].flags & FL_DISABLED))) + if ((!(aliens[i].flags & FL_NOMOVE)) + && (!(aliens[i].flags & FL_DISABLED))) alien_move(&aliens[i]); if ((game.area != MISN_ELLESH) || (aliens[i].shield < 0)) @@ -1360,8 +1372,9 @@ if ((engine.keyState[KEY_ALTFIRE]) && (player.weaponType[1] != W_NONE)) { - if ((player.weaponType[1] != W_CHARGER) && - (player.weaponType[1] != W_LASER) && (player.ammo[1] > 0)) + if ((player.weaponType[1] != W_CHARGER) + && (player.weaponType[1] != W_LASER) + && (player.ammo[1] > 0)) { ship_fireBullet(&player, 1); } @@ -1386,9 +1399,9 @@ if (player.weaponType[1] == W_CHARGER) { - if (engine.keyState[KEY_ALTFIRE] && - ((game.difficulty == DIFFICULTY_ORIGINAL) || - !(engine.keyState[KEY_FIRE]))) + if (engine.keyState[KEY_ALTFIRE] + && ((game.difficulty == DIFFICULTY_ORIGINAL) + || !(engine.keyState[KEY_FIRE]))) { if (!player_chargerFired) { @@ -1424,8 +1437,9 @@ if ((engine.keyState[KEY_SWITCH])) { - if ((weapons[W_PLAYER_WEAPON].ammo[0] >= 3) && - (weapons[W_PLAYER_WEAPON].ammo[0] <= game.maxPlasmaOutput)) + if ((weapons[W_PLAYER_WEAPON].ammo[0] >= 3) + && ((weapons[W_PLAYER_WEAPON].ammo[0] <= game.maxPlasmaOutput) + || (game.difficulty == DIFFICULTY_ORIGINAL))) { weapons[W_PLAYER_WEAPON].flags ^= WF_SPREAD; @@ -1470,9 +1484,9 @@ if (engine.keyState[KEY_ESCAPE]) { - if ((engine.done == ENGINE_RUNNING) && - (engine.gameSection == SECTION_GAME) && - (mission.remainingObjectives1 == 0)) + if ((engine.done == ENGINE_RUNNING) + && (engine.gameSection == SECTION_GAME) + && (mission.remainingObjectives1 == 0)) { audio_playSound(SFX_FLY, screen->w / 2, screen->h / 2); engine.done = ENGINE_SYSEXIT; @@ -1486,8 +1500,8 @@ engine.keyState[KEY_PAUSE] = 0; } - if ((game.area == MISN_ELLESH) || - (game.area == MISN_MARS)) + if ((game.area == MISN_ELLESH) + || (game.area == MISN_MARS)) { player.face = 0; xmoved = 1; @@ -1575,8 +1589,8 @@ LIMIT_ADD(player.hit, -1, 0, 100); screen_blit(gfx_shipSprites[shapeToUse], (int)player.x, (int)player.y); - if ((player.maxShield > 1) && (player.shield <= engine.lowShield) && - CHANCE(1. / 10)) + if ((player.maxShield > 1) && (player.shield <= engine.lowShield) + && CHANCE(player.shield > 1 ? 1. / 10 : 3. / 10)) explosion_add(player.x + RANDRANGE(-10, 10), player.y + RANDRANGE(-10, 20), SP_SMOKE); } @@ -1601,7 +1615,7 @@ /// following the English version only as a general guideline. Any /// number of insults is permitted. "Fool.\n" - "And now you're nothing but a DEAD hero.\n" + "And now you're nothing but a DEAD hero." )); radio_setMessage(FS_KLINE, msg, 1); } @@ -1658,8 +1672,8 @@ LIMIT(engine.ssy, -CAMERA_MAX_SPEED, CAMERA_MAX_SPEED); // Specific for the mission were you have to chase the Executive Transport - if (((game.area == MISN_ELLESH) && (player.shield > 0)) || - (game.area == MISN_MARS)) + if (((game.area == MISN_ELLESH) && (player.shield > 0)) + || (game.area == MISN_MARS)) { engine.ssx = -6; engine.ssy = 0; @@ -1816,41 +1830,41 @@ if (aliens[i].x + aliens[i].image[0]->w < 0) { if (aliens[i].y + aliens[i].image[0]->h < 0) - arrow = (((game.difficulty != DIFFICULTY_ORIGINAL) && - (aliens[i].flags & FL_FRIEND)) ? - SP_ARROW_FRIEND_NORTHWEST : SP_ARROW_NORTHWEST); + arrow = (((game.difficulty != DIFFICULTY_ORIGINAL) + && (aliens[i].flags & FL_FRIEND)) ? + SP_ARROW_FRIEND_NORTHWEST : SP_ARROW_NORTHWEST); else if (aliens[i].y > screen->h) - arrow = (((game.difficulty != DIFFICULTY_ORIGINAL) && - (aliens[i].flags & FL_FRIEND)) ? - SP_ARROW_FRIEND_SOUTHWEST : SP_ARROW_SOUTHWEST); + arrow = (((game.difficulty != DIFFICULTY_ORIGINAL) + && (aliens[i].flags & FL_FRIEND)) ? + SP_ARROW_FRIEND_SOUTHWEST : SP_ARROW_SOUTHWEST); else - arrow = (((game.difficulty != DIFFICULTY_ORIGINAL) && - (aliens[i].flags & FL_FRIEND)) ? - SP_ARROW_FRIEND_WEST : SP_ARROW_WEST); + arrow = (((game.difficulty != DIFFICULTY_ORIGINAL) + && (aliens[i].flags & FL_FRIEND)) ? + SP_ARROW_FRIEND_WEST : SP_ARROW_WEST); } else if (aliens[i].x > screen->w) { if (aliens[i].y + aliens[i].image[0]->h < 0) - arrow = (((game.difficulty != DIFFICULTY_ORIGINAL) && - (aliens[i].flags & FL_FRIEND)) ? - SP_ARROW_FRIEND_NORTHEAST : SP_ARROW_NORTHEAST); + arrow = (((game.difficulty != DIFFICULTY_ORIGINAL) + && (aliens[i].flags & FL_FRIEND)) ? + SP_ARROW_FRIEND_NORTHEAST : SP_ARROW_NORTHEAST); else if (aliens[i].y > screen->h) - arrow = (((game.difficulty != DIFFICULTY_ORIGINAL) && - (aliens[i].flags & FL_FRIEND)) ? - SP_ARROW_FRIEND_SOUTHEAST : SP_ARROW_SOUTHEAST); + arrow = (((game.difficulty != DIFFICULTY_ORIGINAL) + && (aliens[i].flags & FL_FRIEND)) ? + SP_ARROW_FRIEND_SOUTHEAST : SP_ARROW_SOUTHEAST); else - arrow = (((game.difficulty != DIFFICULTY_ORIGINAL) && - (aliens[i].flags & FL_FRIEND)) ? - SP_ARROW_FRIEND_EAST : SP_ARROW_EAST); + arrow = (((game.difficulty != DIFFICULTY_ORIGINAL) + && (aliens[i].flags & FL_FRIEND)) ? + SP_ARROW_FRIEND_EAST : SP_ARROW_EAST); } else if (aliens[i].y + aliens[i].image[0]->h < 0) - arrow = (((game.difficulty != DIFFICULTY_ORIGINAL) && - (aliens[i].flags & FL_FRIEND)) ? - SP_ARROW_FRIEND_NORTH : SP_ARROW_NORTH); + arrow = (((game.difficulty != DIFFICULTY_ORIGINAL) + && (aliens[i].flags & FL_FRIEND)) ? + SP_ARROW_FRIEND_NORTH : SP_ARROW_NORTH); else if (aliens[i].y > screen->h) - arrow = (((game.difficulty != DIFFICULTY_ORIGINAL) && - (aliens[i].flags & FL_FRIEND)) ? - SP_ARROW_FRIEND_SOUTH : SP_ARROW_SOUTH); + arrow = (((game.difficulty != DIFFICULTY_ORIGINAL) + && (aliens[i].flags & FL_FRIEND)) ? + SP_ARROW_FRIEND_SOUTH : SP_ARROW_SOUTH); if (arrow != -1) { @@ -1908,6 +1922,7 @@ int tTextIndex; char text[STRMAX_SHORT]; float nbars; // A float for the sake of float division + float min_shield, max_shield; float shield_pct; int i; int c; @@ -2038,8 +2053,8 @@ events_check(); } - if ((engine.timeMission) && (player.shield > 0) && - ((!engine.cheatTime) || (game.area == MISN_MARS))) + if ((engine.timeMission) && (player.shield > 0) + && ((!engine.cheatTime) || (game.area == MISN_MARS))) { if (SDL_GetTicks() >= engine.counter) { @@ -2113,8 +2128,8 @@ // Do the target's remaining shield (if required) if (game.area != MISN_DORIM) { - if ((engine.targetIndex > -1) && (aliens[engine.targetIndex].shield > 0) && - (engine.targetIndex > engine.maxAliens)) + if ((engine.targetIndex > -1) && (aliens[engine.targetIndex].shield > 0) + && (engine.targetIndex > engine.maxAliens)) { if (game.difficulty == DIFFICULTY_ORIGINAL) { @@ -2139,8 +2154,62 @@ bar.x = screen->w * 11 / 16 + gfx_textSprites[tTextIndex].image->w + 10; bar.y = screen->h - 50; nbars = 85.; - shield_pct = ((float)aliens[engine.targetIndex].shield - / (float)aliens[engine.targetIndex].maxShield); + if (engine.targetIndex == ALIEN_KLINE + && game.difficulty == DIFFICULTY_ORIGINAL) + { + if (game.area == MISN_ELAMALE) + { + max_shield = aliens[engine.targetIndex].maxShield; + min_shield = max_shield - KLINE_SHIELD_MEDIUM; + } + else if (game.area == MISN_EARTH) + { + max_shield = aliens[engine.targetIndex].maxShield; + min_shield = max_shield - KLINE_SHIELD_SMALL; + } + else if (game.area == MISN_VENUS) + { + if (aliens[ALIEN_KLINE].shield > KLINE_STAGE1_SHIELD) + { + max_shield = aliens[engine.targetIndex].maxShield; + min_shield = KLINE_STAGE1_SHIELD; + } + else if (aliens[ALIEN_KLINE].shield > KLINE_STAGE2_SHIELD) + { + max_shield = KLINE_STAGE1_SHIELD; + min_shield = KLINE_STAGE2_SHIELD; + } + else if (aliens[ALIEN_KLINE].shield > KLINE_STAGE3_SHIELD) + { + max_shield = KLINE_STAGE2_SHIELD; + min_shield = KLINE_STAGE3_SHIELD; + } + else + { + max_shield = KLINE_STAGE3_SHIELD; + min_shield = 0; + } + } + else + { + max_shield = aliens[engine.targetIndex].maxShield; + min_shield = max_shield - KLINE_SHIELD_TINY; + } + + if (min_shield > 0) + shield_pct = ( + MAX((float)aliens[engine.targetIndex].shield - min_shield, 1.) + / (max_shield-min_shield)); + else + shield_pct = ( + ((float)aliens[engine.targetIndex].shield - min_shield) + / (max_shield-min_shield)); + } + else + { + shield_pct = ((float)aliens[engine.targetIndex].shield + / (float)aliens[engine.targetIndex].maxShield); + } for (i = 0 ; i < nbars ; i++) { @@ -2379,7 +2448,11 @@ screen_clear(black); SDL_Delay(1000); +#ifdef OLD_MUSIC + audio_playMusic("music/Wybierak.mod", -1); +#else audio_playMusic("music/death.ogg", -1); +#endif int x = (screen->w - gameover->w) / 2; int y = (screen->h - gameover->h) / 2; @@ -2473,9 +2546,9 @@ if (game.hasWingMate2) alien_addFriendly(ALIEN_URSULA); - if ((game.area == MISN_URUSOR) || - (game.area == MISN_POSWIC) || - (game.area == MISN_EARTH)) + if ((game.area == MISN_URUSOR) + || (game.area == MISN_POSWIC) + || (game.area == MISN_EARTH)) alien_addFriendly(ALIEN_SID); // Disable Wingmates for certain missions @@ -2534,8 +2607,17 @@ if (game.area == MISN_VENUS) { - aliens[ALIEN_KLINE].x = player.x + 1000; - aliens[ALIEN_KLINE].y = player.y; + if (game.difficulty == DIFFICULTY_ORIGINAL) + { + aliens[ALIEN_KLINE].flags |= FL_IMMORTAL | FL_NOFIRE | FL_NOMOVE; + aliens[ALIEN_KLINE].x = screen->w * 3 / 4; + aliens[ALIEN_KLINE].y = screen->h / 2; + } + else + { + aliens[ALIEN_KLINE].x = player.x + 1000; + aliens[ALIEN_KLINE].y = player.y; + } } for (int i = 0 ; i < ALIEN_MAX ; i++) @@ -2604,8 +2686,8 @@ for (int i = 0 ; i < 3 ; i++) { - if ((mission.primaryType[i] == M_DESTROY_TARGET_TYPE) && - (mission.target1[i] == CD_ANY)) + if ((mission.primaryType[i] == M_DESTROY_TARGET_TYPE) + && (mission.target1[i] == CD_ANY)) allowableAliens = mission.targetValue1[i]; if (mission.primaryType[i] == M_DESTROY_ALL_TARGETS) @@ -2650,41 +2732,41 @@ engine.gameSection = SECTION_INTERMISSION; if (player.shield > 0) { - if ((SDL_GetTicks() >= engine.missionCompleteTimer) && - ((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) || - (engine.done == ENGINE_SYSEXIT))) + if ((SDL_GetTicks() >= engine.missionCompleteTimer) + && ((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) + || (engine.done == ENGINE_SYSEXIT))) { if ((!mission_checkFailed()) && (game.area != MISN_VENUS)) { player_leaveSector(); - if ((engine.done == ENGINE_SYSEXIT) && - (game.area != MISN_DORIM) && - (game.area != MISN_SIVEDI)) + if ((engine.done == ENGINE_SYSEXIT) + && (game.area != MISN_DORIM) + && (game.area != MISN_SIVEDI)) { - if ((aliens[ALIEN_PHOEBE].shield > 0) && - (game.area != MISN_EARTH)) + if ((aliens[ALIEN_PHOEBE].shield > 0) + && (game.area != MISN_EARTH)) { aliens[ALIEN_PHOEBE].x = player.x - 40; aliens[ALIEN_PHOEBE].y = player.y - 35; aliens[ALIEN_PHOEBE].face = 0; } - if ((aliens[ALIEN_URSULA].shield > 0) && - (game.area != MISN_EARTH)) + if ((aliens[ALIEN_URSULA].shield > 0) + && (game.area != MISN_EARTH)) { aliens[ALIEN_URSULA].x = player.x - 40; aliens[ALIEN_URSULA].y = player.y + 45; aliens[ALIEN_URSULA].face = 0; } - if ((game.area == MISN_URUSOR) || - (game.area == MISN_POSWIC)) + if ((game.area == MISN_URUSOR) + || (game.area == MISN_POSWIC)) { aliens[ALIEN_SID].x = player.x - 100; aliens[ALIEN_SID].y = player.y; @@ -2692,9 +2774,10 @@ } } } - else if ((game.area == MISN_VENUS) && - (engine.musicVolume > 0)) + else if ((game.area == MISN_VENUS) + && (engine.musicVolume > 0)) { + player_getInput(); engine.keyState[KEY_UP] = 0; engine.keyState[KEY_DOWN] = 0; engine.keyState[KEY_LEFT] = 0; @@ -2718,6 +2801,7 @@ } else { + player_getInput(); LIMIT_ADD(engine.musicVolume, -0.2, 0, 100); audio_setMusicVolume(engine.musicVolume); if (SDL_GetTicks() >= engine.missionCompleteTimer) @@ -2806,8 +2890,8 @@ engine.missionCompleteTimer = SDL_GetTicks() + 7000; // specific to Boss 1 - if ((game.area == MISN_MOEBO) && - (aliens[ALIEN_BOSS].flags & FL_ESCAPED)) + if ((game.area == MISN_MOEBO) + && (aliens[ALIEN_BOSS].flags & FL_ESCAPED)) { audio_playSound(SFX_DEATH, aliens[ALIEN_BOSS].x, aliens[ALIEN_BOSS].y); screen_clear(white); diff -Nru starfighter-2.3.3/src/game.h starfighter-2.4/src/game.h --- starfighter-2.3.3/src/game.h 2020-05-27 02:06:14.000000000 +0000 +++ starfighter-2.4/src/game.h 2020-12-26 05:09:29.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -99,6 +99,7 @@ extern char game_systemNames[SYSTEM_MAX][STRMAX_SHORT]; void game_init(); +void game_setStars(); void game_doStars(); void game_doExplosions(); void game_delayFrame(); diff -Nru starfighter-2.3.3/src/gfx.c starfighter-2.4/src/gfx.c --- starfighter-2.3.3/src/gfx.c 2020-07-27 14:05:05.000000000 +0000 +++ starfighter-2.4/src/gfx.c 2020-12-26 05:09:28.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011, 2012, 2013 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -646,9 +646,11 @@ gfx_textSprites[index].life = 0; /* Shortcut: if we already rendered the same string in the same color, don't render it again. */ - if (gfx_textSprites[index].text && gfx_textSprites[index].image && - gfx_textSprites[index].fontColor == fontColor && - !strcmp(gfx_textSprites[index].text, inString)) + // TODO: Double-check this, I think it's trying to test if gfx_textSprites[index].image is NULL. + // Also, check what `text` will be when "empty". + if (gfx_textSprites[index].text && gfx_textSprites[index].image + && (gfx_textSprites[index].fontColor == fontColor) + && (strcmp(gfx_textSprites[index].text, inString) == 0)) { gfx_textSprites[index].x = x; gfx_textSprites[index].y = y; diff -Nru starfighter-2.3.3/src/gfx.h starfighter-2.4/src/gfx.h --- starfighter-2.3.3/src/gfx.h 2020-05-24 00:55:32.000000000 +0000 +++ starfighter-2.4/src/gfx.h 2020-12-26 05:09:29.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/info.c starfighter-2.4/src/info.c --- starfighter-2.3.3/src/info.c 2020-07-16 17:00:39.000000000 +0000 +++ starfighter-2.4/src/info.c 2020-12-26 05:09:28.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011, 2012, 2013 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/info.h starfighter-2.4/src/info.h --- starfighter-2.3.3/src/info.h 2020-05-24 00:55:32.000000000 +0000 +++ starfighter-2.4/src/info.h 2020-12-26 05:09:29.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/intermission.c starfighter-2.4/src/intermission.c --- starfighter-2.3.3/src/intermission.c 2020-09-05 22:19:43.000000000 +0000 +++ starfighter-2.4/src/intermission.c 2020-12-26 16:58:45.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011, 2012, 2013 Guus Sliepen -Copyright (C) 2012, 2015-2020 Layla Marchant +Copyright (C) 2012, 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -693,10 +693,10 @@ r.y -= (intermission_planets[planet].image->h / 2); screen_blit(intermission_planets[planet].image, r.x, r.y); - if (selectable && - game_collision(engine.cursor_x + 13, engine.cursor_y + 13, 6, 6, - r.x, r.y, intermission_planets[planet].image->w, - intermission_planets[planet].image->h)) + if (selectable + && game_collision(engine.cursor_x + 13, engine.cursor_y + 13, + 6, 6, r.x, r.y, intermission_planets[planet].image->w, + intermission_planets[planet].image->h)) { if (!printedName) { @@ -754,8 +754,8 @@ for (int i = TS_STATUS_HEADER + 1 ; i < TS_STATUS_FOOTER ; i++) { y += 20; - if ((i == TS_CHRIS_HEADER) || (i == TS_PHOEBE_HEADER) || - (i == TS_URSULA_HEADER)) + if ((i == TS_CHRIS_HEADER) || (i == TS_PHOEBE_HEADER) + || (i == TS_URSULA_HEADER)) y += 25; gfx_textSprites[i].y = y; @@ -1318,7 +1318,11 @@ if (game_collision(engine.cursor_x + 13, engine.cursor_y + 13, 6, 6, x + 187, y + 92, 45, 22)) { engine.useMusic = 1; +#ifdef OLD_MUSIC + audio_playMusic("music/3DParadise.mod", -1); +#else audio_playMusic("music/through_space.ogg", -1); +#endif } if (game_collision(engine.cursor_x + 13, engine.cursor_y + 13, 6, 6, x + 248, y + 92, 45, 22)) @@ -1500,7 +1504,11 @@ } if ((engine.useAudio) && (engine.useMusic)) +#ifdef OLD_MUSIC + audio_playMusic("music/3DParadise.mod", -1); +#else audio_playMusic("music/through_space.ogg", -1); +#endif /// Retain "%s" as-is. It is replaced with the current system name. snprintf(string, STRMAX_SHORT, _("System : %s"), game_systemNames[game.system]); @@ -1729,8 +1737,8 @@ x = screen->w / 16; y = screen->h - 80; w = screen->w - 2 * x - 32; - if ((game.stationedPlanet == game.destinationPlanet) && - (!intermission_planets[game.stationedPlanet].missionCompleted)) + if ((game.stationedPlanet == game.destinationPlanet) + && (!intermission_planets[game.stationedPlanet].missionCompleted)) screen_blit(gfx_sprites[SP_START_MISSION], x, y); else if (game.stationedPlanet != game.destinationPlanet) screen_blit(gfx_sprites[SP_GOTO], x, y); @@ -1743,9 +1751,9 @@ screen_blit(gfx_sprites[SP_OPTIONS], x + 6 * w / 7, y); screen_blit(gfx_sprites[SP_EXIT], x + w, y); - if (game_collision(engine.cursor_x + 13, engine.cursor_y + 13, 6, 6, x, y, 32, 32) && - ((game.stationedPlanet != game.destinationPlanet) || - (!intermission_planets[game.stationedPlanet].missionCompleted))) + if (game_collision(engine.cursor_x + 13, engine.cursor_y + 13, 6, 6, x, y, 32, 32) + && ((game.stationedPlanet != game.destinationPlanet) + || (!intermission_planets[game.stationedPlanet].missionCompleted))) { if (game.stationedPlanet == game.destinationPlanet) screen_blitText(TS_INFO_START_MISSION, -1, screen->h - 25); diff -Nru starfighter-2.3.3/src/intermission.h starfighter-2.4/src/intermission.h --- starfighter-2.3.3/src/intermission.h 2020-05-24 00:55:32.000000000 +0000 +++ starfighter-2.4/src/intermission.h 2020-12-26 05:09:29.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/Makefile.in starfighter-2.4/src/Makefile.in --- starfighter-2.3.3/src/Makefile.in 2020-09-20 16:07:32.000000000 +0000 +++ starfighter-2.4/src/Makefile.in 2020-12-26 23:19:11.000000000 +0000 @@ -263,9 +263,11 @@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SF_NOFONT = @SF_NOFONT@ +SF_OLD_MUSIC = @SF_OLD_MUSIC@ SF_RUN_IN_PLACE = @SF_RUN_IN_PLACE@ SF_SCREEN_HEIGHT = @SF_SCREEN_HEIGHT@ SF_SCREEN_WIDTH = @SF_SCREEN_WIDTH@ +SF_UNHARDEN = @SF_UNHARDEN@ SF_WARN = @SF_WARN@ SHELL = @SHELL@ STARFIGHTER_CPPFLAGS = @STARFIGHTER_CPPFLAGS@ diff -Nru starfighter-2.3.3/src/mission.c starfighter-2.4/src/mission.c --- starfighter-2.3.3/src/mission.c 2020-08-27 14:10:49.000000000 +0000 +++ starfighter-2.4/src/mission.c 2020-12-26 16:58:35.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011, 2012, 2013 Guus Sliepen -Copyright (C) 2012, 2015-2020 Layla Marchant +Copyright (C) 2012, 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -565,8 +565,8 @@ { for (int i = 0 ; i < ALIEN_MAX ; i++) { - if ((aliens[i].flags & FL_WEAPCO) && (aliens[i].active) && - (aliens[i].shield > 0)) + if ((aliens[i].flags & FL_WEAPCO) && (aliens[i].active) + && (aliens[i].shield > 0)) aliens[i].shield = 0; } } @@ -596,13 +596,13 @@ } // specific to Spirit Boss - if ((game.area == MISN_MOEBO) && - (mission.completed1[0] < OB_INCOMPLETE)) + if ((game.area == MISN_MOEBO) + && (mission.completed1[0] < OB_INCOMPLETE)) engine.timeMission = 1; // specific to the Asteroid belt - if ((game.area == MISN_MARS) && - (mission.completed1[0] < OB_INCOMPLETE)) + if ((game.area == MISN_MARS) + && (mission.completed1[0] < OB_INCOMPLETE)) { mission.completed1[0] = OB_COMPLETED; mission_killAllEnemies(); @@ -616,8 +616,8 @@ char message[STRMAX_SHORT]; char fmt[STRMAX_SHORT]; - if ((*targetValue <= 0) && (type != M_PROTECT_TARGET) && - (type != M_PROTECT_PICKUP)) + if ((*targetValue <= 0) && (type != M_PROTECT_TARGET) + && (type != M_PROTECT_PICKUP)) { *completed = OB_JUST_COMPLETED; mission_checkTimer(); @@ -814,9 +814,9 @@ { if ((mission.completed1[i] == OB_INCOMPLETE) || (mission.completed1[i] == OB_CONDITION)) { - if ((mission.primaryType[i] == type) && - ((mission.target1[i] == id) || - (mission.target1[i] == CD_ANY))) + if ((mission.primaryType[i] == type) + && ((mission.target1[i] == id) + || (mission.target1[i] == CD_ANY))) { matched = 1; mission.targetValue1[i] -= value; @@ -833,9 +833,9 @@ { if ((mission.completed2[i] == OB_INCOMPLETE) || (mission.completed2[i] == OB_CONDITION)) { - if ((mission.secondaryType[i] == type) && - ((mission.target2[i] == id) || - (mission.target2[i] == CD_ANY))) + if ((mission.secondaryType[i] == type) + && ((mission.target2[i] == id) + || (mission.target2[i] == CD_ANY))) { mission.targetValue2[i] -= value; mission_evaluate(type, id, &mission.completed2[i], &mission.targetValue2[i], FONT_YELLOW); @@ -924,7 +924,11 @@ aliens[ALIEN_KLINE].y = player.y; aliens[ALIEN_KLINE].flags |= FL_IMMORTAL | FL_NOFIRE; player_setTarget(ALIEN_KLINE); +#ifdef OLD_MUSIC + audio_playMusic("music/TranceGeneration.mod", -1); +#else audio_playMusic("music/last_cyber_dance.ogg", -1); +#endif } } @@ -937,7 +941,9 @@ { if (mission.completed1[i] == OB_INCOMPLETE) { - if ((mission.primaryType[i] == M_DESTROY_ALL_TARGETS) && (engine.allAliensDead) && (mission.remainingObjectives1 + mission.remainingObjectives2 == 1)) + if ((mission.primaryType[i] == M_DESTROY_ALL_TARGETS) + && (engine.allAliensDead) + && (mission.remainingObjectives1 + mission.remainingObjectives2 == 1)) { mission.completed1[i] = OB_JUST_COMPLETED; mission_checkTimer(); @@ -949,7 +955,9 @@ { if (mission.completed2[i] == OB_INCOMPLETE) { - if ((mission.secondaryType[i] == M_DESTROY_ALL_TARGETS) && (engine.allAliensDead) && (mission.remainingObjectives1 + mission.remainingObjectives2 == 1)) + if ((mission.secondaryType[i] == M_DESTROY_ALL_TARGETS) + && (engine.allAliensDead) + && (mission.remainingObjectives1 + mission.remainingObjectives2 == 1)) { mission.completed2[i] = OB_JUST_COMPLETED; mission_checkTimer(); @@ -983,10 +991,10 @@ mission.completed1[i] = OB_COMPLETED; // do some area specific things - if ((game.area == MISN_MOEBO) || - (game.area == MISN_DORIM) || - (game.area == MISN_ELLESH) || - (game.area == MISN_MARS)) + if ((game.area == MISN_MOEBO) + || (game.area == MISN_DORIM) + || (game.area == MISN_ELLESH) + || (game.area == MISN_MARS)) { if (mission.remainingObjectives2 == 0) { @@ -1017,8 +1025,8 @@ mission.completed2[i] = OB_COMPLETED; // do some area specific things - if ((game.area == MISN_DORIM) && - (mission.remainingObjectives1 == 0)) + if ((game.area == MISN_DORIM) + && (mission.remainingObjectives1 == 0)) { mission_killAllEnemies(); engine.addAliens = -1; @@ -1222,17 +1230,17 @@ break; } - if ((game.area == MISN_URUSOR) || - (game.area == MISN_POSWIC) || - (game.area == MISN_EARTH)) + if ((game.area == MISN_URUSOR) + || (game.area == MISN_POSWIC) + || (game.area == MISN_EARTH)) screen_renderUnicode(_("Sid Wilson will join you on this mission"), screen->w / 2 - BRIEFING_WIDTH / 2 + 20, screen->h / 2 + 175, FONT_WHITE); renderer_update(); game_delayFrame(); player_getInput(); - if ((engine.keyState[KEY_FIRE]) || (engine.keyState[KEY_ALTFIRE]) || - (engine.keyState[KEY_ESCAPE])) + if ((engine.keyState[KEY_FIRE]) || (engine.keyState[KEY_ALTFIRE]) + || (engine.keyState[KEY_ESCAPE])) break; } diff -Nru starfighter-2.3.3/src/mission.h starfighter-2.4/src/mission.h --- starfighter-2.3.3/src/mission.h 2020-07-27 17:43:45.000000000 +0000 +++ starfighter-2.4/src/mission.h 2020-12-26 05:09:29.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/player.c starfighter-2.4/src/player.c --- starfighter-2.3.3/src/player.c 2020-07-27 15:40:43.000000000 +0000 +++ starfighter-2.4/src/player.c 2020-12-26 05:09:29.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011, 2012, 2013 Guus Sliepen -Copyright (C) 2012, 2015-2020 Layla Marchant +Copyright (C) 2012, 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -49,8 +49,14 @@ void player_init() { player.active = 1; - player.x = screen->w / 2; - player.y = screen->h / 2; + if (game.difficulty == DIFFICULTY_ORIGINAL) { + player.x = screen->w / 4; + player.y = screen->h / 3; + } + else { + player.x = screen->w / 2; + player.y = screen->h / 2; + } player.speed = 2; player.systemPower = player.maxShield; player.face = 0; @@ -99,14 +105,14 @@ player_resetDamageDelay = 0; - if ((!engine.cheatShield) && (engine.missionCompleteTimer == 0) && - ((!player.hit) || - (game.difficulty == DIFFICULTY_ORIGINAL) || - ((player.shield != engine.lowShield) && - (player.shield != 1)))) + if ((!engine.cheatShield) && (engine.missionCompleteTimer == 0) + && ((!player.hit) + || (game.difficulty == DIFFICULTY_ORIGINAL) + || ((player.shield != engine.lowShield) + && (player.shield != 1)))) { - if ((game.difficulty == DIFFICULTY_ORIGINAL) || - (player_damageDelay >= delay)) + if ((game.difficulty == DIFFICULTY_ORIGINAL) + || (player_damageDelay >= delay)) { player.shield -= amount; @@ -115,8 +121,8 @@ audio_playSound(SFX_HIT, player.x, player.y); // Damage tiers (not in Classic mode) - if ((oldshield > engine.lowShield) && - (player.shield <= engine.lowShield)) + if ((oldshield > engine.lowShield) + && (player.shield <= engine.lowShield)) { info_setLine("!!! WARNING: SHIELD LOW !!!", FONT_RED); if (game.difficulty != DIFFICULTY_ORIGINAL) @@ -452,6 +458,7 @@ if (engine.event.window.event == SDL_WINDOWEVENT_SIZE_CHANGED) { screen_adjustDimensions(engine.event.window.data1, engine.event.window.data2); + game_setStars(); renderer_reset(); gfx_scaleBackground(); screen_clear(black); @@ -460,8 +467,8 @@ screen_addBuffer(0, 0, screen->w, screen->h); } - if (engine.autoPause && - (engine.event.window.event == SDL_WINDOWEVENT_FOCUS_LOST)) + if (engine.autoPause + && (engine.event.window.event == SDL_WINDOWEVENT_FOCUS_LOST)) engine.paused = 1; break; } diff -Nru starfighter-2.3.3/src/player.h starfighter-2.4/src/player.h --- starfighter-2.3.3/src/player.h 2020-05-24 00:55:32.000000000 +0000 +++ starfighter-2.4/src/player.h 2020-12-26 05:09:29.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/radio.c starfighter-2.4/src/radio.c --- starfighter-2.3.3/src/radio.c 2020-07-16 16:08:04.000000000 +0000 +++ starfighter-2.4/src/radio.c 2020-12-26 05:09:29.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011, 2012, 2013 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/radio.h starfighter-2.4/src/radio.h --- starfighter-2.3.3/src/radio.h 2020-05-24 00:55:32.000000000 +0000 +++ starfighter-2.4/src/radio.h 2020-12-26 05:09:29.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/renderer.c starfighter-2.4/src/renderer.c --- starfighter-2.3.3/src/renderer.c 2020-05-24 00:55:33.000000000 +0000 +++ starfighter-2.4/src/renderer.c 2020-12-26 05:09:29.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011, 2012, 2013 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/renderer.h starfighter-2.4/src/renderer.h --- starfighter-2.3.3/src/renderer.h 2020-05-24 00:55:32.000000000 +0000 +++ starfighter-2.4/src/renderer.h 2020-12-26 05:09:29.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/save.c starfighter-2.4/src/save.c --- starfighter-2.3.3/src/save.c 2020-05-27 02:07:54.000000000 +0000 +++ starfighter-2.4/src/save.c 2020-12-26 05:09:29.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011, 2012, 2013 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -160,42 +160,42 @@ { case 4: case 5: - if ((fscanf(fp, "%d%*c", &game.difficulty) < 1) || - (fscanf(fp, "%d %d %d %d %d %d %d %d%*c", + if ((fscanf(fp, "%d%*c", &game.difficulty) < 1) + || (fscanf(fp, "%d %d %d %d %d %d %d %d%*c", &game.minPlasmaRateLimit, &game.minPlasmaDamageLimit, &game.minPlasmaOutputLimit, &game.maxPlasmaRateLimit, &game.maxPlasmaDamageLimit, &game.maxPlasmaOutputLimit, - &game.maxPlasmaAmmoLimit, &game.maxRocketAmmoLimit) < 8) || - (fscanf(fp, "%d %d %d%*c%*[^\n]%*c", &game.system, &game.area, - &game.stationedPlanet) < 3) || - (fscanf(fp, "%d %d%*c", &game.hasWingMate1, &game.hasWingMate2) < 2) || - (fscanf(fp, "%d %d %d %d%*c", &player.maxShield, - &player.ammo[0], &player.ammo[1], &player.weaponType[1]) < 4) || - (fscanf(fp, "%d %d %d%*c", + &game.maxPlasmaAmmoLimit, &game.maxRocketAmmoLimit) < 8) + || (fscanf(fp, "%d %d %d%*c%*[^\n]%*c", &game.system, &game.area, + &game.stationedPlanet) < 3) + || (fscanf(fp, "%d %d%*c", &game.hasWingMate1, &game.hasWingMate2) < 2) + || (fscanf(fp, "%d %d %d %d%*c", &player.maxShield, + &player.ammo[0], &player.ammo[1], &player.weaponType[1]) < 4) + || (fscanf(fp, "%d %d %d%*c", &weapons[W_PLAYER_WEAPON].ammo[0], &weapons[W_PLAYER_WEAPON].damage, - &weapons[W_PLAYER_WEAPON].reload[0]) < 3) || - (fscanf(fp, "%d %d %d %d %d %d %d %d%*c", + &weapons[W_PLAYER_WEAPON].reload[0]) < 3) + || (fscanf(fp, "%d %d %d %d %d %d %d %d%*c", &game.minPlasmaRate, &game.minPlasmaDamage, &game.minPlasmaOutput, &game.maxPlasmaRate, &game.maxPlasmaDamage, &game.maxPlasmaOutput, - &game.maxPlasmaAmmo, &game.maxRocketAmmo) < 8) || - (fscanf(fp, "%d %d %d %d %d %d %d %d %d %d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d%*c", + &game.maxPlasmaAmmo, &game.maxRocketAmmo) < 8) + || (fscanf(fp, "%d %d %d %d %d %d %d %d %d %d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d%*c", &game.missionCompleted[0], &game.missionCompleted[1], &game.missionCompleted[2], &game.missionCompleted[3], &game.missionCompleted[4], &game.missionCompleted[5], &game.missionCompleted[6], &game.missionCompleted[7], - &game.missionCompleted[8], &game.missionCompleted[9]) < 10) || - (fscanf(fp, "%d%*c", &game.experimentalShield) < 1) || - (fscanf(fp, "%d %d%*c", &game.cash, &game.cashEarned) < 2) || - (fscanf(fp, "%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d%*c", + &game.missionCompleted[8], &game.missionCompleted[9]) < 10) + || (fscanf(fp, "%d%*c", &game.experimentalShield) < 1) + || (fscanf(fp, "%d %d%*c", &game.cash, &game.cashEarned) < 2) + || (fscanf(fp, "%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d%*c", &game.shots, &game.hits, &game.accuracy, &game.totalKills, &game.wingMate1Kills, &game.wingMate2Kills, &game.wingMate1Ejects, &game.wingMate2Ejects, &game.totalOtherKills, &game.shieldPickups, &game.rocketPickups, &game.cellPickups, &game.powerups, - &game.minesKilled, &game.slavesRescued) < 15) || - (fscanf(fp, "%lu%*c", &timeTaken) < 1)) + &game.minesKilled, &game.slavesRescued) < 15) + || (fscanf(fp, "%lu%*c", &timeTaken) < 1)) { printf("Warning: Save data is not correctly formatted. Some data may be lost.\n"); } diff -Nru starfighter-2.3.3/src/save.h starfighter-2.4/src/save.h --- starfighter-2.3.3/src/save.h 2020-05-24 00:55:32.000000000 +0000 +++ starfighter-2.4/src/save.h 2020-12-26 05:09:30.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/screen.c starfighter-2.4/src/screen.c --- starfighter-2.3.3/src/screen.c 2020-05-24 00:55:33.000000000 +0000 +++ starfighter-2.4/src/screen.c 2020-12-26 05:09:29.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011, 2012, 2013 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/screen.h starfighter-2.4/src/screen.h --- starfighter-2.3.3/src/screen.h 2020-05-24 00:55:32.000000000 +0000 +++ starfighter-2.4/src/screen.h 2020-12-26 05:09:30.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/ship.c starfighter-2.4/src/ship.c --- starfighter-2.3.3/src/ship.c 2020-05-26 17:41:05.000000000 +0000 +++ starfighter-2.4/src/ship.c 2020-12-26 05:09:29.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011, 2012 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -68,8 +68,8 @@ return; // Remove some ammo from the player - if ((ship == &player) && (player.weaponType[weaponIndex] != W_LASER) && - (player.ammo[weaponIndex] > 0) && (!engine.cheatAmmo)) + if ((ship == &player) && (player.weaponType[weaponIndex] != W_LASER) + && (player.ammo[weaponIndex] > 0) && (!engine.cheatAmmo)) player.ammo[weaponIndex]--; switch(theWeapon->id) @@ -130,8 +130,8 @@ // Reset the weapon reload time. Double it if it is not friendly or // a boss or Kline ship->reload[weaponIndex] = theWeapon->reload[0]; - if ((ship->flags & FL_WEAPCO) && (ship != &aliens[ALIEN_BOSS]) && - (ship != &aliens[ALIEN_KLINE]) && (theWeapon->id != W_LASER)) + if ((ship->flags & FL_WEAPCO) && (ship != &aliens[ALIEN_BOSS]) + && (ship != &aliens[ALIEN_KLINE]) && (theWeapon->id != W_LASER)) ship->reload[weaponIndex] *= 2; if ((ship == &player) && (weaponIndex == 0)) @@ -173,8 +173,9 @@ if (player.shield > 0) { if (game_collision(player.x, player.y, player.image[0]->w, - player.image[0]->h, ray.x, ray.y, ray.w, ray.h) && - (!engine.cheatShield) && (engine.missionCompleteTimer == 0)) + player.image[0]->h, ray.x, ray.y, ray.w, ray.h) + && (!engine.cheatShield) + && (engine.missionCompleteTimer == 0)) { player_damage(1, RAY_DAMAGE_DELAY); explosion_add(player.x, player.y, SP_SMALL_EXPLOSION); @@ -187,8 +188,8 @@ if (aliens[i].flags & FL_IMMORTAL) continue; - if ((aliens[i].shield > 0) && (ship != &aliens[i]) && - (ship->classDef != aliens[i].classDef)) + if ((aliens[i].shield > 0) && (ship != &aliens[i]) + && (ship->classDef != aliens[i].classDef)) { if (game_collision(aliens[i].x, aliens[i].y, aliens[i].image[0]->w, aliens[i].image[0]->h, ray.x, ray.y, ray.w, ray.h)) diff -Nru starfighter-2.3.3/src/ship.h starfighter-2.4/src/ship.h --- starfighter-2.3.3/src/ship.h 2020-05-24 00:55:32.000000000 +0000 +++ starfighter-2.4/src/ship.h 2020-12-26 05:09:30.000000000 +0000 @@ -1,5 +1,5 @@ /* -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/shop.c starfighter-2.4/src/shop.c --- starfighter-2.3.3/src/shop.c 2020-05-24 00:55:33.000000000 +0000 +++ starfighter-2.4/src/shop.c 2020-12-26 05:09:29.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011, 2012, 2013 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -97,8 +97,9 @@ } gfx_renderUnicode(description, 10, 22, FONT_WHITE, 0, gfx_shopSprites[SHOP_S_SECONDARY]); - if ((player.weaponType[1] != W_LASER) && - (player.weaponType[1] != W_CHARGER) && (player.weaponType[1] != W_NONE)) + if ((player.weaponType[1] != W_LASER) + && (player.weaponType[1] != W_CHARGER) + && (player.weaponType[1] != W_NONE)) { /// Retain "%d" as-is. It is replaced with the rocket capacity of the Firefly. snprintf(description, STRMAX_SHORT, _("Capacity : %d"), game.maxRocketAmmo); @@ -234,16 +235,16 @@ } } - gfx_shopSprites[SHOP_S_PRIMARY] = gfx_createSurface(190, 91); - gfx_shopSprites[SHOP_S_POWERUP] = gfx_createSurface(190, 91); - gfx_shopSprites[SHOP_S_SECONDARY] = gfx_createSurface(190, 91); - - gfx_drawRect(gfx_shopSprites[SHOP_S_PRIMARY], 0, 0, 189, 90, 0x00, 0x00, 0x55); - gfx_drawRect(gfx_shopSprites[SHOP_S_PRIMARY], 0, 0, 189, 20, 0x00, 0x00, 0x99); - gfx_drawRect(gfx_shopSprites[SHOP_S_POWERUP], 0, 0, 189, 90, 0x00, 0x00, 0x55); - gfx_drawRect(gfx_shopSprites[SHOP_S_POWERUP], 0, 0, 189, 20, 0x00, 0x00, 0x99); - gfx_drawRect(gfx_shopSprites[SHOP_S_SECONDARY], 0, 0, 189, 90, 0x00, 0x00, 0x55); - gfx_drawRect(gfx_shopSprites[SHOP_S_SECONDARY], 0, 0, 189, 20, 0x00, 0x00, 0x99); + gfx_shopSprites[SHOP_S_PRIMARY] = gfx_createSurface(194, 91); + gfx_shopSprites[SHOP_S_POWERUP] = gfx_createSurface(203, 91); + gfx_shopSprites[SHOP_S_SECONDARY] = gfx_createSurface(194, 91); + + gfx_drawRect(gfx_shopSprites[SHOP_S_PRIMARY], 0, 0, 193, 90, 0x00, 0x00, 0x55); + gfx_drawRect(gfx_shopSprites[SHOP_S_PRIMARY], 0, 0, 193, 20, 0x00, 0x00, 0x99); + gfx_drawRect(gfx_shopSprites[SHOP_S_POWERUP], 0, 0, 202, 90, 0x00, 0x00, 0x55); + gfx_drawRect(gfx_shopSprites[SHOP_S_POWERUP], 0, 0, 202, 20, 0x00, 0x00, 0x99); + gfx_drawRect(gfx_shopSprites[SHOP_S_SECONDARY], 0, 0, 193, 90, 0x00, 0x00, 0x55); + gfx_drawRect(gfx_shopSprites[SHOP_S_SECONDARY], 0, 0, 193, 20, 0x00, 0x00, 0x99); gfx_shopSprites[SHOP_S_SHIP_INFO] = gfx_createAlphaRect(SHOP_WIDTH + 1, 41, 0x00, 0x00, 0x00); gfx_drawRect(gfx_shopSprites[SHOP_S_SHIP_INFO], 0, 0, SHOP_WIDTH, 40, 0x00, 0x00, 0x33); @@ -261,22 +262,22 @@ case SHOP_PLASMA_MAX_DAMAGE: case SHOP_PLASMA_MAX_RATE: case SHOP_PLASMA_MAX_AMMO: - gfx_drawRect(gfx_shopSprites[SHOP_S_POWERUP], 0, 0, 189, 90, 0x55, 0x00, 0x00); - gfx_drawRect(gfx_shopSprites[SHOP_S_POWERUP], 0, 0, 189, 20, 0x99, 0x00, 0x00); + gfx_drawRect(gfx_shopSprites[SHOP_S_POWERUP], 0, 0, 202, 90, 0x55, 0x00, 0x00); + gfx_drawRect(gfx_shopSprites[SHOP_S_POWERUP], 0, 0, 202, 20, 0x99, 0x00, 0x00); break; case SHOP_PLASMA_MIN_OUTPUT: case SHOP_PLASMA_MIN_DAMAGE: case SHOP_PLASMA_MIN_RATE: - gfx_drawRect(gfx_shopSprites[SHOP_S_PRIMARY], 0, 0, 189, 90, 0x55, 0x00, 0x00); - gfx_drawRect(gfx_shopSprites[SHOP_S_PRIMARY], 0, 0, 189, 20, 0x99, 0x00, 0x00); + gfx_drawRect(gfx_shopSprites[SHOP_S_PRIMARY], 0, 0, 193, 90, 0x55, 0x00, 0x00); + gfx_drawRect(gfx_shopSprites[SHOP_S_PRIMARY], 0, 0, 193, 20, 0x99, 0x00, 0x00); break; case SHOP_PLASMA_AMMO: case SHOP_ROCKET_AMMO: gfx_drawRect(gfx_shopSprites[SHOP_S_SHIP_INFO], 0, 0, SHOP_WIDTH, 40, 0x33, 0x00, 0x00); break; default: - gfx_drawRect(gfx_shopSprites[SHOP_S_SECONDARY], 0, 0, 189, 90, 0x55, 0x00, 0x00); - gfx_drawRect(gfx_shopSprites[SHOP_S_SECONDARY], 0, 0, 189, 20, 0x99, 0x00, 0x00); + gfx_drawRect(gfx_shopSprites[SHOP_S_SECONDARY], 0, 0, 193, 90, 0x55, 0x00, 0x00); + gfx_drawRect(gfx_shopSprites[SHOP_S_SECONDARY], 0, 0, 193, 20, 0x99, 0x00, 0x00); break; } @@ -365,7 +366,7 @@ gfx_shopSprites[SHOP_S_ITEM_INFO] = gfx_createSurface(SHOP_WIDTH + 1, 56); gfx_drawRect(gfx_shopSprites[SHOP_S_ITEM_INFO], 0, 0, SHOP_WIDTH, 35, 0x00, 0x99, 0x00); gfx_drawRect(gfx_shopSprites[SHOP_S_ITEM_INFO], 0, 20, SHOP_WIDTH, 35, 0x00, 0x33, 0x00); - gfx_renderUnicode(_("Information"), 5, 4, FONT_WHITE, 0, gfx_shopSprites[SHOP_S_ITEM_INFO]); + gfx_renderUnicode(_("Information"), 10, 4, FONT_WHITE, 0, gfx_shopSprites[SHOP_S_ITEM_INFO]); switch (shopSelectedItem) { @@ -373,40 +374,40 @@ break; case SHOP_ERROR_INSUFFICIENT_FUNDS: /// For when the player attempts to buy something they can't afford. - gfx_renderUnicode(_("You don't have enough money"), 20, 30, FONT_WHITE, 0, gfx_shopSprites[SHOP_S_ITEM_INFO]); + gfx_renderUnicode(_("You don't have enough money"), 10, 30, FONT_WHITE, 0, gfx_shopSprites[SHOP_S_ITEM_INFO]); break; case SHOP_ERROR_CANNOT_UPGRADE: /// For when the player attempts an upgrade beyond the maximum (line 1 of 2). - gfx_renderUnicode(_("Cannot upgrade ship"), 5, 22, FONT_WHITE, 0, gfx_shopSprites[SHOP_S_ITEM_INFO]); + gfx_renderUnicode(_("Cannot upgrade ship"), 10, 22, FONT_WHITE, 0, gfx_shopSprites[SHOP_S_ITEM_INFO]); /// For when the player attempts an upgrade beyond the maximum (line 2 of 2). - gfx_renderUnicode(_("Hardware capacity has been reached"), 20, 38, FONT_CYAN, 0, gfx_shopSprites[SHOP_S_ITEM_INFO]); + gfx_renderUnicode(_("Hardware capacity has been reached"), 10, 38, FONT_CYAN, 0, gfx_shopSprites[SHOP_S_ITEM_INFO]); break; case SHOP_ERROR_AMMO_LIMIT: /// For when the player attempts to buy more ammo than the ship can hold. - gfx_renderUnicode(_("Ammunition limit reached"), 20, 30, FONT_WHITE, 0, gfx_shopSprites[SHOP_S_ITEM_INFO]); + gfx_renderUnicode(_("Ammunition limit reached"), 10, 30, FONT_WHITE, 0, gfx_shopSprites[SHOP_S_ITEM_INFO]); break; case SHOP_ERROR_CANNOT_SELL: /// For when the player attempts to sell an item they aren't allowed to sell. - gfx_renderUnicode(_("You cannot sell that item"), 20, 30, FONT_WHITE, 0, gfx_shopSprites[SHOP_S_ITEM_INFO]); + gfx_renderUnicode(_("You cannot sell that item"), 10, 30, FONT_WHITE, 0, gfx_shopSprites[SHOP_S_ITEM_INFO]); break; case SHOP_ERROR_NOTHING_TO_SELL: /// For when the player attempts to sell an item they don't have any of. - gfx_renderUnicode(_("Nothing to sell"), 20, 30, FONT_WHITE, 0, gfx_shopSprites[SHOP_S_ITEM_INFO]); + gfx_renderUnicode(_("Nothing to sell"), 10, 30, FONT_WHITE, 0, gfx_shopSprites[SHOP_S_ITEM_INFO]); break; case SHOP_ERROR_IS_NOT_ROCKETS: /// For when the player attempts to buy rockets or rocket capacity /// while secondary weapon is either laser or charge cannon. - gfx_renderUnicode(_("Rockets cannot be bought for Laser or Charger Cannon"), 5, 30, FONT_WHITE, 0, gfx_shopSprites[SHOP_S_ITEM_INFO]); + gfx_renderUnicode(_("Rockets cannot be bought for Laser or Charger Cannon"), 10, 30, FONT_WHITE, 0, gfx_shopSprites[SHOP_S_ITEM_INFO]); break; case SHOP_ERROR_ALREADY_OWNED: /// For when the player attempts to buy a weapon they already have. - gfx_renderUnicode(_("You already have that weapon"), 20, 30, FONT_WHITE, 0, gfx_shopSprites[SHOP_S_ITEM_INFO]); + gfx_renderUnicode(_("You already have that weapon"), 10, 30, FONT_WHITE, 0, gfx_shopSprites[SHOP_S_ITEM_INFO]); break; case SHOP_ERROR_WEAPON_CAPACITY: /// For when the player attempts to increase rocket capacity beyond /// what is allowed for the weapon (used for homing missiles). - gfx_renderUnicode(_("This weapon's ammo limit has been reached"), 20, 30, FONT_WHITE, 0, gfx_shopSprites[SHOP_S_ITEM_INFO]); + gfx_renderUnicode(_("This weapon's ammo limit has been reached"), 10, 30, FONT_WHITE, 0, gfx_shopSprites[SHOP_S_ITEM_INFO]); break; default: if (shopItems[shopSelectedItem].price != 0) @@ -425,9 +426,9 @@ snprintf(description, STRMAX, _("%s (N/A)"), shopItems[shopSelectedItem].description); } - gfx_renderUnicode(shopItems[shopSelectedItem].name, 5, 22, + gfx_renderUnicode(shopItems[shopSelectedItem].name, 20, 22, FONT_WHITE, 0, gfx_shopSprites[SHOP_S_ITEM_INFO]); - gfx_renderUnicode(description, 20, 38, FONT_CYAN, 0, gfx_shopSprites[SHOP_S_ITEM_INFO]); + gfx_renderUnicode(description, 10, 38, FONT_CYAN, 0, gfx_shopSprites[SHOP_S_ITEM_INFO]); break; } } @@ -645,8 +646,8 @@ break; case SHOP_ROCKET_AMMO: - if ((player.weaponType[1] == W_CHARGER) || - (player.weaponType[1] == W_LASER)) + if ((player.weaponType[1] == W_CHARGER) + || (player.weaponType[1] == W_LASER)) { shopSelectedItem = SHOP_ERROR_IS_NOT_ROCKETS; return; @@ -656,20 +657,20 @@ shopSelectedItem = SHOP_ERROR_AMMO_LIMIT; return; } - if ((player.weaponType[1] == W_HOMING_MISSILE) && - (player.ammo[1] >= MAX_HOMING)) + if ((player.weaponType[1] == W_HOMING_MISSILE) + && (player.ammo[1] >= MAX_HOMING)) { shopSelectedItem = SHOP_ERROR_WEAPON_CAPACITY; return; } - if ((player.weaponType[1] == W_DOUBLE_HOMING_MISSILES) && - (player.ammo[1] >= MAX_DOUBLE_HOMING)) + if ((player.weaponType[1] == W_DOUBLE_HOMING_MISSILES) + && (player.ammo[1] >= MAX_DOUBLE_HOMING)) { shopSelectedItem = SHOP_ERROR_WEAPON_CAPACITY; return; } - if ((player.weaponType[1] == W_MICRO_HOMING_MISSILES) && - (player.ammo[1] >= MAX_MICRO_HOMING)) + if ((player.weaponType[1] == W_MICRO_HOMING_MISSILES) + && (player.ammo[1] >= MAX_MICRO_HOMING)) { shopSelectedItem = SHOP_ERROR_WEAPON_CAPACITY; return; @@ -723,26 +724,26 @@ break; case SHOP_ROCKET_MAX_AMMO: - if ((player.weaponType[1] == W_CHARGER) || - (player.weaponType[1] == W_LASER)) + if ((player.weaponType[1] == W_CHARGER) + || (player.weaponType[1] == W_LASER)) { shopSelectedItem = SHOP_ERROR_IS_NOT_ROCKETS; return; } - if ((player.weaponType[1] == W_HOMING_MISSILE) && - (game.maxRocketAmmo >= MAX_HOMING)) + if ((player.weaponType[1] == W_HOMING_MISSILE) + && (game.maxRocketAmmo >= MAX_HOMING)) { shopSelectedItem = SHOP_ERROR_WEAPON_CAPACITY; return; } - if ((player.weaponType[1] == W_DOUBLE_HOMING_MISSILES) && - (game.maxRocketAmmo >= MAX_DOUBLE_HOMING)) + if ((player.weaponType[1] == W_DOUBLE_HOMING_MISSILES) + && (game.maxRocketAmmo >= MAX_DOUBLE_HOMING)) { shopSelectedItem = SHOP_ERROR_WEAPON_CAPACITY; return; } - if ((player.weaponType[1] == W_MICRO_HOMING_MISSILES) && - (game.maxRocketAmmo >= MAX_MICRO_HOMING)) + if ((player.weaponType[1] == W_MICRO_HOMING_MISSILES) + && (game.maxRocketAmmo >= MAX_MICRO_HOMING)) { shopSelectedItem = SHOP_ERROR_WEAPON_CAPACITY; return; @@ -1113,8 +1114,8 @@ screen_blit(gfx_shopSprites[SHOP_S_CATALOG], SHOP_X, SHOP_Y + 50); screen_blit(gfx_shopSprites[SHOP_S_ITEM_INFO], SHOP_X, SHOP_Y + 180); screen_blit(gfx_shopSprites[SHOP_S_PRIMARY], SHOP_X, SHOP_Y + 245); - screen_blit(gfx_shopSprites[SHOP_S_POWERUP], SHOP_X + 203, SHOP_Y + 245); - screen_blit(gfx_shopSprites[SHOP_S_SECONDARY], SHOP_X + 406, SHOP_Y + 245); + screen_blit(gfx_shopSprites[SHOP_S_POWERUP], SHOP_X + 199, SHOP_Y + 245); + screen_blit(gfx_shopSprites[SHOP_S_SECONDARY], SHOP_X + 407, SHOP_Y + 245); if (shopSelectedItem > SHOP_NOTHING) { diff -Nru starfighter-2.3.3/src/shop.h starfighter-2.4/src/shop.h --- starfighter-2.3.3/src/shop.h 2020-05-24 00:55:32.000000000 +0000 +++ starfighter-2.4/src/shop.h 2020-12-26 05:09:30.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/Starfighter.c starfighter-2.4/src/Starfighter.c --- starfighter-2.3.3/src/Starfighter.c 2020-09-05 22:20:54.000000000 +0000 +++ starfighter-2.4/src/Starfighter.c 2020-12-26 05:09:29.000000000 +0000 @@ -2,7 +2,7 @@ Project: Starfighter Copyright (C) 2003 Parallel Realities Copyright (C) 2011, 2012 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -114,8 +114,8 @@ cheatCount = 2; if ((strcmp(argv[i], "it") == 0) && (cheatCount == 2)) cheatCount = 3; - if (((strcmp(argv[i], "better") == 0) && (cheatCount == 3)) || - (strcmp(argv[i], "humansdoitbetter") == 0)) + if (((strcmp(argv[i], "better") == 0) && (cheatCount == 3)) + || (strcmp(argv[i], "humansdoitbetter") == 0)) { printf("Humans do it better! Cheats enabled.\n"); engine.cheat = 1; diff -Nru starfighter-2.3.3/src/structs.h starfighter-2.4/src/structs.h --- starfighter-2.3.3/src/structs.h 2020-05-24 00:55:32.000000000 +0000 +++ starfighter-2.4/src/structs.h 2020-12-26 05:09:30.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011, 2012, 2013 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/title.c starfighter-2.4/src/title.c --- starfighter-2.3.3/src/title.c 2020-07-27 17:05:48.000000000 +0000 +++ starfighter-2.4/src/title.c 2020-12-26 17:02:15.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011, 2012, 2013 Guus Sliepen -Copyright (C) 2012, 2015-2020 Layla Marchant +Copyright (C) 2012, 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -266,7 +266,7 @@ 5, 0, FONT_WHITE, 0, copyrightText); gfx_renderString("Copyright Guus Sliepen, Astrid S. de Wijn and others 2012", 5, MENU_SPACING, FONT_WHITE, 0, copyrightText); - gfx_renderString("Copyright 2015-2020 Layla Marchant", + gfx_renderString("Copyright 2015-2020 The Diligent Circle", 5, 2 * MENU_SPACING, FONT_WHITE, 0, copyrightText); snprintf(buildVersion, STRMAX_SHORT, "Version %s", VERSION ); @@ -313,7 +313,11 @@ player_flushInput(); engine.keyState[KEY_FIRE] = engine.keyState[KEY_ALTFIRE] = 0; +#ifdef OLD_MUSIC + audio_playMusic("music/Platinum.mod", 1); +#else audio_playMusic("music/walking_among_androids.ogg", 1); +#endif while (!engine.done) { @@ -510,7 +514,11 @@ if (engine.useMusic) { +#ifdef OLD_MUSIC + audio_playMusic("music/Platinum.mod", 1); +#else audio_playMusic("music/walking_among_androids.ogg", 1); +#endif } else { @@ -643,7 +651,11 @@ screen_drawBackground(); +#ifdef OLD_MUSIC + audio_playMusic("music/Solace.s3m", 1); +#else audio_playMusic("music/rise_of_spirit.ogg", 1); +#endif fp = fopen("data/credits.txt", "rb"); @@ -695,9 +707,16 @@ screen_unBuffer(); player_getInput(); - if (engine.keyState[KEY_ESCAPE] || engine.keyState[KEY_FIRE] || - engine.keyState[KEY_ALTFIRE]) + if (engine.keyState[KEY_ESCAPE] || engine.keyState[KEY_FIRE] + || engine.keyState[KEY_ALTFIRE]) break; + + // Check to see if we need to reposition credits + if (credit[0].x != (screen->w - credit[0].image->w) / 2) { + for (i=0; i< nCredit; i++) { + credit[i].x = (screen->w - credit[i].image->w) / 2; + } + } float speed = 0.5; if (engine.keyState[KEY_DOWN]) diff -Nru starfighter-2.3.3/src/title.h starfighter-2.4/src/title.h --- starfighter-2.3.3/src/title.h 2020-05-24 00:55:32.000000000 +0000 +++ starfighter-2.4/src/title.h 2020-12-26 05:09:30.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/weapons.c starfighter-2.4/src/weapons.c --- starfighter-2.3.3/src/weapons.c 2020-08-27 14:10:49.000000000 +0000 +++ starfighter-2.4/src/weapons.c 2020-12-26 05:09:29.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011, 2013 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/weapons.h starfighter-2.4/src/weapons.h --- starfighter-2.3.3/src/weapons.h 2020-05-24 00:55:32.000000000 +0000 +++ starfighter-2.4/src/weapons.h 2020-12-26 05:09:30.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/window.c starfighter-2.4/src/window.c --- starfighter-2.3.3/src/window.c 2020-05-24 00:55:33.000000000 +0000 +++ starfighter-2.4/src/window.c 2020-12-26 05:09:29.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011, 2012, 2013 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/src/window.h starfighter-2.4/src/window.h --- starfighter-2.3.3/src/window.h 2020-05-24 00:55:32.000000000 +0000 +++ starfighter-2.4/src/window.h 2020-12-26 05:09:30.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2003 Parallel Realities Copyright (C) 2011 Guus Sliepen -Copyright (C) 2015-2020 Layla Marchant +Copyright (C) 2015-2020 The Diligent Circle This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru starfighter-2.3.3/win32build.sh starfighter-2.4/win32build.sh --- starfighter-2.3.3/win32build.sh 2020-09-09 06:57:44.000000000 +0000 +++ starfighter-2.4/win32build.sh 2020-12-26 23:04:38.000000000 +0000 @@ -7,6 +7,6 @@ # Helper script to cross-compile for Windows with MXE. # Note: Before running, be sure to add the MXE usr/bin location to PATH. -./configure --host=i686-w64-mingw32.static SF_RUN_IN_PLACE=1 SF_NOWARN=1 +./configure --host=i686-w64-mingw32.static SF_RUN_IN_PLACE=1 SF_UNHARDEN=1 make mv src/starfighter.exe .