From 89be22ac697f1b495dca2fbdb1ce67fc044871d5 Mon Sep 17 00:00:00 2001 From: "simon.kagstrom" Date: Sat, 18 Apr 2009 06:24:20 +0000 Subject: [PATCH] Move more messages --- Src/C64_SDL.h | 30 ------------------------------ Src/menutexts.h | 2 ++ 2 files changed, 2 insertions(+), 30 deletions(-) diff --git a/Src/C64_SDL.h b/Src/C64_SDL.h index 9f99a51..fb8769a 100644 --- a/Src/C64_SDL.h +++ b/Src/C64_SDL.h @@ -30,26 +30,6 @@ extern char *fixme_tmp_network_server; static struct timeval tv_start; -static const char *main_menu_messages[] = { - "Invoke key sequence", /* 0 */ - "Insert disc or tape", /* 1 */ - "Bind key to joystick",/* 2 */ - "Other options", /* 3 */ - "Networking", /* 4 */ - "Controller 1 joystick port", /* 5 */ - "^|1|2", - "Save/Load state", /* 7 */ - " ", - "Quit", /* 9 */ - NULL, -}; - -static const char *save_load_state_messages[] = { - "Load saved state", /* 0 */ - "Save current state", /* 1 */ - "Delete state", /* 2 */ - NULL, -}; /* * Constructor, system-dependent things @@ -369,16 +349,6 @@ void C64::networking_menu(Prefs *np) void C64::other_options(Prefs *np) { - const char *other_options_messages[] = { - "Display resolution", /* 0 */ - "^|double-center|stretched", - "Speed (approx)", /* 2 */ - "^|95|100|110", - "Emulate 1541", /* 4 */ - "^|On|Off", - "Reset C64", /* 6 */ - NULL, - }; int submenus[3] = { np->DisplayOption, 0, !np->Emul1541Proc }; diff --git a/Src/menutexts.h b/Src/menutexts.h index 20cbfe0..da0a092 100644 --- a/Src/menutexts.h +++ b/Src/menutexts.h @@ -12,6 +12,8 @@ extern const char *new_advanced_options_menu_messages[]; extern const char *new_help_menu_messages[]; extern const char *layout_messages[]; extern const char *other_options_messages[]; +extern const char *main_menu_messages[]; +extern const char *save_load_state_messages[]; #if defined(__cplusplus) }