X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_in.h;h=beb6a3d33613de4a2f0ca633a2a9d0850ad798a5;hb=07ada6cbfb76cc2c43feb0225d0b1f82408ca8bf;hp=e39c400e29554414cb80e87465160af6670c6a1e;hpb=76278b1d3be2ebf4a635cdec253dfe48450075df;p=16.git

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index e39c400e..beb6a3d3 100755
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -29,9 +29,10 @@
 
 #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"
+#include "src/lib/16_dbg.h"
 
 #ifdef	__DEBUG__
 //#define	__DEBUG_InputMgr__
@@ -42,11 +43,13 @@
 //#define TESTCONTROLNOISY
 #endif
 
-extern byte testkeyin,testcontrolnoisy,gfxtest;
+extern boolean testkeyin,testcontrolnoisy,testctrltype;
 
 //if else for gfxtesting and direction
-#define DIRECTIONIFELSEGFXTEST (player[pn].d == 2 && gfxtest) || (player[pn].info.dir == 2 && !gfxtest)
-#define NDIRECTIONIFELSEGFXTEST (player[pn].d != 2 && gfxtest) || (player[pn].info.dir != 2 && !gfxtest)
+//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
 
@@ -167,8 +170,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,
@@ -209,10 +210,6 @@ typedef	struct		{
 									joyMultXL,joyMultYL,
 									joyMultXH,joyMultYH;
 					} JoystickDef;
-typedef	struct
-{
-	boolean w;
-} JoypadDef;
 
 typedef	struct
 {
@@ -227,7 +224,9 @@ typedef	struct
 	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!
+	word spt;		//speed per tile
 //0000	planar_buf_t huge *data; //supposively the sprite sheet data
 //	planar_buf_t data; //supposively the sprite sheet data
 ////0000----
@@ -249,7 +248,6 @@ typedef	struct
 {
 	boolean			MousePresent;
 	boolean			JoysPresent[MaxJoys];
-	boolean			JoyPadPresent[MaxPads];
 	boolean		Keyboard[NumCodes];
 	boolean		Paused;
 	char		LastASCII;
@@ -257,7 +255,6 @@ typedef	struct
 
 	KeyboardDef	KbdDefs[MaxKbds];
 	JoystickDef	JoyDefs[MaxJoys];
-	JoypadDef	JoypadDefs[MaxPads];
 } inpu;*/
 
 #ifdef DEMO0
@@ -308,5 +305,6 @@ extern boolean IN_UserInput(dword delay,boolean clear);
 extern boolean IN_KeyDown(byte code);
 extern void IN_ClearKey(byte code);
 extern boolean IN_qb(byte kee);
+void IN_initplayer(player_t *player, word pn);
 
 #endif