*/\r
#include "src/lib/scroll16.h"\r
\r
-#define INC_PER_FRAME_PRINT sprintf(global_temp_status_text, "%u", player[pn].enti.persist_aniframe);\\r
-modexprint(&(pip->video->page[0]), player[pn].enti.x-(8*player[pn].enti.persist_aniframe), player[pn].enti.y-TILEWH-(8*player[pn].enti.persist_aniframe), 1, 20, 1, global_temp_status_text);\r
-\r
-//#define WALKTYPE_FRAM_PRINT INC_PER_FRAME_PRINT\r
-//walktypeinfo(player, pn);\r
-//modexprint(&(pip->video->page[0]), player[pn].enti.x-(8*player[pn].enti.persist_aniframe)+8, player[pn].enti.y-TILEWH-(8*player[pn].enti.persist_aniframe), 1, 20, 1, global_temp_status_text);\r
-\r
-#define PERSIST_ANIFRAME_INIT 1\r
-#define Q_INIT PERSIST_ANIFRAME_INIT\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 = PERSIST_ANIFRAME_INIT;\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
\r
void ZC_walk(map_view_t *pip, player_t *player, word pn)\r
{\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].enti.tx == pip[0].tx+pip[0].page->tilemidposscreenx &&\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
{\r
player[pn].walktype=2;\r
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
- INC_PER_FRAME;\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 = Q_INIT; player[pn].enti.d = 2; player[pn].enti.tx++; }\r
+ } else { player[pn].enti.q = 1; player[pn].enti.d = 2; 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
{\r
player[pn].walktype=1;\r
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
- INC_PER_FRAME;\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 = Q_INIT; player[pn].enti.d = 2; player[pn].enti.tx++; }\r
+ } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx++; }\r
}\r
else\r
{\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].enti.tx == pip[0].tx+pip[0].page->tilemidposscreenx &&\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
{\r
player[pn].walktype=2;\r
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
- INC_PER_FRAME;\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 = Q_INIT; player[pn].enti.d = 2; player[pn].enti.tx--; }\r
+ } else { player[pn].enti.q = 1; player[pn].enti.d = 2; 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
{\r
player[pn].walktype=1;\r
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
- INC_PER_FRAME;\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 = Q_INIT; player[pn].enti.d = 2; player[pn].enti.tx--; }\r
+ } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx--; }\r
}\r
else\r
{\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].enti.ty == pip[0].ty+pip[0].page->tilemidposscreeny &&\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
{\r
player[pn].walktype=2;\r
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
- INC_PER_FRAME;\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 = Q_INIT; player[pn].enti.d = 2; player[pn].enti.ty++; }\r
+ } else { player[pn].enti.q = 1; player[pn].enti.d = 2; 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
{\r
player[pn].walktype=1;\r
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
- INC_PER_FRAME;\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 = Q_INIT; player[pn].enti.d = 2; player[pn].enti.ty++; }\r
+ } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty++; }\r
}\r
else\r
{\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].enti.ty == pip[0].ty+pip[0].page->tilemidposscreeny &&\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
{\r
player[pn].walktype=2;\r
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
- INC_PER_FRAME;\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 = Q_INIT; player[pn].enti.d = 2; player[pn].enti.ty--; }\r
+ } else { player[pn].enti.q = 1; player[pn].enti.d = 2; 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
{\r
player[pn].walktype=1;\r
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
- INC_PER_FRAME;\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 = Q_INIT; player[pn].enti.d = 2; player[pn].enti.ty--; }\r
+ } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty--; }\r
}\r
else\r
{\r
}\r
\r
\r
-/*\r
-src/lib/scroll16.c: mv[0].video->r=1;\r
-src/lib/scroll16.c: mv[0].video->r=1;\r
-src/lib/scroll16.c: mv[0].video->r=1;\r
-src/lib/scroll16.c: mv[0].video->r=1;\r
-src/lib/scroll16.c: pip->video->r=1;\r
-src/lib/scroll16.c: mv->video->r=1;\r
- */\r
-\r
-void oldwalk(map_view_t *pip, player_t *player, word pn)\r
-{\r
- //printf("player[%d].d=%d\n", pn, player[pn].enti.d);\r
- switch(player[pn].enti.d)\r
- {\r
- //no direction\r
- case 2:\r
- //0000pip[0].video->startclk = (*clockw);\r
- break;\r
- //right movement\r
- case 3:\r
- //printf("pip[0].page->tilesw=%d ", pip[0].page->tilesw); printf("pip[0].page->tw=%d\n", pip[0].page->tw);\r
- if(pip[0].tx >= 0 && pip[0].tx+pip[0].page->tw < pip[0].map->width && player[pn].enti.tx == pip[0].tx+pip[0].page->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
- {\r
- if(player[pn].enti.q<=player[pn].enti.spt)\r
- {\r
- INC_PER_FRAME;\r
- ANIMATESPRIFUN(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
- mapScrollRight(pip, player, (pip[0].video->p), pn);\r
- if(!pageflipflop) modexShowPage(pip[1].page);\r
- player[pn].enti.q++;\r
- //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
- } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; 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
- {\r
- if(player[pn].enti.q<=player[pn].enti.spt)\r
- {\r
- INC_PER_FRAME;\r
- player[pn].enti.x+=(player[pn].enti.speed);\r
- ANIMATESPRIFUN(pip, player, pn, 0);\r
- if(!pageflipflop) modexShowPage(pip[1].page);\r
- player[pn].enti.q++;\r
- } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.tx++; }\r
- }\r
- else\r
- {\r
- if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].enti.x, player[pn].enti.y-TILEWH, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 32);\r
-#ifdef SPRITE\r
- modexDrawSpriteRegion(pip[0].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 32, 24, 32, PLAYERBMPDATAPTR);\r
-#else\r
- modexClearRegion(pip[1].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 32, 14);\r
-#endif\r
- if(!pageflipflop) modexShowPage(pip[1].page);\r
- player[pn].enti.d = 2;\r
- }\r
- player[pn].enti.triggerx = player[pn].enti.tx+1;\r
- player[pn].enti.triggery = player[pn].enti.ty;\r
- break;\r
-\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].enti.tx == pip[0].tx+pip[0].page->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
- {\r
- if(player[pn].enti.q<=player[pn].enti.spt)\r
- {\r
- INC_PER_FRAME;\r
- ANIMATESPRIFUN(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
- mapScrollLeft(pip, player, (pip[0].video->p), pn);\r
- if(!pageflipflop) modexShowPage(pip[1].page);\r
- player[pn].enti.q++;\r
- //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
- } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; 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
- {\r
- if(player[pn].enti.q<=player[pn].enti.spt)\r
- {\r
- INC_PER_FRAME;\r
- player[pn].enti.x-=(player[pn].enti.speed);\r
- ANIMATESPRIFUN(pip, player, pn, 0);\r
- if(!pageflipflop) modexShowPage(pip[1].page);\r
- player[pn].enti.q++;\r
- } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.tx--; }\r
- }\r
- else\r
- {\r
- if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].enti.x, player[pn].enti.y-TILEWH, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 32);\r
-#ifdef SPRITE\r
- modexDrawSpriteRegion(pip[0].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 96, 24, 32, PLAYERBMPDATAPTR);\r
-#else\r
- modexClearRegion(pip[1].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 32, 10);\r
-#endif\r
- if(!pageflipflop) modexShowPage(pip[1].page);\r
- player[pn].enti.d = 2;\r
- }\r
- player[pn].enti.triggerx = player[pn].enti.tx-1;\r
- player[pn].enti.triggery = player[pn].enti.ty;\r
- break;\r
-\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].enti.ty == pip[0].ty+pip[0].page->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
- {\r
- if(player[pn].enti.q<=player[pn].enti.spt)\r
- {\r
- INC_PER_FRAME;\r
- ANIMATESPRIFUN(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
- mapScrollDown(pip, player, (pip[0].video->p), pn);\r
- if(!pageflipflop) modexShowPage(pip[1].page);\r
- player[pn].enti.q++;\r
- //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
- } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; 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
- {\r
- if(player[pn].enti.q<=player[pn].enti.spt)\r
- {\r
- INC_PER_FRAME;\r
- player[pn].enti.y+=(player[pn].enti.speed);\r
- ANIMATESPRIFUN(pip, player, pn, 0);\r
- if(!pageflipflop) modexShowPage(pip[1].page);\r
- player[pn].enti.q++;\r
- } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.ty++; }\r
- }\r
- else\r
- {\r
- if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].enti.x, player[pn].enti.y-TILEWH, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 32);\r
-#ifdef SPRITE\r
- modexDrawSpriteRegion(pip[0].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 64, 24, 32, PLAYERBMPDATAPTR);\r
-#else\r
- modexClearRegion(pip[1].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 32, 9);\r
-#endif\r
- if(!pageflipflop) modexShowPage(pip[1].page);\r
- player[pn].enti.d = 2;\r
- }\r
- player[pn].enti.triggerx = player[pn].enti.tx;\r
- player[pn].enti.triggery = player[pn].enti.ty+1;\r
- break;\r
-\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].enti.ty == pip[0].ty+pip[0].page->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
- {\r
- if(player[pn].enti.q<=player[pn].enti.spt)\r
- {\r
- INC_PER_FRAME;\r
- ANIMATESPRIFUN(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
- mapScrollUp(pip, player, (pip[0].video->p), pn);\r
- if(!pageflipflop) modexShowPage(pip[1].page);\r
- player[pn].enti.q++;\r
- //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
- } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; 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
- {\r
- if(player[pn].enti.q<=player[pn].enti.spt)\r
- {\r
- INC_PER_FRAME;\r
- player[pn].enti.y-=(player[pn].enti.speed);\r
- ANIMATESPRIFUN(pip, player, pn, 0);\r
- if(!pageflipflop) modexShowPage(pip[1].page);\r
- player[pn].enti.q++;\r
- } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.ty--; }\r
- }\r
- else\r
- {\r
- if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].enti.x, player[pn].enti.y-TILEWH, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 32);\r
-#ifdef SPRITE\r
- modexDrawSpriteRegion(pip[0].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 0, 24, 32, PLAYERBMPDATAPTR);\r
-#else\r
- modexClearRegion(pip[1].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 32, 12);\r
-#endif\r
- if(!pageflipflop) modexShowPage(pip[1].page);\r
- player[pn].enti.d = 2;\r
- }\r
- player[pn].enti.triggerx = player[pn].enti.tx;\r
- player[pn].enti.triggery = player[pn].enti.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
//right movement\r
case 3:\r
- if(pip[0].tx >= 0 && pip[0].tx+pip[0].page->tw < pip[0].page->tilesw)\r
+ if(pip[0].tx >= 0 && pip[0].tx+pip[0].page->ti.tw < pip[0].page->ti.tilesw)\r
{\r
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
pip[0].page->dx+=4;\r
SHOWMVFUN_;\r
player[pn].enti.q++;\r
- } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; pip[0].tx++; }\r
+ } else { player[pn].enti.q = 1; player[pn].enti.d = 2; pip[0].tx++; }\r
}\r
break;\r
\r
//left movement\r
case 1:\r
- if(pip[0].tx > 0 && pip[0].tx+pip[0].page->tw <= pip[0].page->tilesw)\r
+ if(pip[0].tx > 0 && pip[0].tx+pip[0].page->ti.tw <= pip[0].page->ti.tilesw)\r
{\r
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
pip[0].page->dx-=4;\r
SHOWMVFUN_;\r
player[pn].enti.q++;\r
- } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; pip[0].tx--; }\r
+ } else { player[pn].enti.q = 1; player[pn].enti.d = 2; pip[0].tx--; }\r
}\r
break;\r
\r
//down movement\r
case 4:\r
- if(pip[0].ty >= 0 && pip[0].ty+pip[0].page->th < pip[0].page->tilesh)\r
+ if(pip[0].ty >= 0 && pip[0].ty+pip[0].page->ti.th < pip[0].page->ti.tilesh)\r
{\r
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
pip[0].page->dy+=4;\r
SHOWMVFUN_;\r
player[pn].enti.q++;\r
- } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; pip[0].ty++; }\r
+ } else { player[pn].enti.q = 1; player[pn].enti.d = 2; pip[0].ty++; }\r
}\r
break;\r
\r
//up movement\r
case 0:\r
- if(pip[0].ty > 0 && pip[0].ty+pip[0].page->th <= pip[0].page->tilesh)\r
+ if(pip[0].ty > 0 && pip[0].ty+pip[0].page->ti.th <= pip[0].page->ti.tilesh)\r
{\r
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
pip[0].page->dy-=4;\r
SHOWMVFUN_;\r
player[pn].enti.q++;\r
- } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; pip[0].ty--; }\r
+ } else { player[pn].enti.q = 1; player[pn].enti.d = 2; pip[0].ty--; }\r
}\r
break;\r
}\r
pip[0].page = &gv->video.page[0];\r
pip[0].map = map;\r
pip[0].video = &gv->video;\r
- pip[0].panp = &gv->video.panp;\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[i].page = &gv->video.page[i];\r
pip[i].map = pip[0].map;\r
pip[i].video = pip[0].video;\r
- pip[i].panp = pip[0].panp;\r
+ pip[i].p = pip[0].p;\r
+ pip[i].sp = pip[0].sp;\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].video->panp].page->data;\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
\r
switch(sr)\r
{\r
case 1:\r
- crtcOffset = moo[0].page->sw >> 3;\r
+ crtcOffset = moo[moo[0].video->sp].page->sw >> 3;\r
break;\r
default:\r
case 0:\r
\r
/* draw the next column */\r
x= mv[0].page->sw + mv[id].map->tiles->tileWidth;\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->tw, mv[0].ty-1, x, player, mv->page[0].dx);\r
- else\r
- if(!pageflipflop && !pageploop)\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->th+2));\r
+ mapDrawCol(&mv[0], mv[0].tx + mv[0].page->ti.tw, mv[0].ty-1, x, player, DRAWCOLNUM);\r
+// else\r
+// if(!pageflipflop && !pageploop)\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
}\r
\r
\r
/* draw the next column */\r
x= 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, mv->page[0].dx);\r
- else\r
- if(!pageflipflop && !pageploop)\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->th+2));\r
+ mapDrawCol(&mv[0], mv[0].tx - 1, mv[0].ty-1, x, player, DRAWCOLNUM);\r
+// else\r
+// if(!pageflipflop && !pageploop)\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
}\r
\r
/* check to see if this changes the tile */\r
if(mv[id].page[0].dy == 0 )\r
{\r
- /* go down one tile */\r
+ /* go up one tile */\r
mv[id].ty--;\r
- /* Snap the origin downward */\r
+ /* Snap the origin upward */\r
mv[id].page->data -= mv[id].page->pi;\r
\r
mv[id].page[0].dy = mv[id].map->tiles->tileHeight;\r
\r
/* draw the next row */\r
y= 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, mv->page[0].dy);\r
- else\r
- if(!pageflipflop && !pageploop)\r
- modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*(mv[0].page->tw+2), mv[id].map->tiles->tileHeight);\r
+ mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty-1, y, player, DRAWCOLNUM);\r
+// else\r
+// if(!pageflipflop && !pageploop)\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
}\r
\r
+\r
void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid)\r
{\r
word y;//x, /* coordinate for drawing */\r
\r
/* draw the next row */\r
y= mv[0].page->sh + mv[id].map->tiles->tileHeight;\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->th, y, player, mv->page[0].dy);\r
- else\r
- if(!pageflipflop && !pageploop)\r
- modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*(mv[0].page->tw+2), mv[id].map->tiles->tileHeight);\r
+ mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty+mv[0].page->ti.th, y, player, DRAWCOLNUM);\r
+// else\r
+// if(!pageflipflop && !pageploop)\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
}\r
\r
//default player position on the viewable map\r
void playerXYpos(int x, int y, player_t *player, map_view_t *pip, nibble pn)\r
{\r
- player[pn].enti.tx = x + pip[0].tx + pip[0].page->tilemidposscreenx;\r
- player[pn].enti.ty = y + pip[0].ty + pip[0].page->tilemidposscreeny;\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
}\r
//===========================================================================\r
\r
mapDrawWRow(&mv[0], tx-1, ty, py);\r
i+=mv->map->width - tx;\r
}\r
- //if(!pageploop)\r
- modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height);\r
-// {\r
-// unsigned int k,j,o;\r
-// /* fill screen with a distinctive pattern */\r
-// for (k=0;k < vga_state.vga_width;k++) {\r
-// o = k >> 2;\r
-// vga_write_sequencer(0x02/*map mask*/,1 << (k&3));\r
-// for (j=0;j < (mv[0].page->height)+(mv[1].page->height)+(mv[2].page->height)+(mv[3].page->height);j++,o += vga_state.vga_stride)\r
-// vga_state.vga_graphics_ram[o] = (k^j)&15; // VRL samples put all colors in first 15!\r
-// }\r
-// }\r
+// if(!pageploop) 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
}\r
\r
if(i==0)\r
{\r
//wwww\r
- modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, 0); //currently the over scan color!\r
+ modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, 1); //currently the over scan color!\r
}\r
else\r
{\r
case 0:\r
#endif\r
#ifndef TILERENDER\r
- modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, ((dbg_mapdata[i])+1));\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
#else\r
modexDrawBmpRegion (page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data));\r
\r
void near mapDrawRow(map_view_t *mv, int tx, int ty, word y, player_t *player, word poopoffset)\r
{\r
- word x;\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
/* the position within the map array */\r
i=ty * mv->map->width + tx;\r
- for(x=poopoffset; x<(mv->page->sw+mv->dxThresh)/(poopoffset+1) && tx < mv->map->width; x+=mv->map->tiles->tileWidth, tx++) {\r
- if(i>=0) {\r
- /* we are in the map, so copy! */\r
- mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);\r
- }\r
- i++; /* next! */\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
+ i++; /* next! */\r
}\r
+//if(pagedelayrendermap) delay(200);\r
}\r
\r
void near mapDrawCol(map_view_t *mv, int tx, int ty, word x, player_t *player, word poopoffset)\r
{\r
- int y;\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
/* location in the map array */\r
i=ty * mv->map->width + tx;\r
-\r
/* We'll copy all of the columns in the screen,\r
i + 1 row above and one below */\r
- for(y=poopoffset; y<(mv->page->sh+mv->dyThresh)/(poopoffset+1) && ty < mv->map->height; y+=mv->map->tiles->tileHeight, ty++) {\r
- if(i>=0) {\r
- /* we are in the map, so copy away! */\r
- mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);\r
- }\r
- i += mv->map->width;\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
+ i += mv->map->width;\r
}\r
+//if(pagedelayrendermap) delay(200);\r
}\r
\r
void mapDrawWRow(map_view_t *mv, int tx, int ty, word y)\r
{\r
- word x;\r
int i;\r
\r
/* the position within the map array */\r
i=ty * mv->map->width + tx;\r
- for(x=0; x<mv->page->sw+mv->dxThresh && tx < mv->map->width; x+=mv->map->tiles->tileWidth, tx++) {\r
- if(i>=0) {\r
- /* we are in the map, so copy! */\r
- mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);\r
- }\r
- i++; /* next! */\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
+ i++; /* next! */\r
}\r
}\r
\r
void mapDrawWCol(map_view_t *mv, int tx, int ty, word x)\r
{\r
- int y;\r
int i;\r
\r
/* location in the map array */\r
\r
/* We'll copy all of the columns in the screen,\r
i + 1 row above and one below */\r
- for(y=0; y<mv->page->sh+mv->dyThresh && ty < mv->map->height; y+=mv->map->tiles->tileHeight, ty++) {\r
- if(i>=0) {\r
- /* we are in the map, so copy away! */\r
- mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);\r
- }\r
- i += mv->map->width;\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
+ i += mv->map->width;\r
}\r
}\r
\r
//setkb(0);\r
}*/\r
\r
-boolean pageflipflop = 1;\r
-boolean pageploop = 1;\r
+//boolean pageflipflop = 1;\r
+//boolean pageploop = 1;\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 = 7, bgcol = 0, type = 1;//w = 64, h = 8,\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
if(elapsed_timer(gv) >= (1.0 / gv->kurokku.frames_per_second))\r
{\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
+ // 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
case 1:\r
//turn this off if XT\r
//modexWaitBorder();\r
- vga_wait_for_vsync();\r
+ //vga_wait_for_vsync();\r
gv->kurokku.frames_per_second=60;\r
break;\r
}\r
- if(pageflipflop){\r
- if(gv->video.r){\r
+ //render!!\r
+// if(pageflipflop){\r
+ if(gv->video.r ){//r=1\r
//vga_setup_wm1_block_copy();\r
//_fmemcpy((gv->video.page[(gv->video.p)]).data, (gv->video.page[(!gv->video.p)]).data, gv->video.page[(!gv->video.p)].pagesize);\r
//vga_restore_rm0wm0();\r
- if(!pageploop) modexCopyPageRegion(&(gv->video.page[(gv->video.p)]), &(gv->video.page[(!gv->video.p)]), 0, 0, 0, 0, gv->video.page[gv->video.p].width, gv->video.page[!gv->video.p].height);\r
- modexShowPage(&(gv->video.page[gv->video.p]));\r
- if(!pageploop) gv->video.p=!gv->video.p;\r
- gv->video.r=!gv->video.r;\r
+// if(!pageploop) modexCopyPageRegion(&(gv->video.page[(gv->video.p)]), &(gv->video.page[(!gv->video.p)]), 0, 0, 0, 0, gv->video.page[gv->video.p].width, gv->video.page[!gv->video.p].height);\r
+ VL_ShowPage(&(gv->video.page[gv->video.sp]), gv->kurokku.fpscap, 0);\r
+// if(!pageploop) gv->video.p=!gv->video.p;\r
+ gv->video.r =!gv->video.r ;\r
//0000gv->video.tickclk = ((*clockw)-gv->video.startclk)/18.2;\r
- }\r
+// }\r
}\r
}\r
\r
-void near ZC_drawframe(map_view_t *pip, player_t *player, word pn, sword x, sword y, word sw)\r
+void near ZC_drawframe(map_view_t *pip, entity_t *enti, sword x, sword y)\r
{\r
- switch(pip[0].video->rs)\r
+ switch(pip[0].video->rss)\r
{\r
case 0:\r
- animate_spri(player[pn].ent->spri, pip->video);\r
+ animate_spri(enti, pip->video);\r
break;\r
case 1:\r
- oldanimate_spri(player[pn].ent->spri, pip->video);\r
- break;\r
- case 2:\r
- modexClearRegion(&(pip[0].page[0]), x, y, 16, 32, player[pn].enti.dire);\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
#define FRAME4 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, 1+player[pn].enti.dire);\r
#endif\r
\r
-void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch)\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 = player[pn].enti.persist_aniframe;\r
+ word ls = 0;//player[pn].enti.persist_aniframe;\r
player[pn].enti.dire=32; //direction\r
\r
switch(scrollswitch)\r
break;\r
}\r
\r
- if(!pageflipflop)\r
- modexCopyPageRegion(pip[1].page, pip[0].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
+// if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].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
sword x = player[pn].enti.x;\r
sword y = player[pn].enti.y;\r
sword qq,dd; //scroll offset\r
- word ls = player[pn].enti.persist_aniframe;\r
player[pn].enti.dire=10; //direction\r
\r
switch(scrollswitch)\r
qq = ((player[pn].enti.q)*(player[pn].enti.speed));\r
break;\r
}\r
- if(pip[0].video->rs<2)\r
- x-=4;\r
+ x-=4;\r
y-=pip[0].map->tiles->tileHeight;\r
switch (player[pn].enti.d)\r
{\r
break;\r
}\r
player[pn].enti.dire+=dd;\r
- player[pn].ent->spri->delay=1;\r
- if(player[pn].enti.q==1)\r
- set_anim_by_id(player[pn].ent->spri, player[pn].enti.dire);\r
- //pip->video->sprifilei = set_anim_by_id(player[pn].ent->spri, player[pn].enti.dire); if(pip->video->sprifilei == -1){ printf("ERROR! %u\n", player[pn].enti.dire); return; }\r
+ if((player[pn].enti.q==1 && player[pn].enti.pred != player[pn].enti.d) || !dd)\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
+ player[pn].enti.pred = player[pn].enti.d;\r
+ }\r
\r
//setting xy position\r
- player[pn].ent->spri->x = x;\r
- player[pn].ent->spri->y = y;\r
+ player[pn].enti.spri->x = x;\r
+ player[pn].enti.spri->y = y;\r
\r
- switch(ls)\r
- {\r
- case 1:\r
- ZC_drawframe(pip, player, pn, x, y, ls);\r
- break;\r
- case 2:\r
- ZC_drawframe(pip, player, pn, x, y, ls);\r
- break;\r
- case 3:\r
- ZC_drawframe(pip, player, pn, x, y, ls);\r
- break;\r
- case 4:\r
- ZC_drawframe(pip, player, pn, x, y, ls);\r
- break;\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
- if(player[pn].enti.persist_aniframe!=player[pn].enti.q)\r
- {\r
- sprintf(global_temp_status_text, "[%u]%u", player[pn].enti.persist_aniframe, player[pn].enti.q);\r
- modexprint(&(pip->video->page[0]), player[pn].enti.x-(8*player[pn].enti.persist_aniframe), player[pn].enti.y-TILEWH-(8*player[pn].enti.persist_aniframe), 1, 20, 1, global_temp_status_text);\r
- delay(500);\r
- }\r
- //WALKTYPE_FRAM_PRINT;\r
- //sprintf(global_temp_status_text, " %u", player[pn].enti.dire);\r
- //modexprint(&(pip->video->page[0]), player[pn].enti.x-(8*player[pn].enti.persist_aniframe)+8, player[pn].enti.y-TILEWH-(8*player[pn].enti.persist_aniframe), 1, 20, 1, global_temp_status_text);\r
}\r
\r
/*\r
return dx && 1;//crossable_tile(x + dx, map_v) || dy && crossable_tile(y + dy, map_v);\r
}\r
\r
-boolean ZC_walk2(entity_t *ent, map_view_t *map_v)\r
+boolean ZC_walk2(entity_t *enti, map_view_t *map_v)\r
{\r
//return 1;\r
int dx = 1;\r
int dy = 1;\r
- switch(ent->d)\r
+ switch(enti->d)\r
{\r
case 2:\r
return 0;\r
dx = 0;\r
break;\r
}\r
- if(coll_check(ent->x, ent->y, dx, dy, map_v))\r
+ if(coll_check(enti->x, enti->y, dx, dy, map_v))\r
{\r
// Allow movement\r
// Set speed\r
\r
void player_walk(player_t *player, map_view_t *map_v){\r
int dx=16, dy=16;\r
- if(ZC_walk2(&(player->enti), 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->enti), map_v) && boundary_check(map_v->tx, map_v->ty, dx, dy, map_v->map->width - 2*map_v->page->ti.tilesw, map_v->map->height - 2*map_v->page->ti.tilesh))\r
{\r
mapScroll(map_v, player);\r
// (Un)load stuff?\r
}\r
}\r
\r
-void near mapScroll(map_view_t *mv, player_t *player)\r
+void mapScroll(map_view_t *mv, player_t *player)\r
{\r
//word x, y; /* coordinate for drawing */\r
int c = 1;\r
projects / 16.git / blobdiff