Merge remote-tracking branch 'upstream/master'

[16.git] / src / lib / 16_in.h

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index ec9b56a2f424b25454f12fed1e8c3e5f77720d25..29ecc130e1f91616bf870bd9f88a895c6ea30f90 100755 (executable)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -30,20 +30,16 @@
 #include <string.h>\r
 #include "src/lib/16_head.h"\r
 #include "src/lib/16_timer.h"\r
-#include "src/lib/bitmap.h"\r
-#include "src/lib/planar.h"\r
-\r
-#ifdef __DEBUG__\r
-//#define      __DEBUG_InputMgr__\r
+#ifdef __WATCOMC__     //borland C BCEXMM.EXE\r
+#include "src/lib/16_dbg.h"\r
+#include "src/lib/16_sprit.h"\r
+#include "src/lib/bitmap.h"    //old format\r
 #endif\r
-\r
-#ifdef __DEBUG_InputMgr__\r
-//#define TESTKEYIN\r
-//#define TESTCONTROLNOISY\r
+#ifdef __DEBUG__\r
+#define        __DEBUG_InputMgr__\r
+extern boolean dbg_testkeyin,dbg_testcontrolnoisy;\r
 #endif\r
 \r
-extern byte testkeyin,testcontrolnoisy,testctrltype;\r
-\r
 //if else for gfxtesting and direction\r
 //player[pn].d == 2 ||\r
 //player[pn].d != 2 ||\r
@@ -225,10 +221,15 @@ typedef   struct
        byte near pdir; //previous direction~\r
        //byte near kd[2];      //array of arrow key pressed\r
        word speed;             //player speed!\r
+       word spt;               //speed per tile\r
 //0000 planar_buf_t huge *data; //supposively the sprite sheet data\r
 //     planar_buf_t data; //supposively the sprite sheet data\r
 ////0000----\r
-       bitmap_t huge *data; //supposively the sprite sheet data\r
+#ifdef __WATCOMC__\r
+       struct sprite   *spri;  //supposively the sprite sheet data\r
+       memptr          gr;\r
+#endif\r
+       bitmap_t *data;         //supposively the sprite sheet data//old format\r
        sword hp; //hitpoints of the player\r
        int persist_aniframe;    /* gonna be increased to 1 before being used, so 0 is ok for default */\r
        CursorInfo      info;\r
@@ -303,5 +304,6 @@ extern boolean IN_UserInput(dword delay,boolean clear);
 extern boolean IN_KeyDown(byte code);\r
 extern void IN_ClearKey(byte code);\r
 extern boolean IN_qb(byte kee);\r
+void IN_initplayer(player_t *player, word pn);\r
 \r
 #endif\r