ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix handling of --load-slot=0 (same as --load-slot=10)

This commit is contained in:
zeromus 2010-09-02 06:51:31 +00:00
parent 8a55bc6219
commit c1f2d4629a
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
desmume/src/commandline.cpp
View File

@ -53,7 +53,7 @@ CommandLine::CommandLine()
, _advanced_timing(-1) , _advanced_timing(-1)
, _slot1(NULL) , _slot1(NULL)
{ {
load_slot = 0; load_slot = -1;
arm9_gdb_port = arm7_gdb_port = 0; arm9_gdb_port = arm7_gdb_port = 0;
start_paused = FALSE; start_paused = FALSE;
#ifndef _MSC_VER #ifndef _MSC_VER
@ -152,8 +152,8 @@ bool CommandLine::validate()
} }
} }
if (load_slot < 0 || load_slot > 10) { if (load_slot < -1 || load_slot > 10) {
g_printerr("I only know how to load from slots 1-10, 0 means 'do not load savegame' and is default\n"); g_printerr("I only know how to load from slots 0-10; -1 means 'do not load savegame' and is default\n");
return false; return false;
} }
@ -162,7 +162,7 @@ bool CommandLine::validate()
return false; return false;
} }
if(record_movie_file != "" && load_slot != 0) { if(record_movie_file != "" && load_slot != -1) {
g_printerr("Cannot both record a movie and load a savestate.\n"); g_printerr("Cannot both record a movie and load a savestate.\n");
return false; return false;
} }

5
desmume/src/gtk/main.cpp
View File

@ -2268,7 +2268,10 @@ common_gtk_main( class configured_features *my_config)
if(Open( my_config->nds_file.c_str()) >= 0) { if(Open( my_config->nds_file.c_str()) >= 0) {
my_config->process_movieCommands(); my_config->process_movieCommands();
if(my_config->load_slot){ if(my_config->load_slot != -1){
int todo = my_config->load_slot;
if(todo == 10)
todo = 0;
loadstate_slot(my_config->load_slot); loadstate_slot(my_config->load_slot);
} }

6
desmume/src/windows/main.cpp
View File

@ -2918,9 +2918,11 @@ int _main()
cmdline.process_movieCommands(); cmdline.process_movieCommands();
if(cmdline.load_slot != 0) if(cmdline.load_slot != -1)
{ {
HK_StateLoadSlot(cmdline.load_slot, true); int load = cmdline.load_slot;
if(load==10) load=0;
HK_StateLoadSlot(load, true);
} }
MainWindow->Show(SW_NORMAL); MainWindow->Show(SW_NORMAL);