原作のv1.6へのバージョンアップに対応する修正

diff --git a/.gitignore b/.gitignore
index 9d0f212..f394627 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -58,3 +58,4 @@ screen.o
 window.o
 resource.rc
 icon.ico
+starfighter-1.6-win32.patch

diff --git a/LICENSES b/LICENSES
index 9c1299f..81ce28f 100644 (file)
--- a/LICENSES
+++ b/LICENSES
@@ -1,5 +1,6 @@
 data/*
 docs/*
+mac/*
 
 License: GNU GPLv3 or later <https://gnu.org/licenses/gpl.html>
 

diff --git a/Makefile b/Makefile
index 4242a92..fe84559 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ CXXFLAGS += `pkg-config --cflags sdl2 SDL2_image SDL2_mixer`
 LIBS = `pkg-config --libs sdl2 SDL2_image SDL2_mixer`
 OBJS = alien.o audio.o bullet.o cargo.o collectable.o colors.o cutscene.o engine.o event.o explosion.o game.o gfx.o intermission.o loadSave.o messages.o misc.o missions.o player.o renderer.o resources.o screen.o ship.o shop.o Starfighter.o title.o weapons.o window.o
 
-VERSION = 1.5.1
+VERSION = 1.6
 PROG = starfighter
 DOCS = docs/*
 DATA = data gfx sound music
@@ -40,14 +40,14 @@ install: $(ALL)
        mkdir -p $(DESTDIR)$(BINDIR)
        mkdir -p $(DESTDIR)$(DATADIR)
        mkdir -p $(DESTDIR)$(DOCDIR)
-       mkdir -p $(MENUDIR)
-       mkdir -p $(ICONDIR)
+       mkdir -p $(DESTDIR)$(MENUDIR)
+       mkdir -p $(DESTDIR)$(ICONDIR)
 
        install -m 755 $(PROG) $(DESTDIR)$(BINDIR)$(PROG)
        cp -r $(DATA) $(DESTDIR)$(DATADIR)
        cp $(DOCS) $(DESTDIR)$(DOCDIR)
-       cp $(LAUNCHER) $(MENUDIR)
-       cp $(ICON) $(ICONDIR)
+       install -m 644 $(LAUNCHER) $(DESTDIR)$(MENUDIR)
+       install -m 644 $(ICON) $(DESTDIR)$(ICONDIR)
 
 optimise:
        advpng -z gfx/*.png

diff --git a/README-jp.txt b/README-jp.txt
index e351d12..328ea92 100644 (file)
--- a/README-jp.txt
+++ b/README-jp.txt
@@ -1,4 +1,4 @@
-Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
+Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
 
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -71,20 +71,20 @@ Project: Starfighterは次のライブラリに依存している:
 
 日本語版のビルド方法
 
-1. オリジナル(英語)のProject: Starfighter v1.5.1 のソースを展開する。
-2. 日本語版のアーカイブ starfighter-1.5.1-jp-src.tgz を展開する。
+1. オリジナル(英語)のProject: Starfighter v1.6 のソースを展開する。
+2. 日本語版のアーカイブ starfighter-1.6-jp-src.tgz を展開する。
 3. 日本語版の gfx/smallFont.png をオリジナルの gfx/ にコピーし上書きす
    る。
-4. 日本語版の starfighter-1.5.1-jp.patch をオリジナルのルートディレクトリ
+4. 日本語版の starfighter-1.6-jp.patch をオリジナルのルートディレクトリ
    にコピーする。
 5. オリジナルのルートディレクトリで
 
-   patch -p1 < starfighter-1.5.1-jp.patch
+   patch -p1 < starfighter-1.6-jp.patch
 
    を実行する。
 
 6. make を実行する。
 
-win32版をビルドする場合は starfighter-1.5.1-win32.patch.gz を展開し、パッ
+win32版をビルドする場合は starfighter-1.6-win32.patch.gz を展開し、パッ
 チを当てる必要がある。
 このパッチは日本語版・オリジナルの両方で使える。

diff --git a/docs/index.html b/docs/index.html
index f0fc520..54c4a0e 100644 (file)
--- a/docs/index.html
+++ b/docs/index.html
@@ -27,25 +27,17 @@
 
   <h2>¥é¥¤¥»¥ó¥¹</h2>
 
-  <pre>
-Project: Starfighter
-Copyright &copy; 2003 Parallel Realities
-Copyright &copy; 2012 Guus Sliepen, Astrid S. de Wijn and others
-Copyright &copy; 2015, 2016 onpon4
-
-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 <http://www.gnu.org/licenses/>.
-</pre>
+  <p>Copyright &copy; 2003 Parallel Realities<br />
+  Copyright &copy; 2012 Guus Sliepen, Astrid S. de Wijn and others<br />
+  Copyright &copy; 2015, 2016 onpon4</p>
+
+  <p>Project: Starfighter is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.</p>
+
+  <p>Project: Starfighter 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.</p>
+
+  <p>You should have received a copy of the GNU General Public License along with Project: Starfighter.  If not, see <a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>.</p>
+
+  <p>Artistic components of the game are covered by various other libre licenses, such as CC BY or CC BY-SA. See LICENSES for more information.</p>
 
   <h2>½é¤á¤Ë</h2>
 

diff --git a/gfx/aimFighter1.png b/gfx/aimFighter1.png
index ee27c8d..d5e87fc 100644 (file)
Binary files a/gfx/aimFighter1.png and b/gfx/aimFighter1.png differ

diff --git a/gfx/aimFighter2.png b/gfx/aimFighter2.png
index a3cffa4..4c39944 100644 (file)
Binary files a/gfx/aimFighter2.png and b/gfx/aimFighter2.png differ

diff --git a/gfx/alienDevice.png b/gfx/alienDevice.png
index 633d87e..8eb1618 100644 (file)
Binary files a/gfx/alienDevice.png and b/gfx/alienDevice.png differ

diff --git a/gfx/arrowEast.png b/gfx/arrowEast.png
index 87bf927..583e388 100644 (file)
Binary files a/gfx/arrowEast.png and b/gfx/arrowEast.png differ

diff --git a/gfx/arrowNorth.png b/gfx/arrowNorth.png
index 6e1d6d0..772c90e 100644 (file)
Binary files a/gfx/arrowNorth.png and b/gfx/arrowNorth.png differ

diff --git a/gfx/arrowNorthEast.png b/gfx/arrowNorthEast.png
index 8792678..97a7292 100644 (file)
Binary files a/gfx/arrowNorthEast.png and b/gfx/arrowNorthEast.png differ

diff --git a/gfx/arrowNorthWest.png b/gfx/arrowNorthWest.png
index 11b60ad..56b0d70 100644 (file)
Binary files a/gfx/arrowNorthWest.png and b/gfx/arrowNorthWest.png differ

diff --git a/gfx/arrowSouth.png b/gfx/arrowSouth.png
index bd71b17..9cf48e2 100644 (file)
Binary files a/gfx/arrowSouth.png and b/gfx/arrowSouth.png differ

diff --git a/gfx/arrowSouthEast.png b/gfx/arrowSouthEast.png
index cc1c8a9..44e7cfd 100644 (file)
Binary files a/gfx/arrowSouthEast.png and b/gfx/arrowSouthEast.png differ

diff --git a/gfx/arrowSouthWest.png b/gfx/arrowSouthWest.png
index 0c7ecf1..82f1728 100644 (file)
Binary files a/gfx/arrowSouthWest.png and b/gfx/arrowSouthWest.png differ

diff --git a/gfx/arrowWest.png b/gfx/arrowWest.png
index 548c978..db172a6 100644 (file)
Binary files a/gfx/arrowWest.png and b/gfx/arrowWest.png differ

diff --git a/gfx/asteroid1.png b/gfx/asteroid1.png
index 5dc7b53..c2d1afe 100644 (file)
Binary files a/gfx/asteroid1.png and b/gfx/asteroid1.png differ

diff --git a/gfx/asteroid2.png b/gfx/asteroid2.png
index f7ee860..99212c7 100644 (file)
Binary files a/gfx/asteroid2.png and b/gfx/asteroid2.png differ

diff --git a/gfx/asteroid3.png b/gfx/asteroid3.png
index 18c7821..3dac3ca 100644 (file)
Binary files a/gfx/asteroid3.png and b/gfx/asteroid3.png differ

diff --git a/gfx/barrier.png b/gfx/barrier.png
index 507049c..bb28197 100644 (file)
Binary files a/gfx/barrier.png and b/gfx/barrier.png differ

diff --git a/gfx/chainLink.png b/gfx/chainLink.png
index f7dc7aa..ec1e38d 100644 (file)
Binary files a/gfx/chainLink.png and b/gfx/chainLink.png differ

diff --git a/gfx/cloakShip1.png b/gfx/cloakShip1.png
index d2d3a5e..d9ac2f1 100644 (file)
Binary files a/gfx/cloakShip1.png and b/gfx/cloakShip1.png differ

diff --git a/gfx/cloakShip2.png b/gfx/cloakShip2.png
index f555886..987d202 100644 (file)
Binary files a/gfx/cloakShip2.png and b/gfx/cloakShip2.png differ

diff --git a/gfx/cursor.png b/gfx/cursor.png
index 598d71e..5b6dff8 100644 (file)
Binary files a/gfx/cursor.png and b/gfx/cursor.png differ

diff --git a/gfx/dollar.png b/gfx/dollar.png
index 4babf17..b0b2039 100644 (file)
Binary files a/gfx/dollar.png and b/gfx/dollar.png differ

diff --git a/gfx/drone1.png b/gfx/drone1.png
index 87fbfb2..1eb0ec6 100644 (file)
Binary files a/gfx/drone1.png and b/gfx/drone1.png differ

diff --git a/gfx/drone2.png b/gfx/drone2.png
index fc7b685..c600e1f 100644 (file)
Binary files a/gfx/drone2.png and b/gfx/drone2.png differ

diff --git a/gfx/dualFighter1.png b/gfx/dualFighter1.png
index 7d2487a..0b4925b 100644 (file)
Binary files a/gfx/dualFighter1.png and b/gfx/dualFighter1.png differ

diff --git a/gfx/dualFighter2.png b/gfx/dualFighter2.png
index 21193b3..d6ab077 100644 (file)
Binary files a/gfx/dualFighter2.png and b/gfx/dualFighter2.png differ

diff --git a/gfx/elec1.png b/gfx/elec1.png
index b78bf34..fc45f06 100644 (file)
Binary files a/gfx/elec1.png and b/gfx/elec1.png differ

diff --git a/gfx/elec2.png b/gfx/elec2.png
index cd98881..8284169 100644 (file)
Binary files a/gfx/elec2.png and b/gfx/elec2.png differ

diff --git a/gfx/elec3.png b/gfx/elec3.png
index e1bb7d0..f6c2ff1 100644 (file)
Binary files a/gfx/elec3.png and b/gfx/elec3.png differ

diff --git a/gfx/elec4.png b/gfx/elec4.png
index 19606bf..d58560e 100644 (file)
Binary files a/gfx/elec4.png and b/gfx/elec4.png differ

diff --git a/gfx/eliteFighter1.png b/gfx/eliteFighter1.png
index 1c6b001..4ef1321 100644 (file)
Binary files a/gfx/eliteFighter1.png and b/gfx/eliteFighter1.png differ

diff --git a/gfx/eliteFighter2.png b/gfx/eliteFighter2.png
index a945add..f990548 100644 (file)
Binary files a/gfx/eliteFighter2.png and b/gfx/eliteFighter2.png differ

diff --git a/gfx/escort1.png b/gfx/escort1.png
index 9674988..67f0609 100644 (file)
Binary files a/gfx/escort1.png and b/gfx/escort1.png differ

diff --git a/gfx/escort2.png b/gfx/escort2.png
index b0babee..8d21140 100644 (file)
Binary files a/gfx/escort2.png and b/gfx/escort2.png differ

diff --git a/gfx/evilUrsula1.png b/gfx/evilUrsula1.png
index fbec59e..a5e3eac 100644 (file)
Binary files a/gfx/evilUrsula1.png and b/gfx/evilUrsula1.png differ

diff --git a/gfx/evilUrsula2.png b/gfx/evilUrsula2.png
index ba78fbc..8e3cc50 100644 (file)
Binary files a/gfx/evilUrsula2.png and b/gfx/evilUrsula2.png differ

diff --git a/gfx/execTrans1.png b/gfx/execTrans1.png
index 8b590b1..63b7645 100644 (file)
Binary files a/gfx/execTrans1.png and b/gfx/execTrans1.png differ

diff --git a/gfx/execTrans2.png b/gfx/execTrans2.png
index 330245e..76f938c 100644 (file)
Binary files a/gfx/execTrans2.png and b/gfx/execTrans2.png differ

diff --git a/gfx/explode05.png b/gfx/explode05.png
index 4d88aaf..00508db 100644 (file)
Binary files a/gfx/explode05.png and b/gfx/explode05.png differ

diff --git a/gfx/explode06.png b/gfx/explode06.png
index 1452f90..18a419d 100644 (file)
Binary files a/gfx/explode06.png and b/gfx/explode06.png differ

diff --git a/gfx/explode07.png b/gfx/explode07.png
index 8b53c8d..325f03e 100644 (file)
Binary files a/gfx/explode07.png and b/gfx/explode07.png differ

diff --git a/gfx/explode1.png b/gfx/explode1.png
index 0686a4c..7a2e011 100644 (file)
Binary files a/gfx/explode1.png and b/gfx/explode1.png differ

diff --git a/gfx/explode11.png b/gfx/explode11.png
index 4f64878..924a0b4 100644 (file)
Binary files a/gfx/explode11.png and b/gfx/explode11.png differ

diff --git a/gfx/explode12.png b/gfx/explode12.png
index 029fc1f..0405a85 100644 (file)
Binary files a/gfx/explode12.png and b/gfx/explode12.png differ

diff --git a/gfx/explode13.png b/gfx/explode13.png
index 03a9946..c9da010 100644 (file)
Binary files a/gfx/explode13.png and b/gfx/explode13.png differ

diff --git a/gfx/explode14.png b/gfx/explode14.png
index 886ac90..d13e99f 100644 (file)
Binary files a/gfx/explode14.png and b/gfx/explode14.png differ

diff --git a/gfx/explode15.png b/gfx/explode15.png
index 818ee03..07f6ed2 100644 (file)
Binary files a/gfx/explode15.png and b/gfx/explode15.png differ

diff --git a/gfx/explode16.png b/gfx/explode16.png
index 2d4eb37..bf62a2e 100644 (file)
Binary files a/gfx/explode16.png and b/gfx/explode16.png differ

diff --git a/gfx/explode2.png b/gfx/explode2.png
index 62f5ade..1d7ec74 100644 (file)
Binary files a/gfx/explode2.png and b/gfx/explode2.png differ

diff --git a/gfx/explode3.png b/gfx/explode3.png
index 75998e8..5d74891 100644 (file)
Binary files a/gfx/explode3.png and b/gfx/explode3.png differ

diff --git a/gfx/explode4.png b/gfx/explode4.png
index 2376e71..a24d08e 100644 (file)
Binary files a/gfx/explode4.png and b/gfx/explode4.png differ

diff --git a/gfx/explode9.png b/gfx/explode9.png
index a5a1d15..aeceab8 100644 (file)
Binary files a/gfx/explode9.png and b/gfx/explode9.png differ

diff --git a/gfx/face_chris.png b/gfx/face_chris.png
index 9c2340c..75b8c9e 100644 (file)
Binary files a/gfx/face_chris.png and b/gfx/face_chris.png differ

diff --git a/gfx/face_crew.png b/gfx/face_crew.png
index 90d3348..2a940b4 100644 (file)
Binary files a/gfx/face_crew.png and b/gfx/face_crew.png differ

diff --git a/gfx/face_kline.png b/gfx/face_kline.png
index d0c9164..861f215 100644 (file)
Binary files a/gfx/face_kline.png and b/gfx/face_kline.png differ

diff --git a/gfx/face_krass.png b/gfx/face_krass.png
index c1e1a48..07c786c 100644 (file)
Binary files a/gfx/face_krass.png and b/gfx/face_krass.png differ

diff --git a/gfx/face_phoebe.png b/gfx/face_phoebe.png
index 786f5b4..efc4f59 100644 (file)
Binary files a/gfx/face_phoebe.png and b/gfx/face_phoebe.png differ

diff --git a/gfx/face_sid.png b/gfx/face_sid.png
index b2667ea..902ef7e 100644 (file)
Binary files a/gfx/face_sid.png and b/gfx/face_sid.png differ

diff --git a/gfx/face_ursula.png b/gfx/face_ursula.png
index 0b5563f..fe2839d 100644 (file)
Binary files a/gfx/face_ursula.png and b/gfx/face_ursula.png differ

diff --git a/gfx/firefly-big.png b/gfx/firefly-big.png
index e422d1d..70f4e35 100644 (file)
Binary files a/gfx/firefly-big.png and b/gfx/firefly-big.png differ

diff --git a/gfx/friendArrowEast.png b/gfx/friendArrowEast.png
index 420652b..34a82d1 100644 (file)
Binary files a/gfx/friendArrowEast.png and b/gfx/friendArrowEast.png differ

diff --git a/gfx/friendArrowNorthEast.png b/gfx/friendArrowNorthEast.png
index 3b351f9..1828b65 100644 (file)
Binary files a/gfx/friendArrowNorthEast.png and b/gfx/friendArrowNorthEast.png differ

diff --git a/gfx/friendArrowNorthWest.png b/gfx/friendArrowNorthWest.png
index e1d2d00..fd17f38 100644 (file)
Binary files a/gfx/friendArrowNorthWest.png and b/gfx/friendArrowNorthWest.png differ

diff --git a/gfx/friendArrowSouth.png b/gfx/friendArrowSouth.png
index 033cd9d..b05e32f 100644 (file)
Binary files a/gfx/friendArrowSouth.png and b/gfx/friendArrowSouth.png differ

diff --git a/gfx/friendArrowSouthEast.png b/gfx/friendArrowSouthEast.png
index a478025..949b700 100644 (file)
Binary files a/gfx/friendArrowSouthEast.png and b/gfx/friendArrowSouthEast.png differ

diff --git a/gfx/friendArrowWest.png b/gfx/friendArrowWest.png
index 312c9a5..3462627 100644 (file)
Binary files a/gfx/friendArrowWest.png and b/gfx/friendArrowWest.png differ

diff --git a/gfx/frigateBody1.png b/gfx/frigateBody1.png
index 7a04933..784aafa 100644 (file)
Binary files a/gfx/frigateBody1.png and b/gfx/frigateBody1.png differ

diff --git a/gfx/frigateBody2.png b/gfx/frigateBody2.png
index 793986d..960367a 100644 (file)
Binary files a/gfx/frigateBody2.png and b/gfx/frigateBody2.png differ

diff --git a/gfx/frigateGun11.png b/gfx/frigateGun11.png
index 18d0d8b..001cc4e 100644 (file)
Binary files a/gfx/frigateGun11.png and b/gfx/frigateGun11.png differ

diff --git a/gfx/frigateGun12.png b/gfx/frigateGun12.png
index 23b3ed9..fc449ad 100644 (file)
Binary files a/gfx/frigateGun12.png and b/gfx/frigateGun12.png differ

diff --git a/gfx/frigateGun21.png b/gfx/frigateGun21.png
index 472c1fb..d0fa5ab 100644 (file)
Binary files a/gfx/frigateGun21.png and b/gfx/frigateGun21.png differ

diff --git a/gfx/frigateGun22.png b/gfx/frigateGun22.png
index 62510b4..b924b89 100644 (file)
Binary files a/gfx/frigateGun22.png and b/gfx/frigateGun22.png differ

diff --git a/gfx/gameover.png b/gfx/gameover.png
index f440a34..d8ad3cb 100644 (file)
Binary files a/gfx/gameover.png and b/gfx/gameover.png differ

diff --git a/gfx/greenDir.png b/gfx/greenDir.png
index b8cf74f..4ee1f07 100644 (file)
Binary files a/gfx/greenDir.png and b/gfx/greenDir.png differ

diff --git a/gfx/heart.png b/gfx/heart.png
index d733778..281334b 100644 (file)
Binary files a/gfx/heart.png and b/gfx/heart.png differ

diff --git a/gfx/icon1.png b/gfx/icon1.png
index a33edc0..f538af2 100644 (file)
Binary files a/gfx/icon1.png and b/gfx/icon1.png differ

diff --git a/gfx/icon10.png b/gfx/icon10.png
index df422e7..dabed4c 100644 (file)
Binary files a/gfx/icon10.png and b/gfx/icon10.png differ

diff --git a/gfx/icon11.png b/gfx/icon11.png
index dccb38f..52f94ce 100644 (file)
Binary files a/gfx/icon11.png and b/gfx/icon11.png differ

diff --git a/gfx/icon12.png b/gfx/icon12.png
index 409095b..00c65e6 100644 (file)
Binary files a/gfx/icon12.png and b/gfx/icon12.png differ

diff --git a/gfx/icon13.png b/gfx/icon13.png
index 6b08948..0e75bf5 100644 (file)
Binary files a/gfx/icon13.png and b/gfx/icon13.png differ

diff --git a/gfx/icon14.png b/gfx/icon14.png
index bc3090e..46d9d98 100644 (file)
Binary files a/gfx/icon14.png and b/gfx/icon14.png differ

diff --git a/gfx/icon15.png b/gfx/icon15.png
index 789d53e..4f307eb 100644 (file)
Binary files a/gfx/icon15.png and b/gfx/icon15.png differ

diff --git a/gfx/icon16.png b/gfx/icon16.png
index 033ac8d..0ad8200 100644 (file)
Binary files a/gfx/icon16.png and b/gfx/icon16.png differ

diff --git a/gfx/icon17.png b/gfx/icon17.png
index 7b6d991..b6c6ef1 100644 (file)
Binary files a/gfx/icon17.png and b/gfx/icon17.png differ

diff --git a/gfx/icon18.png b/gfx/icon18.png
index eb6a9a1..7995c43 100644 (file)
Binary files a/gfx/icon18.png and b/gfx/icon18.png differ

diff --git a/gfx/icon19.png b/gfx/icon19.png
index 41dd862..2cb36d6 100644 (file)
Binary files a/gfx/icon19.png and b/gfx/icon19.png differ

diff --git a/gfx/icon2.png b/gfx/icon2.png
index 3abc295..1069993 100644 (file)
Binary files a/gfx/icon2.png and b/gfx/icon2.png differ

diff --git a/gfx/icon20.png b/gfx/icon20.png
index 5111e13..dc91993 100644 (file)
Binary files a/gfx/icon20.png and b/gfx/icon20.png differ

diff --git a/gfx/icon21.png b/gfx/icon21.png
index 7407559..27925e2 100644 (file)
Binary files a/gfx/icon21.png and b/gfx/icon21.png differ

diff --git a/gfx/icon22.png b/gfx/icon22.png
index cb0170f..6b508ac 100644 (file)
Binary files a/gfx/icon22.png and b/gfx/icon22.png differ

diff --git a/gfx/icon23.png b/gfx/icon23.png
index b14c09e..2615d80 100644 (file)
Binary files a/gfx/icon23.png and b/gfx/icon23.png differ

diff --git a/gfx/icon24.png b/gfx/icon24.png
index 0e130bb..3a1ac3c 100644 (file)
Binary files a/gfx/icon24.png and b/gfx/icon24.png differ

diff --git a/gfx/icon25.png b/gfx/icon25.png
index 6f458a8..91f21d9 100644 (file)
Binary files a/gfx/icon25.png and b/gfx/icon25.png differ

diff --git a/gfx/icon26.png b/gfx/icon26.png
index 58f6950..8cc8eeb 100644 (file)
Binary files a/gfx/icon26.png and b/gfx/icon26.png differ

diff --git a/gfx/icon3.png b/gfx/icon3.png
index f6f3a0e..cfdf776 100644 (file)
Binary files a/gfx/icon3.png and b/gfx/icon3.png differ

diff --git a/gfx/icon4.png b/gfx/icon4.png
index 200aa64..9a80fb7 100644 (file)
Binary files a/gfx/icon4.png and b/gfx/icon4.png differ

diff --git a/gfx/icon5.png b/gfx/icon5.png
index 3625135..46d1c46 100644 (file)
Binary files a/gfx/icon5.png and b/gfx/icon5.png differ

diff --git a/gfx/icon6.png b/gfx/icon6.png
index c645df1..60810a1 100644 (file)
Binary files a/gfx/icon6.png and b/gfx/icon6.png differ

diff --git a/gfx/icon7.png b/gfx/icon7.png
index ce5e967..cde7010 100644 (file)
Binary files a/gfx/icon7.png and b/gfx/icon7.png differ

diff --git a/gfx/icon8.png b/gfx/icon8.png
index f2db4d0..6f9a5f1 100644 (file)
Binary files a/gfx/icon8.png and b/gfx/icon8.png differ

diff --git a/gfx/icon9.png b/gfx/icon9.png
index 3d90ca0..89e667d 100644 (file)
Binary files a/gfx/icon9.png and b/gfx/icon9.png differ

diff --git a/gfx/kline11.png b/gfx/kline11.png
index d899156..2953aef 100644 (file)
Binary files a/gfx/kline11.png and b/gfx/kline11.png differ

diff --git a/gfx/kline12.png b/gfx/kline12.png
index 994f466..0621788 100644 (file)
Binary files a/gfx/kline12.png and b/gfx/kline12.png differ

diff --git a/gfx/klineText.png b/gfx/klineText.png
index 8b93e3a..1d0df83 100644 (file)
Binary files a/gfx/klineText.png and b/gfx/klineText.png differ

diff --git a/gfx/mine.png b/gfx/mine.png
index 16bd558..3e5776d 100644 (file)
Binary files a/gfx/mine.png and b/gfx/mine.png differ

diff --git a/gfx/mineBoss2.png b/gfx/mineBoss2.png
index ab0ed66..30aeb71 100644 (file)
Binary files a/gfx/mineBoss2.png and b/gfx/mineBoss2.png differ

diff --git a/gfx/mineBossWing21.png b/gfx/mineBossWing21.png
index 0e9e926..fa506f1 100644 (file)
Binary files a/gfx/mineBossWing21.png and b/gfx/mineBossWing21.png differ

diff --git a/gfx/mineBossWing22.png b/gfx/mineBossWing22.png
index 9823cf0..7161d26 100644 (file)
Binary files a/gfx/mineBossWing22.png and b/gfx/mineBossWing22.png differ

diff --git a/gfx/mineBossWing31.png b/gfx/mineBossWing31.png
index af2c644..790bb41 100644 (file)
Binary files a/gfx/mineBossWing31.png and b/gfx/mineBossWing31.png differ

diff --git a/gfx/mineBossWing32.png b/gfx/mineBossWing32.png
index 97e7dc9..80c7aa9 100644 (file)
Binary files a/gfx/mineBossWing32.png and b/gfx/mineBossWing32.png differ

diff --git a/gfx/miner1.png b/gfx/miner1.png
index 776fff0..2904a24 100644 (file)
Binary files a/gfx/miner1.png and b/gfx/miner1.png differ

diff --git a/gfx/miner2.png b/gfx/miner2.png
index 97286e4..a418faa 100644 (file)
Binary files a/gfx/miner2.png and b/gfx/miner2.png differ

diff --git a/gfx/missileBoat1.png b/gfx/missileBoat1.png
index 01c0f3e..081a452 100644 (file)
Binary files a/gfx/missileBoat1.png and b/gfx/missileBoat1.png differ

diff --git a/gfx/missileBoat2.png b/gfx/missileBoat2.png
index c5f2895..890709a 100644 (file)
Binary files a/gfx/missileBoat2.png and b/gfx/missileBoat2.png differ

diff --git a/gfx/mobileCannon1.png b/gfx/mobileCannon1.png
index de1403e..c317442 100644 (file)
Binary files a/gfx/mobileCannon1.png and b/gfx/mobileCannon1.png differ

diff --git a/gfx/mobileCannon2.png b/gfx/mobileCannon2.png
index 2f994b7..fa23646 100644 (file)
Binary files a/gfx/mobileCannon2.png and b/gfx/mobileCannon2.png differ

diff --git a/gfx/mobileShield1.png b/gfx/mobileShield1.png
index 1b4ba7c..75429f4 100644 (file)
Binary files a/gfx/mobileShield1.png and b/gfx/mobileShield1.png differ

diff --git a/gfx/mobileShield2.png b/gfx/mobileShield2.png
index 7c74394..56f1fb0 100644 (file)
Binary files a/gfx/mobileShield2.png and b/gfx/mobileShield2.png differ

diff --git a/gfx/ore1.png b/gfx/ore1.png
index 33bfc4d..d17ec52 100644 (file)
Binary files a/gfx/ore1.png and b/gfx/ore1.png differ

diff --git a/gfx/ore2.png b/gfx/ore2.png
index beeb0d1..f39be88 100644 (file)
Binary files a/gfx/ore2.png and b/gfx/ore2.png differ

diff --git a/gfx/ore3.png b/gfx/ore3.png
index 2c30ae0..fee46c8 100644 (file)
Binary files a/gfx/ore3.png and b/gfx/ore3.png differ

diff --git a/gfx/phoebeText.png b/gfx/phoebeText.png
index 873f1f3..dbd2373 100644 (file)
Binary files a/gfx/phoebeText.png and b/gfx/phoebeText.png differ

diff --git a/gfx/planet_blue.png b/gfx/planet_blue.png
index e3267c5..041b731 100644 (file)
Binary files a/gfx/planet_blue.png and b/gfx/planet_blue.png differ

diff --git a/gfx/planet_green.png b/gfx/planet_green.png
index aac83ad..8c9067d 100644 (file)
Binary files a/gfx/planet_green.png and b/gfx/planet_green.png differ

diff --git a/gfx/planet_orange.png b/gfx/planet_orange.png
index f09bf91..5d8fe8a 100644 (file)
Binary files a/gfx/planet_orange.png and b/gfx/planet_orange.png differ

diff --git a/gfx/planet_red.png b/gfx/planet_red.png
index 37ad806..efe442d 100644 (file)
Binary files a/gfx/planet_red.png and b/gfx/planet_red.png differ

diff --git a/gfx/planet_sun.png b/gfx/planet_sun.png
index f8af514..8d641d0 100644 (file)
Binary files a/gfx/planet_sun.png and b/gfx/planet_sun.png differ

diff --git a/gfx/plasmaAmmo.png b/gfx/plasmaAmmo.png
index 1fd89ec..eaa6506 100644 (file)
Binary files a/gfx/plasmaAmmo.png and b/gfx/plasmaAmmo.png differ

diff --git a/gfx/plasmaDamage.png b/gfx/plasmaDamage.png
index 8339e68..9901019 100644 (file)
Binary files a/gfx/plasmaDamage.png and b/gfx/plasmaDamage.png differ

diff --git a/gfx/plasmaGreen.png b/gfx/plasmaGreen.png
index 233572a..52c90df 100644 (file)
Binary files a/gfx/plasmaGreen.png and b/gfx/plasmaGreen.png differ

diff --git a/gfx/plasmaRate.png b/gfx/plasmaRate.png
index a2b6d91..5e27b7b 100644 (file)
Binary files a/gfx/plasmaRate.png and b/gfx/plasmaRate.png differ

diff --git a/gfx/plasmaRed.png b/gfx/plasmaRed.png
index de19903..81b27dc 100644 (file)
Binary files a/gfx/plasmaRed.png and b/gfx/plasmaRed.png differ

diff --git a/gfx/plutoBoss1.png b/gfx/plutoBoss1.png
index ef8f671..b49f112 100644 (file)
Binary files a/gfx/plutoBoss1.png and b/gfx/plutoBoss1.png differ

diff --git a/gfx/plutoBoss2.png b/gfx/plutoBoss2.png
index bffe47a..20f9b0e 100644 (file)
Binary files a/gfx/plutoBoss2.png and b/gfx/plutoBoss2.png differ

diff --git a/gfx/prlogo.png b/gfx/prlogo.png
index 18d358a..9c7e870 100644 (file)
Binary files a/gfx/prlogo.png and b/gfx/prlogo.png differ

diff --git a/gfx/rebelCarrier1.png b/gfx/rebelCarrier1.png
index 60124dd..200edd3 100644 (file)
Binary files a/gfx/rebelCarrier1.png and b/gfx/rebelCarrier1.png differ

diff --git a/gfx/rebelCarrier2.png b/gfx/rebelCarrier2.png
index e9216e7..55a4c87 100644 (file)
Binary files a/gfx/rebelCarrier2.png and b/gfx/rebelCarrier2.png differ

diff --git a/gfx/redDir.png b/gfx/redDir.png
index ab159bf..5caf234 100644 (file)
Binary files a/gfx/redDir.png and b/gfx/redDir.png differ

diff --git a/gfx/rocket.png b/gfx/rocket.png
index a85187a..5da9d48 100644 (file)
Binary files a/gfx/rocket.png and b/gfx/rocket.png differ

diff --git a/gfx/rocket1.png b/gfx/rocket1.png
index 1cbb881..87bcfc1 100644 (file)
Binary files a/gfx/rocket1.png and b/gfx/rocket1.png differ

diff --git a/gfx/rocket2.png b/gfx/rocket2.png
index d2b4be0..0835b19 100644 (file)
Binary files a/gfx/rocket2.png and b/gfx/rocket2.png differ

diff --git a/gfx/sflogo.png b/gfx/sflogo.png
index b0aca78..6b6f03c 100644 (file)
Binary files a/gfx/sflogo.png and b/gfx/sflogo.png differ

diff --git a/gfx/sid1.png b/gfx/sid1.png
index 0482e4f..e37be5f 100644 (file)
Binary files a/gfx/sid1.png and b/gfx/sid1.png differ

diff --git a/gfx/sid2.png b/gfx/sid2.png
index e25df2e..e28cf6c 100644 (file)
Binary files a/gfx/sid2.png and b/gfx/sid2.png differ

diff --git a/gfx/sidText.png b/gfx/sidText.png
index 66790d8..fc629ca 100644 (file)
Binary files a/gfx/sidText.png and b/gfx/sidText.png differ

diff --git a/gfx/slaveTrans1.png b/gfx/slaveTrans1.png
index 32429ce..a272240 100644 (file)
Binary files a/gfx/slaveTrans1.png and b/gfx/slaveTrans1.png differ

diff --git a/gfx/slaveTrans2.png b/gfx/slaveTrans2.png
index 4cfd5ca..bb58169 100644 (file)
Binary files a/gfx/slaveTrans2.png and b/gfx/slaveTrans2.png differ

diff --git a/gfx/splitBoss11.png b/gfx/splitBoss11.png
index 0576b03..f47cbf9 100644 (file)
Binary files a/gfx/splitBoss11.png and b/gfx/splitBoss11.png differ

diff --git a/gfx/splitBoss12.png b/gfx/splitBoss12.png
index 8b7e6f9..611423b 100644 (file)
Binary files a/gfx/splitBoss12.png and b/gfx/splitBoss12.png differ

diff --git a/gfx/splitBoss21.png b/gfx/splitBoss21.png
index d54d34c..3cca935 100644 (file)
Binary files a/gfx/splitBoss21.png and b/gfx/splitBoss21.png differ

diff --git a/gfx/splitBoss22.png b/gfx/splitBoss22.png
index b3fe7ab..f8fe687 100644 (file)
Binary files a/gfx/splitBoss22.png and b/gfx/splitBoss22.png differ

diff --git a/gfx/splitBoss31.png b/gfx/splitBoss31.png
index 96cd0d5..60e5306 100644 (file)
Binary files a/gfx/splitBoss31.png and b/gfx/splitBoss31.png differ

diff --git a/gfx/splitBoss32.png b/gfx/splitBoss32.png
index 4ebd36d..b040fba 100644 (file)
Binary files a/gfx/splitBoss32.png and b/gfx/splitBoss32.png differ

diff --git a/gfx/stunBolt.png b/gfx/stunBolt.png
index edd8630..2eb5fde 100644 (file)
Binary files a/gfx/stunBolt.png and b/gfx/stunBolt.png differ

diff --git a/gfx/superCharge.png b/gfx/superCharge.png
index 4d3dddd..29095fd 100644 (file)
Binary files a/gfx/superCharge.png and b/gfx/superCharge.png differ

diff --git a/gfx/targetText.png b/gfx/targetText.png
index aa84751..cec34e9 100644 (file)
Binary files a/gfx/targetText.png and b/gfx/targetText.png differ

diff --git a/gfx/transport1.png b/gfx/transport1.png
index bdf4e0f..53d5741 100644 (file)
Binary files a/gfx/transport1.png and b/gfx/transport1.png differ

diff --git a/gfx/transport2.png b/gfx/transport2.png
index 347a873..e9e7de1 100644 (file)
Binary files a/gfx/transport2.png and b/gfx/transport2.png differ

diff --git a/gfx/tug1.png b/gfx/tug1.png
index 3a6deb7..1f3e34d 100644 (file)
Binary files a/gfx/tug1.png and b/gfx/tug1.png differ

diff --git a/gfx/tug2.png b/gfx/tug2.png
index e854511..fbabaed 100644 (file)
Binary files a/gfx/tug2.png and b/gfx/tug2.png differ

diff --git a/gfx/ursulaText.png b/gfx/ursulaText.png
index 4f07b35..9a3a72f 100644 (file)
Binary files a/gfx/ursulaText.png and b/gfx/ursulaText.png differ

diff --git a/gfx/wingmate1.png b/gfx/wingmate1.png
index c6fc6cb..a980947 100644 (file)
Binary files a/gfx/wingmate1.png and b/gfx/wingmate1.png differ

diff --git a/gfx/wingmate2.png b/gfx/wingmate2.png
index 99ea4c2..9b7d70d 100644 (file)
Binary files a/gfx/wingmate2.png and b/gfx/wingmate2.png differ

diff --git a/mac/README.txt b/mac/README.txt
new file mode 100644 (file)
index 0000000..e08ca83
--- /dev/null
+++ b/mac/README.txt
@@ -0,0 +1,18 @@
+Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without any warranty.
+
+========================================================================
+
+
+Requires Mac OS \10X 10.11.6 and Xcode 7.2 to compile.
+
+There are three SDL frameworks required, which you should download and 
+place in this directory.
+
+https://www.libsdl.org/release/SDL2-2.0.4.dmg
+https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.1.dmg
+https://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.0.1.dmg

diff --git a/mac/starfighter.xcodeproj/project.pbxproj b/mac/starfighter.xcodeproj/project.pbxproj
new file mode 100644 (file)
index 0000000..dd154c2
--- /dev/null
+++ b/mac/starfighter.xcodeproj/project.pbxproj
@@ -0,0 +1,497 @@
+// !$*UTF8*$!
+{
+       archiveVersion = 1;
+       classes = {
+       };
+       objectVersion = 46;
+       objects = {
+
+/* Begin PBXBuildFile section */
+               797059001D52CB1000FC009C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 797058FF1D52CB1000FC009C /* Assets.xcassets */; };
+               7970590F1D52CC2E00FC009C /* SDL2_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7970590C1D52CC2E00FC009C /* SDL2_image.framework */; };
+               797059101D52CC2E00FC009C /* SDL2_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7970590D1D52CC2E00FC009C /* SDL2_mixer.framework */; };
+               797059111D52CC2E00FC009C /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7970590E1D52CC2E00FC009C /* SDL2.framework */; };
+               797059131D52CD0100FC009C /* SDL2_image.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7970590C1D52CC2E00FC009C /* SDL2_image.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+               797059141D52CD0400FC009C /* SDL2_mixer.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7970590D1D52CC2E00FC009C /* SDL2_mixer.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+               797059151D52CD0700FC009C /* SDL2.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7970590E1D52CC2E00FC009C /* SDL2.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+               797059AF1D52D83F00FC009C /* alien.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 797059771D52D83E00FC009C /* alien.cpp */; };
+               797059B01D52D83F00FC009C /* audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 797059791D52D83E00FC009C /* audio.cpp */; };
+               797059B11D52D83F00FC009C /* bullet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7970597B1D52D83E00FC009C /* bullet.cpp */; };
+               797059B21D52D83F00FC009C /* cargo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7970597D1D52D83E00FC009C /* cargo.cpp */; };
+               797059B31D52D83F00FC009C /* collectable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7970597F1D52D83E00FC009C /* collectable.cpp */; };
+               797059B41D52D83F00FC009C /* colors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 797059811D52D83E00FC009C /* colors.cpp */; };
+               797059B51D52D83F00FC009C /* cutscene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 797059831D52D83E00FC009C /* cutscene.cpp */; };
+               797059B61D52D83F00FC009C /* engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 797059861D52D83E00FC009C /* engine.cpp */; };
+               797059B71D52D83F00FC009C /* event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 797059881D52D83E00FC009C /* event.cpp */; };
+               797059B81D52D83F00FC009C /* explosion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7970598A1D52D83E00FC009C /* explosion.cpp */; };
+               797059B91D52D83F00FC009C /* game.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7970598C1D52D83E00FC009C /* game.cpp */; };
+               797059BA1D52D83F00FC009C /* gfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7970598E1D52D83F00FC009C /* gfx.cpp */; };
+               797059BB1D52D83F00FC009C /* intermission.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 797059901D52D83F00FC009C /* intermission.cpp */; };
+               797059BC1D52D83F00FC009C /* loadSave.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 797059921D52D83F00FC009C /* loadSave.cpp */; };
+               797059BD1D52D83F00FC009C /* messages.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 797059941D52D83F00FC009C /* messages.cpp */; };
+               797059BE1D52D83F00FC009C /* misc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 797059961D52D83F00FC009C /* misc.cpp */; };
+               797059BF1D52D83F00FC009C /* missions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 797059981D52D83F00FC009C /* missions.cpp */; };
+               797059C01D52D83F00FC009C /* player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7970599A1D52D83F00FC009C /* player.cpp */; };
+               797059C11D52D83F00FC009C /* renderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7970599C1D52D83F00FC009C /* renderer.cpp */; };
+               797059C21D52D83F00FC009C /* resources.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7970599E1D52D83F00FC009C /* resources.cpp */; };
+               797059C31D52D83F00FC009C /* screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 797059A01D52D83F00FC009C /* screen.cpp */; };
+               797059C41D52D83F00FC009C /* ship.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 797059A21D52D83F00FC009C /* ship.cpp */; };
+               797059C51D52D83F00FC009C /* shop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 797059A41D52D83F00FC009C /* shop.cpp */; };
+               797059C61D52D83F00FC009C /* Starfighter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 797059A61D52D83F00FC009C /* Starfighter.cpp */; };
+               797059C71D52D83F00FC009C /* title.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 797059A91D52D83F00FC009C /* title.cpp */; };
+               797059C81D52D83F00FC009C /* weapons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 797059AB1D52D83F00FC009C /* weapons.cpp */; };
+               797059C91D52D83F00FC009C /* window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 797059AD1D52D83F00FC009C /* window.cpp */; };
+               797059CB1D52D87100FC009C /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 797059CA1D52D87100FC009C /* CoreFoundation.framework */; };
+               797059D11D52D8ED00FC009C /* data in Resources */ = {isa = PBXBuildFile; fileRef = 797059CC1D52D8ED00FC009C /* data */; };
+               797059D21D52D8ED00FC009C /* gfx in Resources */ = {isa = PBXBuildFile; fileRef = 797059CD1D52D8ED00FC009C /* gfx */; };
+               797059D31D52D8ED00FC009C /* misc in Resources */ = {isa = PBXBuildFile; fileRef = 797059CE1D52D8ED00FC009C /* misc */; };
+               797059D41D52D8ED00FC009C /* music in Resources */ = {isa = PBXBuildFile; fileRef = 797059CF1D52D8ED00FC009C /* music */; };
+               797059D51D52D8ED00FC009C /* sound in Resources */ = {isa = PBXBuildFile; fileRef = 797059D01D52D8ED00FC009C /* sound */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+               797059121D52CCF100FC009C /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = "";
+                       dstSubfolderSpec = 10;
+                       files = (
+                               797059131D52CD0100FC009C /* SDL2_image.framework in CopyFiles */,
+                               797059141D52CD0400FC009C /* SDL2_mixer.framework in CopyFiles */,
+                               797059151D52CD0700FC009C /* SDL2.framework in CopyFiles */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+               797058F61D52CB1000FC009C /* Starfighter.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Starfighter.app; sourceTree = BUILT_PRODUCTS_DIR; };
+               797058FF1D52CB1000FC009C /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+               797059041D52CB1000FC009C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+               7970590C1D52CC2E00FC009C /* SDL2_image.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SDL2_image.framework; sourceTree = SOURCE_ROOT; };
+               7970590D1D52CC2E00FC009C /* SDL2_mixer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SDL2_mixer.framework; sourceTree = SOURCE_ROOT; };
+               7970590E1D52CC2E00FC009C /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SDL2.framework; sourceTree = SOURCE_ROOT; };
+               797059771D52D83E00FC009C /* alien.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = alien.cpp; path = ../../src/alien.cpp; sourceTree = "<group>"; };
+               797059781D52D83E00FC009C /* alien.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = alien.h; path = ../../src/alien.h; sourceTree = "<group>"; };
+               797059791D52D83E00FC009C /* audio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = audio.cpp; path = ../../src/audio.cpp; sourceTree = "<group>"; };
+               7970597A1D52D83E00FC009C /* audio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = audio.h; path = ../../src/audio.h; sourceTree = "<group>"; };
+               7970597B1D52D83E00FC009C /* bullet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bullet.cpp; path = ../../src/bullet.cpp; sourceTree = "<group>"; };
+               7970597C1D52D83E00FC009C /* bullet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bullet.h; path = ../../src/bullet.h; sourceTree = "<group>"; };
+               7970597D1D52D83E00FC009C /* cargo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cargo.cpp; path = ../../src/cargo.cpp; sourceTree = "<group>"; };
+               7970597E1D52D83E00FC009C /* cargo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cargo.h; path = ../../src/cargo.h; sourceTree = "<group>"; };
+               7970597F1D52D83E00FC009C /* collectable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = collectable.cpp; path = ../../src/collectable.cpp; sourceTree = "<group>"; };
+               797059801D52D83E00FC009C /* collectable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = collectable.h; path = ../../src/collectable.h; sourceTree = "<group>"; };
+               797059811D52D83E00FC009C /* colors.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = colors.cpp; path = ../../src/colors.cpp; sourceTree = "<group>"; };
+               797059821D52D83E00FC009C /* colors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = colors.h; path = ../../src/colors.h; sourceTree = "<group>"; };
+               797059831D52D83E00FC009C /* cutscene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cutscene.cpp; path = ../../src/cutscene.cpp; sourceTree = "<group>"; };
+               797059841D52D83E00FC009C /* cutscene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cutscene.h; path = ../../src/cutscene.h; sourceTree = "<group>"; };
+               797059851D52D83E00FC009C /* defs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = defs.h; path = ../../src/defs.h; sourceTree = "<group>"; };
+               797059861D52D83E00FC009C /* engine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = engine.cpp; path = ../../src/engine.cpp; sourceTree = "<group>"; };
+               797059871D52D83E00FC009C /* engine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = engine.h; path = ../../src/engine.h; sourceTree = "<group>"; };
+               797059881D52D83E00FC009C /* event.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = event.cpp; path = ../../src/event.cpp; sourceTree = "<group>"; };
+               797059891D52D83E00FC009C /* event.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = event.h; path = ../../src/event.h; sourceTree = "<group>"; };
+               7970598A1D52D83E00FC009C /* explosion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = explosion.cpp; path = ../../src/explosion.cpp; sourceTree = "<group>"; };
+               7970598B1D52D83E00FC009C /* explosion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = explosion.h; path = ../../src/explosion.h; sourceTree = "<group>"; };
+               7970598C1D52D83E00FC009C /* game.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = game.cpp; path = ../../src/game.cpp; sourceTree = "<group>"; };
+               7970598D1D52D83F00FC009C /* game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = game.h; path = ../../src/game.h; sourceTree = "<group>"; };
+               7970598E1D52D83F00FC009C /* gfx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = gfx.cpp; path = ../../src/gfx.cpp; sourceTree = "<group>"; };
+               7970598F1D52D83F00FC009C /* gfx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gfx.h; path = ../../src/gfx.h; sourceTree = "<group>"; };
+               797059901D52D83F00FC009C /* intermission.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = intermission.cpp; path = ../../src/intermission.cpp; sourceTree = "<group>"; };
+               797059911D52D83F00FC009C /* intermission.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = intermission.h; path = ../../src/intermission.h; sourceTree = "<group>"; };
+               797059921D52D83F00FC009C /* loadSave.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = loadSave.cpp; path = ../../src/loadSave.cpp; sourceTree = "<group>"; };
+               797059931D52D83F00FC009C /* loadSave.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = loadSave.h; path = ../../src/loadSave.h; sourceTree = "<group>"; };
+               797059941D52D83F00FC009C /* messages.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = messages.cpp; path = ../../src/messages.cpp; sourceTree = "<group>"; };
+               797059951D52D83F00FC009C /* messages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = messages.h; path = ../../src/messages.h; sourceTree = "<group>"; };
+               797059961D52D83F00FC009C /* misc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = misc.cpp; path = ../../src/misc.cpp; sourceTree = "<group>"; };
+               797059971D52D83F00FC009C /* misc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = misc.h; path = ../../src/misc.h; sourceTree = "<group>"; };
+               797059981D52D83F00FC009C /* missions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = missions.cpp; path = ../../src/missions.cpp; sourceTree = "<group>"; };
+               797059991D52D83F00FC009C /* missions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = missions.h; path = ../../src/missions.h; sourceTree = "<group>"; };
+               7970599A1D52D83F00FC009C /* player.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = player.cpp; path = ../../src/player.cpp; sourceTree = "<group>"; };
+               7970599B1D52D83F00FC009C /* player.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = player.h; path = ../../src/player.h; sourceTree = "<group>"; };
+               7970599C1D52D83F00FC009C /* renderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = renderer.cpp; path = ../../src/renderer.cpp; sourceTree = "<group>"; };
+               7970599D1D52D83F00FC009C /* renderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = renderer.h; path = ../../src/renderer.h; sourceTree = "<group>"; };
+               7970599E1D52D83F00FC009C /* resources.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = resources.cpp; path = ../../src/resources.cpp; sourceTree = "<group>"; };
+               7970599F1D52D83F00FC009C /* resources.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = resources.h; path = ../../src/resources.h; sourceTree = "<group>"; };
+               797059A01D52D83F00FC009C /* screen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = screen.cpp; path = ../../src/screen.cpp; sourceTree = "<group>"; };
+               797059A11D52D83F00FC009C /* screen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = screen.h; path = ../../src/screen.h; sourceTree = "<group>"; };
+               797059A21D52D83F00FC009C /* ship.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ship.cpp; path = ../../src/ship.cpp; sourceTree = "<group>"; };
+               797059A31D52D83F00FC009C /* ship.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ship.h; path = ../../src/ship.h; sourceTree = "<group>"; };
+               797059A41D52D83F00FC009C /* shop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = shop.cpp; path = ../../src/shop.cpp; sourceTree = "<group>"; };
+               797059A51D52D83F00FC009C /* shop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = shop.h; path = ../../src/shop.h; sourceTree = "<group>"; };
+               797059A61D52D83F00FC009C /* Starfighter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Starfighter.cpp; path = ../../src/Starfighter.cpp; sourceTree = "<group>"; };
+               797059A71D52D83F00FC009C /* Starfighter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Starfighter.h; path = ../../src/Starfighter.h; sourceTree = "<group>"; };
+               797059A81D52D83F00FC009C /* structs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = structs.h; path = ../../src/structs.h; sourceTree = "<group>"; };
+               797059A91D52D83F00FC009C /* title.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = title.cpp; path = ../../src/title.cpp; sourceTree = "<group>"; };
+               797059AA1D52D83F00FC009C /* title.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = title.h; path = ../../src/title.h; sourceTree = "<group>"; };
+               797059AB1D52D83F00FC009C /* weapons.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = weapons.cpp; path = ../../src/weapons.cpp; sourceTree = "<group>"; };
+               797059AC1D52D83F00FC009C /* weapons.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = weapons.h; path = ../../src/weapons.h; sourceTree = "<group>"; };
+               797059AD1D52D83F00FC009C /* window.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = window.cpp; path = ../../src/window.cpp; sourceTree = "<group>"; };
+               797059AE1D52D83F00FC009C /* window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = window.h; path = ../../src/window.h; sourceTree = "<group>"; };
+               797059CA1D52D87100FC009C /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
+               797059CC1D52D8ED00FC009C /* data */ = {isa = PBXFileReference; lastKnownFileType = folder; name = data; path = ../data; sourceTree = "<group>"; };
+               797059CD1D52D8ED00FC009C /* gfx */ = {isa = PBXFileReference; lastKnownFileType = folder; name = gfx; path = ../gfx; sourceTree = "<group>"; };
+               797059CE1D52D8ED00FC009C /* misc */ = {isa = PBXFileReference; lastKnownFileType = folder; name = misc; path = ../misc; sourceTree = "<group>"; };
+               797059CF1D52D8ED00FC009C /* music */ = {isa = PBXFileReference; lastKnownFileType = folder; name = music; path = ../music; sourceTree = "<group>"; };
+               797059D01D52D8ED00FC009C /* sound */ = {isa = PBXFileReference; lastKnownFileType = folder; name = sound; path = ../sound; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+               797058F31D52CB1000FC009C /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               797059CB1D52D87100FC009C /* CoreFoundation.framework in Frameworks */,
+                               797059111D52CC2E00FC009C /* SDL2.framework in Frameworks */,
+                               7970590F1D52CC2E00FC009C /* SDL2_image.framework in Frameworks */,
+                               797059101D52CC2E00FC009C /* SDL2_mixer.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+               797058ED1D52CB1000FC009C = {
+                       isa = PBXGroup;
+                       children = (
+                               797059CC1D52D8ED00FC009C /* data */,
+                               797059CD1D52D8ED00FC009C /* gfx */,
+                               797059CE1D52D8ED00FC009C /* misc */,
+                               797059CF1D52D8ED00FC009C /* music */,
+                               797059D01D52D8ED00FC009C /* sound */,
+                               797059CA1D52D87100FC009C /* CoreFoundation.framework */,
+                               797058F81D52CB1000FC009C /* starfighter */,
+                               797058F71D52CB1000FC009C /* Products */,
+                       );
+                       sourceTree = "<group>";
+               };
+               797058F71D52CB1000FC009C /* Products */ = {
+                       isa = PBXGroup;
+                       children = (
+                               797058F61D52CB1000FC009C /* Starfighter.app */,
+                       );
+                       name = Products;
+                       sourceTree = "<group>";
+               };
+               797058F81D52CB1000FC009C /* starfighter */ = {
+                       isa = PBXGroup;
+                       children = (
+                               797059771D52D83E00FC009C /* alien.cpp */,
+                               797059781D52D83E00FC009C /* alien.h */,
+                               797059791D52D83E00FC009C /* audio.cpp */,
+                               7970597A1D52D83E00FC009C /* audio.h */,
+                               7970597B1D52D83E00FC009C /* bullet.cpp */,
+                               7970597C1D52D83E00FC009C /* bullet.h */,
+                               7970597D1D52D83E00FC009C /* cargo.cpp */,
+                               7970597E1D52D83E00FC009C /* cargo.h */,
+                               7970597F1D52D83E00FC009C /* collectable.cpp */,
+                               797059801D52D83E00FC009C /* collectable.h */,
+                               797059811D52D83E00FC009C /* colors.cpp */,
+                               797059821D52D83E00FC009C /* colors.h */,
+                               797059831D52D83E00FC009C /* cutscene.cpp */,
+                               797059841D52D83E00FC009C /* cutscene.h */,
+                               797059851D52D83E00FC009C /* defs.h */,
+                               797059861D52D83E00FC009C /* engine.cpp */,
+                               797059871D52D83E00FC009C /* engine.h */,
+                               797059881D52D83E00FC009C /* event.cpp */,
+                               797059891D52D83E00FC009C /* event.h */,
+                               7970598A1D52D83E00FC009C /* explosion.cpp */,
+                               7970598B1D52D83E00FC009C /* explosion.h */,
+                               7970598C1D52D83E00FC009C /* game.cpp */,
+                               7970598D1D52D83F00FC009C /* game.h */,
+                               7970598E1D52D83F00FC009C /* gfx.cpp */,
+                               7970598F1D52D83F00FC009C /* gfx.h */,
+                               797059901D52D83F00FC009C /* intermission.cpp */,
+                               797059911D52D83F00FC009C /* intermission.h */,
+                               797059921D52D83F00FC009C /* loadSave.cpp */,
+                               797059931D52D83F00FC009C /* loadSave.h */,
+                               797059941D52D83F00FC009C /* messages.cpp */,
+                               797059951D52D83F00FC009C /* messages.h */,
+                               797059961D52D83F00FC009C /* misc.cpp */,
+                               797059971D52D83F00FC009C /* misc.h */,
+                               797059981D52D83F00FC009C /* missions.cpp */,
+                               797059991D52D83F00FC009C /* missions.h */,
+                               7970599A1D52D83F00FC009C /* player.cpp */,
+                               7970599B1D52D83F00FC009C /* player.h */,
+                               7970599C1D52D83F00FC009C /* renderer.cpp */,
+                               7970599D1D52D83F00FC009C /* renderer.h */,
+                               7970599E1D52D83F00FC009C /* resources.cpp */,
+                               7970599F1D52D83F00FC009C /* resources.h */,
+                               797059A01D52D83F00FC009C /* screen.cpp */,
+                               797059A11D52D83F00FC009C /* screen.h */,
+                               797059A21D52D83F00FC009C /* ship.cpp */,
+                               797059A31D52D83F00FC009C /* ship.h */,
+                               797059A41D52D83F00FC009C /* shop.cpp */,
+                               797059A51D52D83F00FC009C /* shop.h */,
+                               797059A61D52D83F00FC009C /* Starfighter.cpp */,
+                               797059A71D52D83F00FC009C /* Starfighter.h */,
+                               797059A81D52D83F00FC009C /* structs.h */,
+                               797059A91D52D83F00FC009C /* title.cpp */,
+                               797059AA1D52D83F00FC009C /* title.h */,
+                               797059AB1D52D83F00FC009C /* weapons.cpp */,
+                               797059AC1D52D83F00FC009C /* weapons.h */,
+                               797059AD1D52D83F00FC009C /* window.cpp */,
+                               797059AE1D52D83F00FC009C /* window.h */,
+                               7970590C1D52CC2E00FC009C /* SDL2_image.framework */,
+                               7970590D1D52CC2E00FC009C /* SDL2_mixer.framework */,
+                               7970590E1D52CC2E00FC009C /* SDL2.framework */,
+                               797058FF1D52CB1000FC009C /* Assets.xcassets */,
+                               797059041D52CB1000FC009C /* Info.plist */,
+                       );
+                       path = starfighter;
+                       sourceTree = "<group>";
+               };
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+               797058F51D52CB1000FC009C /* Starfighter */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = 797059071D52CB1000FC009C /* Build configuration list for PBXNativeTarget "Starfighter" */;
+                       buildPhases = (
+                               797058F21D52CB1000FC009C /* Sources */,
+                               797058F31D52CB1000FC009C /* Frameworks */,
+                               797058F41D52CB1000FC009C /* Resources */,
+                               797059121D52CCF100FC009C /* CopyFiles */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = Starfighter;
+                       productName = starfighter;
+                       productReference = 797058F61D52CB1000FC009C /* Starfighter.app */;
+                       productType = "com.apple.product-type.application";
+               };
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+               797058EE1D52CB1000FC009C /* Project object */ = {
+                       isa = PBXProject;
+                       attributes = {
+                               LastUpgradeCheck = 0720;
+                               ORGANIZATIONNAME = "Parallel Realities";
+                               TargetAttributes = {
+                                       797058F51D52CB1000FC009C = {
+                                               CreatedOnToolsVersion = 7.2;
+                                       };
+                               };
+                       };
+                       buildConfigurationList = 797058F11D52CB1000FC009C /* Build configuration list for PBXProject "starfighter" */;
+                       compatibilityVersion = "Xcode 3.2";
+                       developmentRegion = English;
+                       hasScannedForEncodings = 0;
+                       knownRegions = (
+                               en,
+                               Base,
+                       );
+                       mainGroup = 797058ED1D52CB1000FC009C;
+                       productRefGroup = 797058F71D52CB1000FC009C /* Products */;
+                       projectDirPath = "";
+                       projectRoot = "";
+                       targets = (
+                               797058F51D52CB1000FC009C /* Starfighter */,
+                       );
+               };
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+               797058F41D52CB1000FC009C /* Resources */ = {
+                       isa = PBXResourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               797059D51D52D8ED00FC009C /* sound in Resources */,
+                               797059D31D52D8ED00FC009C /* misc in Resources */,
+                               797059D21D52D8ED00FC009C /* gfx in Resources */,
+                               797059D41D52D8ED00FC009C /* music in Resources */,
+                               797059D11D52D8ED00FC009C /* data in Resources */,
+                               797059001D52CB1000FC009C /* Assets.xcassets in Resources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+               797058F21D52CB1000FC009C /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               797059BC1D52D83F00FC009C /* loadSave.cpp in Sources */,
+                               797059B01D52D83F00FC009C /* audio.cpp in Sources */,
+                               797059C01D52D83F00FC009C /* player.cpp in Sources */,
+                               797059C41D52D83F00FC009C /* ship.cpp in Sources */,
+                               797059B61D52D83F00FC009C /* engine.cpp in Sources */,
+                               797059B11D52D83F00FC009C /* bullet.cpp in Sources */,
+                               797059C51D52D83F00FC009C /* shop.cpp in Sources */,
+                               797059BD1D52D83F00FC009C /* messages.cpp in Sources */,
+                               797059BE1D52D83F00FC009C /* misc.cpp in Sources */,
+                               797059BB1D52D83F00FC009C /* intermission.cpp in Sources */,
+                               797059B51D52D83F00FC009C /* cutscene.cpp in Sources */,
+                               797059C61D52D83F00FC009C /* Starfighter.cpp in Sources */,
+                               797059C21D52D83F00FC009C /* resources.cpp in Sources */,
+                               797059C31D52D83F00FC009C /* screen.cpp in Sources */,
+                               797059B31D52D83F00FC009C /* collectable.cpp in Sources */,
+                               797059BF1D52D83F00FC009C /* missions.cpp in Sources */,
+                               797059C11D52D83F00FC009C /* renderer.cpp in Sources */,
+                               797059C71D52D83F00FC009C /* title.cpp in Sources */,
+                               797059B91D52D83F00FC009C /* game.cpp in Sources */,
+                               797059C81D52D83F00FC009C /* weapons.cpp in Sources */,
+                               797059B41D52D83F00FC009C /* colors.cpp in Sources */,
+                               797059B21D52D83F00FC009C /* cargo.cpp in Sources */,
+                               797059B81D52D83F00FC009C /* explosion.cpp in Sources */,
+                               797059BA1D52D83F00FC009C /* gfx.cpp in Sources */,
+                               797059C91D52D83F00FC009C /* window.cpp in Sources */,
+                               797059B71D52D83F00FC009C /* event.cpp in Sources */,
+                               797059AF1D52D83F00FC009C /* alien.cpp in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+               797059051D52CB1000FC009C /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+                               CLANG_CXX_LIBRARY = "libc++";
+                               CLANG_ENABLE_MODULES = YES;
+                               CLANG_ENABLE_OBJC_ARC = YES;
+                               CLANG_WARN_BOOL_CONVERSION = YES;
+                               CLANG_WARN_CONSTANT_CONVERSION = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_EMPTY_BODY = YES;
+                               CLANG_WARN_ENUM_CONVERSION = YES;
+                               CLANG_WARN_INT_CONVERSION = YES;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+                               CODE_SIGN_IDENTITY = "-";
+                               COPY_PHASE_STRIP = NO;
+                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               ENABLE_STRICT_OBJC_MSGSEND = YES;
+                               ENABLE_TESTABILITY = YES;
+                               GCC_C_LANGUAGE_STANDARD = gnu99;
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_NO_COMMON_BLOCKS = YES;
+                               GCC_OPTIMIZATION_LEVEL = 0;
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "DEBUG=1",
+                                       "$(inherited)",
+                               );
+                               GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_UNDECLARED_SELECTOR = YES;
+                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+                               GCC_WARN_UNUSED_FUNCTION = YES;
+                               GCC_WARN_UNUSED_VARIABLE = YES;
+                               MACOSX_DEPLOYMENT_TARGET = 10.11;
+                               MTL_ENABLE_DEBUG_INFO = YES;
+                               ONLY_ACTIVE_ARCH = YES;
+                               SDKROOT = macosx;
+                       };
+                       name = Debug;
+               };
+               797059061D52CB1000FC009C /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+                               CLANG_CXX_LIBRARY = "libc++";
+                               CLANG_ENABLE_MODULES = YES;
+                               CLANG_ENABLE_OBJC_ARC = YES;
+                               CLANG_WARN_BOOL_CONVERSION = YES;
+                               CLANG_WARN_CONSTANT_CONVERSION = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_EMPTY_BODY = YES;
+                               CLANG_WARN_ENUM_CONVERSION = YES;
+                               CLANG_WARN_INT_CONVERSION = YES;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+                               CODE_SIGN_IDENTITY = "-";
+                               COPY_PHASE_STRIP = NO;
+                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+                               ENABLE_NS_ASSERTIONS = NO;
+                               ENABLE_STRICT_OBJC_MSGSEND = YES;
+                               GCC_C_LANGUAGE_STANDARD = gnu99;
+                               GCC_NO_COMMON_BLOCKS = YES;
+                               GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_UNDECLARED_SELECTOR = YES;
+                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+                               GCC_WARN_UNUSED_FUNCTION = YES;
+                               GCC_WARN_UNUSED_VARIABLE = YES;
+                               MACOSX_DEPLOYMENT_TARGET = 10.11;
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               SDKROOT = macosx;
+                       };
+                       name = Release;
+               };
+               797059081D52CB1000FC009C /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+                               COMBINE_HIDPI_IMAGES = YES;
+                               FRAMEWORK_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(PROJECT_DIR)",
+                               );
+                               GCC_PREPROCESSOR_DEFINITIONS = "VERSION=\\\"1.6\\\"";
+                               HEADER_SEARCH_PATHS = (
+                                       SDL2.framework/Headers,
+                                       SDL2_mixer.framework/Headers,
+                                       SDL2_image.framework/Headers,
+                               );
+                               INFOPLIST_FILE = starfighter/Info.plist;
+                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+                               PRODUCT_BUNDLE_IDENTIFIER = uk.me.fantastic.starfighter;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Debug;
+               };
+               797059091D52CB1000FC009C /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+                               COMBINE_HIDPI_IMAGES = YES;
+                               FRAMEWORK_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(PROJECT_DIR)",
+                               );
+                               GCC_PREPROCESSOR_DEFINITIONS = "VERSION=\\\"1.6\\\"";
+                               HEADER_SEARCH_PATHS = (
+                                       SDL2.framework/Headers,
+                                       SDL2_mixer.framework/Headers,
+                                       SDL2_image.framework/Headers,
+                               );
+                               INFOPLIST_FILE = starfighter/Info.plist;
+                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+                               PRODUCT_BUNDLE_IDENTIFIER = uk.me.fantastic.starfighter;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Release;
+               };
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+               797058F11D52CB1000FC009C /* Build configuration list for PBXProject "starfighter" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               797059051D52CB1000FC009C /* Debug */,
+                               797059061D52CB1000FC009C /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               797059071D52CB1000FC009C /* Build configuration list for PBXNativeTarget "Starfighter" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               797059081D52CB1000FC009C /* Debug */,
+                               797059091D52CB1000FC009C /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+/* End XCConfigurationList section */
+       };
+       rootObject = 797058EE1D52CB1000FC009C /* Project object */;
+}

