summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2008-09-17 19:48:06 +0000
committerSimon Howard2008-09-17 19:48:06 +0000
commit3f667115be72b279ebe3c60ae8cb897d6a94c253 (patch)
treeca98525e809bb8cec3d3dfe7f756f92c7695d3bb
parentc56d9a25df21bfa0d07f6f7b56edbe0ab6f0e136 (diff)
downloadchocolate-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
-rw-r--r--src/d_event.h22
-rw-r--r--src/doom/d_main.h9
-rw-r--r--src/doom/doomdef.h14
3 files changed, 22 insertions, 23 deletions
diff --git a/src/d_event.h b/src/d_event.h
index e544e79a..da3ee926 100644
--- a/src/d_event.h
+++ b/src/d_event.h
@@ -55,22 +55,6 @@ typedef struct
} event_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;
-
-
-
//
// Button/action code definitions.
//
@@ -107,12 +91,6 @@ typedef enum
-//
-// GLOBAL VARIABLES
-//
-
-extern gameaction_t gameaction;
-
// Called by IO functions when input is detected.
void D_PostEvent (event_t *ev);
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.
//