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

Fixed minor compile warnings in Visual Studio.

This commit is contained in:
Stephen Anthony 2017-05-07 00:04:09 -02:30
parent ba3e5a36a0
commit 0cb9b89d7d
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/debugger/gui/PaddleWidget.cxx
View File

@ -44,8 +44,8 @@ PaddleWidget::PaddleWidget(GuiObject* boss, const GUI::Font& font,
new SliderWidget(boss, font, xpos, ypos, 10*fontWidth, lineHeight,
p0string, lwidth, kP0Changed);
myP0Resistance->setMinValue(0);
myP0Resistance->setMaxValue(Paddles::MAX_RESISTANCE);
myP0Resistance->setStepValue(Paddles::MAX_RESISTANCE/100);
myP0Resistance->setMaxValue(uInt32(Paddles::MAX_RESISTANCE));
myP0Resistance->setStepValue(uInt32(Paddles::MAX_RESISTANCE/100));
myP0Resistance->setTarget(this);
xpos += 20; ypos += myP0Resistance->getHeight() + 4;
@ -58,8 +58,8 @@ PaddleWidget::PaddleWidget(GuiObject* boss, const GUI::Font& font,
new SliderWidget(boss, font, xpos, ypos, 10*fontWidth, lineHeight,
p1string, lwidth, kP1Changed);
myP1Resistance->setMinValue(0);
myP1Resistance->setMaxValue(Paddles::MAX_RESISTANCE);
myP1Resistance->setStepValue(Paddles::MAX_RESISTANCE/100);
myP1Resistance->setMaxValue(uInt32(Paddles::MAX_RESISTANCE));
myP1Resistance->setStepValue(uInt32(Paddles::MAX_RESISTANCE/100));
myP1Resistance->setTarget(this);
xpos += 20; ypos += myP1Resistance->getHeight() + 4;
@ -71,10 +71,10 @@ PaddleWidget::PaddleWidget(GuiObject* boss, const GUI::Font& font,
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void PaddleWidget::loadConfig()
{
myP0Resistance->setValue(Paddles::MAX_RESISTANCE -
Int32(myController.read(Controller::Nine)));
myP1Resistance->setValue(Paddles::MAX_RESISTANCE -
Int32(myController.read(Controller::Five)));
myP0Resistance->setValue(Int32(Paddles::MAX_RESISTANCE -
myController.read(Controller::Nine)));
myP1Resistance->setValue(Int32(Paddles::MAX_RESISTANCE -
myController.read(Controller::Five)));
myP0Fire->setState(!myController.read(Controller::Four));
myP1Fire->setState(!myController.read(Controller::Three));
}
@ -87,11 +87,11 @@ void PaddleWidget::handleCommand(
{
case kP0Changed:
myController.set(Controller::Nine,
Paddles::MAX_RESISTANCE - myP0Resistance->getValue());
Int32(Paddles::MAX_RESISTANCE - myP0Resistance->getValue()));
break;
case kP1Changed:
myController.set(Controller::Five,
Paddles::MAX_RESISTANCE - myP1Resistance->getValue());
Int32(Paddles::MAX_RESISTANCE - myP1Resistance->getValue()));
break;
case kP0Fire:
myController.set(Controller::Four, !myP0Fire->getState());

2
src/debugger/gui/RiotWidget.cxx
View File

@ -464,6 +464,8 @@ ControllerWidget* RiotWidget::addControlWidget(GuiObject* boss, const GUI::Font&
return new SaveKeyWidget(boss, font, x, y, controller);
case Controller::TrakBall: // TODO - implement this
return new NullControlWidget(boss, font, x, y, controller);
default:
return nullptr; // make compiler happy
}
}