]> 4ch.mooo.com Git - 16.git/blobdiff - src/scroll.c
I really do not know what is causing it to be so messy... wwww
[16.git] / src / scroll.c
old mode 100644 (file)
new mode 100755 (executable)
index 726753e..8ea0507
@@ -21,7 +21,7 @@
  */
 
 #include "src/lib/scroll16.h"
-#include "src/lib/mapread.h"
+//#include "src/lib/mapread.h"
 #include "src/lib/wcpu/wcpu.h"
 
 //#define FADE
@@ -31,7 +31,6 @@
 
 void main()
 {
-       dword tiku = 0;
 //     word panswitch=0, panq=1, pand=0;
        global_game_variables_t gvar;
        word panpagenum=0; //for panning!
@@ -55,28 +54,28 @@ void main()
 
        player[0].persist_aniframe=0;
        player[0].speed=4;
-
-       start_timer(&gvar);
-       gvar.frames_per_second = 60;
+       //0000printf("starting timer\n");
+//++++
+       //++++????start_timer(&gvar);
+//++++ gvar.frames_per_second = 60;
+//0000 printf("ok\n");
        //extern struct inconfig inpu;
 
 //     atexit(qclean());
 
        /* create the map */
-       //printf("Total used @ before map load:                 %zu\n", oldfreemem-GetFreeSize());
-       printf("Total free @ before map load:                   %zu\n", GetFreeSize());
-       printf("Total near free @ before map load:                      %zu\n", GetNearFreeSize());
-       printf("Total far free @ before map load:                       %zu\n", GetFarFreeSize());
+       //0000printf("Total used @ before map load:                     %zu\n", oldfreemem-GetFreeSize());
+//0000 printf("Total free @ before map load:                   %zu\n", GetFreeSize());
+//0000 printf("Total near free @ before map load:                      %zu\n", GetNearFreeSize());
+//0000 printf("Total far free @ before map load:                       %zu\n", GetFarFreeSize());
 //     getch();
 //0000 fprintf(stderr, "testing~\n");
-//     loadmap("data/test.map", &map);
+//++++ loadmap("data/test.map", &map);
        map.width=0;
        map.height=0;
        chkmap(&map, 1);
+//0000 printf("chkmap ok\n");
 //0000 fprintf(stderr, "yay map loaded~~\n");
-//---- map = allocMap(map.width,map.height); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly
-       //if(isEMS()) printf("%d tesuto\n", coretotalEMS());
-//---- initMap(&map);
        mv[0].map = ↦
        mv[1].map = ↦
        mv[2].map = ↦
@@ -92,9 +91,11 @@ void main()
        /* create the planar buffer */
 //0000 printf("Total used @ before planar buffer creation:     %zu\n", oldfreemem-GetFreeSize());
        p = planar_buf_from_bitmap(&player[0].data);
+//0000 printf("planar buffer ok\n");
 //0000 printf("Total used @ after planar buffer creation:      %zu\n", oldfreemem-GetFreeSize());
 
        /*      input!  */
+//0000 getch();
        IN_Startup();
        IN_Default(0,&player,ctrl_Joystick);
 
@@ -106,7 +107,7 @@ void main()
 #endif
 
        textInit();
-       VGAmodeX(1);
+       VGAmodeX(1, &gvar);
 #ifdef FADE
        modexPalBlack();        //reset the palette~
 #endif
@@ -156,11 +157,14 @@ void main()
        player[0].y = player[0].ty*TILEWH;
        player[0].triggerx = player[0].tx;
        player[0].triggery = player[0].ty+1;
+/*     player[0].info.x = player[0].tx;
+       player[0].info.xaxis = player[0].tx*TILEWH;
+       player[0].info.y = player[0].ty;
+       player[0].info.yaxis = player[0].ty*TILEWH;*/
        player[0].q=1;
-       player[0].info.dir=2;
+       player[0].d=2;
        player[0].hp=4;
-       player[0].speed=4;
-       player[0].persist_aniframe=0;
+//     player[0].persist_aniframe=0;
        //npc
        /*npc0.tx = bg->tx + 1;
        npc0.ty = bg->ty + 1;
@@ -185,8 +189,8 @@ void main()
 #endif
        while(!IN_KeyDown(sc_Escape) && player[0].hp>0)
        {
-               sprintf(mesg, "%lu", tiku);
-               modexprint(mv[1].page, 16, 16, 1, 15, 0, mesg);
+               sprintf(mesg, "%lu", gvar.tiku);
+//++++         modexprint(mv[1].page, 16, 16, 1, 15, 0, mesg);
                shinku(mv[1].page, &gvar);
                IN_ReadControl(0,&player);
        //top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square
@@ -342,7 +346,7 @@ void main()
        //TSR
        if(IN_KeyDown(87))      //f11
        {
-               VGAmodeX(0);
+               VGAmodeX(0, &gvar);
                IN_Shutdown();
                __asm
                {
@@ -353,7 +357,7 @@ void main()
 
        if((player[0].q==1) && !(player[0].x%TILEWH==0 && player[0].y%TILEWH==0)) break;        //incase things go out of sync!
 
-       tiku++;
+       gvar.tiku++;
        }
 
        /* fade back to text mode */
@@ -363,9 +367,10 @@ void main()
        modexSavePalFile("data/g.pal", gpal);
        modexFadeOff(4, gpal);
 #endif
-       VGAmodeX(0);
+       VGAmodeX(0, &gvar);
        IN_Shutdown();
-       printf("Project 16 scroll.exe\n");
+       printf("Project 16 scroll.exe. This is just a test file!\n");
+       printf("version %s\n", VERSION);
        printf("tx: %d\n", bg->tx);
        printf("ty: %d\n", bg->ty);
        printf("player[0].x: %d", player[0].x); printf("                player[0].y: %d\n", player[0].y);
@@ -373,23 +378,21 @@ void main()
        //else printf("\nplayer[0].y: %d\n", player[0].y);
        printf("player[0].tx: %d", player[0].tx); printf("              player[0].ty: %d\n", player[0].ty);
        printf("player[0].triggx: %d", player[0].triggerx); printf("    player[0].triggy: %d\n", player[0].triggery);
-       printf("player[0].hp: %d", (player[0].hp));     printf("        player[0].q: %d", player[0].q); printf("        player[0].info.dir: %d\n", player[0].info.dir);
+       printf("player[0].hp: %d", (player[0].hp));     printf("        player[0].q: %d", player[0].q); printf("        player[0].info.dir: %d", player[0].info.dir);   printf("        player[0].d: %d\n", player[0].d);
        printf("tile data value at player trigger position: %d\n", bg->map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))]);
