summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tags.cc
diff options
context:
space:
mode:
authorNeil Moore <neil@s-z.org>2014-07-26 22:55:35 -0400
committerNeil Moore <neil@s-z.org>2014-07-26 22:55:35 -0400
commit421ad785ff4df1a8811fd9fd3ef56f1ab6d429e9 (patch)
treeaf029e0d02b9a5265f6699234d527506461b31c6 /crawl-ref/source/tags.cc
parentebbff481bc02d783952a9eebd4f051b95f40f2c5 (diff)
downloadcrawl-ref-421ad785ff4df1a8811fd9fd3ef56f1ab6d429e9.tar.gz
crawl-ref-421ad785ff4df1a8811fd9fd3ef56f1ab6d429e9.zip
Remove base max MP adjustment.
Only the 2 MP tutorial bonus used it; combine that with the max MP decrease from self-restoration and device recharging.
Diffstat (limited to 'crawl-ref/source/tags.cc')
-rw-r--r--crawl-ref/source/tags.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc
index d1163e6659..13d4e6b30c 100644
--- a/crawl-ref/source/tags.cc
+++ b/crawl-ref/source/tags.cc
@@ -1343,7 +1343,6 @@ static void tag_construct_you(writer &th)
marshallShort(th, you.hp_max_adj_temp);
marshallShort(th, you.hp_max_adj_perm);
marshallShort(th, you.mp_max_adj);
- marshallShort(th, you.mp_max_adj_base);
marshallShort(th, you.pos().x);
marshallShort(th, you.pos().y);
@@ -2217,8 +2216,12 @@ static void tag_read_you(reader &th)
you.hp_max_adj_temp = unmarshallShort(th);
you.hp_max_adj_perm = unmarshallShort(th);
you.mp_max_adj = unmarshallShort(th);
- you.mp_max_adj_base = unmarshallShort(th);
#if TAG_MAJOR_VERSION == 34
+ if (th.getMinorVersion() < TAG_MINOR_REMOVE_BASE_MP)
+ {
+ int baseadj = unmarshallShort(th);
+ you.mp_max_adj += baseadj;
+ }
if (th.getMinorVersion() < TAG_MINOR_CLASS_HP_0)
you.hp_max_adj_perm -= 8;
#endif