diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-08-26 01:12:32 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-08-26 01:13:25 +0300 |
| commit | 6f8da91cf4af4057ae4d2b9a2e2cd654e54d2d2c (patch) | |
| tree | a5653f6ee58e814a8c33305710616e85e4717f12 /src | |
| parent | b296e03e228f4506b65852b055df007ccbe14310 (diff) | |
| download | plus-6f8da91cf4af4057ae4d2b9a2e2cd654e54d2d2c.tar.gz plus-6f8da91cf4af4057ae4d2b9a2e2cd654e54d2d2c.tar.bz2 plus-6f8da91cf4af4057ae4d2b9a2e2cd654e54d2d2c.tar.xz plus-6f8da91cf4af4057ae4d2b9a2e2cd654e54d2d2c.zip | |
disable map reduce in SDL2.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/setup_perfomance.cpp | 2 | ||||
| -rw-r--r-- | src/map.cpp | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/setup_perfomance.cpp b/src/gui/setup_perfomance.cpp index eecfe95fc..17dec597e 100644 --- a/src/gui/setup_perfomance.cpp +++ b/src/gui/setup_perfomance.cpp @@ -81,9 +81,11 @@ Setup_Perfomance::Setup_Perfomance(const Widget2 *const widget) : new SetupItemCheckBox(_("Enable opacity cache (Software, can " "use much memory)"), "", "alphaCache", this, "alphaCacheEvent"); +#ifndef USE_SDL2 // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable map reduce (Software)"), "", "enableMapReduce", this, "enableMapReduceEvent"); +#endif // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable compound sprite delay (Software)"), "", diff --git a/src/map.cpp b/src/map.cpp index 7b83e9c7b..011a19319 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -1439,11 +1439,15 @@ void Map::clearIndexedTilesets() void Map::reduce() { +#ifdef USE_SDL2 + return; +#else if (!mFringeLayer || mOpenGL > 0 || !config.getBoolValue("enableMapReduce")) { return; } +#endif int cnt = 0; for (int x = 0; x < mWidth; x ++) |