reverted input and stuff back... walk() is broken badly

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

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index 4b0030cd0c81d746dbc50896ce451390cc2d19ef..9e4bfc2e88ae047cf49024a4e5919e5818cc117a 100755 (executable)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -40,8 +40,8 @@
 //if else for gfxtesting and direction\r
 //player[pn].d == 2 ||\r
 //player[pn].d != 2 ||\r
-#define DIRECTIONIFELSE        (player->info.dir == 2)//(player[pn].info.dir == 2)\r
-//#define NDIRECTIONIFELSE     (player->info.dir != 2)//(player[pn].info.dir != 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
@@ -50,7 +50,7 @@
 #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
@@ -232,7 +232,7 @@ typedef     struct
        int persist_aniframe;    /* gonna be increased to 1 before being used, so 0 is ok for default */\r
        CursorInfo      info;\r
        ControlType     Controls;\r
-       int dx, dy, delta;\r
+       int dx, dy, delta;      //TODO: what is this? ^^\r
 } player_t;\r
 \r
 /*\r
@@ -285,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
@@ -303,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