diff options
author | Bardur Arantsson <bardur@scientician.net> | 2012-04-06 11:10:49 +0200 |
---|---|---|
committer | Bardur Arantsson <bardur@scientician.net> | 2012-04-07 15:28:26 +0200 |
commit | 8ffbaea87b5ca17e7baa77cf17986a5b9dfc585e (patch) | |
tree | 7c3317e8d258e9f9b1b3c078a6238875c37921a4 /src | |
parent | 92e717a03262c95983d7a6bcaaa7da4923ce850f (diff) |
Lua: Remove HOOK_QUAFF completely
Diffstat (limited to 'src')
-rw-r--r-- | src/cmd6.c | 7 | ||||
-rw-r--r-- | src/defines.h | 1 | ||||
-rw-r--r-- | src/util.pkg | 12 |
3 files changed, 1 insertions, 19 deletions
@@ -2495,14 +2495,9 @@ void do_cmd_quaff_potion(void) msg_print("Your demon breath spoils the potion!"); ident = FALSE; } - - /* Analyze the potion */ - else if (process_hooks_ret(HOOK_QUAFF, "d", "(O)", o_ptr)) - { - ident = process_hooks_return[0].num; - } else { + /* Normal potion handling */ ident = quaff_potion(o_ptr->tval, o_ptr->sval, o_ptr->pval, o_ptr->pval2); } diff --git a/src/defines.h b/src/defines.h index 605a8c24..d40e3b90 100644 --- a/src/defines.h +++ b/src/defines.h @@ -4457,7 +4457,6 @@ #define HOOK_PLAYER_LEVEL 20 #define HOOK_WIELD 21 #define HOOK_INIT 22 -#define HOOK_QUAFF 23 #define HOOK_AIM 24 #define HOOK_USE 25 #define HOOK_ACTIVATE 26 diff --git a/src/util.pkg b/src/util.pkg index e988b62e..d00dcb76 100644 --- a/src/util.pkg +++ b/src/util.pkg @@ -361,18 +361,6 @@ typedef unsigned int u32b; */ #define HOOK_INIT 22 -/** @def HOOK_QUAFF - * @brief Player quaffs a potion.\n - * @param Object o_ptr \n the potion to quaff. - * @brief Potion - * @return Boolean \n TRUE if potion was quaffed, otherwise FALSE. - * @return Number ident \n TRUE if the potion was identifed, otherwise FALSE. - * @note - * If the hook returns TRUE, the hook sets the "potion identified" flag. - * @note (see file cmd6.c) - */ -#define HOOK_QUAFF 23 - /** @def HOOK_AIM */ #define HOOK_AIM 24 |