vgaGetMode/vgaSetMode just call DOSLIB int10 mode functions.

[16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index ecfa672543d9814e9073ccbe0330a7b0a5283baf..d5222a50062e052506a742a3f1f3035753243d96 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123
  *
  * This file is part of Project 16.
  *
@@ -21,7 +21,7 @@
  */
 
 #include "src/lib/scroll16.h"
-#include "src/lib/timer.h"
+#include "src/lib/16_timer.h"
 #include "src/lib/wcpu/wcpu.h"
 
 //#define FADE
@@ -37,7 +37,7 @@ map_view_t mv[3];
 map_view_t *bg, *spri, *mask;//, *tmp;
 bitmap_t p;
 word pn=0;
-static planar_buf_t pp;
+static planar_buf_t huge *pp;
 float t;
 sword bakapee;
 
@@ -64,22 +64,23 @@ void main(int argc, char *argv[])
        if(argv[1]) bakapee = atoi(argv[1]);
        else bakapee = 1;
 
+       testcontrolnoisy=0;
+
        player[0].persist_aniframe=0;
        player[0].speed=4;
        //player[0].data = &pp;
 
-       printf("starting timer\n");
+       printf("starting timer  ");
        start_timer(&gvar);
        printf("ok\n");
-       //extern struct inconfig inpu;
 
 //     atexit(qclean());
 
        /* create the map */
-       fprintf(stderr, "testing map load~\n");
+       fprintf(stderr, "testing map load~      ");
        loadmap("data/test.map", &map);
        chkmap(&map, 0);
-       printf("chkmap ok\n");
+       printf("chkmap ok       ");
        fprintf(stderr, "yay map loaded~~\n");
        mv[0].map = ↦
        mv[1].map = ↦
@@ -96,8 +97,8 @@ void main(int argc, char *argv[])
 
        /* create the planar buffer */
 ////++++       (player[0].data) = *planar_buf_from_bitmap(&p);
-       printf("load pee!!\n");
-       pp = planar_buf_from_bitmap0(&p);
+       printf("load pee!!      ");
+       pp = planar_buf_from_bitmap(&p);
        printf("done!\n");
 
 #endif
@@ -116,7 +117,7 @@ void main(int argc, char *argv[])
 #endif
 
        textInit();
-       VGAmodeX(bakapee, &gvar);
+       VGAmodeX(bakapee, 1, &gvar);
 //     printf("%dx%d\n", gvar.video.page[0].sw, gvar.video.page[0].sh);
 #ifdef FADE
        modexPalBlack();        //reset the palette~
@@ -125,7 +126,8 @@ void main(int argc, char *argv[])
 //     printf("Total used @ before palette initiation:         %zu\n", oldfreemem-GetFreeSize());
 //++++ player[0].data.offset=(paloffset/3);
 //++++ modexPalUpdate1(&player[0].data, &paloffset, 0, 0);
-               modexPalUpdate1(p.palette);
+               //modexPalUpdate1(p.palette);
+               modexPalUpdate1(map.tiles->btdata->palette);
        //printf("      %d\n", sizeof(ptmp->data));
        //printf("1:    %d\n", paloffset);
 //++++ map.tiles->data->offset=(paloffset/3);
@@ -365,7 +367,7 @@ void main(int argc, char *argv[])
        //TSR
        if(IN_KeyDown(87))      //f11
        {
-               VGAmodeX(0, &gvar);
+               VGAmodeX(0, 0, &gvar);
                IN_Shutdown();
                __asm
                {
@@ -408,7 +410,7 @@ void main(int argc, char *argv[])
        modexSavePalFile("data/g.pal", gpal);
        modexFadeOff(4, gpal);
 #endif
-       VGAmodeX(0, &gvar);
+       VGAmodeX(0, 1, &gvar);
 #endif
        IN_Shutdown();
        printf("Project 16 scroll.exe. This is just a test file!\n");
@@ -421,6 +423,7 @@ void main(int argc, char *argv[])
        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", player[0].info.dir);   printf("        player[0].d: %d\n", player[0].d);
+               printf("pdir=%d\n", player[0].pdir);
        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("Total used: %zu\n", oldfreemem-GetFreeSize());