diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2015-02-23 09:11:58 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2015-02-23 09:11:58 +0100 |
| commit | 7fce5e3c4d9c6700786828a6b82577fa95499217 (patch) | |
| tree | 95dbe6c406dc4e54dff2897a2e73ae7960f9cb1a /src | |
| parent | 560ebe18ecf165dcfffa2d57870f01f1099be44c (diff) | |
Remove ra_head
Diffstat (limited to 'src')
| -rw-r--r-- | src/externs.h | 1 | ||||
| -rw-r--r-- | src/init1.cc | 2 | ||||
| -rw-r--r-- | src/init2.cc | 8 | ||||
| -rw-r--r-- | src/variable.cc | 1 |
4 files changed, 2 insertions, 10 deletions
diff --git a/src/externs.h b/src/externs.h index 2fd649fe..50fa4777 100644 --- a/src/externs.h +++ b/src/externs.h @@ -326,7 +326,6 @@ extern char *f_text; extern object_kind *k_info; extern artifact_type *a_info; extern ego_item_type *e_info; -extern header *ra_head; extern randart_part_type *ra_info; extern randart_gen_type ra_gen[30]; extern monster_race *r_info; diff --git a/src/init1.cc b/src/init1.cc index d8217499..1d8d30d7 100644 --- a/src/init1.cc +++ b/src/init1.cc @@ -6940,7 +6940,7 @@ errr init_ra_info_txt(FILE *fp, char *buf) if (i < error_idx) return (4); /* Verify information */ - if (i >= ra_head->info_num) return (2); + if (i >= max_ra_idx) return (2); /* Save the index */ error_idx = i; diff --git a/src/init2.cc b/src/init2.cc index 20c9ee9a..afee0538 100644 --- a/src/init2.cc +++ b/src/init2.cc @@ -716,14 +716,8 @@ static errr init_ra_info(void) /* General buffer */ char buf[1024]; - /*** Make the "header" ***/ - ra_head = make_header(max_ra_idx); - - - /*** Make the fake arrays ***/ - /* Allocate the "ra_info" array */ - ra_info = make_array<randart_part_type>(ra_head->info_num); + ra_info = make_array<randart_part_type>(max_ra_idx); /*** Load the ascii template file ***/ diff --git a/src/variable.cc b/src/variable.cc index 17145a1a..36fd2246 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -630,7 +630,6 @@ ego_item_type *e_info; /* * The randart arrays */ -header *ra_head; randart_part_type *ra_info; randart_gen_type ra_gen[30]; |