From 3f667115be72b279ebe3c60ae8cb897d6a94c253 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Wed, 17 Sep 2008 19:48:06 +0000 Subject: Move gameaction from d_event.h into doom/ code. Subversion-branch: /branches/raven-branch Subversion-revision: 1238 --- src/doom/d_main.h | 9 ++++++++- src/doom/doomdef.h | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) (limited to 'src/doom') 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. // -- cgit v1.2.3