summaryrefslogtreecommitdiff
path: root/src/doomdef.h
diff options
context:
space:
mode:
authorSimon Howard2006-01-01 23:53:15 +0000
committerSimon Howard2006-01-01 23:53:15 +0000
commit34c3dd253fa3d56b16c11a5263ffb3378529fc33 (patch)
tree4b89818d378e447bae0677de62586d467ec62c24 /src/doomdef.h
parent0caa1149ff6a96e930f4ebce0db45457e0661b2e (diff)
downloadchocolate-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/doomdef.h')
-rw-r--r--src/doomdef.h10
1 files changed, 5 insertions, 5 deletions
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.