ohh OHHH WWWWWWWWWWW

[16.git] / src / lib / scroll16.c

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index e60a8b97344f55ab64ebd95d3158f4165a1f4c9b..47ee9f7f22674394fc91d8e04800b256fc14797d 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -566,38 +566,25 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)
        word rx, ry;\r
        //word textx=0, texty=0;\r
        //if(i==0) i=2;\r
+//     printf("%02d ", i); if(x >= page->width - t->tileWidth) printf("\n");\r
        switch(i)\r
        {\r
                case 0:\r
-               //wwww\r
-                       modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, 0); //currently the over scan color!\r
+                       //wwww\r
+                       modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, 1); //currently the over scan color!\r
                break;\r
-               case 1:\r
-                       rx = (((i-1) % ((t->tileset.data->width)/t->tileWidth)) * t->tileWidth);\r
-                       ry = (((i-1) / ((t->tileset.data->height)/t->tileHeight)) * t->tileHeight);\r
-//                     rx = (((i-1) % ((t->spri->sprite_vrl_cont->vrl_header->width)/t->tileWidth)) * t->tileWidth);\r
-//                     ry = (((i-1) / ((t->spri->sprite_vrl_cont->vrl_header->height)/t->tileHeight)) * t->tileHeight);\r
-////0000printf("i=%d\n", i);\r
+               default:\r
+                       rx = (((i-1) % ((t->pcximg->width)/t->tileWidth)) * t->tileWidth);\r
+                       ry = (((i-1) / ((t->pcximg->height)/t->tileHeight)) * t->tileHeight);\r
 #ifndef TILERENDER\r
                        if(!pagenorendermap) modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, i+1);\r
 #else\r
-                       //modexDrawBmpRegion            (page, x, y, rx, ry, t->tileWidth, t->tileHeight, i);\r
-                       /* then the sprite. note modding ram ptr means we just draw to (x&3,0) */\r
+                       modexDrawBmpRegion              (page, x, y, rx, ry, t->tileWidth, t->tileHeight, i);\r
                        //draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,vrl_lineoffs,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));\r
                        //modexDrawBmpRegion    (page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data));\r
-                       //drawmap here\r
 #endif\r
 #ifdef __DEBUG_MAP__\r
-               switch(dbg_maptext)\r
-               {\r
-                       case 0:\r
-\r
-                       break;\r
-                       case 1:\r
-                               sprintf(global_temp_status_text2, "%d", i);\r
-                               modexprint(page, x+8, y+8, 1, 1, 2, global_temp_status_text2);\r
-                       break;\r
-               }\r
+                       if(dbg_maptext){ sprintf(global_temp_status_text2, "%u", i); modexprint(page, x, y, 1, 0, 1, 2, global_temp_status_text2); }\r
 #endif\r
                break;\r
        }\r
@@ -609,7 +596,7 @@ void near mapDrawRow(map_view_t *mv, int tx, int ty, word y, player_t *player, w
 if(pagedelayrendermap)         if(!y)  y+=TILEWH;      else    y-=TILEWH;\r
        poopoffset%=player[0].enti.speed;\r
 //printf("y: %d\n", poopoffset);\r
-if(pagedelayrendermap){ sprintf(global_temp_status_text, "%-3u", mv->dx); modexprint(mv[0].page, player[0].enti.x, player[0].enti.y-28-(poopoffset*8) , 1, 2, 1, global_temp_status_text); }\r
+if(pagedelayrendermap){ sprintf(global_temp_status_text, "%-3u", mv->dx); modexprint(mv[0].page, player[0].enti.x, player[0].enti.y-28-(poopoffset*8) , 1, 1, 2, 1, global_temp_status_text); }\r
        /* the position within the map array */\r
        i=ty * mv->map->width + tx;\r
        for(    mv->dx=poopoffset;      mv->dx<(mv->page->sw+mv->dxThresh)/(poopoffset+1) && tx < mv->map->width;       mv->dx+=mv->map->MAPTILESPTR->tileWidth, tx++) {\r
@@ -626,7 +613,7 @@ void near mapDrawCol(map_view_t *mv, int tx, int ty, word x, player_t *player, w
 if(pagedelayrendermap)         if(!x)  x+=TILEWH;              else    x-=TILEWH;\r
        poopoffset%=player[0].enti.speed;\r
 //printf("x: %d\n", poopoffset);\r
-if(pagedelayrendermap){ sprintf(global_temp_status_text, "%-3u", mv->dy); modexprint(mv[0].page, player[0].enti.x, player[0].enti.y-28-(poopoffset*8) , 1, 2, 1, global_temp_status_text); }\r
+if(pagedelayrendermap){ sprintf(global_temp_status_text, "%-3u", mv->dy); modexprint(mv[0].page, player[0].enti.x, player[0].enti.y-28-(poopoffset*8) , 1, 1, 2, 1, global_temp_status_text); }\r
        /* location in the map array */\r
        i=ty * mv->map->width + tx;\r
        /* We'll copy all of the columns in the screen,\r
@@ -687,15 +674,18 @@ void shinku(global_game_variables_t *gv)
         //\r
         //      This fixes *** Null pointer assignment detected error message in ZCROLL.EXE on exit.\r
                sprintf(global_temp_status_text, "%.0f fps", (double)gv->kurokku.tiku/ticktock(gv));\r
-               //modexprint(&(gv->video.page[/*!*/(gv->video.p)]), x, y, type, col, bgcol, global_temp_status_text);\r
-               modexCopyPageRegion(&gv->video.page[0], &gv->video.page[1],\r
-                       gv->video.page[/*!*/(gv->video.p)].dx,\r
-                       gv->video.page[/*!*/(gv->video.p)].dy,\r
-                       gv->video.page[/*!*/(gv->video.p)].dx,\r
-                       gv->video.page[/*!*/(gv->video.p)].dy,\r
-                       96, 16);\r
-               modexprint(&(gv->video.page[/*!*/(gv->video.p)]), x, y, type, col, bgcol, global_temp_status_text);\r
+               //modexprint(&(gv->video.page[/*!*/(gv->video.p)]), x, y, type, 1, col, bgcol, global_temp_status_text);\r
+               if(gv->kurokku.wcpu)\r
+               {\r
+                       modexCopyPageRegion(&gv->video.page[0], &gv->video.page[1],\r
+                               gv->video.page[/*!*/(gv->video.p)].dx,\r
+                               gv->video.page[/*!*/(gv->video.p)].dy,\r
+                               gv->video.page[/*!*/(gv->video.p)].dx,\r
+                               gv->video.page[/*!*/(gv->video.p)].dy,\r
+                               96, 16);\r
+                       modexprint(&(gv->video.page[/*!*/(gv->video.p)]), x, y, type, 1, col, bgcol, global_temp_status_text);\r
 //0000printf("dx=%u    dy=%u\n", gv->video.page[/*!*/(gv->video.p)].dx, gv->video.page[/*!*/(gv->video.p)].dy);\r
+               }\r
                gv->kurokku.tiku=0;\r
        }else //copy dat sheet\r
        gv->kurokku.tiku++;\r
@@ -703,7 +693,7 @@ void shinku(global_game_variables_t *gv)
        switch(gv->kurokku.fpscap)\r
        {\r
                case 0: //turn this off if XT\r
-                       //modexprint(&(gv->video.page[0]), x, y+8, type, col, bgcol, "sanic!");\r
+                       //modexprint(&(gv->video.page[0]), x, y+8, type, 1, col, bgcol, "sanic!");\r
                        gv->kurokku.frames_per_second=1;\r
                break;\r
                case 1:\r