diff options
Diffstat (limited to 'src/object_type.hpp')
| -rw-r--r-- | src/object_type.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/object_type.hpp b/src/object_type.hpp index 3a34d181..69e8c5df 100644 --- a/src/object_type.hpp +++ b/src/object_type.hpp @@ -1,8 +1,10 @@ #pragma once -#include "h-basic.h" +#include "h-basic.hpp" #include "object_flag_set.hpp" +#include "object_kind_fwd.hpp" +#include <memory> #include <string> /** @@ -34,7 +36,7 @@ */ struct object_type { - s16b k_idx = 0; /* Kind index (zero if "dead") */ + std::shared_ptr<object_kind> k_ptr; byte iy = 0; /* Y-position on map, or zero */ byte ix = 0; /* X-position on map, or zero */ @@ -73,7 +75,7 @@ struct object_type s16b timeout = 0; /* Timeout Counter */ - byte ident = 0; /* Special flags */ + bool identified = false; /* Has the object been identified? */ byte marked = 0; /* Object is marked */ @@ -86,8 +88,6 @@ struct object_type s16b held_m_idx = 0; /* Monster holding the object; if any */ - byte sense = 0; /* Pseudo-id status */ - byte found = 0; /* How did we find it */ s16b found_aux1 = 0; /* Stores info for found */ s16b found_aux2 = 0; /* Stores info for found */ |