added stuff ww

diff --git a/pcx2vrl b/pcx2vrl
index 06179c758ee3353a54ef7bc76b2422c342d53dd7..bd947e55158b82b4f9d900234745aca806cde60e 100755 (executable)
Binary files a/pcx2vrl and b/pcx2vrl differ

diff --git a/pcxsscut b/pcxsscut
index 2ce56d285d26ddb8a30e5f7bf2839df2bde1fa75..1deec74dc0487422bfdb03acb381df671e83a049 100755 (executable)
Binary files a/pcxsscut and b/pcxsscut differ

diff --git a/src/fontgfx.c b/src/fontgfx.c
index 90e6a8692063a4fb843dd93790f401a8e419eb0f..4c4c04431aee7ae9d94d868c41b6165500d8e5db 100755 (executable)
--- a/src/fontgfx.c
+++ b/src/fontgfx.c
@@ -100,7 +100,6 @@ IIIIIII  BBBBBBBBB    MMMM    M    MMMM\n\
        chx=0;\r
        chy=0;\r
        colpee=32;\r
-//     bios_cls();\r
        /* position the cursor to home */\r
 //     vga_moveto(0,0);\r
 //     vga_sync_bios_cursor();\r

diff --git a/src/lib/16_dbg.c b/src/lib/16_dbg.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/lib/16_dbg.h b/src/lib/16_dbg.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/scroll.c b/src/scroll.c
index 8f8c27f514c90a91fbd582785df3eaef5fcbc2e0..6d6f07232f716194f8c21ef577eb307afd0c4bc1 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -221,7 +221,6 @@ void main(int argc, char *argv[])
                //printf("      player[0].q: %d", player[0].q); printf("        player[0].d: %d\n", player[0].d);
        }
 
-
        //the scripting stuff....
        //if(((player[0].triggerx == TRIGGX && player[0].triggery == TRIGGY) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].ty == 5))
        if(((mv[0].map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].ty == 5))
@@ -235,31 +234,33 @@ void main(int argc, char *argv[])
        }
        if(player[0].q == (TILEWH/(player[0].speed))+1 && player[0].info.dir != 2 && (player[0].triggerx == 5 && player[0].triggery == 5)){ player[0].hp--; }
        //debugging binds!
-       if(IN_KeyDown(2)){ modexShowPage(mv[0].page); pan.pn=0; }
-       if(IN_KeyDown(3)){ modexShowPage(mv[1].page); pan.pn=1; }
-       if(IN_KeyDown(4)){ modexShowPage(mv[2].page); pan.pn=2; }
-       if(IN_KeyDown(4+1)){ modexShowPage(mv[3].page); pan.pn=3; }
+       if(IN_KeyDown(2)){ modexShowPage(mv[0].page); pan.pn=0; IN_UserInput(1,1); }
+       if(IN_KeyDown(3)){ modexShowPage(mv[1].page); pan.pn=1; IN_UserInput(1,1); }
+       if(IN_KeyDown(4)){ modexShowPage(mv[2].page); pan.pn=2; IN_UserInput(1,1); }
+       if(IN_KeyDown(4+1)){ modexShowPage(mv[3].page); pan.pn=3; IN_UserInput(1,1); }
        if(IN_KeyDown(25)){ modexpdump(mv[0].page); modexpdump(mv[1].page);
-               //IN_Ack();
+                IN_UserInput(1,1);
        }       //p
 #ifdef MODEX
 #ifdef FADE
-       if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page); }
+       if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page);  IN_UserInput(1,1); }
        if(IN_KeyDown(22)){
        paloffset=0; modexPalBlack(); modexPalUpdate(&player[0].data, &paloffset, 0, 0);
        printf("1paloffset      =       %d\n", paloffset/3);
         modexPalUpdate(map.tiles->data, &paloffset, 0, 0);
        printf("2paloffset      =       %d\n", paloffset/3);
-        modexpdump(mv[0].page); modexpdump(mv[1].page); }
+        modexpdump(mv[0].page); modexpdump(mv[1].page);
+                IN_UserInput(1,1);
+       }
 #endif
 #endif
        //pan switch
-       if(IN_KeyDown(88)){panswitch=!panswitch;}       //f12
+       if(IN_KeyDown(88)){panswitch=!panswitch; IN_UserInput(1,1);}    //f12
        //TSR
        if(IN_KeyDown(87))      //f11
        {
                pageflipflop=!pageflipflop;
-               //IN_Ack();
+               IN_UserInput(1,1);
 //             VGAmodeX(0, 0, &gvar);
 //             IN_Shutdown();
 //             __asm
@@ -271,7 +272,7 @@ void main(int argc, char *argv[])
        if(IN_KeyDown(68))      //s
        {
                gvar.kurokku.fpscap=!gvar.kurokku.fpscap;
-               //IN_Ack();
+                IN_UserInput(1,1);
        }
        //TODO fmemtest into page
        /*if(IN_KeyDown(4+1))   //4
@@ -282,7 +283,7 @@ void main(int argc, char *argv[])
        }*/
 
        //9
-       if(IN_KeyDown(10)){ modexPalOverscan(default_pal, rand()%56); modexPalUpdate1(default_pal); }
+       if(IN_KeyDown(10)){ modexPalOverscan(default_pal, rand()%56); modexPalUpdate1(default_pal); IN_UserInput(1,1); }
        //if(IN_KeyDown(11)){ modexPalOverscan(default_pal, 15); }
        if((player[0].q==1) && !(player[0].x%TILEWH==0 && player[0].y%TILEWH==0)) break;        //incase things go out of sync!
        }

diff --git a/src/test.c b/src/test.c
index bb3792ae16919090c0b3f6f6b1176b6494e7c4d3..6a443a9c4beddab2a297a96dc6b936445402a193 100755 (executable)
--- a/src/test.c
+++ b/src/test.c
@@ -171,12 +171,13 @@ void main(int argc, char *argv[])
 //                             modexClearRegion(&gvar.video.page[1], 48, 48, gvar.video.page[1].sw-64, gvar.video.page[1].sh-64, 128);\r
 //                     }\r
                //}\r
-               if(IN_KeyDown(1+1)) pan.pn=0;\r
-               if(IN_KeyDown(2+1)) pan.pn=1;\r
-               if(IN_KeyDown(3+1)) pan.pn=2;\r
-               if(IN_KeyDown(4+1)) pan.pn=3;\r
+               if(IN_KeyDown(1+1)){ pan.pn=0; }\r
+               if(IN_KeyDown(2+1)){ pan.pn=1; }\r
+               if(IN_KeyDown(3+1)){ pan.pn=2; }\r
+               if(IN_KeyDown(4+1)){ pan.pn=3; }\r
                if(IN_KeyDown(25)){\r
                        modexpdump(&gvar.video.page[pan.pn]);\r
+                       IN_UserInput(1,1);\r
                }//p\r
                modexShowPage(&gvar.video.page[pan.pn]);\r
        }\r

diff --git a/vrl2vrs b/vrl2vrs
index cee2d1d5ec2093825ded51e0e6c9b8b836e38ee9..b67956b7baa37941b88ad79da1a2ff49c0c435a0 100755 (executable)
Binary files a/vrl2vrs and b/vrl2vrs differ

diff --git a/vrsdump b/vrsdump
index a75a903a84ae3d98973e3aecab4a6c08fce8a764..dbaba30e42b8639969d3bdd4433243eb338adcbe 100755 (executable)
Binary files a/vrsdump and b/vrsdump differ