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

A small reprieve for gcc6 users. Fixed codebase so it compiles in g++6 again. 

Note that we're moving to gcc7 fairly soon, so this won't be for long.

Bumped version number.
This commit is contained in:
Stephen Anthony 2020-06-07 18:34:10 -02:30
parent 081682e2b5
commit 082b8dd9dc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/PaletteHandler.hxx
View File

@ -125,8 +125,8 @@ class PaletteHandler
/**
Convert adjustables from/to 100% scale
*/
constexpr float scaleFrom100(float x) const { return (x / 50.F) - 1.F; }
constexpr uInt32 scaleTo100(float x) const { return uInt32(50 * (x + 1.F)); }
static constexpr float scaleFrom100(float x) { return (x / 50.F) - 1.F; }
static constexpr uInt32 scaleTo100(float x) { return uInt32(50 * (x + 1.F)); }
/**
Convert palette settings name to enumeration.

2
src/common/Version.hxx
View File

@ -18,7 +18,7 @@
#ifndef VERSION_HXX
#define VERSION_HXX
#define STELLA_VERSION "6.2"
#define STELLA_VERSION "6.2.1_pre"
#define STELLA_BUILD "6001"
#endif