//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
+ !(pip[0].map->MAPDATAPTR[(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
//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
}\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(player[pn].enti.tx < pip[0].map->width && !(pip[0].map->MAPDATAPTR[(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
//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
+ !(pip[0].map->MAPDATAPTR[(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
//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
}\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(player[pn].enti.tx > 1 && !(pip[0].map->MAPDATAPTR[(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
//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
+ !(pip[0].map->MAPDATAPTR[(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
//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
}\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(player[pn].enti.ty < pip[0].map->height && !(pip[0].map->MAPDATAPTR[(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
//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
+ !(pip[0].map->MAPDATAPTR[(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
//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
}\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(player[pn].enti.ty > 1 && !(pip[0].map->MAPDATAPTR[(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
// do PEL panning here\r
outp(AC_INDEX, 0x33);\r
outp(AC_INDEX, (moo[0].page->dx & 0x03) << 1);\r
+ vga_state.vga_draw_stride_limit = vga_state.vga_draw_stride = moo[0].page->stridew;\r
}\r
\r
void\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
+ map->MAPDATAPTR[i]=255;\r
+// printf("[%d]", map->MAPDATAPTR[i]);\r
tile = tile ? 0 : 1;\r
i++;\r
}\r
ScrollRight(mv, player, id, plid);\r
\r
/* draw the next column */\r
- x= mv[0].page->sw + mv[0].map->tiles->tileWidth;\r
+ x= mv[0].page->sw + mv[0].map->MAPTILESPTR->tileWidth;\r
#ifndef FULLRCREND\r
if(player[plid].enti.q%4)\r
#else\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
+// modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[0].map->MAPTILESPTR->tileWidth, mv[0].page->height);\r
+ //mv[0].video->dorender=1;//ScrollRight\r
}\r
\r
\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
+// modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[0].map->MAPTILESPTR->tileWidth, mv[0].page->height);\r
+ //mv[0].video->dorender=1;//ScrollLeft\r
}\r
\r
\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
+// modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[0].page->width, mv[0].map->MAPTILESPTR->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[0].map->tiles->tileHeight;\r
+ y= mv[0].page->sh + mv[0].map->MAPTILESPTR->tileHeight;\r
#ifndef FULLRCREND\r
if(player[plid].enti.q%3)\r
#else\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
+// modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[0].page->width, mv[0].map->MAPTILESPTR->tileHeight);\r
+ //mv[0].video->dorender=1;//ScrollDown\r
}\r
\r
void ZC_mapScroll(map_view_t *mv, player_t *player, word pn)\r
if(b) mapScrollUp(mv, player, (1), pn);\r
break;\r
}\r
- mv[0].video->dorender=1;\r
+ //mv[0].video->dorender=1;//ZC_mapScroll\r
}\r
\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->MAPDATAPTR = malloc(((map->width*map->height)+1)*sizeof(byte));\r
+ map->MAPDATAPTR = &x;\r
+ map->MAPTILESPTR = malloc(sizeof(tiles_t));\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
+// map->MAPTILESPTR->data = &bp;\r
+ map->MAPTILESPTR->tileHeight = 16;\r
+ map->MAPTILESPTR->tileWidth = 16;\r
+ map->MAPTILESPTR->rows = 1;\r
+ map->MAPTILESPTR->cols = 1;\r
#ifdef __DEBUG_MAP__\r
dbg_maptext = true;\r
#endif\r
}\r
#ifdef __DEBUG_MAP__\r
- else dbg_maptext = false;\r
+ else\r
+ {\r
+ dbg_maptext = false;\r
+ }\r
#endif\r
return 0;\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
- 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
+ ZC_mapredraw(mv, tx, ty);\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
/* set up the coordinates */\r
mv[0].tx = mv[1].tx = tx;\r
mv[0].ty = mv[1].ty = ty;\r
- mv[0].page->dx = mv[1].page->dx = mv[2].page->dx = mv[3].page->dx = mv->map->tiles->tileWidth;\r
- mv[0].page->dy = mv[1].page->dy = mv[2].page->dy = mv[3].page->dy = mv->map->tiles->tileHeight;\r
+ mv[0].page->dx = mv[1].page->dx = mv[2].page->dx = mv[3].page->dx = mv->map->MAPTILESPTR->tileWidth;\r
+ mv[0].page->dy = mv[1].page->dy = mv[2].page->dy = mv[3].page->dy = mv->map->MAPTILESPTR->tileHeight;\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].dyThresh = mv[3].dyThresh = mv->map->tiles->tileHeight * 2;\r
+ mv[0].dxThresh = mv[1].dxThresh = mv[2].dxThresh = mv[3].dxThresh = mv->map->MAPTILESPTR->tileWidth * 2;\r
+ mv[0].dyThresh = mv[1].dyThresh = mv[2].dyThresh = mv[3].dyThresh = mv->map->MAPTILESPTR->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->MAPTILESPTR->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
case 0:\r
#endif\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
+ if(!pagenorendermap) 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
+ modexDrawBmpRegion (page, x, y, rx, ry, t->tileWidth, t->tileHeight, i);\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
#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
+ if(!pagenorendermap) modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, i);\r
+ sprintf(global_temp_status_text2, "%d", i);\r
+ modexprint(page, x, y, 1, 1, 2, global_temp_status_text2);\r
break;\r
}\r
#endif\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( 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
+ for( mv->dx=poopoffset; mv->dx<(mv->page->sw+mv->dxThresh)/(poopoffset+1) && tx < mv->map->width; mv->dx+=mv->map->MAPTILESPTR->tileWidth, tx++) {\r
+ if(i>=0)\r
+ mapDrawTile(mv->map->MAPTILESPTR, mv->map->MAPDATAPTR[i], mv->page, mv->dx, y);\r
i++; /* next! */\r
}\r
-//if(pagedelayrendermap) delay(200);\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
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
+ for( mv->dy=poopoffset; mv->dy<(mv->page->sh+mv->dyThresh)/(poopoffset+1) && ty < mv->map->height; mv->dy+=mv->map->MAPTILESPTR->tileHeight, ty++) {\r
+ if(i>=0)\r
+ mapDrawTile(mv->map->MAPTILESPTR, mv->map->MAPDATAPTR[i], mv->page, x, mv->dy);\r
i += mv->map->width;\r
}\r
-//if(pagedelayrendermap) delay(200);\r
+if(pagedelayrendermap) delay(200);\r
}\r
\r
void mapDrawWRow(map_view_t *mv, int tx, int ty, word y)\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
+ for(mv->dx=0; mv->dx<mv->page->sw+mv->dxThresh && tx < mv->map->width; mv->dx+=mv->map->MAPTILESPTR->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
+ mapDrawTile(mv->map->MAPTILESPTR, mv->map->MAPDATAPTR[i], mv->page, mv->dx, y);\r
i++; /* next! */\r
}\r
}\r
\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
+ for(mv->dy=0; mv->dy<mv->page->sh+mv->dyThresh && ty < mv->map->height; mv->dy+=mv->map->MAPTILESPTR->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
+ mapDrawTile(mv->map->MAPTILESPTR, mv->map->MAPDATAPTR[i], mv->page, x, mv->dy);\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 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
if(elapsed_timer(gv) >= (1.0 / gv->kurokku.frames_per_second))\r
{\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
+ //modexprint(&(gv->video.page[/*!*/(gv->video.p)]), x, y, type, col, bgcol, global_temp_status_text);\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, col, bgcol, 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
gv->kurokku.tiku=0;\r
}else //copy dat sheet\r
gv->kurokku.tiku++;\r
\r
switch(gv->kurokku.fpscap)\r
{\r
- case 0:\r
+ case 0: //turn this off if XT\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_start();\r
+ //modexWaitBorder();\r
+ //modexWaitBorder_start();\r
//vga_wait_for_vsync();\r
+ vga_wait_for_vsync_end();\r
gv->kurokku.frames_per_second=60;\r
break;\r
}\r
}\r
}\r
\r
-void near ZC_animatePlayer(map_view_t *pip, player_t *player, nibble pn)\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
break;\r
}\r
x-=4;\r
- y-=pip[0].map->tiles->tileHeight;\r
+ y-=pip[0].map->MAPTILESPTR->tileHeight;\r
switch (player[pn].enti.d)\r
{\r
case 0:\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
//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
-\r
- if(pip[0].video->bgps)\r
+ if(pip[0].video->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
- //draw sprite\r
- animate_spri(&player[pn].enti, pip[0].video);\r
+\r
+ //draw sprite\r
+ animate_spri(&player[pn].enti, pip[0].video);\r
+ }\r
//0000if(player[pn].enti.q<4) delay(200);\r
- pip[0].video->dorender = 1;\r
}\r
\r
/*\r
projects / 16.git / blobdiff