pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad round, memset VLA

Browse Source
This commit is contained in:
Lior Halphon
2020-04-02 21:42:12 +03:00
parent 79f3f3f4d5
commit 2af6c63253
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/gfx.c
View File

@@ -104,7 +104,7 @@ void remove_whitespace(struct Graphic *graphic) {
if (Options.interleave) tile_size *= 2; if (Options.interleave) tile_size *= 2;
// Make sure we have a whole number of tiles, round down if required // Make sure we have a whole number of tiles, round down if required
graphic->size &= tile_size - 1; graphic->size &= ~(tile_size - 1);
int i = 0; int i = 0;
for (int j = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) { for (int j = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) {
@@ -142,7 +142,7 @@ void remove_duplicates(struct Graphic *graphic) {
int num_tiles = 0; int num_tiles = 0;
// Make sure we have a whole number of tiles, round down if required // Make sure we have a whole number of tiles, round down if required
graphic->size &= tile_size - 1; graphic->size &= ~(tile_size - 1);
for (int i = 0, j = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) { for (int i = 0, j = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) {
while (j < graphic->size && tile_exists(&graphic->data[j], graphic->data, tile_size, num_tiles)) { while (j < graphic->size && tile_exists(&graphic->data[j], graphic->data, tile_size, num_tiles)) {
@@ -164,6 +164,7 @@ void remove_duplicates(struct Graphic *graphic) {
bool flip_exists(uint8_t *tile, uint8_t *tiles, int tile_size, int num_tiles, bool xflip, bool yflip) { bool flip_exists(uint8_t *tile, uint8_t *tiles, int tile_size, int num_tiles, bool xflip, bool yflip) {
uint8_t flip[tile_size]; uint8_t flip[tile_size];
memset(flip, 0, sizeof(flip));
int half_size = tile_size / 2; int half_size = tile_size / 2;
for (int i = 0; i < tile_size; i++) { for (int i = 0; i < tile_size; i++) {
int byte = i; int byte = i;
@@ -193,7 +194,7 @@ void remove_flip(struct Graphic *graphic, bool xflip, bool yflip) {
int num_tiles = 0; int num_tiles = 0;
// Make sure we have a whole number of tiles, round down if required // Make sure we have a whole number of tiles, round down if required
graphic->size &= tile_size - 1; graphic->size &= ~(tile_size - 1);
for (int i = 0, j = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) { for (int i = 0, j = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) {
while (j < graphic->size && flip_exists(&graphic->data[j], graphic->data, tile_size, num_tiles, xflip, yflip)) { while (j < graphic->size && flip_exists(&graphic->data[j], graphic->data, tile_size, num_tiles, xflip, yflip)) {