From c61e70057e25c7f0ad5dab92ce6897492ccd75cc Mon Sep 17 00:00:00 2001 From: sparky4 Date: Fri, 6 Jan 2017 14:23:01 -0600 Subject: [PATCH] makefile polished!! it seems everything works reletively ok and i added f6 and f7 to show the vrs stride issue i am having! THEY NOW CORRespond with page num in 0.exe --- src/0.c | 10 ++++++---- src/lib/16_tail.h | 3 +++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/0.c b/src/0.c index f34cda63..c57cf799 100755 --- a/src/0.c +++ b/src/0.c @@ -19,12 +19,13 @@ int main(int argc,char **argv) { unsigned int bufsz; int fd; char *bakapee1,*bakapee2; + word pagenum=0; bakapee1=malloc(64); bakapee2=malloc(1024); IN_Startup(); - IN_Default(0,&player,ctrl_Joystick); + IN_Default(0,&player,ctrl_Keyboard1); IN_initplayer(&player, 0); if (argc < 3) { @@ -84,7 +85,7 @@ int main(int argc,char **argv) { /* setup camera and screen~ */ modexHiganbanaPageSetup(&gvar.video); - modexShowPage(&(gvar.video.page[0])); + modexShowPage(&(gvar.video.page[pagenum])); #define VMEMHEIGHT gvar.video.page[0].height+gvar.video.page[1].height @@ -130,13 +131,14 @@ int main(int argc,char **argv) { while(!IN_KeyDown(sc_Escape)) { IN_ReadControl(0,&player); - if(IN_KeyDown(2)) modexShowPage(&(gvar.video.page[0])); - if(IN_KeyDown(3)) modexShowPage(&(gvar.video.page[1])); + if(IN_KeyDown(2)){ pagenum=0; modexShowPage(&(gvar.video.page[0])); } + if(IN_KeyDown(3)){ pagenum=1; modexShowPage(&(gvar.video.page[1])); } if(IN_KeyDown(68)) //f10 { //gvar.kurokku.fpscap=!gvar.kurokku.fpscap; IN_UserInput(1,1); } + FUNCTIONKEYFUNCTIONS0EXE; /* render box bounds. y does not need modification, but x and width must be multiple of 4 */ if (x >= overdraw) rx = (x - overdraw) & (~3); diff --git a/src/lib/16_tail.h b/src/lib/16_tail.h index 5206da5a..3183cb52 100755 --- a/src/lib/16_tail.h +++ b/src/lib/16_tail.h @@ -33,6 +33,9 @@ #define FUNCTIONKEYFUNCTIONS \ if(IN_KeyDown(sc_F6)){ modexShowPage(&gvar.video.page[0]); IN_UserInput(1,1); } \ if(IN_KeyDown(sc_F7)){ modexShowPage_(&gvar.video.page[0]); IN_UserInput(1,1); } +#define FUNCTIONKEYFUNCTIONS0EXE \ + if(IN_KeyDown(sc_F6)){ modexShowPage(&gvar.video.page[pagenum]); IN_UserInput(1,1); } \ + if(IN_KeyDown(sc_F7)){ modexShowPage_(&gvar.video.page[pagenum]); IN_UserInput(1,1); } void DebugMemory_(global_game_variables_t *gvar, boolean q); void Shutdown16(global_game_variables_t *gvar); -- 2.39.5