Assorted UI cleanups. Add a bunch of little image files that may be used in the Ouya port later.

This commit is contained in:
Henrik Rydgard committed 2013-07-15 17:41:24 +02:00
1 parent 2054e46c1f
commit 09a7bd08fa
43 files changed
+158 -122

No files matched your search

+3 -3
View File
@@ -50,6 +50,7 @@
#include "UI/MenuScreens.h"
#include "UI/EmuScreen.h"
#include "UI/GameInfoCache.h"
#include "UI/MiscScreens.h"
EmuScreen::EmuScreen(const std::string &filename) : invalid_(true) {
CheckGLExtensions();
@@ -349,9 +350,8 @@ static const struct { int from, to; } legacy_touch_mapping[12] = {
void EmuScreen::update(InputState &input) {
globalUIState = UISTATE_INGAME;
if (errorMessage_.size()) {
screenManager()->push(new ErrorScreen(
"Error loading file",
errorMessage_));
screenManager()->push(new PromptScreen(
"Error loading file: " + errorMessage_, "OK", ""));
errorMessage_ = "";
return;
}