summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/ghost.cc4
-rw-r--r--crawl-ref/source/mon-util.cc6
2 files changed, 6 insertions, 4 deletions
diff --git a/crawl-ref/source/ghost.cc b/crawl-ref/source/ghost.cc
index a92e1fa1c2..52fd438f26 100644
--- a/crawl-ref/source/ghost.cc
+++ b/crawl-ref/source/ghost.cc
@@ -387,6 +387,8 @@ void ghost_demon::init_player_ghost()
best_skill_level = you.skills[best_skill];
xl = you.experience_level;
+ fly = mons_class_flies(MONS_PLAYER_GHOST);
+
add_spells();
}
@@ -572,7 +574,7 @@ void ghost_demon::find_extra_ghosts( std::vector<ghost_demon> &gs, int n )
{
// Bingo!
announce_ghost(*menv[i].ghost);
- gs.push_back( *menv[i].ghost );
+ gs.push_back(*menv[i].ghost);
--n;
}
}
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 5cbe5008c8..80fa813597 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -1553,7 +1553,7 @@ flight_type mons_flies(const monsters *mon, bool randarts)
if (mons_enslaved_twisted_soul(mon))
return (FL_LEVITATE);
- if (mon->type == MONS_PANDEMONIUM_DEMON && mon->ghost->fly)
+ if (mon->type == MONS_PLAYER_GHOST || mon->type == MONS_PANDEMONIUM_DEMON)
return (mon->ghost->fly);
const int montype = mons_is_zombified(mon) ? mons_zombie_base(mon)
@@ -3907,8 +3907,8 @@ int monsters::damage_brand(int which_attack)
{
if (type == MONS_PLAYER_GHOST || type == MONS_PANDEMONIUM_DEMON)
return (ghost->brand);
- else
- return (SPWPN_NORMAL);
+
+ return (SPWPN_NORMAL);
}
return (!is_range_weapon(*mweap) ? get_weapon_brand(*mweap) : SPWPN_NORMAL);