GoldWars/GoldWars.xcodeproj/project.pbxproj

@@ -614,7 +614,6 @@
 				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = DDKFQG46BQ;
 				INFOPLIST_FILE = GoldWars/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.5;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -638,7 +637,6 @@
 				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = DDKFQG46BQ;
 				INFOPLIST_FILE = GoldWars/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.5;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

GoldWars/GoldWars/Entities/HUD.swift

@@ -61,11 +61,7 @@ class HUD: GKEntity {
                 y: EntityManager.gameEMInstance.scene.size.height * 0.1),
             onButtonPress: { }
         )
-        leaveGame = ButtonNode(textureName: "exitButton",
-                               text: "" ,
-                               isEnabled: true,
-                               position: CGPoint(x: EntityManager.gameEMInstance.scene.size.width * 0.05, y: EntityManager.gameEMInstance.scene.size.height * 0.11),
-                               onButtonPress: {
+        leaveGame = ButtonNode(textureName: "exitButton", text: "" , isEnabled: true, position: CGPoint(x: EntityManager.gameEMInstance.scene.size.width * 0.05, y: EntityManager.gameEMInstance.scene.size.height * 0.11), onButtonPress: {
                 EntityManager.gameEMInstance.add(Modal(modaltype: .QuitGame, base: nil, anchorPoint: CGPoint(x: EntityManager.gameEMInstance.scene.size.width / 2 , y: EntityManager.gameEMInstance.scene.size.height / 2), gameScene: EntityManager.gameEMInstance.scene, currentDraggedBase: nil, touchLocation: nil, collisionBase: nil))
         })
         leaveGame.size = CGSize(width: 120, height: 120);

GoldWars/GoldWars/Entities/Modal.swift

@@ -105,7 +105,6 @@ class Modal: GKEntity{
                     GameCenterManager.sharedInstance.sendStateToPeers(state: State(state: 6))
                     GameCenterManager.sharedInstance.opponentQuit = false
                     GameCenterManager.sharedInstance.quitGame = true
-                    (EntityManager.gameEMInstance.scene as! GameScene).gameQuit()
                 }))
             case .PauseGame:
                 break

GoldWars/GoldWars/GameCenterManager.swift

@@ -170,17 +170,14 @@ final class GameCenterManager: NSObject, GKMatchmakerViewControllerDelegate, GKG
                     os_log("State 4 erhalten, Peer hat verloren", log: LOG, type: .info)
                     winner = hostingPlayer?.displayName
                     gameEnded = true
-                    (EntityManager.gameEMInstance.scene as! GameScene).gameEnd()
                 case 5:
                     os_log("State 5 erhalten, Peer hat gewonnen", log: LOG, type: .info)
                     winner = peerPlayer?.displayName
                     gameEnded = true
-                     (EntityManager.gameEMInstance.scene as! GameScene).gameEnd()
                 case 6:
                     os_log("State 6 erhalten, Peer hat Spiel verlassen ", log: LOG, type: .info)
                     opponentQuit = true
                     quitGame = true
-                    (EntityManager.gameEMInstance.scene as! GameScene).gameQuit()
                 default:
                     break
             }

GoldWars/GoldWars/GameViewController.swift

@@ -22,8 +22,8 @@ class GameViewController: UIViewController {
             scene.scaleMode = .aspectFill
             view.presentScene(scene)
             //TODO: create dev profile or remove on delivery
-//            view.showsFPS = true
-//            view.showsNodeCount = true
+            view.showsFPS = true
+            view.showsNodeCount = true
         }
         GameCenterManager.sharedInstance.viewController = self
     }

GoldWars/GoldWars/RoundCalculatorService.swift

