From 2f1cfb3766a0b1d5e707cc93488dbf276ed48a3e Mon Sep 17 00:00:00 2001 From: sparky4 Date: Mon, 13 Feb 2017 15:20:43 -0600 Subject: [PATCH] oddly enough defining __NEWMAPTILEDATAVARS__ in 16_tdef.h will cause a limbo to appear outside the map wwww --- src/lib/16_map.c | 29 +++++++++--------- src/lib/16_tdef.h | 20 ++++++++++-- src/lib/scroll16.c | 76 +++++++++++++++++++++++----------------------- src/lib/scroll16.h | 10 +++--- src/maptest.c | 2 +- src/scroll.c | 2 +- src/zcroll.c | 2 +- 7 files changed, 78 insertions(+), 63 deletions(-) diff --git a/src/lib/16_map.c b/src/lib/16_map.c index defa4a9a..37179ab7 100755 --- a/src/lib/16_map.c +++ b/src/lib/16_map.c @@ -257,7 +257,7 @@ void extract_map(const char *js, jsmntok_t *t, size_t count, map_t *map) { while(ilayerdata = malloc(sizeof(byte*) * t[i].size); + //map->layerdata = malloc(sizeof(byte*) * t[i].size); inner_end = t[i].end; k = 0; while(t[i].start < inner_end) { @@ -268,14 +268,13 @@ void extract_map(const char *js, jsmntok_t *t, size_t count, map_t *map) { #ifdef DEBUG_MAPDATA printf("Layer %d data: [\n", k); #endif - map->layerdata[k] = malloc(sizeof(byte) * t[i+1].size); - map->data = map->layerdata[k]; + map->MAPDATAPTK = malloc(sizeof(byte) * t[i+1].size); + //for backwards compatibility for rest of code +// map->data = map->MAPDATAPTK; for(j = 0; j < t[i+1].size; j++) { - map->layerdata[k][j] = (byte)atoi(js + t[i+2+j].start); - //for backwards compatibility for rest of code -// map->data[j] = map->layerdata[k][j];//(byte)atoi(js + t[i+2+j].start);//(byte)atoi(js+t->start); + map->MAPDATAPTK[j] = (byte)atoi(js + t[i+2+j].start); #ifdef DEBUG_MAPDATA - //printf("[%d,%d]%d", k, j, map->layerdata[k][j]); + //printf("[%d,%d]%d", k, j, map->MAPDATAPTK[j]); fprintf(stdout, "%c", map->data[j]+44); #endif } @@ -295,24 +294,24 @@ void extract_map(const char *js, jsmntok_t *t, size_t count, map_t *map) { k = 0; while(t[i].start < inner_end) { if(jsoneq(js, &(t[i]), "image") == 0) { - map->layertile[k] = malloc(sizeof(tiles_t)); + map->MAPTILESPTK = malloc(sizeof(tiles_t)); s = remove_ext((char *)js+t[i+1].start, '.', '/'); - strcpy(map->layertile[k]->imgname, s); + strcpy(map->MAPTILESPTK->imgname, s); //And move to vrs, probably // bp = bitmapLoadPcx("data/ed.pcx"); -// map->layertile[k]->btdata = &bp; - //map->layertile[k]->btdata = malloc(sizeof(bitmap_t)); - map->layertile[k]->rows = 1; - map->layertile[k]->cols = 1; +// map->MAPTILESPTK->btdata = &bp; + //map->MAPTILESPTK->btdata = malloc(sizeof(bitmap_t)); + map->MAPTILESPTK->rows = 1; + map->MAPTILESPTK->cols = 1; #ifdef __DEBUG_MAP__ dbg_maptext=false; #endif i++; }else if(jsoneq(js, &(t[i]), "tileheight") == 0) { - map->layertile[k]->tileHeight = atoi(js + t[i+1].start); + map->MAPTILESPTK->tileHeight = atoi(js + t[i+1].start); i++; }else if(jsoneq(js, &(t[i]), "tilewidth") == 0) { - map->layertile[k]->tileWidth = atoi(js + t[i+1].start); + map->MAPTILESPTK->tileWidth = atoi(js + t[i+1].start); i++; } i++; diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h index b638071c..38fd2260 100755 --- a/src/lib/16_tdef.h +++ b/src/lib/16_tdef.h @@ -79,14 +79,30 @@ typedef struct { //TODO: 16_mm and 16_ca must handle this //TODO: add variables from 16_ca -#define MAPLAYERS 2 +//#define __NEWMAPTILEDATAVARS__ + +#ifdef __NEWMAPTILEDATAVARS__ +#define MAPLAYERS 4 +#define MAPTILESPTR layertile[0] +#define MAPTILESPTK layertile[k] +#define MAPDATAPTR layerdata[0] +#define MAPDATAPTK layerdata[k] +#else +#define MAPTILESPTR tiles//layertile[0] +#define MAPTILESPTK tiles//layertile[k] +#define MAPDATAPTR data//layerdata[0] +#define MAPDATAPTK data//layerdata[k] +#endif typedef struct { //long planestart[3]; //unsigned planelength[3]; +#ifndef __NEWMAPTILEDATAVARS__ byte *data; //TODO: 16_mm and 16_ca must handle this + tiles_t *tiles; //TODO: 16_mm and 16_ca must handle this +#else byte * far *layerdata; //TODO: 16_mm and 16_ca must handle this - //tiles_t *tiles; //TODO: 16_mm and 16_ca must handle this tiles_t far *layertile[MAPLAYERS]; //TODO: 16_mm and 16_ca must handle this +#endif int width, height; //this has to be signed! byte name[16]; } map_t; diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c index d99f5db1..9a4708ab 100755 --- a/src/lib/scroll16.c +++ b/src/lib/scroll16.c @@ -37,7 +37,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn) //right movement case 3: 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 && - !(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! + !(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! { player[pn].walktype=2; if(player[pn].enti.q<=player[pn].enti.spt) @@ -48,7 +48,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn) //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2; } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx++; } } - 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)) + 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)) { player[pn].walktype=1; if(player[pn].enti.q<=player[pn].enti.spt) @@ -70,7 +70,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn) //left movement case 1: 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 && - !(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! + !(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! { player[pn].walktype=2; if(player[pn].enti.q<=player[pn].enti.spt) @@ -81,7 +81,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn) //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2; } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx--; } } - 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)) + 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)) { player[pn].walktype=1; if(player[pn].enti.q<=player[pn].enti.spt) @@ -103,7 +103,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn) //down movement case 4: 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 && - !(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! + !(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! { player[pn].walktype=2; if(player[pn].enti.q<=player[pn].enti.spt) @@ -114,7 +114,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn) //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2; } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty++; } } - 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)) + 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)) { player[pn].walktype=1; if(player[pn].enti.q<=player[pn].enti.spt) @@ -136,7 +136,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn) //up movement case 0: 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 && - !(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! + !(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! { player[pn].walktype=2; if(player[pn].enti.q<=player[pn].enti.spt) @@ -147,7 +147,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn) //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2; } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty--; } } - 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)) + 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)) { player[pn].walktype=1; if(player[pn].enti.q<=player[pn].enti.spt) @@ -318,8 +318,8 @@ initMap(map_t *map) { i=0; for(y=0; yheight; y++) { for(x=0; xwidth; x++) { - map->data[i]=255; -// printf("[%d]", map->data[i]); + map->MAPDATAPTR[i]=255; +// printf("[%d]", map->MAPDATAPTR[i]); tile = tile ? 0 : 1; i++; } @@ -337,7 +337,7 @@ void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid) ScrollRight(mv, player, id, plid); /* draw the next column */ - x= mv[0].page->sw + mv[0].map->layertile[0]->tileWidth; + x= mv[0].page->sw + mv[0].map->MAPTILESPTR->tileWidth; #ifndef FULLRCREND if(player[plid].enti.q%4) #else @@ -347,7 +347,7 @@ void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid) mapDrawCol(&mv[id], mv[0].tx + mv[0].page->ti.tw, mv[0].ty-1, x, player, DRAWCOLNUM); // else // if(mv[0].video->bgps) -// modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[0].map->layertile[0]->tileWidth, mv[0].page->height); +// modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[0].map->MAPTILESPTR->tileWidth, mv[0].page->height); //mv[0].video->dorender=1;//ScrollRight } @@ -369,7 +369,7 @@ void near mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid) mapDrawCol(&mv[id], mv[0].tx - 1, mv[0].ty-1, x, player, DRAWCOLNUM); // else // if(mv[0].video->bgps) -// modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[0].map->layertile[0]->tileWidth, mv[0].page->height); +// modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[0].map->MAPTILESPTR->tileWidth, mv[0].page->height); //mv[0].video->dorender=1;//ScrollLeft } @@ -391,7 +391,7 @@ void near mapScrollUp(map_view_t *mv, player_t *player, word id, word plid) mapDrawRow(&mv[id], mv[0].tx - 1, mv[0].ty-1, y, player, DRAWROWNUM); // else // if(mv[0].video->bgps) -// modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[0].page->width, mv[0].map->layertile[0]->tileHeight); +// modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[0].page->width, mv[0].map->MAPTILESPTR->tileHeight); //mv[0].video->dorender=1;//ScrollUp } @@ -403,7 +403,7 @@ void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid) ScrollDown(mv, player, id, plid); /* draw the next row */ - y= mv[0].page->sh + mv[0].map->layertile[0]->tileHeight; + y= mv[0].page->sh + mv[0].map->MAPTILESPTR->tileHeight; #ifndef FULLRCREND if(player[plid].enti.q%3) #else @@ -413,7 +413,7 @@ void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid) mapDrawRow(&mv[id], mv[0].tx - 1, mv[0].ty+mv[0].page->ti.th, y, player, DRAWROWNUM); // else // if(mv[0].video->bgps) -// modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[0].page->width, mv[0].map->layertile[0]->tileHeight); +// modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[0].page->width, mv[0].map->MAPTILESPTR->tileHeight); //mv[0].video->dorender=1;//ScrollDown } @@ -498,16 +498,16 @@ sword chkmap(map_t *map, word q) //initiate a null map! map->width=MAPW;///2; map->height=MAPH;///2; -// map->data = malloc(((map->width*map->height)+1)*sizeof(byte)); - map->data = &x; - map->layertile[0] = malloc(sizeof(tiles_t)); +// map->MAPDATAPTR = malloc(((map->width*map->height)+1)*sizeof(byte)); + map->MAPDATAPTR = &x; + map->MAPTILESPTR = malloc(sizeof(tiles_t)); //fix this to be far~ // bp = bitmapLoadPcx("data/ed.pcx"); -// map->layertile[0]->data = &bp; - map->layertile[0]->tileHeight = 16; - map->layertile[0]->tileWidth = 16; - map->layertile[0]->rows = 1; - map->layertile[0]->cols = 1; +// map->MAPTILESPTR->data = &bp; + map->MAPTILESPTR->tileHeight = 16; + map->MAPTILESPTR->tileWidth = 16; + map->MAPTILESPTR->rows = 1; + map->MAPTILESPTR->cols = 1; #ifdef __DEBUG_MAP__ dbg_maptext = true; #endif @@ -538,12 +538,12 @@ void ZC_mapinitMV(map_view_t *mv, int tx, int ty) /* set up the coordinates */ mv[0].tx = mv[1].tx = tx; mv[0].ty = mv[1].ty = ty; - mv[0].page->dx = mv[1].page->dx = mv[2].page->dx = mv[3].page->dx = mv->map->layertile[0]->tileWidth; - mv[0].page->dy = mv[1].page->dy = mv[2].page->dy = mv[3].page->dy = mv->map->layertile[0]->tileHeight; + mv[0].page->dx = mv[1].page->dx = mv[2].page->dx = mv[3].page->dx = mv->map->MAPTILESPTR->tileWidth; + mv[0].page->dy = mv[1].page->dy = mv[2].page->dy = mv[3].page->dy = mv->map->MAPTILESPTR->tileHeight; /* set up the thresholds */ - mv[0].dxThresh = mv[1].dxThresh = mv[2].dxThresh = mv[3].dxThresh = mv->map->layertile[0]->tileWidth * 2; - mv[0].dyThresh = mv[1].dyThresh = mv[2].dyThresh = mv[3].dyThresh = mv->map->layertile[0]->tileHeight * 2; + mv[0].dxThresh = mv[1].dxThresh = mv[2].dxThresh = mv[3].dxThresh = mv->map->MAPTILESPTR->tileWidth * 2; + mv[0].dyThresh = mv[1].dyThresh = mv[2].dyThresh = mv[3].dyThresh = mv->map->MAPTILESPTR->tileHeight * 2; } void ZC_mapredraw(map_view_t *mv, int tx, int ty) @@ -553,7 +553,7 @@ void ZC_mapredraw(map_view_t *mv, int tx, int ty) py=0; i=mv[0].ty * mv[0].map->width + mv[0].tx; - for(ty=mv[0].ty-1; py < mv[0].page->sh+mv->dyThresh && ty < mv[0].map->height; ty++, py+=mv[0].map->layertile[0]->tileHeight) { + 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) { mapDrawWRow(&mv[0], tx-1, ty, py); mapDrawWRow(&mv[1], tx-1, ty, py); i+=mv->map->width - tx; @@ -611,9 +611,9 @@ if(pagedelayrendermap) if(!y) y+=TILEWH; else y-=TILEWH; 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); } /* the position within the map array */ i=ty * mv->map->width + tx; - for( mv->dx=poopoffset; mv->dx<(mv->page->sw+mv->dxThresh)/(poopoffset+1) && tx < mv->map->width; mv->dx+=mv->map->layertile[0]->tileWidth, tx++) { + for( mv->dx=poopoffset; mv->dx<(mv->page->sw+mv->dxThresh)/(poopoffset+1) && tx < mv->map->width; mv->dx+=mv->map->MAPTILESPTR->tileWidth, tx++) { if(i>=0) - mapDrawTile(mv->map->layertile[0], mv->map->data[i], mv->page, mv->dx, y); + mapDrawTile(mv->map->MAPTILESPTR, mv->map->MAPDATAPTR[i], mv->page, mv->dx, y); i++; /* next! */ } if(pagedelayrendermap) delay(200); @@ -630,9 +630,9 @@ if(pagedelayrendermap){ sprintf(global_temp_status_text, "%-3u", mv->dy); modexp i=ty * mv->map->width + tx; /* We'll copy all of the columns in the screen, i + 1 row above and one below */ - for( mv->dy=poopoffset; mv->dy<(mv->page->sh+mv->dyThresh)/(poopoffset+1) && ty < mv->map->height; mv->dy+=mv->map->layertile[0]->tileHeight, ty++) { + for( mv->dy=poopoffset; mv->dy<(mv->page->sh+mv->dyThresh)/(poopoffset+1) && ty < mv->map->height; mv->dy+=mv->map->MAPTILESPTR->tileHeight, ty++) { if(i>=0) - mapDrawTile(mv->map->layertile[0], mv->map->data[i], mv->page, x, mv->dy); + mapDrawTile(mv->map->MAPTILESPTR, mv->map->MAPDATAPTR[i], mv->page, x, mv->dy); i += mv->map->width; } if(pagedelayrendermap) delay(200); @@ -644,9 +644,9 @@ void mapDrawWRow(map_view_t *mv, int tx, int ty, word y) /* the position within the map array */ i=ty * mv->map->width + tx; - for(mv->dx=0; mv->dxpage->sw+mv->dxThresh && tx < mv->map->width; mv->dx+=mv->map->layertile[0]->tileWidth, tx++) { + for(mv->dx=0; mv->dxpage->sw+mv->dxThresh && tx < mv->map->width; mv->dx+=mv->map->MAPTILESPTR->tileWidth, tx++) { if(i>=0) /* we are in the map, so copy! */ - mapDrawTile(mv->map->layertile[0], mv->map->data[i], mv->page, mv->dx, y); + mapDrawTile(mv->map->MAPTILESPTR, mv->map->MAPDATAPTR[i], mv->page, mv->dx, y); i++; /* next! */ } } @@ -660,9 +660,9 @@ void mapDrawWCol(map_view_t *mv, int tx, int ty, word x) /* We'll copy all of the columns in the screen, i + 1 row above and one below */ - for(mv->dy=0; mv->dypage->sh+mv->dyThresh && ty < mv->map->height; mv->dy+=mv->map->layertile[0]->tileHeight, ty++) { + for(mv->dy=0; mv->dypage->sh+mv->dyThresh && ty < mv->map->height; mv->dy+=mv->map->MAPTILESPTR->tileHeight, ty++) { if(i>=0) /* we are in the map, so copy away! */ - mapDrawTile(mv->map->layertile[0], mv->map->data[i], mv->page, x, mv->dy); + mapDrawTile(mv->map->MAPTILESPTR, mv->map->MAPDATAPTR[i], mv->page, x, mv->dy); i += mv->map->width; } } @@ -751,7 +751,7 @@ void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn) break; } x-=4; - y-=pip[0].map->layertile[0]->tileHeight; + y-=pip[0].map->MAPTILESPTR->tileHeight; switch (player[pn].enti.d) { case 0: diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h index c33d99c3..fc187954 100755 --- a/src/lib/scroll16.h +++ b/src/lib/scroll16.h @@ -81,7 +81,7 @@ #define SCROLLEXITMESG printf("page[0]dxy: %dx%d", gvar.video.page[0].dx, gvar.video.page[0].dy);\ printf("\n\n");\ printf("player vars:\n");\ - printf(" xy: %dx%d", player[0].enti.x, player[0].enti.y); printf(" txy: %dx%d", player[0].enti.tx, player[0].enti.ty); printf(" triggxy: %dx%d", player[0].enti.triggerx, player[0].enti.triggery); printf(" value: %d\n", mv[1].map->layerdata[0][(player[0].enti.triggerx-1)+(map.width*(player[0].enti.triggery-1))]);\ + printf(" xy: %dx%d", player[0].enti.x, player[0].enti.y); printf(" txy: %dx%d", player[0].enti.tx, player[0].enti.ty); printf(" triggxy: %dx%d", player[0].enti.triggerx, player[0].enti.triggery); printf(" value: %d\n", mv[1].map->MAPDATAPTR[(player[0].enti.triggerx-1)+(map.width*(player[0].enti.triggery-1))]);\ printf(" hp: %d", (player[0].enti.hp)); printf(" q: %u", player[0].enti.q); printf(" info.dir: %u", player[0].info.dir); printf(" d: %u", player[0].enti.d); printf(" dire: %u", player[0].enti.dire);\ printf(" pdir: %u\n", player[0].pdir); printf(" delay=%u", player[0].enti.spri->delay);\ printf("\n\n");\ @@ -132,7 +132,7 @@ inline void near ScrollRight(map_view_t *mv, player_t *player, word id, word pli /* Snap the origin forward */ mv[id].page->data += 4; - mv[id].page->dx = mv[id].map->layertile[0]->tileWidth; + mv[id].page->dx = mv[id].map->MAPTILESPTR->tileWidth; } } @@ -149,7 +149,7 @@ inline void near ScrollLeft(map_view_t *mv, player_t *player, word id, word plid /* Snap the origin backward */ mv[id].page->data -= 4; - mv[id].page->dx = mv[id].map->layertile[0]->tileWidth; + mv[id].page->dx = mv[id].map->MAPTILESPTR->tileWidth; } } @@ -166,7 +166,7 @@ inline void near ScrollUp(map_view_t *mv, player_t *player, word id, word plid) /* Snap the origin upward */ mv[id].page->data -= mv[id].page->pi; - mv[id].page->dy = mv[id].map->layertile[0]->tileHeight; + mv[id].page->dy = mv[id].map->MAPTILESPTR->tileHeight; } } @@ -183,7 +183,7 @@ inline void near ScrollDown(map_view_t *mv, player_t *player, word id, word plid /* Snap the origin downward */ mv[id].page->data += mv[id].page->pi; - mv[id].page->dy = mv[id].map->layertile[0]->tileHeight; + mv[id].page->dy = mv[id].map->MAPTILESPTR->tileHeight; } } diff --git a/src/maptest.c b/src/maptest.c index c73ea3dd..f426b2c6 100755 --- a/src/maptest.c +++ b/src/maptest.c @@ -61,7 +61,7 @@ main(int argc, char *argv[]) for(i=0; i<(map.width*map.height); i++) { //fprintf(stdout, "%04d[%02d]", i, map.data[i]); - fprintf(stdout, "%c", map.layerdata[0][i]+44); + fprintf(stdout, "%c", map.MAPDATAPTR[i]+44); if(!((i+1)%map.width)){ //fprintf(stdout, "[%d]", i); fprintf(stdout, "\n"); } diff --git a/src/scroll.c b/src/scroll.c index 7c3dd4fe..beaff2b2 100755 --- a/src/scroll.c +++ b/src/scroll.c @@ -180,7 +180,7 @@ void main(int argc, char *argv[]) //the scripting stuff.... //if(((player[0].enti.triggerx == TRIGGX && player[0].enti.triggery == TRIGGY) && IN_KeyDown(0x1C))||(player[0].enti.tx == 5 && player[0].enti.ty == 5)) - if(((mv[0].map->data[(player[0].enti.triggerx-1)+(map.width*(player[0].enti.triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].enti.tx == 5 && player[0].enti.ty == 5)) + if(((mv[0].map->MAPDATAPTR[(player[0].enti.triggerx-1)+(map.width*(player[0].enti.triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].enti.tx == 5 && player[0].enti.ty == 5)) { short i; for(i=800; i>=400; i--) diff --git a/src/zcroll.c b/src/zcroll.c index ed2341bb..16213d6b 100755 --- a/src/zcroll.c +++ b/src/zcroll.c @@ -170,7 +170,7 @@ void main(int argc, char *argv[]) //the scripting stuff.... //if(((player[0].enti.triggerx == TRIGGX && player[0].enti.triggery == TRIGGY) && IN_KeyDown(0x1C))||(player[0].enti.tx == 5 && player[0].enti.ty == 5)) - if(((mv[0].map->data[(player[0].enti.triggerx-1)+(map.width*(player[0].enti.triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].enti.tx == 5 && player[0].enti.ty == 5)) + if(((mv[0].map->MAPDATAPTR[(player[0].enti.triggerx-1)+(map.width*(player[0].enti.triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].enti.tx == 5 && player[0].enti.ty == 5)) { short i; for(i=800; i>=400; i--) -- 2.39.2