[16_ca needs huge amounts of work and I should remember what needs to be done soon...

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

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 415df9643c591ed73527fde1426d18ac2a92d4b1..9e69713cba5d7a6bc900918609c4e98f11c01e14 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -459,7 +459,7 @@ void ZC_mapScroll(map_view_t *mv, player_t *player, word pn)
 //===========================================================================\r
 //TODO: put player in starting position of assigned spot on map\r
 //default player position on the viewable map\r
-void ZC_playerXYpos(int x, int y, player_t *player, map_view_t *pip, nibble pn, boolean defaultsw)\r
+void ZC_PlayerXYpos(int x, int y, player_t *player, map_view_t *pip, nibble pn, boolean defaultsw)\r
 {\r
        player[pn].enti.tx = x + pip[0].tx;\r
        player[pn].enti.ty = y + pip[0].ty;\r
@@ -576,10 +576,13 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)
                        modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, 1); //currently the over scan color!\r
                break;\r
                default:\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
+                       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
 #ifndef TILERENDER\r
-                       if(!pagenorendermap) modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, i+1);\r
+#ifdef __DEBUG_RF__\r
+                       if(!dbg_pagenorendermap)\r
+#endif\r
+                               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
                        //draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,vrl_lineoffs,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));\r
@@ -595,10 +598,14 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)
 void near mapDrawRow(map_view_t *mv, int tx, int ty, word y, player_t *player, word poopoffset)\r
 {\r
        int i; nibble z;\r
-if(pagedelayrendermap)         if(!y)  y+=TILEWH;      else    y-=TILEWH;\r
+#ifdef __DEBUG_RF__\r
+if(dbg_pagedelayrendermap)             if(!y)  y+=TILEWH;      else    y-=TILEWH;\r
+#endif\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, 0, PALMAPDRAWW, 1, global_temp_status_text); }\r
+#ifdef __DEBUG_RF__\r
+if(dbg_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, 0, PALMAPDRAWW, 1, global_temp_status_text); }\r
+#endif\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->tiles->tileWidth, tx++) {\r
@@ -611,16 +618,23 @@ if(pagedelayrendermap){ sprintf(global_temp_status_text, "%-3u", mv->dx); modexp
                                }\r
                }\r
                i++; /* next! */\r
-       } if(pagedelayrendermap) delay(200);\r
+       }\r
+#ifdef __DEBUG_RF__\r
+if(dbg_pagedelayrendermap) delay(200);\r
+#endif\r
 }\r
 \r
 void near mapDrawCol(map_view_t *mv, int tx, int ty, word x, player_t *player, word poopoffset)\r
 {\r
        int i; nibble z;\r
-if(pagedelayrendermap)         if(!x)  x+=TILEWH;              else    x-=TILEWH;\r
+#ifdef __DEBUG_RF__\r
+if(dbg_pagedelayrendermap)             if(!x)  x+=TILEWH;              else    x-=TILEWH;\r
+#endif\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, 0, PALMAPDRAWW, 1, global_temp_status_text); }\r
+#ifdef __DEBUG_RF__\r
+if(dbg_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, 0, PALMAPDRAWW, 1, global_temp_status_text); }\r
+#endif\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
@@ -635,7 +649,10 @@ if(pagedelayrendermap){ sprintf(global_temp_status_text, "%-3u", mv->dy); modexp
                                }\r
                }\r
                i += mv->map->width;\r
-       } if(pagedelayrendermap) delay(200);\r
+       }\r
+#ifdef __DEBUG_RF__\r
+if(dbg_pagedelayrendermap) delay(200);\r
+#endif\r
 }\r
 \r
 void mapDrawWRow(map_view_t *mv, int tx, int ty, word y)\r
@@ -679,8 +696,6 @@ void mapDrawWCol(map_view_t *mv, int tx, int ty, word x)
        }\r
 }\r
 \r
-boolean pagenorendermap = 0;\r
-boolean pagedelayrendermap = 0;\r
 \r
 /*     sync    */\r
 void shinku(global_game_variables_t *gv)\r