diff options
-rw-r--r-- | crawl-ref/source/libunix.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/monstuff.cc | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/crawl-ref/source/libunix.cc b/crawl-ref/source/libunix.cc index 9dbf1db8e0..133eb70620 100644 --- a/crawl-ref/source/libunix.cc +++ b/crawl-ref/source/libunix.cc @@ -63,7 +63,9 @@ static struct termios game_term; // Its best if curses comes at the end (name conflicts with Solaris). -- bwr #ifndef CURSES_INCLUDE_FILE + #ifndef _XOPEN_SOURCE_EXTENDED #define _XOPEN_SOURCE_EXTENDED + #endif #include <curses.h> #else #include CURSES_INCLUDE_FILE diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 68b4633883..15691a0fcd 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -988,7 +988,10 @@ static bool valid_morph( monsters *monster, int new_mclass ) // but if we ever do have polydemon, these will be needed: || new_mclass == MONS_PLAYER_GHOST || new_mclass == MONS_PANDEMONIUM_DEMON + + // Other poly-unsuitable things || new_mclass == MONS_ROYAL_JELLY + || new_mclass == MONS_ORB_GUARDIAN || new_mclass == MONS_ORANGE_STATUE || new_mclass == MONS_SILVER_STATUE || new_mclass == MONS_ICE_STATUE |