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

COMMON: Rename kFeatureCursorHasPalette -> kFeatureCursorPalette

Browse source
This commit is contained in:
Max Horn 2011-06-03 23:30:55 +02:00
parent 4b95cf5d1a
commit 91b889e2d3
18 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
View file

@ -468,7 +468,7 @@ bool DINGUXSdlGraphicsManager::loadGFXMode() {
bool DINGUXSdlGraphicsManager::hasFeature(OSystem::Feature f) { bool DINGUXSdlGraphicsManager::hasFeature(OSystem::Feature f) {
return return
(f == OSystem::kFeatureAspectRatioCorrection) || (f == OSystem::kFeatureAspectRatioCorrection) ||
(f == OSystem::kFeatureCursorHasPalette); (f == OSystem::kFeatureCursorPalette);
} }
void DINGUXSdlGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) { void DINGUXSdlGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) {

2
backends/graphics/gph/gph-graphics.cpp
View file

@ -476,7 +476,7 @@ bool GPHGraphicsManager::loadGFXMode() {
bool GPHGraphicsManager::hasFeature(OSystem::Feature f) { bool GPHGraphicsManager::hasFeature(OSystem::Feature f) {
return return
(f == OSystem::kFeatureAspectRatioCorrection) || (f == OSystem::kFeatureAspectRatioCorrection) ||
(f == OSystem::kFeatureCursorHasPalette); (f == OSystem::kFeatureCursorPalette);
} }
void GPHGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) { void GPHGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) {

2
backends/graphics/opengl/opengl-graphics.cpp
View file

@ -91,7 +91,7 @@ void OpenGLGraphicsManager::initEventObserver() {
bool OpenGLGraphicsManager::hasFeature(OSystem::Feature f) { bool OpenGLGraphicsManager::hasFeature(OSystem::Feature f) {
return return
(f == OSystem::kFeatureAspectRatioCorrection) || (f == OSystem::kFeatureAspectRatioCorrection) ||
(f == OSystem::kFeatureCursorHasPalette); (f == OSystem::kFeatureCursorPalette);
} }
void OpenGLGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) { void OpenGLGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) {

2
backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp
View file

@ -35,7 +35,7 @@ SamsungTVSdlGraphicsManager::SamsungTVSdlGraphicsManager(SdlEventSource *sdlEven
bool SamsungTVSdlGraphicsManager::hasFeature(OSystem::Feature f) { bool SamsungTVSdlGraphicsManager::hasFeature(OSystem::Feature f) {
return return
(f == OSystem::kFeatureAspectRatioCorrection) || (f == OSystem::kFeatureAspectRatioCorrection) ||
(f == OSystem::kFeatureCursorHasPalette); (f == OSystem::kFeatureCursorPalette);
} }
void SamsungTVSdlGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) { void SamsungTVSdlGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) {

2
backends/graphics/sdl/sdl-graphics.cpp
View file

@ -223,7 +223,7 @@ bool SdlGraphicsManager::hasFeature(OSystem::Feature f) {
return return
(f == OSystem::kFeatureFullscreenMode) || (f == OSystem::kFeatureFullscreenMode) ||
(f == OSystem::kFeatureAspectRatioCorrection) || (f == OSystem::kFeatureAspectRatioCorrection) ||
(f == OSystem::kFeatureCursorHasPalette) || (f == OSystem::kFeatureCursorPalette) ||
(f == OSystem::kFeatureIconifyWindow); (f == OSystem::kFeatureIconifyWindow);
} }

2
backends/graphics/symbiansdl/symbiansdl-graphics.cpp
View file

@ -54,7 +54,7 @@ bool SymbianSdlGraphicsManager::hasFeature(OSystem::Feature f) {
switch (f) { switch (f) {
case OSystem::kFeatureFullscreenMode: case OSystem::kFeatureFullscreenMode:
case OSystem::kFeatureAspectRatioCorrection: case OSystem::kFeatureAspectRatioCorrection:
case OSystem::kFeatureCursorHasPalette: case OSystem::kFeatureCursorPalette:
#ifdef USE_VIBRA_SE_PXXX #ifdef USE_VIBRA_SE_PXXX
case OSystem::kFeatureVibration: case OSystem::kFeatureVibration:
#endif #endif

2
backends/platform/android/android.cpp
View file

@ -399,7 +399,7 @@ void OSystem_Android::addPluginDirectories(Common::FSList &dirs) const {
bool OSystem_Android::hasFeature(Feature f) { bool OSystem_Android::hasFeature(Feature f) {
return (f == kFeatureFullscreenMode || return (f == kFeatureFullscreenMode ||
f == kFeatureAspectRatioCorrection || f == kFeatureAspectRatioCorrection ||
f == kFeatureCursorHasPalette || f == kFeatureCursorPalette ||
f == kFeatureVirtualKeyboard || f == kFeatureVirtualKeyboard ||
f == kFeatureOverlaySupportsAlpha); f == kFeatureOverlaySupportsAlpha);
} }

2
backends/platform/dc/dcmain.cpp
View file

@ -163,7 +163,7 @@ bool OSystem_Dreamcast::hasFeature(Feature f)
case kFeatureAspectRatioCorrection: case kFeatureAspectRatioCorrection:
case kFeatureVirtualKeyboard: case kFeatureVirtualKeyboard:
case kFeatureOverlaySupportsAlpha: case kFeatureOverlaySupportsAlpha:
case kFeatureCursorHasPalette: case kFeatureCursorPalette:
return true; return true;
default: default:
return false; return false;

2
backends/platform/ds/arm9/source/osystem_ds.cpp
View file

@ -122,7 +122,7 @@ void OSystem_DS::initBackend() {
} }
bool OSystem_DS::hasFeature(Feature f) { bool OSystem_DS::hasFeature(Feature f) {
return (f == kFeatureVirtualKeyboard) || (f == kFeatureCursorHasPalette); return (f == kFeatureVirtualKeyboard) || (f == kFeatureCursorPalette);
} }
void OSystem_DS::setFeatureState(Feature f, bool enable) { void OSystem_DS::setFeatureState(Feature f, bool enable) {

2
backends/platform/n64/osys_n64_base.cpp
View file

@ -199,7 +199,7 @@ void OSystem_N64::initBackend() {
} }
bool OSystem_N64::hasFeature(Feature f) { bool OSystem_N64::hasFeature(Feature f) {
return (f == kFeatureCursorHasPalette); return (f == kFeatureCursorPalette);
} }
void OSystem_N64::setFeatureState(Feature f, bool enable) { void OSystem_N64::setFeatureState(Feature f, bool enable) {

2
backends/platform/psp/osys_psp.cpp
View file

@ -110,7 +110,7 @@ void OSystem_PSP::engineDone() {
} }
bool OSystem_PSP::hasFeature(Feature f) { bool OSystem_PSP::hasFeature(Feature f) {
return (f == kFeatureOverlaySupportsAlpha || f == kFeatureCursorHasPalette); return (f == kFeatureOverlaySupportsAlpha || f == kFeatureCursorPalette);
} }
void OSystem_PSP::setFeatureState(Feature f, bool enable) { void OSystem_PSP::setFeatureState(Feature f, bool enable) {

2
backends/platform/wii/osystem.cpp
View file

@ -175,7 +175,7 @@ void OSystem_Wii::engineDone() {
bool OSystem_Wii::hasFeature(Feature f) { bool OSystem_Wii::hasFeature(Feature f) {
return (f == kFeatureFullscreenMode) || return (f == kFeatureFullscreenMode) ||
(f == kFeatureAspectRatioCorrection) || (f == kFeatureAspectRatioCorrection) ||
(f == kFeatureCursorHasPalette) || (f == kFeatureCursorPalette) ||
(f == kFeatureOverlaySupportsAlpha); (f == kFeatureOverlaySupportsAlpha);
} }

10
common/system.h
View file

@ -168,7 +168,7 @@ public:
* To enable the cursor palette call "disableCursorPalette" with false. * To enable the cursor palette call "disableCursorPalette" with false.
* @see disableCursorPalette * @see disableCursorPalette
*/ */
kFeatureCursorHasPalette, kFeatureCursorPalette,
/** /**
* Set to true if the overlay pixel format has an alpha channel. * Set to true if the overlay pixel format has an alpha channel.
@ -776,22 +776,22 @@ public:
* The palette entries from 'start' till (start+num-1) will be replaced - so * The palette entries from 'start' till (start+num-1) will be replaced - so
* a full palette update is accomplished via start=0, num=256. * a full palette update is accomplished via start=0, num=256.
* *
* Backends which implement it should have kFeatureCursorHasPalette flag set * Backends which implement it should have kFeatureCursorPalette flag set
* *
* @see setPalette * @see setPalette
* @see kFeatureCursorHasPalette * @see kFeatureCursorPalette
*/ */
virtual void setCursorPalette(const byte *colors, uint start, uint num) {} virtual void setCursorPalette(const byte *colors, uint start, uint num) {}
/** /**
* Disable or enable cursor palette. * Disable or enable cursor palette.
* *
* Backends which implement it should have kFeatureCursorHasPalette flag set * Backends which implement it should have kFeatureCursorPalette flag set
* *
* @param disable True to disable, false to enable. * @param disable True to disable, false to enable.
* *
* @see setPalette * @see setPalette
* @see kFeatureCursorHasPalette * @see kFeatureCursorPalette
*/ */
virtual void disableCursorPalette(bool disable) {} virtual void disableCursorPalette(bool disable) {}

2
engines/scumm/he/resource_he.cpp
View file

@ -171,7 +171,7 @@ bool MacResExtractor::extractResource(int id, CachedCursor *cc) {
return false; return false;
// If we don't have a cursor palette, force monochrome cursors // If we don't have a cursor palette, force monochrome cursors
bool forceMonochrome = !_vm->_system->hasFeature(OSystem::kFeatureCursorHasPalette); bool forceMonochrome = !_vm->_system->hasFeature(OSystem::kFeatureCursorPalette);
Graphics::MacCursor *macCursor = new Graphics::MacCursor(); Graphics::MacCursor *macCursor = new Graphics::MacCursor();

2
engines/testbed/graphics.cpp
View file

@ -244,7 +244,7 @@ void rotatePalette(byte *palette, int size) {
*/ */
void GFXtests::setupMouseLoop(bool disableCursorPalette, const char *gfxModeName, int cursorTargetScale) { void GFXtests::setupMouseLoop(bool disableCursorPalette, const char *gfxModeName, int cursorTargetScale) {
bool isFeaturePresent; bool isFeaturePresent;
isFeaturePresent = g_system->hasFeature(OSystem::kFeatureCursorHasPalette); isFeaturePresent = g_system->hasFeature(OSystem::kFeatureCursorPalette);
Common::Rect cursorRect; Common::Rect cursorRect;
if (isFeaturePresent) { if (isFeaturePresent) {

12
graphics/cursorman.cpp
View file

@ -86,7 +86,7 @@ void CursorManager::popAllCursors() {
delete cur; delete cur;
} }
if (g_system->hasFeature(OSystem::kFeatureCursorHasPalette)) { if (g_system->hasFeature(OSystem::kFeatureCursorPalette)) {
while (!_cursorPaletteStack.empty()) { while (!_cursorPaletteStack.empty()) {
Palette *pal = _cursorPaletteStack.pop(); Palette *pal = _cursorPaletteStack.pop();
delete pal; delete pal;
@ -141,11 +141,11 @@ void CursorManager::replaceCursor(const byte *buf, uint w, uint h, int hotspotX,
} }
bool CursorManager::supportsCursorPalettes() { bool CursorManager::supportsCursorPalettes() {
return g_system->hasFeature(OSystem::kFeatureCursorHasPalette); return g_system->hasFeature(OSystem::kFeatureCursorPalette);
} }
void CursorManager::disableCursorPalette(bool disable) { void CursorManager::disableCursorPalette(bool disable) {
if (!g_system->hasFeature(OSystem::kFeatureCursorHasPalette)) if (!g_system->hasFeature(OSystem::kFeatureCursorPalette))
return; return;
if (_cursorPaletteStack.empty()) if (_cursorPaletteStack.empty())
@ -158,7 +158,7 @@ void CursorManager::disableCursorPalette(bool disable) {
} }
void CursorManager::pushCursorPalette(const byte *colors, uint start, uint num) { void CursorManager::pushCursorPalette(const byte *colors, uint start, uint num) {
if (!g_system->hasFeature(OSystem::kFeatureCursorHasPalette)) if (!g_system->hasFeature(OSystem::kFeatureCursorPalette))
return; return;
Palette *pal = new Palette(colors, start, num); Palette *pal = new Palette(colors, start, num);
@ -171,7 +171,7 @@ void CursorManager::pushCursorPalette(const byte *colors, uint start, uint num)
} }
void CursorManager::popCursorPalette() { void CursorManager::popCursorPalette() {
if (!g_system->hasFeature(OSystem::kFeatureCursorHasPalette)) if (!g_system->hasFeature(OSystem::kFeatureCursorPalette))
return; return;
if (_cursorPaletteStack.empty()) if (_cursorPaletteStack.empty())
@ -194,7 +194,7 @@ void CursorManager::popCursorPalette() {
} }
void CursorManager::replaceCursorPalette(const byte *colors, uint start, uint num) { void CursorManager::replaceCursorPalette(const byte *colors, uint start, uint num) {
if (!g_system->hasFeature(OSystem::kFeatureCursorHasPalette)) if (!g_system->hasFeature(OSystem::kFeatureCursorPalette))
return; return;
if (_cursorPaletteStack.empty()) { if (_cursorPaletteStack.empty()) {

4
graphics/cursorman.h
View file

@ -108,9 +108,9 @@ public:
* Test whether cursor palettes are supported. * Test whether cursor palettes are supported.
* *
* This is just an convenience wrapper for checking for * This is just an convenience wrapper for checking for
* OSystem::kFeatureCursorHasPalette to be supported by OSystem. * OSystem::kFeatureCursorPalette to be supported by OSystem.
* *
* @see OSystem::kFeatureCursorHasPalette * @see OSystem::kFeatureCursorPalette
* @see OSystem::hasFeature * @see OSystem::hasFeature
*/ */
bool supportsCursorPalettes(); bool supportsCursorPalettes();

2
gui/ThemeEngine.cpp
View file

@ -1271,7 +1271,7 @@ void ThemeEngine::openDialog(bool doBuffer, ShadingStyle style) {
} }
bool ThemeEngine::createCursor(const Common::String &filename, int hotspotX, int hotspotY, int scale) { bool ThemeEngine::createCursor(const Common::String &filename, int hotspotX, int hotspotY, int scale) {
if (!_system->hasFeature(OSystem::kFeatureCursorHasPalette)) if (!_system->hasFeature(OSystem::kFeatureCursorPalette))
return true; return true;
// Try to locate the specified file among all loaded bitmaps // Try to locate the specified file among all loaded bitmaps