shithub: choc

Info  •  Files  •  Log  •  Branches

Move gameaction from d_event.h into doom/ code.

Subversion-branch: /branches/raven-branch
Subversion-revision: 1238

--- a/src/d_event.h

+++ b/src/d_event.h

@@ -55,22 +55,6 @@

 } 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.

 //

@@ -106,12 +90,6 @@

-

-//

-// GLOBAL VARIABLES

-//

-

-extern  gameaction_t    gameaction;

 // Called by IO functions when input is detected.

 void D_PostEvent (event_t *ev);

--- 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_DoAdvanceDemo (void);

 void D_StartTitle (void);

+//

+// GLOBAL VARIABLES

+//

+extern  gameaction_t    gameaction;

+

+

 #endif

+

--- a/src/doom/doomdef.h

+++ b/src/doom/doomdef.h

@@ -60,6 +60,20 @@

     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.

 //