#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
-#define ZC_WALKR ScrollRight(pip, player, 3, pn); \\r
- ScrollRight(pip, player, 2, pn); \\r
- mapScrollRight(pip, player, (0), pn); \\r
-if(pip[0].video->bgps) mapScrollRight(pip, player, (1), pn);\r
-#define ZC_WALKL ScrollLeft(pip, player, 3, pn); \\r
- ScrollLeft(pip, player, 2, pn); \\r
- mapScrollLeft(pip, player, (0), pn); \\r
-if(pip[0].video->bgps) mapScrollLeft(pip, player, (1), pn);\r
-#define ZC_WALKD ScrollDown(pip, player, 3, pn); \\r
- ScrollDown(pip, player, 2, pn); \\r
- mapScrollDown(pip, player, (0), pn); \\r
-if(pip[0].video->bgps) mapScrollDown(pip, player, (1), pn);\r
-#define ZC_WALKU ScrollUp(pip, player, 3, pn); \\r
- ScrollUp(pip, player, 2, pn); \\r
- mapScrollUp(pip, player, (0), pn); \\r
-if(pip[0].video->bgps) mapScrollUp(pip, player, (1), pn);\r
\r
void ZC_walk(map_view_t *pip, player_t *player, word pn)\r
{\r
player[pn].walktype=2;\r
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
- ZC_animatePlayer(pip, player, pn, 2);\r
- ZC_WALKR\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
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
player[pn].enti.x+=(player[pn].enti.speed);\r
- ZC_animatePlayer(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
- ZC_animatePlayer(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
player[pn].walktype=2;\r
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
- ZC_animatePlayer(pip, player, pn, 2);\r
- ZC_WALKL\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
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
player[pn].enti.x-=(player[pn].enti.speed);\r
- ZC_animatePlayer(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
- ZC_animatePlayer(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
player[pn].walktype=2;\r
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
- ZC_animatePlayer(pip, player, pn, 2);\r
- ZC_WALKD\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
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
player[pn].enti.y+=(player[pn].enti.speed);\r
- ZC_animatePlayer(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
- ZC_animatePlayer(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
player[pn].walktype=2;\r
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
- ZC_animatePlayer(pip, player, pn, 2);\r
- ZC_WALKU\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
if(player[pn].enti.q<=player[pn].enti.spt)\r
{\r
player[pn].enti.y-=(player[pn].enti.speed);\r
- ZC_animatePlayer(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
- ZC_animatePlayer(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
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
\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
// 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->r=1;\r
+ //mv[0].video->dorender=1;//ScrollRight\r
}\r
\r
\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->r=1;\r
+ //mv[0].video->dorender=1;//ScrollLeft\r
}\r
\r
\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->r=1;\r
+ //mv[0].video->dorender=1;//ScrollUp\r
}\r
\r
\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->r=1;\r
+ //mv[0].video->dorender=1;//ScrollDown\r
}\r
\r
void ZC_mapScroll(map_view_t *mv, player_t *player, word pn)\r
mapScrollRight(mv, player, (0), pn);\r
if(b) mapScrollRight(mv, player, (1), pn);\r
break;\r
- case 4://left\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 1://down\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) mapScrollUp(mv, player, (1), pn);\r
break;\r
}\r
- printf("player[pn].enti.d=%u\n", player[pn].enti.d);\r
- mv->video->r=1;\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, nibble pn, 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[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
//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
#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
- 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
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
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);\r
+ sprintf(global_temp_status_text2, "%d", i);\r
+ modexprint(page, x, y, 1, 1, 2, global_temp_status_text2);\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
+ modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, i);\r
//modexprintbig(page, x, y, 1, 15, 0, (t->debug_data));\r
/*for(texty=0; texty<2; texty++)\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
// 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
+//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
- modexprint(&(gv->video.page[0]), x, y+8, type, col, bgcol, "sanic!");\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
//render!!\r
- if(gv->video.r )\r
+ if(gv->video.dorender )\r
{//r=1\r
/*if(video->bgp s)\r
{\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.r =!gv->video.r ;\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_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.speed;\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
+ //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->video);\r
-//0000if(player[pn].enti.q<2) delay(200);\r
- pip->video->r=1;\r
+\r
+ //draw sprite\r
+ animate_spri(&player[pn].enti, pip[0].video);\r
+ }\r
+//0000if(player[pn].enti.q<4) delay(200);\r
}\r
\r
/*\r
projects / 16.git / blobdiff