p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I...

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index d6c33f34116a194ff9271da24754a06899d8c7f5..922ad97f25cb7166f9f58fb22789e490f801b7a4 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -307,7 +307,7 @@ void ZC_ShowMV(map_view_t *moo, boolean vsync, boolean sr)
        outp(AC_INDEX, (moo[0].page->dx & 0x03) << 1);\r
        vga_state.vga_draw_stride_limit = vga_state.vga_draw_stride = moo[0].page->stridew;\r
 }\r
-\r
+#if 0\r
 void\r
 initMap(map_t *map) {\r
        // just a place holder to fill out an alternating pattern\r
@@ -326,6 +326,47 @@ initMap(map_t *map) {
                tile = tile ? 0 : 1;\r
        }\r
 }\r
+#endif\r
+void\r
+initMap(map_t *map) {\r
+       /* just a place holder to fill out an alternating pattern */\r
+       int x, y;\r
+       int i;\r
+       int tile = 1;\r
+       dbg_maptext=1;\r
+       map->tiles = malloc(sizeof(tiles_t));\r
+\r
+       /* create the tile set */\r
+       map->tiles->spri = malloc(sizeof(sprite_t));\r
+       map->tiles->spri->sprite_vrl_cont.vrl_header->width = (TILEWH*2);\r
+       map->tiles->spri->sprite_vrl_cont.vrl_header->height= TILEWH;\r
+       map->tiles->spri->sprite_vrl_cont.buffer = malloc((TILEWH*2)*TILEWH);\r
+       map->tiles->tileHeight = TILEWH;\r
+       map->tiles->tileWidth =TILEWH;\r
+       map->tiles->rows = 1;\r
+       map->tiles->cols = 2;\r
+\r
+       i=0;\r
+       for(y=0; y<TILEWH; y++) {\r
+       for(x=0; x<(TILEWH*2); x++) {\r
+               if(x<TILEWH)\r
+                       map->tiles->spri->sprite_vrl_cont.buffer[i] = 2;//0x24;\r
+               else\r
+                       map->tiles->spri->sprite_vrl_cont.buffer[i] = 1;//0x34;\r
+               i++;\r
+       }\r
+       }\r
+\r
+       i=0;\r
+       for(y=0; y<map->height; y++) {\r
+               for(x=0; x<map->width; x++) {\r
+                       map->layerdata[0].data[i] = tile;\r
+                       tile = tile ? 1 : 2;\r
+                       i++;\r
+               }\r
+               tile = tile ? 1 : 2;\r
+       }\r
+}\r
 \r
 //===========================================================================//\r
 \r

diff --git a/src/xcroll.c b/src/xcroll.c
index 0f4bf060c2ce668cad69fb63ebe0f331dce2cbc0..c968bdf6a76270d950863cf5c6748fdcc78df0a7 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -26,6 +26,7 @@
 #include "src/lib/16_dbg.h"\r
 \r
 #define FADE\r
+//#define NOMAPLOAD\r
 \r
 //map_view_t mv[4];\r
 static map_t map;\r
@@ -83,13 +84,16 @@ void main(int argc, char *argv[])
        //----gvar.player[0].enti.spri.spritesheet = malloc(sizeof(struct vrs_container));\r
 \r
        // create the map\r
+#ifndef NOMAPLOAD\r
 //     fprintf(stderr, "testing map load~      ");\r
        CA_loadmap("data/test.map", &map, &gvar);\r
        chkmap(&map, 0);\r
 //     initMap(&map);\r
 //     printf("chkmap ok       ");\r
 //     fprintf(stderr, "yay map loaded~~\n");\r
-\r
+#else\r
+       initMap(&map);\r
+#endif\r
        // data\r
        VRS_LoadVRS(bakapee1, &gvar.player[0].enti, &gvar);\r
 \r