X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_in.h;h=0990a55089d68ccdcf3b3cd786c7d0ab991e324c;hb=4710ca84cd057d4e144400ec68aff6e25a5041d6;hp=ad6d073432dbbe2e6d8bc8292e9b806d0d1e95f1;hpb=0f1f17dc05c1f9530651580fc5c23b121b8969ab;p=16.git

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index ad6d0734..0990a550 100755
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -29,20 +29,27 @@
 
 #include <string.h>
 #include "src/lib/16_head.h"
-#include "src/lib/timer.h"
+#include "src/lib/16_timer.h"
 #include "src/lib/bitmap.h"
+#include "src/lib/planar.h"
 
 #ifdef	__DEBUG__
 //#define	__DEBUG_InputMgr__
 #endif
 
-extern boolean testkeyin,testcontrolnoisy;
-
 #ifdef	__DEBUG_InputMgr__
 //#define TESTKEYIN
 //#define TESTCONTROLNOISY
 #endif
 
+extern boolean testkeyin,testcontrolnoisy,testctrltype;
+
+//if else for gfxtesting and direction
+//player[pn].d == 2 ||
+//player[pn].d != 2 ||
+#define DIRECTIONIFELSE	(player[pn].info.dir == 2)
+//#define NDIRECTIONIFELSE	(player[pn].info.dir != 2)
+
 #define	KeyInt	9	// The keyboard ISR number
 
 // Stuff for the joystick
@@ -162,8 +169,6 @@ typedef	enum		{
 						ctrl_Joystick,
 							ctrl_Joystick1 = ctrl_Joystick,ctrl_Joystick2,
 						ctrl_Mouse,
-						ctrl_Joypad,
-							ctrl_Joypad1 = ctrl_Joypad,ctrl_Joypad2
 					} ControlType;
 typedef	enum		{
 						motion_Left = -1,motion_Up = -1,
@@ -204,10 +209,6 @@ typedef	struct		{
 									joyMultXL,joyMultYL,
 									joyMultXH,joyMultYH;
 					} JoystickDef;
-typedef	struct
-{
-	boolean w;
-} JoypadDef;
 
 typedef	struct
 {
@@ -219,10 +220,15 @@ typedef	struct
 	int triggery; //player's trigger box tile position on the viewable map
 	int sheetsetx; //NOT USED YET! player sprite sheet set on the image x
 	int sheetsety; //NOT USED YET! player sprite sheet set on the image y
-	word d;	//direction!! wwww
-	word q; //loop variable
+	byte d;		//direction to render sprite!! wwww
+	byte q;		//loop variable for anumation and locking the playing to compleate the animation cycle to prevent issues with misalignment www
+	byte near pdir;	//previous direction~
+	//byte near kd[2];	//array of arrow key pressed
 	word speed;		//player speed!
-	bitmap_t data; //supposively the sprite sheet data
+//0000	planar_buf_t huge *data; //supposively the sprite sheet data
+//	planar_buf_t data; //supposively the sprite sheet data
+////0000----
+	bitmap_t huge *data; //supposively the sprite sheet data
 	sword hp; //hitpoints of the player
 	int persist_aniframe;    /* gonna be increased to 1 before being used, so 0 is ok for default */
 	CursorInfo	info;
@@ -240,7 +246,6 @@ typedef	struct
 {
 	boolean			MousePresent;
 	boolean			JoysPresent[MaxJoys];
-	boolean			JoyPadPresent[MaxPads];
 	boolean		Keyboard[NumCodes];
 	boolean		Paused;
 	char		LastASCII;
@@ -248,7 +253,6 @@ typedef	struct
 
 	KeyboardDef	KbdDefs[MaxKbds];
 	JoystickDef	JoyDefs[MaxJoys];
-	JoypadDef	JoypadDefs[MaxPads];
 } inpu;*/
 
 #ifdef DEMO0
@@ -281,8 +285,8 @@ extern void IN_SetKeyHook(void (*hook)());
 extern void IN_ClearKeysDown();
 //static void INL_AdjustCursor(CursorInfo *info,word buttons,int dx,int dy);
 extern void IN_ReadCursor(CursorInfo *info);
-extern void near IN_ReadControl(int playnum,player_t *player);
-extern void IN_SetControlType(word playnum,player_t *player,ControlType type);
+extern void near IN_ReadControl(int pn,player_t *player);
+extern void IN_SetControlType(word pn,player_t *player,ControlType type);
 #if DEMO0
 extern boolean IN_StartDemoRecord(word bufsize);
 extern void IN_StartDemoPlayback(byte /*__segment*/ *buffer,word bufsize);