repo sync

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/lib/scroll16.c b/src/lib/scroll16.c
index 1780d960d4b6c338383c30f9f69dbdf063e88990..af1a9bffc8b0d071221c002d195164fd723e882c 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -594,22 +594,15 @@ void shinku(global_game_variables_t *gv)
        //modexCopyPageRegion(pip[1].page, pip[2].page, 16, 16, 16, 16, (14*8)+4, 8+4);
        if(elapsed_timer(gv) >= (1.0 / gv->kurokku.frames_per_second))
        {
-               word x = (16) + gv->video.page[shinku_fps_indicator_page].dx; // follow the screen
-               word y = (16) + gv->video.page[shinku_fps_indicator_page].dy; // follow the screen
+               word x = (0) + gv->video.page[shinku_fps_indicator_page].dx; // follow the screen
+               word y = (0) + gv->video.page[shinku_fps_indicator_page].dy; // follow the screen
                word col = 7;
                word bgcol = 0;
                word type = 0;
-
-               //t=(((*(gv->clock))-gv->clock_start) /18.2);
                sprintf(gv->pee, "%f fps", (double)gv->kurokku.tiku/ticktock(gv));
-//             printf("%s\n", gv->pee);
-               //FIXME PLEASE!!
                modexprint(&(gv->video.page[shinku_fps_indicator_page]), x, y, type, col, bgcol, gv->pee);
-//++++ modexprint(&(gv->video.page[0]), x, y, type, col, bgcol, gv->pee);
-               //(gv->clock_start)=*(gv->clock);
                gv->kurokku.tiku=0;
        }
-       //modexprint(page, 16, 16, 1, 15, 0, pee);
        gv->kurokku.tiku++;
        switch(gv->kurokku.fpscap)
        {

diff --git a/src/scroll.c b/src/scroll.c
index d13d7d01b30b272ff2e210b3d9d4e74679ed4271..491610d3bdd6b330a8e323640bf621e801d590ed 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -379,7 +379,7 @@ void main(int argc, char *argv[])
                                gvar.kurokku.fpscap=0;
                        break;
                }
-               IN_Ack();
+               //IN_Ack();
        }
        //TODO fmemtest into page
        if(IN_KeyDown(4+1))     //4

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