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

Fix for warnings from Visual Studio.

This commit is contained in:
Stephen Anthony 2019-12-27 20:20:05 -03:30
parent 0c0f732e5f
commit 234ebb5373
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emucore/Paddles.cxx
View File

@ -430,4 +430,6 @@ int Paddles::DEJITTER_BASE = 0;
int Paddles::DEJITTER_DIFF = 0;
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
const std::array<Controller::DigitalPin, 2> Paddles::ourButtonPin;
const std::array<Controller::DigitalPin, 2> Paddles::ourButtonPin = {
DigitalPin::Four, DigitalPin::Three
};

4
src/emucore/Paddles.hxx
View File

@ -162,9 +162,7 @@ class Paddles : public Controller
// Lookup table for associating paddle buttons with controller pins
// Yes, this is hideously complex
static constexpr std::array<Controller::DigitalPin, 2> ourButtonPin = {
DigitalPin::Four, DigitalPin::Three
};
static const std::array<Controller::DigitalPin, 2> ourButtonPin;
private:
// Following constructors and assignment operators not supported

6
src/gui/RadioButtonWidget.cxx
View File

@ -122,12 +122,14 @@ void RadioButtonWidget::drawWidget(bool hilite)
// Draw the outer bounding circle
s.drawBitmap(radio_img_outercircle.data(), _x, _y + _boxY,
hilite ? kWidColorHi : kColor,
radio_img_outercircle.size(), radio_img_outercircle.size());
static_cast<uInt32>(radio_img_outercircle.size()),
static_cast<uInt32>(radio_img_outercircle.size()));
// Draw the inner bounding circle with enabled color
s.drawBitmap(radio_img_innercircle.data(), _x + 1, _y + _boxY + 1,
isEnabled() ? _bgcolor : kColor,
radio_img_innercircle.size(), radio_img_innercircle.size());
static_cast<uInt32>(radio_img_innercircle.size()),
static_cast<uInt32>(radio_img_innercircle.size()));
// draw state
if(_state)