diff options
| author | twinaphex | 2013-01-29 01:59:01 +0100 |
|---|---|---|
| committer | twinaphex | 2013-01-29 01:59:01 +0100 |
| commit | 2dfdc938c99783e187f60c1d13db73e0ee434c92 (patch) | |
| tree | eb063a3af74ff44b2ba22ec34deb5811129d1cd4 /frontend/menu.c | |
| parent | e5f4d90401d099d5191f95e9f771ab5a81c87ed8 (diff) | |
| parent | 17f84149a604fefb8181a280487bd48ca7a353b2 (diff) | |
| download | pcsx_rearmed-2dfdc938c99783e187f60c1d13db73e0ee434c92.tar.gz pcsx_rearmed-2dfdc938c99783e187f60c1d13db73e0ee434c92.tar.bz2 pcsx_rearmed-2dfdc938c99783e187f60c1d13db73e0ee434c92.zip | |
Merge git://github.com/notaz/pcsx_rearmed
Diffstat (limited to 'frontend/menu.c')
| -rw-r--r-- | frontend/menu.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/frontend/menu.c b/frontend/menu.c index 7dab2e6..8119505 100644 --- a/frontend/menu.c +++ b/frontend/menu.c @@ -8,7 +8,7 @@ * See the COPYING file in the top-level directory. */ -#define _GNU_SOURCE +#define _GNU_SOURCE 1 #include <stdio.h> #include <string.h> #include <errno.h> @@ -251,7 +251,9 @@ static int optional_cdimg_filter(struct dirent **namelist, int count, p = strrchr(buf2, '/'); if (p == NULL) p = strrchr(buf2, '\\'); - if (p == NULL) + if (p != NULL) + p++; + else p = buf2; snprintf(buf, sizeof(buf), "%s/%s", basedir, p); @@ -327,6 +329,7 @@ static void menu_set_defconfig(void) g_opts = 0; g_scaler = SCALE_4_3; + g_gamma = 100; volume_boost = 0; frameskip = 0; analog_deadzone = 50; @@ -391,6 +394,7 @@ static const struct { CE_CONFIG_VAL(Cpu), CE_INTVAL(region), CE_INTVAL_V(g_scaler, 2), + CE_INTVAL(g_gamma), CE_INTVAL(g_layer_x), CE_INTVAL(g_layer_y), CE_INTVAL(g_layer_w), @@ -1696,10 +1700,10 @@ out: static void handle_memcard_sel(void) { - Config.Mcd1[0] = 0; + strcpy(Config.Mcd1, "none"); if (memcard1_sel != 0) snprintf(Config.Mcd1, sizeof(Config.Mcd1), ".%s%s", MEMCARD_DIR, memcards[memcard1_sel]); - Config.Mcd2[0] = 0; + strcpy(Config.Mcd2, "none"); if (memcard2_sel != 0) snprintf(Config.Mcd2, sizeof(Config.Mcd2), ".%s%s", MEMCARD_DIR, memcards[memcard2_sel]); LoadMcds(Config.Mcd1, Config.Mcd2); |