notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(Vita) Try to enable dynarec now
[pcsx_rearmed.git]
/
maemo
/
hildon.c
diff --git
a/maemo/hildon.c
b/maemo/hildon.c
index
6fbdcf5
..
7e9cd9f
100644
(file)
--- a/
maemo/hildon.c
+++ b/
maemo/hildon.c
@@
-484,31
+484,31
@@
inline void key_press_event(int key2,int type)
switch (psxkey1){
case DKEY_CROSS:
in_state_gun |= SACTION_GUN_A;
switch (psxkey1){
case DKEY_CROSS:
in_state_gun |= SACTION_GUN_A;
- break;
+ break;
case DKEY_CIRCLE:
in_state_gun |= SACTION_GUN_B;
case DKEY_CIRCLE:
in_state_gun |= SACTION_GUN_B;
- break;
+ break;
case DKEY_TRIANGLE:
in_state_gun |= SACTION_GUN_TRIGGER2;
case DKEY_TRIANGLE:
in_state_gun |= SACTION_GUN_TRIGGER2;
- break;
+ break;
case DKEY_SQUARE:
in_state_gun |= SACTION_GUN_TRIGGER;
case DKEY_SQUARE:
in_state_gun |= SACTION_GUN_TRIGGER;
- break;
+ break;
}
}else if (type == 2) {
switch (psxkey1){
case DKEY_CROSS:
in_state_gun &= ~SACTION_GUN_A;
}
}else if (type == 2) {
switch (psxkey1){
case DKEY_CROSS:
in_state_gun &= ~SACTION_GUN_A;
- break;
+ break;
case DKEY_CIRCLE:
in_state_gun &= ~SACTION_GUN_B;
case DKEY_CIRCLE:
in_state_gun &= ~SACTION_GUN_B;
- break;
+ break;
case DKEY_TRIANGLE:
in_state_gun &= ~SACTION_GUN_TRIGGER2;
case DKEY_TRIANGLE:
in_state_gun &= ~SACTION_GUN_TRIGGER2;
- break;
+ break;
case DKEY_SQUARE:
in_state_gun &= ~SACTION_GUN_TRIGGER;
case DKEY_SQUARE:
in_state_gun &= ~SACTION_GUN_TRIGGER;
- break;
+ break;
}
}
}else{
}
}
}else{
@@
-533,7
+533,7
@@
inline void key_press_event(int key2,int type)
in_a1[1] = 255;
break;
}
in_a1[1] = 255;
break;
}
-
}
+ }
}
else if (type == 2) {
if (psxkey1 >= 0)
}
else if (type == 2) {
if (psxkey1 >= 0)
@@
-554,7
+554,7
@@
inline void key_press_event(int key2,int type)
}
}
emu_set_action(SACTION_NONE);
}
}
emu_set_action(SACTION_NONE);
-
}
+ }
}
}
}
}
@@
-599,7
+599,7
@@
int maemo_init(int *argc, char ***argv)
}
fclose(pFile);
}
}
fclose(pFile);
}
-
+
switch (in_type1){
case PSE_PAD_TYPE_GUNCON:
memset(cornerActions, 0, sizeof(cornerActions));
switch (in_type1){
case PSE_PAD_TYPE_GUNCON:
memset(cornerActions, 0, sizeof(cornerActions));
@@
-610,7
+610,7
@@
int maemo_init(int *argc, char ***argv)
break;
case PSE_PAD_TYPE_ANALOGPAD:
printf("Controller set to analog (SCPH-1150)\n");
break;
case PSE_PAD_TYPE_ANALOGPAD:
printf("Controller set to analog (SCPH-1150)\n");
- break;
+ break;
}
if (in_enable_vibration)
}
if (in_enable_vibration)
@@
-664,7
+664,7
@@
int maemo_init(int *argc, char ***argv)
if (bKeepDisplayOn){
if (pthread_create(&display_thread, NULL, displayThread, NULL))
if (bKeepDisplayOn){
if (pthread_create(&display_thread, NULL, displayThread, NULL))
- printf("Failed to create display thread.\n");
+ printf("Failed to create display thread.\n");
}
pl_rearmed_cbs.only_16bpp = 1;
}
pl_rearmed_cbs.only_16bpp = 1;