Skip to content

Manic EMU is an all-in-one retro game emulator for iOS. It packs powerful features while keeping a clean, sleek UI and delivering buttery-smooth gameplay.

Swift

Add prboom core

Stephen B8dd0bf837664
diff --git a/Cores/prboom.libretro.framework/Info.plist b/Cores/prboom.libretro.framework/Info.plist
new file mode 100644
index 00000000..4dee0831
--- /dev/null
+++ b/Cores/prboom.libretro.framework/Info.plist
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bc47101cac635317b2e161280e367fa359c8ff6a281a7caeec93e73732f0a729
+size 925
diff --git a/Cores/prboom.libretro.framework/prboom.libretro b/Cores/prboom.libretro.framework/prboom.libretro
new file mode 100755
index 00000000..8d07576b
--- /dev/null
+++ b/Cores/prboom.libretro.framework/prboom.libretro
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:315b43d155d2ff42f12c3039795e32c5797486cc02e7fb6481ed8e0ee060f44e
+size 1586256
diff --git a/ManicEmu/ManicEmu.xcodeproj/project.pbxproj b/ManicEmu/ManicEmu.xcodeproj/project.pbxproj
index 08b4c769..488b6b88 100644
--- a/ManicEmu/ManicEmu.xcodeproj/project.pbxproj
+++ b/ManicEmu/ManicEmu.xcodeproj/project.pbxproj
@@ -840,6 +840,7 @@
57FC198D2DF04E160076D93C /* right_eye_disabler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57FC198C2DF04E160076D93C /* right_eye_disabler.cpp */; };
57FC19982DF051180076D93C /* hack_manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57FC19962DF051180076D93C /* hack_manager.cpp */; };
57FC19992DF051180076D93C /* hack_list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57FC19952DF051180076D93C /* hack_list.cpp */; };
+ 7E864E4CE64E0E64CCE47550 /* DOOM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2068D6E791D56FF6148997EA /* DOOM.swift */; };
A392D5652E96682C00F920E7 /* DisabledTapSwitch.swift in Sources */ = {isa = PBXBuildFile; fileRef = A392D5632E96682600F920E7 /* DisabledTapSwitch.swift */; };
A392D5B32E9796B900F920E7 /* ServiceIconView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A392D5B22E9796B800F920E7 /* ServiceIconView.swift */; };
A3A043802E9BF57A006442C2 /* UIScrollViewExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3A0437F2E9BF57A006442C2 /* UIScrollViewExtensions.swift */; };
@@ -866,6 +867,7 @@
B2F4B7B02A138C74003B0E07 /* PhotoSaver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2F4B7AF2A138C74003B0E07 /* PhotoSaver.swift */; };
B2F4B7B22A147226003B0E07 /* UIViewExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2F4B7B12A147226003B0E07 /* UIViewExtensions.swift */; };
CA9648A74704D76821691375 /* libPods-ManicEmu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DF2E8F8EA477A62C025C6FCF /* libPods-ManicEmu.a */; };
+ D90358FF409D7405F5E406CC /* prboom.libretro.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 20B6A88FB41ED3142FD4FD9E /* prboom.libretro.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -926,6 +928,7 @@
57BFBE732DD3361800AABF98 /* ppsspp.libretro.framework in Embed Frameworks */,
57BFBE1E2DD32F7700AABF98 /* Libretro.framework in Embed Frameworks */,
5768FE6C2DAE018E009974D1 /* MoltenVK.xcframework in Embed Frameworks */,
+ D90358FF409D7405F5E406CC /* prboom.libretro.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
@@ -944,7 +947,9 @@
/* Begin PBXFileReference section */
165A3334DE78D830F5BF67BC /* Pods-ManicEmu.sideloaddebug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ManicEmu.sideloaddebug.xcconfig"; path = "Target Support Files/Pods-ManicEmu/Pods-ManicEmu.sideloaddebug.xcconfig"; sourceTree = "<group>"; };
+ 2068D6E791D56FF6148997EA /* DOOM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DOOM.swift; sourceTree = "<group>"; };
209AFDF51E7FF4D72ADD0678 /* Pods-ManicEmu.sideloadrelease.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ManicEmu.sideloadrelease.xcconfig"; path = "Target Support Files/Pods-ManicEmu/Pods-ManicEmu.sideloadrelease.xcconfig"; sourceTree = "<group>"; };
+ 20B6A88FB41ED3142FD4FD9E /* prboom.libretro.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = prboom.libretro.framework; path = ../Cores/prboom.libretro.framework; sourceTree = SOURCE_ROOT; };
57047A092D85217400C62FF6 /* PurchaseView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PurchaseView.swift; sourceTree = "<group>"; };
57047A0B2D852E7200C62FF6 /* FeaturesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeaturesView.swift; sourceTree = "<group>"; };
57047A132D856DB000C62FF6 /* PriceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PriceView.swift; sourceTree = "<group>"; };
@@ -4056,6 +4061,7 @@
57655C1E2DF6B94C003E4A6E /* picodrive.libretro.framework */,
57F0D83C2DE2C59900760F57 /* nestopia.libretro.framework */,
57BFBE712DD3360A00AABF98 /* ppsspp.libretro.framework */,
+ 20B6A88FB41ED3142FD4FD9E /* prboom.libretro.framework */,
);
path = Cores;
sourceTree = "<group>";
@@ -4292,6 +4298,7 @@
57F0D8412DE2CD8B00760F57 /* NES.swift */,
57BFBE8F2DD435C700AABF98 /* PSP.swift */,
571BB8062DA4357900830134 /* ThreeDS.swift */,
+ 2068D6E791D56FF6148997EA /* DOOM.swift */,
);
path = Cores;
sourceTree = "<group>";
@@ -5665,6 +5672,7 @@
5726FEE72D71D7FA00041AD5 /* SettingsListFooterCollectionReusableView.swift in Sources */,
57F632B72D700A06007270E8 /* LanServiceEditCollectionViewCell.swift in Sources */,
5754D8C82E27A864001EA5ED /* VB.swift in Sources */,
+ 7E864E4CE64E0E64CCE47550 /* DOOM.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/ManicEmu/ManicEmu/Resources/Info.plist b/ManicEmu/ManicEmu/Resources/Info.plist
index f6470dce..cb4d67b5 100644
--- a/ManicEmu/ManicEmu/Resources/Info.plist
+++ b/ManicEmu/ManicEmu/Resources/Info.plist
@@ -278,6 +278,18 @@
<string>public.aoshuang.game.arcade</string>
</array>
</dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>DOOM Game</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>public.aoshuang.game.doom</string>
+ </array>
+ </dict>
<dict>
<key>CFBundleTypeName</key>
<string>2600 Game</string>
@@ -1101,6 +1113,29 @@
</array>
</dict>
</dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>public.data</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>DOOM Game</string>
+ <key>UTTypeIconFiles</key>
+ <array>
+ <string>file_icon.png</string>
+ </array>
+ <key>UTTypeIdentifier</key>
+ <string>public.aoshuang.game.doom</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>wad</string>
+ <string>iwad</string>
+ <string>pwad</string>
+ </array>
+ </dict>
+ </dict>
<dict>
<key>UTTypeConformsTo</key>
<array>
diff --git a/ManicEmu/ManicEmu/Sources/Base/Constants.swift b/ManicEmu/ManicEmu/Sources/Base/Constants.swift
index e33cbd70..6234a7f2 100644
--- a/ManicEmu/ManicEmu/Sources/Base/Constants.swift
+++ b/ManicEmu/ManicEmu/Sources/Base/Constants.swift
@@ -94,6 +94,7 @@ struct Constants {
case .ss: return 0.638
case .n64: return 1.369
case .mcd: return (Locale.prefersUS ? 0.5864 : 1.1)
+ case .doom: return 0.731
case .arcade: return 0.731
case .ns: return 0.611
case .a2600: return 0.735
@@ -307,6 +308,13 @@ struct Constants {
static let Flycast = Document.appendingPathComponent(LibretroCore.Cores.Flycast.name)
static let bsnes = Document.appendingPathComponent(LibretroCore.Cores.bsnes.name)
static let MAME = Document.appendingPathComponent(LibretroCore.Cores.MAME.name)
+ static var PrBoom: String {
+ let path = Document.appendingPathComponent(LibretroCore.Cores.PrBoom.name)
+ if !FileManager.default.fileExists(atPath: path) {
+ try? FileManager.default.createDirectory(atPath: path, withIntermediateDirectories: true)
+ }
+ return path
+ }
static let Stella = Document.appendingPathComponent(LibretroCore.Cores.Stella.name)
static let Atari800 = Document.appendingPathComponent(LibretroCore.Cores.Atari800.name)
static let ProSystem = Document.appendingPathComponent(LibretroCore.Cores.ProSystem.name)
diff --git a/ManicEmu/ManicEmu/Sources/Business/Games/Views/GameCoverView.swift b/ManicEmu/ManicEmu/Sources/Business/Games/Views/GameCoverView.swift
index 5aee6020..a36daa02 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Games/Views/GameCoverView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Games/Views/GameCoverView.swift
@@ -217,6 +217,8 @@ class GameCoverView: UIView {
image = style == .style2 ? R.image.ps1_cover_v() : R.image.ps1_cover_h()
} else if gameType == .dc {
image = style == .style2 ? R.image.dc_cover_v() : R.image.dc_cover_h()
+ } else if gameType == .doom {
+ image = style == .style2 ? R.image.arcade_cover_v() : R.image.arcade_cover_h()
} else if gameType == .arcade {
image = style == .style2 ? R.image.arcade_cover_v() : R.image.arcade_cover_h()
} else if gameType == .ns {
diff --git a/ManicEmu/ManicEmu/Sources/Business/Play/Models/Game.swift b/ManicEmu/ManicEmu/Sources/Business/Play/Models/Game.swift
index f1a9393e..25f23997 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Play/Models/Game.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Play/Models/Game.swift
@@ -177,6 +177,8 @@ class Game: Object, ObjectUpdatable {
return URL(fileURLWithPath: Constants.Path.PokeMini.appendingPathComponent("\(name).eep"))
} else if gameType == .ps1 {
return URL(fileURLWithPath: Constants.Path.BeetlePSXHW.appendingPathComponent("\(name).srm"))
+ } else if gameType == .doom {
+ return URL(fileURLWithPath: Constants.Path.PrBoom.appendingPathComponent(name))
} else if gameType == .arcade {
return URL(fileURLWithPath: Constants.Path.MAME.appendingPathComponent("\(name).srm"))
} else if gameType == .a2600 {
@@ -377,6 +379,8 @@ class Game: Object, ObjectUpdatable {
} else {
return Bundle.main.path(forResource: "desmume.libretro", ofType: "framework", inDirectory: "Frameworks")
}
+ } else if gameType == .doom {
+ return Bundle.main.path(forResource: "prboom.libretro", ofType: "framework", inDirectory: "Frameworks")
} else if gameType == .arcade {
if defaultCore == 0 {
return Bundle.main.path(forResource: "mame.libretro", ofType: "framework", inDirectory: "Frameworks")
diff --git a/ManicEmu/ManicEmu/Sources/Business/Play/Models/GameSetting.swift b/ManicEmu/ManicEmu/Sources/Business/Play/Models/GameSetting.swift
index f16dac85..bd1f5877 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Play/Models/GameSetting.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Play/Models/GameSetting.swift
@@ -685,7 +685,7 @@ struct GameSetting: SettingCellItem {
return false
}
return true
- case .gba, .gbc, .gb, .nes, .fds, .snes, .md, .mcd, ._32x, .gg, .sg1000, .ms, .ss, .vb, .pm, .arcade:
+ case .gba, .gbc, .gb, .nes, .fds, .snes, .md, .mcd, ._32x, .gg, .sg1000, .ms, .ss, .vb, .pm, .arcade, .doom:
if (gameType == .gb || gameType == .vb || gameType == .pm || gameType == .nes || gameType == .fds) && type == .palette {
return true
}
@@ -707,7 +707,7 @@ struct GameSetting: SettingCellItem {
return true
}
- if (gameType == .vb || gameType == .pm) && type == .cheatCode {
+ if (gameType == .vb || gameType == .pm || gameType == .doom) && type == .cheatCode {
return false
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Play/VIewControllers/PlayViewController.swift b/ManicEmu/ManicEmu/Sources/Business/Play/VIewControllers/PlayViewController.swift
index ad7e0c6e..5a1ae9b8 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Play/VIewControllers/PlayViewController.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Play/VIewControllers/PlayViewController.swift
@@ -2649,6 +2649,8 @@ extension PlayViewController {
LibretroCore.sharedInstance().updateLibretroConfig("savefile_directory", value: Constants.Path.bsnes.libretroPath)
} else if manicGame.gameType == .ds {
LibretroCore.sharedInstance().updateLibretroConfig("savefile_directory", value: Constants.Path.DSSavePath.libretroPath)
+ } else if manicGame.gameType == .doom {
+ LibretroCore.sharedInstance().updateLibretroConfig("savefile_directory", value: Constants.Path.PrBoom.libretroPath)
} else {
LibretroCore.sharedInstance().updateLibretroConfig("savefile_directory", value: Constants.Path.LibretroSavePath.libretroPath)
}
@@ -3395,6 +3397,8 @@ extension PlayViewController {
customSaveDir = Constants.Path.bsnes
} else if manicGame.gameType == .ds {
customSaveDir = Constants.Path.DSSavePath
+ } else if manicGame.gameType == .doom {
+ customSaveDir = Constants.Path.PrBoom
} else if manicGame.isAzahar3DS {
customSaveDir = Constants.Path.ThreeDS
}
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Cores/DOOM.swift b/ManicEmu/ManicEmu/Sources/Tools/Cores/DOOM.swift
new file mode 100644
index 00000000..4b59c836
--- /dev/null
+++ b/ManicEmu/ManicEmu/Sources/Tools/Cores/DOOM.swift
@@ -0,0 +1,165 @@
+//
+// DOOM.swift
+// ManicEmu
+//
+// Created by Stephen on 3/16/2026.
+//
+
+import ManicEmuCore
+import AVFoundation
+
+extension GameType
+{
+ static let doom = GameType("public.aoshuang.game.doom")
+}
+
+@objc enum DOOMGameInput: Int, Input, CaseIterable {
+ case a
+ case b
+ case x
+ case y
+ case start
+ case select
+ case up
+ case down
+ case left
+ case right
+ case l1
+ case r1
+ case l2
+ case r2
+ case l3
+ case r3
+
+ case flex
+ case menu
+
+ public var type: InputType {
+ return .game(.doom)
+ }
+
+ init?(stringValue: String) {
+ if stringValue == "a" { self = .a }
+ else if stringValue == "b" { self = .b }
+ else if stringValue == "x" { self = .x }
+ else if stringValue == "y" { self = .y }
+ else if stringValue == "start" { self = .start }
+ else if stringValue == "select" { self = .select }
+ else if stringValue == "up" { self = .up }
+ else if stringValue == "down" { self = .down }
+ else if stringValue == "left" { self = .left }
+ else if stringValue == "right" { self = .right }
+ else if stringValue == "l1" { self = .l1 }
+ else if stringValue == "r1" { self = .r1 }
+ else if stringValue == "l2" { self = .l2 }
+ else if stringValue == "r2" { self = .r2 }
+ else if stringValue == "l3" { self = .l3 }
+ else if stringValue == "r3" { self = .r3 }
+ else if stringValue == "flex" { self = .flex }
+ else { return nil }
+ }
+}
+
+struct DOOM: ManicEmuCoreProtocol {
+ public static let core = DOOM()
+
+ public var name: String { "DOOM" }
+ public var identifier: String { "com.aoshuang.DOOMCore" }
+
+ public var gameType: GameType { GameType.doom }
+ public var gameInputType: Input.Type { DOOMGameInput.self }
+ var allInputs: [Input] { DOOMGameInput.allCases }
+ public var gameSaveExtension: String { "save" }
+
+ public let audioFormat = AVAudioFormat(commonFormat: .pcmFormatInt16, sampleRate: 44100, channels: 2, interleaved: true)!
+ public let videoFormat = VideoFormat(format: .bitmap(.rgb565), dimensions: CGSize(width: 320, height: 200))
+
+ public var supportCheatFormats: Set<CheatFormat> {
+ return []
+ }
+
+ public var emulatorConnector: EmulatorBase { DOOMEmulatorBridge.shared }
+
+ private init() {}
+}
+
+
+class DOOMEmulatorBridge : NSObject, EmulatorBase {
+ static let shared = DOOMEmulatorBridge()
+
+ var gameURL: URL?
+
+ private(set) var frameDuration: TimeInterval = (1.0 / 60.0)
+
+ var audioRenderer: (any ManicEmuCore.AudioRenderProtocol)?
+
+ var videoRenderer: (any ManicEmuCore.VideoRenderProtocol)?
+
+ var saveUpdateHandler: (() -> Void)?
+
+ func start(withGameURL gameURL: URL) {}
+
+ func stop() {}
+
+ func pause() {}
+
+ func resume() {}
+
+ func runFrame(processVideo: Bool) {}
+
+ func activateInput(_ input: Int, value: Double, playerIndex: Int) {
+ guard playerIndex >= 0 else { return }
+ if let gameInput = DOOMGameInput(rawValue: input),
+ let libretroButton = gameInputToCoreInput(gameInput: gameInput) {
+#if DEBUG
+ Log.debug("\(String(describing: Self.self))点击了:\(gameInput)")
+#endif
+ LibretroCore.sharedInstance().press(libretroButton, playerIndex: UInt32(playerIndex))
+ }
+ }
+
+ func gameInputToCoreInput(gameInput: DOOMGameInput) -> LibretroButton? {
+ if gameInput == .a { return .A }
+ else if gameInput == .b { return .B }
+ else if gameInput == .x { return .X }
+ else if gameInput == .y { return .Y }
+ else if gameInput == .start { return .start }
+ else if gameInput == .select { return .select }
+ else if gameInput == .up { return .up }
+ else if gameInput == .down { return .down }
+ else if gameInput == .left { return .left }
+ else if gameInput == .right { return .right }
+ else if gameInput == .l1 { return .L1 }
+ else if gameInput == .r1 { return .R1 }
+ else if gameInput == .l2 { return .L2 }
+ else if gameInput == .r2 { return .R2 }
+ else if gameInput == .l3 { return .L3 }
+ else if gameInput == .r3 { return .R3 }
+ return nil
+ }
+
+ func deactivateInput(_ input: Int, playerIndex: Int) {
+ if let gameInput = DOOMGameInput(rawValue: input),
+ let libretroButton = gameInputToCoreInput(gameInput: gameInput) {
+ LibretroCore.sharedInstance().release(libretroButton, playerIndex: UInt32(playerIndex))
+ }
+ }
+
+ func resetInputs() {}
+
+ func saveSaveState(to url: URL) {}
+
+ func loadSaveState(from url: URL) {}
+
+ func saveGameSave(to url: URL) {}
+
+ func loadGameSave(from url: URL) {}
+
+ func addCheatCode(_ cheatCode: String, type: String) -> Bool {
+ return false
+ }
+
+ func resetCheats() {}
+
+ func updateCheats() {}
+}
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Extensions/GameTypeExtensions.swift b/ManicEmu/ManicEmu/Sources/Tools/Extensions/GameTypeExtensions.swift
index 0f0ca000..11f1387c 100644
--- a/ManicEmu/ManicEmu/Sources/Tools/Extensions/GameTypeExtensions.swift
+++ b/ManicEmu/ManicEmu/Sources/Tools/Extensions/GameTypeExtensions.swift
@@ -84,6 +84,8 @@ extension GameType {
self = .ps1
} else if ["cdi", "gdi", "chd", "cue", "bin", "m3u"].contains(ext) {
self = .dc
+ } else if ["wad", "iwad", "pwad"].contains(ext) {
+ self = .doom
} else if ["zip", "7z", "cmd"].contains(ext) {
self = .arcade
} else if ["a26", "bin"].contains(ext) {
@@ -154,6 +156,8 @@ extension GameType {
self = .ps1
} else if shortName.uppercased() == "DC" {
self = .dc
+ } else if shortName.uppercased() == "DOOM" {
+ self = .doom
} else if shortName.uppercased() == "Arcade".uppercased() {
self = .arcade
} else if shortName.uppercased() == "NS" {
@@ -197,6 +201,7 @@ extension GameType {
case .pm: return "Pokémon Mini"
case .ps1: return "PlayStation"
case .dc: return "Dreamcast"
+ case .doom: return "DOOM"
case .arcade: return "Arcade"
case .ns: return "Nintendo Switch"
case .a2600: return "Atari 2600"
@@ -232,6 +237,7 @@ extension GameType {
case .pm: return NSLocalizedString("PM", comment: "")
case .ps1: return NSLocalizedString("PS1", comment: "")
case .dc: return NSLocalizedString("DC", comment: "")
+ case .doom: return NSLocalizedString("DOOM", comment: "")
case .arcade: return NSLocalizedString("Arcade", comment: "")
case .ns: return NSLocalizedString("NS", comment: "")
case .a2600: return NSLocalizedString("2600", comment: "")
@@ -268,6 +274,7 @@ extension GameType {
case .pm: return 2001
case .ps1: return 1995
case .dc: return 1998
+ case .doom: return 1993
case .arcade: return 1971
case .ns: return 2017
case .a2600: return 1977
@@ -303,6 +310,7 @@ extension GameType {
case .pm: return PM.core
case .ps1: return PS1.core
case .dc: return DC.core
+ case .doom: return DOOM.core
case .arcade: return Arcade.core
case .a2600: return A2600.core
case .a5200: return A5200.core
@@ -318,6 +326,8 @@ extension GameType {
return .md
} else if self == .fds {
return .nes
+ } else if self == .doom {
+ return .arcade
}
return self
}
@@ -395,7 +405,7 @@ extension GameType {
return .sony
case .md, .mcd, ._32x, .sg1000, .gg, .ms, .ss, .dc:
return .sega
- case .arcade:
+ case .arcade, .doom:
return .arcade
case .a2600, .a5200, .a7800, .jaguar, .lynx:
return .atari
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Extensions/LibretroCoreExtensions.swift b/ManicEmu/ManicEmu/Sources/Tools/Extensions/LibretroCoreExtensions.swift
index b4395ba0..cbdddfd9 100644
--- a/ManicEmu/ManicEmu/Sources/Tools/Extensions/LibretroCoreExtensions.swift
+++ b/ManicEmu/ManicEmu/Sources/Tools/Extensions/LibretroCoreExtensions.swift
@@ -9,7 +9,7 @@
extension LibretroCore {
enum Cores {
- case Nestopia, Snes9x, PicoDrive, Yabause, BeetleSaturn, Mupen64PlushNext, BeetleVB, PokeMini, BeetlePSXHW, bsnes, Gambatte, VBAM, mGBA, Flycast, Gearsystem, ClownMDEmu, bsnesJG, melonDSDS, PPSSPP, MAME, FinalBurnNeo, Citra, Azahar, JGenesis, DeSmuME, Stella, Atari800, ProSystem, VirtualJaguar, Holani
+ case Nestopia, Snes9x, PicoDrive, Yabause, BeetleSaturn, Mupen64PlushNext, BeetleVB, PokeMini, BeetlePSXHW, bsnes, Gambatte, VBAM, mGBA, Flycast, Gearsystem, ClownMDEmu, bsnesJG, melonDSDS, PPSSPP, MAME, FinalBurnNeo, PrBoom, Citra, Azahar, JGenesis, DeSmuME, Stella, Atari800, ProSystem, VirtualJaguar, Holani
var name: String {
switch self {
@@ -55,6 +55,8 @@ extension LibretroCore {
"MAME"
case .FinalBurnNeo:
"FinalBurn Neo"
+ case .PrBoom:
+ "PrBoom"
case .Citra:
"Citra"
case .Azahar:
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Others/System.swift b/ManicEmu/ManicEmu/Sources/Tools/Others/System.swift
index 84d9e96f..d386a10f 100644
--- a/ManicEmu/ManicEmu/Sources/Tools/Others/System.swift
+++ b/ManicEmu/ManicEmu/Sources/Tools/Others/System.swift
@@ -11,6 +11,7 @@ import ManicEmuCore
enum System: CaseIterable
{
+ case doom
case jaguar
case lynx
case a7800
@@ -46,7 +47,7 @@ enum System: CaseIterable
}
static var allCores: [ManicEmuCoreProtocol] {
- return [NES.core, SNES.core, ThreeDS.core, GBC.core, GBA.core, PSP.core, MD.core, MCD.core, S2X.core, SG1000.core, GG.core, MS.core, SS.core, N64.core, GB.core, VB.core, PM.core, PS1.core, DC.core, DS.core, FDS.core, Arcade.core, A2600.core, A5200.core, A7800.core, Lynx.core, Jaguar.core]
+ return [NES.core, SNES.core, ThreeDS.core, GBC.core, GBA.core, PSP.core, MD.core, MCD.core, S2X.core, SG1000.core, GG.core, MS.core, SS.core, N64.core, GB.core, VB.core, PM.core, PS1.core, DC.core, DS.core, FDS.core, Arcade.core, DOOM.core, A2600.core, A5200.core, A7800.core, Lynx.core, Jaguar.core]
}
}
@@ -77,6 +78,7 @@ extension System {
case .dc: return .dc
case .fds: return .fds
case .arcade: return .arcade
+ case .doom: return .doom
case .ns: return .ns
case .a2600: return .a2600
case .a5200: return .a5200
diff --git a/ManicSupport/Resources/System.core b/ManicSupport/Resources/System.core
index fc240995..86f5d4ed 100644
--- a/ManicSupport/Resources/System.core
+++ b/ManicSupport/Resources/System.core
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:4632ff0f1ff2c8693357bea096dd964abf4e90626c16952cf55479001b7ac013
-size 59303666
+oid sha256:090e83002630f883b9be066e6f713ad19db3443e9126f40b478f2816e5078531
+size 59361314