in case where DEBUGSERIAL is not defined, make sure stubs compile

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

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index d910f3ecfcbb8fea5ed5500d373f7a3d338f8805..beb6a3d33613de4a2f0ca633a2a9d0850ad798a5 100755 (executable)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -29,9 +29,10 @@
 \r
 #include <string.h>\r
 #include "src/lib/16_head.h"\r
-#include "src/lib/timer.h"\r
+#include "src/lib/16_timer.h"\r
 #include "src/lib/bitmap.h"\r
 #include "src/lib/planar.h"\r
+#include "src/lib/16_dbg.h"\r
 \r
 #ifdef __DEBUG__\r
 //#define      __DEBUG_InputMgr__\r
@@ -42,7 +43,13 @@
 //#define TESTCONTROLNOISY\r
 #endif\r
 \r
-static word testkeyin,testcontrolnoisy;\r
+extern boolean testkeyin,testcontrolnoisy,testctrltype;\r
+\r
+//if else for gfxtesting and direction\r
+//player[pn].d == 2 ||\r
+//player[pn].d != 2 ||\r
+#define DIRECTIONIFELSE        (player[pn].info.dir == 2)\r
+//#define NDIRECTIONIFELSE     (player[pn].info.dir != 2)\r
 \r
 #define        KeyInt  9       // The keyboard ISR number\r
 \r
@@ -163,8 +170,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
@@ -205,10 +210,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
@@ -220,11 +221,16 @@ typedef   struct
        int triggery; //player's trigger box tile position on the viewable map\r
        int sheetsetx; //NOT USED YET! player sprite sheet set on the image x\r
        int sheetsety; //NOT USED YET! player sprite sheet set on the image y\r
-       word d; //direction!! wwww\r
-       word q; //loop variable\r
+       byte d;         //direction to render sprite!! wwww\r
+       byte q;         //loop variable for anumation and locking the playing to compleate the animation cycle to prevent issues with misalignment www\r
+       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
-//     bitmap_t data; //supposively the sprite sheet data\r
+////0000----\r
+       bitmap_t huge *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
@@ -242,7 +248,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
@@ -250,7 +255,6 @@ typedef     struct
 \r
        KeyboardDef     KbdDefs[MaxKbds];\r
        JoystickDef     JoyDefs[MaxJoys];\r
-       JoypadDef       JoypadDefs[MaxPads];\r
 } inpu;*/\r
 \r
 #ifdef DEMO0\r
@@ -283,8 +287,8 @@ extern void IN_SetKeyHook(void (*hook)());
 extern void IN_ClearKeysDown();\r
 //static void INL_AdjustCursor(CursorInfo *info,word buttons,int dx,int dy);\r
 extern void IN_ReadCursor(CursorInfo *info);\r
-extern void near IN_ReadControl(int playnum,player_t *player);\r
-extern void IN_SetControlType(word playnum,player_t *player,ControlType type);\r
+extern void near IN_ReadControl(int pn,player_t *player);\r
+extern void IN_SetControlType(word pn,player_t *player,ControlType type);\r
 #if DEMO0\r
 extern boolean IN_StartDemoRecord(word bufsize);\r
 extern void IN_StartDemoPlayback(byte /*__segment*/ *buffer,word bufsize);\r
@@ -301,5 +305,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