diff options
| author | twinaphex | 2012-11-28 06:35:30 +0100 |
|---|---|---|
| committer | twinaphex | 2012-11-28 06:35:30 +0100 |
| commit | b194a2ecd43debbb3724e332b660b993725acd52 (patch) | |
| tree | a41deacfa7a6841e97d67fce60bb7f39b54b12be /frontend/main.h | |
| parent | b6514bd168106e978a0af0f5043d5da6fd35800a (diff) | |
| parent | 06d2e1a58b6eb7fb449f79f7e807343bd8d39b59 (diff) | |
| download | pcsx_rearmed-b194a2ecd43debbb3724e332b660b993725acd52.tar.gz pcsx_rearmed-b194a2ecd43debbb3724e332b660b993725acd52.tar.bz2 pcsx_rearmed-b194a2ecd43debbb3724e332b660b993725acd52.zip | |
Merge git://github.com/notaz/pcsx_rearmed
Diffstat (limited to 'frontend/main.h')
| -rw-r--r-- | frontend/main.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/frontend/main.h b/frontend/main.h index bdb4870..45e0aeb 100644 --- a/frontend/main.h +++ b/frontend/main.h @@ -42,7 +42,7 @@ int emu_core_preinit(void); int emu_core_init(void); void emu_set_default_config(void); -void emu_on_new_cd(void); +void emu_on_new_cd(int show_hud_msg); int get_state_filename(char *buf, int size, int i); int emu_check_state(int slot); @@ -65,10 +65,14 @@ enum sched_action { SACTION_NEXT_SSLOT, SACTION_PREV_SSLOT, SACTION_TOGGLE_FSKIP, + SACTION_SWITCH_DISPMODE, + SACTION_FAST_FORWARD, SACTION_SCREENSHOT, SACTION_VOLUME_UP, SACTION_VOLUME_DOWN, SACTION_MINIMIZE, + SACTION_TOGGLE_FPS, + SACTION_TOGGLE_FULLSCREEN, SACTION_GUN_TRIGGER = 16, SACTION_GUN_A, SACTION_GUN_B, |