1 files changed, 29 insertions, 21 deletions
diff --git a/src/d_event.h b/src/d_event.h
index 4578870f..25334a96 100644
--- a/src/d_event.h
+++ b/src/d_event.h
@@ -42,7 +42,8 @@ typedef enum
     ev_keydown,
     ev_keyup,
     ev_mouse,
-    ev_joystick
+    ev_joystick,
+    ev_quit
 } evtype_t;
 
 // Event structure.
@@ -55,22 +56,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.
 //
@@ -104,14 +89,37 @@ typedef enum
   
 } buttoncode_t;
 
+// villsa [STRIFE] Strife specific buttons
+// TODO - not finished
+typedef enum
+{
+    // Player view look up
+    BT2_LOOKUP          = 1,
+    // Player view look down
+    BT2_LOOKDOWN        = 2,
+    // Center player's view
+    BT2_CENTERVIEW      = 4,
+    // Use inventory item
+    BT2_INVUSE          = 8,
+    // Drop inventory item
+    BT2_INVDROP         = 16,
+    // Jump up and down
+    BT2_JUMP            = 32,
+    // Use medkit
+    BT2_HEALTH          = 128,
+  
+} buttoncode2_t;
 
 
 
-//
-// GLOBAL VARIABLES
-//
 
-extern  gameaction_t    gameaction;
+// Called by IO functions when input is detected.
+void D_PostEvent (event_t *ev);
+
+// Read an event from the event queue
+
+event_t *D_PopEvent(void);
 
 
 #endif
+