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

1 files changed, 5 insertions, 4 deletions

diff --git a/src/hexen/am_map.c b/src/hexen/am_map.c
index a0a1703e..06fc9490 100644
--- a/src/hexen/am_map.c
+++ b/src/hexen/am_map.c
@@ -23,6 +23,7 @@
 
 
 #include "h2def.h"
+#include "i_video.h"
 #include "i_swap.h"
 #include "p_local.h"
 #include "am_map.h"
@@ -275,7 +276,7 @@ void AM_initVariables(void)
     //static event_t st_notify = { ev_keyup, AM_MSGENTERED };
 
     automapactive = true;
-    fb = screen;
+    fb = I_VideoBuffer;
 
     f_oldloc.x = INT_MAX;
     amclock = 0;
@@ -683,16 +684,16 @@ void AM_clearFB(int color)
     j = mapystart * finit_width;
     for (i = 0; i < SCREENHEIGHT - SBARHEIGHT; i++)
     {
-        memcpy(screen + i * finit_width, maplump + j + mapxstart,
+        memcpy(I_VideoBuffer + i * finit_width, maplump + j + mapxstart,
                finit_width - mapxstart);
-        memcpy(screen + i * finit_width + finit_width - mapxstart,
+        memcpy(I_VideoBuffer + i * finit_width + finit_width - mapxstart,
                maplump + j, mapxstart);
         j += finit_width;
         if (j >= finit_height * finit_width)
             j = 0;
     }
 
-//       memcpy(screen, maplump, finit_width*finit_height);
+//       memcpy(I_VideoBuffer, maplump, finit_width*finit_height);
 //  memset(fb, color, f_w*f_h);
 }