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

Merged revisions 1581 and 1582

This commit is contained in:
yabause 2009-02-02 21:37:12 +00:00
parent ca449f72bf
commit 05b4a94f10
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bios.cpp
View File

@ -984,7 +984,7 @@ TEMPLATE static u32 getCRC16()
u32 datap = cpu->R[1]; u32 datap = cpu->R[1];
u32 size = cpu->R[2]; u32 size = cpu->R[2];
static u16 val[] = { 0xC0C1,0xC181,0xC301,0xC601,0xCC01,0xD801,0xF001,0xA001 }; const u16 val[] = { 0xC0C1,0xC181,0xC301,0xC601,0xCC01,0xD801,0xF001,0xA001 };
for(i = 0; i < size; i++) for(i = 0; i < size; i++)
{ {
crc = crc ^ _MMU_read08(cpu->proc_ID, datap + i); crc = crc ^ _MMU_read08(cpu->proc_ID, datap + i);

2
src/gtk/main.cpp
View File

@ -396,6 +396,7 @@ static void Launch()
gtk_action_set_sensitive(gtk_action_group_get_action(action_group, "pause"), TRUE); gtk_action_set_sensitive(gtk_action_group_get_action(action_group, "pause"), TRUE);
gtk_action_set_sensitive(gtk_action_group_get_action(action_group, "run"), FALSE); gtk_action_set_sensitive(gtk_action_group_get_action(action_group, "run"), FALSE);
gtk_action_set_sensitive(gtk_action_group_get_action(action_group, "reset"), TRUE);
gtk_action_set_sensitive(gtk_action_group_get_action(action_group, "printscreen"), TRUE); gtk_action_set_sensitive(gtk_action_group_get_action(action_group, "printscreen"), TRUE);
} }
@ -468,7 +469,6 @@ static void Open_Select(GtkWidget* widget, gpointer data)
gtk_widget_destroy(pDialog); gtk_widget_destroy(pDialog);
} else { } else {
gtk_action_set_sensitive(gtk_action_group_get_action(action_group, "run"), TRUE); gtk_action_set_sensitive(gtk_action_group_get_action(action_group, "run"), TRUE);
gtk_action_set_sensitive(gtk_action_group_get_action(action_group, "reset"), TRUE);
} }
//Launch(NULL, pWindow); //Launch(NULL, pWindow);