summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2018-03-25 20:07:30 +0200
committerBardur Arantsson <bardur@scientician.net>2018-03-25 20:07:30 +0200
commitd3f48788c6108df10b181f4e85d3d2f74aaed91a (patch)
treee2c4ddf13ee7b7d8f883acd669d8844d9f8d8ef2 /src
parentfe3eb7fec6d851af07b7077378dff5e8283a6226 (diff)
Remove "tried" flag
It's no longer used.
Diffstat (limited to 'src')
-rw-r--r--src/birth.cc1
-rw-r--r--src/cmd6.cc18
-rw-r--r--src/loadsave.cc1
-rw-r--r--src/object1.cc6
-rw-r--r--src/object2.cc19
-rw-r--r--src/object2.hpp2
-rw-r--r--src/object_kind.hpp2
7 files changed, 0 insertions, 49 deletions
diff --git a/src/birth.cc b/src/birth.cc
index 40e3eeea..e6bd6fd4 100644
--- a/src/birth.cc
+++ b/src/birth.cc
@@ -633,7 +633,6 @@ static void player_wipe()
for (auto &k_entry: k_info)
{
auto k_ptr = k_entry.second;
- k_ptr->tried = FALSE;
k_ptr->aware = FALSE;
k_ptr->artifact = 0;
}
diff --git a/src/cmd6.cc b/src/cmd6.cc
index 2034d1c1..cf67cbdc 100644
--- a/src/cmd6.cc
+++ b/src/cmd6.cc
@@ -1415,9 +1415,6 @@ void do_cmd_eat_food()
/* Combine / Reorder the pack (later) */
p_ptr->notice |= (PN_COMBINE | PN_REORDER);
- /* We have tried it */
- object_tried(o_ptr);
-
/* The player is now aware of the object */
if (!object_aware_p(o_ptr))
{
@@ -2464,9 +2461,6 @@ void do_cmd_quaff_potion()
/* Combine / Reorder the pack (later) */
p_ptr->notice |= (PN_COMBINE | PN_REORDER);
- /* The item has been tried */
- object_tried(o_ptr);
-
/* An identification was made */
if (ident && !object_aware_p(o_ptr))
{
@@ -3397,9 +3391,6 @@ void do_cmd_read_scroll()
/* Combine / Reorder the pack (later) */
p_ptr->notice |= (PN_COMBINE | PN_REORDER);
- /* The item was tried */
- object_tried(o_ptr);
-
/* An identification was made */
if (!object_aware_p(o_ptr))
{
@@ -3564,9 +3555,6 @@ void do_cmd_use_staff()
/* Combine / Reorder the pack (later) */
p_ptr->notice |= (PN_COMBINE | PN_REORDER);
- /* Tried the item */
- object_tried(o_ptr);
-
/* An identification was made */
/* Window stuff */
p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
@@ -3724,9 +3712,6 @@ void do_cmd_aim_wand()
/* Combine / Reorder the pack (later) */
p_ptr->notice |= (PN_COMBINE | PN_REORDER);
- /* Mark it as tried */
- object_tried(o_ptr);
-
/* Identify */
object_aware(o_ptr);
@@ -4213,9 +4198,6 @@ void do_cmd_zap_rod()
/* Combine / Reorder the pack (later) */
p_ptr->notice |= (PN_COMBINE | PN_REORDER);
- /* Tried the object */
- object_tried(o_ptr);
-
/* Identify */
if (!object_aware_p(o_ptr))
{
diff --git a/src/loadsave.cc b/src/loadsave.cc
index a9fa3205..8f8ea0cc 100644
--- a/src/loadsave.cc
+++ b/src/loadsave.cc
@@ -2096,7 +2096,6 @@ static bool do_object_lore(ls_flag_t flag)
do_fixed_map(flag, k_info, do_int,
[](std::shared_ptr<object_kind> k_ptr, auto flag) -> void {
do_bool(&k_ptr->aware, flag);
- do_bool(&k_ptr->tried, flag);
do_bool(&k_ptr->artifact, flag);
}
);
diff --git a/src/object1.cc b/src/object1.cc
index fedc729f..353283c1 100644
--- a/src/object1.cc
+++ b/src/object1.cc
@@ -2005,12 +2005,6 @@ static std::string object_desc_aux(object_type const *o_ptr, int pref, int mode)
inscrip.push_back("empty");
}
- /* Note "tried" if the object has been tested unsuccessfully */
- if (!aware && object_tried_p(o_ptr))
- {
- inscrip.push_back("tried");
- }
-
/* Note the discount, if any */
if ((o_ptr->discount) && o_ptr->inscription.empty())
{
diff --git a/src/object2.cc b/src/object2.cc
index affb4b96..0a31f383 100644
--- a/src/object2.cc
+++ b/src/object2.cc
@@ -767,25 +767,6 @@ bool object_aware_p(object_type const *o_ptr)
/*
- * Something has been "sampled"
- */
-void object_tried(object_type *o_ptr)
-{
- /* Mark it as tried (even if "aware") */
- o_ptr->k_ptr->tried = TRUE;
-}
-
-
-/**
- * Has the given object been "tried"?
- */
-bool object_tried_p(object_type const *o_ptr)
-{
- return o_ptr->k_ptr->tried;
-}
-
-
-/*
* Return the "value" of an "unknown" item
* Make a guess at the value of non-aware items
*/
diff --git a/src/object2.hpp b/src/object2.hpp
index 54ca6a86..3f771594 100644
--- a/src/object2.hpp
+++ b/src/object2.hpp
@@ -42,8 +42,6 @@ void object_known(object_type *o_ptr);
bool object_known_p(object_type const *o_ptr);
void object_aware(object_type *o_ptr);
bool object_aware_p(object_type const *o_ptr);
-void object_tried(object_type *o_ptr);
-bool object_tried_p(object_type const *o_ptr);
s32b object_value(object_type const *o_ptr);
s32b object_value_real(object_type const *o_ptr);
bool_ object_similar(object_type const *o_ptr, object_type const *j_ptr);
diff --git a/src/object_kind.hpp b/src/object_kind.hpp
index 5d04e512..d2619950 100644
--- a/src/object_kind.hpp
+++ b/src/object_kind.hpp
@@ -68,8 +68,6 @@ struct object_kind
bool_ aware = 0; /* The player is "aware" of the item's effects */
- bool_ tried = 0; /* The player has "tried" one of the items */
-
bool_ allow_special = 0;
byte btval = 0; /* Become Object type */