From cbf288e86d375bad65beca8fca75871b9b9f4c2c Mon Sep 17 00:00:00 2001 From: 127-Z3R0 <81heti1bif@hft-stuttgart.de> Date: Tue, 2 Jun 2020 22:18:59 +0200 Subject: [PATCH] minor refactoring --- GoldWars/GoldWars/GameCenterManager.swift | 58 +++++++++---------- .../GoldWars/RoundCalculatorService.swift | 1 + 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/GoldWars/GoldWars/GameCenterManager.swift b/GoldWars/GoldWars/GameCenterManager.swift index adbdea2..d10654b 100644 --- a/GoldWars/GoldWars/GameCenterManager.swift +++ b/GoldWars/GoldWars/GameCenterManager.swift @@ -131,35 +131,35 @@ final class GameCenterManager: NSObject, GKMatchmakerViewControllerDelegate, GKG } if let state = try? jsonDecoder.decode(State.self, from: data) { switch state.state { - case 0: - os_log("State 0 erhalten", log: LOG, type: .info) - sendStateToPeers(state: State(state: 1)) - case 1: - os_log("State 1 erhalten", log: LOG, type: .info) - - if isServer { - os_log("Peer hat Player initialisiert", log: LOG, type: .info) - initAndSendMap() - }else { - os_log("Host hat Player initialisiert", log: LOG, type: .info) - } - case 2: - os_log("State 2 erhalten", log: LOG, type: .info) - sendStateToPeers(state: State(state: 3)) - initIsFinish = true - os_log("Spiel startet", log: LOG, type: .info) - case 3: - os_log("State 3 erhalten", log: LOG, type: .info) - initIsFinish = true - os_log("Spiel startet", log: LOG, type: .info) - case 4: - os_log("State 4 erhalten, Peer hat verloren", log: LOG, type: .info) - // TODO: Trigger Loser Scene - case 5: - os_log("State 5 erhalten, Peer hat gewonnen", log: LOG, type: .info) - // TODO: Trigger Winner Scene - default: - break + case 0: + os_log("State 0 erhalten", log: LOG, type: .info) + sendStateToPeers(state: State(state: 1)) + case 1: + os_log("State 1 erhalten", log: LOG, type: .info) + + if isServer { + os_log("Peer hat Player initialisiert", log: LOG, type: .info) + initAndSendMap() + }else { + os_log("Host hat Player initialisiert", log: LOG, type: .info) + } + case 2: + os_log("State 2 erhalten", log: LOG, type: .info) + sendStateToPeers(state: State(state: 3)) + initIsFinish = true + os_log("Spiel startet", log: LOG, type: .info) + case 3: + os_log("State 3 erhalten", log: LOG, type: .info) + initIsFinish = true + os_log("Spiel startet", log: LOG, type: .info) + case 4: + os_log("State 4 erhalten, Peer hat verloren", log: LOG, type: .info) + // TODO: Trigger Loser Scene + case 5: + os_log("State 5 erhalten, Peer hat gewonnen", log: LOG, type: .info) + // TODO: Trigger Winner Scene + default: + break } } if let roundData = try? jsonDecoder.decode(LocalRoundData.self, from: data) { diff --git a/GoldWars/GoldWars/RoundCalculatorService.swift b/GoldWars/GoldWars/RoundCalculatorService.swift index a604a1a..95f0c72 100644 --- a/GoldWars/GoldWars/RoundCalculatorService.swift +++ b/GoldWars/GoldWars/RoundCalculatorService.swift @@ -158,6 +158,7 @@ class RoundCalculatorService { winner = determineWinner(by: "capture") } winner == GameCenterManager.sharedInstance.hostingPlayer?.displayName ? GameCenterManager.sharedInstance.sendStateToPeers(state: State(state: 4)) : GameCenterManager.sharedInstance.sendStateToPeers(state: State(state: 5)) + //TODO: Trigger Winner/Loser-Scene for Server return } currentRound += 1