Skip to content

Commit cbb4df7

Browse files
author
Darrell Root
committed
Version 2.3 build 15 release candidate
1 parent e9975ac commit cbb4df7

File tree

5 files changed

+6
-22
lines changed

5 files changed

+6
-22
lines changed

Netrek2.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1384,7 +1384,7 @@
13841384
CODE_SIGN_IDENTITY = "-";
13851385
CODE_SIGN_STYLE = Automatic;
13861386
COMBINE_HIDPI_IMAGES = YES;
1387-
CURRENT_PROJECT_VERSION = 14;
1387+
CURRENT_PROJECT_VERSION = 15;
13881388
DEVELOPMENT_ASSET_PATHS = "\"NetrekMacOS/Preview Content\"";
13891389
DEVELOPMENT_TEAM = 8DU2Q8ABKY;
13901390
ENABLE_HARDENED_RUNTIME = YES;
@@ -1395,7 +1395,7 @@
13951395
"@executable_path/../Frameworks",
13961396
);
13971397
MACOSX_DEPLOYMENT_TARGET = 10.15;
1398-
MARKETING_VERSION = 2.2;
1398+
MARKETING_VERSION = 2.3;
13991399
PRODUCT_BUNDLE_IDENTIFIER = net.networkmom.netrek;
14001400
PRODUCT_NAME = "$(TARGET_NAME)";
14011401
SWIFT_VERSION = 5.0;
@@ -1410,7 +1410,7 @@
14101410
CODE_SIGN_IDENTITY = "-";
14111411
CODE_SIGN_STYLE = Automatic;
14121412
COMBINE_HIDPI_IMAGES = YES;
1413-
CURRENT_PROJECT_VERSION = 14;
1413+
CURRENT_PROJECT_VERSION = 15;
14141414
DEVELOPMENT_ASSET_PATHS = "\"NetrekMacOS/Preview Content\"";
14151415
DEVELOPMENT_TEAM = 8DU2Q8ABKY;
14161416
ENABLE_HARDENED_RUNTIME = YES;
@@ -1421,7 +1421,7 @@
14211421
"@executable_path/../Frameworks",
14221422
);
14231423
MACOSX_DEPLOYMENT_TARGET = 10.15;
1424-
MARKETING_VERSION = 2.2;
1424+
MARKETING_VERSION = 2.3;
14251425
PRODUCT_BUNDLE_IDENTIFIER = net.networkmom.netrek;
14261426
PRODUCT_NAME = "$(TARGET_NAME)";
14271427
SWIFT_VERSION = 5.0;

NetrekMacOS/Gobal Group/AppDelegate.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
3636
private(set) var gameState: GameState = .noServerSelected
3737
var analyzer: PacketAnalyzer?
3838
var clientTypeSent = false
39-
var soundController: SoundController?
39+
//var soundController: SoundController?
4040

4141
var serverByTag: [Int:String] = [:]
4242

@@ -77,7 +77,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
7777
//Always run in dark mode
7878
NSApp.appearance = NSAppearance(named: .darkAqua)
7979

80-
self.soundController = SoundController()
80+
//self.soundController = SoundController()
8181
self.keymapController = KeymapController()
8282

8383
setupBlankMenu()

Shared/Communication/MakePacket.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@ import Foundation
1010
import SwiftUI
1111

1212
class MakePacket {
13-
#if os(macOS)
14-
static let appDelegate = NSApplication.shared.delegate as! AppDelegate
15-
#elseif os(iOS)
16-
static let appDelegate = UIApplication.shared.delegate as! AppDelegate
17-
#endif
1813

1914
static func make16Tuple(string: String) -> (UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8) {
2015
var temp: [UInt8] = []

Shared/Communication/PacketAnalyzer.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@ import Foundation
1010
import SwiftUI
1111
class PacketAnalyzer {
1212

13-
/*#if os(macOS)
14-
let appDelegate = NSApplication.shared.delegate as! AppDelegate
15-
#elseif os(iOS)
16-
let appDelegate = UIApplication.shared.delegate as! AppDelegate
17-
#endif*/
1813
let appDelegate: AppDelegate
1914
let universe = Universe.universe
2015
var leftOverData: Data?

Shared/Views/PlayerView.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ struct PlayerView: View, TacticalOffset {
1616
var screenWidth: CGFloat
1717
var screenHeight: CGFloat
1818

19-
#if os(macOS)
20-
let appDelegate = NSApplication.shared.delegate as! AppDelegate
21-
#elseif os(iOS)
22-
let appDelegate = UIApplication.shared.delegate as! AppDelegate
23-
#endif
24-
2519

2620
var body: some View {
2721
return GeometryReader { geo in

0 commit comments

Comments
 (0)