See WHAT_WAS_CHANGED for details

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

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index 186158ea99f4612d9dd960b298dbf696ebcb1626..b2170176335c5498d265f205629be345150b3bf2 100755 (executable)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -30,26 +30,19 @@
 #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
+#ifdef __WATCOMC__     //borland C BCEXMM.EXE\r
 #include "src/lib/16_dbg.h"\r
-\r
-#ifdef __DEBUG__\r
-//#define      __DEBUG_InputMgr__\r
+#include "src/lib/bitmap.h"    //old format\r
+#include "src/lib/16_sprit.h"\r
+#include "src/lib/16_entity.h"\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 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
+#define DIRECTIONIFELSE        (player->info.dir == 2)\r
 \r
 #define        KeyInt  9       // The keyboard ISR number\r
 \r
@@ -58,7 +51,7 @@ extern boolean testkeyin,testcontrolnoisy,testctrltype;
 #define        JoyScaleShift   8\r
 #define        MaxJoyValue             5000\r
 \r
-#define        MaxPlayers      4\r
+#define        MaxPlayers      1\r
 #define        MaxKbds         2\r
 #define        MaxJoys         2\r
 #define        MaxPads         2\r
@@ -230,11 +223,17 @@ typedef   struct
 //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 *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
        ControlType     Controls;\r
+       entity_t *ent;\r
+       int dx, dy, delta;\r
 } player_t;\r
 \r
 /*\r
@@ -287,8 +286,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 pn,player_t *player);\r
-extern void IN_SetControlType(word pn,player_t *player,ControlType type);\r
+extern void near IN_ReadControl(player_t *player);\r
+extern void IN_SetControlType(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
@@ -305,6 +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
+void IN_initplayer(player_t *player);\r
 \r
 #endif\r