summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/monplace.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-03-06 23:26:44 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-03-06 23:26:44 +0000
commitbc0e74bb8ed94b852b5e4fa1037ae3d3ab5cd7bc (patch)
tree22b3d34fa437320596edd0e9d6008e390f6eadc5 /crawl-ref/source/monplace.cc
parentedad8f8fa56cd9c67b809597c49af915e7caac2e (diff)
downloadcrawl-ref-bc0e74bb8ed94b852b5e4fa1037ae3d3ab5cd7bc.tar.gz
crawl-ref-bc0e74bb8ed94b852b5e4fa1037ae3d3ab5cd7bc.zip
Fix miscalculation of zombie downgrades (oops).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9361 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monplace.cc')
-rw-r--r--crawl-ref/source/monplace.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc
index 49ed14a834..4922974dbf 100644
--- a/crawl-ref/source/monplace.cc
+++ b/crawl-ref/source/monplace.cc
@@ -1386,13 +1386,13 @@ static void _define_zombie(int mid, monster_type ztype, monster_type cs,
menv[mid].max_hit_points = menv[mid].hit_points;
menv[mid].ac -= 2;
- menv[mid].ac = std::min(0, menv[mid].ac);
+ menv[mid].ac = std::max(0, menv[mid].ac);
menv[mid].ev -= 5;
- menv[mid].ev = std::min(0, menv[mid].ev);
+ menv[mid].ev = std::max(0, menv[mid].ev);
menv[mid].speed -= 2;
- menv[mid].speed = std::min(3, menv[mid].speed);
+ menv[mid].speed = std::max(3, menv[mid].speed);
// Now override type with the required type.
if (cs == MONS_ZOMBIE_SMALL || cs == MONS_ZOMBIE_LARGE)
@@ -1406,10 +1406,10 @@ static void _define_zombie(int mid, monster_type ztype, monster_type cs,
menv[mid].max_hit_points = menv[mid].hit_points;
menv[mid].ac -= 4;
- menv[mid].ac = std::min(0, menv[mid].ac);
+ menv[mid].ac = std::max(0, menv[mid].ac);
menv[mid].ev -= 2;
- menv[mid].ev = std::min(0, menv[mid].ev);
+ menv[mid].ev = std::max(0, menv[mid].ev);
menv[mid].type = ((mons_zombie_size(menv[mid].base_monster) == Z_BIG)
? MONS_SKELETON_LARGE : MONS_SKELETON_SMALL);