reverted input and stuff back... walk() is broken badly

[16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index c92469cb0f30ea5fc2429acde1fd99b8b207f144..114cad0f1da08c73362e3139c186d1afa584900e 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -29,7 +29,7 @@
 //#define FADE\r
 #define MODEX  //this is for mode x initiating\r
 \r
-boolean dbg_noplayerinpu=1;\r
+//boolean dbg_noplayerinpu=1;\r
 \r
 //word far *clock= (word far*) 0x046C; /* 18.2hz clock */\r
 //bitmap_t *p;\r
@@ -42,7 +42,7 @@ float t;
 sword bakapee;\r
 pan_t pan;\r
 //debugswitches\r
-boolean panswitch=1;\r
+boolean panswitch=0;//1\r
 //extern boolean pageflipflop=1;\r
        unsigned int i;\r
        const char *cpus;\r
@@ -65,34 +65,7 @@ void main(int argc, char *argv[])
        if(argv[1]) bakapee = atoi(argv[1]);\r
        else bakapee = 1;\r
 \r
-       // DOSLIB: check our environment\r
-       probe_dos();\r
-\r
-       // DOSLIB: what CPU are we using?\r
-       // NTS: I can see from the makefile Sparky4 intends this to run on 8088 by the -0 switch in CFLAGS.\r
-       //      So this code by itself shouldn't care too much what CPU it's running on. Except that other\r
-       //      parts of this project (DOSLIB itself) rely on CPU detection to know what is appropriate for\r
-       //      the CPU to carry out tasks. --J.C.\r
-       cpu_probe();\r
-\r
-       // DOSLIB: check for VGA\r
-       if (!probe_vga()) {\r
-               printf("VGA probe failed\n");\r
-               return;\r
-       }\r
-       // hardware must be VGA or higher!\r
-       if (!(vga_state.vga_flags & VGA_IS_VGA)) {\r
-               printf("This program requires VGA or higher graphics hardware\n");\r
-               return;\r
-       }\r
-\r
-       if (_DEBUG_INIT() == 0) {\r
-#ifdef DEBUGSERIAL\r
-               printf("WARNING: Failed to initialize DEBUG output\n");\r
-#endif\r
-       }\r
-       _DEBUG("Serial debug output started\n"); // NTS: All serial output must end messages with newline, or DOSBox-X will not emit text to log\r
-       _DEBUGF("Serial debug output printf test %u %u %u\n",1U,2U,3U);\r
+       Startup16(&gvar);\r
 \r
        pan.pn=1;\r
 \r
@@ -125,7 +98,7 @@ void main(int argc, char *argv[])
        if(!dbg_noplayerinpu)\r
        {\r
        IN_Startup();\r
-       IN_Default(0,&player,ctrl_Joystick);\r
+       IN_Default(0,&player,ctrl_Keyboard1);\r
        //IN_Default(1,&player,ctrl_Joystick);\r
        }\r
 \r
@@ -184,7 +157,7 @@ void main(int argc, char *argv[])
        //default player position on the viewable map\r
        player[0].tx = mv[0].tx + mv[0].page->tilemidposscreenx;\r
        player[0].ty = mv[0].ty + mv[0].page->tilemidposscreeny;\r
-       IN_initplayer(&player);//, 0);\r
+       IN_initplayer(&player, 0);\r
        //IN_initplayer(&player, 1);\r
 \r
 #ifndef        SPRITE\r
@@ -228,9 +201,9 @@ void main(int argc, char *argv[])
        //when player[0].tx or player[0].ty == 0 or player[0].tx == 20 or player[0].ty == 15 then stop because that is edge of map and you do not want to walk of the map\r
 \r
        //player movement\r
-               IN_ReadControl(/*0,*/&player);\r
+               IN_ReadControl(0, &player);\r
        if(!panswitch){\r
-               walk(mv, player, 0);\r
+               walk(mv, &player, 0);\r
        }else{\r
                panpagemanual(mv, player, 0);\r
                //printf("      player[0].q: %d", player[0].q); printf("        player[0].d: %d\n", player[0].d);\r