aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNebuleon Fumika2013-01-20 18:14:18 -0500
committerNebuleon Fumika2013-01-20 18:14:18 -0500
commit31c9101699e444b177d8bfce8cb6fec8bed4c7c5 (patch)
tree72e359f7a0e7ccb1890401a6d2b8586aecad08a3
parentf64980e2c18351304650613bb3ec597e7f4ffcc9 (diff)
downloadsnesemu-31c9101699e444b177d8bfce8cb6fec8bed4c7c5.tar.gz
snesemu-31c9101699e444b177d8bfce8cb6fec8bed4c7c5.tar.bz2
snesemu-31c9101699e444b177d8bfce8cb6fec8bed4c7c5.zip
Prepare data structures for adding hotkeys.
-rw-r--r--source/nds/gui.c1
-rw-r--r--source/nds/gui.h57
2 files changed, 9 insertions, 49 deletions
diff --git a/source/nds/gui.c b/source/nds/gui.c
index 733cb35..9333bb6 100644
--- a/source/nds/gui.c
+++ b/source/nds/gui.c
@@ -4153,6 +4153,7 @@ int load_emu_config_file(void)
pt[EMU_CONFIG_HEADER_SIZE]= 0;
if(!strcmp(pt, EMU_CONFIG_HEADER))
{
+ memset(&emu_config, 0, sizeof(emu_config));
fread(&emu_config, 1, sizeof(emu_config), fp);
fclose(fp);
return 0;
diff --git a/source/nds/gui.h b/source/nds/gui.h
index d733ee5..87c14e4 100644
--- a/source/nds/gui.h
+++ b/source/nds/gui.h
@@ -40,6 +40,10 @@ struct _EMU_CONFIG
char rom_file[256];
char rom_path[256];
char latest_file[5][512];
+ u32 HotkeyReturnToMenu;
+ u32 HotkeyTemporaryFastForward;
+ u32 HotkeyToggleSound;
+ u32 Reserved[61];
};
struct _GAME_CONFIG
@@ -52,55 +56,10 @@ struct _GAME_CONFIG
u32 Reserved1;
u32 backward;
u32 backward_time;
- u32 Reserved2;
- u32 Reserved3;
- u32 Reserved4;
- u32 Reserved5;
- u32 Reserved6;
- u32 Reserved7;
- u32 Reserved8;
- u32 Reserved9;
- u32 Reserved10;
- u32 Reserved11;
- u32 Reserved12;
- u32 Reserved13;
- u32 Reserved14;
- u32 Reserved15;
- u32 Reserved16;
- u32 Reserved17;
- u32 Reserved18;
- u32 Reserved19;
- u32 Reserved20;
- u32 Reserved21;
- u32 Reserved22;
- u32 Reserved23;
- u32 Reserved24;
- u32 Reserved25;
- u32 Reserved26;
- u32 Reserved27;
- u32 Reserved28;
- u32 Reserved29;
- u32 Reserved30;
- u32 Reserved31;
- u32 Reserved32;
-
- u32 Reserved33;
- u32 Reserved34;
- u32 Reserved35;
- u32 Reserved36;
- u32 Reserved37;
- u32 Reserved38;
- u32 Reserved39;
- u32 Reserved40;
- u32 Reserved41;
- u32 Reserved42;
- u32 Reserved43;
- u32 Reserved44;
- u32 Reserved45;
- u32 Reserved46;
- u32 Reserved47;
- u32 Reserved48;
- u32 Reserved49;
+ u32 HotkeyReturnToMenu;
+ u32 HotkeyTemporaryFastForward;
+ u32 HotkeyToggleSound;
+ u32 Reserved2[45];
};
typedef enum