diff --git a/mac/starfighter/Assets.xcassets/AppIcon.appiconset/Contents.json b/mac/starfighter/Assets.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644 (file)
index 0000000..0715d30
--- /dev/null
+++ b/mac/starfighter/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,59 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "size" : "16x16",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "16x16",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "32x32",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "32x32",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "128x128",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "128x128",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "256x256",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "256x256",
+      "scale" : "2x"
+    },
+    {
+      "size" : "512x512",
+      "idiom" : "mac",
+      "filename" : "web_hi_res_512.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "512x512",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

diff --git a/mac/starfighter/Assets.xcassets/AppIcon.appiconset/web_hi_res_512.png b/mac/starfighter/Assets.xcassets/AppIcon.appiconset/web_hi_res_512.png
new file mode 100644 (file)
index 0000000..d48ab42
Binary files /dev/null and b/mac/starfighter/Assets.xcassets/AppIcon.appiconset/web_hi_res_512.png differ

diff --git a/mac/starfighter/Info.plist b/mac/starfighter/Info.plist
new file mode 100644 (file)
index 0000000..3b35ac2
--- /dev/null
+++ b/mac/starfighter/Info.plist
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+       <key>CFBundleDevelopmentRegion</key>
+       <string>en</string>
+       <key>CFBundleExecutable</key>
+       <string>$(EXECUTABLE_NAME)</string>
+       <key>CFBundleIconFile</key>
+       <string></string>
+       <key>CFBundleIdentifier</key>
+       <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+       <key>CFBundleInfoDictionaryVersion</key>
+       <string>6.0</string>
+       <key>CFBundleName</key>
+       <string>$(PRODUCT_NAME)</string>
+       <key>CFBundlePackageType</key>
+       <string>APPL</string>
+       <key>CFBundleShortVersionString</key>
+       <string>1.5.1</string>
+       <key>CFBundleSignature</key>
+       <string>????</string>
+       <key>CFBundleVersion</key>
+       <string>1</string>
+       <key>LSMinimumSystemVersion</key>
+       <string>$(MACOSX_DEPLOYMENT_TARGET)</string>
+       <key>NSHumanReadableCopyright</key>
+       <string>Copyright © 2016 Parallel Realities. All rights reserved.</string>
+       <key>NSMainNibFile</key>
+       <string>MainMenu</string>
+       <key>NSPrincipalClass</key>
+       <string>NSApplication</string>
+</dict>
+</plist>

diff --git a/src/Starfighter.cpp b/src/Starfighter.cpp
index e579fcb..4e89219 100644 (file)
--- a/src/Starfighter.cpp
+++ b/src/Starfighter.cpp
@@ -20,6 +20,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "Starfighter.h"
 
+#ifdef __APPLE__
+#include "CoreFoundation/CoreFoundation.h"
+#endif
+
 int main(int argc, char **argv)
 {
        bool cheatAttempt;
@@ -28,6 +32,23 @@ int main(int argc, char **argv)
 
        if (chdir(DATADIR) == -1)
                printf("Warning: failed to change directory to \"%s\"\n", DATADIR);
+ 
+    // This makes relative paths work in C++ in Xcode by changing directory to the Resources folder inside the .app bundle
+#ifdef __APPLE__
+    CFBundleRef mainBundle = CFBundleGetMainBundle();
+    CFURLRef resourcesURL = CFBundleCopyResourcesDirectoryURL(mainBundle);
+    char path[PATH_MAX];
+    if (!CFURLGetFileSystemRepresentation(resourcesURL, TRUE, (UInt8 *)path, PATH_MAX))
+    {
+        // error!
+    }
+    CFRelease(resourcesURL);
+    
+    chdir(path);
+    printf("Current directory \"%s\"\n", path);
+#endif
+    // ----------------------------------------------------------------------------
+
 
        engine_init(); // Must do this first!
 

diff --git a/src/alien.cpp b/src/alien.cpp
index 70160fd..3fc30f6 100644 (file)
--- a/src/alien.cpp
+++ b/src/alien.cpp
@@ -1764,7 +1764,7 @@ void alien_destroy(object *alien, object *attacker)
        }
 
        if ((alien->classDef == CD_KRASS) && (attacker == &player))
-               setRadioMessage(FS_CHRIS, "²¶¤Ï¥¯¥ê¥¹¤À¡¢¥¸¥¸¥¤¡£", 1);
+               setRadioMessage(FS_CHRIS, "²¶¤Î̾¤Ï¥¯¥ê¥¹¤À¡¢¥¸¥¸¥¤¡£", 1);
 
        if (alien->classDef == CD_KLINE)
        {

diff --git a/src/colors.cpp b/src/colors.cpp
index 137e1fe..78c7b2b 100644 (file)
--- a/src/colors.cpp
+++ b/src/colors.cpp
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <SDL.h>
+#include "SDL.h"
 
 #include "Starfighter.h"
 

diff --git a/src/event.cpp b/src/event.cpp
index 4d89c23..c4ea6ba 100644 (file)
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -294,7 +294,7 @@ void events_init()
 
                        events[6].time = 25;
                        events[6].face = FS_CHRIS;
-                       strcpy(events[6].message, "²¶¤Ë¤â̾Á°¤¬¤¢¤ë¡£ÃΤé¤Í¤¨¤Î¤«?");
+                       strcpy(events[6].message, "²¶¤Ë¤â̾Á°¤¬¤¢¤ë¡£²±¤¨¤Æ¤¤¤ë¤«?");
 
                        events[7].time = 45;
                        events[7].entity = ALIEN_BOSS_PART3;

diff --git a/src/intermission.cpp b/src/intermission.cpp
index 8fd40cb..bac0f4e 100644 (file)
--- a/src/intermission.cpp
+++ b/src/intermission.cpp
@@ -54,7 +54,7 @@ static void intermission_setStatusLines()
        sprintf(string, "¥×¥ì¥¤¥ä¡¼°Ê³°¤Ë·âÄƤµ¤ì¤¿Å¨¤Î¿ô : %d", game.totalOtherKills);
        gfx_createTextObject(TS_OTHER_KILLS, string, 0, 0, FONT_WHITE);
 
-       sprintf(string, "²Ô¤¤¤ÀÁ÷¶â³Û : %d", game.cashEarned);
+       sprintf(string, "²Ô¤¤¤ÀÁí¶â³Û : %d", game.cashEarned);
        gfx_createTextObject(TS_CASH_EARNED, string, 0, 0, FONT_WHITE);
 
        gfx_createTextObject(TS_CHRIS_HEADER, "*** ¥¯¥ê¥¹ ***", 0, 0, FONT_WHITE);

diff --git a/src/messages.cpp b/src/messages.cpp
index 453e431..b29ec7a 100644 (file)
--- a/src/messages.cpp
+++ b/src/messages.cpp
@@ -38,7 +38,7 @@ static const char *killMessage[10] = {
 
        "¤³¤ì¤Ç%dµ¡ÌܤÀ¡£",
 
-       "¤ª¤¤%s¡¢¿²¤Æ¤¤¤ë¤Î¤«?!",
+       "%s¡¢¿²¤Æ¤¤¤ë¤Î¤«?!",
        "¤³¤ì¤ÇÄɤ¤¤Ä¤¤¤¿¤¾¡¢%s!",
 
        "¤Þ¤º¤Ï1µ¡ÌÜ!",

diff --git a/src/misc.cpp b/src/misc.cpp
index 5431432..eb454cb 100644 (file)
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -87,23 +87,6 @@ void setRadioMessage(int face, const char *in, int priority)
        gfx_createMessageBox(faceShape, in, 1);
 }
 
-static const char *faces[] = {
-                       "FACE_CHRIS", "FACE_SID", "FACE_KRASS",
-                       "FACE_KLINE", "FACE_PHOEBE", "FACE_URSULA",
-                       "FACE_CREW"
-};
-
-int getFace(const char *face)
-{
-       for (int i = 0 ; i < 7 ; i++)
-       {
-               if (strcmp(faces[i], face) == 0)
-                       return FS_CHRIS + i;
-       }
-
-       return -1;
-}
-
 void resetLists()
 {
        object *ob, *ob2;

diff --git a/src/misc.h b/src/misc.h
index 3f858a5..8dc4ea4 100644 (file)
--- a/src/misc.h
+++ b/src/misc.h
@@ -24,7 +24,6 @@ extern void clearInfoLines();
 void copyInfoLine(int a, int b);
 extern void setInfoLine(const char *in, int color);
 extern void setRadioMessage(int face, const char *in, int priority);
-extern int getFace(const char *face);
 extern void resetLists();
 
 #endif

diff --git a/src/missions.cpp b/src/missions.cpp
index 2a615dd..0dcac6a 100644 (file)
--- a/src/missions.cpp
+++ b/src/missions.cpp
@@ -583,6 +583,11 @@ bool allMissionsCompleted()
                        }
                        else
                        {
+                               if (currentMission.remainingObjectives2 > 0)
+                               {
+                                       setInfoLine("æ½Ð¥ï¡¼¥×¥¨¥ó¥¸¥ó¤¬ÍøÍѲÄǽ ESC¥Ü¥¿¥ó¤Ç»ÏÆ°¤¹¤ë", FONT_CYAN);
+                               }
+
                                if (game.area != MISN_INTERCEPTION)
                                        setInfoLine("*** ¼çÍפÊǤ̳¤ò´°Î» ***", FONT_GREEN);
                                else
@@ -902,7 +907,10 @@ void missionFinishedScreen()
 
                if (currentMission.remainingObjectives1 + currentMission.remainingObjectives2 == 0)
                {
-                       shield_bonus = player.shield * 10;
+                       if (game.difficulty == DIFFICULTY_NIGHTMARE)
+                               shield_bonus = 100;
+                       else
+                               shield_bonus = player.shield * 10;
                        sprintf(temp, "¥·¡¼¥ë¥É ¥Ü¡¼¥Ê¥¹: $%.3d", shield_bonus);
                        screen_renderString(temp, -1, 430, FONT_WHITE);
                        game.cash += shield_bonus;

diff --git a/src/title.cpp b/src/title.cpp
index 36f716b..5f9c51e 100644 (file)
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -285,7 +285,7 @@ int doTitle()
                aliens[i].face = 0;
        }
 
-       sprintf(buildVersion, "Version "VERSION);
+    sprintf(buildVersion, "Version %s", VERSION );
 
        SDL_Rect optionRec;
 

diff --git a/src/window.cpp b/src/window.cpp
index 3a17242..2c6f17a 100644 (file)
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -17,6 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+
 #include "SDL.h"
 
 SDL_Window *window;