summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2015-02-23 09:12:00 +0100
committerBardur Arantsson <bardur@scientician.net>2015-02-23 09:12:00 +0100
commitaba7dbda30fcc8be0fe129f065ce3e494b374c54 (patch)
tree2e06a65aff67141d2354be58be31a8a8f455691e /src
parenta59d8968c3bf669790e15a6170577b92f36745b6 (diff)
Remove dead code/flags
Diffstat (limited to 'src')
-rw-r--r--src/externs.h2
-rw-r--r--src/object1.cc16
2 files changed, 8 insertions, 10 deletions
diff --git a/src/externs.h b/src/externs.h
index 037d68e3..f19f0eea 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -1123,8 +1123,6 @@ extern bool_ easy_open_door(int y, int x);
/* cmd2.c */
extern bool_ do_cmd_disarm_aux(int y, int x, int dir, int do_pickup);
-extern bool_ easy_floor;
-
/* script.c */
extern void init_lua_init(void);
diff --git a/src/object1.cc b/src/object1.cc
index 5e62519d..e33f2193 100644
--- a/src/object1.cc
+++ b/src/object1.cc
@@ -6289,7 +6289,7 @@ void py_pickup_floor(int pickup)
}
/* Add a flags group */
-static void gain_flag_group(object_type *o_ptr, bool_ silent)
+static void gain_flag_group(object_type *o_ptr)
{
int grp = 0;
int tries = 1000;
@@ -6314,7 +6314,7 @@ static void gain_flag_group(object_type *o_ptr, bool_ silent)
o_ptr->pval2 -= flags_groups[grp].price;
o_ptr->pval3 |= BIT(grp);
- if (!silent)
+ /* Message */
{
char o_name[80];
@@ -6323,7 +6323,7 @@ static void gain_flag_group(object_type *o_ptr, bool_ silent)
}
}
-u32b get_flag(object_type *o_ptr, int grp, int k)
+static u32b get_flag(object_type *o_ptr, int grp, int k)
{
u32b f = 0, flag_set = 0;
int tries = 1000;
@@ -6384,7 +6384,7 @@ u32b get_flag(object_type *o_ptr, int grp, int k)
}
/* Add a flags from a flag group */
-static void gain_flag_group_flag(object_type *o_ptr, bool_ silent)
+static void gain_flag_group_flag(object_type *o_ptr)
{
int grp = 0, k = 0;
u32b f = 0;
@@ -6431,7 +6431,7 @@ static void gain_flag_group_flag(object_type *o_ptr, bool_ silent)
break;
}
- if (!silent)
+ /* Message */
{
char o_name[80];
@@ -6468,13 +6468,13 @@ void object_gain_level(object_type *o_ptr)
o_ptr->to_h += 1;
o_ptr->pval2++;
- if (magik(NEW_GROUP_CHANCE)) gain_flag_group(o_ptr, FALSE);
+ if (magik(NEW_GROUP_CHANCE)) gain_flag_group(o_ptr);
}
else
{
- if (!o_ptr->pval3) gain_flag_group(o_ptr, FALSE);
+ if (!o_ptr->pval3) gain_flag_group(o_ptr);
- gain_flag_group_flag(o_ptr, FALSE);
+ gain_flag_group_flag(o_ptr);
if (!o_ptr->pval) o_ptr->pval = 1;
else