diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-01 23:32:17 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-01 23:32:17 +0000 |
| commit | 24be5339e3c697c6faf7038a7cbeddae0cf92314 (patch) | |
| tree | 2c6c70307ecf9b9996737717fd4bfd852b6057e3 /crawl-ref/source/effects.cc | |
| parent | a6935bcfb6948bdb6d366cfecda141093b8163f3 (diff) | |
| download | crawl-ref-24be5339e3c697c6faf7038a7cbeddae0cf92314.tar.gz crawl-ref-24be5339e3c697c6faf7038a7cbeddae0cf92314.zip | |
Commit a few changes, mostly clean-up.
* Modify tile_show_items setting in tutorial to (hopefully) show corpses
again.
* Change skill_exp_needed to use the level input rather than decreasing
the passed in parameter, esp. when it was mostly called in the form
skill_exp_needed(x + 1) anyway.
I was trying to find out what went wrong in BR 1929156 but I can't
work out the formula. :(
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5421 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/effects.cc')
| -rw-r--r-- | crawl-ref/source/effects.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index 2e9ca80f70..f172544727 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -2699,18 +2699,20 @@ void handle_time( long time_delta ) // off-level. static void catchup_monster_moves(monsters *mon, int turns) { - // Summoned monsters might have disappeared + // Summoned monsters might have disappeared. if (!mon->alive()) return; - // Don't move non-land or stationary monsters around + // Don't move non-land or stationary monsters around. if (mons_habitat( mon ) != HT_LAND + || mons_is_zombified( mon ) + && mons_habitat_by_type(mon->base_monster) != HT_LAND || mons_is_stationary( mon )) { return; } - // Let sleeping monsters lie + // Let sleeping monsters lie. if (mon->behaviour == BEH_SLEEP || mons_is_paralysed(mon)) return; |