hft-informatik/software-projekt-2-gold-wars
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

last changes

Browse Source
This commit is contained in:
Chauntalle Schüle 2020-06-03 13:19:56 +02:00
parent 74a7df551c
commit 7050fd1b8f
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GoldWars/GoldWars/RoundCalculatorService.swift
View File

@ -26,13 +26,11 @@ class RoundCalculatorService {
var numberOfAttacks = 0 var numberOfAttacks = 0
var numberOfOwnUnitMoves = 0 var numberOfOwnUnitMoves = 0
var roundNr = 1
func calculateRound() { func calculateRound() {
StateManager.sharedInstance.stateMachine?.enter(SyncingState.self) StateManager.sharedInstance.stateMachine?.enter(SyncingState.self)
os_log("Started calculating Round", log: RoundCalculatorService.LOG, type: .info) os_log("Started calculating Round", log: RoundCalculatorService.LOG, type: .info)
roundNr += 1
isCalculating = true isCalculating = true
let currentSnapshotModel = DataService.sharedInstance.snapshotModel let currentSnapshotModel = DataService.sharedInstance.snapshotModel
var baseSpecificMoves = collectBaseSpecificMoves() var baseSpecificMoves = collectBaseSpecificMoves()

2
GoldWars/GoldWars/States/GameState.swift
View File

@ -29,7 +29,7 @@ class GameState: GKState {
os_log("Entered Game State", log: LOG, type: .info) os_log("Entered Game State", log: LOG, type: .info)
if CommandLine.arguments.contains("--no-matchmaking") { if CommandLine.arguments.contains("--no-matchmaking") {
StateManager.sharedInstance.menuSc!.loadScene(scene: GameScene(size: StateManager.sharedInstance.menuSc!.size)) StateManager.sharedInstance.menuSc!.loadScene(scene: GameScene(size: StateManager.sharedInstance.menuSc!.size))
} else if RoundCalculatorService.sharedInstance.roundNr == 1 { } else if RoundCalculatorService.sharedInstance.currentRound == 1 {
StateManager.sharedInstance.menuSc!.loadScene(scene: StateManager.sharedInstance.gameSc!) StateManager.sharedInstance.menuSc!.loadScene(scene: StateManager.sharedInstance.gameSc!)
} }
} }