makefile polished!! it seems everything works reletively ok and i added f6 and f7...

[16.git] / src / 0.c

diff --git a/src/0.c b/src/0.c
index c0f215374d7aad49b59ca6b664db3df9b0e18c50..c57cf7992b98e7e01ae2d0249b24abc943d68ecc 100755 (executable)
--- a/src/0.c
+++ b/src/0.c
@@ -19,12 +19,13 @@ int main(int argc,char **argv) {
        unsigned int bufsz;\r
        int fd;\r
        char *bakapee1,*bakapee2;\r
+       word pagenum=0;\r
 \r
        bakapee1=malloc(64);\r
        bakapee2=malloc(1024);\r
 \r
        IN_Startup();\r
-       IN_Default(0,&player,ctrl_Joystick);\r
+       IN_Default(0,&player,ctrl_Keyboard1);\r
        IN_initplayer(&player, 0);\r
 \r
        if (argc < 3) {\r
@@ -84,7 +85,7 @@ int main(int argc,char **argv) {
 \r
        /* setup camera and screen~ */\r
        modexHiganbanaPageSetup(&gvar.video);\r
-       modexShowPage(&(gvar.video.page[0]));\r
+       modexShowPage(&(gvar.video.page[pagenum]));\r
 \r
        #define VMEMHEIGHT gvar.video.page[0].height+gvar.video.page[1].height\r
 \r
@@ -130,13 +131,14 @@ int main(int argc,char **argv) {
                while(!IN_KeyDown(sc_Escape))\r
                {\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(2)){ pagenum=0; modexShowPage(&(gvar.video.page[0])); }\r
+                       if(IN_KeyDown(3)){ pagenum=1; modexShowPage(&(gvar.video.page[1])); }\r
                        if(IN_KeyDown(68))      //f10\r
                        {\r
                                //gvar.kurokku.fpscap=!gvar.kurokku.fpscap;\r
                                IN_UserInput(1,1);\r
                        }\r
+                       FUNCTIONKEYFUNCTIONS0EXE;\r
 \r
                        /* render box bounds. y does not need modification, but x and width must be multiple of 4 */\r
                        if (x >= overdraw) rx = (x - overdraw) & (~3);\r
@@ -146,7 +148,7 @@ int main(int argc,char **argv) {
                        h = vrl_header->height + overdraw + y - ry;\r
                        w = (x + vrl_header->width + (overdraw*2) + 3/*round up*/ - rx) & (~3);\r
                        if ((rx+w) > gvar.video.page[0].width) w = gvar.video.page[0].width-rx;\r
-                       if ((ry+h) > gvar.video.page[0].height) h = (gvar.video.page[0].height)-ry;\r
+                       if ((ry+h) > gvar.video.page[0].height) h = gvar.video.page[0].height-ry;\r
 \r
                        /* block copy pattern to where we will draw the sprite */\r
                        vga_setup_wm1_block_copy();\r