diff options
| author | Johanna Ploog <j-p-e-g@users.sourceforge.net> | 2009-12-27 22:01:19 +0100 |
|---|---|---|
| committer | Johanna Ploog <j-p-e-g@users.sourceforge.net> | 2009-12-28 00:37:54 +0100 |
| commit | 64f064aa956cc616ea1f53dda9cad1804ce1ca22 (patch) | |
| tree | ea7cc98b125b653e55b9fa6a4bc522206d92ec6f | |
| parent | d333f654e907b79612b62581f8131d6edaff8191 (diff) | |
| download | crawl-ref-64f064aa956cc616ea1f53dda9cad1804ce1ca22.tar.gz crawl-ref-64f064aa956cc616ea1f53dda9cad1804ce1ca22.zip | |
A few spacing changes.
| -rw-r--r-- | crawl-ref/source/traps.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc index 9083576b6e..b7ca9f2dec 100644 --- a/crawl-ref/source/traps.cc +++ b/crawl-ref/source/traps.cc @@ -686,18 +686,18 @@ int trap_def::max_damage(const actor& act) // players -- this choice prevents traps from easily killing // large monsters fairly deep within the dungeon. if (act.atype() == ACT_MONSTER) - level = 0; + level = 0; switch (this->type) { - case TRAP_NEEDLE: return 0; + case TRAP_NEEDLE: return 0; case TRAP_DART: return 4 + level/2; case TRAP_ARROW: return 7 + level; case TRAP_SPEAR: return 10 + level; case TRAP_BOLT: return 13 + level; case TRAP_AXE: return 15 + level; - default: return 0; - case TRAP_BLADE: return (level ? level*2 : 10) + 28; + case TRAP_BLADE: return (level ? 2*level : 10) + 28; + default: return 0; } return (0); @@ -762,7 +762,7 @@ static bool _disarm_is_deadly(trap_def& trap) if (trap.type == TRAP_NEEDLE && you.res_poison() <= 0) dam += 15; // arbitrary - return you.hp <= dam; + return (you.hp <= dam); } // where *must* point to a valid, discovered trap. |