cleaned up some comments I was making during testing

[chaz/carfire] / Project06 / CS 3505 Project 06 / CS 3505 Project 06 / NetworkGame.cs

diff --git a/Project06/CS 3505 Project 06/CS 3505 Project 06/NetworkGame.cs b/Project06/CS 3505 Project 06/CS 3505 Project 06/NetworkGame.cs
index 0d1ac6d00ca8fa7644095410d8630c8349ea404c..72a588cf62f6fcbab846b40794fd387dbf529a52 100644 (file)
--- a/Project06/CS 3505 Project 06/CS 3505 Project 06/NetworkGame.cs
+++ b/Project06/CS 3505 Project 06/CS 3505 Project 06/NetworkGame.cs
@@ -104,10 +104,17 @@ namespace CS_3505_Project_06
             mNetworkSession = NetworkSession.EndCreate(result);\r
             mNetworkSession.AllowHostMigration = true;\r
             mNetworkSession.AllowJoinInProgress = false;\r
-\r
+            mNetworkSession.GameStarted += new EventHandler<GameStartedEventArgs>(mNetworkSession_GameStarted);\r
             mJoinedSessionDelegate(mNetworkSession, this);\r
         }\r
 \r
+\r
+        //gamestarted event\r
+        void mNetworkSession_GameStarted(object sender, GameStartedEventArgs e)\r
+        {\r
+            Reset();\r
+        }\r
+\r
         /// <summary>\r
         /// Determine whether or not the network game object is associated with any network session.\r
         /// </summary>\r
@@ -160,6 +167,8 @@ namespace CS_3505_Project_06
 \r
             mJoinedSessionDelegate(mNetworkSession, this);\r
             mJoinedSessionDelegate = null;\r
+\r
+            mNetworkSession.GameStarted += new EventHandler<GameStartedEventArgs>(mNetworkSession_GameStarted);\r
         }\r
 \r
 \r
@@ -210,7 +219,7 @@ namespace CS_3505_Project_06
             mNetworkSession.StartGame();\r
             mNetworkSession.ResetReady();\r
 \r
-            Reset();\r
+            //Reset();\r
         }\r
 \r
 \r
@@ -235,18 +244,12 @@ namespace CS_3505_Project_06
                 }\r
                 else if (mNetworkSession.SessionState == NetworkSessionState.Playing)\r
                 {\r
-                    //TODO reset needs to be called for all players, currently LocalGamerInfo throughs exception for all nonhosts\r
-                    //     because in start game reset is only called on hosts games thus other clients never get an updated list\r
-                    //     gamers.\r
-\r
-\r
-//thoughs exeption see TODO above\r
-                    //if (mGame.IsGameOver(LocalGamerInfo) || mGame.IsTerminated(LocalGamerInfo))\r
-                    //{\r
-                    //    // TODO: Should support moving back to the session lobby.\r
-                    //    LeaveSession();\r
-                    //    return;\r
-                    //}\r
+                    if (mGame.IsGameOver(LocalGamerInfo) || mGame.IsTerminated(LocalGamerInfo))\r
+                    {\r
+                        // TODO: Should support moving back to the session lobby.\r
+                        LeaveSession();\r
+                        return;\r
+                    }\r
 \r
                     if (HaveNeededEvents)\r
                     {\r