no idea why bcexmm.exe is broke w

[16.git] / src / scroll.c

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