Apply trunk r10309 to 0.5.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10310 c06c8d41-db1a-0410-9941-cceddc491573

2 files changed, 6 insertions, 6 deletions

diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 2736c1c002..89c4656dd9 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -1722,7 +1722,7 @@ int exper_value(const monsters *monster)
     return (x_val);
 }
 
-void mons_load_spells( monsters *mon, mon_spellbook_type book )
+void mons_load_spells(monsters *mon, mon_spellbook_type book)
 {
     mon->load_spells(book);
 }
@@ -8025,10 +8025,10 @@ void monsters::lose_energy(energy_use_type et, int div, int mult)
 static inline monster_type _royal_jelly_ejectable_monster()
 {
     return static_cast<monster_type>(
-        random_choose( MONS_ACID_BLOB,
-                       MONS_AZURE_JELLY,
-                       MONS_DEATH_OOZE,
-                       -1 ) );
+        random_choose(MONS_ACID_BLOB,
+                      MONS_AZURE_JELLY,
+                      MONS_DEATH_OOZE,
+                      -1));
 }
 
 bool monsters::can_drink_potion(potion_type ptype) const
diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h
index b3d3ec32ce..73676956d3 100644
--- a/crawl-ref/source/mon-util.h
+++ b/crawl-ref/source/mon-util.h
@@ -680,7 +680,7 @@ unsigned mons_char(int mc);
 int mons_class_colour(int mc);
 int mons_colour(const monsters *mon);
 
-void mons_load_spells( monsters *mon, mon_spellbook_type book );
+void mons_load_spells(monsters *mon, mon_spellbook_type book);
 
 monster_type random_draconian_monster_species();