diff options
author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-04 06:05:54 +0000 |
---|---|---|
committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-04 06:05:54 +0000 |
commit | 8079104c39087532a85fa9bdee1c7b66ceeb7cee (patch) | |
tree | ed17406c550d00d05ccda35065c645b82ecc0150 | |
parent | 68e4a1302028f7da4be3c1f124f316d316152969 (diff) | |
download | crawl-ref-8079104c39087532a85fa9bdee1c7b66ceeb7cee.tar.gz crawl-ref-8079104c39087532a85fa9bdee1c7b66ceeb7cee.zip |
Fixing compilation warnings.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8198 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r-- | crawl-ref/source/monstuff.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/religion.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 1be1610afb..b7fc6972a3 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -4907,7 +4907,7 @@ static bool _siren_movement_effect(const monsters *monster) else { bool swapping = false; - monsters *mon; + monsters *mon = NULL; if (mgrd(newpos) != NON_MONSTER) { mon = &menv[mgrd(newpos)]; diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index edc80afd2e..36633abd53 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -6979,7 +6979,7 @@ int get_tension(god_type god) // Divides by 1 at level 1, 200 at level 27. const int exp_lev = you.get_experience_level(); const int exp_need = exp_needed(exp_lev + 1); - const int factor = ceil(sqrt(exp_need / 30.0)); + const int factor = (int)ceil(sqrt(exp_need / 30.0)); const int div = 1 + factor; tension /= div; |