X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_in.h;h=b56e9f4640f1c7f54dc73ddc15275f1a7ed528ce;hb=c060c91a1c7e418122606fdc5cd7c9ce5a55495d;hp=e0efe8cfd593e321138cfcce8a85afd1be9a39ea;hpb=c7e6c3d9447e917f4149be3885f0c3bedf9bec67;p=16.git

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index e0efe8cf..b56e9f46 100755
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -32,7 +32,7 @@
 #include "src/lib/16_timer.h"
 #ifdef __WATCOMC__	//borland C BCEXMM.EXE
 #include "src/lib/16_dbg.h"
-#include "src/lib/16_sprit.h"
+#include "src/lib/16_spri.h"
 #include "src/lib/16_enti.h"
 //#include "src/lib/bitmap.h"	//old format
 #endif
@@ -56,7 +56,7 @@
 #define	MaxPads		2
 #define	NumCodes	128
 
-typedef	byte		ScanCode;
+//typedef	byte		ScanCode;
 #define	sc_None			0
 #define	sc_Bad			0xff
 #define	sc_Return		0x1c
@@ -155,7 +155,8 @@ typedef	enum		{
 						demo_Off,demo_Record,demo_Playback,demo_PlayDone
 					} Demo;
 #endif
-typedef	enum		{
+//moved to 16_tdef.h
+/*typedef	enum		{
 						//ctrl_None,				// MDM (GAMERS EDGE) - added
 						ctrl_Keyboard,
 							ctrl_Keyboard1 = ctrl_Keyboard,ctrl_Keyboard2,
@@ -216,24 +217,22 @@ 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----
 #ifdef	__WATCOMC__
 	struct sprite	*spri;	//supposively the sprite sheet data
 	memptr		gr;
 	entity_t		*ent;
 #endif
-	bitmap_t __far *data;		//supposively the sprite sheet data//old format
+	bitmap_t	*data;		//supposively the sprite sheet data//old format
+	bitmap_t	bmp;
 	sword hp; //hitpoints of the player
-	int persist_aniframe;    /* gonna be increased to 1 before being used, so 0 is ok for default */
+	int persist_aniframe;    // gonna be increased to 1 before being used, so 0 is ok for default
 	CursorInfo	info;
 	ControlType	Controls;
+//newer vars
 	int dx, dy, delta;	//TODO: what is this? ^^
-} player_t;
+} player_t;*/
 
 /*
 =============================================================================
@@ -285,7 +284,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 near IN_ReadControl(int pn,player_t *player);
+extern void near IN_ReadControl(word pn, player_t *player);
 extern void IN_SetControlType(word pn,player_t *player,ControlType type);
 #if DEMO0
 extern boolean IN_StartDemoRecord(word bufsize);
@@ -303,6 +302,7 @@ 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);
+extern ScanCode IN_GetLastScan();
+extern ScanCode IN_GetCurCode();
 
 #endif