From d861617f0fa266d9ca86088ba0b8fc9561043ea1 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 26 Jun 2012 21:14:16 +0200 Subject: Remove "monk_*" globals --- src/externs.h | 2 -- src/variable.c | 4 ---- src/xtra1.c | 2 ++ 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/externs.h b/src/externs.h index 300bc73d..3c9d6d74 100644 --- a/src/externs.h +++ b/src/externs.h @@ -467,8 +467,6 @@ extern void (*ang_sort_swap)(vptr u, vptr v, int a, int b); extern bool_ (*get_mon_num_hook)(int r_idx); extern bool_ (*get_mon_num2_hook)(int r_idx); extern bool_ (*get_obj_num_hook)(int k_idx); -extern bool_ monk_armour_aux; -extern bool_ monk_notify_aux; extern u16b max_wild_x; extern u16b max_wild_y; extern wilderness_map **wild_map; diff --git a/src/variable.c b/src/variable.c index e5a4e92c..4972e647 100644 --- a/src/variable.c +++ b/src/variable.c @@ -1071,10 +1071,6 @@ bool_ (*get_mon_num2_hook)(int r_idx); bool_ (*get_obj_num_hook)(int k_idx); -/* Hack, monk armour */ -bool_ monk_armour_aux; -bool_ monk_notify_aux; - bool_ easy_open = TRUE; bool_ easy_disarm = TRUE; bool_ easy_tunnel = FALSE; diff --git a/src/xtra1.c b/src/xtra1.c index 0cc3ccac..d24eaa5c 100644 --- a/src/xtra1.c +++ b/src/xtra1.c @@ -2821,6 +2821,7 @@ void apply_flags(u32b f1, u32b f2, u32b f3, u32b f4, u32b f5, u32b esp, s16b pva */ void calc_bonuses(bool_ silent) { + static bool_ monk_notify_aux = FALSE; int i, j, hold; int old_speed; u32b old_telepathy; @@ -2829,6 +2830,7 @@ void calc_bonuses(bool_ silent) int old_dis_to_a; object_type *o_ptr; u32b f1, f2, f3, f4, f5, esp; + bool_ monk_armour_aux; /* Save the old speed */ -- cgit v1.2.3