Add on-screen feedback for some keyboard shortcuts (so you know which setting was changed)

This commit is contained in:
Henrik Rydgard committed 2013-05-22 18:00:06 +02:00
1 parent 199907b9ed
commit 059aed36ee
12 files changed
+328 -207

No files matched your search

+18 -4
View File
@@ -37,6 +37,7 @@
#include "Core/HLE/sceDisplay.h"
#include "Core/Debugger/SymbolMap.h"
#include "UI/OnScreenDisplay.h"
#include "UI/ui_atlas.h"
#include "UI/GamepadEmu.h"
#include "UI/UIShader.h"
@@ -214,6 +215,14 @@ void EmuScreen::update(InputState &input) {
__CtrlSetAnalog(stick_x, stick_y, 0);
__CtrlSetAnalog(rightstick_x, rightstick_x, 1);
if (PSP_CoreParameter().fpsLimit != 2) {
if (input.pad_buttons_down & PAD_BUTTON_UNTHROTTLE) {
osm.Show("Speed: unlimited!", 1.0, 0x50E0FF);
}
if (input.pad_buttons_up & PAD_BUTTON_UNTHROTTLE) {
osm.Show("Speed: standard", 1.0);
}
}
if (input.pad_buttons & PAD_BUTTON_UNTHROTTLE) {
PSP_CoreParameter().unthrottle = true;
} else {
@@ -225,19 +234,20 @@ void EmuScreen::update(InputState &input) {
}
//Toggle between 3 different states of fpsLimit
if (input.pad_buttons_down & PAD_BUTTON_LEFT_THUMB) {
if (PSP_CoreParameter().fpsLimit == 0){
if (PSP_CoreParameter().fpsLimit == 0) {
PSP_CoreParameter().fpsLimit = 1;
osm.Show("Speed: fixed", 1.0);
}
else if (PSP_CoreParameter().fpsLimit == 1){
PSP_CoreParameter().fpsLimit = 2;
osm.Show("Speed: unlimited!", 1.0, 0x50E0FF);
}
else if (PSP_CoreParameter().fpsLimit == 2){
PSP_CoreParameter().fpsLimit = 0;
osm.Show("Speed: standard", 1.0);
}
}
if (input.pad_buttons_down & (PAD_BUTTON_MENU | PAD_BUTTON_BACK | PAD_BUTTON_RIGHT_THUMB)) {
if (g_Config.bBufferedRendering)
@@ -291,6 +301,10 @@ void EmuScreen::render() {
DrawWatermark();
if (!osm.IsEmpty()) {
osm.Draw(ui_draw2d);
}
if (g_Config.bShowDebugStats) {
char statbuf[4096] = {0};
__DisplayGetDebugStats(statbuf);