OSDN Git Service

something is bothering me very much on the animation part of frame. particularly...
[proj16/16.git] / src / zcroll.c
index 29f329c..a02ae0d 100755 (executable)
 \r
 #include "src/lib/scroll16.h"\r
 #include "src/lib/16_timer.h"\r
-#include "src/lib/wcpu/wcpu.h"\r
 #include "src/lib/16render.h"\r
 #include "src/lib/16_dbg.h"\r
 \r
-#define MODEXZ\r
-\r
 //bitmap_t p;\r
 static map_t map;\r
 map_view_t mv[4];\r
 float t;\r
 sword bakapee;\r
-pan_t pan;\r
 //debugswitches\r
 boolean panswitch=0,baka=0;\r
 //extern boolean pageflipflop=1;\r
 unsigned int i;\r
-const char *cpus;\r
-//static int persist_aniframe = 0;    /* gonna be increased to 1 before being used, so 0 is ok for default */\r
 \r
-//map_view_db_t pgid[4];\r
-word pg;\r
 #ifdef FADE\r
 static word paloffset=0;\r
 byte *dpal;\r
@@ -58,32 +50,28 @@ void main(int argc, char *argv[])
        if(argv[1]) bakapee = atoi(argv[1]);\r
        else bakapee = 1;\r
 \r
-       player[0].data = _fmalloc(72*128); //TODO use exmm\r
-       *player[0].data = bitmapLoadPcx("data/chikyuu.pcx", &gvar); // load sprite\r
-\r
        Startup16(&gvar);\r
 \r
-       pan.pn=0;\r
+       gvar.video.panp=0;\r
 \r
        // OK, this one takes hellova time and needs to be done in farmalloc or MM_...\r
        //IN CA i think you use CAL_SetupGrFile but i do think we should work together on this part --sparky4\r
-       player[0].ent = malloc(sizeof(entity_t));\r
-       player[0].ent->spri = malloc(sizeof(struct sprite));\r
-       player[0].ent->spri->spritesheet = malloc(sizeof(struct vrs_container));\r
+       //player[0].ent = malloc(sizeof(entity_t));\r
+       player[0].enti.spri = malloc(sizeof(struct sprite));\r
+       player[0].enti.spri->spritesheet = malloc(sizeof(struct vrs_container));\r
 \r
        // create the map\r
-       fprintf(stderr, "testing map load~      ");\r
+//     fprintf(stderr, "testing map load~      ");\r
        loadmap("data/test.map", &map);\r
        chkmap(&map, 0);\r
-       printf("chkmap ok       ");\r
-       fprintf(stderr, "yay map loaded~~\n");\r
+//     printf("chkmap ok       ");\r
+//     fprintf(stderr, "yay map loaded~~\n");\r
 \r
        // data\r
-       read_vrs(&gvar, "data/spri/chikyuu.vrs", player[0].ent->spri->spritesheet);\r
-//     player[0].data = malloc(72*128); //TODO use exmm\r
-//     *player[0].data = bitmapLoadPcx("data/chikyuu.pcx", &gvar); // load sprite\r
+       read_vrs(&gvar, "data/spri/chikyuu.vrs", player[0].enti.spri->spritesheet);\r
+       PCXBMP = bitmapLoadPcx("data/chikyuu.pcx", &gvar); // load sprite\r
 \r
-       //      input!\r
+       // input!\r
        IN_Default(0, &player,ctrl_Keyboard1);\r
 \r
        // save the palette\r
@@ -92,14 +80,16 @@ void main(int argc, char *argv[])
        modexPalSave(dpal);\r
        modexFadeOff(4, dpal);\r
 #endif\r
-       textInit();\r
+\r
        VGAmodeX(bakapee, 1, &gvar);\r
-#ifdef MODEXZ\r
+\r
+       /* fix up the palette and everything */\r
 #ifdef FADE\r
        modexPalBlack();        //reset the palette~\r
 #endif\r
-       CA_LoadFile("data/spri/chikyuu.pal", &pal, &gvar);\r
-       modexPalUpdate1(pal);\r
+       modexPalUpdate1(&PCXBMP->palette);\r
+//     CA_LoadFile("data/spri/chikyuu.pal", &pal, &gvar);\r
+//     modexPalUpdate1(pal);\r
 #ifdef FADE\r
        gpal = modexNewPal();\r
        modexPalSave(gpal);\r
