(360) Fix for 360 - INVALID_FILE_ATTRIBUTES is not defined in a

360 header
(PS3) Added g_console.rom_path setting - not using g_extern.system.
fullpath anymore
This commit is contained in:
TwinAphex51224 2012-01-21 02:58:19 +01:00
parent c5e8eb0283
commit e044275c3e
4 changed files with 5 additions and 10 deletions

1
file.c
View File

@ -42,6 +42,7 @@
#elif defined(_XBOX)
#include <xtl.h>
#define setmode _setmode
#define INVALID_FILE_ATTRIBUTES -1
#else
#include <sys/types.h>
#include <sys/stat.h>

View File

@ -180,8 +180,8 @@ struct console_settings
uint32_t current_resolution_id;
uint32_t initial_resolution_id;
bool screenshots_enable;
bool in_game_menu;
char rom_path[PATH_MAX];
};
#endif

View File

@ -242,8 +242,6 @@ static void ingame_menu(void)
{
ingame_menu_item = 0;
g_console.in_game_menu = false;
g_extern.video_active = true;
g_extern.audio_active = true;
mode_switch = MODE_EMULATION;
}
@ -549,7 +547,7 @@ begin_loop:
char arg1[] = "ssnes";
char arg2[PATH_MAX];
snprintf(arg2, sizeof(arg2), g_extern.system.fullpath);
snprintf(arg2, sizeof(arg2), g_console.rom_path);
char arg3[] = "-v";
char arg4[] = "-c";
char arg5[MAX_PATH_LENGTH];
@ -559,11 +557,6 @@ begin_loop:
int argc = sizeof(argv_) / sizeof(argv_[0]) - 1;
int init_ret = ssnes_main_init(argc, argv_);
if(init_ret)
{
mode_switch = MODE_MENU;
ssnes_main_deinit();
}
g_emulator_initialized = 1;
init_ssnes = 0;
}

View File

@ -1278,7 +1278,8 @@ static void select_rom(void)
snprintf(rom_path_temp, sizeof(rom_path_temp), "%s/%s", FILEBROWSER_GET_CURRENT_DIRECTORY_NAME(browser), FILEBROWSER_GET_CURRENT_FILENAME(browser));
menu_is_running = 0;
snprintf(g_extern.system.fullpath, sizeof(g_extern.system.fullpath), "%s/%s", FILEBROWSER_GET_CURRENT_DIRECTORY_NAME(browser), FILEBROWSER_GET_CURRENT_FILENAME(browser));
memset(&g_extern, 0, sizeof(g_extern));
snprintf(g_console.rom_path, sizeof(g_console.rom_path), "%s/%s", FILEBROWSER_GET_CURRENT_DIRECTORY_NAME(browser), FILEBROWSER_GET_CURRENT_FILENAME(browser));
init_ssnes = 1;
mode_switch = MODE_EMULATION;