{\r
if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x, player[pn].y-TILEWH, player[pn].x, player[pn].y-TILEWH, 24, 32);\r
#ifdef SPRITE\r
- PBUFSFUN(pip[0].page, player[pn].x, player[pn].y-TILEWH, 24, 32, 24, 32, PLAYERBMPDATA);\r
+ PBUFSFUN(pip[0].page, player[pn].x, player[pn].y-TILEWH, 24, 32, 24, 32, PLAYERBMPDATAPTR);\r
#else\r
modexClearRegion(pip[1].page, player[pn].x, player[pn].y-TILEWH, 24, 32, 14);\r
#endif\r
{\r
if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x, player[pn].y-TILEWH, player[pn].x, player[pn].y-TILEWH, 24, 32);\r
#ifdef SPRITE\r
- PBUFSFUN(pip[0].page, player[pn].x, player[pn].y-TILEWH, 24, 96, 24, 32, PLAYERBMPDATA);\r
+ PBUFSFUN(pip[0].page, player[pn].x, player[pn].y-TILEWH, 24, 96, 24, 32, PLAYERBMPDATAPTR);\r
#else\r
modexClearRegion(pip[1].page, player[pn].x, player[pn].y-TILEWH, 24, 32, 10);\r
#endif\r
{\r
if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x, player[pn].y-TILEWH, player[pn].x, player[pn].y-TILEWH, 24, 32);\r
#ifdef SPRITE\r
- PBUFSFUN(pip[0].page, player[pn].x, player[pn].y-TILEWH, 24, 64, 24, 32, PLAYERBMPDATA);\r
+ PBUFSFUN(pip[0].page, player[pn].x, player[pn].y-TILEWH, 24, 64, 24, 32, PLAYERBMPDATAPTR);\r
#else\r
modexClearRegion(pip[1].page, player[pn].x, player[pn].y-TILEWH, 24, 32, 9);\r
#endif\r
{\r
if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x, player[pn].y-TILEWH, player[pn].x, player[pn].y-TILEWH, 24, 32);\r
#ifdef SPRITE\r
- PBUFSFUN(pip[0].page, player[pn].x, player[pn].y-TILEWH, 24, 0, 24, 32, PLAYERBMPDATA);\r
+ PBUFSFUN(pip[0].page, player[pn].x, player[pn].y-TILEWH, 24, 0, 24, 32, PLAYERBMPDATAPTR);\r
#else\r
modexClearRegion(pip[1].page, player[pn].x, player[pn].y-TILEWH, 24, 32, 12);\r
#endif\r
src/lib/scroll16.c: mv->video->r=1;\r
*/\r
\r
+void ZC_walk(map_view_t *pip, player_t *player, word pn)\r
+{\r
+ #define INC_PER_FRAME if(player[pn].q&1) player[pn].persist_aniframe++; if(player[pn].persist_aniframe>4) player[pn].persist_aniframe = 1;\r
+ switch(player[pn].d)\r
+ {\r
+ //no direction\r
+ case 2:\r
+ //0000pip[0].video->startclk = (*clockw);\r
+ break;\r
+ //right movement\r
+ case 3:\r
+ if(pip[0].tx >= 0 && pip[0].tx+pip[0].page->tw < pip[0].map->width && player[pn].tx == pip[0].tx+pip[0].page->tilemidposscreenx &&\r
+ !(pip[0].map->data[(player[pn].tx)+(pip[0].map->width*(player[pn].ty-1))] == 0))//!(player[pn].tx+1 == TRIGGX && player[pn].ty == TRIGGY)) //collision detection!\r
+ {\r
+ if(player[pn].q<=player[pn].spt)\r
+ {\r
+ INC_PER_FRAME;\r
+ animatePlayer(pip, player, pn, 1);\r
+ ScrollRight(pip, player, 3, pn);\r
+ ScrollRight(pip, player, 2, pn);\r
+ mapScrollRight(pip, player, (pip[0].video->p), pn);\r
+ player[pn].q++;\r
+ //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
+ } else { player[pn].q = 1; player[pn].d = 2; player[pn].tx++; }\r
+ }\r
+ else if(player[pn].tx < pip[0].map->width && !(pip[0].map->data[(player[pn].tx)+(pip[0].map->width*(player[pn].ty-1))] == 0))//!(player[pn].tx+1 == TRIGGX && player[pn].ty == TRIGGY))\r
+ {\r
+ if(player[pn].q<=player[pn].spt)\r
+ {\r
+ INC_PER_FRAME;\r
+ player[pn].x+=(player[pn].speed);\r
+ animatePlayer(pip, player, pn, 0);\r
+ player[pn].q++;\r
+ } else { player[pn].q = 1; player[pn].d = 2; player[pn].tx++; }\r
+ }\r
+ else\r
+ {\r
+#ifdef SPRITE\r
+ PBUFSFUN(pip[0].page, player[pn].x, player[pn].y-TILEWH, 24, 32, 24, 32, PLAYERBMPDATAPTR);\r
+#else\r
+ modexClearRegion(pip[1].page, player[pn].x, player[pn].y-TILEWH, 24, 32, 14);\r
+#endif\r
+ player[pn].d = 2;\r
+ }\r
+ player[pn].triggerx = player[pn].tx+1;\r
+ player[pn].triggery = player[pn].ty;\r
+ break;\r
+ //left movement\r
+ case 1:\r
+ if(pip[0].tx > 0 && pip[0].tx+pip[0].page->tw <= pip[0].map->width && player[pn].tx == pip[0].tx+pip[0].page->tilemidposscreenx &&\r
+ !(pip[0].map->data[(player[pn].tx-2)+(pip[0].map->width*(player[pn].ty-1))] == 0))//!(player[pn].tx-1 == TRIGGX && player[pn].ty == TRIGGY)) //collision detection!\r
+ {\r
+ if(player[pn].q<=player[pn].spt)\r
+ {\r
+ INC_PER_FRAME;\r
+ animatePlayer(pip, player, pn, 1);\r
+ ScrollLeft(pip, player, 3, pn);\r
+ ScrollLeft(pip, player, 2, pn);\r
+ mapScrollLeft(pip, player, (pip[0].video->p), pn);\r
+ player[pn].q++;\r
+ //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
+ } else { player[pn].q = 1; player[pn].d = 2; player[pn].tx--; }\r
+ }\r
+ else if(player[pn].tx > 1 && !(pip[0].map->data[(player[pn].tx-2)+(pip[0].map->width*(player[pn].ty-1))] == 0))//!(player[pn].tx-1 == TRIGGX && player[pn].ty == TRIGGY))\r
+ {\r
+ if(player[pn].q<=player[pn].spt)\r
+ {\r
+ INC_PER_FRAME;\r
+ player[pn].x-=(player[pn].speed);\r
+ animatePlayer(pip, player, pn, 0);\r
+ player[pn].q++;\r
+ } else { player[pn].q = 1; player[pn].d = 2; player[pn].tx--; }\r
+ }\r
+ else\r
+ {\r
+#ifdef SPRITE\r
+ PBUFSFUN(pip[0].page, player[pn].x, player[pn].y-TILEWH, 24, 96, 24, 32, PLAYERBMPDATAPTR);\r
+#else\r
+ modexClearRegion(pip[1].page, player[pn].x, player[pn].y-TILEWH, 24, 32, 10);\r
+#endif\r
+ player[pn].d = 2;\r
+ }\r
+ player[pn].triggerx = player[pn].tx-1;\r
+ player[pn].triggery = player[pn].ty;\r
+ break;\r
+ //down movement\r
+ case 4:\r
+ if(pip[0].ty >= 0 && pip[0].ty+pip[0].page->th < pip[0].map->height && player[pn].ty == pip[0].ty+pip[0].page->tilemidposscreeny &&\r
+ !(pip[0].map->data[(player[pn].tx-1)+(pip[0].map->width*(player[pn].ty))] == 0))//!(player[pn].tx == TRIGGX && player[pn].ty+1 == TRIGGY)) //collision detection!\r
+ {\r
+ if(player[pn].q<=player[pn].spt)\r
+ {\r
+ INC_PER_FRAME;\r
+ animatePlayer(pip, player, pn, 1);\r
+ ScrollDown(pip, player, 3, pn);\r
+ ScrollDown(pip, player, 2, pn);\r
+ mapScrollDown(pip, player, (pip[0].video->p), pn);\r
+ player[pn].q++;\r
+ //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
+ } else { player[pn].q = 1; player[pn].d = 2; player[pn].ty++; }\r
+ }\r
+ else if(player[pn].ty < pip[0].map->height && !(pip[0].map->data[(player[pn].tx-1)+(pip[0].map->width*(player[pn].ty))] == 0))//!(player[pn].tx == TRIGGX && player[pn].ty+1 == TRIGGY))\r
+ {\r
+ if(player[pn].q<=player[pn].spt)\r
+ {\r
+ INC_PER_FRAME;\r
+ player[pn].y+=(player[pn].speed);\r
+ animatePlayer(pip, player, pn, 0);\r
+ player[pn].q++;\r
+ } else { player[pn].q = 1; player[pn].d = 2; player[pn].ty++; }\r
+ }\r
+ else\r
+ {\r
+#ifdef SPRITE\r
+ PBUFSFUN(pip[0].page, player[pn].x, player[pn].y-TILEWH, 24, 64, 24, 32, PLAYERBMPDATAPTR);\r
+#else\r
+ modexClearRegion(pip[1].page, player[pn].x, player[pn].y-TILEWH, 24, 32, 9);\r
+#endif\r
+ player[pn].d = 2;\r
+ }\r
+ player[pn].triggerx = player[pn].tx;\r
+ player[pn].triggery = player[pn].ty+1;\r
+ break;\r
+ //up movement\r
+ case 0:\r
+ if(pip[0].ty > 0 && pip[0].ty+pip[0].page->th <= pip[0].map->height && player[pn].ty == pip[0].ty+pip[0].page->tilemidposscreeny &&\r
+ !(pip[0].map->data[(player[pn].tx-1)+(pip[0].map->width*(player[pn].ty-2))] == 0))//!(player[pn].tx == TRIGGX && player[pn].ty-1 == TRIGGY)) //collision detection!\r
+ {\r
+ if(player[pn].q<=player[pn].spt)\r
+ {\r
+ INC_PER_FRAME;\r
+ animatePlayer(pip, player, pn, 1);\r
+ ScrollUp(pip, player, 3, pn);\r
+ ScrollUp(pip, player, 2, pn);\r
+ mapScrollUp(pip, player, (pip[0].video->p), pn);\r
+ player[pn].q++;\r
+ //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
+ } else { player[pn].q = 1; player[pn].d = 2; player[pn].ty--; }\r
+ }\r
+ else if(player[pn].ty > 1 && !(pip[0].map->data[(player[pn].tx-1)+(pip[0].map->width*(player[pn].ty-2))] == 0))//!(player[pn].tx == TRIGGX && player[pn].ty-1 == TRIGGY))\r
+ {\r
+ if(player[pn].q<=player[pn].spt)\r
+ {\r
+ INC_PER_FRAME;\r
+ player[pn].y-=(player[pn].speed);\r
+ animatePlayer(pip, player, 0, pn);\r
+ player[pn].q++;\r
+ } else { player[pn].q = 1; player[pn].d = 2; player[pn].ty--; }\r
+ }\r
+ else\r
+ {\r
+#ifdef SPRITE\r
+ PBUFSFUN(pip[0].page, player[pn].x, player[pn].y-TILEWH, 24, 0, 24, 32, PLAYERBMPDATAPTR);\r
+#else\r
+ modexClearRegion(pip[1].page, player[pn].x, player[pn].y-TILEWH, 24, 32, 12);\r
+#endif\r
+ player[pn].d = 2;\r
+ }\r
+ player[pn].triggerx = player[pn].tx;\r
+ player[pn].triggery = player[pn].ty-1;\r
+ break;\r
+ }\r
+}\r
+\r
//panning page\r
void ZC_panPageManual(map_view_t *pip, player_t *player, word pn)\r
{\r
/*\r
* modex mv setup\r
*/\r
-void ZC_MVSetup(map_view_t *pip, map_t *map, pan_t *pan, global_game_variables_t *gv)\r
+void ZC_MVSetup(map_view_t *pip, map_t *map, global_game_variables_t *gv)\r
{\r
#define ZC_MVI 1\r
nibble i;\r
pip[0].page = &gv->video.page[0];\r
pip[0].map = map;\r
pip[0].video = &gv->video;\r
- pip[0].pan = pan;\r
+ pip[0].panp = &gv->video.panp;\r
ZC_MVInit(pip, 1, 1);\r
\r
for(i=ZC_MVI;i<gv->video.num_of_pages;i++)\r
pip[i].page = &gv->video.page[i];\r
pip[i].map = pip[0].map;\r
pip[i].video = pip[0].video;\r
- pip[i].pan = pip[0].pan;\r
+ pip[i].panp = pip[0].panp;\r
// if(i>ZC_MVI) {\r
pip[i].tx = 1;\r
pip[i].ty = 1;\r
byte crtcOffset;\r
\r
/* calculate offset */\r
- offset = (word) moo[moo[0].pan->pn].page->data;\r
+ offset = (word) moo[moo[0].video->panp].page->data;\r
offset += moo[0].page->dy * (moo[0].page->width >> 2 );\r
offset += moo[0].page->dx >> 2;\r
\r
//setkb(0);\r
}*/\r
\r
-unsigned char shinku_fps_indicator_page = 2;\r
boolean pageflipflop = 1;\r
boolean pageploop = 1;\r
\r
//modexCopyPageRegion(pip[1].page, pip[2].page, 16, 16, 16, 16, (14*8)+4, 8+4);\r
/* block copy to visible RAM from offscreen */\r
// vga_setup_wm1_block_copy();\r
-// modexCopyPageRegion(&(gv->video.page[shinku_fps_indicator_page]), &(gv->video.page[!shinku_fps_indicator_page]), x, y, x+w, 0, w, h);\r
+// modexCopyPageRegion(&(gv->video.page[gv->video->sfip]), &(gv->video.page[!gv->video->sfip]), x, y, x+w, 0, w, h);\r
// o = *(gv->video.page[2].data); // source offscreen\r
-// o2 = *(gv->video.page[shinku_fps_indicator_page].data)+(y * vga_state.vga_stride) + (x >> 2); // dest visible (original stride)\r
+// o2 = *(gv->video.page[gv->video->sfip].data)+(y * vga_state.vga_stride) + (x >> 2); // dest visible (original stride)\r
// for (i=0;i < h;i++,o += vga_state.vga_draw_stride,o2 += vga_state.vga_stride) vga_wm1_mem_block_copy(o2,o,w >> 2);\r
/* must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally */\r
// vga_restore_rm0wm0();\r
//\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
- //modexClearRegion(&(gv->video.page[shinku_fps_indicator_page]), x, y, w, h, 45);\r
+ //modexClearRegion(&(gv->video.page[gv->video->sfip]), x, y, w, h, 45);\r
modexprint(&(gv->video.page[/*!*/(gv->video.p)]), x, y, type, col, bgcol, global_temp_status_text);\r
gv->kurokku.tiku=0;\r
/* block copy to visible RAM from offscreen */\r
// vga_setup_wm1_block_copy();\r
-// o = *(gv->video.page[shinku_fps_indicator_page].data); // source offscreen\r
+// o = *(gv->video.page[gv->video->sfip].data); // source offscreen\r
// o2 = *(gv->video.page[2].data)+(y * vga_state.vga_stride) + (x >> 2); // dest visible (original stride)\r
// for (i=0;i < h;i++,o += vga_state.vga_draw_stride,o2 += vga_state.vga_stride) vga_wm1_mem_block_copy(o2,o,w >> 2);\r
-// modexCopyPageRegion(&(gv->video.page[shinku_fps_indicator_page]), &(gv->video.page[!shinku_fps_indicator_page]), x, y, x, 0, w, h);\r
+// modexCopyPageRegion(&(gv->video.page[gv->video->sfip]), &(gv->video.page[!gv->video->sfip]), x, y, x, 0, w, h);\r
/* must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally */\r
// vga_restore_rm0wm0();\r
}else //copy dat sheet\r
switch(gv->kurokku.fpscap)\r
{\r
case 0:\r
- //modexprint(&(gv->video.page[shinku_fps_indicator_page]), x, y+8, type, col, bgcol, "sanic!");\r
+ //modexprint(&(gv->video.page[gv->video->sfip]), x, y+8, type, col, bgcol, "sanic!");\r
gv->kurokku.frames_per_second=1;\r
break;\r
case 1:\r
}\r
}\r
\r
-void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch)\r
+void /*near*/ animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch)\r
{\r
sword x = player[pn].x;\r
sword y = player[pn].y;\r
}\r
\r
#ifdef SPRITE\r
-#define FRAME1 PBUFSFUN(pip[/*!*/(pip->video->p)].page, x, y, 48, dire, 24, 32, PLAYERBMPDATA);\r
-#define FRAME2 PBUFSFUN(pip[/*!*/(pip->video->p)].page, x, y, 24, dire, 24, 32, PLAYERBMPDATA);\r
-#define FRAME3 PBUFSFUN(pip[/*!*/(pip->video->p)].page, x, y, 0, dire, 24, 32, PLAYERBMPDATA);\r
-#define FRAME4 PBUFSFUN(pip[/*!*/(pip->video->p)].page, x, y, 24, dire, 24, 32, PLAYERBMPDATA);\r
+#define FRAME1 PBUFSFUN(pip[/*!*/(pip->video->p)].page, x, y, 48, dire, 24, 32, PLAYERBMPDATAPTR);\r
+#define FRAME2 PBUFSFUN(pip[/*!*/(pip->video->p)].page, x, y, 24, dire, 24, 32, PLAYERBMPDATAPTR);\r
+#define FRAME3 PBUFSFUN(pip[/*!*/(pip->video->p)].page, x, y, 0, dire, 24, 32, PLAYERBMPDATAPTR);\r
+#define FRAME4 PBUFSFUN(pip[/*!*/(pip->video->p)].page, x, y, 24, dire, 24, 32, PLAYERBMPDATAPTR);\r
#else\r
#define FRAME1 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, 2+dire);\r
#define FRAME2 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, 1+dire);\r
return dx && 1;//crossable_tile(x + dx, map_v) || dy && crossable_tile(y + dy, map_v);\r
}\r
\r
-boolean ZC_walk(entity_t *ent, map_view_t *map_v)\r
+boolean ZC_walk2(entity_t *ent, map_view_t *map_v)\r
{\r
//return 1;\r
int dx = 1;\r
\r
void player_walk(player_t *player, map_view_t *map_v){\r
int dx=16, dy=16;\r
- if(ZC_walk(player->ent, map_v) && boundary_check(map_v->tx, map_v->ty, dx, dy, map_v->map->width - 2*map_v->page->tilesw, map_v->map->height - 2*map_v->page->tilesh))\r
+ if(ZC_walk2(player->ent, map_v) && boundary_check(map_v->tx, map_v->ty, dx, dy, map_v->map->width - 2*map_v->page->tilesw, map_v->map->height - 2*map_v->page->tilesh))\r
{\r
mapScroll(map_v, player);\r
// (Un)load stuff?\r
projects / 16.git / blobdiff