@@ -160,7 +160,7 @@ class RoundCalculatorService {
             winner == GameCenterManager.sharedInstance.hostingPlayer?.displayName ? GameCenterManager.sharedInstance.sendStateToPeers(state: State(state: 4)) : GameCenterManager.sharedInstance.sendStateToPeers(state: State(state: 5))
             GameCenterManager.sharedInstance.winner = winner
             GameCenterManager.sharedInstance.gameEnded = true
-            (EntityManager.gameEMInstance.scene as! GameScene).gameEnd()
+            
             // Update EloSystem
             if winner == GameCenterManager.sharedInstance.hostingPlayer?.displayName {
                 EloHelper.updateEloScore(winner: GameCenterManager.sharedInstance.hostingPlayer!, hatDenNikoGemacht: GameCenterManager.sharedInstance.peerPlayer!)

GoldWars/GoldWars/RoundTimer.swift

@@ -13,7 +13,6 @@ class RoundTimer: Timer {
     var timer: Timer?
     var timeLeft: Int = 0
     var isHeartbeatLocked = false
-    var isTimerStopped = false
     var calculate = false
     var roundEnded = "Syncing"
     
@@ -32,42 +31,48 @@ class RoundTimer: Timer {
     }
     
     func stopTimer() {
-        isTimerStopped = true
+        guard timer != nil else { return }
+        timer?.invalidate()
+        timer = nil
     }
     
     func resumeTimer() {
-        isTimerStopped = false
+        timer = Timer.scheduledTimer(
+            timeInterval: 1.0,
+            target: self,
+            selector: #selector(onTimerFires),
+            userInfo: nil,
+            repeats: true
+        )
     }
     
     @objc func onTimerFires()
     {
-        if !isTimerStopped {
-            timeLeft -= 1
-            EntityManager.gameEMInstance.updateTime(time: (timeLeft > 0 ? String(timeLeft) : roundEnded))
-            
-            if timeLeft == 0 {
-                EntityManager.gameEMInstance.removeModal()
-                RoundCalculatorService.sharedInstance.resetNumberOfAttacksAndFormats()
-                if !MultiplayerNetwork.sharedInstance.isSending {
-                    MultiplayerNetwork.sharedInstance.sendPlayerMoves(localRoundData: DataService.sharedInstance.localRoundData)
-                }
-                calculate = true
+        timeLeft -= 1
+        EntityManager.gameEMInstance.updateTime(time: (timeLeft > 0 ? String(timeLeft) : roundEnded))
+        
+        if timeLeft == 0 {
+            EntityManager.gameEMInstance.removeModal()
+            RoundCalculatorService.sharedInstance.resetNumberOfAttacksAndFormats()
+            if !MultiplayerNetwork.sharedInstance.isSending {
+                MultiplayerNetwork.sharedInstance.sendPlayerMoves(localRoundData: DataService.sharedInstance.localRoundData)
             }
-            
-            if timeLeft <= 0 {
-                if calculate
-                    && !RoundCalculatorService.sharedInstance.isCalculating
-                    && DataService.sharedInstance.didReceiveAllData()
-                    && GameCenterManager.sharedInstance.isServer {
-                    RoundCalculatorService.sharedInstance.calculateRound()
-                    calculate = false
-                }
-            }
-            
-            if (!isHeartbeatLocked && (timeLeft % 7 == 0)){
-                MultiplayerNetwork.sharedInstance.sendHeartbeatToPlayer()
-                isHeartbeatLocked = true;
+            calculate = true
+        }
+        
+        if timeLeft <= 0 {
+            if calculate
+                && !RoundCalculatorService.sharedInstance.isCalculating
+                && DataService.sharedInstance.didReceiveAllData()
+                && GameCenterManager.sharedInstance.isServer {
+                RoundCalculatorService.sharedInstance.calculateRound()
+                calculate = false
             }
         }
+        
+        if (!isHeartbeatLocked && (timeLeft % 7 == 0)){
+            MultiplayerNetwork.sharedInstance.sendHeartbeatToPlayer()
+            isHeartbeatLocked = true;
+        }
     }
 }

GoldWars/GoldWars/Scenes/GameScene.swift

@@ -78,7 +78,12 @@ class GameScene: SKScene{
     
     override func update(_ currentTime: TimeInterval) {
         entityManager.getBackground()?.update(deltaTime: currentTime)
-      
+        if GameCenterManager.sharedInstance.gameEnded && !gameEndEffects {
+            gameEnd()
+        }
+        if GameCenterManager.sharedInstance.quitGame {
+            gameQuit()
+        }
     }