X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_in.h;h=280625853eded3f601a10c0d38c07fb19bfa66e4;hb=91b509a59014237571bce50abc62bfbbf5315adf;hp=9a9c768502fb4cd65ec5b2d7696c09b78539dd57;hpb=5e15fd0dadb195739e333d5d49acfdef1a42074b;p=16.git

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
old mode 100644
new mode 100755
index 9a9c7685..28062585
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -29,16 +29,20 @@
 
 #include <string.h>
 #include "src/lib/16_head.h"
+#include "src/lib/timer.h"
+#include "src/lib/bitmap.h"
 
 #ifdef	__DEBUG__
-#define	__DEBUG_InputMgr__
+//#define	__DEBUG_InputMgr__
 #endif
 
 #ifdef	__DEBUG_InputMgr__
-#define TESTKEYIN
-#define TESTCONTROLNOISY
+//#define TESTKEYIN
+//#define TESTCONTROLNOISY
 #endif
 
+static boolean testkeyin,testcontrolnoisy;
+
 #define	KeyInt	9	// The keyboard ISR number
 
 // Stuff for the joystick
@@ -174,14 +178,14 @@ typedef	enum		{
 						dir_South,//dir_Soutinest,
 					} Direction;
 typedef	struct		{
-						boolean		button0,button1,button2,button3;
-						int			x,y;
-						Motion		xaxis,yaxis;
-						Direction	dir;
+						boolean	near	button0,button1,button2,button3;
+						int	near		x,y;
+						Motion	near	xaxis,yaxis;
+						Direction near	dir;
 					} CursorInfo;
 
 typedef	struct		{
-						ScanCode	button0,button1,
+						ScanCode near	button0,button1,
 									//upleft,
 									up,
 									down,
@@ -193,7 +197,7 @@ typedef	struct		{
 									;
 					} KeyboardDef;
 typedef	struct		{
-						word		joyMinX,joyMinY,
+						word	near	joyMinX,joyMinY,
 									threshMinX,threshMinY,
 									threshMaxX,threshMaxY,
 									joyMaxX,joyMaxY,
@@ -213,12 +217,14 @@ typedef	struct
 	int ty; //player tile position on the viewable map
 	int triggerx; //player's trigger box tile position on the viewable map
 	int triggery; //player's trigger box tile position on the viewable map
-	int setx; //NOT USED YET! player sprite sheet set on the image x
-	int sety; //NOT USED YET! player sprite sheet set on the image y
+	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
-//	word d; //direction
-	//bitmap_t data; //supposively the sprite sheet data
-	int hp; //hitpoints of the player
+	word speed;		//player speed!
+	bitmap_t 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;
 	ControlType	Controls;
 } player_t;
@@ -251,8 +257,6 @@ typedef	struct
 		static word		DemoOffset,DemoSize;
 #endif
 
-extern dword far* clockdw;
-
 //	Internal routines
 extern void interrupt INL_KeyService();
 extern void Mouse(int x);
@@ -277,7 +281,7 @@ 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 IN_ReadControl(int playnum,player_t *player);
+extern void near IN_ReadControl(int playnum,player_t *player);
 extern void IN_SetControlType(word playnum,player_t *player,ControlType type);
 #if DEMO0
 extern boolean IN_StartDemoRecord(word bufsize);