thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GUI: Change name of GUI-renderers to remove "16-bit"

Browse source
This commit is contained in:
Narek Mailian 2013-08-01 01:38:22 +02:00
parent 969a33a32d
commit f545a2f08f
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
graphics/VectorRendererSpec.cpp
View file

@ -277,15 +277,15 @@ void colorFill(PixelType *first, PixelType *last, PixelType color) {
VectorRenderer *createRenderer(int mode) {
#ifdef DISABLE_FANCY_THEMES
assert(mode == GUI::ThemeEngine::kGfxStandard16bit);
assert(mode == GUI::ThemeEngine::kGfxStandard);
#endif
PixelFormat format = g_system->getOverlayFormat();
switch (mode) {
case GUI::ThemeEngine::kGfxStandard16bit:
case GUI::ThemeEngine::kGfxStandard:
return new VectorRendererSpec<OverlayColor>(format);
#ifndef DISABLE_FANCY_THEMES
case GUI::ThemeEngine::kGfxAntialias16bit:
case GUI::ThemeEngine::kGfxAntialias:
return new VectorRendererAA<OverlayColor>(format);
#endif
default:

12
gui/ThemeEngine.cpp
View file

@ -343,9 +343,9 @@ ThemeEngine::~ThemeEngine() {
*********************************************************/
const ThemeEngine::Renderer ThemeEngine::_rendererModes[] = {
{ _s("Disabled GFX"), _sc("Disabled GFX", "lowres"), "none", kGfxDisabled },
{ _s("Standard Renderer (16bpp)"), _s("Standard (16bpp)"), "normal_16bpp", kGfxStandard16bit },
{ _s("Standard Renderer"), _s("Standard"), "normal", kGfxStandard },
#ifndef DISABLE_FANCY_THEMES
{ _s("Antialiased Renderer (16bpp)"), _s("Antialiased (16bpp)"), "aa_16bpp", kGfxAntialias16bit }
{ _s("Antialiased Renderer"), _s("Antialiased"), "antialias", kGfxAntialias }
#endif
};
@ -353,9 +353,9 @@ const uint ThemeEngine::_rendererModesSize = ARRAYSIZE(ThemeEngine::_rendererMod
const ThemeEngine::GraphicsMode ThemeEngine::_defaultRendererMode =
#ifndef DISABLE_FANCY_THEMES
ThemeEngine::kGfxAntialias16bit;
ThemeEngine::kGfxAntialias;
#else
ThemeEngine::kGfxStandard16bit;
ThemeEngine::kGfxStandard;
#endif
ThemeEngine::GraphicsMode ThemeEngine::findMode(const Common::String &cfg) {
@ -494,9 +494,9 @@ void ThemeEngine::disable() {
void ThemeEngine::setGraphicsMode(GraphicsMode mode) {
switch (mode) {
case kGfxStandard16bit:
case kGfxStandard:
#ifndef DISABLE_FANCY_THEMES
case kGfxAntialias16bit:
case kGfxAntialias:
#endif
_bytesPerPixel = sizeof(uint16);
break;

4
gui/ThemeEngine.h
View file

@ -250,8 +250,8 @@ public:
*/
enum GraphicsMode {
kGfxDisabled = 0, ///< No GFX
kGfxStandard16bit, ///< 2BPP with the standard (aliased) renderer.
kGfxAntialias16bit ///< 2BPP with the optimized AA renderer.
kGfxStandard, ///< Standard (aliased) renderer.
kGfxAntialias ///< Optimized AA renderer.
};
/** Constant value to expand dirty rectangles, to make sure they are fully copied */