Move onscreen turbo to left of select. Force frameskip when unthrottled.

This commit is contained in:
Henrik Rydgard 2013-04-14 12:11:49 +02:00
parent b88f428a67
commit 7972f98739
3 changed files with 14 additions and 4 deletions

View File

@ -281,6 +281,7 @@ void DoFrameTiming(bool &throttle, bool &skipFrame) {
// Check if the frameskipping code should be enabled. If neither throttling or frameskipping is on,
// we have nothing to do here.
bool doFrameSkip = g_Config.iFrameSkip == 1;
if (!throttle && !doFrameSkip)
return;
@ -295,6 +296,15 @@ void DoFrameTiming(bool &throttle, bool &skipFrame) {
skipFrame = true;
// INFO_LOG(HLE,"FRAMESKIP %i", numSkippedFrames);
}
// On non windows, which is always vsync locked, we need to force frameskip when
// unthrottled.
#ifndef _WIN32
if (!throttle) {
doFrameSkip = true;
skipFrame = true;
}
#endif
if (curFrameTime < nextFrameTime && throttle)
{

View File

@ -65,9 +65,9 @@ void LayoutGamepad(int w, int h)
crossPad.setPos(leftX + arrow_spacing, leftY, 40, controlScale);
buttonSelect.setPos(halfW - button_spacing * 2, h - 20 * controlScale, controlScale);
buttonStart.setPos(halfW , h - 20 * controlScale, controlScale);
buttonTurbo.setPos(halfW + button_spacing * 2 , h - 20 * controlScale, controlScale);
buttonTurbo.setPos(halfW - button_spacing * 2, h - 20 * controlScale, controlScale);
buttonSelect.setPos(halfW , h - 20 * controlScale, controlScale);
buttonStart.setPos(halfW + button_spacing * 2 , h - 20 * controlScale, controlScale);
buttonLShoulder.setPos(button_spacing + 10 * controlScale, 30 * controlScale, controlScale);
buttonRShoulder.setPos(w - button_spacing - 10 * controlScale, 30 * controlScale, controlScale);

2
native

@ -1 +1 @@
Subproject commit 961e400e1f07ae313cc8ef13e1669b2a549c8899
Subproject commit 345180dcef8b47a3c21b6eb7a18942e54eb93c6c