wwww ok wwwww zscroll and scroll compile disabled due to me being too tired to whack...

diff --git a/makefile b/makefile
index 478641222e156f807288f5eb315aa8bb58dd30b3..dd3d7cf96ab25a3deb507f12e1926dc44da0535c 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -157,12 +157,12 @@ DOSLIBLIBS += $(DOSLIB_8250)/dos86h/8250.lib
 TESTEXEC = &
        tesuto.exe &
        0.exe &
-       scroll.exe &
-       zcroll.exe &
        exmmtest.exe &
+       vgmtest.exe &
        vrstest.exe
 TESTEXEC2 = &
-       vgmtest.exe &
+       scroll.exe &
+       zcroll.exe &
        inputest.exe &
        maptest.exe &
        fmemtest.exe &

diff --git a/scroll.exe b/scroll.exe
new file mode 100755 (executable)
index 0000000..98bf3dc
Binary files /dev/null and b/scroll.exe differ

diff --git a/src/0.c b/src/0.c
index 09e8953df6d271e368b80d0486d15f9d755393e3..4da93c71a6f7d354912ee2680c903c3a4ebb7469 100755 (executable)
--- a/src/0.c
+++ b/src/0.c
@@ -25,7 +25,7 @@ int main(int argc,char **argv) {
 \r
        IN_Startup();\r
        IN_Default(0,&player,ctrl_Joystick);\r
-       IN_initplayer(&player, 0);\r
+       IN_initplayer(&player);//, 0);\r
 \r
        if (argc < 3) {\r
                fprintf(stderr,"drawvrl <VRL file> <palette file>\n");\r
@@ -134,7 +134,7 @@ int main(int argc,char **argv) {
 \r
                while(!IN_KeyDown(sc_Escape))\r
                {\r
-                       IN_ReadControl(0,&player);\r
+                       IN_ReadControl(/*0,*/&player);\r
                        if(IN_KeyDown(2)) modexShowPage(&(gvar.video.page[0]));\r
                        if(IN_KeyDown(3)) modexShowPage(&(gvar.video.page[1]));\r
                        if(IN_KeyDown(68))      //f10\r

diff --git a/src/16.c b/src/16.c
index 6ad5334f03d1566a7554375400166e9ee337a7e0..b7850faa6b70d4cee4b6de59cc3a1499b997e5e8 100755 (executable)
--- a/src/16.c
+++ b/src/16.c
@@ -78,7 +78,7 @@ main(int argc, char *argv[])
        start_timer(&gvar);\r
        while(ENGI_EXIT != engi_stat)\r
        {\r
-               IN_ReadControl(0,&player);\r
+               IN_ReadControl(/*0,*/&player);\r
                if(IN_KeyDown(sc_Escape)) engi_stat = ENGI_EXIT;\r
                shinku(&gvar);\r
                _DEBUGF("Serial debug output printf test %u %u %u\n",1U,2U,3U);\r

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index ef0f1fa65660ae238dd057c88b82054a60736e53..0d3b29c79087d7d43aca9339004ca9b1df8b5976 100755 (executable)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -686,7 +686,7 @@ IN_Startup()
 void\r
 IN_Default(boolean gotit,player_t *player,ControlType nt)\r
 {\r
-       int i;\r
+       //int i;\r
        if\r
        (\r
                (!gotit)\r

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index de0bf36df2147e23044d185f71ee594538b6c086..3c1046331ce38665be4f350d90901970a6a17bc1 100755 (executable)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -33,6 +33,7 @@
 #ifdef __WATCOMC__     //borland C BCEXMM.EXE\r
 #include "src/lib/16_dbg.h"\r
 #include "src/lib/16_sprit.h"\r
+#include "src/lib/16_enti.h"\r
 //#include "src/lib/bitmap.h"  //old format\r
 #endif\r
 #ifdef __DEBUG__\r
@@ -43,8 +44,8 @@ extern boolean dbg_testkeyin,dbg_testcontrolnoisy;
 //if else for gfxtesting and direction\r
 //player[pn].d == 2 ||\r
 //player[pn].d != 2 ||\r
-#define DIRECTIONIFELSE        (player[pn].info.dir == 2)\r
-//#define NDIRECTIONIFELSE     (player[pn].info.dir != 2)\r
+#define DIRECTIONIFELSE        (player->info.dir == 2)//(player[pn].info.dir == 2)\r
+//#define NDIRECTIONIFELSE     (player->info.dir != 2)//(player[pn].info.dir != 2)\r
 \r
 #define        KeyInt  9       // The keyboard ISR number\r
 \r

diff --git a/src/scroll.c b/src/scroll.c
index b512f832bf78e8274e83bcb292aa1c8308f90839..dd2db336a03f7457967c519b40f49f179dc0a540 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -178,7 +178,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
@@ -221,7 +221,7 @@ 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
        }else{\r

diff --git a/src/vgmtest.c b/src/vgmtest.c
index c3a3c176c7b1065d751bbc267ca695c3f643c323..2760ac0da95d46d8219b6404ab206cf534321767 100755 (executable)
--- a/src/vgmtest.c
+++ b/src/vgmtest.c
@@ -48,7 +48,7 @@ UINT8 OPL2_ReadStatus(void)
 void\r
 main(int argc, char *argv[])\r
 {\r
-       global_game_variables_t gvar;\r
+       //++++global_game_variables_t gvar;\r
        VGM_FILE pee[9];\r
        player_t player[MaxPlayers];\r
        char *bakapee;\r
@@ -64,7 +64,7 @@ main(int argc, char *argv[])
        while(!IN_KeyDown(sc_Escape))\r
        //while(!kbhit())\r
        {\r
-               IN_ReadControl(0,&player);\r
+               IN_ReadControl(/*0,*/&player);\r
                UpdateSoundEngine();\r
        }\r
        StopMusic();\r

diff --git a/vgmtest.exe b/vgmtest.exe
deleted file mode 100755 (executable)
index 68c88c9..0000000
Binary files a/vgmtest.exe and /dev/null differ