diff options
author | Simon Howard | 2008-10-01 18:00:13 +0000 |
---|---|---|
committer | Simon Howard | 2008-10-01 18:00:13 +0000 |
commit | f8b216522bb4a2f2a8279412ff949955706d727e (patch) | |
tree | 62f1e30c973f6af4da63770f11f7448b4489d244 /src/hexen/d_net.c | |
parent | bf5e84859e2aca7f543f88a4a93bb971332aa989 (diff) | |
download | chocolate-doom-f8b216522bb4a2f2a8279412ff949955706d727e.tar.gz chocolate-doom-f8b216522bb4a2f2a8279412ff949955706d727e.tar.bz2 chocolate-doom-f8b216522bb4a2f2a8279412ff949955706d727e.zip |
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
Diffstat (limited to 'src/hexen/d_net.c')
-rw-r--r-- | src/hexen/d_net.c | 14 |
1 files changed, 11 insertions, 3 deletions
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."); } |