diff options
-rw-r--r-- | crawl-ref/source/artefact.cc | 10 | ||||
-rw-r--r-- | crawl-ref/source/decks.cc | 12 | ||||
-rw-r--r-- | crawl-ref/source/describe.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/directn.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/monplace.cc | 12 | ||||
-rw-r--r-- | crawl-ref/source/spl-book.cc | 4 |
6 files changed, 21 insertions, 21 deletions
diff --git a/crawl-ref/source/artefact.cc b/crawl-ref/source/artefact.cc index a1e557b0c9..0d8597433c 100644 --- a/crawl-ref/source/artefact.cc +++ b/crawl-ref/source/artefact.cc @@ -1250,7 +1250,7 @@ static bool _init_artefact_properties(item_def &item) if (!props.exists( ARTEFACT_PROPS_KEY )) props[ARTEFACT_PROPS_KEY].new_vector(SV_SHORT).resize(ART_PROPERTIES); - CrawlVector &rap = props[ARTEFACT_PROPS_KEY]; + CrawlVector &rap = props[ARTEFACT_PROPS_KEY].get_vector(); rap.set_max_size(ART_PROPERTIES); for (vec_size i = 0; i < ART_PROPERTIES; i++) @@ -1901,14 +1901,14 @@ bool make_item_blessed_blade( item_def &item ) ASSERT(!item.props.exists( KNOWN_PROPS_KEY )); item.props[KNOWN_PROPS_KEY].new_vector(SV_BOOL).resize(ART_PROPERTIES); - CrawlVector &known = item.props[KNOWN_PROPS_KEY]; + CrawlVector &known = item.props[KNOWN_PROPS_KEY].get_vector(); known.set_max_size(ART_PROPERTIES); for (vec_size i = 0; i < ART_PROPERTIES; i++) known[i] = (bool) false; ASSERT(!item.props.exists( ARTEFACT_PROPS_KEY )); item.props[ARTEFACT_PROPS_KEY].new_vector(SV_SHORT).resize(ART_PROPERTIES); - CrawlVector &rap = item.props[ARTEFACT_PROPS_KEY]; + CrawlVector &rap = item.props[ARTEFACT_PROPS_KEY].get_vector(); rap.set_max_size(ART_PROPERTIES); for (vec_size i = 0; i < ART_PROPERTIES; i++) rap[i] = (short) 0; @@ -1964,7 +1964,7 @@ bool make_item_randart( item_def &item ) ASSERT(!item.props.exists( ARTEFACT_NAME_KEY )); ASSERT(!item.props.exists( ARTEFACT_APPEAR_KEY )); item.props[KNOWN_PROPS_KEY].new_vector(SV_BOOL).resize(ART_PROPERTIES); - CrawlVector &known = item.props[KNOWN_PROPS_KEY]; + CrawlVector &known = item.props[KNOWN_PROPS_KEY].get_vector(); known.set_max_size(ART_PROPERTIES); for (vec_size i = 0; i < ART_PROPERTIES; i++) known[i] = (bool) false; @@ -2017,7 +2017,7 @@ bool make_item_unrandart( item_def &item, int unrand_index ) if (!item.props.exists( KNOWN_PROPS_KEY )) { item.props[KNOWN_PROPS_KEY].new_vector(SV_BOOL).resize(ART_PROPERTIES); - CrawlVector &known = item.props[KNOWN_PROPS_KEY]; + CrawlVector &known = item.props[KNOWN_PROPS_KEY].get_vector(); known.set_max_size(ART_PROPERTIES); for (vec_size i = 0; i < ART_PROPERTIES; i++) known[i] = (bool) false; diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc index a743dbe952..f067d84a15 100644 --- a/crawl-ref/source/decks.cc +++ b/crawl-ref/source/decks.cc @@ -205,9 +205,9 @@ static void _shuffle_deck(item_def &deck) CrawlHashTable &props = deck.props; ASSERT(props.exists("cards")); - CrawlVector &cards = props["cards"]; + CrawlVector &cards = props["cards"].get_vector(); - CrawlVector &flags = props["card_flags"]; + CrawlVector &flags = props["card_flags"].get_vector(); ASSERT(flags.size() == cards.size()); // Don't use std::shuffle(), since we want to apply exactly the @@ -243,8 +243,8 @@ static void _set_card_and_flags(item_def& deck, int idx, card_type card, unsigned char _flags) { CrawlHashTable &props = deck.props; - CrawlVector &cards = props["cards"]; - CrawlVector &flags = props["card_flags"]; + CrawlVector &cards = props["cards"].get_vector(); + CrawlVector &flags = props["card_flags"].get_vector(); if (idx == -1) idx = static_cast<int>(cards.size()) - 1; @@ -783,7 +783,7 @@ bool deck_peek() mpr("A card falls out of the deck."); } - CrawlVector &cards = deck.props["cards"]; + CrawlVector &cards = deck.props["cards"].get_vector(); const int num_cards = cards.size(); card_type card1, card2; @@ -3195,7 +3195,7 @@ static void _unmark_deck(item_def& deck) if (!props.exists("card_flags")) return; - CrawlVector &flags = props["card_flags"]; + CrawlVector &flags = props["card_flags"].get_vector(); for (unsigned int i = 0; i < flags.size(); ++i) { diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 462320deee..9f78b628d8 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -2106,7 +2106,7 @@ void set_feature_desc_long(const std::string &raw_name, if (!props.exists(LONG_DESC_KEY)) props[LONG_DESC_KEY].new_table(SV_STR); - CrawlHashTable &desc_table = props[LONG_DESC_KEY]; + CrawlHashTable &desc_table = props[LONG_DESC_KEY].get_table(); if (desc.empty()) desc_table.erase(raw_name); diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index b0a162cc62..d119668aae 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -2874,7 +2874,7 @@ void set_feature_desc_short(const std::string &base_name, if (!props.exists(SHORT_DESC_KEY)) props[SHORT_DESC_KEY].new_table(SV_STR); - CrawlHashTable &desc_table = props[SHORT_DESC_KEY]; + CrawlHashTable &desc_table = props[SHORT_DESC_KEY].get_table(); if (_desc.empty()) { diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc index dbe77740de..0d7177be5d 100644 --- a/crawl-ref/source/monplace.cc +++ b/crawl-ref/source/monplace.cc @@ -3382,9 +3382,9 @@ void set_vault_mon_list(const std::vector<mons_spec> &list) props[VAULT_MON_BASES_KEY].new_vector(SV_LONG).resize(size); props[VAULT_MON_WEIGHTS_KEY].new_vector(SV_LONG).resize(size); - CrawlVector &type_vec = props[VAULT_MON_TYPES_KEY]; - CrawlVector &base_vec = props[VAULT_MON_BASES_KEY]; - CrawlVector &weight_vec = props[VAULT_MON_WEIGHTS_KEY]; + CrawlVector &type_vec = props[VAULT_MON_TYPES_KEY].get_vector(); + CrawlVector &base_vec = props[VAULT_MON_BASES_KEY].get_vector(); + CrawlVector &weight_vec = props[VAULT_MON_WEIGHTS_KEY].get_vector(); for (unsigned int i = 0; i < size; i++) { @@ -3422,9 +3422,9 @@ void get_vault_mon_list(std::vector<mons_spec> &list) ASSERT(props.exists(VAULT_MON_BASES_KEY)); ASSERT(props.exists(VAULT_MON_WEIGHTS_KEY)); - CrawlVector &type_vec = props[VAULT_MON_TYPES_KEY]; - CrawlVector &base_vec = props[VAULT_MON_BASES_KEY]; - CrawlVector &weight_vec = props[VAULT_MON_WEIGHTS_KEY]; + CrawlVector &type_vec = props[VAULT_MON_TYPES_KEY].get_vector(); + CrawlVector &base_vec = props[VAULT_MON_BASES_KEY].get_vector(); + CrawlVector &weight_vec = props[VAULT_MON_WEIGHTS_KEY].get_vector(); ASSERT(type_vec.size() == base_vec.size()); ASSERT(type_vec.size() == weight_vec.size()); diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc index c3562ab0aa..0e0fd0ea5b 100644 --- a/crawl-ref/source/spl-book.cc +++ b/crawl-ref/source/spl-book.cc @@ -2363,7 +2363,7 @@ bool make_book_level_randart(item_def &book, int level, int num_spells, props.erase(SPELL_LIST_KEY); props[SPELL_LIST_KEY].new_vector(SV_LONG).resize(SPELLBOOK_SIZE); - CrawlVector &spell_vec = props[SPELL_LIST_KEY]; + CrawlVector &spell_vec = props[SPELL_LIST_KEY].get_vector(); spell_vec.set_max_size(SPELLBOOK_SIZE); for (int i = 0; i < SPELLBOOK_SIZE; i++) @@ -2808,7 +2808,7 @@ bool make_book_theme_randart(item_def &book, int disc1, int disc2, props.erase(SPELL_LIST_KEY); props[SPELL_LIST_KEY].new_vector(SV_LONG).resize(SPELLBOOK_SIZE); - CrawlVector &spell_vec = props[SPELL_LIST_KEY]; + CrawlVector &spell_vec = props[SPELL_LIST_KEY].get_vector(); spell_vec.set_max_size(SPELLBOOK_SIZE); // Count how often each spell school appears in the book. |