summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fineff.cc
diff options
context:
space:
mode:
authorNeil Moore <neil@s-z.org>2013-01-03 21:03:31 -0500
committerNeil Moore <neil@s-z.org>2013-01-03 21:03:31 -0500
commit15c1d7297dfc086c8699cd3633c10d02923bd986 (patch)
tree0b37d36ba7e51e407bff2431b1bc40f85c3c788e /crawl-ref/source/fineff.cc
parent889d248270472f34dd1ba51aedc96cd625b1862a (diff)
downloadcrawl-ref-15c1d7297dfc086c8699cd3633c10d02923bd986.tar.gz
crawl-ref-15c1d7297dfc086c8699cd3633c10d02923bd986.zip
Allow TRJ to spawn jellies on both arena teams.
Diffstat (limited to 'crawl-ref/source/fineff.cc')
-rw-r--r--crawl-ref/source/fineff.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/fineff.cc b/crawl-ref/source/fineff.cc
index 84dc54e19a..83c8aef33b 100644
--- a/crawl-ref/source/fineff.cc
+++ b/crawl-ref/source/fineff.cc
@@ -16,6 +16,7 @@
#include "mon-place.h"
#include "ouch.h"
#include "religion.h"
+#include "state.h"
#include "view.h"
void final_effect::schedule()
@@ -212,7 +213,7 @@ void trj_spawn_fineff::fire()
: BEH_HOSTILE;
// No permanent friendly jellies from an enslaved TRJ.
- if (spawn_beh == BEH_FRIENDLY)
+ if (spawn_beh == BEH_FRIENDLY && !crawl_state.game_is_arena())
return;
int spawned = 0;