diff --git a/general.h b/general.h index 9c876a203d..cee025dd8b 100644 --- a/general.h +++ b/general.h @@ -173,6 +173,9 @@ struct settings struct console_settings { bool block_config_read; +#ifdef __CELLOS_LV2__ + bool return_to_multiman_enable; +#endif bool screenshots_enable; }; #endif diff --git a/ps3/main.c b/ps3/main.c index c7f68077b3..6e310db47c 100644 --- a/ps3/main.c +++ b/ps3/main.c @@ -66,8 +66,6 @@ if(!(config_get_array(currentconfig, charstring, setting, sizeof(setting)))) \ strncpy(setting,defaultvalue, sizeof(setting)); -bool g_rom_loaded; -bool return_to_MM; /* launch multiMAN on exit if ROM is passed*/ uint32_t g_emulator_initialized = 0; char special_action_msg[256]; /* message which should be overlaid on top of the screen*/ @@ -222,19 +220,18 @@ int main(int argc, char *argv[]) SSNES_LOG("Registering Callback\n"); cellSysutilRegisterCallback(0, callback_sysutil_exit, NULL); - g_rom_loaded = false; #ifdef MULTIMAN_SUPPORT - return_to_MM = true; + g_console.return_to_multiman_enable = true; if(argc > 1) { strncpy(MULTIMAN_GAME_TO_BOOT, argv[1], sizeof(MULTIMAN_GAME_TO_BOOT)); } #else - return_to_MM = false; + g_console.return_to_multiman_enable = false; #endif - get_path_settings(return_to_MM); + get_path_settings(g_console.return_to_multiman_enable); init_settings(); #if(CELL_SDK_VERSION > 0x340000) diff --git a/ps3/shared.h b/ps3/shared.h index b5f2123b5b..d737f5d3bb 100644 --- a/ps3/shared.h +++ b/ps3/shared.h @@ -22,7 +22,6 @@ extern char special_action_msg[256]; extern uint32_t g_emulator_initialized; extern uint32_t special_action_msg_expired; extern unsigned g_frame_count; -extern bool g_rom_loaded; extern bool g_quitting; extern char contentInfoPath[MAX_PATH_LENGTH]; diff --git a/ssnes.c b/ssnes.c index 74482ab25d..374701c1c6 100644 --- a/ssnes.c +++ b/ssnes.c @@ -436,7 +436,8 @@ static void print_compiler(FILE *file) #if defined(_MSC_VER) fprintf(file, "MSVC (%d) %u-bit\n", _MSC_VER, (unsigned)(CHAR_BIT * sizeof(size_t))); #elif defined(__SNC__) - fprintf(file, "SNC %u-bit\n", (unsigned)(CHAR_BIT * sizeof(size_t))); + fprintf(file, "SNC (%d) %u-bit\n", + __SN_VER__, (unsigned)(CHAR_BIT * sizeof(size_t))); #elif defined(_WIN32) && defined(__GNUC__) fprintf(file, "MinGW (%d.%d.%d) %u-bit\n", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__, (unsigned)(CHAR_BIT * sizeof(size_t)));