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

Merge remote-tracking branch 'refs/remotes/origin/devTestBranch'

Browse Source
This commit is contained in:
Aldin Duraki 2020-07-02 13:01:37 +02:00
commit 43ba0be225
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
GoldWars/GoldWars/Entities/HUD.swift
View File

@ -61,7 +61,11 @@ class HUD: GKEntity {
y: EntityManager.gameEMInstance.scene.size.height * 0.1), y: EntityManager.gameEMInstance.scene.size.height * 0.1),
onButtonPress: { } 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)) 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); leaveGame.size = CGSize(width: 120, height: 120);

1
GoldWars/GoldWars/Entities/Modal.swift
View File

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

1
GoldWars/GoldWars/GameCenterManager.swift
View File

@ -178,6 +178,7 @@ final class GameCenterManager: NSObject, GKMatchmakerViewControllerDelegate, GKG
(EntityManager.gameEMInstance.scene as! GameScene).gameEnd() (EntityManager.gameEMInstance.scene as! GameScene).gameEnd()
case 6: case 6:
os_log("State 6 erhalten, Peer hat Spiel verlassen ", log: LOG, type: .info) os_log("State 6 erhalten, Peer hat Spiel verlassen ", log: LOG, type: .info)
(EntityManager.gameEMInstance.scene as! GameScene).gameQuit()
opponentQuit = true opponentQuit = true
quitGame = true quitGame = true
default: default: