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

fix rebase issues

Browse Source
This commit is contained in:
Jakob Haag 2020-06-01 20:34:44 +02:00 committed by Aldin Duraki
parent eadcec10d8
commit a086a7779b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GoldWars/GoldWars/RoundCalculatorService.swift
View File

@ -201,9 +201,9 @@ class RoundCalculatorService {
func increaseMoveCounter(ownBase: Bool!) { func increaseMoveCounter(ownBase: Bool!) {
if ownBase { if ownBase {
self.numberOfOwnUnitMoves = self.numberOfOwnUnitMoves + 1 self.numberOfOwnUnitMoves += 1
} else { } else {
self.numberOfAttacks = self.numberOfAttacks + 1 self.numberOfAttacks += 1
} }
} }
} }

2
GoldWars/GoldWars/RoundTimer.swift
View File

@ -31,7 +31,7 @@ class RoundTimer: Timer {
@objc func onTimerFires() @objc func onTimerFires()
{ {
timeLeft = timeLeft - 1 timeLeft -= 1
EntityManager.gameEMInstance.updateTime(time: (timeLeft > 0 ? String(timeLeft) : roundEnded)) EntityManager.gameEMInstance.updateTime(time: (timeLeft > 0 ? String(timeLeft) : roundEnded))