natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix going into an endless for loop for minimap processing

Browse Source
This commit is contained in:
Skarn
2020-10-21 10:19:10 +03:00
parent 35a60cbff5
commit 35e7d66e8b
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/noggit/MapView.cpp
View File

@@ -1563,20 +1563,19 @@ void MapView::saveMinimap(noggit::MinimapRenderSettings* settings)
case noggit::MinimapGenMode::MAP: case noggit::MinimapGenMode::MAP:
{ {
// increment tile indices here // increment tile indices here
if (mmap_render_success)
{
mmap_render_index++;
}
tile_index tile = tile_index(mmap_render_index / 64, mmap_render_index % 64); tile_index tile = tile_index(mmap_render_index / 64, mmap_render_index % 64);
if (_world->mapIndex.hasTile(tile)) if (_world->mapIndex.hasTile(tile))
{ {
mmap_render_success = _world->saveMinimap(512, 512, tile); mmap_render_success = _world->saveMinimap(512, 512, tile);
if (mmap_render_success)
{
mmap_render_index++;
}
} }
else else
{ {do
do
{ {
mmap_render_index++; mmap_render_index++;
tile.x = mmap_render_index / 64; tile.x = mmap_render_index / 64;
@@ -1584,11 +1583,6 @@ void MapView::saveMinimap(noggit::MinimapRenderSettings* settings)
} while (!_world->mapIndex.hasTile(tile) && mmap_render_index != 4095 ); } while (!_world->mapIndex.hasTile(tile) && mmap_render_index != 4095 );
if (mmap_render_success)
{
mmap_render_index--;
}
} }
if (mmap_render_success && mmap_render_index >= 4095) if (mmap_render_success && mmap_render_index >= 4095)