diff options
| author | Simon Howard | 2006-01-01 23:53:15 +0000 |
|---|---|---|
| committer | Simon Howard | 2006-01-01 23:53:15 +0000 |
| commit | 34c3dd253fa3d56b16c11a5263ffb3378529fc33 (patch) | |
| tree | 4b89818d378e447bae0677de62586d467ec62c24 /src/g_game.c | |
| parent | 0caa1149ff6a96e930f4ebce0db45457e0661b2e (diff) | |
| download | chocolate-doom-34c3dd253fa3d56b16c11a5263ffb3378529fc33.tar.gz chocolate-doom-34c3dd253fa3d56b16c11a5263ffb3378529fc33.tar.bz2 chocolate-doom-34c3dd253fa3d56b16c11a5263ffb3378529fc33.zip | |
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
Diffstat (limited to 'src/g_game.c')
| -rw-r--r-- | src/g_game.c | 18 |
1 files changed, 6 insertions, 12 deletions
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; } } |