From f8b216522bb4a2f2a8279412ff949955706d727e Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Wed, 1 Oct 2008 18:00:13 +0000
Subject: Use common versions of ticcmd_t and event_t for Hexen code. Remove
 old i_video definitions and use common i_video.c interface.

Subversion-branch: /branches/raven-branch
Subversion-revision: 1312
---
 src/hexen/d_net.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'src/hexen/d_net.c')

diff --git a/src/hexen/d_net.c b/src/hexen/d_net.c
index 25819f02..086b685f 100644
--- a/src/hexen/d_net.c
+++ b/src/hexen/d_net.c
@@ -23,6 +23,9 @@
 
 
 #include "h2def.h"
+#include "i_video.h"
+#include "i_system.h"
+#include "i_timer.h"
 #include "m_argv.h"
 #include "p_local.h"
 #include <stdlib.h>             // for atoi()
@@ -517,10 +520,15 @@ void CheckAbort(void)
         I_StartTic();
 
     I_StartTic();
-    for (; eventtail != eventhead;
-         eventtail = (eventtail + 1) & (MAXEVENTS - 1))
+    for (;;)
     {
-        ev = &events[eventtail];
+        ev = D_PopEvent();
+
+        if (ev == NULL)
+        {
+            break;
+        }
+
         if (ev->type == ev_keydown && ev->data1 == KEY_ESCAPE)
             I_Error("Network game synchronization aborted.");
     }
-- 
cgit v1.2.3