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
cdrom: make read reschedule optional
[pcsx_rearmed.git]
/
frontend
/
common
/
menu.c
diff --git
a/frontend/common/menu.c
b/frontend/common/menu.c
index
31522f7
..
7890df4
100644
(file)
--- a/
frontend/common/menu.c
+++ b/
frontend/common/menu.c
@@
-560,11
+560,11
@@
static int me_process(menu_entry *entry, int is_next, int is_lr)
names = (const char **)entry->data;
\r
for (c = 0; names[c] != NULL; c++)
\r
;
\r
names = (const char **)entry->data;
\r
for (c = 0; names[c] != NULL; c++)
\r
;
\r
- *(
int
*)entry->var += is_next ? 1 : -1;
\r
- if (*(
int
*)entry->var < 0)
\r
- *(
int
*)entry->var = 0;
\r
- if (*(
int
*)entry->var >= c)
\r
- *(
int
*)entry->var = c - 1;
\r
+ *(
signed char
*)entry->var += is_next ? 1 : -1;
\r
+ if (*(
signed char
*)entry->var < 0)
\r
+ *(
signed char
*)entry->var = 0;
\r
+ if (*(
signed char
*)entry->var >= c)
\r
+ *(
signed char
*)entry->var = c - 1;
\r
return 1;
\r
default:
\r
return 0;
\r
return 1;
\r
default:
\r
return 0;
\r
@@
-640,13
+640,12
@@
static void me_loop(menu_entry *menu, int *menu_sel, void (*draw_more)(void))
\r
/* ***************************************** */
\r
\r
\r
/* ***************************************** */
\r
\r
-static void draw_menu_
credits(
void (*draw_more)(void))
\r
+static void draw_menu_
message(const char *msg,
void (*draw_more)(void))
\r
{
\r
{
\r
- const char *creds, *p;
\r
int x, y, h, w, wt;
\r
int x, y, h, w, wt;
\r
+ const char *p;
\r
\r
\r
- p = creds = plat_get_credits();
\r
-
\r
+ p = msg;
\r
for (h = 1, w = 0; *p != 0; h++) {
\r
for (wt = 0; *p != 0 && *p != '\n'; p++)
\r
wt++;
\r
for (h = 1, w = 0; *p != 0; h++) {
\r
for (wt = 0; *p != 0 && *p != '\n'; p++)
\r
wt++;
\r
@@
-665,7
+664,7
@@
static void draw_menu_credits(void (*draw_more)(void))
\r
menu_draw_begin(1);
\r
\r
\r
menu_draw_begin(1);
\r
\r
- for (p =
creds
; *p != 0 && y <= g_menuscreen_h - me_mfont_h; y += me_mfont_h) {
\r
+ for (p =
msg
; *p != 0 && y <= g_menuscreen_h - me_mfont_h; y += me_mfont_h) {
\r
text_out16(x, y, p);
\r
\r
for (; *p != 0 && *p != '\n'; p++)
\r
text_out16(x, y, p);
\r
\r
for (; *p != 0 && *p != '\n'; p++)
\r
@@
-767,11
+766,6
@@
static int scandir_cmp(const void *p1, const void *p2)
return alphasort(d1, d2);
\r
}
\r
\r
return alphasort(d1, d2);
\r
}
\r
\r
-static const char *filter_exts[] = {
\r
- ".mp3", ".MP3", ".srm", ".brm", "s.gz", ".mds", "bcfg", ".txt", ".htm", "html",
\r
- ".jpg", ".gpe"
\r
-};
\r
-
\r
static int scandir_filter(const struct dirent *ent)
\r
{
\r
const char *p;
\r
static int scandir_filter(const struct dirent *ent)
\r
{
\r
const char *p;
\r