X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscroll16.h;h=c33d99c35e1b21a9e5c7f200798df9d8505ebf2f;hb=3bccccc5b1bd97dc63e3caccc800959e9e5948db;hp=c789cc1ad3ce41afea0fe2dcafc500001be61b47;hpb=5e004b57253df9e7572e5f0705c353f559ca0875;p=16.git diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h index c789cc1a..c33d99c3 100755 --- a/src/lib/scroll16.h +++ b/src/lib/scroll16.h @@ -34,7 +34,7 @@ //#include "src/lib/16_map.h" //new map stuff #include "src/lib/16_timer.h" #include "src/lib/wcpu/16_wcpu.h" -#include "src/lib/16_sprit.h" +#include "src/lib/16_spri.h" #include #include @@ -63,6 +63,8 @@ #define MAPW 40 #define MAPH 30 +//===========================================================================// + //if(player[0].enti.hp==0) printf("%d wwww\n", player[0].enti.y+8); //else printf("\nplayer[0].enti.y: %d\n", player[0].enti.y); //printf("gvar.video.p=%u ", gvar.video.p); @@ -70,27 +72,30 @@ //not used now printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n"); //printf("mv[%u].tx: %d", gvar.video.panp, mv[gvar.video.panp].tx); printf(" mv[%u].ty: %d ", gvar.video.panp, mv[gvar.video.panp].ty); //printf("gvar.kurokku: "); printf("%.0f ", clock()); printf("tiku=%lu ", gvar.kurokku.tiku); printf("t=%.0f ", gvar.kurokku.t); printf("ticktock()=%f ", ticktock(&gvar)); printf("%.0f fps", (double)gvar.kurokku.tiku/ticktock(&gvar)); -//printf("map.width=%d map.height=%d map.data[0]=%d\n", mv[1].map->width, mv[1].map->height, mv[1].map->data[0]); +//printf("map.width=%d map.height=%d map.data[0]=%d\n", mv[1].map->width, mv[1].map->height, mv[1].map->layerdata[0][0]); //printf("pageflipflop=%u", pageflipflop); //printf("&global_temp_status_text = %Fp\n", &global_temp_status_text); //printf("middle tile position: %dx", gvar.video.page[0].tilemidposscreenx); printf("%d\n", gvar.video.page[0].tilemidposscreeny); //printf(" aniframe=%u", player[0].enti.persist_aniframe); -#define SCROLLEXITMESG printf("[0]txy: %dx%d ", mv[1].tx, mv[1].ty); printf("[1]txy: %dx%d", mv[1].tx, mv[1].ty);\ +//printf("mv[0]txy: %dx%d ", mv[0].tx, mv[0].ty); printf("mv[1]txy: %dx%d", mv[1].tx, mv[1].ty); +#define SCROLLEXITMESG printf("page[0]dxy: %dx%d", gvar.video.page[0].dx, gvar.video.page[0].dy);\ printf("\n\n");\ printf("player vars:\n");\ - printf(" xy: %dx%d", player[0].enti.x, player[0].enti.y); printf(" txy: %dx%d", player[0].enti.tx, player[0].enti.ty); printf(" triggxy: %dx%d", player[0].enti.triggerx, player[0].enti.triggery); printf(" value: %d\n", mv[1].map->data[(player[0].enti.triggerx-1)+(map.width*(player[0].enti.triggery-1))]);\ - printf(" hp: %d", (player[0].enti.hp)); printf(" q: %d", player[0].enti.q); printf(" info.dir: %d", player[0].info.dir); printf(" d: %d ", player[0].enti.d);\ - printf(" pdir: %d\n", player[0].pdir); printf(" delay=%u", player[0].enti.spri->delay);\ + printf(" xy: %dx%d", player[0].enti.x, player[0].enti.y); printf(" txy: %dx%d", player[0].enti.tx, player[0].enti.ty); printf(" triggxy: %dx%d", player[0].enti.triggerx, player[0].enti.triggery); printf(" value: %d\n", mv[1].map->layerdata[0][(player[0].enti.triggerx-1)+(map.width*(player[0].enti.triggery-1))]);\ + printf(" hp: %d", (player[0].enti.hp)); printf(" q: %u", player[0].enti.q); printf(" info.dir: %u", player[0].info.dir); printf(" d: %u", player[0].enti.d); printf(" dire: %u", player[0].enti.dire);\ + printf(" pdir: %u\n", player[0].pdir); printf(" delay=%u", player[0].enti.spri->delay);\ printf("\n\n");\ VL_PrintmodexmemInfo(&gvar.video);\ \ - printf("gvar.video.r=%u ", gvar.video.r);\ - printf("gvar.video.bgps=%u ", gvar.video.bgps);\ + printf("gvar.video:\n");\ + printf(" r=%u ", gvar.video.dorender);\ + printf("bgps=%u ", gvar.video.bgps);\ printf("\n\n"); extern boolean pagenorendermap, pagedelayrendermap; extern char global_temp_status_text[512]; +extern char global_temp_status_text2[512]; //map_t allocMap(int w, int h); void initMap(map_t *map); @@ -104,10 +109,11 @@ void near mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid); void near mapScrollUp(map_view_t *mv, player_t *player, word id, word plid); void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid); void ZC_mapScroll(map_view_t *mv, player_t *player, word pn); -void ZC_playerXYpos(int x, int y, player_t *player, map_view_t *pip, nibble pn); +void ZC_playerXYpos(int x, int y, player_t *player, map_view_t *pip, nibble pn, boolean defaultsw); sword chkmap(map_t *map, word q); void mapGoTo(map_view_t *mv, int tx, int ty); void ZC_mapinitMV(map_view_t *mv, int tx, int ty); +void ZC_mapredraw(map_view_t *mv, int tx, int ty); void near 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); void near mapDrawCol(map_view_t *mv, int tx, int ty, word x, player_t *player, word poopoffset); @@ -126,7 +132,7 @@ inline void near ScrollRight(map_view_t *mv, player_t *player, word id, word pli /* Snap the origin forward */ mv[id].page->data += 4; - mv[id].page->dx = mv[id].map->tiles->tileWidth; + mv[id].page->dx = mv[id].map->layertile[0]->tileWidth; } } @@ -143,7 +149,7 @@ inline void near ScrollLeft(map_view_t *mv, player_t *player, word id, word plid /* Snap the origin backward */ mv[id].page->data -= 4; - mv[id].page->dx = mv[id].map->tiles->tileWidth; + mv[id].page->dx = mv[id].map->layertile[0]->tileWidth; } } @@ -160,7 +166,7 @@ inline void near ScrollUp(map_view_t *mv, player_t *player, word id, word plid) /* Snap the origin upward */ mv[id].page->data -= mv[id].page->pi; - mv[id].page->dy = mv[id].map->tiles->tileHeight; + mv[id].page->dy = mv[id].map->layertile[0]->tileHeight; } } @@ -177,7 +183,7 @@ inline void near ScrollDown(map_view_t *mv, player_t *player, word id, word plid /* Snap the origin downward */ mv[id].page->data += mv[id].page->pi; - mv[id].page->dy = mv[id].map->tiles->tileHeight; + mv[id].page->dy = mv[id].map->layertile[0]->tileHeight; } } @@ -185,7 +191,7 @@ inline void near ScrollDown(map_view_t *mv, player_t *player, word id, word plid //sync void shinku(global_game_variables_t *gv); //animate the sprite -void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch); +void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn); // Move an entity around. Should actually be in 16_entity boolean ZC_walk2(entity_t *ent, map_view_t *map_v);