@@ -109,29 +99,24 @@ void main(int argc, char *argv[])
 \r
        // setup camera and screen~\r
        modexHiganbanaPageSetup(&gvar.video);\r
-       for(i=0;i<gvar.video.num_of_pages;i++)\r
-       {\r
-               mv[i].page = &gvar.video.page[i];\r
-               mv[i].map = &map;\r
-               mv[i].video = &gvar.video;\r
-               mv[i].pan       = &pan;\r
-       }\r
-       player[0].ent->spri->x = player[0].ent->spri->y = 20;\r
+       ZC_MVSetup(&mv, &map, &gvar);\r
+\r
+       //renderswitch\r
+       gvar.video.rss=0;\r
 \r
        // set up paging\r
        //TODO: LOAD map data and position the map in the middle of the screen if smaller then screen\r
-       mapGoTo(mv, 0, 0);\r
-#endif\r
+       mapGoTo(&mv, 0, 0);\r
 \r
-       //TODO: put player in starting position of spot\r
-       //default player position on the viewable map\r
-       player[0].tx = mv[0].tx + mv[0].page->tilemidposscreenx;\r
-       player[0].ty = mv[0].ty + mv[0].page->tilemidposscreeny;\r
-       IN_initplayer(&player, 0);\r
+       playerXYpos(0, 0, &player, &mv, 0);\r
+       EN_initplayer(&player, 0);\r
+       player[0].enti.spri->x = player[0].enti.x-4;\r
+       player[0].enti.spri->y = player[0].enti.y-16;\r
 \r
-       i = set_anim_by_id(player[0].ent->spri, 11);\r
-       print_anim_ids(player[0].ent->spri);\r
-       if (i == -1)\r
+       player[0].enti.dire=31;\r
+       gvar.video.sprifilei = set_anim_by_id(player[0].enti.spri, player[0].enti.dire);\r
+       //print_anim_ids(player[0].enti.spri);\r
+       if (gvar.video.sprifilei == -1)\r
        {\r
 #ifdef FADE\r
                modexFadeOff(4, gpal);\r
@@ -140,20 +125,17 @@ void main(int argc, char *argv[])
 #ifdef FADE\r
                modexFadeOn(4, dpal);\r
 #endif\r
-       exit(-4);\r
        }\r
-       //++++animate_spri(&(player[0].ent->spri));\r
+       animate_spri(&(player[0].enti), &gvar.video);\r
 \r
-       modexShowPage(mv[0].page);//!(gvar.video.p)\r
-       shinku_fps_indicator_page = 0; // we're on page 1 now, shinku(). follow along please or it will not be visible.\r
+       VL_ShowPage(mv[0].page, 0, 0);//modexShowPage(mv[0].page);//!(gvar.video.p)\r
 #ifdef FADE\r
        modexFadeOn(4, gpal);\r
 #endif\r
-       modexDrawSprite(mv[0].page, 16, 16, (player[0].data));\r
        /*strcpy(global_temp_status_text, "press enter for the loop of zcroll\nescape to quit");\r
        modexprint(&gvar.video.page[0], 144, 72, 1, 7, 0, global_temp_status_text);\r
        while(!IN_KeyDown(sc_Enter)){ if(IN_KeyDown(sc_Escape)) goto quit; } IN_UserInput(1,1);*///wwww\r
-       while(!IN_KeyDown(sc_Escape))// && player[0].hp>0)\r
+       while(!IN_KeyDown(sc_Escape))// && player[0].enti.hp>0)\r
        {\r
                shinku(&gvar);\r
                //top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square\r
@@ -163,8 +145,8 @@ void main(int argc, char *argv[])
                //player movement\r
                IN_ReadControl(0, &player);\r
                if(!panswitch){\r
-                       //ZC_walk(player[0].ent, mv);\r
-                       walk(mv, &player, 0);\r
+                       //ZC_walk2(player[0].ent, mv);\r
+                       ZC_walk(&mv, &player, 0);\r
                }\r
 \r
                //the scripting stuff....\r
@@ -177,22 +159,18 @@ void main(int argc, char *argv[])
                        }\r
                        nosound();\r
                }\r
