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

Merge branch '84-nachkomma-stellen-entfernen' into 'development'

Browse Source 
Resolve "Nachkomma-Stellen entfernen"

Closes #84

See merge request marcel.schwarz/software-projekt-2!110
This commit is contained in:
Marcel Schwarz 2020-06-11 20:42:08 +00:00
commit e10d57968c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
GoldWars/GoldWars/Scenes/GameScene.swift
View File

@ -16,7 +16,7 @@ class GameScene: SKScene{
var isMoveTouch = false var isMoveTouch = false
var currentDraggedBase : Base? var currentDraggedBase : Base?
static var sendUnits: CGFloat = 0 static var sendUnits: Int = 0
var collisionBase: Base? var collisionBase: Base?
override func sceneDidLoad() { override func sceneDidLoad() {
@ -113,7 +113,7 @@ class GameScene: SKScene{
touchLocation: touchLocation, touchLocation: touchLocation,
collisionBase: collisionBase) collisionBase: collisionBase)
) )
GameScene.sendUnits = CGFloat(currentDraggedBase!.unitCount / 2) GameScene.sendUnits = Int(currentDraggedBase!.unitCount / 2)
} }
} }
} }
@ -123,7 +123,7 @@ class GameScene: SKScene{
for e in entityManager.entities{ for e in entityManager.entities{
if let modal = e as? Modal { if let modal = e as? Modal {
if modal.type == ModalType.BaseAttack || modal.type == ModalType.BaseMoveOwnUnits { if modal.type == ModalType.BaseAttack || modal.type == ModalType.BaseMoveOwnUnits {
GameScene.sendUnits = ((e.component(ofType: SliderComponent.self)?.sliderNode.getValue ?? 0) * CGFloat((e as! Modal).unitCount)).rounded(.up) GameScene.sendUnits = Int(((e.component(ofType: SliderComponent.self)?.sliderNode.getValue ?? 0) * CGFloat((e as! Modal).unitCount)).rounded(.up))
//TODO: refactor this quick and dirty fix //TODO: refactor this quick and dirty fix
if GameScene.sendUnits == 0 { if GameScene.sendUnits == 0 {