diff options
| author | Simon Howard | 2008-09-17 19:48:06 +0000 |
|---|---|---|
| committer | Simon Howard | 2008-09-17 19:48:06 +0000 |
| commit | 3f667115be72b279ebe3c60ae8cb897d6a94c253 (patch) | |
| tree | ca98525e809bb8cec3d3dfe7f756f92c7695d3bb /src/doom | |
| parent | c56d9a25df21bfa0d07f6f7b56edbe0ab6f0e136 (diff) | |
| download | chocolate-doom-3f667115be72b279ebe3c60ae8cb897d6a94c253.tar.gz chocolate-doom-3f667115be72b279ebe3c60ae8cb897d6a94c253.tar.bz2 chocolate-doom-3f667115be72b279ebe3c60ae8cb897d6a94c253.zip | |
Move gameaction from d_event.h into doom/ code.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1238
Diffstat (limited to 'src/doom')
| -rw-r--r-- | src/doom/d_main.h | 9 | ||||
| -rw-r--r-- | src/doom/doomdef.h | 14 |
2 files changed, 22 insertions, 1 deletions
diff --git a/src/doom/d_main.h b/src/doom/d_main.h index da59d59d..a1770536 100644 --- a/src/doom/d_main.h +++ b/src/doom/d_main.h @@ -28,7 +28,7 @@ #ifndef __D_MAIN__ #define __D_MAIN__ -#include "d_event.h" +#include "doomdef.h" @@ -47,5 +47,12 @@ void D_AdvanceDemo (void); void D_DoAdvanceDemo (void); void D_StartTitle (void); +// +// GLOBAL VARIABLES +// + +extern gameaction_t gameaction; + #endif + diff --git a/src/doom/doomdef.h b/src/doom/doomdef.h index 7df8acd5..e911f886 100644 --- a/src/doom/doomdef.h +++ b/src/doom/doomdef.h @@ -60,6 +60,20 @@ typedef enum GS_DEMOSCREEN, } gamestate_t; +typedef enum +{ + ga_nothing, + ga_loadlevel, + ga_newgame, + ga_loadgame, + ga_savegame, + ga_playdemo, + ga_completed, + ga_victory, + ga_worlddone, + ga_screenshot +} gameaction_t; + // // Difficulty/skill settings/filters. // |