X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Project06%2FCS%203505%20Project%2006%2FCS%203505%20Project%2006%2FNetworkGame.cs;h=2386ef60717983e77271ee1aa4a81a16683769c9;hb=9187849a37e447f2440ef8257e15e8652f0c51e8;hp=3ce0372be2059e941415307532a715ece59d8055;hpb=8c50e423a4325590132a2e921c73ed3439db7bbc;p=chaz%2Fcarfire

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 3ce0372..2386ef6 100644
--- a/Project06/CS 3505 Project 06/CS 3505 Project 06/NetworkGame.cs	
+++ b/Project06/CS 3505 Project 06/CS 3505 Project 06/NetworkGame.cs	
@@ -210,7 +210,7 @@ namespace CS_3505_Project_06
             mNetworkSession.StartGame();
             mNetworkSession.ResetReady();
 
-            Reset();
+            //Reset();
         }
 
 
@@ -232,15 +232,25 @@ namespace CS_3505_Project_06
                 if (mNetworkSession.SessionState == NetworkSessionState.Lobby)
                 {
                     mLobby.Update(gameTime, this);
+
+                    //if state started as lobby and was changed to playing, call reset.
+                    if (mNetworkSession.SessionState == NetworkSessionState.Playing)
+                        Reset();
                 }
                 else if (mNetworkSession.SessionState == NetworkSessionState.Playing)
                 {
-                    if (mGame.IsGameOver(LocalGamerInfo) || mGame.IsTerminated(LocalGamerInfo))
-                    {
-                        // TODO: Should support moving back to the session lobby.
-                        LeaveSession();
-                        return;
-                    }
+                    //TODO reset needs to be called for all players, currently LocalGamerInfo throughs exception for all nonhosts
+                    //     because in start game reset is only called on hosts games thus other clients never get an updated list
+                    //     gamers.
+
+
+//thoughs exeption see TODO above
+                    //if (mGame.IsGameOver(LocalGamerInfo) || mGame.IsTerminated(LocalGamerInfo))
+                    //{
+                    //    // TODO: Should support moving back to the session lobby.
+                    //    LeaveSession();
+                    //    return;
+                    //}
 
                     if (HaveNeededEvents)
                     {