trying to figure out the issue with player sprite with pcx

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

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index de0bf36df2147e23044d185f71ee594538b6c086..e0efe8cfd593e321138cfcce8a85afd1be9a39ea 100755 (executable)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -33,12 +33,9 @@
 #ifdef __WATCOMC__     //borland C BCEXMM.EXE\r
 #include "src/lib/16_dbg.h"\r
 #include "src/lib/16_sprit.h"\r
+#include "src/lib/16_enti.h"\r
 //#include "src/lib/bitmap.h"  //old format\r
 #endif\r
-#ifdef __DEBUG__\r
-#define        __DEBUG_InputMgr__\r
-extern boolean dbg_testkeyin,dbg_testcontrolnoisy;\r
-#endif\r
 \r
 //if else for gfxtesting and direction\r
 //player[pn].d == 2 ||\r
@@ -53,7 +50,7 @@ extern boolean dbg_testkeyin,dbg_testcontrolnoisy;
 #define        JoyScaleShift   8\r
 #define        MaxJoyValue             5000\r
 \r
-#define        MaxPlayers      1\r
+#define        MaxPlayers              2//futre plans for multiple playable charaters and being able to alternate\r
 #define        MaxKbds         2\r
 #define        MaxJoys         2\r
 #define        MaxPads         2\r
@@ -228,14 +225,14 @@ typedef   struct
 #ifdef __WATCOMC__\r
        struct sprite   *spri;  //supposively the sprite sheet data\r
        memptr          gr;\r
+       entity_t                *ent;\r
 #endif\r
-       bitmap_t *data;         //supposively the sprite sheet data//old format\r
+       bitmap_t __far *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
+       int dx, dy, delta;      //TODO: what is this? ^^\r
 } player_t;\r
 \r
 /*\r
@@ -288,8 +285,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(player_t *player);\r
-extern void IN_SetControlType(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
@@ -306,6 +303,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);\r
+void IN_initplayer(player_t *player, word pn);\r
 \r
 #endif\r