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 78ebd8053db4bec143f7dc2995773c0712fd92db..16b9b0aeab16accbd8f778ae988c97c34dec478e 100755 (executable)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -30,9 +30,11 @@
 #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 __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
 #ifdef __DEBUG__\r
 //#define      __DEBUG_InputMgr__\r
 #endif\r
@@ -42,7 +44,7 @@
 //#define TESTCONTROLNOISY\r
 #endif\r
 \r
-extern boolean testkeyin,testcontrolnoisy,testctrltype;\r
+extern boolean testkeyin,testcontrolnoisy;\r
 \r
 //if else for gfxtesting and direction\r
 //player[pn].d == 2 ||\r
@@ -225,10 +227,12 @@ 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
+       struct sprite *spri;    //supposively the sprite sheet data\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