/* Project 16 Source Code~\r
- * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2020 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
*\r
* This file is part of Project 16.\r
*\r
*/\r
#include "src/lib/scroll16.h"\r
\r
-//#define INC_PER_FRAME if(player[pn].enti.q&1) player[pn].enti.persist_aniframe++; if(player[pn].enti.persist_aniframe>4) player[pn].enti.persist_aniframe = 1;\r
+//check map edge\r
+boolean ZCL_mapEdgeChk(map_view_t *map_v, nibble dir, int tx, int ty, boolean pansw, boolean noscrollsw)\r
+{\r
+ int w,h;\r
+\r
+ switch (pansw)\r
+ {\r
+ case 0:\r
+ w = map_v[0].map->width;\r
+ h = map_v[0].map->height;\r
+ break;\r
+ case 1:\r
+ w = map_v[0].page->ti.tilesw;\r
+ h = map_v[0].page->ti.tilesh;\r
+ break;\r
+ }\r
\r
-void ZC_walk(map_view_t *pip, player_t *player, word pn)\r
+ switch(dir)\r
+ {\r
+ default://no direction\r
+ case 2:\r
+ //0000pip[0].video->startclk = (*clockw);\r
+ return false;\r
+ break;\r
+ //right movement\r
+ case 3:\r
+ if(noscrollsw) return tx < map_v[0].map->width;\r
+ else return (map_v[0].tx >= 0 && map_v[0].tx+map_v[0].page->ti.tw < w);\r
+ break;\r
+ //left movement\r
+ case 1:\r
+ if(noscrollsw) return tx > 1;\r
+ else return (map_v[0].tx > 0 && map_v[0].tx+map_v[0].page->ti.tw <= w);\r
+ break;\r
+ //down movement\r
+ case 4:\r
+ if(noscrollsw) return ty < map_v[0].map->height;\r
+ else return (map_v[0].ty >= 0 && map_v[0].ty+map_v[0].page->ti.th < h);\r
+ break;\r
+ //up movement\r
+ case 0:\r
+ if(noscrollsw) return ty > 1;\r
+ else return (map_v[0].ty > 0 && map_v[0].ty+map_v[0].page->ti.th <= h);\r
+ break;\r
+ }\r
+ return false;\r
+}\r
+\r
+boolean ZCL_CollCheck(map_view_t *map_v, nibble dir, int tx, int ty)\r
{\r
- switch(player[pn].enti.d)\r
+ switch (dir)\r
+ {\r
+ default://no direction\r
+ case 2:\r
+ break;\r
+ case 3://right\r
+ return !(map_v[0].map->layerdata[0].data[(tx)+(map_v[0].map->width*(ty-1))] == 0);\r
+ break;\r
+ case 1://left\r
+ return !(map_v[0].map->layerdata[0].data[(tx-2)+(map_v[0].map->width*(ty-1))] == 0);\r
+ break;\r
+ case 4://down\r
+ return !(map_v[0].map->layerdata[0].data[(tx-1)+(map_v[0].map->width*(ty))] == 0);\r
+ break;\r
+ case 0://up\r
+ return !(map_v[0].map->layerdata[0].data[(tx-1)+(map_v[0].map->width*(ty-2))] == 0);\r
+ break;\r
+ }\r
+ return false;\r
+}\r
+\r
+boolean ZCL_ScreenMidPosChk(map_view_t *map_v, nibble dir, int tx, int ty)\r
+{\r
+ if(ZCL_mapEdgeChk(map_v, dir, 0, 0, 0, 0))\r
+ switch(dir)\r
+ {\r
+ default://no direction\r
+ case 2:\r
+ //0000map_v[0].video->startclk = (*clockw);\r
+ return false;\r
+ break;\r
+ //right movement\r
+ case 3:\r
+ return tx == map_v[0].tx+map_v[0].page->ti.tilemidposscreenx;\r
+ break;\r
+ //left movement\r
+ case 1:\r
+ return tx == map_v[0].tx+map_v[0].page->ti.tilemidposscreenx;\r
+ break;\r
+ //down movement\r
+ case 4:\r
+ return ty == map_v[0].ty+map_v[0].page->ti.tilemidposscreeny;\r
+ break;\r
+ //up movement\r
+ case 0:\r
+ return ty == map_v[0].ty+map_v[0].page->ti.tilemidposscreeny;\r
+ break;\r
+ }\r
+ return false;\r
+}\r
+\r
+//#define INC_PER_FRAME if(gvar->player[pn].enti.q&1) gvar->player[pn].enti.persist_aniframe++; if(gvar->player[pn].enti.persist_aniframe>4) gvar->player[pn].enti.persist_aniframe = 1;\r
+#ifdef OLDWALKSHOWPAGESTUFF\r
+#define SHOWMVFUN__ VL_ShowPage(&gvar->video.page[0], 1, 0);//modexShowPage(&gvar->video.page);\r
+//ZC_ShowMV(gvar->mv, 1, 0);\r
+#endif\r
+\r
+void ZC_walk(global_game_variables_t *gvar, word pn)\r
+{\r
+ switch(gvar->player[pn].enti.d)\r
{\r
//no direction\r
case 2:\r
- //0000pip[0].video->startclk = (*clockw);\r
+ //0000gvar->mv[0].video->startclk = (*clockw);\r
break;\r
//right movement\r
case 3:\r
- if(pip[0].tx >= 0 && pip[0].tx+pip[0].page->ti.tw < pip[0].map->width && player[pn].enti.tx == pip[0].tx+pip[0].page->ti.tilemidposscreenx &&\r
- !(pip[0].map->data[(player[pn].enti.tx)+(pip[0].map->width*(player[pn].enti.ty-1))] == 0))//!(player[pn].enti.tx+1 == TRIGGX && player[pn].enti.ty == TRIGGY)) //collision detection!\r
+ if(ZCL_ScreenMidPosChk(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty) &&\r
+ ZCL_CollCheck(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty))//!(gvar->player[pn].enti.tx+1 == TRIGGX && gvar->player[pn].enti.ty == TRIGGY)) //collision detection!\r
{\r
- player[pn].walktype=2;\r
- if(player[pn].enti.q<=player[pn].enti.spt)\r
+ gvar->player[pn].walktype=2;\r
+ if(gvar->player[pn].enti.q<=gvar->player[pn].enti.spt)\r
{\r
- //INC_PER_FRAME;\r
- ANIMATESPRIFUN(pip, player, pn, 2);\r
- ScrollRight(pip, player, 3, pn);\r
- ScrollRight(pip, player, 2, pn);\r
- mapScrollRight(pip, player, (pip[0].video->p), pn);\r
- player[pn].enti.q++;\r
- //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
- } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx++; }\r
+ ZC_animatePlayer(gvar->mv, gvar->player, pn);\r
+ ZC_mapScroll(gvar->mv, gvar->player, pn);\r
+ gvar->player[pn].enti.q++;\r
+ //0000gvar->mv[0].video->clk = ((*clockw)-gvar->mv[0].video->startclk)/18.2;\r
+#ifdef OLDWALKSHOWPAGESTUFF\r
+ SHOWMVFUN__\r
+#endif\r
+ } else { gvar->player[pn].enti.q = 1; gvar->player[pn].enti.d = 2; gvar->player[pn].enti.tx++; }\r
}\r
- else if(player[pn].enti.tx < pip[0].map->width && !(pip[0].map->data[(player[pn].enti.tx)+(pip[0].map->width*(player[pn].enti.ty-1))] == 0))//!(player[pn].enti.tx+1 == TRIGGX && player[pn].enti.ty == TRIGGY))\r
+ else if(ZCL_mapEdgeChk(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty, 0, 1) &&\r
+ ZCL_CollCheck(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty))//!(gvar->player[pn].enti.tx+1 == TRIGGX && gvar->player[pn].enti.ty == TRIGGY))\r
{\r
- player[pn].walktype=1;\r
- if(player[pn].enti.q<=player[pn].enti.spt)\r
+ gvar->player[pn].walktype=1;\r
+ if(gvar->player[pn].enti.q<=gvar->player[pn].enti.spt)\r
{\r
- //INC_PER_FRAME;\r
- player[pn].enti.x+=(player[pn].enti.speed);\r
- ANIMATESPRIFUN(pip, player, pn, 1);\r
- player[pn].enti.q++;\r
- } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx++; }\r
+ gvar->player[pn].enti.x+=(gvar->player[pn].enti.spt);\r
+ ZC_animatePlayer(gvar->mv, gvar->player, pn);\r
+ gvar->player[pn].enti.q++;\r
+#ifdef OLDWALKSHOWPAGESTUFF\r
+ SHOWMVFUN__\r
+#endif\r
+ } else { gvar->player[pn].enti.q = 1; gvar->player[pn].enti.d = 2; gvar->player[pn].enti.tx++; }\r
}\r
else\r
{\r
- player[pn].walktype=0;\r
- ANIMATESPRIFUN(pip, player, pn, 0);\r
- player[pn].enti.d = 2;\r
+ gvar->player[pn].walktype=0;\r
+ ZC_animatePlayer(gvar->mv, gvar->player, pn);\r
+ gvar->player[pn].enti.d = 2;\r
+#ifdef OLDWALKSHOWPAGESTUFF\r
+ SHOWMVFUN__\r
+#endif\r
}\r
- player[pn].enti.triggerx = player[pn].enti.tx+1;\r
- player[pn].enti.triggery = player[pn].enti.ty;\r
+ gvar->player[pn].enti.triggerx = gvar->player[pn].enti.tx+1;\r
+ gvar->player[pn].enti.triggery = gvar->player[pn].enti.ty;\r
break;\r
//left movement\r
case 1:\r
- if(pip[0].tx > 0 && pip[0].tx+pip[0].page->ti.tw <= pip[0].map->width && player[pn].enti.tx == pip[0].tx+pip[0].page->ti.tilemidposscreenx &&\r
- !(pip[0].map->data[(player[pn].enti.tx-2)+(pip[0].map->width*(player[pn].enti.ty-1))] == 0))//!(player[pn].enti.tx-1 == TRIGGX && player[pn].enti.ty == TRIGGY)) //collision detection!\r
+ if(ZCL_ScreenMidPosChk(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty) &&\r
+ ZCL_CollCheck(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty))//!(gvar->player[pn].enti.tx-1 == TRIGGX && gvar->player[pn].enti.ty == TRIGGY)) //collision detection!\r
{\r
- player[pn].walktype=2;\r
- if(player[pn].enti.q<=player[pn].enti.spt)\r
+ gvar->player[pn].walktype=2;\r
+ if(gvar->player[pn].enti.q<=gvar->player[pn].enti.spt)\r
{\r
- //INC_PER_FRAME;\r
- ANIMATESPRIFUN(pip, player, pn, 2);\r
- ScrollLeft(pip, player, 3, pn);\r
- ScrollLeft(pip, player, 2, pn);\r
- mapScrollLeft(pip, player, (pip[0].video->p), pn);\r
- player[pn].enti.q++;\r
- //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
- } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx--; }\r
+ ZC_animatePlayer(gvar->mv, gvar->player, pn);\r
+ ZC_mapScroll(gvar->mv, gvar->player, pn);\r
+ gvar->player[pn].enti.q++;\r
+ //0000gvar->mv[0].video->clk = ((*clockw)-gvar->mv[0].video->startclk)/18.2;\r
+#ifdef OLDWALKSHOWPAGESTUFF\r
+ SHOWMVFUN__\r
+#endif\r
+ } else { gvar->player[pn].enti.q = 1; gvar->player[pn].enti.d = 2; gvar->player[pn].enti.tx--; }\r
}\r
- else if(player[pn].enti.tx > 1 && !(pip[0].map->data[(player[pn].enti.tx-2)+(pip[0].map->width*(player[pn].enti.ty-1))] == 0))//!(player[pn].enti.tx-1 == TRIGGX && player[pn].enti.ty == TRIGGY))\r
+ else if(ZCL_mapEdgeChk(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty, 0, 1) &&\r
+ ZCL_CollCheck(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty))//!(gvar->player[pn].enti.tx-1 == TRIGGX && gvar->player[pn].enti.ty == TRIGGY))\r
{\r
- player[pn].walktype=1;\r
- if(player[pn].enti.q<=player[pn].enti.spt)\r
+ gvar->player[pn].walktype=1;\r
+ if(gvar->player[pn].enti.q<=gvar->player[pn].enti.spt)\r
{\r
- //INC_PER_FRAME;\r
- player[pn].enti.x-=(player[pn].enti.speed);\r
- ANIMATESPRIFUN(pip, player, pn, 1);\r
- player[pn].enti.q++;\r
- } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx--; }\r
+ gvar->player[pn].enti.x-=(gvar->player[pn].enti.spt);\r
+ ZC_animatePlayer(gvar->mv, gvar->player, pn);\r
+ gvar->player[pn].enti.q++;\r
+#ifdef OLDWALKSHOWPAGESTUFF\r
+ SHOWMVFUN__\r
+#endif\r
+ } else { gvar->player[pn].enti.q = 1; gvar->player[pn].enti.d = 2; gvar->player[pn].enti.tx--; }\r
}\r
else\r
{\r
- player[pn].walktype=0;\r
- ANIMATESPRIFUN(pip, player, pn, 0);\r
- player[pn].enti.d = 2;\r
+ gvar->player[pn].walktype=0;\r
+ ZC_animatePlayer(gvar->mv, gvar->player, pn);\r
+ gvar->player[pn].enti.d = 2;\r
+#ifdef OLDWALKSHOWPAGESTUFF\r
+ SHOWMVFUN__\r
+#endif\r
}\r
- player[pn].enti.triggerx = player[pn].enti.tx-1;\r
- player[pn].enti.triggery = player[pn].enti.ty;\r
+ gvar->player[pn].enti.triggerx = gvar->player[pn].enti.tx-1;\r
+ gvar->player[pn].enti.triggery = gvar->player[pn].enti.ty;\r
break;\r
//down movement\r
case 4:\r
- if(pip[0].ty >= 0 && pip[0].ty+pip[0].page->ti.th < pip[0].map->height && player[pn].enti.ty == pip[0].ty+pip[0].page->ti.tilemidposscreeny &&\r
- !(pip[0].map->data[(player[pn].enti.tx-1)+(pip[0].map->width*(player[pn].enti.ty))] == 0))//!(player[pn].enti.tx == TRIGGX && player[pn].enti.ty+1 == TRIGGY)) //collision detection!\r
+ if(ZCL_ScreenMidPosChk(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty) &&\r
+ ZCL_CollCheck(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty))//!(gvar->player[pn].enti.tx == TRIGGX && gvar->player[pn].enti.ty+1 == TRIGGY)) //collision detection!\r
{\r
- player[pn].walktype=2;\r
- if(player[pn].enti.q<=player[pn].enti.spt)\r
+ gvar->player[pn].walktype=2;\r
+ if(gvar->player[pn].enti.q<=gvar->player[pn].enti.spt)\r
{\r
- //INC_PER_FRAME;\r
- ANIMATESPRIFUN(pip, player, pn, 2);\r
- ScrollDown(pip, player, 3, pn);\r
- ScrollDown(pip, player, 2, pn);\r
- mapScrollDown(pip, player, (pip[0].video->p), pn);\r
- player[pn].enti.q++;\r
- //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
- } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty++; }\r
+ ZC_animatePlayer(gvar->mv, gvar->player, pn);\r
+ ZC_mapScroll(gvar->mv, gvar->player, pn);\r
+ gvar->player[pn].enti.q++;\r
+ //0000gvar->mv[0].video->clk = ((*clockw)-gvar->mv[0].video->startclk)/18.2;\r
+#ifdef OLDWALKSHOWPAGESTUFF\r
+ SHOWMVFUN__\r
+#endif\r
+ } else { gvar->player[pn].enti.q = 1; gvar->player[pn].enti.d = 2; gvar->player[pn].enti.ty++; }\r
}\r
- else if(player[pn].enti.ty < pip[0].map->height && !(pip[0].map->data[(player[pn].enti.tx-1)+(pip[0].map->width*(player[pn].enti.ty))] == 0))//!(player[pn].enti.tx == TRIGGX && player[pn].enti.ty+1 == TRIGGY))\r
+ else if(ZCL_mapEdgeChk(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty, 0, 1) &&\r
+ ZCL_CollCheck(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty))//!(gvar->player[pn].enti.tx == TRIGGX && gvar->player[pn].enti.ty+1 == TRIGGY))\r
{\r
- player[pn].walktype=1;\r
- if(player[pn].enti.q<=player[pn].enti.spt)\r
+ gvar->player[pn].walktype=1;\r
+ if(gvar->player[pn].enti.q<=gvar->player[pn].enti.spt)\r
{\r
- //INC_PER_FRAME;\r
- player[pn].enti.y+=(player[pn].enti.speed);\r
- ANIMATESPRIFUN(pip, player, pn, 1);\r
- player[pn].enti.q++;\r
- } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty++; }\r
+ gvar->player[pn].enti.y+=(gvar->player[pn].enti.spt);\r
+ ZC_animatePlayer(gvar->mv, gvar->player, pn);\r
+ gvar->player[pn].enti.q++;\r
+#ifdef OLDWALKSHOWPAGESTUFF\r
+ SHOWMVFUN__\r
+#endif\r
+ } else { gvar->player[pn].enti.q = 1; gvar->player[pn].enti.d = 2; gvar->player[pn].enti.ty++; }\r
}\r
else\r
{\r
- player[pn].walktype=0;\r
- ANIMATESPRIFUN(pip, player, pn, 0);\r
- player[pn].enti.d = 2;\r
+ gvar->player[pn].walktype=0;\r
+ ZC_animatePlayer(gvar->mv, gvar->player, pn);\r
+ gvar->player[pn].enti.d = 2;\r
+#ifdef OLDWALKSHOWPAGESTUFF\r
+ SHOWMVFUN__\r
+#endif\r
}\r
- player[pn].enti.triggerx = player[pn].enti.tx;\r
- player[pn].enti.triggery = player[pn].enti.ty+1;\r
+ gvar->player[pn].enti.triggerx = gvar->player[pn].enti.tx;\r
+ gvar->player[pn].enti.triggery = gvar->player[pn].enti.ty+1;\r
break;\r
//up movement\r
case 0:\r
- if(pip[0].ty > 0 && pip[0].ty+pip[0].page->ti.th <= pip[0].map->height && player[pn].enti.ty == pip[0].ty+pip[0].page->ti.tilemidposscreeny &&\r
- !(pip[0].map->data[(player[pn].enti.tx-1)+(pip[0].map->width*(player[pn].enti.ty-2))] == 0))//!(player[pn].enti.tx == TRIGGX && player[pn].enti.ty-1 == TRIGGY)) //collision detection!\r
+ if(ZCL_ScreenMidPosChk(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty) &&\r
+ ZCL_CollCheck(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty))//!(gvar->player[pn].enti.tx == TRIGGX && gvar->player[pn].enti.ty-1 == TRIGGY)) //collision detection!\r
{\r
- player[pn].walktype=2;\r
- if(player[pn].enti.q<=player[pn].enti.spt)\r
+ gvar->player[pn].walktype=2;\r
+ if(gvar->player[pn].enti.q<=gvar->player[pn].enti.spt)\r
{\r
- //INC_PER_FRAME;\r
- ANIMATESPRIFUN(pip, player, pn, 2);\r
- ScrollUp(pip, player, 3, pn);\r
- ScrollUp(pip, player, 2, pn);\r
- mapScrollUp(pip, player, (pip[0].video->p), pn);\r
- player[pn].enti.q++;\r
- //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
- } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty--; }\r
+ ZC_animatePlayer(gvar->mv, gvar->player, pn);\r
+ ZC_mapScroll(gvar->mv, gvar->player, pn);\r
+ gvar->player[pn].enti.q++;\r
+ //0000gvar->mv[0].video->clk = ((*clockw)-gvar->mv[0].video->startclk)/18.2;\r
+#ifdef OLDWALKSHOWPAGESTUFF\r
+ SHOWMVFUN__\r
+#endif\r
+ } else { gvar->player[pn].enti.q = 1; gvar->player[pn].enti.d = 2; gvar->player[pn].enti.ty--; }\r
}\r
- else if(player[pn].enti.ty > 1 && !(pip[0].map->data[(player[pn].enti.tx-1)+(pip[0].map->width*(player[pn].enti.ty-2))] == 0))//!(player[pn].enti.tx == TRIGGX && player[pn].enti.ty-1 == TRIGGY))\r
+ else if(ZCL_mapEdgeChk(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty, 0, 1) &&\r
+ ZCL_CollCheck(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty))//!(gvar->player[pn].enti.tx == TRIGGX && gvar->player[pn].enti.ty-1 == TRIGGY))\r
{\r
- player[pn].walktype=1;\r
- if(player[pn].enti.q<=player[pn].enti.spt)\r
+ gvar->player[pn].walktype=1;\r
+ if(gvar->player[pn].enti.q<=gvar->player[pn].enti.spt)\r
{\r
- //INC_PER_FRAME;\r
- player[pn].enti.y-=(player[pn].enti.speed);\r
- ANIMATESPRIFUN(pip, player, pn, 1);\r
- player[pn].enti.q++;\r
- } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty--; }\r
+ gvar->player[pn].enti.y-=(gvar->player[pn].enti.spt);\r
+ ZC_animatePlayer(gvar->mv, gvar->player, pn);\r
+ gvar->player[pn].enti.q++;\r
+#ifdef OLDWALKSHOWPAGESTUFF\r
+ SHOWMVFUN__\r
+#endif\r
+ } else { gvar->player[pn].enti.q = 1; gvar->player[pn].enti.d = 2; gvar->player[pn].enti.ty--; }\r
}\r
else\r
{\r
- player[pn].walktype=0;\r
- ANIMATESPRIFUN(pip, player, pn, 0);\r
- player[pn].enti.d = 2;\r
+ gvar->player[pn].walktype=0;\r
+ ZC_animatePlayer(gvar->mv, gvar->player, pn);\r
+ gvar->player[pn].enti.d = 2;\r
+#ifdef OLDWALKSHOWPAGESTUFF\r
+ SHOWMVFUN__\r
+#endif\r
}\r
- player[pn].enti.triggerx = player[pn].enti.tx;\r
- player[pn].enti.triggery = player[pn].enti.ty-1;\r
+ gvar->player[pn].enti.triggerx = gvar->player[pn].enti.tx;\r
+ gvar->player[pn].enti.triggery = gvar->player[pn].enti.ty-1;\r
break;\r
}\r
}\r
//panning page\r
void ZC_panPageManual(map_view_t *pip, player_t *player, word pn)\r
{\r
-#define SHOWMVFUN_ ZC_ShowMV(pip, 0, 0);\r
+#define SHOWMVFUN_ VL_ShowPage(pip[0].page, 0, 0);//ZC_ShowMV(pip, 0, 0);\r
switch(player[pn].enti.d)\r
{\r
//right movement\r
case 3:\r
- if(pip[0].tx >= 0 && pip[0].tx+pip[0].page->ti.tw < pip[0].page->ti.tilesw)\r
+ if(ZCL_mapEdgeChk(pip, player[pn].enti.d, player[pn].enti.tx, player[pn].enti.ty, 1, 0))\r
{\r
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
\r
//left movement\r
case 1:\r
- if(pip[0].tx > 0 && pip[0].tx+pip[0].page->ti.tw <= pip[0].page->ti.tilesw)\r
+ if(ZCL_mapEdgeChk(pip, player[pn].enti.d, player[pn].enti.tx, player[pn].enti.ty, 1, 0))\r
{\r
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
\r
//down movement\r
case 4:\r
- if(pip[0].ty >= 0 && pip[0].ty+pip[0].page->ti.th < pip[0].page->ti.tilesh)\r
+ if(ZCL_mapEdgeChk(pip, player[pn].enti.d, player[pn].enti.tx, player[pn].enti.ty, 1, 0))\r
{\r
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
\r
//up movement\r
case 0:\r
- if(pip[0].ty > 0 && pip[0].ty+pip[0].page->ti.th <= pip[0].page->ti.tilesh)\r
+ if(ZCL_mapEdgeChk(pip, player[pn].enti.d, player[pn].enti.tx, player[pn].enti.ty, 1, 0))\r
{\r
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
#define ZC_MVI 1\r
nibble i;\r
// 1st page\r
- pip[0].page = &gv->video.page[0];\r
- pip[0].map = map;\r
- pip[0].video = &gv->video;\r
- pip[0].p = &gv->video.p;\r
- pip[0].sp = &gv->video.sp;\r
+ pip[0].page = &gv->video.page[0];\r
+ pip[0].map = map;\r
+ pip[0].video = &gv->video;\r
+ pip[0].kurokku = &gv->kurokku;\r
+ pip[0].p = &gv->video.p;\r
+ pip[0].sp = &gv->video.sp;\r
ZC_MVInit(pip, 1, 1);\r
\r
for(i=ZC_MVI;i<gv->video.num_of_pages;i++)\r
//pip[0].ty = pip[1].ty = ty;\r
}\r
\r
+//#if 0\r
+//for backwards compatibility with code i am lazy ww\r
void ZC_ShowMV(map_view_t *moo, boolean vsync, boolean sr)\r
{\r
- //VL_ShowPage(moo[moo[0].video->sp].page, vsync, sr);\r
- word high_address, low_address, offset;\r
- byte crtcOffset;\r
+ VL_ShowPage(moo[0].page, vsync, sr);\r
+}\r
\r
- // calculate offset\r
- offset = (word) moo[moo[0].video->sp].page->data;\r
- offset += moo[0].page->dy * (moo[0].page->width >> 2 );\r
- offset += moo[0].page->dx >> 2;\r
+#if 0\r
+void\r
+initMap(map_t *map) {\r
+ // just a place holder to fill out an alternating pattern\r
+ int x, y;\r
+ int i;\r
+ int tile = 1;\r
\r
- // calculate crtcOffset according to virtual width\r
- switch(sr)\r
- {\r
- case 1:\r
- crtcOffset = moo[moo[0].video->sp].page->sw >> 3;\r
- break;\r
- default:\r
- case 0:\r
- crtcOffset = moo[0].page->width >> 3;\r
- break;\r
+ i=0;\r
+ for(y=0; y<map->height; y++) {\r
+ for(x=0; x<map->width; x++) {\r
+ map->layerdata[0].data[i]=255;\r
+// printf("[%d]", map->layerdata[0].data[i]);\r
+ tile = tile ? 0 : 1;\r
+ i++;\r
+ }\r
+ tile = tile ? 0 : 1;\r
}\r
-\r
- high_address = HIGH_ADDRESS | (offset & 0xff00);\r
- low_address = LOW_ADDRESS | (offset << 8);\r
-\r
- // wait for appropriate timing and then program CRTC\r
- if(vsync) while ((inp(INPUT_STATUS_1) & DISPLAY_ENABLE));\r
- outpw(CRTC_INDEX, high_address);\r
- outpw(CRTC_INDEX, low_address);\r
- outp(CRTC_INDEX, 0x13);\r
- outp(CRTC_DATA, crtcOffset);\r
-\r
- // wait for one retrace\r
- if(vsync) while (!(inp(INPUT_STATUS_1) & VRETRACE));\r
-\r
- // do PEL panning here\r
- outp(AC_INDEX, 0x33);\r
- outp(AC_INDEX, (moo[0].page->dx & 0x03) << 1);\r
}\r
\r
void\r
initMap(map_t *map) {\r
- // just a place holder to fill out an alternating pattern\r
+ /* just a place holder to fill out an alternating pattern */\r
int x, y;\r
int i;\r
int tile = 1;\r
-\r
+ map->tiles = malloc(sizeof(tiles_t));\r
+ map->width=20;\r
+ map->height=15;\r
+\r
+ /* create the tile set */\r
+ map->tiles->spri = malloc(sizeof(sprite_t));\r
+ map->tiles->spri->sprite_vrl_cont.vrl_header->width = (TILEWH*2);\r
+ map->tiles->spri->sprite_vrl_cont.vrl_header->height= TILEWH;\r
+ map->tiles->spri->sprite_vrl_cont.buffer = malloc((TILEWH*2)*TILEWH);\r
+ map->tiles->tileHeight = TILEWH;\r
+ map->tiles->tileWidth =TILEWH*2;\r
+ map->tiles->rows = 1;\r
+ map->tiles->cols = 2;\r
+//#if 0\r
i=0;\r
+ for(y=0; y<TILEWH; y++) {\r
+ for(x=0; x<(TILEWH*2); x++) {\r
+ if(x<TILEWH)\r
+ map->tiles->spri->sprite_vrl_cont.buffer[i] = 28;//0x24;\r
+ else\r
+ map->tiles->spri->sprite_vrl_cont.buffer[i] = 0;//0x34;\r
+ i++;\r
+ }\r
+ }\r
+//#endif\r
+ i=0;\r
+ printf("pee\n");\r
for(y=0; y<map->height; y++) {\r
for(x=0; x<map->width; x++) {\r
- map->data[i]=255;\r
-// printf("[%d]", map->data[i]);\r
+ map->layerdata[0].data[i] = tile;\r
+// printf("%u ", map->layerdata[0].data[i]);\r
tile = tile ? 0 : 1;\r
i++;\r
}\r
+// printf("\n");\r
tile = tile ? 0 : 1;\r
}\r
}\r
+#endif\r
+//===========================================================================//\r
\r
\r
void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid)\r
ScrollRight(mv, player, id, plid);\r
\r
/* draw the next column */\r
- x= mv[0].page->sw + mv[id].map->tiles->tileWidth;\r
+ x= mv[0].page->sw + mv[0].map->tiles->tileWidth;\r
+ if(ZCL_mapEdgeChk(mv, player[plid].enti.d, player[plid].enti.tx, player[plid].enti.ty, 0, 0))\r
#ifndef FULLRCREND\r
if(player[plid].enti.q%4)\r
#else\r
if(player[plid].enti.q==4)\r
#endif\r
- if(id==0)\r
- mapDrawCol(&mv[0], mv[0].tx + mv[0].page->ti.tw, mv[0].ty-1, x, player, DRAWCOLNUM);\r
- else\r
- if(mv[0].video->bgps)\r
- modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[id].map->tiles->tileWidth, mv[id].map->tiles->tileHeight*(mv[0].page->ti.th+2));\r
- mv[0].video->r=1;\r
+// if(id==0)\r
+ mapDrawCol(&mv[id], mv[0].tx + mv[0].page->ti.tw, mv[0].ty-1, x, player);\r
+// else\r
+// if(mv[0].video->vga_state.bgps)\r
+// modexCopyPageRegion(mv->page, mv[0].page, x, 0, x, 0, mv[0].map->tiles->tileWidth, mv[0].page->height);\r
+ //mv[0].video->dorender=1;//ScrollRight\r
}\r
\r
\r
\r
/* draw the next column */\r
x= 0;\r
+ if(ZCL_mapEdgeChk(mv, player[plid].enti.d, player[plid].enti.tx, player[plid].enti.ty, 0, 0))\r
#ifndef FULLRCREND\r
if(player[plid].enti.q%4)\r
#else\r
if(player[plid].enti.q==4)\r
#endif\r
- if(id==0)\r
- mapDrawCol(&mv[0], mv[0].tx - 1, mv[0].ty-1, x, player, DRAWCOLNUM);\r
- else\r
- if(mv[0].video->bgps)\r
- modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[id].map->tiles->tileWidth, mv[id].map->tiles->tileHeight*(mv[0].page->ti.th+2));\r
- mv[0].video->r=1;\r
+// if(id==0)\r
+ mapDrawCol(&mv[id], mv[0].tx - 1, mv[0].ty-1, x, player);\r
+// else\r
+// if(mv[0].video->vga_state.bgps)\r
+// modexCopyPageRegion(mv->page, mv[0].page, x, 0, x, 0, mv[0].map->tiles->tileWidth, mv[0].page->height);\r
+ //mv[0].video->dorender=1;//ScrollLeft\r
}\r
\r
\r
\r
/* draw the next row */\r
y= 0;\r
+ if(ZCL_mapEdgeChk(mv, player[plid].enti.d, player[plid].enti.tx, player[plid].enti.ty, 0, 0))\r
#ifndef FULLRCREND\r
if(player[plid].enti.q%3)\r
#else\r
if(player[plid].enti.q==4)\r
#endif\r
- if(id==0)\r
- mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty-1, y, player, DRAWCOLNUM);\r
- else\r
- if(mv[0].video->bgps)\r
- modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*(mv[0].page->ti.tw+2), mv[id].map->tiles->tileHeight);\r
- mv[0].video->r=1;\r
+// if(id==0)\r
+ mapDrawRow(&mv[id], mv[0].tx - 1, mv[0].ty-1, y, player);\r
+// else\r
+// if(mv[0].video->vga_state.bgps)\r
+// modexCopyPageRegion(mv->page, mv[0].page, 0, y, 0, y, mv[0].page->width, mv[0].map->tiles->tileHeight);\r
+ //mv[0].video->dorender=1;//ScrollUp\r
}\r
\r
\r
ScrollDown(mv, player, id, plid);\r
\r
/* draw the next row */\r
- y= mv[0].page->sh + mv[id].map->tiles->tileHeight;\r
+ y= mv[0].page->sh + mv[0].map->tiles->tileHeight;\r
+ if(ZCL_mapEdgeChk(mv, player[plid].enti.d, player[plid].enti.tx, player[plid].enti.ty, 0, 0))\r
#ifndef FULLRCREND\r
if(player[plid].enti.q%3)\r
#else\r
if(player[plid].enti.q==4)\r
#endif\r
- if(id==0)\r
- mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty+mv[0].page->ti.th, y, player, DRAWCOLNUM);\r
- else\r
- if(mv[0].video->bgps)\r
- modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*(mv[0].page->ti.tw+2), mv[id].map->tiles->tileHeight);\r
- mv[0].video->r=1;\r
+// if(id==0)\r
+ mapDrawRow(&mv[id], mv[0].tx - 1, mv[0].ty+mv[0].page->ti.th, y, player);\r
+// else\r
+// if(mv[0].video->vga_state.bgps)\r
+// modexCopyPageRegion(mv->page, mv[0].page, 0, y, 0, y, mv[0].page->width, mv[0].map->tiles->tileHeight);\r
+ //mv[0].video->dorender=1;//ScrollDown\r
}\r
\r
-\r
+void ZC_mapScroll(map_view_t *mv, player_t *player, word pn)\r
+{\r
+ word b = mv[0].video->vga_state.bgps;\r
+ switch(player[pn].enti.d)\r
+ {\r
+ case 2://none\r
+ break;\r
+ case 3://right\r
+ ScrollRight(mv, player, 3, pn);\r
+ ScrollRight(mv, player, 2, pn);\r
+ mapScrollRight(mv, player, (0), pn);\r
+ if(b) mapScrollRight(mv, player, (1), pn);\r
+ break;\r
+ case 1://left\r
+ ScrollLeft(mv, player, 3, pn);\r
+ ScrollLeft(mv, player, 2, pn);\r
+ mapScrollLeft(mv, player, (0), pn);\r
+ if(b) mapScrollLeft(mv, player, (1), pn);\r
+ break;\r
+ case 4://down\r
+ ScrollDown(mv, player, 3, pn);\r
+ ScrollDown(mv, player, 2, pn);\r
+ mapScrollDown(mv, player, (0), pn);\r
+ if(b) mapScrollDown(mv, player, (1), pn);\r
+ break;\r
+ case 0://up\r
+ ScrollUp(mv, player, 3, pn);\r
+ ScrollUp(mv, player, 2, pn);\r
+ mapScrollUp(mv, player, (0), pn);\r
+ if(b) mapScrollUp(mv, player, (1), pn);\r
+ break;\r
+ }\r
+ //mv[0].video->dorender=1;//ZC_mapScroll\r
+}\r
\r
//===========================================================================\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)\r
+void ZC_PlayerXYpos(int x, int y, player_t *player, map_view_t *pip, boolean defaultsw)\r
{\r
- player[pn].enti.tx = x + pip[0].tx + pip[0].page->ti.tilemidposscreenx;\r
- player[pn].enti.ty = y + pip[0].ty + pip[0].page->ti.tilemidposscreeny;\r
+ player->enti.tx = x + pip[0].tx;\r
+ player->enti.ty = y + pip[0].ty;\r
+\r
+ switch(defaultsw)\r
+ {\r
+ case 1:\r
+ player->enti.tx += pip[0].page->ti.tilemidposscreenx;\r
+ player->enti.ty += pip[0].page->ti.tilemidposscreeny;\r
+ break;\r
+ case 0:\r
+ break;\r
+ }\r
}\r
//===========================================================================\r
\r
+void ZC_checkardmap(map_t *map)\r
+{\r
+ // just a place holder to fill out an alternating pattern\r
+ int x, y;\r
+ int i;\r
+ static byte z[(MAPW*MAPH)];//map->width*map->height];\r
+ byte tile = 1;\r
+\r
+ i=0;\r
+ for(y=0; y<map->height; y++) {\r
+ for(x=0; x<map->width; x++) {\r
+ z[i]=tile+1;\r
+ tile = tile ? 0 : 1;\r
+ i++;\r
+ }\r
+ tile = tile ? 0 : 1;\r
+ }\r
+ map->layerdata[0].data = &z;\r
+}\r
+\r
sword chkmap(map_t *map, word q)\r
{\r
// bitmap_t bp;\r
- static byte x[(MAPW*MAPH)+1] =\r
-{ 1, 2, 3, 4, 0, 3, 3, 3, 3, 3, 3, 3, 3, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 6, 7, 8, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 10, 11, 12, 4, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 0, 1, 1, 1, 5, 8, 1, 11, 11, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 4, 0, 0, 0, 0, 0, 8, 8, 1, 11, 11, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 8, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 1, 2, 3, 4, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 5, 6, 7, 8, 6, 6, 6, 6, 6, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 9, 10, 11, 12, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 10, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 10 };\r
-/*1, 2, 3, 4, 0, 3, 3, 3, 3, 3, 3, 3, 3, 4, 1, 1, 1, 1, 1, 1, \\r
-5, 6, 7, 8, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \\r
-9, 10, 11, 12, 4, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \\r
-13, 14, 15, 16, 0, 1, 1, 1, 5, 8, 1, 11, 11, 1, 1, 1, 1, 1, 1, 1, \\r
-0, 0, 4, 0, 0, 0, 0, 0, 8, 8, 1, 11, 11, 3, 1, 1, 1, 1, 1, 1, \\r
-1, 1, 1, 1, 0, 0, 0, 0, 8, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \\r
-1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \\r
-1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, \\r
-1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \\r
-1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \\r
-1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, \\r
-1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \\r
-1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, \\r
-1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \\r
-1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 1, 2, 3, 4 };*/\r
+// static byte x[(MAPW*MAPH)+1] =\r
+//{ 1, 2, 3, 4, 0, 3, 3, 3, 3, 3, 3, 3, 3, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 6, 7, 8, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 10, 11, 12, 4, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 0, 1, 1, 1, 5, 8, 1, 11, 11, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 4, 0, 0, 0, 0, 0, 8, 8, 1, 11, 11, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 8, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 1, 2, 3, 4, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 5, 6, 7, 8, 6, 6, 6, 6, 6, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 9, 10, 11, 12, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 10, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 10 };\r
+//1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1 };\r
+//1, 2, 3, 4, 0, 3, 3, 3, 3, 3, 3, 3, 3, 4, 1, 1, 1, 1, 1, 1, 5, 6, 7, 8, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 10, 11, 12, 4, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 0, 1, 1, 1, 5, 8, 1, 11, 11, 1, 1, 1, 1, 1, 1, 1, 0, 0, 4, 0, 0, 0, 0, 0, 8, 8, 1, 11, 11, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 8, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 1, 2, 3, 4 };\r
//check for failed to load map\r
- if((map->width == map->height == 0) && (q>0))\r
+ if((!map->width || !map->height) && (q>0))\r
{\r
//initiate a null map!\r
- map->width=MAPW;///2;\r
- map->height=MAPH;///2;\r
-// map->data = malloc(((map->width*map->height)+1)*sizeof(byte));\r
- map->data = &x;\r
- map->tiles = malloc(sizeof(tiles_t));\r
+ map->width=MAPW;\r
+ map->height=MAPH;\r
+// map->layerdata[0].data = fmfaflflfofcf(((map->width*map->height)+1)*sizeof(byte));\r
+ ZC_checkardmap(map);//map->layerdata[0].data = &x;\r
//fix this to be far~\r
// bp = bitmapLoadPcx("data/ed.pcx");\r
// map->tiles->data = &bp;\r
-#ifdef __DEBUG_MAP__\r
- dbg_mapdata = map->data;\r
-#endif\r
map->tiles->tileHeight = 16;\r
map->tiles->tileWidth = 16;\r
map->tiles->rows = 1;\r
map->tiles->cols = 1;\r
-#ifdef __DEBUG_MAP__\r
- dbg_maptext = true;\r
-#endif\r
}\r
-#ifdef __DEBUG_MAP__\r
- else dbg_maptext = false;\r
-#endif\r
return 0;\r
}\r
\r
//TODO: player position here\r
void mapGoTo(map_view_t *mv, int tx, int ty)\r
{\r
- int py;//px,\r
- unsigned int i;\r
-\r
ZC_mapinitMV(mv, tx, ty);\r
\r
/* draw the tiles */\r
modexClearRegion(mv[0].page, 0, 0, mv[0].page->width, mv[0].page->height, 0);\r
- py=0;\r
- i=mv[0].ty * mv[0].map->width + mv[0].tx;\r
- for(ty=mv[0].ty-1; py < mv[0].page->sh+mv->dyThresh && ty < mv[0].map->height; ty++, py+=mv[0].map->tiles->tileHeight) {\r
- mapDrawWRow(&mv[0], tx-1, ty, py);\r
- i+=mv->map->width - tx;\r
- }\r
- if(mv[0].video->bgps) modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height);\r
-// modexCopyPageRegion(mv[3].page, mv[0].page, 0/**/, 0/**/, 0, 0, 24, 32);\r
+ ZC_mapredraw(mv, tx, ty);\r
+\r
+ //if(mv[0].video->vga_state.bgps) modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height);\r
}\r
\r
void ZC_mapinitMV(map_view_t *mv, int tx, int ty)\r
mv[0].dyThresh = mv[1].dyThresh = mv[2].dyThresh = mv[3].dyThresh = mv->map->tiles->tileHeight * 2;\r
}\r
\r
+void ZC_mapredraw(map_view_t *mv, int tx, int ty)\r
+{\r
+ int py;//px,\r
+ unsigned int i;\r
+\r
+ py=0;\r
+ i=mv[0].ty * mv[0].map->width + mv[0].tx;\r
+ for(ty=mv[0].ty-1; py < mv[0].page->sh+mv->dyThresh && ty < mv[0].map->height; ty++, py+=mv[0].map->tiles->tileHeight) {\r
+ mapDrawWRow(&mv[0], tx-1, ty, py);\r
+ mapDrawWRow(&mv[1], tx-1, ty, py);\r
+ i+=mv->map->width - tx;\r
+ }\r
+}\r
+\r
void near\r
mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)\r
{\r
- word rx;\r
- word ry;\r
- //word textx=0, texty=0;\r
- //if(i==0) i=2;\r
- if(i==0)\r
- {\r
- //wwww\r
- modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, 1); //currently the over scan color!\r
- }\r
- else\r
+ word rx, ry;\r
+// printf("%02d ", i); if(x >= page->width - t->tileWidth) printf("\n");\r
+ switch(i)\r
{\r
- rx = (((i-1) % ((t->data->width)/t->tileWidth)) * t->tileWidth);\r
- ry = (((i-1) / ((t->data->height)/t->tileHeight)) * t->tileHeight);\r
-////0000printf("i=%d\n", i);\r
-#ifdef __DEBUG_MAP__\r
- switch(dbg_maptext)\r
- {\r
- case 0:\r
-#endif\r
+ case 0:\r
+ //wwww\r
+ 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
#ifndef TILERENDER\r
- if(!pagenorendermap) modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, ((dbg_mapdata[i])+1));\r
- //modexprint(page, x, y, 1, 15, 0, (char const *)(t->debug_data[i]));\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, (t->data));\r
- /* then the sprite. note modding ram ptr means we just draw to (x&3,0) */\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
+ 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
#endif\r
#ifdef __DEBUG_MAP__\r
- break;\r
- case 1:\r
- modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, (dbg_mapdata[i])+1);\r
- //modexprintbig(page, x, y, 1, 15, 0, (t->debug_data));\r
- /*for(texty=0; texty<2; texty++)\r
- {\r
- for(textx=0; textx<2; textx++)\r
- {*/\r
-// modexprint(page, x+(textx*8), y+(texty*8), 1, (word)(t->debug_data), 0, (t->debug_data));\r
-/* }\r
- }*/\r
- break;\r
- }\r
+ if(dbg_maptext){ sprintf(global_temp_status_text2, "%u", i); modexprint(page, x, y, 1, 0, 1, 2, 1, global_temp_status_text2); }\r
#endif\r
+ break;\r
}\r
}\r
-\r
-void near mapDrawRow(map_view_t *mv, int tx, int ty, word y, player_t *player, word poopoffset)\r
+#define PALMAPDRAWW 13\r
+void near mapDrawRow(map_view_t *mv, int tx, int ty, word y, player_t *player)\r
{\r
int i;\r
-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 defined(FULLRCREND) || defined(__DEBUG_RF__)\r
+ word drawtileoffset=0;\r
+//printf("y: %d ", drawtileoffset);\r
+ drawtileoffset%=player[0].enti.spt;\r
+//printf("%d\n", drawtileoffset);\r
+#endif\r
+#ifdef __DEBUG_RF__\r
+if(dbg_pagedelayrendermap){ if(!y) y+=TILEWH; else y-=TILEWH;\r
+ sprintf(global_temp_status_text, "%-3u", drawtileoffset); modexprint(mv->page, player[0].enti.x, player[0].enti.y-28-(drawtileoffset*8) , 1, 0, PALMAPDRAWW, 1, 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
- if(i>=0) /* we are in the map, so copy away! */\r
- mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, mv->dx, y);\r
+ /*\r
+ */\r
+#ifndef FULLRCREND\r
+ for( mv->dx=drawtileoffset; mv->dx<(mv->page->sw+mv->dxThresh)/(drawtileoffset+1) && tx < mv->map->width; mv->dx+=mv->map->tiles->tileWidth, tx++) {\r
+#else\r
+ for(mv->dx=0; mv->dx<mv->page->sw+mv->dxThresh && tx < mv->map->width; mv->dx+=mv->map->tiles->tileWidth, tx++) {\r
+#endif\r
+ if(i>=0)\r
+ mapDrawTile(mv->map->tiles, mv->map->layerdata[0].data[i], mv->page, mv->dx, y);\r
i++; /* next! */\r
}\r
-//if(pagedelayrendermap) delay(200);\r
+#ifdef __DEBUG_RF__\r
+if(dbg_pagedelayrendermap) DBG_RFDELAYMETHOD;\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
+\r
+\r
+\r
+\r
+\r
+\r
+void near mapDrawCol(map_view_t *mv, int tx, int ty, word x, player_t *player)\r
{\r
int i;\r
-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 defined(FULLRCREND) || defined(__DEBUG_RF__)\r
+ word drawtileoffset=0;\r
+//printf("x: %d ", drawtileoffset);\r
+ drawtileoffset%=player[0].enti.spt;\r
+//printf("%d\n", drawtileoffset);\r
+#endif\r
+#ifdef __DEBUG_RF__\r
+if(dbg_pagedelayrendermap){ if(!x) x+=TILEWH; else x-=TILEWH;\r
+ sprintf(global_temp_status_text, "%-3u", drawtileoffset); modexprint(mv->page, player[0].enti.x, player[0].enti.y-28-(drawtileoffset*8) , 1, 0, PALMAPDRAWW, 1, 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
i + 1 row above and one below */\r
- for( mv->dy=poopoffset; mv->dy<(mv->page->sh+mv->dyThresh)/(poopoffset+1) && ty < mv->map->height; mv->dy+=mv->map->tiles->tileHeight, ty++) {\r
- if(i>=0) /* we are in the map, so copy away! */\r
- mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, mv->dy);\r
+#ifndef FULLRCREND\r
+ for( mv->dy=drawtileoffset; mv->dy<(mv->page->sh+mv->dyThresh)/(drawtileoffset+1) && ty < mv->map->height; mv->dy+=mv->map->tiles->tileHeight, ty++) {\r
+#else\r
+ for(mv->dy=0; mv->dy<mv->page->sh+mv->dyThresh && ty < mv->map->height; mv->dy+=mv->map->tiles->tileHeight, ty++) {\r
+#endif\r
+ if(i>=0)\r
+ mapDrawTile(mv->map->tiles, mv->map->layerdata[0].data[i], mv->page, x, mv->dy);\r
i += mv->map->width;\r
}\r
-//if(pagedelayrendermap) delay(200);\r
+#ifdef __DEBUG_RF__\r
+if(dbg_pagedelayrendermap) DBG_RFDELAYMETHOD;\r
+#endif\r
}\r
\r
void mapDrawWRow(map_view_t *mv, int tx, int ty, word y)\r
{\r
- int i;\r
+ int i; nibble z;\r
\r
/* the position within the map array */\r
i=ty * mv->map->width + tx;\r
for(mv->dx=0; mv->dx<mv->page->sw+mv->dxThresh && tx < mv->map->width; mv->dx+=mv->map->tiles->tileWidth, tx++) {\r
- if(i>=0) /* we are in the map, so copy! */\r
- mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, mv->dx, y);\r
+ if(i>=0){ /* we are in the map, so copy! */\r
+ mapDrawTile(mv->map->tiles, mv->map->layerdata[0].data[i], mv->page, mv->dx, y);\r
+ for(z=1;z<=2;z++)\r
+ if(mv->map->layerdata[z].data[i]){\r
+ sprintf(global_temp_status_text2, "%u", mv->map->layerdata[z].data[i]); modexprint(mv->page, mv->dx, y, 1, 0, PALMAPDRAWW, z+2, 1, global_temp_status_text2);\r
+ //mapDrawTile(mv->map->tiles, mv->map->layerdata[z].data[i], mv->page, mv->dx, y);\r
+ }\r
+ }\r
i++; /* next! */\r
}\r
}\r
\r
void mapDrawWCol(map_view_t *mv, int tx, int ty, word x)\r
{\r
- int i;\r
+ int i; nibble z;\r
\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
i + 1 row above and one below */\r
for(mv->dy=0; mv->dy<mv->page->sh+mv->dyThresh && ty < mv->map->height; mv->dy+=mv->map->tiles->tileHeight, ty++) {\r
- if(i>=0) /* we are in the map, so copy away! */\r
- mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, mv->dy);\r
+ if(i>=0){ /* we are in the map, so copy away! */\r
+ mapDrawTile(mv->map->tiles, mv->map->layerdata[0].data[i], mv->page, x, mv->dy);\r
+ for(z=1;z<=2;z++)\r
+ if(mv->map->layerdata[z].data[i]){\r
+ sprintf(global_temp_status_text2, "%u", mv->map->layerdata[z].data[i]); modexprint(mv->page, x, mv->dy, 1, 0, PALMAPDRAWW, z+2, 1, global_temp_status_text2);\r
+ //mapDrawTile(mv->map->tiles, mv->map->layerdata[z].data[i], mv->page, x, mv->dy);\r
+ }\r
+ }\r
i += mv->map->width;\r
}\r
}\r
\r
-/*void qclean()\r
-{\r
- //setkb(0);\r
-}*/\r
-\r
-boolean pagenorendermap = 0;\r
-boolean pagedelayrendermap = 0;\r
\r
/* sync */\r
void shinku(global_game_variables_t *gv)\r
{\r
- word x = (0) + gv->video.page[/*!*/(gv->video.p)].dx; // follow the screen\r
- word y = (0) + gv->video.page[/*!*/(gv->video.p)].dy; // follow the screen\r
- word col = 2, bgcol = 1, type = 1;//w = 64, h = 8, //col7bgcol0\r
- //byte o,o2,i;\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[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[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
+#ifdef SHOWFPS\r
+ word x = gv->video.page[/*!*/(gv->video.p)].dx; //(gv->video.page[(gv->video.p)].tlx) - // follow the screen\r
+ word y = gv->video.page[/*!*/(gv->video.p)].dy; //(gv->video.page[(gv->video.p)].tly) - // follow the screen\r
+ word col = 2, bgcol = 1, type = 1;//w = 64, h = 8,\r
+#endif\r
if(elapsed_timer(gv) >= (1.0 / gv->kurokku.frames_per_second))\r
{\r
+#ifdef SHOWFPS\r
// NTS: For some bizarre reason, gv->pee is not initialized, but the pointer is not NULL even\r
// though it should be. Instead it's NULL as a neAr pointer but contains a non-null\r
// segment value, so testing against NULL doesn't work. It is initialized properly if\r
- // you call start_timer() though which uses neAr malloc. Rather than fight with that,\r
+ // you call start_timer() though which uses neAr mAlloc. Rather than fight with that,\r
// I decided it would be better to declare a temp buffer statically and sprintf to that.\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[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
+ //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, 1, 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
+#endif\r
gv->kurokku.tiku=0;\r
- /* block copy to visible RAM from offscreen */\r
-// vga_setup_wm1_block_copy();\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[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
gv->kurokku.tiku++;\r
\r
- switch(gv->kurokku.fpscap)\r
- {\r
- case 0:\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
- //turn this off if XT\r
- //modexWaitBorder();\r
- //vga_wait_for_vsync();\r
- gv->kurokku.frames_per_second=60;\r
- break;\r
- }\r
//render!!\r
- if(gv->video.r )\r
+ if(gv->video.dorender)\r
{//r=1\r
- if(gv->video.bgps )\r
- {//bgps=1\r
- /*modexCopyPageRegion(&(gv->video.page[\r
- ]), &(gv->video.page[(\r
- ]), 0, 0, 0, 0, gv->video.page[\r
- ].width, gv->video.page[\r
- ].height);*/\r
+ /*if(video->bgp s)\r
+ {\r
+ modexCopyPageRegion(&(gv->video.page[ ]), &(gv->video.page[ ]), 0, 0, 0, 0, gv->video.page[ ].width, gv->video.page[ ].height);\r
}else{\r
//modexCopyPageRegion(&video->page[0], &video->page[1], enti->x, enti->y, 0, 0, 24, 32);\r
- }\r
+ }*/\r
+#ifndef OLDWALKSHOWPAGESTUFF\r
VL_ShowPage(&(gv->video.page[gv->video.sp]), gv->kurokku.fpscap, 0);\r
- gv->video.r =!gv->video.r ;\r
+#endif\r
+ gv->video.dorender =!gv->video.dorender;\r
//0000gv->video.tickclk = ((*clockw)-gv->video.startclk)/18.2;\r
-// }\r
}\r
-}\r
-\r
-void near ZC_drawframe(map_view_t *pip, entity_t *enti, sword x, sword y)\r
-{\r
- switch(pip[0].video->rss)\r
- {\r
- case 0:\r
- animate_spri(enti, pip->video);\r
- break;\r
- case 1:\r
- animate_spri(enti, pip->video);\r
- break;\r
-// case 2:\r
-// modexClearRegion(&(pip[0].page[0]), x, y, 16, 32, player[pn].enti.dire);\r
-// break;\r
- }\r
-}\r
-\r
-#ifdef SPRITE\r
-#define FRAME1 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 48, player[pn].enti.dire, 24, 32, PLAYERBMPDATAPTR);\r
-#define FRAME2 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, player[pn].enti.dire, 24, 32, PLAYERBMPDATAPTR);\r
-#define FRAME3 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 0, player[pn].enti.dire, 24, 32, PLAYERBMPDATAPTR);\r
-#define FRAME4 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, player[pn].enti.dire, 24, 32, PLAYERBMPDATAPTR);\r
-#else\r
-#define FRAME1 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, 2+player[pn].enti.dire);\r
-#define FRAME2 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, 1+player[pn].enti.dire);\r
-#define FRAME3 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, player[pn].enti.dire);\r
-#define FRAME4 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, 1+player[pn].enti.dire);\r
-#endif\r
\r
-void animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch)\r
-{\r
- sword x = player[pn].enti.x;\r
- sword y = player[pn].enti.y;\r
- sword bx = x+16; //buffer's x\r
- sword by = y+16; //buffer's y\r
- sword qq; //scroll offset\r
- word ls = 0;//player[pn].enti.persist_aniframe;\r
- player[pn].enti.dire=32; //direction\r
-\r
- switch(scrollswitch)\r
- {\r
- case 0:\r
- qq = 0;\r
- break;\r
- default:\r
- qq = ((player[pn].enti.q)*(player[pn].enti.speed));\r
- break;\r
- }\r
- //x-=4;\r
- y-=pip[0].map->tiles->tileHeight;\r
- switch (player[pn].enti.d)\r
+ switch(gv->kurokku.fpscap)\r
{\r
- case 0:\r
- //up\r
- player[pn].enti.dire*=player[pn].enti.d;\r
- y-=qq;\r
- by-=4;\r
- break;\r
- case 3:\r
- // right\r
- player[pn].enti.dire*=(player[pn].enti.d-2);\r
- x+=qq;\r
- bx+=4;\r
- break;\r
- case 2:\r
- break;\r
- case 4:\r
- //down\r
- player[pn].enti.dire*=(player[pn].enti.d-2);\r
- y+=qq;\r
- by+=4;\r
- break;\r
- case 1:\r
- //left\r
- player[pn].enti.dire*=(player[pn].enti.d+2);\r
- x-=qq;\r
- bx-=4;\r
+ case 0: //turn this off if XT\r
+ //modexprint(&(gv->video.page[0]), x, y+8, type, 1, col, bgcol, "sanic!");\r
+ gv->kurokku.frames_per_second=1;\r
break;\r
- }\r
-\r
- if(pip[0].video->bgps) modexCopyPageRegion(pip[0].page, pip[1].page, x-4, y-4, x-4, y-4, 28, 36);\r
-// else{\r
-// //copy old bg to page0\r
-// //modexCopyPageRegion(pip[3].page, pip[0].page, bx, by, 0, 0, 20, 36);\r
-// //update buffer\r
-// //modexCopyPageRegion(pip[0].page, pip[3].page, 0, 0, x, y, 20, 36);\r
-// }\r
-//modexCopyPageRegion(page_t *dest, page_t *src, word sx, word sy, word dx, word dy, word width, word height);\r
- //modexCopyPageRegion(pip[3].page, pip[!(pip->video->p)].page, x-4, y-4, 0, 128, 28, 36);\r
- /*modexCopyPageRegion(pip[pip->video->p].page,\r
- pip[!(pip->video->p)].page, x-4, y-4, x-4, y-4, 28, 36);*/\r
-// else modexCopyPageRegion(pip[1].page, pip[0].page, x-4, y-4, x-4, y-4, 28, 40);\r
- switch(ls)\r
- {\r
case 1:\r
- FRAME1\r
- break;\r
- case 2:\r
- FRAME2\r
- break;\r
- case 3:\r
- FRAME3\r
- break;\r
- case 4:\r
- FRAME4\r
+//#ifndef OLDWALKSHOWPAGESTUFF\r
+ //vga_wait_for_vsync();\r
+ vga_wait_for_vsync_end();\r
+//#else\r
+ //modexWaitBorder();\r
+//#endif\r
+ gv->kurokku.frames_per_second=FPSVALUE;\r
break;\r
}\r
-// if(2>ls && ls>=1) { FRAME1 }else\r
-// if(3>ls && ls>=2) { FRAME2 }else\r
-// if(4>ls && ls>=3) { FRAME3 }else\r
-// if(5>ls && ls>=4) { FRAME4 }\r
- //modexCopyPageRegion(pip[0].page, pip[3].page, 0, 0, x, y, 24, 32);\r
- //printf("x=%d y=%d bx=%d by=%d\n", x, y, bx, by);\r
- pip->video->r=1;\r
+ PM_NextFrame(gv);\r
}\r
\r
-void near ZC_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)\r
{\r
sword x = player[pn].enti.x;\r
sword y = player[pn].enti.y;\r
sword qq,dd; //scroll offset\r
player[pn].enti.dire=10; //direction\r
\r
- switch(scrollswitch)\r
+ switch(player[pn].walktype)\r
{\r
case 0:\r
dd = 0;\r
break;\r
case 2:\r
dd = 1;\r
- qq = ((player[pn].enti.q)*(player[pn].enti.speed));\r
+ qq = player[pn].enti.q*player[pn].enti.spt;\r
break;\r
}\r
x-=4;\r
break;\r
}\r
player[pn].enti.dire+=dd;\r
- if((player[pn].enti.q==1 && player[pn].enti.pred != player[pn].enti.d) || !dd)\r
+ //setting xy position\r
+ player[pn].enti.spri.x = x;\r
+ player[pn].enti.spri.y = y;\r
+\r
+ if((player[pn].enti.q==1 && player[pn].enti.pred != player[pn].enti.d) || !dd)//when dir changed OR when player change face direction\r
{\r
- set_anim_by_id(player[pn].enti.spri, player[pn].enti.dire); //pip->video->sprifilei = set_anim_by_id(player[pn].enti.spri, player[pn].enti.dire); if(pip->video->sprifilei == -1){ printf("ERROR! %u\n", player[pn].enti.dire); return; }\r
+ //0000printf(" q=%u pred=%u d=%u dd=%u\n", player[pn].enti.q, player[pn].enti.pred, player[pn].enti.d, dd);\r
+ set_anim_by_id(&player[pn].enti.spri, player[pn].enti.dire); //pip->video->sprifilei = set_anim_by_id(player[pn].enti.spri, player[pn].enti.dire); if(pip->video->sprifilei == -1){ printf("ERROR! %u\n", player[pn].enti.dire); return; }\r
player[pn].enti.pred = player[pn].enti.d;\r
+ if(!dd)//changed direction while NOT moving!\r
+ {\r
+ modexCopyPageRegion(pip[0].page, pip[1].page, x-4, y-4, x-4, y-4, 28, 40);\r
+ animate_spri(&player[pn].enti, pip[0].video);\r
+ }\r
}\r
\r
- //setting xy position\r
- player[pn].enti.spri->x = x;\r
- player[pn].enti.spri->y = y;\r
+ if(pip[0].video->vga_state.bgps && dd)//if moving wwww\r
+ {\r
+ modexCopyPageRegion(pip[0].page, pip[1].page, x-4, y-4, x-4, y-4, 28, 40);\r
\r
- //draw sprite\r
- ZC_drawframe(pip, &player[pn].enti, x, y);\r
-//0000if(player[pn].enti.q<2) delay(200);\r
- pip->video->r=1;\r
+ //draw sprite\r
+ animate_spri(&player[pn].enti, pip[0].video);\r
+ }\r
+//0000if(player[pn].enti.q<4) delay(200);\r
+#ifdef OLDWALKSHOWPAGESTUFF\r
+ modexWaitBorder();\r
+#endif\r
}\r
\r
/*\r
}\r
}\r
\r
+/*\r
+ * end\r
+ */\r
+\r
+\r
void mapScroll(map_view_t *mv, player_t *player)\r
{\r
//word x, y; /* coordinate for drawing */\r
default:\r
break;\r
}\r
+}\r
\r
- mv->video->r=1;\r
+void ZC_GirdChk (global_game_variables_t *gvar, player_t *player)\r
+{\r
+ if((player->enti.q==1) &&\r
+ !(player->enti.x%gvar->mv[0].map->tiles->tileWidth==0 && player->enti.y%gvar->mv[0].map->tiles->tileHeight==0))\r
+ ZC_PlayerXYpos(0, 0, player, gvar->mv, 1);\r
+ //TODO: MAKE SURE TO RESYNC PLAYER IN WALKABLE SPOT\r
}\r
OSDN Git Service
