X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_in.h;h=d2dfb54a2e1b02ee9985a4029179178a58990629;hb=3baebbddf8e57357bc4c5d3e512c91c8e9c84773;hp=0990a55089d68ccdcf3b3cd786c7d0ab991e324c;hpb=07346f616e3fe792fd34aba5e80afaddb8cf47e7;p=16.git

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index 0990a550..d2dfb54a 100755
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -30,9 +30,11 @@
 #include <string.h>
 #include "src/lib/16_head.h"
 #include "src/lib/16_timer.h"
-#include "src/lib/bitmap.h"
-#include "src/lib/planar.h"
-
+#include "src/lib/16_sprit.h"
+#include "src/lib/bitmap.h"	//old format
+#ifdef __WATCOMC__
+#include "src/lib/16_dbg.h"
+#endif
 #ifdef	__DEBUG__
 //#define	__DEBUG_InputMgr__
 #endif
@@ -42,7 +44,7 @@
 //#define TESTCONTROLNOISY
 #endif
 
-extern boolean testkeyin,testcontrolnoisy,testctrltype;
+extern boolean testkeyin,testcontrolnoisy;
 
 //if else for gfxtesting and direction
 //player[pn].d == 2 ||
@@ -225,10 +227,12 @@ typedef	struct
 	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----
-	bitmap_t huge *data; //supposively the sprite sheet data
+	struct sprite *spri;	//supposively the sprite sheet data
+	bitmap_t *data;		//supposively the sprite sheet data//old format
 	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;
@@ -303,5 +307,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