From 3c392aec73426a15ef3b07d6cea8411d5ee936f8 Mon Sep 17 00:00:00 2001 From: notaz Date: Thu, 11 Oct 2007 20:38:27 +0000 Subject: [PATCH] minor adjustments git-svn-id: file:///home/notaz/opt/svn/PicoDrive@273 be3aeb3a-fb24-0410-a615-afba39da0efa --- platform/gizmondo/emu.c | 2 +- platform/gizmondo/main.c | 2 +- platform/gizmondo/menu.c | 8 +++----- platform/gizmondo/menu.h | 2 -- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/platform/gizmondo/emu.c b/platform/gizmondo/emu.c index 440a8de..cf9a13e 100644 --- a/platform/gizmondo/emu.c +++ b/platform/gizmondo/emu.c @@ -104,7 +104,7 @@ void emu_Init(void) void emu_Deinit(void) { // save SRAM - if((currentConfig.EmuOpt & 1) && SRam.changed) { + if ((currentConfig.EmuOpt & 1) && SRam.changed) { emu_SaveLoadGame(0, 1); SRam.changed = 0; } diff --git a/platform/gizmondo/main.c b/platform/gizmondo/main.c index 8038a94..59b8e57 100644 --- a/platform/gizmondo/main.c +++ b/platform/gizmondo/main.c @@ -1,4 +1,4 @@ -// (c) Copyright 2006 notaz, All rights reserved. +// (c) Copyright 2007 notaz, All rights reserved. // Free for non-commercial use. // For commercial use, separate licencing terms must be obtained. diff --git a/platform/gizmondo/menu.c b/platform/gizmondo/menu.c index 5606214..6e501a8 100644 --- a/platform/gizmondo/menu.c +++ b/platform/gizmondo/menu.c @@ -45,7 +45,6 @@ static void menu_darken_bg(void *dst, const void *src, int pixels, int darker); static void menu_prepare_bg(int use_game_bg); static unsigned int inp_prev = 0; -static int inp_prevjoy = 0; static unsigned long wait_for_input(unsigned int interesting) { @@ -71,7 +70,6 @@ static unsigned long wait_for_input(unsigned int interesting) wait = 50; } inp_prev = ret; - inp_prevjoy = 0; // we don't need diagonals in menus if ((ret&BTN_UP) && (ret&BTN_LEFT)) ret &= ~BTN_LEFT; @@ -264,10 +262,10 @@ static int my_scandir(const char *dir, struct my_dirent ***namelist_out, BOOL bRet; wdir = malloc(sizeof(wdir[0]) * MAX_PATH); - if (wdir == NULL) { lprintf_al("%s:%s: OOM\n", __FILE__, __LINE__); goto fail; } + if (wdir == NULL) { lprintf_al("%s:%i: OOM\n", __FILE__, __LINE__); goto fail; } namelist = malloc(sizeof(*namelist) * name_alloc); - if (namelist == NULL) { lprintf_al("%s:%s: OOM\n", __FILE__, __LINE__); goto fail; } + if (namelist == NULL) { lprintf_al("%s:%i: OOM\n", __FILE__, __LINE__); goto fail; } // try to read first.. len = cstr2wstr(wdir, dir); @@ -312,7 +310,7 @@ static int my_scandir(const char *dir, struct my_dirent ***namelist_out, void *tmp; name_alloc *= 2; tmp = realloc(namelist, sizeof(*namelist) * name_alloc); - if (tmp == NULL) { lprintf_al("%s:%s: OOM\n", __FILE__, __LINE__); goto fail; } + if (tmp == NULL) { lprintf_al("%s:%i: OOM\n", __FILE__, __LINE__); goto fail; } namelist = tmp; } diff --git a/platform/gizmondo/menu.h b/platform/gizmondo/menu.h index d4e96be..3829836 100644 --- a/platform/gizmondo/menu.h +++ b/platform/gizmondo/menu.h @@ -3,8 +3,6 @@ // For commercial use, separate licencing terms must be obtained. -void menu_init(void); -void text_out16(int x, int y, const char *texto, ...); void menu_loop(void); int menu_loop_tray(void); void menu_romload_prepare(const char *rom_name); -- 2.39.2