diff options
| -rw-r--r-- | graphics/VectorRendererSpec.cpp | 23 | ||||
| -rw-r--r-- | gui/ThemeEngine.cpp | 2 | ||||
| -rw-r--r-- | gui/newgui.cpp | 3 |
3 files changed, 17 insertions, 11 deletions
diff --git a/graphics/VectorRendererSpec.cpp b/graphics/VectorRendererSpec.cpp index b129bbfc79..375dfca20a 100644 --- a/graphics/VectorRendererSpec.cpp +++ b/graphics/VectorRendererSpec.cpp @@ -372,16 +372,27 @@ applyScreenShading(GUI::Theme::ShadingStyle shadingStyle) { uint8 r, g, b; uint lum; - uint32 shiftMask = (uint32)( + const uint32 shiftMask = (uint32)~( (1 << PixelFormat::kGreenShift) | (1 << PixelFormat::kRedShift) | - (1 << PixelFormat::kBlueShift)); - - shiftMask = (~shiftMask) >> 1; + (1 << PixelFormat::kBlueShift)) >> 1; if (shadingStyle == GUI::Theme::kShadingDim) { - while (pixels--) - *ptr++ = (*ptr >> 1) & shiftMask; + + int n = (pixels + 7) >> 3; + switch (pixels % 8) { + case 0: do { + *ptr++ = (*ptr >> 1) & shiftMask; + case 7: *ptr++ = (*ptr >> 1) & shiftMask; + case 6: *ptr++ = (*ptr >> 1) & shiftMask; + case 5: *ptr++ = (*ptr >> 1) & shiftMask; + case 4: *ptr++ = (*ptr >> 1) & shiftMask; + case 3: *ptr++ = (*ptr >> 1) & shiftMask; + case 2: *ptr++ = (*ptr >> 1) & shiftMask; + case 1: *ptr++ = (*ptr >> 1) & shiftMask; + } while (--n > 0); + } + } else if (shadingStyle == GUI::Theme::kShadingLuminance) { while (pixels--) { colorToRGB<PixelFormat>(*ptr, r, g, b); diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp index 17623845b0..e75c2e295e 100644 --- a/gui/ThemeEngine.cpp +++ b/gui/ThemeEngine.cpp @@ -462,8 +462,6 @@ bool ThemeEngine::addDrawData(const Common::String &data, bool cached) { bool ThemeEngine::loadTheme(Common::String fileName) { unloadTheme(); - warning("Loading theme: %s.\n", fileName.c_str()); - if (fileName != "builtin") { if (fileName.hasSuffix(".zip")) ImageMan.addArchive(fileName); diff --git a/gui/newgui.cpp b/gui/newgui.cpp index 3361a76602..72b7f2612c 100644 --- a/gui/newgui.cpp +++ b/gui/newgui.cpp @@ -92,9 +92,6 @@ NewGui::NewGui() : _redrawStatus(kRedrawDisabled), if (themefile.compareToIgnoreCase("default") == 0) themefile = "builtin"; -// if (themefile != "builtin" && !themefile.hasSuffix(".zip")) -// themefile += ".zip"; - ConfMan.registerDefault("gui_renderer", 2); ThemeEngine::GraphicsMode gfxMode = (ThemeEngine::GraphicsMode)ConfMan.getInt("gui_renderer"); |