-               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--; }\r
+               if(player[0].enti.q == (TILEWH/(player[0].speed))+1 && player[0].info.dir != 2 && (player[0].triggerx == 5 && player[0].triggery == 5)){ player[0].enti.hp--; }\r
 */             //debugging binds!\r
-               if(IN_KeyDown(2)){ modexShowPage(mv[0].page); pan.pn=0; }\r
+               if(IN_KeyDown(2)){ modexShowPage(mv[0].page); gvar.video.panp=0; }\r
                if(IN_KeyDown(25)){ modexpdump(mv[0].page);\r
                         IN_UserInput(1,1);\r
                }       //p\r
-#ifdef FADE\r
-               if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); IN_UserInput(1,1); } //p\r
-               if(IN_KeyDown(22)){\r
-                       printf("2paloffset      =       %d\n", paloffset/3);\r
-                       IN_UserInput(1,1);\r
-               }\r
-#endif\r
+\r
+               if(IN_KeyDown(24)){ modexPalUpdate0(gpal); /*paloffset=0;*/ modexpdump(mv[0].page); IN_UserInput(1,1); } //o\r
+               if(IN_KeyDown(22)){ modexPalUpdate0(gpal); } //u\r
 \r
                //pan switch\r
-               if(IN_KeyDown(88)){panswitch=!panswitch; IN_UserInput(1,1);}    //f12\r
+               //if(IN_KeyDown(88)){panswitch=!panswitch; IN_UserInput(1,1);}  //f12\r
                if(IN_KeyDown(87))      //f11\r
                {\r
                        pageflipflop=!pageflipflop;\r
@@ -210,23 +188,29 @@ void main(int argc, char *argv[])
                if(IN_KeyDown(66))      //f8\r
                {\r
 //                     modexDrawSprite(mv[0].page, 16, 16, &p);\r
-                       modexDrawSprite(mv[0].page, 32+72, 16, (player[0].data));\r
+//                     modexDrawSprite(mv[0].page, 32+72, 16, (player[0].data));\r
+                       switch(i)\r
+                       {\r
+                               case 11:\r
+                                       i=0;\r
+                                       player[0].enti.spri->x = TILEWH;\r
+                               default:\r
+                                       i++;\r
+                                       animate_spri(&(player[0].enti), &gvar.video);// player[0].enti.spri->x += 16;\r
+                               break;\r
+                       }\r
                }\r
-               //TODO fmemtest into page\r
-               /*if(IN_KeyDown(4+1))   //4\r
-               {\r
-                       pg=1;\r
-                       SELECT_ALL_PLANES();\r
-                       _fmemset(((mv[pg].page->data+4)+(16*(mv[pg].page->width/4))), 15, 4);\r
-               }*/\r
+               FUNCTIONKEYFUNCTIONS;\r
+               if(IN_KeyDown(sc_L)){ modexClearRegion(&gvar.video.page[0], player[0].enti.x, player[0].enti.y, 16, 16, 1); }\r
 \r
                //9\r
 #ifdef FADE\r
                if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate1(dpal); IN_UserInput(1,1); }\r
-               //if(IN_KeyDown(11)){ modexPalOverscan(15); }\r
 #endif\r
-               if((player[0].q==1) && !(player[0].x%TILEWH==0 && player[0].y%TILEWH==0)) break;        //incase things go out of sync!\r
-               player[0].hp = 0;\r
+               if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r\r
+\r
+               if((player[0].enti.q==1) && !(player[0].enti.x%TILEWH==0 && player[0].enti.y%TILEWH==0)) break; //incase things go out of sync!\r
+               player[0].enti.hp = 0;\r
        }\r
 \r
        /* fade back to text mode */\r
@@ -241,14 +225,7 @@ void main(int argc, char *argv[])
        printf("\nProject 16 zcroll.exe. This is just a test file!\n");\r
        printf("version %s\n", VERSION);\r
        SCROLLEXITMESG;\r
-       switch(detectcpu())\r
-       {\r
-               case 0: cpus = "8086/8088 or 186/88"; break;\r
-               case 1: cpus = "286"; break;\r
-               case 2: cpus = "386 or newer"; break;\r
-               default: cpus = "internal error"; break;\r
-       }\r
-       printf("detected CPU type: %s\n", cpus);\r
+       WCPU_cpufpumesg();\r
 #ifdef FADE\r
        modexFadeOn(4, dpal);\r
 #endif\r