Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-04-26 08:17:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
red031000 2025-11-06 07:13:36 +00:00
parent 5d39e7bd54
commit 369fa7d00d
No known key found for this signature in database
GPG Key ID: D27E50C050AE0CE1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/nitrogfx/gfx.c
View File

@ -798,11 +798,6 @@ void ApplyCellsToImage(char *cellFilePath, struct Image *image, bool toPNG, bool
{ {
cellHeight = options->cells[i]->maxY - options->cells[i]->minY; cellHeight = options->cells[i]->maxY - options->cells[i]->minY;
cellWidth = options->cells[i]->maxX - options->cells[i]->minX; cellWidth = options->cells[i]->maxX - options->cells[i]->minX;
if (snap)
{
cellHeight = SnapToTile(cellHeight);
cellWidth = SnapToTile(cellWidth);
}
cellInfo[i].minX = options->cells[i]->minX; cellInfo[i].minX = options->cells[i]->minX;
cellInfo[i].minY = options->cells[i]->minY; cellInfo[i].minY = options->cells[i]->minY;
} }
@ -847,6 +842,11 @@ void ApplyCellsToImage(char *cellFilePath, struct Image *image, bool toPNG, bool
cellInfo[i].minX = minX; cellInfo[i].minX = minX;
cellInfo[i].minY = minY; cellInfo[i].minY = minY;
} }
if (snap)
{
cellHeight = SnapToTile(cellHeight);
cellWidth = SnapToTile(cellWidth);
}
outputHeight += cellHeight + 1; outputHeight += cellHeight + 1;
if (outputWidth < cellWidth) if (outputWidth < cellWidth)
@ -1592,7 +1592,7 @@ void ReadNtrCell_LABL(unsigned char * restrict data, unsigned int blockOffset, u
{ {
FATAL_ERROR("corrupted LABL block\n"); FATAL_ERROR("corrupted LABL block\n");
} }
unsigned long slen = strnlen((char *)data + offset, blockSize - offset); unsigned long slen = strnlen((char *)data + offset, (blockOffset + blockSize) - offset);
options->labels[i] = malloc(slen + 1); options->labels[i] = malloc(slen + 1);
strncpy(options->labels[i], (char *)data + offset, slen + 1); strncpy(options->labels[i], (char *)data + offset, slen + 1);
} }