From 073ad3584fbf781ce10bef61ad4ff38850282f47 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 21 Jun 2016 13:37:02 +0200 Subject: Rework TR{1,2,3,4,5}_* flags to flag_set<> --- src/init2.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/init2.cc') 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(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 */ -- cgit v1.2.3