summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-info.h
diff options
context:
space:
mode:
authorNeil Moore <neil@s-z.org>2012-06-19 22:51:14 -0400
committerRaphael Langella <raphael.langella@gmail.com>2012-07-04 18:04:09 +0200
commit87c40161cad6ace4f6c2abbc0a8e9696df75ac30 (patch)
treef8bdc11bb06fb9b88ad8a1e81face0a83fb12748 /crawl-ref/source/mon-info.h
parent62cb7de5ac324c4438784bf0454c41373cdc1f69 (diff)
downloadcrawl-ref-87c40161cad6ace4f6c2abbc0a8e9696df75ac30.tar.gz
crawl-ref-87c40161cad6ace4f6c2abbc0a8e9696df75ac30.zip
Use mid rather than mindex for constriction.
actor::constricting is now a pointer to a map from mids to durations; if the actor is not constricting anything, we use a NULL pointer rather than an empty map to save memory. Save compatibility: Because constrictees might be loaded after constrictors (and vice versa), we cannot convert the old constriction arrays (which use mindex) until all the monsters have been loaded. Instead, save the constriction data temporarily, and create the maps at the end of tag_read_level_monsters().
Diffstat (limited to 'crawl-ref/source/mon-info.h')
-rw-r--r--crawl-ref/source/mon-info.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/mon-info.h b/crawl-ref/source/mon-info.h
index e2bc8919d1..31de3d6de6 100644
--- a/crawl-ref/source/mon-info.h
+++ b/crawl-ref/source/mon-info.h
@@ -112,7 +112,7 @@ struct monster_info_base
flight_type fly;
CrawlHashTable props;
std::string constrictor_name;
- std::string constricting_name[MAX_CONSTRICT];
+ std::vector<std::string> constricting_name;
uint32_t client_id;
};