X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=70c3f40bb74df268ee00029db19f7ccdb6ec2509;hb=fff0f71242f32851524284239d75b294f1fadf07;hp=147619366cff2dadb5c05435d315039d461ad4fd;hpb=bff534c9d7fdb9abe8f9bc198ea96ceaaa467ac4;p=16.git

diff --git a/src/scroll.c b/src/scroll.c
index 14761936..70c3f40b 100755
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -20,7 +20,7 @@
  *
  */
 
-#include "src/lib/scroll16.h"
+#include "src/lib/16_scr.h"
 #include "src/lib/16_timer.h"
 #include "src/lib/wcpu/wcpu.h"
 #include "src/lib/mapread.h"
@@ -93,7 +93,6 @@ void main(int argc, char *argv[])
 
 #endif
 	/*	input!	*/
-	if(!dbg_noplayerinpu)
 	IN_Default(0,&player,ctrl_Keyboard1);
 
 	/* save the palette */
@@ -186,7 +185,6 @@ void main(int argc, char *argv[])
 	modexFadeOn(4, gpal);
 #endif
 #endif
-	if(!dbg_noplayerinpu)
 	while(!IN_KeyDown(sc_Escape) && player[0].hp>0)
 	{
 		shinku(&gvar);
@@ -281,11 +279,6 @@ void main(int argc, char *argv[])
 	//if(IN_KeyDown(11)){ modexPalOverscan(15); }
 	if((player[0].q==1) && !(player[0].x%TILEWH==0 && player[0].y%TILEWH==0)) break;	//incase things go out of sync!
 	}
-	else
-		while(!kbhit())
-		{
-			shinku(&gvar);
-		}
 
 	/* fade back to text mode */
 	/* but 1st lets save the game palette~ */