X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_in.c;h=8d17c37ff27d8950ff024fc8f3f306c5fa6f0cc8;hb=29204d5f82b02c730907d7cdf6760f291ae8e93e;hp=ef0f1fa65660ae238dd057c88b82054a60736e53;hpb=989f287818c93cf9b1ff96c13e66720571210513;p=16.git

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index ef0f1fa6..8d17c37f 100755
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -38,10 +38,6 @@
 
 #include "src/lib/16_in.h"
 
-#ifdef __DEBUG_InputMgr__
-boolean dbg_testkeyin=0,dbg_testcontrolnoisy=0;
-#endif
-
 static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */
 
 /*
@@ -510,7 +506,7 @@ INL_StartKbd()
 	IN_ClearKeysDown();
 
 	OldKeyVect = _dos_getvect(KeyInt);
-	//_dos_setvect(KeyInt,INL_KeyService);
+	_dos_setvect(KeyInt,INL_KeyService);
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -705,8 +701,9 @@ IN_Default(boolean gotit,player_t *player,ControlType nt)
 	//in.KbdDefs[0].downleft = 0x4f;
 	inpu.KbdDefs[0].down = 0x50;
 	//in.KbdDefs[0].downright = 0x51;
-	IN_SetControlType(player,nt);
-	player->d=2;
+	IN_SetControlType(0,player,nt);
+	for(i=0; i>MaxPlayers;i++)
+		player[i].enti.d =2;
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -817,7 +814,7 @@ IN_ReadCursor(CursorInfo *info)
 //
 ///////////////////////////////////////////////////////////////////////////
 void near
-IN_ReadControl(player_t *player)
+IN_ReadControl(word pn, player_t *player)
 {
 			boolean		realdelta;
 #if DEMO0
@@ -853,11 +850,11 @@ register	KeyboardDef	*def;
 		realdelta = false;
 	}
 	else if (DemoMode == demo_PlayDone)
-		Quit("Demo playback exceeded");
+		Quit ("Demo playback exceeded");
 	else
 	{
 #endif
-		switch (type = player->Controls)
+		switch (type = player[pn].Controls)
 		{
 		case ctrl_Keyboard1:
 		case ctrl_Keyboard2:
@@ -872,7 +869,7 @@ register	KeyboardDef	*def;
 			else if (Keyboard[def->downright])
 				mx = motion_Right,my = motion_Down;*/
 //TODO: make this into a function that the joystick AND keyboard can use wwww
-			if(DIRECTIONIFELSE)//(player->info.dir == 2)
+			if(DIRECTIONIFELSE)//(player[pn].info.dir == 2)
 			{
 			if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){
 				if((inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]))
@@ -885,7 +882,7 @@ register	KeyboardDef	*def;
 				if((inpu.Keyboard[def->right] && !inpu.Keyboard[def->left]))
 					mx = motion_Right;
 			}else{	//2 keys pressed
-					switch (player->pdir)
+					switch (player[pn].pdir)
 					{
 						case 0:
 						case 4:
@@ -901,7 +898,7 @@ register	KeyboardDef	*def;
 						break;
 					}
 #ifdef __DEBUG_InputMgr__
-					//if(dbg_testcontrolnoisy > 0){ printf("dir=%c ", dirchar(dir)); printf("pdir=%c	", dirchar(player->pdir)); }
+					//if(dbg_testcontrolnoisy > 0){ printf("dir=%c ", dirchar(dir)); printf("pdir=%c	", dirchar(player[pn].pdir)); }
 #endif
 				}
 			}
@@ -939,23 +936,23 @@ register	KeyboardDef	*def;
 		dy = my;// * 127;
 	}
 
-	player->info.x = dx;
-	player->info.xaxis = mx;
-	player->info.y = dy;
-	player->info.yaxis = my;
-	player->info.button0 = buttons & (1 << 0);
-	player->info.button1 = buttons & (1 << 1);
-	player->info.button2 = buttons & (1 << 2);
-	player->info.button3 = buttons & (1 << 3);
-//	player->info.dir = DirTable[((my + 1) * 3) + (mx + 1)];
+	player[pn].info.x = dx;
+	player[pn].info.xaxis = mx;
+	player[pn].info.y = dy;
+	player[pn].info.yaxis = my;
+	player[pn].info.button0 = buttons & (1 << 0);
+	player[pn].info.button1 = buttons & (1 << 1);
+	player[pn].info.button2 = buttons & (1 << 2);
+	player[pn].info.button3 = buttons & (1 << 3);
+//	player[pn].info.dir = DirTable[((my + 1) * 3) + (mx + 1)];
 	conpee=(((my + 1) * 2) + (mx + 1))-1;
-	player->info.dir = DirTable[conpee];
+	player[pn].info.dir = DirTable[conpee];
 
