diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2015-02-23 09:11:58 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2015-02-23 09:11:58 +0100 |
| commit | 2714df02ad4a4b47745caa149561e3a8c821df45 (patch) | |
| tree | eed928a19283374ede241177e294663367e20340 /src/cmd1.cc | |
| parent | 11056413f0457bca511ad6f875219e031a2c3503 (diff) | |
Remove f_head, f_name, f_text
Diffstat (limited to 'src/cmd1.cc')
| -rw-r--r-- | src/cmd1.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cmd1.cc b/src/cmd1.cc index 6affcad9..2548aa72 100644 --- a/src/cmd1.cc +++ b/src/cmd1.cc @@ -3244,7 +3244,7 @@ void move_player_aux(int dir, int do_pickup, int run, bool_ disarm) else feat = f_info[c_ptr->feat].mimic; - msg_format("You feel %s.", f_text + f_info[feat].block); + msg_format("You feel %s.", f_info[feat].block); c_ptr->info |= (CAVE_MARK); lite_spot(y, x); } @@ -3301,7 +3301,7 @@ void move_player_aux(int dir, int do_pickup, int run, bool_ disarm) else feat = f_info[c_ptr->feat].mimic; - msg_format("There is %s.", f_text + f_info[feat].block); + msg_format("There is %s.", f_info[feat].block); if (!(p_ptr->confused || p_ptr->stun || p_ptr->image)) energy_use = 0; @@ -3420,7 +3420,7 @@ void move_player_aux(int dir, int do_pickup, int run, bool_ disarm) if (!run) p_ptr->window |= (PW_OVERHEAD); /* Some feature descs */ - if (f_info[cave[p_ptr->py][p_ptr->px].feat].text > 1) + if (f_info[cave[p_ptr->py][p_ptr->px].feat].text != DEFAULT_FEAT_TEXT) { /* Mega-hack for dungeon branches */ if ((feat == FEAT_MORE) && c_ptr->special) @@ -3429,7 +3429,7 @@ void move_player_aux(int dir, int do_pickup, int run, bool_ disarm) } else { - msg_print(f_text + f_info[feat].text); + msg_print(f_info[feat].text); } /* Flush message while running */ @@ -3464,7 +3464,7 @@ void move_player_aux(int dir, int do_pickup, int run, bool_ disarm) else if (cave[y][x].feat >= FEAT_ALTAR_HEAD && cave[y][x].feat <= FEAT_ALTAR_TAIL) { - cptr name = f_name + f_info[cave[y][x].feat].name; + cptr name = f_info[cave[y][x].feat].name; cptr pref = (is_a_vowel(name[0])) ? "an" : "a"; msg_format("You see %s %s.", pref, name); |