/* Project 16 Source Code~\r
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
*\r
* This file is part of Project 16.\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
- 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
+ ZC_animatePlayer(pip, player, pn);\r
+ ZC_mapScroll(pip, player, 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
player[pn].walktype=1;\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, 1);\r
+ ZC_animatePlayer(pip, player, pn);\r
player[pn].enti.q++;\r
} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx++; }\r
}\r
else\r
{\r
player[pn].walktype=0;\r
- ANIMATESPRIFUN(pip, player, pn, 0);\r
+ ZC_animatePlayer(pip, player, pn);\r
player[pn].enti.d = 2;\r
}\r
player[pn].enti.triggerx = player[pn].enti.tx+1;\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
- 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
+ ZC_animatePlayer(pip, player, pn);\r
+ ZC_mapScroll(pip, player, 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
player[pn].walktype=1;\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, 1);\r
+ ZC_animatePlayer(pip, player, pn);\r
player[pn].enti.q++;\r
} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx--; }\r
}\r
else\r
{\r
player[pn].walktype=0;\r
- ANIMATESPRIFUN(pip, player, pn, 0);\r
+ ZC_animatePlayer(pip, player, pn);\r
player[pn].enti.d = 2;\r
}\r
player[pn].enti.triggerx = player[pn].enti.tx-1;\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
- 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
+ ZC_animatePlayer(pip, player, pn);\r
+ ZC_mapScroll(pip, player, 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
player[pn].walktype=1;\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, 1);\r
+ ZC_animatePlayer(pip, player, pn);\r
player[pn].enti.q++;\r
} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty++; }\r
}\r
else\r
{\r
player[pn].walktype=0;\r
- ANIMATESPRIFUN(pip, player, pn, 0);\r
+ ZC_animatePlayer(pip, player, pn);\r
player[pn].enti.d = 2;\r
}\r
player[pn].enti.triggerx = player[pn].enti.tx;\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
- 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
+ ZC_animatePlayer(pip, player, pn);\r
+ ZC_mapScroll(pip, player, 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
player[pn].walktype=1;\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, 1);\r
+ ZC_animatePlayer(pip, player, pn);\r
player[pn].enti.q++;\r
} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty--; }\r
}\r
else\r
{\r
player[pn].walktype=0;\r
- ANIMATESPRIFUN(pip, player, pn, 0);\r
+ ZC_animatePlayer(pip, player, pn);\r
player[pn].enti.d = 2;\r
}\r
player[pn].enti.triggerx = player[pn].enti.tx;\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
\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
\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
\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].map = map;\r
pip[0].video = &gv->video;\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].map = pip[0].map;\r
pip[i].video = pip[0].video;\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
word high_address, low_address, offset;\r
byte crtcOffset;\r
\r
- /* calculate offset */\r
- offset = (word) moo[moo[0].video->p].page->data;\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
\r
- /* calculate crtcOffset according to virtual width */\r
+ // calculate crtcOffset according to virtual width\r
switch(sr)\r
{\r
case 1:\r
- crtcOffset = moo[moo[0].video->p].page->sw >> 3;\r
+ crtcOffset = moo[moo[0].video->sp].page->sw >> 3;\r
break;\r
default:\r
case 0:\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
+ // 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
+ // wait for one retrace\r
if(vsync) while (!(inp(INPUT_STATUS_1) & VRETRACE));\r
\r
- /* do PEL panning here */\r
+ // do PEL panning here\r
outp(AC_INDEX, 0x33);\r
outp(AC_INDEX, (moo[0].page->dx & 0x03) << 1);\r
}\r
\r
-/*map_t\r
-allocMap(int w, int h) {\r
- map_t result;\r
-\r
- result.width =w;\r
- result.height=h;\r
- result.data = malloc(sizeof(byte) * w * h);\r
- //result.data = (byte *)alloc_emem(((int)sizeof(byte) * w * h)/1024);\r
- if(isEMS() || checkEMS())\r
- {\r
- XMOVE mm;\r
- //emmhandle = mallocEMS(coretotalEMS());//alloc_emem((int)sizeof(map))\r
- mm.length=sizeof(result);\r
- mm.sourceH=0;\r
- mm.sourceOff=ptr2long(&result);\r
- mm.destH=emmhandle;\r
- mm.destOff=0;\r
- ist = move_emem(&mm);\r
- if(!ist){ dealloc_emem(emmhandle); exit(5); }\r
- printf("%d\n", coretotalEMS());\r
- }\r
-\r
- return result;\r
-}*/\r
-\r
-/*void\r
+void\r
initMap(map_t *map) {\r
// just a place holder to fill out an alternating pattern\r
- int x, y, xx, yy;\r
- int i, q;\r
-// int tile = 1;\r
- //if(!isEMS() || !checkEMS())\r
-// map->tiles = malloc(sizeof(tiles_t));\r
- //else\r
- // map->tiles = (tiles_t *)alloc_emem(sizeof(tiles_t));\r
-\r
- //create the tile set\r
- //if(!isEMS() || !checkEMS())\r
-// map->tiles->data = malloc(sizeof(bitmap_t));\r
- //else\r
- // map->tiles->data = (bitmap_t *)alloc_emem(sizeof(bitmap_t));\r
-// map->tiles->data->width = (TILEWH);\r
-// map->tiles->data->height= TILEWH;\r
- //if(!isEMS() || !checkEMS())\r
-// map->tiles->data->data = malloc((TILEWH*2)*TILEWH);\r
- //else\r
- // map->tiles->data->data = (byte *)alloc_emem((TILEWH*2)*TILEWH);\r
-// map->tiles->tileHeight = TILEWH;\r
-// map->tiles->tileWidth =TILEWH;\r
-// map->tiles->rows = 1;\r
-// map->tiles->cols = 1;//2;\r
-\r
- q=0;\r
- //for(y=0; y<map->height; y++) {\r
- //for(x=0; x<map->width; x++) {\r
- i=0;\r
- for(yy=0; yy<TILEWH; yy++) {\r
- for(xx=0; xx<(TILEWH); xx++) {\r
- //if(x<TILEWH){\r
- map->tiles->data->data[i+1] = map->data[q];//28;//0x24;\r
-// printf("[%d]", map->tiles->data->data[i]);\r
- //}else{\r
- //map->tiles->data->data[i] = map->data[q];//0;//0x34;\r
- //printf("]%d[==[%d]", i, map->tiles->data->data[i]);\r
- //}\r
- i++;\r
- }\r
-// printf("\n");\r
- }\r
-// printf("[%d]", map->data[q]);\r
- q++;\r
-// }\r
- //printf("\n\n");\r
-// }\r
+ int x, y;\r
+ int i;\r
+ int tile = 1;\r
\r
i=0;\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
- //tile = tile ? 0 : 1;\r
+ map->data[i]=255;\r
+// printf("[%d]", map->data[i]);\r
+ tile = tile ? 0 : 1;\r
i++;\r
}\r
- //tile = tile ? 0 : 1;\r
+ tile = tile ? 0 : 1;\r
}\r
-}*/\r
+}\r
+\r
+//===========================================================================//\r
+\r
\r
void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid)\r
{\r
word x;//, y; /* coordinate for drawing */\r
\r
- /* increment the pixel position and update the page */\r
- mv[id].page[0].dx += player[plid].enti.speed;\r
-\r
- /* check to see if this changes the tile */\r
- if(mv[id].page[0].dx >= mv[id].dxThresh )\r
- {\r
- /* go forward one tile */\r
- mv[id].tx++;\r
- /* Snap the origin forward */\r
- mv[id].page->data += 4;\r
-\r
- mv[id].page[0].dx = mv[id].map->tiles->tileWidth;\r
- }\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
#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, 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->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, DRAWCOLNUM);\r
+// else\r
+// if(mv[0].video->bgps)\r
+// modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[0].map->tiles->tileWidth, mv[0].page->height);\r
+ mv[0].video->dorender=1;\r
}\r
\r
\r
{\r
word x;//,y; /* coordinate for drawing */\r
\r
- /* decrement the pixel position and update the page */\r
- mv[id].page[0].dx -= player[plid].enti.speed;\r
-\r
- /* check to see if this changes the tile */\r
- if(mv[id].page[0].dx == 0)\r
- {\r
- /* go backward one tile */\r
- mv[id].tx--;\r
- /* Snap the origin backward */\r
- mv[id].page->data -= 4;\r
-\r
- mv[id].page[0].dx = mv[id].map->tiles->tileWidth;\r
- }\r
+ ScrollLeft(mv, player, id, plid);\r
\r
/* draw the next column */\r
x= 0;\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(!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
- mv[0].video->r=1;\r
+// if(id==0)\r
+ mapDrawCol(&mv[id], 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[0].map->tiles->tileWidth, mv[0].page->height);\r
+ mv[0].video->dorender=1;\r
}\r
\r
\r
{\r
word y;//x, /* coordinate for drawing */\r
\r
- /* decrement the pixel position and update the page */\r
- mv[id].page[0].dy -= player[plid].enti.speed;\r
-\r
- /* check to see if this changes the tile */\r
- if(mv[id].page[0].dy == 0 )\r
- {\r
- /* go up one tile */\r
- mv[id].ty--;\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
+ ScrollUp(mv, player, id, plid);\r
\r
/* draw the next row */\r
y= 0;\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(!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
- mv[0].video->r=1;\r
+// if(id==0)\r
+ mapDrawRow(&mv[id], mv[0].tx - 1, mv[0].ty-1, y, player, DRAWROWNUM);\r
+// else\r
+// if(mv[0].video->bgps)\r
+// modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[0].page->width, mv[0].map->tiles->tileHeight);\r
+ mv[0].video->dorender=1;\r
}\r
\r
\r
{\r
word y;//x, /* coordinate for drawing */\r
\r
- /* increment the pixel position and update the page */\r
- mv[id].page[0].dy += player[plid].enti.speed;\r
-\r
- /* check to see if this changes the tile */\r
- if(mv[id].page[0].dy >= mv[id].dyThresh )\r
- {\r
- /* go down one tile */\r
- mv[id].ty++;\r
- /* Snap the origin downward */\r
- mv[id].page->data += mv[id].page->pi;\r
-\r
- mv[id].page[0].dy = mv[id].map->tiles->tileHeight;\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
#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, 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->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, DRAWROWNUM);\r
+// else\r
+// if(mv[0].video->bgps)\r
+// modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[0].page->width, mv[0].map->tiles->tileHeight);\r
+ mv[0].video->dorender=1;\r
}\r
\r
-\r
-//TODO finish this wwww\r
-void near ScrollRight(map_view_t *mv, player_t *player, word id, word plid)\r
+void ZC_mapScroll(map_view_t *mv, player_t *player, word pn)\r
{\r
- /* increment the pixel position and update the page */\r
- mv[id].page->dx += player[plid].enti.speed;\r
-\r
- /* check to see if this changes the tile */\r
- if(mv[id].page->dx >= mv[0].dxThresh )\r
- {\r
-// vga_setup_wm1_block_copy();\r
-// _fmemmove(mv[id].page->data+4, mv[id].page->data, mv[id].page->pagesize);\r
-// vga_restore_rm0wm0();\r
- /* Snap the origin forward */\r
- mv[id].page->data += 4;\r
- mv[id].page->dx = mv[0].map->tiles->tileWidth;\r
- }\r
-}\r
-\r
-void near ScrollLeft(map_view_t *mv, player_t *player, word id, word plid)\r
-{\r
- /* decrement the pixel position and update the page */\r
- mv[id].page->dx -= player[plid].enti.speed;\r
-\r
- /* check to see if this changes the tile */\r
- if(mv[id].page->dx == 0)\r
- {\r
-// vga_setup_wm1_block_copy();\r
-// _fmemmove(mv[id].page->data-4, mv[id].page->data, mv[id].page->pagesize);\r
-// vga_restore_rm0wm0();\r
- /* Snap the origin backward */\r
- mv[id].page->data -= 4;\r
- mv[id].page->dx = mv[0].map->tiles->tileWidth;\r
- }\r
-}\r
-\r
-void near ScrollUp(map_view_t *mv, player_t *player, word id, word plid)\r
-{\r
- /* decrement the pixel position and update the page */\r
- mv[id].page->dy -= player[plid].enti.speed;\r
-\r
- /* check to see if this changes the tile */\r
- if(mv[id].page->dy == 0)\r
- {\r
-// vga_setup_wm1_block_copy();\r
-// _fmemmove(mv[id].page->data-mv[id].page->pi, mv[id].page->data, mv[id].page->pagesize);\r
-// vga_restore_rm0wm0();\r
- /* Snap the origin backward */\r
- mv[id].page->data -= mv[id].page->pi;\r
- mv[id].page->dy = mv[0].map->tiles->tileWidth;\r
- }\r
-}\r
-\r
-void near ScrollDown(map_view_t *mv, player_t *player, word id, word plid)\r
-{\r
- /* increment the pixel position and update the page */\r
- mv[id].page->dy += player[plid].enti.speed;\r
-\r
- /* check to see if this changes the tile */\r
- if(mv[id].page->dy >= mv[0].dxThresh )\r
+ word b = mv[0].video->bgps;\r
+ switch(player[pn].enti.d)\r
{\r
-// vga_setup_wm1_block_copy();\r
-// _fmemmove(mv[id].page->data+mv[id].page->pi, mv[id].page->data, mv[id].page->pagesize);\r
-// vga_restore_rm0wm0();\r
- /* Snap the origin forward */\r
- mv[id].page->data += mv[id].page->pi;\r
- mv[id].page->dy = mv[0].map->tiles->tileWidth;\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;\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 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, nibble pn, boolean defaultsw)\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;\r
+ player[pn].enti.ty = y + pip[0].ty;\r
+\r
+ switch(defaultsw)\r
+ {\r
+ case 1:\r
+ player[pn].enti.tx += pip[0].page->ti.tilemidposscreenx;\r
+ player[pn].enti.ty += pip[0].page->ti.tilemidposscreeny;\r
+ break;\r
+ case 0:\r
+ break;\r
+ }\r
}\r
//===========================================================================\r
\r
int py;//px,\r
unsigned int i;\r
\r
- mapinitmapview(mv, tx, ty);\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
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(!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
+ mapDrawWRow(&mv[1], tx-1, ty, py);\r
+ i+=mv->map->width - tx;\r
+ }\r
+// py=0;\r
+// i=mv[1].ty * mv[1].map->width + mv[1].tx;\r
+// for(ty=mv[1].ty-1; py < mv[1].page->sh+mv->dyThresh && ty < mv[1].map->height; ty++, py+=mv[1].map->tiles->tileHeight) {\r
+// mapDrawWRow(&mv[1], 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
}\r
\r
-void mapinitmapview(map_view_t *mv, int tx, int ty)\r
+void ZC_mapinitMV(map_view_t *mv, int tx, int ty)\r
{\r
/* set up the coordinates */\r
mv[0].tx = mv[1].tx = tx;\r
\r
/* set up the thresholds */\r
mv[0].dxThresh = mv[1].dxThresh = mv[2].dxThresh = mv[3].dxThresh = mv->map->tiles->tileWidth * 2;\r
- mv[0].dyThresh = mv[1].dyThresh = mv[2].dxThresh = mv[3].dxThresh = mv->map->tiles->tileHeight * 2;\r
+ mv[0].dyThresh = mv[1].dyThresh = mv[2].dyThresh = mv[3].dyThresh = mv->map->tiles->tileHeight * 2;\r
}\r
\r
void near\r
//setkb(0);\r
}*/\r
\r
-//boolean pageflipflop = 1;\r
-//boolean pageploop = 1;\r
boolean pagenorendermap = 0;\r
boolean pagedelayrendermap = 0;\r
\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
+ word col = 2, bgcol = 1, type = 1;//w = 64, h = 8,\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
//\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
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
+ //modexprint(&(gv->video.page[0]), 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
+ modexWaitBorder_start();\r
//vga_wait_for_vsync();\r
gv->kurokku.frames_per_second=60;\r
break;\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
- VL_ShowPage(&(gv->video.page[gv->video.p]), gv->kurokku.fpscap, 0);//VL_ShowPage(&(gv->video.page[gv->video.p]), gv->kurokku.fpscap, 0);\r
-// if(!pageploop) gv->video.p=!gv->video.p;\r
- gv->video.r =!gv->video.r ;\r
+ if(gv->video.dorender )\r
+ {//r=1\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
+ VL_ShowPage(&(gv->video.page[gv->video.sp]), gv->kurokku.fpscap, 0);\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
- {\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
- break;\r
- }\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
- 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
- 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
-}\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, nibble 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.speed;\r
break;\r
}\r
x-=4;\r
player[pn].enti.dire+=dd;\r
if((player[pn].enti.q==1 && player[pn].enti.pred != player[pn].enti.d) || !dd)\r
{\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
}\r
player[pn].enti.spri->x = x;\r
player[pn].enti.spri->y = y;\r
\r
+ if(pip[0].video->bgps)\r
+ modexCopyPageRegion(pip[0].page, pip[1].page, x-4, y-4, x-4, y-4, 28, 40);\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
+ animate_spri(&player[pn].enti, pip[0].video);\r
+//0000if(player[pn].enti.q<4) delay(200);\r
+ pip[0].video->dorender = 1;\r
}\r
\r
/*\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
default:\r
break;\r
}\r
-\r
- mv->video->r=1;\r
}\r
OSDN Git Service
