Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-12-01 01:11:46 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #26 from xsacha/master

Browse Source 
Qt/Blackberry
This commit is contained in:
Henrik Rydgård 2013-01-12 15:23:34 -08:00
commit 7225f4667c
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
base/BlackberryMain.cpp
View File

@ -121,13 +121,13 @@ void SimulateGamepad(InputState *input) {
input->pad_rstick_x = 0;
input->pad_rstick_y = 0;
if (input->pad_buttons & (1<<14))
if (input->pad_buttons & PAD_BUTTON_JOY_UP)
input->pad_lstick_y=1;
else if (input->pad_buttons & (1<<15))
else if (input->pad_buttons & PAD_BUTTON_JOY_DOWN)
input->pad_lstick_y=-1;
if (input->pad_buttons & (1<<16))
if (input->pad_buttons & PAD_BUTTON_JOY_LEFT)
input->pad_lstick_x=-1;
else if (input->pad_buttons & (1<<17))
else if (input->pad_buttons & PAD_BUTTON_JOY_RIGHT)
input->pad_lstick_x=1;
}

8
base/QtMain.cpp
View File

@ -26,13 +26,13 @@ void SimulateGamepad(InputState *input) {
input->pad_rstick_x = 0;
input->pad_rstick_y = 0;
if (input->pad_buttons & (1<<14))
if (input->pad_buttons & PAD_BUTTON_JOY_UP)
input->pad_lstick_y=1;
else if (input->pad_buttons & (1<<15))
else if (input->pad_buttons & PAD_BUTTON_JOY_DOWN)
input->pad_lstick_y=-1;
if (input->pad_buttons & (1<<16))
if (input->pad_buttons & PAD_BUTTON_JOY_LEFT)
input->pad_lstick_x=-1;
else if (input->pad_buttons & (1<<17))
else if (input->pad_buttons & PAD_BUTTON_JOY_RIGHT)
input->pad_lstick_x=1;
}

3
gfx/gl_common.h
View File

@ -5,7 +5,6 @@
#if defined(IOS)
#include <OpenGLES/ES2/gl.h>
#include <OpenGLES/ES2/glext.h>
typedef char GLchar;
#else
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
@ -19,7 +18,7 @@ typedef char GLchar;
#endif
#endif
#if defined(__SYMBIAN32__) || defined(MEEGO_EDITION_HARMATTAN) || defined(PANDORA)
#ifndef GLchar
typedef char GLchar;
#endif

7
input/input_state.h
View File

@ -18,9 +18,14 @@ enum {
PAD_BUTTON_LEFT = 1024,
PAD_BUTTON_RIGHT = 2048,
// Android only
PAD_BUTTON_MENU = 4096,
PAD_BUTTON_BACK = 8192,
// For Blackberry and Qt
PAD_BUTTON_JOY_UP = 1<<14,
PAD_BUTTON_JOY_DOWN = 1<<15,
PAD_BUTTON_JOY_LEFT = 1<<16,
PAD_BUTTON_JOY_RIGHT = 1<<17,
};
#ifndef MAX_POINTERS