gvar.video.page[1].pattern_ofs removed because it is just (0x10000UL - (uint16_t...

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

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index 9b2705859385605f403125987974f19bf8c860ae..5d9da94ac5a1eb007178435c5ec005e0f564bc88 100755 (executable)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -32,7 +32,9 @@
 #include "src/lib/16_timer.h"\r
 #include "src/lib/bitmap.h"\r
 #include "src/lib/planar.h"\r
-\r
+#ifdef __WATCOMC__\r
+#include "src/lib/16_dbg.h"\r
+#endif\r
 #ifdef __DEBUG__\r
 //#define      __DEBUG_InputMgr__\r
 #endif\r
@@ -42,7 +44,7 @@
 //#define TESTCONTROLNOISY\r
 #endif\r
 \r
-extern byte testkeyin,testcontrolnoisy,testctrltype;\r
+extern boolean testkeyin,testcontrolnoisy,testctrltype;\r
 \r
 //if else for gfxtesting and direction\r
 //player[pn].d == 2 ||\r
@@ -169,8 +171,6 @@ typedef     enum            {
                                                ctrl_Joystick,\r
                                                        ctrl_Joystick1 = ctrl_Joystick,ctrl_Joystick2,\r
                                                ctrl_Mouse,\r
-//                                             ctrl_Joypad,\r
-//                                                     ctrl_Joypad1 = ctrl_Joypad,ctrl_Joypad2\r
                                        } ControlType;\r
 typedef        enum            {\r
                                                motion_Left = -1,motion_Up = -1,\r
@@ -211,10 +211,6 @@ typedef    struct          {
                                                                        joyMultXL,joyMultYL,\r
                                                                        joyMultXH,joyMultYH;\r
                                        } JoystickDef;\r
-// typedef     struct\r
-// {\r
-//     boolean w;\r
-// } JoypadDef;\r
 \r
 typedef        struct\r
 {\r
@@ -231,10 +227,11 @@ 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
+       bitmap_t *data; //supposively the sprite sheet data\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
@@ -252,7 +249,6 @@ typedef     struct
 {\r
        boolean                 MousePresent;\r
        boolean                 JoysPresent[MaxJoys];\r
-       boolean                 JoyPadPresent[MaxPads];\r
        boolean         Keyboard[NumCodes];\r
        boolean         Paused;\r
        char            LastASCII;\r
@@ -260,7 +256,6 @@ typedef     struct
 \r
        KeyboardDef     KbdDefs[MaxKbds];\r
        JoystickDef     JoyDefs[MaxJoys];\r
-       JoypadDef       JoypadDefs[MaxPads];\r
 } inpu;*/\r
 \r
 #ifdef DEMO0\r
@@ -311,5 +306,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