summaryrefslogtreecommitdiff
path: root/src/init2.cc
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2016-06-21 13:37:02 +0200
committerBardur Arantsson <bardur@scientician.net>2016-06-21 13:37:02 +0200
commit073ad3584fbf781ce10bef61ad4ff38850282f47 (patch)
treeeb2db284b91ad7987655401406a2d57843337875 /src/init2.cc
parentb9e4f471c2e23283945ba9324912c7e29dd8fbd8 (diff)
Rework TR{1,2,3,4,5}_* flags to flag_set<>
Diffstat (limited to 'src/init2.cc')
-rw-r--r--src/init2.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/init2.cc b/src/init2.cc
index a539a470..678a018c 100644
--- a/src/init2.cc
+++ b/src/init2.cc
@@ -25,6 +25,7 @@
#include "monster_race.hpp"
#include "monster_race_flag.hpp"
#include "monster_type.hpp"
+#include "object_flag.hpp"
#include "object_kind.hpp"
#include "object_type.hpp"
#include "owner_type.hpp"
@@ -390,7 +391,7 @@ namespace {
static void allocate()
{
- ra_info = make_array<randart_part_type>(max_ra_idx);
+ ra_info = new randart_part_type[max_ra_idx];
}
static errr parse(FILE *fp)
@@ -1110,16 +1111,14 @@ static void init_guardians(void)
if (d_ptr->final_artifact)
{
artifact_type *a_ptr = &a_info[d_ptr->final_artifact];
-
- a_ptr->flags4 |= TR4_SPECIAL_GENE;
+ a_ptr->flags |= TR_SPECIAL_GENE;
}
/* Mark the final object */
if (d_ptr->final_object)
{
object_kind *k_ptr = &k_info[d_ptr->final_object];
-
- k_ptr->flags4 |= TR4_SPECIAL_GENE;
+ k_ptr->flags |= TR_SPECIAL_GENE;
}
/* Give randart if there are no final artifacts */