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
use __ARM_ARCH
[pcsx_rearmed.git]
/
frontend
/
menu.c
diff --git
a/frontend/menu.c
b/frontend/menu.c
index
675ec26
..
9ddbe37
100644
(file)
--- a/
frontend/menu.c
+++ b/
frontend/menu.c
@@
-1,5
+1,5
@@
/*
/*
- * (C) Gražvydas "notaz" Ignotas, 2010-201
4
+ * (C) Gražvydas "notaz" Ignotas, 2010-201
5
*
* This work is licensed under the terms of any of these licenses
* (at your option):
*
* This work is licensed under the terms of any of these licenses
* (at your option):
@@
-903,8
+903,6
@@
static void get_line(char *d, size_t size, const char *s)
len = size - 1;
strncpy(d, s, len);
d[len] = 0;
len = size - 1;
strncpy(d, s, len);
d[len] = 0;
-
- mystrip(d);
}
static void keys_write_all(FILE *f)
}
static void keys_write_all(FILE *f)
@@
-1011,7
+1009,10
@@
static void keys_load_all(const char *cfg)
while (p != NULL && (p = strstr(p, "binddev = ")) != NULL) {
p += 10;
while (p != NULL && (p = strstr(p, "binddev = ")) != NULL) {
p += 10;
+ // don't strip 'dev' because there are weird devices
+ // with names with space at the end
get_line(dev, sizeof(dev), p);
get_line(dev, sizeof(dev), p);
+
dev_id = in_config_parse_dev(dev);
if (dev_id < 0) {
printf("input: can't handle dev: %s\n", dev);
dev_id = in_config_parse_dev(dev);
if (dev_id < 0) {
printf("input: can't handle dev: %s\n", dev);
@@
-1934,7
+1935,7
@@
static const char credits_text[] =
"PCSX4ALL plugin by PCSX4ALL team\n"
" Chui, Franxis, Unai\n\n"
"integration, optimization and\n"
"PCSX4ALL plugin by PCSX4ALL team\n"
" Chui, Franxis, Unai\n\n"
"integration, optimization and\n"
- " frontend (C) 2010-201
4
notaz\n";
+ " frontend (C) 2010-201
5
notaz\n";
static int reset_game(void)
{
static int reset_game(void)
{