YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tile list

Browse Source
This commit is contained in:
Dominic Masters
2021-04-05 20:56:37 +10:00
parent 35759965ab
commit ca24ed264a
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/engine/world/chunklist.c
View File

@ -152,7 +152,8 @@ void chunkListChunkLoad(chunklist_t *list, chunk_t *chunk,
int32_t tx, ty, tz, i, count; int32_t tx, ty, tz, i, count;
tilesetdiv_t *div; tilesetdiv_t *div;
tileref_t *tiles; tileref_t *tiles;
tileref_t tile; tileref_t tileRef;
tile_t *tile;
count = CHUNK_WIDTH * CHUNK_DEPTH * CHUNK_HEIGHT; count = CHUNK_WIDTH * CHUNK_DEPTH * CHUNK_HEIGHT;
tiles = calloc(count, sizeof(tileref_t)); tiles = calloc(count, sizeof(tileref_t));
@ -163,10 +164,11 @@ void chunkListChunkLoad(chunklist_t *list, chunk_t *chunk,
for(tx = 0; tx < CHUNK_WIDTH; tx++) { for(tx = 0; tx < CHUNK_WIDTH; tx++) {
for(ty = 0; ty < CHUNK_HEIGHT; ty++) { for(ty = 0; ty < CHUNK_HEIGHT; ty++) {
for(tz = 0; tz < CHUNK_DEPTH; tz++) { for(tz = 0; tz < CHUNK_DEPTH; tz++) {
tile = tiles[++i]; tileRef = tiles[++i];
if(tile == TILE_NULL) continue; if(tileRef == TILE_NULL) continue;
div = &list->tilemap->tileset->divisions[tile]; div = list->tilemap->tileset->divisions + tileRef;
tile = list->tilemap->tiles + tileRef;
spriteBatchQuad(chunk->batch, -1, spriteBatchQuad(chunk->batch, -1,
tx, ty, tz, 1, 1, tx, ty, tz, 1, 1,
div->x0, div->y0, div->x1, div->y1 div->x0, div->y0, div->x1, div->y1

2
src/engine/world/tile.c
View File

@ -12,7 +12,7 @@ tilemap_t * tileMapCreate(tileset_t *tileset) {
if(tilemap == NULL) return NULL; if(tilemap == NULL) return NULL;
tilemap->tileset = tileset; tilemap->tileset = tileset;
tilemap->tiles = malloc(sizeof(tile_t) * tileset->columns * tileset->rows); tilemap->tiles = calloc(tileset->columns * tileset->rows, sizeof(tile_t));
return tilemap; return tilemap;
} }