diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2016-10-05 18:45:09 +0200 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2016-10-05 18:49:38 +0200 |
| commit | cbafbc638c2e1d5bb40ee6bc419007062e9615e4 (patch) | |
| tree | 0a4644c9c935a2a54d8b52613c67a09fc2fbf4be /src/help.cc | |
| parent | 551339813797a9b274ccf5f3f0c4f0d0b44cbf64 (diff) | |
Remove traps
Credit goes mostly to "miramor" <danlev@norwoodlight.com> who did most
of the actual work. I just did a few minor tweaks and fixes + rebased
onto master.
Diffstat (limited to 'src/help.cc')
| -rw-r--r-- | src/help.cc | 38 |
1 files changed, 10 insertions, 28 deletions
diff --git a/src/help.cc b/src/help.cc index e5014b45..7af521a9 100644 --- a/src/help.cc +++ b/src/help.cc @@ -24,7 +24,7 @@ #include "variable.hpp" #define DESC_MAX 14 -#define TRIGGERED_HELP_MAX 18 +#define TRIGGERED_HELP_MAX 17 #define HELP_VOID_JUMPGATE 0 #define HELP_FOUNTAIN 1 @@ -34,16 +34,15 @@ #define HELP_GET_RUNE 5 #define HELP_GET_ROD 6 #define HELP_GET_ROD_TIP 7 -#define HELP_GET_TRAP_KIT 8 -#define HELP_GET_DEVICE 9 -#define HELP_WILDERNESS 10 -#define HELP_GAME_TOME 11 -#define HELP_GAME_THEME 12 -#define HELP_1ST_LEVEL 13 -#define HELP_20TH_LEVEL 14 -#define HELP_ID_SPELL_ITM 15 -#define HELP_MELEE_SKILLS 16 -#define HELP_MON_ASK_HELP 17 +#define HELP_GET_DEVICE 8 +#define HELP_WILDERNESS 9 +#define HELP_GAME_TOME 10 +#define HELP_GAME_THEME 11 +#define HELP_1ST_LEVEL 12 +#define HELP_20TH_LEVEL 13 +#define HELP_ID_SPELL_ITM 14 +#define HELP_MELEE_SKILLS 15 +#define HELP_MON_ASK_HELP 16 /** * Game started? @@ -200,7 +199,6 @@ context_help_type class_table[] = { "Priest(Varda)", "c_pr_varda.txt", 0 }, { "Sniper", "c_sniper.txt", 0 }, { "Stonewright", "c_stonewr.txt", 0 }, - { "Trapper", "c_trapper.txt", 0 }, { "Wainrider", "c_wainrid.txt", 0 }, { "War-mage", "c_warmage.txt", 0 }, /* End of list */ @@ -302,7 +300,6 @@ context_help_type ability_table[] = { "Ammo creation", "ability.txt", 7 }, { "Touch of death", "ability.txt", 8 }, { "Far reaching attack", "ability.txt", 10 }, - { "Trapping", "ability.txt", 11 }, { "Undead Form", "ability.txt", 12 }, { NULL, NULL, 0 }, }; @@ -352,11 +349,6 @@ static bool_ trigger_get_rod_tip(void *in, void *out) { return (g->o_ptr->tval == TV_ROD); } -static bool_ trigger_get_trap_kit(void *in, void *out) { - hook_get_in *g = (hook_get_in *) in; - return (g->o_ptr->tval == TV_TRAPKIT); -} - static bool_ trigger_get_magic_device(void *in, void *out) { hook_get_in *g = (hook_get_in *) in; return ((g->o_ptr->tval == TV_WAND) || @@ -479,16 +471,6 @@ static triggered_help_type triggered_help[TRIGGERED_HELP_MAX] = NULL } }, - { HELP_GET_TRAP_KIT, - HOOK_GET, - trigger_get_trap_kit, - { "Ooooh, a trapping kit. If you have ability in the trapping skill,", - "you can lay this trap (via the 'm' key) to harm unsuspecting foes.", - "You'll generally need either some ammo or magic device depending", - "on the exact type of trap kit.", - NULL - } - }, { HELP_GET_DEVICE, HOOK_GET, trigger_get_magic_device, |