1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00

Merge pull request #5460 from Laserlicht/setting

[1.6.7?] Add settings
This commit is contained in:
Ivan Savenko
2025-02-25 16:49:48 +02:00
committed by GitHub
11 changed files with 73 additions and 14 deletions

View File

@@ -20,6 +20,8 @@
#include "../gui/CGuiHandler.h"
#include "../render/IScreenHandler.h"
#include "../../lib/CConfigHandler.h"
#include <tbb/parallel_for.h>
#include <tbb/task_arena.h>
@@ -270,7 +272,10 @@ SDLImageShared::SDLImageShared(const SDLImageShared * from, int integerScaleFact
upscalingInProgress = false;
};
upscalingArena.enqueue(scalingTask);
if(settings["video"]["asyncUpscaling"].Bool())
upscalingArena.enqueue(scalingTask);
else
scalingTask();
}
bool SDLImageShared::isLoading() const