diff options
| -rw-r--r-- | src/externs.h | 1 | ||||
| -rw-r--r-- | src/loadsave.c | 11 | ||||
| -rw-r--r-- | src/main-crb.c | 12 | ||||
| -rw-r--r-- | src/main.c | 8 | ||||
| -rw-r--r-- | src/variable.c | 3 |
5 files changed, 1 insertions, 34 deletions
diff --git a/src/externs.h b/src/externs.h index da47af0f..33a74266 100644 --- a/src/externs.h +++ b/src/externs.h @@ -113,7 +113,6 @@ extern u32b sf_when; extern u16b sf_lives; extern u16b sf_saves; extern u32b vernum; /* Version flag */ -extern bool_ arg_fiddle; extern bool_ arg_wizard; extern bool_ arg_sound; extern bool_ arg_graphics; diff --git a/src/loadsave.c b/src/loadsave.c index 4ec7a02a..858ea377 100644 --- a/src/loadsave.c +++ b/src/loadsave.c @@ -2609,18 +2609,15 @@ static bool_ do_savefile_aux(int flag) /* Read RNG state */ do_randomizer(flag); - if ((flag == LS_LOAD) && (arg_fiddle)) note("Loaded Randomizer Info"); /* Automatizer state */ do_byte((byte*)&automatizer_enabled, flag); /* Then the options */ do_options(flag); - if ((flag == LS_LOAD) && (arg_fiddle)) note("Loaded Option Flags"); /* Then the "messages" */ do_messages(flag); - if ((flag == LS_LOAD) && (arg_fiddle)) note("Loaded Messages"); /* Monster Memory */ if (flag == LS_SAVE) tmp16u = max_r_idx; @@ -2640,7 +2637,6 @@ static bool_ do_savefile_aux(int flag) do_lore(i, flag); } - if ((flag == LS_LOAD) && (arg_fiddle)) note("Loaded Monster Memory"); /* Object Memory */ if (flag == LS_SAVE) tmp16u = max_k_idx; do_u16b(&tmp16u, flag); @@ -2654,7 +2650,6 @@ static bool_ do_savefile_aux(int flag) /* Read the object memory */ for (i = 0; i < tmp16u; i++) do_xtra(i, flag); - if ((flag == LS_LOAD) && (arg_fiddle)) note("Loaded Object Memory"); if (flag == LS_LOAD) junkinit(); { @@ -2790,7 +2785,6 @@ static bool_ do_savefile_aux(int flag) } } } - if ((flag == LS_LOAD) && (arg_fiddle)) note("Loaded Quests"); /* Load the random artifacts. */ if (flag == LS_SAVE) tmp16u = MAX_RANDARTS; @@ -2828,7 +2822,6 @@ static bool_ do_savefile_aux(int flag) { do_byte(&(&a_info[i])->cur_num, flag); } - if ((flag == LS_LOAD) && arg_fiddle) note("Loaded Artifacts"); /* Fates */ if (flag == LS_SAVE) tmp16u = MAX_FATES; @@ -2846,7 +2839,6 @@ static bool_ do_savefile_aux(int flag) { do_fate(i, flag); } - if ((flag == LS_LOAD) && arg_fiddle) note("Loaded Fates"); /* Load the Traps */ if (flag == LS_SAVE) tmp16u = max_t_idx; @@ -2864,7 +2856,6 @@ static bool_ do_savefile_aux(int flag) { do_byte((byte*)&t_info[i].ident, flag); } - if ((flag == LS_LOAD) && (arg_fiddle)) note("Loaded Traps"); /* inscription knowledge */ if (flag == LS_SAVE) tmp16u = MAX_INSCRIPTIONS; @@ -2880,13 +2871,11 @@ static bool_ do_savefile_aux(int flag) /* Read the inscription flag */ for (i = 0; i < tmp16u; i++) do_byte((byte*)&inscription_info[i].know, flag); - if ((flag == LS_LOAD) && arg_fiddle) note("Loaded Inscriptions"); /* Read the extra stuff */ if (!do_extra(flag)) return FALSE; - if ((flag == LS_LOAD) && arg_fiddle) note("Loaded extra information"); /* player_hp array */ diff --git a/src/main-crb.c b/src/main-crb.c index 86604471..d8af65de 100644 --- a/src/main-crb.c +++ b/src/main-crb.c @@ -3992,7 +3992,6 @@ static void handle_open_when_ready(void) # define SUBMENU_TILEWIDTH 145 #define ITEM_TILEHEIGHT 4 # define SUBMENU_TILEHEIGHT 146 -#define ITEM_FIDDLE 6 #define ITEM_WIZARD 7 @@ -4630,10 +4629,6 @@ static void setup_menus(void) } } - /* Item "arg_fiddle" */ - EnableMenuItem(m, ITEM_FIDDLE); - CheckMenuItem(m, ITEM_FIDDLE, arg_fiddle); - /* Item "arg_wizard" */ EnableMenuItem(m, ITEM_WIZARD); CheckMenuItem(m, ITEM_WIZARD, arg_wizard); @@ -5039,13 +5034,6 @@ static void menu(long mc) break; } - case ITEM_FIDDLE: - { - arg_fiddle = !arg_fiddle; - - break; - } - case ITEM_WIZARD: { arg_wizard = !arg_wizard; @@ -307,13 +307,6 @@ int main(int argc, char *argv[]) break; } - case 'F': - case 'f': - { - arg_fiddle = TRUE; - break; - } - case 'W': case 'w': { @@ -439,7 +432,6 @@ usage: puts("Usage: tome [options] [-- subopts]"); puts(" -h This help"); puts(" -n Start a new character"); - puts(" -f Request fiddle mode"); puts(" -w Request wizard mode"); puts(" -v Request sound mode"); puts(" -g Request graphics mode"); diff --git a/src/variable.c b/src/variable.c index feed0c37..2ec4f7bc 100644 --- a/src/variable.c +++ b/src/variable.c @@ -46,9 +46,8 @@ u16b sf_lives; /* Number of past "lives" with this file */ u16b sf_saves; /* Number of "saves" during this life */ /* - * Run-time arguments + * Run-time aruments */ -bool_ arg_fiddle; /* Command arg -- Request fiddle mode */ bool_ arg_wizard; /* Command arg -- Request wizard mode */ bool_ arg_sound; /* Command arg -- Request special sounds */ bool_ arg_graphics; /* Command arg -- Request graphics mode */ |