-       printf("palette offset: %d\n", paloffset/3);
+//     printf("palette offset: %d\n", paloffset/3);
 //++++ printf("Total used: %zu\n", oldfreemem-GetFreeSize());
 //++++ printf("Total free: %zu\n", GetFreeSize());
-       printf("temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867\n");
-       printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n");
-       printf("Screen: %dx", screen.width);    printf("%d\n", screen.height);
-       printf("Screen2: %dx", screen2.width);  printf("%d\n", screen2.height);
-       printf("map: %dx%d\n", map.width, map.height);
+//not used now printf("temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867\n");
+//not used now printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n");
+//     printf("Screen: %dx", screen.width);    printf("%d\n", screen.height);
+//     printf("Screen2: %dx", screen2.width);  printf("%d\n", screen2.height);
+//     printf("map: %dx%d\n", map.width, map.height);
+//     printf("\n");
+//     printf("player[0].info.x: %d", player[0].info.xaxis); printf("          player[0].info.y: %d\n", player[0].info.yaxis);
+//     printf("player[0].info.tx: %d", player[0].info.x); printf("             player[0].info.ty: %d\n", player[0].info.y);
        //printf("map.width=%d  map.height=%d   map.data[0]=%d\n", bg->map->width, bg->map->height, bg->map->data[0]);
-       //xmsfree(&map);
-       //xmsfree(bg);
-       //xmsfree(spri);
-       //xmsfree(mask);
-       //xmsreport();
-       //emmclose(emmhandle);
+
        switch(detectcpu())
        {
                case 0: cpus = "8086/8088 or 186/88"; break;