diff options
| -rw-r--r-- | lib/help/command.txt | 11 | ||||
| -rw-r--r-- | lib/help/option.txt | 17 | ||||
| -rw-r--r-- | src/birth.c | 16 | ||||
| -rw-r--r-- | src/cmd3.c | 4 | ||||
| -rw-r--r-- | src/cmd4.c | 9 | ||||
| -rw-r--r-- | src/dungeon.c | 3 | ||||
| -rw-r--r-- | src/externs.h | 9 | ||||
| -rw-r--r-- | src/files.c | 12 | ||||
| -rw-r--r-- | src/generate.c | 42 | ||||
| -rw-r--r-- | src/loadsave.c | 12 | ||||
| -rw-r--r-- | src/modules.c | 3 | ||||
| -rw-r--r-- | src/monster1.c | 4 | ||||
| -rw-r--r-- | src/spells1.c | 2 | ||||
| -rw-r--r-- | src/tables.c | 19 | ||||
| -rw-r--r-- | src/util.c | 9 | ||||
| -rw-r--r-- | src/variable.c | 9 |
16 files changed, 19 insertions, 162 deletions
diff --git a/lib/help/command.txt b/lib/help/command.txt index 0beffd33..6616c252 100644 --- a/lib/help/command.txt +++ b/lib/help/command.txt @@ -572,12 +572,11 @@ for a quantity will convert any "letters" into the maximal legal value. wilderness map. Going up a staircase will take you to a new dungeon level unless you are at the first level of the dungeon, in which case you will return to the surface. Note that whenever you leave a dungeon - level, you will never find it again, unless the "permanent_levels" - option is set or the level contains a dungeon town. This means that - for all intents and purposes, any objects on that level are destroyed. - This includes unknown artifacts unless the "Create characters in - preserve mode" option was set when your character was created, in which - case the artifacts may show up again later. + level, you will never find it again, unless the level contains a dungeon + town. This means that for all intents and purposes, any objects on that + level are destroyed. This includes unknown artifacts unless the "Create + characters in preserve mode" option was set when your character was + created, in which case the artifacts may show up again later. ~~~~~77 [[[[[GGo down staircase (>)] Descends a down staircase you are standing on. There are always diff --git a/lib/help/option.txt b/lib/help/option.txt index 33e0ce9e..6fd3b413 100644 --- a/lib/help/option.txt +++ b/lib/help/option.txt @@ -51,10 +51,6 @@ can also be viewed from the option menu while playing, but not changed then. character who is above average (but not great) in all stats. Unused points convert into starting gold for the player. -#####GGenerate persistent dungeons [permanent_levels] - Setting this option means that level 1 of the dungeon will always have - the same dungeon map each time you visit it (like the Nethack dungeon). - #####GAlways generate very unusual rooms [ironman_rooms] Tries to place a special room or vault on every dungeon level. Very fun, but extremely deadly - imagine that Greater Checkerboard Vault with Lokkak @@ -181,11 +177,6 @@ off at will during the course of the game. #####GAudible bell (on errors, etc) [ring_bell] Attempt to make a "bell" noise when various errors occur. -#####GUse color if possible (slow) [use_color] - This option enables the software support for colour. Since this makes - the game slower, you should always disable this option if you are using - a machine which is not capable of using colours. - ~~~~~09|Options|Disturbance #####R=== Option Set 2 -- Disturbance === @@ -382,10 +373,6 @@ off at will during the course of the game. #####GMonsters chase current location (v.slow) [flow_by_sound] Allow monsters to make paths to the player when they are nearby. This option is extremely slow, but can produce viciously smart monsters. - -#####GMonsters chase recent locations (v.slow) [flow_by_smell] - As above, but also allow monsters to take advantage of "old" trails - that you may have left in the dungeon. ~~~~~3 #####GUse special symbols for the player char [player_symbols] If this option has been compiled in, it allows you to display your @@ -508,10 +495,6 @@ off at will during the course of the game. displayed by the game. This will give you maximal information, but may slow down the game somewhat. -#####GCompress messages in savefiles [compress_savefile] - Compress the savefile, by only saving the most recent messages that - the player has received. This can cut the size of the savefile by a - drastic amount, but will result in the loss of message information. ~~~~~2 #####GHilite the player with the cursor [hilite_player] Place the visible cursor on the player. This looks fine on some Unix diff --git a/src/birth.c b/src/birth.c index b3b61e3c..fa74c5e2 100644 --- a/src/birth.c +++ b/src/birth.c @@ -2387,7 +2387,6 @@ static bool player_birth_aux_ask() * the old one (player_type members), it would be less confusing * to handle birth-only options in a uniform fashion,the above and * the following: - * permanent_levels, * ironman_rooms, * joke_monsters, * always_small_level, and @@ -2395,16 +2394,6 @@ static bool player_birth_aux_ask() */ - /* Set dungeon seed */ - if (permanent_levels) - { - seed_dungeon = randint(0x10000000); - } - else - { - seed_dungeon = 0; - } - /* Set the recall dungeon accordingly */ call_lua("get_module_info", "(s)", "d", "base_dungeon", &tmp); dungeon_type = tmp; @@ -2432,7 +2421,7 @@ static bool player_birth_aux_ask() /* Heino Vander Sanden and Jimmy De Laet */ call_lua("get_module_info", "(s)", "d", "rand_quest", &allow_quest); - if (!ironman_rooms && !permanent_levels && allow_quest) + if (!ironman_rooms && allow_quest) { if (do_quick_start) { @@ -3772,9 +3761,6 @@ bool begin_screen() savefile_try_again: sel = 0; - /* Hack */ - use_color = TRUE; - /* Grab the savefiles */ max = load_savefile_names(); @@ -1545,10 +1545,6 @@ static void roff_top(int r_idx) a1 = r_ptr->d_attr; a2 = r_ptr->x_attr; - /* Hack -- fake monochrome */ - if (!use_color) a1 = TERM_WHITE; - if (!use_color) a2 = TERM_WHITE; - /* Clear the top line */ Term_erase(0, 0, 255); @@ -919,7 +919,7 @@ static void do_cmd_options_win(void) cptr s = angband_term_name[j]; /* Use color */ - if (use_color && (j == x)) a = TERM_L_BLUE; + if ((j == x)) a = TERM_L_BLUE; /* Window name, staggered, centered */ Term_putstr(35 + j * 5 - strlen(s) / 2, 2 + j % 2, -1, a, s); @@ -933,7 +933,7 @@ static void do_cmd_options_win(void) cptr str = window_flag_desc[i]; /* Use color */ - if (use_color && (i == y)) a = TERM_L_BLUE; + if ((i == y)) a = TERM_L_BLUE; /* Unused option */ if (!str) str = "(Unused option)"; @@ -949,7 +949,7 @@ static void do_cmd_options_win(void) char c = '.'; /* Use color */ - if (use_color && (i == y) && (j == x)) a = TERM_L_BLUE; + if ((i == y) && (j == x)) a = TERM_L_BLUE; /* Active flag */ if (window_flag[j] & (1L << i)) c = 'X'; @@ -3112,9 +3112,6 @@ void do_cmd_load_screen(void) if (hack[i] == buf[x]) a = i; } - /* Hack -- fake monochrome */ - if (!use_color) a = TERM_WHITE; - /* Put the attr/char */ Term_draw(x, y, a, c); } diff --git a/src/dungeon.c b/src/dungeon.c index dc5c421f..c6eb7551 100644 --- a/src/dungeon.c +++ b/src/dungeon.c @@ -5670,9 +5670,6 @@ void play_game(bool new_game) /* Hack -- seed for flavors */ seed_flavor = rand_int(0x10000000); - /* Hack -- seed for town layout */ - seed_town = rand_int(0x10000000); - /* Roll up a new character */ player_birth(); diff --git a/src/externs.h b/src/externs.h index 6a11847a..73b9f20a 100644 --- a/src/externs.h +++ b/src/externs.h @@ -122,8 +122,6 @@ extern bool character_saved; extern bool character_icky; extern bool character_xtra; extern u32b seed_flavor; -extern u32b seed_town; -extern u32b seed_dungeon; extern s16b command_cmd; extern s16b command_arg; extern s16b command_rep; @@ -206,8 +204,6 @@ extern bool prompt_pickup_heavy; extern bool always_repeat; extern bool use_old_target; extern bool depth_in_feet; -extern bool use_color; -extern bool compress_savefile; extern bool hilite_player; extern bool ring_bell; extern bool find_ignore_stairs; @@ -246,7 +242,6 @@ extern bool view_perma_grids; extern bool view_torch_grids; extern bool monster_lite; extern bool flow_by_sound; -extern bool flow_by_smell; extern bool track_follow; extern bool track_target; extern bool stack_allow_items; @@ -280,9 +275,6 @@ extern bool speak_unique; extern bool small_levels; extern bool empty_levels; extern bool always_small_level; -#if 0 /* It's controlled by insanity -- pelpel */ -extern bool flavored_attacks; -#endif extern bool player_symbols; extern byte hitpoint_warn; extern byte delay_factor; @@ -545,7 +537,6 @@ extern s16b *max_dlv; extern u32b total_bounties; extern s16b doppleganger; extern bool generate_encounter; -extern bool permanent_levels; extern bool autoroll; extern bool point_based; extern bool maximize, preserve, special_lvls, ironman_rooms; diff --git a/src/files.c b/src/files.c index 32c991fd..95237b16 100644 --- a/src/files.c +++ b/src/files.c @@ -2636,9 +2636,6 @@ static void display_player_ben_one(int mode) } } - /* Monochrome */ - if (!use_color) a = TERM_WHITE; - /* Dump flag */ if (modetemp == 1 && x == 0 && y > 7 && y < 12) { @@ -2651,7 +2648,7 @@ static void display_player_ben_one(int mode) } a = TERM_WHITE; - if (use_color && got) + if (got) { if (modetemp == 1 && x == 0 && y > 7 && y < 12) { @@ -3223,11 +3220,6 @@ errr file_character(cptr name, bool full) else fprintf(fff, "\n Always unusual rooms: OFF"); - if (seed_dungeon) - fprintf(fff, "\n Persistent Dungeons: ON"); - else - fprintf(fff, "\n Persistent Dungeons: OFF"); - fprintf(fff, "\n\n Recall Depth:"); for (y = 1; y < max_d_idx; y++) { @@ -3241,7 +3233,7 @@ errr file_character(cptr name, bool full) if (noscore) fprintf(fff, "\n You have done something illegal."); - if (PRACE_FLAGS(PR1_EXPERIMENTAL) || seed_dungeon) + if (PRACE_FLAGS(PR1_EXPERIMENTAL)) fprintf(fff, "\n You have done something experimental."); if (stupid_monsters) diff --git a/src/generate.c b/src/generate.c index c12fd14e..ca9f58b0 100644 --- a/src/generate.c +++ b/src/generate.c @@ -2959,8 +2959,6 @@ static void build_type5(int by0, int bx0) x1 = xval - 11; x2 = xval + 11; - if (seed_dungeon) Rand_quick = FALSE; - /* Place the floor area */ for (y = y1; y <= y2; y++) { @@ -3134,8 +3132,6 @@ static void build_type5(int by0, int bx0) (void)place_monster_aux(y, x, r_idx, FALSE, FALSE, MSTATUS_ENEMY); } } - - if (seed_dungeon) Rand_quick = TRUE; } @@ -3200,8 +3196,6 @@ static void build_type6(int by0, int bx0) x1 = xval - 11; x2 = xval + 11; - if (seed_dungeon) Rand_quick = FALSE; - /* Place the floor area */ for (y = y1 - 1; y <= y2 + 1; y++) { @@ -3530,11 +3524,6 @@ static void build_type6(int by0, int bx0) /* Center monster */ place_monster_aux(yval, xval, what[7], FALSE, FALSE, MSTATUS_ENEMY); - - if (seed_dungeon) - { - Rand_quick = TRUE; - } } /* @@ -3548,12 +3537,6 @@ static void build_vault(int yval, int xval, int ymax, int xmax, cptr data) cave_type *c_ptr; - /* Vaults are different even in persistent dungeons. */ - if (seed_dungeon) - { - Rand_quick = FALSE; - } - /* Clean the between gates arrays */ for (i = 0; i < 8; i++) { @@ -3808,11 +3791,6 @@ static void build_vault(int yval, int xval, int ymax, int xmax, cptr data) } } } - - if (seed_dungeon) - { - Rand_quick = TRUE; - } } /* @@ -7727,9 +7705,6 @@ static bool cave_gen(void) process_hooks(HOOK_GEN_LEVEL, "(d)", is_quest(dun_level)); - /* Monsters and objects change even in persistent dungeons. */ - if (seed_dungeon) Rand_quick = FALSE; - /* Basic "amount" */ k = (dun_level / 3); if (k > 10) k = 10; @@ -8488,7 +8463,6 @@ void generate_cave(void) bool loaded = FALSE; char buf[80]; s16b town_level = 0; - s32b old_seed_dungeon = seed_dungeon; /* The dungeon is not ready */ character_dungeon = FALSE; @@ -8517,17 +8491,10 @@ void generate_cave(void) wipe_m_list(); /* Seed the RNG if appropriate */ - if (seed_dungeon) - { - Rand_quick = TRUE; - Rand_value = seed_dungeon + dun_level; - } - if (town_level) { Rand_quick = TRUE; - seed_dungeon = town_info[town_level].seed; - Rand_value = seed_dungeon; + Rand_value = town_info[town_level].seed; } process_hooks(HOOK_GEN_LEVEL_BEGIN, ""); @@ -8972,13 +8939,6 @@ void generate_cave(void) /* Remember when this level was "created" */ old_turn = turn; - if (seed_dungeon) - { - Rand_quick = FALSE; - - seed_dungeon = old_seed_dungeon; - } - /* Provide astral chars with the full map */ if (p_ptr->astral && dun_level) { diff --git a/src/loadsave.c b/src/loadsave.c index 835d1e57..7230d090 100644 --- a/src/loadsave.c +++ b/src/loadsave.c @@ -316,6 +316,7 @@ static bool do_extra(int flag) s16b tmp16s; u32b tmp32u; u16b tmp16b; + u32b dummy32u = 0; do_string(player_name, 32, flag); @@ -759,10 +760,10 @@ static bool do_extra(int flag) do_s16b(&rune_spells[i].mana, flag); } - /* Write the "object seeds" */ - do_u32b(&seed_dungeon, flag); - do_u32b(&seed_flavor, flag); - do_u32b(&seed_town, flag); + /* Load random seeds */ + do_u32b(&dummy32u, flag); /* Load-compatibility with old savefiles. */ + do_u32b(&seed_flavor, flag); /* For consistent object flavors. */ + do_u32b(&dummy32u, flag); /* Load-compatibility with old savefiles. */ /* Special stuff */ do_u16b(&panic_save, flag); @@ -2511,8 +2512,7 @@ static void do_messages(int flag) /* FIXME! We should be able to unify this be s16b num; - if (flag == LS_SAVE) num = (compress_savefile && - (message_num() > 40)) ? 40 : message_num(); + if (flag == LS_SAVE) num = message_num(); /* Total */ do_s16b(&num, flag); diff --git a/src/modules.c b/src/modules.c index 1555eff3..ceb3e81d 100644 --- a/src/modules.c +++ b/src/modules.c @@ -174,9 +174,6 @@ bool select_module() { s32b k, sel, max; - /* Hack */ - use_color = TRUE; - /* Init some lua */ init_lua(); diff --git a/src/monster1.c b/src/monster1.c index 5da7d478..7a44ffab 100644 --- a/src/monster1.c +++ b/src/monster1.c @@ -1565,10 +1565,6 @@ static void roff_name(int r_idx, int ego) a1 = r_ptr->d_attr; a2 = r_ptr->x_attr; - /* Hack -- fake monochrome */ - if (!use_color) a1 = TERM_WHITE; - if (!use_color) a2 = TERM_WHITE; - /* A title (use "The" for non-uniques) */ if (!(r_ptr->flags1 & (RF1_UNIQUE))) { diff --git a/src/spells1.c b/src/spells1.c index a7b0ad41..58b102cf 100644 --- a/src/spells1.c +++ b/src/spells1.c @@ -1123,7 +1123,7 @@ byte spell_color(int type) } /* Normal tiles or ASCII */ - else if (use_color) + else { /* Analyze */ switch (type) diff --git a/src/tables.c b/src/tables.c index 6c83ee04..2f05b7ca 100644 --- a/src/tables.c +++ b/src/tables.c @@ -1407,9 +1407,6 @@ option_type option_info[] = "ring_bell", "Audible bell (on errors, etc)" }, /* Changed to default to FALSE -- it's so extremely annoying!!! -TY */ - { &use_color, TRUE, 1, 19, - "use_color", "Use color if possible (slow)" }, - /*** Disturbance ***/ { &find_ignore_stairs, FALSE, 2, 0, @@ -1520,9 +1517,6 @@ option_type option_info[] = { &flow_by_sound, FALSE, 3, 10, "flow_by_sound", "Monsters chase current location (v.slow)" }, - { &flow_by_smell, FALSE, 3, 11, - "flow_by_smell", "Monsters chase recent locations (v.slow)" }, - { &player_symbols, FALSE, 3, 12, "player_symbols", "Use special symbols for the player char"}, @@ -1579,9 +1573,6 @@ option_type option_info[] = { &fresh_message, FALSE, 4, 9, "fresh_message", "Flush output after every message" }, - { &compress_savefile, TRUE, 4, 10, - "compress_savefile", "Compress messages in savefiles" }, - { &hilite_player, FALSE, 4, 11, "hilite_player", "Hilite the player with the cursor" }, @@ -1602,13 +1593,6 @@ option_type option_info[] = /*** ToME options ***/ -#if 0 /* It's controlled by insanity instead :) - pelpel */ - - { &flavored_attacks, TRUE, 5, 0, - "flavored_attacks", "Show silly messages when fighting" }, - -#endif /* 0 */ - { &option_ingame_help, TRUE, 5, 1, "ingame_help", "Ingame contextual help" }, @@ -1653,9 +1637,6 @@ option_type option_info[] = { &special_lvls, TRUE, 6, 4, "special_lvls", "Allow the use of special, unique, levels" }, #endif - { &permanent_levels, FALSE, 6, 5, - "permanent_levels", "Generate persistent dungeons [EXPERIMENTAL]" }, - { &ironman_rooms, FALSE, 6, 6, "ironman_rooms", "Always generate very unusual rooms" }, @@ -2605,9 +2605,6 @@ static void msg_flush(int x) { byte a = TERM_L_BLUE; - /* Hack -- fake monochrome */ - if (!use_color) a = TERM_WHITE; - /* Pause for response */ Term_putstr(x, 0, -1, a, "-more-"); @@ -2906,9 +2903,6 @@ void cmsg_format(byte color, cptr fmt, ...) */ void c_put_str(byte attr, cptr str, int row, int col) { - /* Hack -- fake monochrome */ - if (!use_color) attr = TERM_WHITE; - /* Position cursor, Dump the attr/text */ Term_putstr(col, row, -1, attr, str); } @@ -2930,9 +2924,6 @@ void put_str(cptr str, int row, int col) */ void c_prt(byte attr, cptr str, int row, int col) { - /* Hack -- fake monochrome */ - if (!use_color) attr = TERM_WHITE; - /* Clear line, position cursor */ Term_erase(col, row, 255); diff --git a/src/variable.c b/src/variable.c index fa42772f..6bc4b04e 100644 --- a/src/variable.c +++ b/src/variable.c @@ -81,8 +81,6 @@ bool character_icky; /* The game is in an icky full screen mode */ bool character_xtra; /* The game is in an icky startup mode */ u32b seed_flavor; /* Hack -- consistent object colors */ -u32b seed_town; /* Hack -- consistent town layout */ -u32b seed_dungeon; /* Simulate persisten dungeons */ s16b command_cmd; /* Current "Angband Command" */ @@ -238,7 +236,6 @@ bool show_choices; /* Show choices in certain sub-windows */ bool show_details; /* Show details in certain sub-windows */ bool ring_bell; /* Ring the bell (on errors, etc) */ -bool use_color; /* Use color if possible (slow) */ bool show_inven_graph; /* Show graphics in inventory */ bool show_equip_graph; /* Show graphics in equip list */ @@ -268,9 +265,6 @@ bool speak_unique; /* Speaking uniques + shopkeepers */ bool small_levels; /* Allow unusually small dungeon levels */ bool empty_levels; /* Allow empty 'arena' levels */ bool always_small_level; /* Small levels */ -#if 0 /* It's controlled by insanity -- pelpel */ -bool flavored_attacks; /* Show silly messages when fighting */ -#endif bool player_symbols; /* Use varying symbols for the player char */ bool plain_descriptions; /* Plain object descriptions */ bool stupid_monsters; /* Monsters use old AI */ @@ -301,7 +295,6 @@ bool dungeon_align; /* Generate dungeons with aligned rooms */ bool dungeon_stair; /* Generate dungeons with connected stairs */ bool flow_by_sound; /* Monsters track new player location */ -bool flow_by_smell; /* Monsters track old player location */ bool track_follow; /* Monsters follow the player */ bool track_target; /* Monsters target the player */ @@ -327,8 +320,6 @@ bool fresh_before; /* Flush output before normal commands */ bool fresh_after; /* Flush output after normal commands */ bool fresh_message; /* Flush output after all messages */ -bool compress_savefile; /* Compress messages in savefiles */ - bool hilite_player; /* Hilite the player with the cursor */ bool view_yellow_lite; /* Use special colors for torch-lit grids */ |