aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornotaz2010-12-16 18:46:59 +0200
committernotaz2010-12-16 18:46:59 +0200
commit87c06e512fb1b757c1c4359e46359654cfcb8b82 (patch)
tree263bd06fbec8b0795b979613a539c24900879ce3
parent38b8102cdfde55d7afa20bf95c7698d39407379b (diff)
downloadpcsx_rearmed-87c06e512fb1b757c1c4359e46359654cfcb8b82.tar.gz
pcsx_rearmed-87c06e512fb1b757c1c4359e46359654cfcb8b82.tar.bz2
pcsx_rearmed-87c06e512fb1b757c1c4359e46359654cfcb8b82.zip
menu: update file colors, fix a bug in emu_if
-rw-r--r--frontend/menu.c4
-rw-r--r--libpcsxcore/new_dynarec/emu_if.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/frontend/menu.c b/frontend/menu.c
index 3559f55..40edb2f 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -128,8 +128,8 @@ static int menu_load_config(int is_game)
// rrrr rggg gggb bbbb
static unsigned short fname2color(const char *fname)
{
- static const char *cdimg_exts[] = { ".bin", ".img", ".iso", ".z" };
- static const char *other_exts[] = { ".cue", ".ccd", ".sub", ".table" };
+ static const char *cdimg_exts[] = { ".bin", ".img", ".iso", ".z", ".cue" };
+ static const char *other_exts[] = { ".ccd", ".toc", ".mds", ".sub", ".table" };
const char *ext = strrchr(fname, '.');
int i;
diff --git a/libpcsxcore/new_dynarec/emu_if.c b/libpcsxcore/new_dynarec/emu_if.c
index 68b0e82..8e1545e 100644
--- a/libpcsxcore/new_dynarec/emu_if.c
+++ b/libpcsxcore/new_dynarec/emu_if.c
@@ -438,7 +438,7 @@ end:
printf("-- %d\n", bad);
for (i = 0; i < 8; i++)
printf("r%d=%08x r%2d=%08x r%2d=%08x r%2d=%08x\n", i, allregs_p[i],
- i+8, allregs_p[i+8], i+16, allregs_p[i+16], i+24, allregs_p[i+23]);
+ i+8, allregs_p[i+8], i+16, allregs_p[i+16], i+24, allregs_p[i+24]);
printf("PC: %08x/%08x, cycle %u\n", psxRegs.pc, ppc, psxRegs.cycle);
dump_mem("/mnt/ntz/dev/pnd/tmp/psxram.dump", psxM, 0x200000);
dump_mem("/mnt/ntz/dev/pnd/tmp/psxregs.dump", psxH, 0x10000);