Fix

cs3217-2324 · Apr 8, 2024 · 66343c3 · 66343c3
1 parent 344c020
commit 66343c3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/...proj/project.xcworkspace/xcuserdata/macbookpro.xcuserdatad/UserInterfaceState.xcuserstate b/...proj/project.xcworkspace/xcuserdata/macbookpro.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/TowerForge/TowerForge/Networking/RoomNetwork/GameRoom.swift b/TowerForge/TowerForge/Networking/RoomNetwork/GameRoom.swift
@@ -110,7 +110,7 @@ class GameRoom {
     private func updateRoomState(roomState: RoomState) {
         print("Updating room state from player")
         let roomStateRef = FirebaseDatabaseReference(.Rooms).child(roomName).child("roomState")
-        roomStateRef.setValue(roomState) { error, _ in
+        roomStateRef.setValue(roomState.rawValue) { error, _ in
             if let error = error {
                 print("Error updating room state: \(error.localizedDescription)")
             } else {
@@ -198,6 +198,7 @@ class GameRoom {
 
             let room = GameRoom(roomName: roomName, roomState: roomState)
             room.roomId = roomId
+            completion(room)
         }
     }
 

diff --git a/TowerForge/TowerForge/ViewControllers/GameWaitingRoomViewController.swift b/TowerForge/TowerForge/ViewControllers/GameWaitingRoomViewController.swift
@@ -36,10 +36,8 @@ class GameWaitingRoomViewController: UIViewController {
     }
 
     @IBAction private func onStartButtonPressed(_ sender: Any) {
-        gameRoom?.updatePlayerReady { state in
-            if state == .gameOnGoing {
-                self.performSegue(withIdentifier: "segueToGame", sender: self)
-            }
+        gameRoom?.updatePlayerReady { _ in
+            self.startButton.isEnabled = false
         }
     }
 
@@ -55,7 +53,6 @@ class GameWaitingRoomViewController: UIViewController {
                 self.navigationController?.popViewController(animated: true)
             }
         })
-        // performSegue(withIdentifier: "segueToGameRoom", sender: self)
     }
 
     private func updatePlayerList() {