From 34c3dd253fa3d56b16c11a5263ffb3378529fc33 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 1 Jan 2006 23:53:15 +0000
Subject: Remove GS_WAITINGSTART gamestate. This will be independent of the
 main loop to avoid interfering with the main game code too much.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 237
---
 src/d_main.c  | 17 +++++++----------
 src/d_net.c   | 12 +++++++-----
 src/doomdef.h | 10 +++++-----
 src/g_game.c  | 18 ++++++------------
 4 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/src/d_main.c b/src/d_main.c
index 4b898c7d..1df9cabf 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: d_main.c 235 2005-12-30 18:58:22Z fraggle $
+// $Id: d_main.c 237 2006-01-01 23:53:15Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -22,6 +22,10 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.33  2006/01/01 23:53:14  fraggle
+// Remove GS_WAITINGSTART gamestate.  This will be independent of the main
+// loop to avoid interfering with the main game code too much.
+//
 // Revision 1.32  2005/12/30 18:58:22  fraggle
 // Fix client code to correctly send reply to server on connection.
 // Add "waiting screen" while waiting for the game to start.
@@ -146,7 +150,7 @@
 //-----------------------------------------------------------------------------
 
 
-static const char rcsid[] = "$Id: d_main.c 235 2005-12-30 18:58:22Z fraggle $";
+static const char rcsid[] = "$Id: d_main.c 237 2006-01-01 23:53:15Z fraggle $";
 
 #define	BGCOLOR		7
 #define	FGCOLOR		8
@@ -395,10 +399,6 @@ void D_Display (void)
       case GS_DEMOSCREEN:
 	D_PageDrawer ();
 	break;
-
-      case GS_WAITINGSTART:
-        NET_Drawer();
-        break;
     }
     
     // draw buffered stuff to screen
@@ -1581,10 +1581,7 @@ void D_DoomMain (void)
 	G_LoadGame (file);
     }
 	
-    // TODO: Remove this test here for GS_WAITINGSTART.  Temporary hack
-    // for new network code.
-
-    if (gamestate != GS_WAITINGSTART && gameaction != ga_loadgame )
+    if (gameaction != ga_loadgame )
     {
 	if (autostart || netgame)
 	    G_InitNew (startskill, startepisode, startmap);
diff --git a/src/d_net.c b/src/d_net.c
index c5ef6f4c..73f57612 100644
--- a/src/d_net.c
+++ b/src/d_net.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: d_net.c 235 2005-12-30 18:58:22Z fraggle $
+// $Id: d_net.c 237 2006-01-01 23:53:15Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -22,6 +22,10 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.10  2006/01/01 23:53:15  fraggle
+// Remove GS_WAITINGSTART gamestate.  This will be independent of the main
+// loop to avoid interfering with the main game code too much.
+//
 // Revision 1.9  2005/12/30 18:58:22  fraggle
 // Fix client code to correctly send reply to server on connection.
 // Add "waiting screen" while waiting for the game to start.
@@ -63,7 +67,7 @@
 //-----------------------------------------------------------------------------
 
 
-static const char rcsid[] = "$Id: d_net.c 235 2005-12-30 18:58:22Z fraggle $";
+static const char rcsid[] = "$Id: d_net.c 237 2006-01-01 23:53:15Z fraggle $";
 
 
 #include "m_menu.h"
@@ -623,8 +627,6 @@ void D_CheckNetGame (void)
         if (NET_ClientConnect(addr))
         {
             printf("connected to local server\n");
-            
-            gamestate = GS_WAITINGSTART;
         }
         else
         {
@@ -681,7 +683,7 @@ void D_QuitNetGame (void)
 	
     if (debugfile)
 	fclose (debugfile);
-		
+
     if (!netgame || !usergame || consoleplayer == -1 || demoplayback)
 	return;
 	
diff --git a/src/doomdef.h b/src/doomdef.h
index 4f2e51a3..ee599d0a 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: doomdef.h 235 2005-12-30 18:58:22Z fraggle $
+// $Id: doomdef.h 237 2006-01-01 23:53:15Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -132,16 +132,12 @@ typedef enum
 // The current state of the game: whether we are
 // playing, gazing at the intermission screen,
 // the game final animation, or a demo. 
-//
-// fraggle: GS_WAITINGSTART indicates that we are in a netgame, waiting
-// for a signal from the server to start the game.
 typedef enum
 {
     GS_LEVEL,
     GS_INTERMISSION,
     GS_FINALE,
     GS_DEMOSCREEN,
-    GS_WAITINGSTART,
 } gamestate_t;
 
 //
@@ -377,6 +373,10 @@ typedef enum
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.10  2006/01/01 23:53:15  fraggle
+// Remove GS_WAITINGSTART gamestate.  This will be independent of the main
+// loop to avoid interfering with the main game code too much.
+//
 // Revision 1.9  2005/12/30 18:58:22  fraggle
 // Fix client code to correctly send reply to server on connection.
 // Add "waiting screen" while waiting for the game to start.
diff --git a/src/g_game.c b/src/g_game.c
index de4770fb..001cb19e 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: g_game.c 235 2005-12-30 18:58:22Z fraggle $
+// $Id: g_game.c 237 2006-01-01 23:53:15Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -22,6 +22,10 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.18  2006/01/01 23:53:15  fraggle
+// Remove GS_WAITINGSTART gamestate.  This will be independent of the main
+// loop to avoid interfering with the main game code too much.
+//
 // Revision 1.17  2005/12/30 18:58:22  fraggle
 // Fix client code to correctly send reply to server on connection.
 // Add "waiting screen" while waiting for the game to start.
@@ -94,7 +98,7 @@
 
 
 static const char
-rcsid[] = "$Id: g_game.c 235 2005-12-30 18:58:22Z fraggle $";
+rcsid[] = "$Id: g_game.c 237 2006-01-01 23:53:15Z fraggle $";
 
 #include <string.h>
 #include <stdlib.h>
@@ -647,13 +651,6 @@ boolean G_Responder (event_t* ev)
 	return false; 
     } 
 
-    // waiting for a network game to start
-
-    if (gamestate == GS_WAITINGSTART)
-    {
-        return NET_Responder(ev);
-    }
- 
     if (gamestate == GS_LEVEL) 
     { 
 #if 0 
@@ -866,9 +863,6 @@ void G_Ticker (void)
       case GS_DEMOSCREEN: 
 	D_PageTicker (); 
 	break;
-
-      case GS_WAITINGSTART:
-        break;
     }        
 } 
  
-- 
cgit v1.2.3