summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2012-04-06 10:52:28 +0200
committerBardur Arantsson <bardur@scientician.net>2012-04-07 15:28:26 +0200
commit5a91c8e154a9b55fa6ccba342f26d8bd03af140d (patch)
tree7ebf05ecc82d2cbe2824297a7b9872caf5c4fb3a /src
parent05fedc33f23a2459c4149f2a0970f01ae2602a62 (diff)
Lua: Remove HOOK_READ completely
Diffstat (limited to 'src')
-rw-r--r--src/cmd6.c8
-rw-r--r--src/defines.h1
-rw-r--r--src/util.pkg14
3 files changed, 1 insertions, 22 deletions
diff --git a/src/cmd6.c b/src/cmd6.c
index 869ad707..63137a69 100644
--- a/src/cmd6.c
+++ b/src/cmd6.c
@@ -2907,13 +2907,7 @@ void do_cmd_read_scroll(void)
ident = FALSE;
}
- /* New scripts, can override the ingame code */
- else if (process_hooks_ret(HOOK_READ, "dd", "(O)", o_ptr))
- {
- used_up = process_hooks_return[0].num;
- ident = process_hooks_return[1].num;
- }
- /* Traditional scrolls */
+ /* Scrolls */
else if (o_ptr->tval == TV_SCROLL)
{
/* Analyze the scroll */
diff --git a/src/defines.h b/src/defines.h
index 3d258caf..605a8c24 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -4462,7 +4462,6 @@
#define HOOK_USE 25
#define HOOK_ACTIVATE 26
#define HOOK_ZAP 27
-#define HOOK_READ 28
#define HOOK_CALC_POWERS 30
#define HOOK_KEYPRESS 31
#define HOOK_CHAT 32
diff --git a/src/util.pkg b/src/util.pkg
index ab2b6ce2..e988b62e 100644
--- a/src/util.pkg
+++ b/src/util.pkg
@@ -401,20 +401,6 @@ typedef unsigned int u32b;
*/
#define HOOK_ZAP 27
-/** @def HOOK_READ
- * @brief Player reads a scroll.\n
- * @param Object o_ptr \n the scroll to read.
- * @brief Scroll
- * @return Boolean \n TRUE if scroll was read, otherwise FALSE.
- * @return Number used_up \n TRUE if the scroll was used up, otherwise FALSE.
- * @return Number ident \n TRUE if the scroll was identifed, otherwise FALSE.
- * @note
- * If the hook returns TRUE, the hook sets the "scroll used up" and
- * "scroll identified" flags.
- * @note (see file cmd6.c)
- */
-#define HOOK_READ 28
-
/** @def HOOK_CALC_POWERS
* @brief Calculate player powers.
* @note (see xtra1.c)