shithub: choc

Download patch

ref: 01e9eff0e42b4255fd230fe1f9e5de9c9ed16e8f
parent: af6bdd73396e166417484c2efe4a0eb48aac780e
author: Simon Howard <[email protected]>
date: Wed Jan 11 21:18:59 EST 2006 

Only start new games when in the waiting-for-start state.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 285


--- a/src/net_client.c
+++ b/src/net_client.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: net_client.c 284 2006-01-12 02:11:52Z fraggle $
+// $Id: net_client.c 285 2006-01-12 02:18:59Z fraggle $
 //
 // Copyright(C) 2005 Simon Howard
 //
@@ -21,6 +21,9 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.18  2006/01/12 02:18:59  fraggle
+// Only start new games when in the waiting-for-start state.
+//
 // Revision 1.17  2006/01/12 02:11:52  fraggle
 // Game start packets
 //
@@ -250,6 +253,13 @@
     {
         return;
     }
+
+    if (client_state != CLIENT_STATE_WAITING_START)
+    {
+        return;
+    }
+
+    // Start the game
 
     consoleplayer = player_number;
     
--- a/src/net_server.c
+++ b/src/net_server.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: net_server.c 284 2006-01-12 02:11:52Z fraggle $
+// $Id: net_server.c 285 2006-01-12 02:18:59Z fraggle $
 //
 // Copyright(C) 2005 Simon Howard
 //
@@ -21,6 +21,9 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.21  2006/01/12 02:18:59  fraggle
+// Only start new games when in the waiting-for-start state.
+//
 // Revision 1.20  2006/01/12 02:11:52  fraggle
 // Game start packets
 //
@@ -406,6 +409,13 @@
     if (!NET_ReadSettings(packet, &settings))
     {
         // Malformed packet
+
+        return;
+    }
+
+    if (server_state != SERVER_WAITING_START)
+    {
+        // Can only start a game if we are in the waiting start state.
 
         return;
     }