]> 4ch.mooo.com Git - 16.git/commitdiff
makefile polished!! it seems everything works reletively ok and i added f6 and f7...
authorsparky4 <sparky4@cock.li>
Fri, 6 Jan 2017 20:23:01 +0000 (14:23 -0600)
committersparky4 <sparky4@cock.li>
Fri, 6 Jan 2017 20:23:01 +0000 (14:23 -0600)
src/0.c
src/lib/16_tail.h

diff --git a/src/0.c b/src/0.c
index f34cda637d9edcf8746550f09633e300fe36f524..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
index 5206da5a816702c90d69eef420d2f3ce3b36b7a2..3183cb527686dd82172fdf21bd87c73dbe6e4280 100755 (executable)
@@ -33,6 +33,9 @@
 #define FUNCTIONKEYFUNCTIONS \\r
        if(IN_KeyDown(sc_F6)){ modexShowPage(&gvar.video.page[0]); IN_UserInput(1,1); } \\r
        if(IN_KeyDown(sc_F7)){ modexShowPage_(&gvar.video.page[0]); IN_UserInput(1,1); }\r
+#define FUNCTIONKEYFUNCTIONS0EXE \\r
+       if(IN_KeyDown(sc_F6)){ modexShowPage(&gvar.video.page[pagenum]); IN_UserInput(1,1); } \\r
+       if(IN_KeyDown(sc_F7)){ modexShowPage_(&gvar.video.page[pagenum]); IN_UserInput(1,1); }\r
 \r
 void DebugMemory_(global_game_variables_t *gvar, boolean q);\r
 void Shutdown16(global_game_variables_t *gvar);\r