-	if(DirTable[conpee]!=2)	player->pdir=DirTable[conpee];
-	if(player->q==1 &&( dir!=2 || (mx!=motion_None || my!=motion_None)))
+	if(DirTable[conpee]!=2)	player[pn].pdir=DirTable[conpee];
+	if(player[pn].enti.q==1 &&( dir!=2 || (mx!=motion_None || my!=motion_None)))
 	{
-		if(dir==2) player->d = player->info.dir;
-		else player->d = DirTable[dir];
+		if(dir==2) player[pn].enti.d = player[pn].info.dir;
+		else player[pn].enti.d = DirTable[dir];
 	}
 
 #if DEMO0
@@ -976,7 +973,7 @@ register	KeyboardDef	*def;
 				DemoOffset += 2;
 
 			if (DemoOffset >= DemoSize)
-				Quit("Demo buffer overflow");
+				Quit ("Demo buffer overflow");
 
 			DemoBuffer[DemoOffset] = 1;
 			DemoBuffer[DemoOffset + 1] = dbyte;
@@ -985,13 +982,13 @@ register	KeyboardDef	*def;
 #endif
 #ifdef __DEBUG_InputMgr__
 if(dbg_testcontrolnoisy > 0)
-if(player->info.dir!=2/*(inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->left] || inpu.Keyboard[def->right])*/ || player->q>1)
+if(player[pn].info.dir!=2/*(inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->left] || inpu.Keyboard[def->right])*/ || player[pn].enti.q>1)
 {
-	//printf("b1=%u b2=%u b3=%u b4=%u	", player->info.button0, player->info.button1, player->info.button2, player->info.button3);
-	//printf("q=%d ", player->q);
+	//printf("b1=%u b2=%u b3=%u b4=%u	", player[pn].info.button0, player[pn].info.button1, player[pn].info.button2, player[pn].info.button3);
+	//printf("q=%d ", player[pn].enti.q);
 	//printf("cpee=%c ", dirchar(conpee));
-	printf("pdir=%c d=%c dir=%c ", dirchar(player->pdir), dirchar(player->d), dirchar(player->info.dir));
-	/*if(realdelta) */printf("dx=%d	dy=%d	mx=%d	my=%d", player->info.x, player->info.y, player->info.xaxis, player->info.yaxis);
+	printf("pdir=%c d=%c dir=%c ", dirchar(player[pn].pdir), dirchar(player[pn].enti.d), dirchar(player[pn].info.dir));
+	/*if(realdelta) */printf("dx=%d	dy=%d	mx=%d	my=%d", player[pn].info.x, player[pn].info.y, player[pn].info.xaxis, player[pn].info.yaxis);
 	//else if(!realdelta) printf("%c%d %c%d %c%d %c%d", dirchar(0), inpu.Keyboard[def->up], dirchar(4), inpu.Keyboard[def->down], dirchar(1), inpu.Keyboard[def->left], dirchar(3), inpu.Keyboard[def->right]);
 	printf("\n");
 }
@@ -1005,10 +1002,10 @@ if(player->info.dir!=2/*(inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || i
 //
 ///////////////////////////////////////////////////////////////////////////
 void
-IN_SetControlType(player_t *player,ControlType type)
+IN_SetControlType(word pn,player_t *player,ControlType type)
 {
 	// DEBUG - check that requested type is present?
-	player->Controls = type;
+	player[pn].Controls = type;
 }
 
 #if DEMO0
@@ -1250,7 +1247,17 @@ IN_UserInput(dword delay,boolean clear)
 
 boolean IN_KeyDown(byte code)
 {
+#ifdef __DEBUG_InputMgr__
+	if(!dbg_nointest)
+#endif
 	return inpu.Keyboard[code];
+#ifdef __DEBUG_InputMgr__
+	else
+		if(dbg_nointest && kbhit())
+			return 1;
+		else
+			return 0;
+#endif
 }
 
 void IN_ClearKey(byte code)
@@ -1263,23 +1270,8 @@ void IN_ClearKey(byte code)
 boolean IN_qb(byte kee)
 {
 #ifdef __DEBUG_InputMgr__
-//	if(dbg_testkeyin > 0) printf("%u\n", inpu.Keyboard[kee]);
+	if(dbg_testkeyin) printf("%u\n", inpu.Keyboard[kee]);
 #endif
 	if(inpu.Keyboard[kee]==true) return 1;
 	else return 0;
 }
-
-//init player!
-void IN_initplayer(player_t *player)
-{
-	player->x = player->tx*TILEWH;
-	player->y = player->ty*TILEWH;
-	player->triggerx = player->tx;
-	player->triggery = player->ty+1;
-	player->q=1;
-	player->d=2;
-	player->hp=4;
-	player->speed=4;
-	player->persist_aniframe=0;
-	player->spt=(TILEWH/(player->speed));	//speed per tile wwww
-}