ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/filesystem

This commit is contained in:
Stephen Anthony 2022-08-09 14:35:28 -02:30
parent d05fae04fa 4fecd8fc97
commit aba30d36de
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/PaletteHandler.cxx
View File

@ -77,8 +77,7 @@ void PaletteHandler::cyclePalette(int direction)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool PaletteHandler::isCustomAdjustable() const
{
return myCurrentAdjustable >= CUSTOM_START
&& myCurrentAdjustable <= CUSTOM_END;
return myCurrentAdjustable <= CUSTOM_END;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

2
src/common/PaletteHandler.hxx
View File

@ -39,7 +39,7 @@ class PaletteHandler
static constexpr float DEF_RGB_SHIFT = 0.0F;
static constexpr float MAX_RGB_SHIFT = 22.5F;
enum Adjustables {
enum Adjustables : uInt32 {
PHASE_SHIFT,
RED_SCALE,
GREEN_SCALE,

2
src/emucore/Bankswitch.cxx
View File

@ -211,7 +211,7 @@ Bankswitch::Sizes = {{
{ 8_KB, 8_KB+5 }, // _WDSW
{ 64_KB, 64_KB }, // _X07
#if defined(CUSTOM_ARM)
{ Bankswitch::any_KB, Bankswitch::any_KB } }
{ Bankswitch::any_KB, Bankswitch::any_KB }
#endif
}};
#endif // GUI_SUPPORT