Warning fixes, fix hw back button on Android

This commit is contained in:
Henrik Rydgard committed 2013-07-20 20:49:08 +02:00
1 parent bd2c74cf24
commit 51adb8c64f
3 files changed
+9 -7

No files matched your search

+3
View File
@@ -284,6 +284,9 @@ void EmuScreen::onVKeyUp(int virtualKeyCode) {
}
void EmuScreen::key(const KeyInput &key) {
if (key.keyCode == KEYCODE_BACK)
pauseTrigger_ = true;
int result = KeyMap::KeyToPspButton(key.deviceId, key.keyCode);
if (result == KEYMAP_ERROR_UNKNOWN_KEY)
return;
+2 -3
View File
@@ -50,13 +50,12 @@ private:
void onVKeyDown(int virtualKeyCode);
void onVKeyUp(int virtualKeyCode);
bool pauseTrigger_;
// Something invalid was loaded, don't try to emulate
bool invalid_;
std::string errorMessage_;
bool pauseTrigger_;
// To track mappable virtual keys. We can have as many as we want.
bool virtKeys[VIRTKEY_COUNT];
};
+4 -4
View File
@@ -34,7 +34,7 @@ public:
virtual void Touch(const TouchInput &input);
virtual void Draw(UIContext &dc);
virtual void GetContentDimensions(const UIContext &dc, float &w, float &h) const;
virtual bool IsDown() { return pointerDownMask_ != NULL; }
virtual bool IsDown() { return pointerDownMask_ != 0; }
// chainable
MultiTouchButton *FlipImageH(bool flip) { flipImageH_ = flip; return this; }
MultiTouchButton *SetAngle(float angle) { angle_ = angle; return this; }
@@ -88,12 +88,12 @@ public:
private:
void ProcessTouch(float x, float y, bool down);
float radius_;
float scale_;
int arrowIndex_;
int overlayIndex_;
float scale_;
float radius_;
int dragPointerId_;
int down_;
};