id-Software · tomkidd · Apr 5, 2018 · Apr 6, 2018 · May 9, 2018 · Sep 17, 2018
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: schnapple
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,89 @@
+base/doom.wad
+.DS_Store
+base/doom2.wad
+base/plutonia.wad
+base/tnt.wad
+base/SIGIL.wad
+base/SIGIL_SHREDS.wad
+
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData/
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+
+## Other
+*.moved-aside
+*.xccheckout
+*.xcscmblueprint
+Thumbs.db
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+*.dSYM.zip
+*.dSYM
+
+## Playgrounds
+timeline.xctimeline
+playground.xcworkspace
+
+# Swift Package Manager
+#
+# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
+# Packages/
+# Package.pins
+# Package.resolved
+.build/
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# Pods/
+#
+# Add this line if you want to avoid checking in source code from the Xcode workspace
+# *.xcworkspace
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://docs.fastlane.tools/best-practices/source-control/#source-control
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots/**/*.png
+fastlane/test_output
+
+# Code Injection
+#
+# After new code Injection tools there's a generated folder /iOSInjectionProject
+# https://github.com/johnno1962/injectionforxcode
+
+iOSInjectionProject/
+code/iphone/Doom.xcodeproj/project.xcworkspace/xcuserdata/tomkidd.xcuserdatad/UserInterfaceState.xcuserstate
+code/iphone/DOOM.xcodeproj/project.xcworkspace/xcuserdata/tomkidd.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/IB Images/AdvancedButton.png b/IB Images/AdvancedButton.png
diff --git a/IB Images/AdvancedButton_Highlighted.png b/IB Images/AdvancedButton_Highlighted.png
diff --git a/IB Images/BackButton.png b/IB Images/BackButton.png
diff --git a/IB Images/BackButton_Highlighted.png b/IB Images/BackButton_Highlighted.png
diff --git a/IB Images/Button.png b/IB Images/Button.png
diff --git a/IB Images/Button_Highlighted.png b/IB Images/Button_Highlighted.png
diff --git a/IB Images/DOOM_sigil_decal.png b/IB Images/DOOM_sigil_decal.png
diff --git a/IB Images/DifficultyBackground.png b/IB Images/DifficultyBackground.png
diff --git a/IB Images/Divide.png b/IB Images/Divide.png
diff --git a/IB Images/DoomLogo.png b/IB Images/DoomLogo.png
diff --git a/IB Images/DownArrow.png b/IB Images/DownArrow.png
diff --git a/IB Images/DownArrow_Highlighted.png b/IB Images/DownArrow_Highlighted.png
diff --git a/IB Images/Easy.png b/IB Images/Easy.png
diff --git a/IB Images/Episode1Background.png b/IB Images/Episode1Background.png
diff --git a/IB Images/Episode1Background_Highlighted.png b/IB Images/Episode1Background_Highlighted.png
diff --git a/IB Images/Episode2Background.png b/IB Images/Episode2Background.png
diff --git a/IB Images/Episode2Background_Highlighted.png b/IB Images/Episode2Background_Highlighted.png
diff --git a/IB Images/Episode3Background.png b/IB Images/Episode3Background.png
diff --git a/IB Images/Episode3Background_Highlighted.png b/IB Images/Episode3Background_Highlighted.png
diff --git a/IB Images/Episode4Background.png b/IB Images/Episode4Background.png
diff --git a/IB Images/Episode4Background_Highlighted.png b/IB Images/Episode4Background_Highlighted.png
diff --git a/IB Images/Hard.png b/IB Images/Hard.png
diff --git a/IB Images/LayoutDualButton.png b/IB Images/LayoutDualButton.png
diff --git a/IB Images/LayoutDualButton_Highlighted.png b/IB Images/LayoutDualButton_Highlighted.png
diff --git a/IB Images/LayoutSingleButton.png b/IB Images/LayoutSingleButton.png
diff --git a/IB Images/LayoutSingleButton_Highlighted.png b/IB Images/LayoutSingleButton_Highlighted.png
diff --git a/IB Images/LayoutWheelButton.png b/IB Images/LayoutWheelButton.png
diff --git a/IB Images/LayoutWheelButton_Highlighted.png b/IB Images/LayoutWheelButton_Highlighted.png
diff --git a/IB Images/MapOverlay.png b/IB Images/MapOverlay.png
diff --git a/IB Images/Medium.png b/IB Images/Medium.png
diff --git a/IB Images/MenuBackground.png b/IB Images/MenuBackground.png
diff --git a/IB Images/MissonBackground.png b/IB Images/MissonBackground.png
diff --git a/IB Images/NextButton.png b/IB Images/NextButton.png
diff --git a/IB Images/NextButton_Highlighted.png b/IB Images/NextButton_Highlighted.png
diff --git a/IB Images/Nightmare.png b/IB Images/Nightmare.png
diff --git a/IB Images/ResumeButton.png b/IB Images/ResumeButton.png
diff --git a/IB Images/SelectedBracket.png b/IB Images/SelectedBracket.png
diff --git a/IB Images/SettingsButton.png b/IB Images/SettingsButton.png
diff --git a/IB Images/SettingsButton_Highlighted.png b/IB Images/SettingsButton_Highlighted.png
diff --git a/IB Images/SliderBackground.png b/IB Images/SliderBackground.png
diff --git a/IB Images/SliderBar.png b/IB Images/SliderBar.png
diff --git a/IB Images/SliderSkull.png b/IB Images/SliderSkull.png
diff --git a/IB Images/[email protected] b/IB Images/[email protected]
diff --git a/IB Images/SliderSkull~ipad.png b/IB Images/SliderSkull~ipad.png
diff --git a/IB Images/SubMenuBackground.png b/IB Images/SubMenuBackground.png
diff --git a/IB Images/SubMenuButton.png b/IB Images/SubMenuButton.png
diff --git a/IB Images/SubMenuButton_Highlighted.png b/IB Images/SubMenuButton_Highlighted.png
diff --git a/IB Images/Thumbs.db b/IB Images/Thumbs.db
diff --git a/IB Images/UpArrow.png b/IB Images/UpArrow.png
diff --git a/IB Images/UpArrow_Highlighted.png b/IB Images/UpArrow_Highlighted.png
diff --git a/README.md b/README.md
@@ -0,0 +1,40 @@
+<img align="left" width="100" height="100" src="https://raw.githubusercontent.com/tomkidd/DOOM-iOS/master/icon_doom.png">  
+
+#  DOOM, DOOM II, Final DOOM and SIGIL for iOS 11 and tvOS for Apple TV
+
+This is my update for DOOM for iOS to run on iOS 11, running in modern resolutions including the full width of the iPhone X. I have also made a target and version for tvOS to run on Apple TV. Additionally, I have included targets to create apps for DOOM II, Final DOOM and [SIGIL](https://www.romerogames.ie/si6il).
+
+![screenshot](https://raw.githubusercontent.com/tomkidd/DOOM-iOS/master/ss_doom.png)
+
+Improvements/Changes
+
+- Compiles and runs in iOS 11 SDK
+- Orientation and coordinate system fixed to reflect iOS 8 changes
+- C warnings fixed for Xcode 9.3
+- Basic MFi controller support
+- Structure and View Controller usage grafted in from the DOOM-iOS2 repository and public user forks, unused code and embedded xcodeproj use eliminated
+- Second project target for tvOS that takes advantage of focus model and removes on-screen controls.
+
+You will need to provide your own copy of `doom.wad` for DOOM, `doom2.wad` for DOOM II, `tnt.wad` and `plutonia.wad` for Final DOOM and `SIGIL.wad` (and optionally `SIGIL_SHREDS.wad`) for SIGIL
+
+You can find the file `doom.wad` in any installation of DOOM, available on [Steam](http://store.steampowered.com/app/2280/Ultimate_Doom/), [GOG](https://www.gog.com/game/the_ultimate_doom), and floppy disk from 1-800-IDGAMES (note: do not call 1-800-IDGAMES I don't know where it goes anymore). 
+
+`doom2.wad` is in any installation of DOOM II, available on [Steam](https://store.steampowered.com/app/2300/DOOM_II/) or [GOG](https://www.gog.com/game/doom_ii_final_doom)
+
+`tnt.wad` and `plutonia.wad` are in any installation of Final DOOM, available on [Steam](https://store.steampowered.com/app/2290/Final_DOOM/) or [GOG](https://www.gog.com/game/doom_ii_final_doom) (note that GOG sells DOOM II and Final DOOM packaged together)  
+
+`SIGIL.wad` is available free from the [SIGIL](https://www.romerogames.ie/si6il) website, and `SIGIL_SHREDS.wad` is available in the "registered" (purchased) versions. Note that SIGIL also requires `doom.wad` from the original game. 
+
+This repo contains changes from id's [DOOM-iOS2](https://github.com/id-Software/DOOM-IOS2) repo (different than the parent of this repo), changes from the [FinalJudgement](https://github.com/JadingTsunami/FinalJudgment-iOS) repo by [JadingTsunami](https://github.com/JadingTsunami/), and [MFi controller code](https://github.com/johnnyw/DOOM-IOS2/commit/41646df7ccad6e39263a73767e91d5801759b780) from [John Watson](https://github.com/johnnyw) (by way of [TheRohans](https://github.com/TheRohans/DOOM-IOS2/), where I originally found it). I incorporated the efforts of [yarsrevenge](https://github.com/yarsrvenge/DOOM-IOS2) in getting the basics of the tvOS versions going. 
+
+I wrote a [lengthy article](http://schnapple.com/wolfenstein-3d-and-doom-on-ios-11/) on the process of making these ports. For a rundown of the effort to get it running on tvOS, I wrote a [second lenghty article](http://schnapple.com/wolfenstein-3d-and-doom-on-tvos-for-apple-tv/) on the subject. 
+
+And just for fun I did [another article](https://schnapple.com/sigil-for-ios-and-tvos-for-apple-tv/) on adding SIGIL support. Note that the previous issues with SIGIL's intermission screens and the Buckethead MP3 files have been addressed. 
+
+[Video of DOOM running on an iPhone X](https://www.youtube.com/watch?v=IrY5L1kn-NA)
+
+[Video of DOOM running on an Apple TV](https://www.youtube.com/watch?v=P8QmMSabaqQ)
+
+I have also made apps for [*Wolfenstein 3-D*](https://github.com/tomkidd/Wolf3D-iOS), [*Quake*](https://github.com/tomkidd/Quake-iOS), [*Quake II*](https://github.com/tomkidd/Quake2-iOS), [*Quake III: Arena*](https://github.com/tomkidd/Quake3-iOS), [*Return to Castle Wolfenstein*](https://github.com/tomkidd/RTCW-iOS) and [*DOOM 3*](https://github.com/tomkidd/DOOM3-iOS).
+
+Have fun. For any questions I can be reached at [email protected]
diff --git a/assets/iphone/arialimagelal.tga b/assets/iphone/arialimagelal.tga
diff --git a/assets/iphone/baborted_01.wav b/assets/iphone/baborted_01.wav
diff --git a/assets/iphone/back_button.tga b/assets/iphone/back_button.tga
diff --git a/assets/iphone/baction_01.wav b/assets/iphone/baction_01.wav
diff --git a/assets/iphone/bdown_01.wav b/assets/iphone/bdown_01.wav
diff --git a/assets/iphone/controller_down_01.wav b/assets/iphone/controller_down_01.wav
diff --git a/assets/iphone/controller_down_01_silence.wav b/assets/iphone/controller_down_01_silence.wav
diff --git a/assets/iphone/controller_up_01.wav b/assets/iphone/controller_up_01.wav
diff --git a/assets/iphone/controller_up_01_silence.wav b/assets/iphone/controller_up_01_silence.wav
diff --git a/assets/iphone/deathmatch.tga b/assets/iphone/deathmatch.tga
diff --git a/assets/iphone/directional_2.tga b/assets/iphone/directional_2.tga
diff --git a/assets/iphone/disc_1.tga b/assets/iphone/disc_1.tga
diff --git a/assets/iphone/disc_2.tga b/assets/iphone/disc_2.tga
diff --git a/assets/iphone/fire.tga b/assets/iphone/fire.tga
diff --git a/assets/iphone/font1.tga b/assets/iphone/font1.tga
diff --git a/assets/iphone/kills.tga b/assets/iphone/kills.tga
diff --git a/assets/iphone/load_saved.tga b/assets/iphone/load_saved.tga
diff --git a/assets/iphone/loading.tga b/assets/iphone/loading.tga
diff --git a/assets/iphone/long_string_box.tga b/assets/iphone/long_string_box.tga
diff --git a/assets/iphone/map_button.tga b/assets/iphone/map_button.tga
diff --git a/assets/iphone/menu_bar.tga b/assets/iphone/menu_bar.tga
diff --git a/assets/iphone/menu_button.tga b/assets/iphone/menu_button.tga
diff --git a/assets/iphone/multi_backdrop.tga b/assets/iphone/multi_backdrop.tga
diff --git a/assets/iphone/multi_face.tga b/assets/iphone/multi_face.tga
diff --git a/assets/iphone/multi_frame.tga b/assets/iphone/multi_frame.tga
diff --git a/assets/iphone/multiplay.tga b/assets/iphone/multiplay.tga
diff --git a/assets/iphone/par.tga b/assets/iphone/par.tga
diff --git a/assets/iphone/partime.tga b/assets/iphone/partime.tga
diff --git a/assets/iphone/respawn.tga b/assets/iphone/respawn.tga
diff --git a/assets/iphone/respawn_gear.tga b/assets/iphone/respawn_gear.tga
diff --git a/assets/iphone/rotate.tga b/assets/iphone/rotate.tga
diff --git a/assets/iphone/secrets.tga b/assets/iphone/secrets.tga
diff --git a/assets/iphone/short_string_box.tga b/assets/iphone/short_string_box.tga
diff --git a/assets/iphone/side_2_side.tga b/assets/iphone/side_2_side.tga
diff --git a/assets/iphone/slide_01.wav b/assets/iphone/slide_01.wav
diff --git a/assets/iphone/up_down.tga b/assets/iphone/up_down.tga
diff --git a/assets/newsfx/dsbarexp.wav b/assets/newsfx/dsbarexp.wav
diff --git a/assets/newsfx/dsbdcls.wav b/assets/newsfx/dsbdcls.wav
diff --git a/assets/newsfx/dsbdopn.wav b/assets/newsfx/dsbdopn.wav
diff --git a/assets/newsfx/dsbfg.wav b/assets/newsfx/dsbfg.wav
diff --git a/assets/newsfx/dsbgact.wav b/assets/newsfx/dsbgact.wav
diff --git a/assets/newsfx/dsbgdth1.wav b/assets/newsfx/dsbgdth1.wav
diff --git a/assets/newsfx/dsbgdth2.wav b/assets/newsfx/dsbgdth2.wav
diff --git a/assets/newsfx/dsbgsit1.wav b/assets/newsfx/dsbgsit1.wav
diff --git a/assets/newsfx/dsbgsit2.wav b/assets/newsfx/dsbgsit2.wav
diff --git a/assets/newsfx/dsboscub.wav b/assets/newsfx/dsboscub.wav
diff --git a/assets/newsfx/dsbosdth.wav b/assets/newsfx/dsbosdth.wav
diff --git a/assets/newsfx/dsbospit.wav b/assets/newsfx/dsbospit.wav
diff --git a/assets/newsfx/dsbospn.wav b/assets/newsfx/dsbospn.wav
diff --git a/assets/newsfx/dsbossit.wav b/assets/newsfx/dsbossit.wav
diff --git a/assets/newsfx/dsbrsdth.wav b/assets/newsfx/dsbrsdth.wav
diff --git a/assets/newsfx/dsbrssit.wav b/assets/newsfx/dsbrssit.wav
diff --git a/assets/newsfx/dsbspact.wav b/assets/newsfx/dsbspact.wav
diff --git a/assets/newsfx/dsbspdth.wav b/assets/newsfx/dsbspdth.wav
diff --git a/assets/newsfx/dsbspsit.wav b/assets/newsfx/dsbspsit.wav
diff --git a/assets/newsfx/dsbspwlk.wav b/assets/newsfx/dsbspwlk.wav
diff --git a/assets/newsfx/dscacdth.wav b/assets/newsfx/dscacdth.wav
diff --git a/assets/newsfx/dscacsit.wav b/assets/newsfx/dscacsit.wav
diff --git a/assets/newsfx/dsclaw.wav b/assets/newsfx/dsclaw.wav
diff --git a/assets/newsfx/dscybdth.wav b/assets/newsfx/dscybdth.wav
diff --git a/assets/newsfx/dscybsit.wav b/assets/newsfx/dscybsit.wav
diff --git a/assets/newsfx/dsdbcls.wav b/assets/newsfx/dsdbcls.wav
diff --git a/assets/newsfx/dsdbload.wav b/assets/newsfx/dsdbload.wav
diff --git a/assets/newsfx/dsdbopn.wav b/assets/newsfx/dsdbopn.wav
diff --git a/assets/newsfx/dsdmact.wav b/assets/newsfx/dsdmact.wav
diff --git a/assets/newsfx/dsdmpain.wav b/assets/newsfx/dsdmpain.wav
diff --git a/assets/newsfx/dsdorcls.wav b/assets/newsfx/dsdorcls.wav
diff --git a/assets/newsfx/dsdoropn.wav b/assets/newsfx/dsdoropn.wav
diff --git a/assets/newsfx/dsdshtgn.wav b/assets/newsfx/dsdshtgn.wav
diff --git a/assets/newsfx/dsfirsht.wav b/assets/newsfx/dsfirsht.wav
diff --git a/assets/newsfx/dsfirxpl.wav b/assets/newsfx/dsfirxpl.wav
diff --git a/assets/newsfx/dsflame.wav b/assets/newsfx/dsflame.wav
diff --git a/assets/newsfx/dsflamst.wav b/assets/newsfx/dsflamst.wav
diff --git a/assets/newsfx/dsgetpow.wav b/assets/newsfx/dsgetpow.wav
diff --git a/assets/newsfx/dshoof.wav b/assets/newsfx/dshoof.wav
diff --git a/assets/newsfx/dsitemup.wav b/assets/newsfx/dsitemup.wav
diff --git a/assets/newsfx/dsitmbk.wav b/assets/newsfx/dsitmbk.wav
diff --git a/assets/newsfx/dskeendt.wav b/assets/newsfx/dskeendt.wav
diff --git a/assets/newsfx/dskeenpn.wav b/assets/newsfx/dskeenpn.wav
diff --git a/assets/newsfx/dskntdth.wav b/assets/newsfx/dskntdth.wav
diff --git a/assets/newsfx/dskntsit.wav b/assets/newsfx/dskntsit.wav
diff --git a/assets/newsfx/dsmanatk.wav b/assets/newsfx/dsmanatk.wav
diff --git a/assets/newsfx/dsmandth.wav b/assets/newsfx/dsmandth.wav
diff --git a/assets/newsfx/dsmansit.wav b/assets/newsfx/dsmansit.wav
diff --git a/assets/newsfx/dsmetal.wav b/assets/newsfx/dsmetal.wav
diff --git a/assets/newsfx/dsmpain.wav b/assets/newsfx/dsmpain.wav
diff --git a/assets/newsfx/dsnoway.wav b/assets/newsfx/dsnoway.wav
diff --git a/assets/newsfx/dsoof.wav b/assets/newsfx/dsoof.wav
diff --git a/assets/newsfx/dspdiehi.wav b/assets/newsfx/dspdiehi.wav
diff --git a/assets/newsfx/dspedth.wav b/assets/newsfx/dspedth.wav
diff --git a/assets/newsfx/dspepain.wav b/assets/newsfx/dspepain.wav
diff --git a/assets/newsfx/dspesit.wav b/assets/newsfx/dspesit.wav
diff --git a/assets/newsfx/dspistol.wav b/assets/newsfx/dspistol.wav
diff --git a/assets/newsfx/dsplasma.wav b/assets/newsfx/dsplasma.wav
diff --git a/assets/newsfx/dspldeth.wav b/assets/newsfx/dspldeth.wav
diff --git a/assets/newsfx/dsplpain.wav b/assets/newsfx/dsplpain.wav
diff --git a/assets/newsfx/dspodth1.wav b/assets/newsfx/dspodth1.wav
diff --git a/assets/newsfx/dspodth2.wav b/assets/newsfx/dspodth2.wav
diff --git a/assets/newsfx/dspodth3.wav b/assets/newsfx/dspodth3.wav
diff --git a/assets/newsfx/dspopain.wav b/assets/newsfx/dspopain.wav
diff --git a/assets/newsfx/dsposact.wav b/assets/newsfx/dsposact.wav
diff --git a/assets/newsfx/dsposit1.wav b/assets/newsfx/dsposit1.wav
diff --git a/assets/newsfx/dsposit2.wav b/assets/newsfx/dsposit2.wav
diff --git a/assets/newsfx/dsposit3.wav b/assets/newsfx/dsposit3.wav
diff --git a/assets/newsfx/dspstart.wav b/assets/newsfx/dspstart.wav
diff --git a/assets/newsfx/dspstop.wav b/assets/newsfx/dspstop.wav
diff --git a/assets/newsfx/dspunch.wav b/assets/newsfx/dspunch.wav
diff --git a/assets/newsfx/dsradio.wav b/assets/newsfx/dsradio.wav
diff --git a/assets/newsfx/dsrlaunc.wav b/assets/newsfx/dsrlaunc.wav
diff --git a/assets/newsfx/dsrxplod.wav b/assets/newsfx/dsrxplod.wav
diff --git a/assets/newsfx/dssawful.wav b/assets/newsfx/dssawful.wav
diff --git a/assets/newsfx/dssawhit.wav b/assets/newsfx/dssawhit.wav
diff --git a/assets/newsfx/dssawidl.wav b/assets/newsfx/dssawidl.wav
diff --git a/assets/newsfx/dssawup.wav b/assets/newsfx/dssawup.wav
diff --git a/assets/newsfx/dssgcock.wav b/assets/newsfx/dssgcock.wav
diff --git a/assets/newsfx/dssgtatk.wav b/assets/newsfx/dssgtatk.wav
diff --git a/assets/newsfx/dssgtdth.wav b/assets/newsfx/dssgtdth.wav
diff --git a/assets/newsfx/dssgtsit.wav b/assets/newsfx/dssgtsit.wav
diff --git a/assets/newsfx/dsshotgn.wav b/assets/newsfx/dsshotgn.wav
diff --git a/assets/newsfx/dsskeact.wav b/assets/newsfx/dsskeact.wav
diff --git a/assets/newsfx/dsskeatk.wav b/assets/newsfx/dsskeatk.wav
diff --git a/assets/newsfx/dsskedth.wav b/assets/newsfx/dsskedth.wav
diff --git a/assets/newsfx/dsskepch.wav b/assets/newsfx/dsskepch.wav
diff --git a/assets/newsfx/dsskesit.wav b/assets/newsfx/dsskesit.wav
diff --git a/assets/newsfx/dsskeswg.wav b/assets/newsfx/dsskeswg.wav
diff --git a/assets/newsfx/dssklatk.wav b/assets/newsfx/dssklatk.wav
diff --git a/assets/newsfx/dsskldth.wav b/assets/newsfx/dsskldth.wav
diff --git a/assets/newsfx/dsslop.wav b/assets/newsfx/dsslop.wav
diff --git a/assets/newsfx/dsspidth.wav b/assets/newsfx/dsspidth.wav
diff --git a/assets/newsfx/dsspisit.wav b/assets/newsfx/dsspisit.wav
diff --git a/assets/newsfx/dsssdth.wav b/assets/newsfx/dsssdth.wav
diff --git a/assets/newsfx/dssssit.wav b/assets/newsfx/dssssit.wav
diff --git a/assets/newsfx/dsstnmov.wav b/assets/newsfx/dsstnmov.wav
diff --git a/assets/newsfx/dsswtchn.wav b/assets/newsfx/dsswtchn.wav
diff --git a/assets/newsfx/dsswtchx.wav b/assets/newsfx/dsswtchx.wav
diff --git a/assets/newsfx/dstelept.wav b/assets/newsfx/dstelept.wav
diff --git a/assets/newsfx/dstink.wav b/assets/newsfx/dstink.wav
diff --git a/assets/newsfx/dsvilact.wav b/assets/newsfx/dsvilact.wav
diff --git a/assets/newsfx/dsvilatk.wav b/assets/newsfx/dsvilatk.wav
diff --git a/assets/newsfx/dsvildth.wav b/assets/newsfx/dsvildth.wav
diff --git a/assets/newsfx/dsvilsit.wav b/assets/newsfx/dsvilsit.wav
diff --git a/assets/newsfx/dsvipain.wav b/assets/newsfx/dsvipain.wav
diff --git a/assets/newsfx/dswpnup.wav b/assets/newsfx/dswpnup.wav
diff --git a/base.parm b/base.parm
@@ -0,0 +1,2 @@
+iphone/livetile_1.tga PVR2
+iphone/arialImageLAL.tga	LA
diff --git a/base/.DS_Store b/base/.DS_Store
diff --git a/base/base.iPack b/base/base.iPack
diff --git a/base/music/d_bunny.mp3 b/base/music/d_bunny.mp3
diff --git a/base/music/d_e1m1.mp3 b/base/music/d_e1m1.mp3
diff --git a/base/music/d_e1m2.mp3 b/base/music/d_e1m2.mp3
diff --git a/base/music/d_e1m3.mp3 b/base/music/d_e1m3.mp3
diff --git a/base/music/d_e1m4.mp3 b/base/music/d_e1m4.mp3
diff --git a/base/music/d_e1m5.mp3 b/base/music/d_e1m5.mp3
diff --git a/base/music/d_e1m6.mp3 b/base/music/d_e1m6.mp3
diff --git a/base/music/d_e1m7.mp3 b/base/music/d_e1m7.mp3
diff --git a/base/music/d_e1m8.mp3 b/base/music/d_e1m8.mp3
diff --git a/base/music/d_e1m9.mp3 b/base/music/d_e1m9.mp3
diff --git a/base/music/d_e2m1.mp3 b/base/music/d_e2m1.mp3
diff --git a/base/music/d_e2m2.mp3 b/base/music/d_e2m2.mp3
diff --git a/base/music/d_e2m3.mp3 b/base/music/d_e2m3.mp3
diff --git a/base/music/d_e2m4.mp3 b/base/music/d_e2m4.mp3
diff --git a/base/music/d_e2m5.mp3 b/base/music/d_e2m5.mp3
diff --git a/base/music/d_e2m6.mp3 b/base/music/d_e2m6.mp3
diff --git a/base/music/d_e2m7.mp3 b/base/music/d_e2m7.mp3
diff --git a/base/music/d_e2m8.mp3 b/base/music/d_e2m8.mp3
diff --git a/base/music/d_e2m9.mp3 b/base/music/d_e2m9.mp3
diff --git a/base/music/d_e3m1.mp3 b/base/music/d_e3m1.mp3
diff --git a/base/music/d_e3m2.mp3 b/base/music/d_e3m2.mp3
diff --git a/base/music/d_e3m3.mp3 b/base/music/d_e3m3.mp3
diff --git a/base/music/d_e3m4.mp3 b/base/music/d_e3m4.mp3
diff --git a/base/music/d_e3m5.mp3 b/base/music/d_e3m5.mp3
diff --git a/base/music/d_e3m6.mp3 b/base/music/d_e3m6.mp3
diff --git a/base/music/d_e3m7.mp3 b/base/music/d_e3m7.mp3
diff --git a/base/music/d_e3m8.mp3 b/base/music/d_e3m8.mp3
diff --git a/base/music/d_e3m9.mp3 b/base/music/d_e3m9.mp3
diff --git a/base/music/d_inter.mp3 b/base/music/d_inter.mp3
diff --git a/base/music/d_intro.mp3 b/base/music/d_intro.mp3
diff --git a/base/music/d_introa.mp3 b/base/music/d_introa.mp3
diff --git a/base/music/d_victor.mp3 b/base/music/d_victor.mp3
diff --git a/code/.DS_Store b/code/.DS_Store
diff --git a/code/SDL_shim/SDL_Mixer.h b/code/SDL_shim/SDL_Mixer.h
@@ -0,0 +1,102 @@
+/*
+
+ Copyright (C) 2011 Id Software, Inc.
+
+ 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 2
+ 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, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+ */
+
+#ifndef doomengine_SDL_Mixer_h
+#define doomengine_SDL_Mixer_h
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+===============================
+
+This is a minimal implemenation of SDL_Mixer for iOS, just to get MIDI files
+playing so that we can play the music directly from the WADs.
+
+===============================
+*/
+
+#include <stdint.h>
+
+typedef struct Mix_Music_tag {
+	char unused;
+} Mix_Music;
+
+
+/* Open the mixer with a certain audio format */
+extern int Mix_OpenAudio(int frequency, uint16_t format, int channels,
+				  int chunksize);
+
+
+/* Close the mixer, halting all playing audio */
+extern void Mix_CloseAudio(void);
+
+
+/* Set a function that is called after all mixing is performed.
+   This can be used to provide real-time visual display of the audio stream
+   or add a custom mixer filter for the stream data.
+*/
+extern void Mix_SetPostMix(void (*mix_func)
+						   (void *udata, uint8_t *stream, int len), void *arg);
+
+
+/* Fade in music or a channel over "ms" milliseconds, same semantics as the "Play" functions */
+extern int Mix_FadeInMusic(Mix_Music *music, int loops, int ms);
+
+
+/* Pause/Resume the music stream */
+extern void Mix_PauseMusic(void);
+extern void Mix_ResumeMusic(void);
+
+
+/* Halt a channel, fading it out progressively till it's silent
+   The ms parameter indicates the number of milliseconds the fading
+   will take.
+ */
+extern int Mix_FadeOutMusic(int ms);
+
+
+/* Free an audio chunk previously loaded */
+extern void Mix_FreeMusic(Mix_Music *music);
+
+
+/* Load a wave file or a music (.mod .s3m .it .xm) file */
+extern Mix_Music * Mix_LoadMUS(const char *file);
+
+
+extern const char * Mix_GetError(void);
+
+
+
+
+/* Set the volume in the range of 0-128 of a specific channel or chunk.
+   If the specified channel is -1, set volume for all channels.
+   Returns the original volume.
+   If the specified volume is -1, just return the current volume.
+*/
+extern int Mix_VolumeMusic(int volume);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif