Split event code into a separate d_event.c file.

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

4 files changed, 9 insertions, 55 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 90e5dedb..e4d14ffd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,7 @@ chocolate_server_SOURCES=$(DEDSERV_FILES)
 chocolate_server_LDADD = @LDFLAGS@ @SDL_LIBS@ @SDLNET_LIBS@ 
 
 MAIN_SOURCE_FILES=\
-                     d_event.h             \
+d_event.c            d_event.h             \
 doomkeys.h                                 \
 doomfeatures.h                             \
 doomtype.h                                 \
diff --git a/src/d_event.h b/src/d_event.h
index 4578870f..e544e79a 100644
--- a/src/d_event.h
+++ b/src/d_event.h
@@ -113,5 +113,13 @@ typedef enum
 
 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
+
diff --git a/src/doom/d_main.c b/src/doom/d_main.c
index 2ab329bf..6a6ab57d 100644
--- a/src/doom/d_main.c
+++ b/src/doom/d_main.c
@@ -144,53 +144,6 @@ void D_DoAdvanceDemo (void);
 
 
 //
-// EVENT HANDLING
-//
-// Events are asynchronous inputs generally generated by the game user.
-// Events can be discarded if no responder claims them
-//
-
-#define MAXEVENTS		64
-
-static event_t         events[MAXEVENTS];
-static int             eventhead;
-static int 		eventtail;
-
-
-//
-// D_PostEvent
-// Called by the I/O functions when input is detected
-//
-void D_PostEvent (event_t* ev)
-{
-    events[eventhead] = *ev;
-    eventhead = (eventhead + 1) % MAXEVENTS;
-}
-
-// Read an event from the queue.
-
-event_t *D_PopEvent(void)
-{
-    event_t *result;
-
-    // No more events waiting.
-
-    if (eventtail == eventhead)
-    {
-        return NULL;
-    }
-    
-    result = &events[eventtail];
-
-    // Advance to the next event in the queue.
-
-    eventtail = (eventtail + 1) % MAXEVENTS;
-
-    return result;
-}
-
-
-//
 // D_ProcessEvents
 // Send all the events of the given timestamp down the responder chain
 //
diff --git a/src/doom/d_main.h b/src/doom/d_main.h
index 14536447..79f7c7e3 100644
--- a/src/doom/d_main.h
+++ b/src/doom/d_main.h
@@ -41,13 +41,6 @@
 //
 void D_DoomMain (void);
 
-// 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);
-
 // Read events from all input devices
 
 void D_ProcessEvents (void);