//#include "src/lib/16_map.h" //new map stuff\r
#include "src/lib/16_timer.h"\r
#include "src/lib/wcpu/16_wcpu.h"\r
-#include "src/lib/16_sprit.h"\r
+#include "src/lib/16_spri.h"\r
\r
#include <hw/cpu/cpu.h>\r
#include <hw/dos/dos.h>\r
#define SPRITE\r
//#define TILERENDER\r
\r
-#define ANIMATESPRIFUN ZC_animatePlayer\r
-\r
#define PLAYERBMPDATAVAR player[pn].data\r
#define PLAYERBMPDATA *PLAYERBMPDATAVAR\r
#define PLAYERBMPDATAPTR PLAYERBMPDATAVAR\r
\r
//row and colum drawing routines\r
#define FULLRCREND\r
-#define DRAWCOLNUM mv->page[0].dx\r
-#define DRAWROLNUM mv->page[0].dy\r
+#define DRAWCOLNUM mv->page[id].dx\r
+#define DRAWROWNUM mv->page[id].dy\r
//#define DRAWCOLNUM player[plid].enti.q\r
//#define DRAWROLNUM player[plid].enti.q\r
\r
#define MAPW 40\r
#define MAPH 30\r
\r
+//===========================================================================//\r
+\r
//if(player[0].enti.hp==0) printf("%d wwww\n", player[0].enti.y+8);\r
//else printf("\nplayer[0].enti.y: %d\n", player[0].enti.y);\r
//printf("gvar.video.p=%u ", gvar.video.p);\r
//not used now printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n");\r
//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);\r
//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));\r
-//printf("map.width=%d map.height=%d map.data[0]=%d\n", mv[0].map->width, mv[0].map->height, mv[0].map->data[0]);\r
+//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]);\r
//printf("pageflipflop=%u", pageflipflop);\r
//printf("&global_temp_status_text = %Fp\n", &global_temp_status_text);\r
//printf("middle tile position: %dx", gvar.video.page[0].tilemidposscreenx); printf("%d\n", gvar.video.page[0].tilemidposscreeny);\r
//printf(" aniframe=%u", player[0].enti.persist_aniframe);\r
-#define SCROLLEXITMESG printf("txy: %dx%d\n", mv[0].tx, mv[0].ty);\\r
- printf("\n");\\r
+//printf("mv[0]txy: %dx%d ", mv[0].tx, mv[0].ty); printf("mv[1]txy: %dx%d", mv[1].tx, mv[1].ty);\r
+#define SCROLLEXITMESG printf("page[0]dxy: %dx%d", gvar.video.page[0].dx, gvar.video.page[0].dy);\\r
+ printf("\n\n");\\r
printf("player vars:\n");\\r
- 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[0].map->data[(player[0].enti.triggerx-1)+(map.width*(player[0].enti.triggery-1))]);\\r
- 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);\\r
- printf(" pdir: %d\n", player[0].pdir); printf(" delay=%u", player[0].enti.spri->delay);\\r
+ 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->MAPDATAPTR[(player[0].enti.triggerx-1)+(map.width*(player[0].enti.triggery-1))]);\\r
+ 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);\\r
+ printf(" pdir: %u\n", player[0].pdir); printf(" delay=%u", player[0].enti.spri->delay);\\r
printf("\n\n");\\r
VL_PrintmodexmemInfo(&gvar.video);\\r
\\r
- printf("gvar.video.r=%u ", gvar.video.r);\\r
+ printf("gvar.video:\n");\\r
+ printf(" r=%u ", gvar.video.dorender);\\r
+ printf("bgps=%u ", gvar.video.bgps);\\r
printf("\n\n");\r
\r
extern boolean pagenorendermap, pagedelayrendermap;\r
\r
extern char global_temp_status_text[512];\r
+extern char global_temp_status_text2[512];\r
\r
//map_t allocMap(int w, int h);\r
void initMap(map_t *map);\r
void ZC_walk(map_view_t *pip, player_t *player, word pn);\r
-//void oldwalk(map_view_t *pip, player_t *player, word pn);\r
void ZC_panPageManual(map_view_t *pip, player_t *player, word pn);\r
void ZC_MVSetup(map_view_t *pip, map_t *map, global_game_variables_t *gv);\r
void ZC_MVInit(map_view_t *pip, int tx, int ty);\r
void near mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid);\r
void near mapScrollUp(map_view_t *mv, player_t *player, word id, word plid);\r
void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid);\r
+void ZC_mapScroll(map_view_t *mv, player_t *player, word pn);\r
+void ZC_playerXYpos(int x, int y, player_t *player, map_view_t *pip, nibble pn, boolean defaultsw);\r
+sword chkmap(map_t *map, word q);\r
+void mapGoTo(map_view_t *mv, int tx, int ty);\r
+void ZC_mapinitMV(map_view_t *mv, int tx, int ty);\r
+void ZC_mapredraw(map_view_t *mv, int tx, int ty);\r
+void near mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y);\r
+void near mapDrawRow(map_view_t *mv, int tx, int ty, word y, player_t *player, word poopoffset);\r
+void near mapDrawCol(map_view_t *mv, int tx, int ty, word x, player_t *player, word poopoffset);\r
+void mapDrawWRow(map_view_t *mv, int tx, int ty, word y);\r
+void mapDrawWCol(map_view_t *mv, int tx, int ty, word x);\r
inline void near ScrollRight(map_view_t *mv, player_t *player, word id, word plid)\r
{\r
/* increment the pixel position and update the page */\r
/* Snap the origin forward */\r
mv[id].page->data += 4;\r
\r
- mv[id].page->dx = mv[id].map->tiles->tileWidth;\r
+ mv[id].page->dx = mv[id].map->MAPTILESPTR->tileWidth;\r
}\r
}\r
\r
/* Snap the origin backward */\r
mv[id].page->data -= 4;\r
\r
- mv[id].page->dx = mv[id].map->tiles->tileWidth;\r
+ mv[id].page->dx = mv[id].map->MAPTILESPTR->tileWidth;\r
}\r
}\r
\r
/* Snap the origin upward */\r
mv[id].page->data -= mv[id].page->pi;\r
\r
- mv[id].page->dy = mv[id].map->tiles->tileHeight;\r
+ mv[id].page->dy = mv[id].map->MAPTILESPTR->tileHeight;\r
}\r
}\r
\r
/* Snap the origin downward */\r
mv[id].page->data += mv[id].page->pi;\r
\r
- mv[id].page->dy = mv[id].map->tiles->tileHeight;\r
+ mv[id].page->dy = mv[id].map->MAPTILESPTR->tileHeight;\r
}\r
}\r
\r
-void ZC_playerXYpos(int x, int y, player_t *player, map_view_t *pip, nibble pn);\r
-sword chkmap(map_t *map, word q);\r
-void mapGoTo(map_view_t *mv, int tx, int ty);\r
-void ZC_mapinitMV(map_view_t *mv, int tx, int ty);\r
-void near mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y);\r
-void near mapDrawRow(map_view_t *mv, int tx, int ty, word y, player_t *player, word poopoffset);\r
-void near mapDrawCol(map_view_t *mv, int tx, int ty, word x, player_t *player, word poopoffset);\r
-void mapDrawWRow(map_view_t *mv, int tx, int ty, word y);\r
-void mapDrawWCol(map_view_t *mv, int tx, int ty, word x);\r
//void qclean();\r
+//sync\r
void shinku(global_game_variables_t *gv);\r
-void near ZC_drawframe(map_view_t *pip, entity_t *enti, sword x, sword y);\r
-void animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch);\r
-void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch);\r
+//animate the sprite\r
+void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn);\r
\r
// Move an entity around. Should actually be in 16_entity\r
boolean ZC_walk2(entity_t *ent, map_view_t *map_v);\r
projects / 16.git / blobdiff