-#include "angband.h"\r
+#include "angband.h"\r
#include "grid.h"\r
#include "generate.h"\r
#include "rooms.h"\r
#include "rooms-pitnest.h"\r
+#include "monsterrace-hook.h"\r
+#include "sort.h"\r
\r
\r
\r
-#define NUM_NEST_MON_TYPE 64 /*!<nest\82Ì\8eí\95Ê\90\94 */\r
+#define NUM_NEST_MON_TYPE 64 /*!<nestの種別数 */\r
\r
-/*! pit/nest\8c^\8fî\95ñ\82Ìtypedef */\r
+/*! pit/nest型情報のtypedef */\r
typedef struct vault_aux_type vault_aux_type;\r
\r
-/*! pit/nest\8c^\8fî\95ñ\82Ì\8d\\91¢\91Ì\92è\8b` */\r
+/*! pit/nest型情報の構造体定義 */\r
struct vault_aux_type\r
{\r
- cptr name;\r
+ concptr name;\r
bool(*hook_func)(MONRACE_IDX r_idx);\r
void(*prep_func)(void);\r
- int level;\r
+ DEPTH level;\r
int chance;\r
};\r
\r
-/*! nest\82ÌID\92è\8b` / Nest types code */\r
+/*! nestのID定義 / Nest types code */\r
#define NEST_TYPE_CLONE 0\r
#define NEST_TYPE_JELLY 1\r
#define NEST_TYPE_SYMBOL_GOOD 2\r
#define NEST_TYPE_CHAPEL 8\r
#define NEST_TYPE_UNDEAD 9\r
\r
-/*! pit\82ÌID\92è\8b` / Pit types code */\r
+/*! pitのID定義 / Pit types code */\r
#define PIT_TYPE_ORC 0\r
#define PIT_TYPE_TROLL 1\r
#define PIT_TYPE_GIANT 2\r
#define PIT_TYPE_DARK_ELF 9\r
\r
\r
-\r
-\r
-\r
-\r
-/*! \92Ê\8fípit\90¶\90¬\8e\9e\82Ì\83\82\83\93\83X\83^\81[\82Ì\8d\\90¬\8fð\8c\8fID / Race index for "monster pit (clone)" */\r
-static int vault_aux_race;\r
-\r
-/*! \92P\88ê\83V\83\93\83{\83\8bpit\90¶\90¬\8e\9e\82Ì\8ew\92è\83V\83\93\83{\83\8b / Race index for "monster pit (symbol clone)" */\r
-static char vault_aux_char;\r
-\r
-/*! \83u\83\8c\83X\91®\90«\82É\8aî\82Ã\82\83h\83\89\83S\83\93pit\90¶\90¬\8e\9e\8fð\8c\8f\83}\83X\83N / Breath mask for "monster pit (dragon)" */\r
-static u32b vault_aux_dragon_mask4;\r
-\r
-\r
-/*!\r
-* @brief \83\82\83\93\83X\83^\81[\82ªVault\90¶\90¬\82Ì\8dÅ\92á\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82©\82ð\95Ô\82· /\r
-* Helper monster selection function\r
-* @param r_idx \8am\94F\82µ\82½\82¢\83\82\83\93\83X\83^\81[\8eí\91°ID\r
-* @return Vault\90¶\90¬\82Ì\8dÅ\92á\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82È\82çTRUE\82ð\95Ô\82·\81B\r
-*/\r
-static bool vault_aux_simple(MONRACE_IDX r_idx)\r
-{\r
- /* Okay */\r
- return (vault_monster_okay(r_idx));\r
-}\r
-\r
-\r
-/*!\r
-* @brief \83\82\83\93\83X\83^\81[\82ª\83[\83\8a\81[nest\82Ì\90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82©\82ð\95Ô\82· /\r
-* Helper function for "monster nest (jelly)"\r
-* @param r_idx \8am\94F\82µ\82½\82¢\83\82\83\93\83X\83^\81[\8eí\91°ID\r
-* @return \90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82È\82çTRUE\82ð\95Ô\82·\81B\r
-*/\r
-static bool vault_aux_jelly(MONRACE_IDX r_idx)\r
-{\r
- monster_race *r_ptr = &r_info[r_idx];\r
-\r
- /* Validate the monster */\r
- if (!vault_monster_okay(r_idx)) return (FALSE);\r
-\r
- if ((r_ptr->flags2 & RF2_KILL_BODY) && !(r_ptr->flags1 & RF1_NEVER_BLOW)) return (FALSE);\r
-\r
- /* Also decline evil jellies (like death molds and shoggoths) */\r
- if (r_ptr->flags3 & (RF3_EVIL)) return (FALSE);\r
-\r
- /* Require icky thing, jelly, mold, or mushroom */\r
- if (!my_strchr("ijm,", r_ptr->d_char)) return (FALSE);\r
-\r
- /* Okay */\r
- return (TRUE);\r
-}\r
-\r
-/*!\r
-* @brief \83\82\83\93\83X\83^\81[\82ª\93®\95¨nest\82Ì\90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82©\82ð\95Ô\82· /\r
-* Helper function for "monster nest (animal)"\r
-* @param r_idx \8am\94F\82µ\82½\82¢\83\82\83\93\83X\83^\81[\8eí\91°ID\r
-* @return \90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82È\82çTRUE\82ð\95Ô\82·\81B\r
-*/\r
-static bool vault_aux_animal(MONRACE_IDX r_idx)\r
-{\r
- monster_race *r_ptr = &r_info[r_idx];\r
-\r
- /* Validate the monster */\r
- if (!vault_monster_okay(r_idx)) return (FALSE);\r
-\r
- /* Require "animal" flag */\r
- if (!(r_ptr->flags3 & (RF3_ANIMAL))) return (FALSE);\r
-\r
- /* Okay */\r
- return (TRUE);\r
-}\r
-\r
-\r
-/*!\r
-* @brief \83\82\83\93\83X\83^\81[\82ª\83A\83\93\83f\83b\83hnest\82Ì\90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82©\82ð\95Ô\82· /\r
-* Helper function for "monster nest (undead)"\r
-* @param r_idx \8am\94F\82µ\82½\82¢\83\82\83\93\83X\83^\81[\8eí\91°ID\r
-* @return \90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82È\82çTRUE\82ð\95Ô\82·\81B\r
-*/\r
-static bool vault_aux_undead(MONRACE_IDX r_idx)\r
-{\r
- monster_race *r_ptr = &r_info[r_idx];\r
-\r
- /* Validate the monster */\r
- if (!vault_monster_okay(r_idx)) return (FALSE);\r
-\r
- /* Require Undead */\r
- if (!(r_ptr->flags3 & (RF3_UNDEAD))) return (FALSE);\r
-\r
- /* Okay */\r
- return (TRUE);\r
-}\r
-\r
-/*!\r
-* @brief \83\82\83\93\83X\83^\81[\82ª\90¹\93°nest\82Ì\90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82©\82ð\95Ô\82· /\r
-* Helper function for "monster nest (chapel)"\r
-* @param r_idx \8am\94F\82µ\82½\82¢\83\82\83\93\83X\83^\81[\8eí\91°ID\r
-* @return \90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82È\82çTRUE\82ð\95Ô\82·\81B\r
-*/\r
-static bool vault_aux_chapel_g(MONRACE_IDX r_idx)\r
-{\r
- static int chapel_list[] = {\r
- MON_NOV_PRIEST, MON_NOV_PALADIN, MON_NOV_PRIEST_G, MON_NOV_PALADIN_G,\r
- MON_PRIEST, MON_JADE_MONK, MON_IVORY_MONK, MON_ULTRA_PALADIN,\r
- MON_EBONY_MONK, MON_W_KNIGHT, MON_KNI_TEMPLAR, MON_PALADIN,\r
- MON_TOPAZ_MONK, 0 };\r
-\r
- int i;\r
-\r
- monster_race *r_ptr = &r_info[r_idx];\r
-\r
- /* Validate the monster */\r
- if (!vault_monster_okay(r_idx)) return (FALSE);\r
-\r
- if (r_ptr->flags3 & (RF3_EVIL)) return (FALSE);\r
- if ((r_idx == MON_A_GOLD) || (r_idx == MON_A_SILVER)) return (FALSE);\r
-\r
- /* Require "priest" or Angel */\r
-\r
- if (r_ptr->d_char == 'A') return TRUE;\r
-\r
- for (i = 0; chapel_list[i]; i++)\r
- if (r_idx == chapel_list[i]) return TRUE;\r
-\r
- return FALSE;\r
-}\r
-\r
-/*!\r
-* @brief \83\82\83\93\83X\83^\81[\82ª\8c¢\8f¬\89®nest\82Ì\90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82©\82ð\95Ô\82· /\r
-* Helper function for "monster nest (kennel)"\r
-* @param r_idx \8am\94F\82µ\82½\82¢\83\82\83\93\83X\83^\81[\8eí\91°ID\r
-* @return \90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82È\82çTRUE\82ð\95Ô\82·\81B\r
-*/\r
-static bool vault_aux_kennel(MONRACE_IDX r_idx)\r
-{\r
- monster_race *r_ptr = &r_info[r_idx];\r
-\r
- /* Validate the monster */\r
- if (!vault_monster_okay(r_idx)) return (FALSE);\r
-\r
- /* Require a Zephyr Hound or a dog */\r
- if (!my_strchr("CZ", r_ptr->d_char)) return (FALSE);\r
-\r
- /* Okay */\r
- return (TRUE);\r
-}\r
-\r
-/*!\r
-* @brief \83\82\83\93\83X\83^\81[\82ª\83~\83~\83b\83Nnest\82Ì\90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82©\82ð\95Ô\82· /\r
-* Helper function for "monster nest (mimic)"\r
-* @param r_idx \8am\94F\82µ\82½\82¢\83\82\83\93\83X\83^\81[\8eí\91°ID\r
-* @return \90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82È\82çTRUE\82ð\95Ô\82·\81B\r
-*/\r
-static bool vault_aux_mimic(MONRACE_IDX r_idx)\r
-{\r
- monster_race *r_ptr = &r_info[r_idx];\r
-\r
- /* Validate the monster */\r
- if (!vault_monster_okay(r_idx)) return (FALSE);\r
-\r
- /* Require mimic */\r
- if (!my_strchr("!$&(/=?[\\|", r_ptr->d_char)) return (FALSE);\r
-\r
- /* Okay */\r
- return (TRUE);\r
-}\r
-\r
-/*!\r
-* @brief \83\82\83\93\83X\83^\81[\82ª\92P\88ê\83N\83\8d\81[\83\93nest\82Ì\90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82©\82ð\95Ô\82· /\r
-* Helper function for "monster nest (clone)"\r
-* @param r_idx \8am\94F\82µ\82½\82¢\83\82\83\93\83X\83^\81[\8eí\91°ID\r
-* @return \90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82È\82çTRUE\82ð\95Ô\82·\81B\r
-*/\r
-static bool vault_aux_clone(MONRACE_IDX r_idx)\r
-{\r
- /* Validate the monster */\r
- if (!vault_monster_okay(r_idx)) return (FALSE);\r
-\r
- return (r_idx == vault_aux_race);\r
-}\r
-\r
-\r
-/*!\r
-* @brief \83\82\83\93\83X\83^\81[\82ª\8e×\88«\91®\90«\83V\83\93\83{\83\8b\83N\83\8d\81[\83\93nest\82Ì\90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82©\82ð\95Ô\82· /\r
-* Helper function for "monster nest (symbol clone)"\r
-* @param r_idx \8am\94F\82µ\82½\82¢\83\82\83\93\83X\83^\81[\8eí\91°ID\r
-* @return \90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82È\82çTRUE\82ð\95Ô\82·\81B\r
-*/\r
-static bool vault_aux_symbol_e(MONRACE_IDX r_idx)\r
-{\r
- monster_race *r_ptr = &r_info[r_idx];\r
-\r
- /* Validate the monster */\r
- if (!vault_monster_okay(r_idx)) return (FALSE);\r
-\r
- if ((r_ptr->flags2 & RF2_KILL_BODY) && !(r_ptr->flags1 & RF1_NEVER_BLOW)) return (FALSE);\r
-\r
- if (r_ptr->flags3 & (RF3_GOOD)) return (FALSE);\r
-\r
- /* Decline incorrect symbol */\r
- if (r_ptr->d_char != vault_aux_char) return (FALSE);\r
-\r
- /* Okay */\r
- return (TRUE);\r
-}\r
-\r
-\r
-/*!\r
-* @brief \83\82\83\93\83X\83^\81[\82ª\91P\97Ç\91®\90«\83V\83\93\83{\83\8b\83N\83\8d\81[\83\93nest\82Ì\90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82©\82ð\95Ô\82· /\r
-* Helper function for "monster nest (symbol clone)"\r
-* @param r_idx \8am\94F\82µ\82½\82¢\83\82\83\93\83X\83^\81[\8eí\91°ID\r
-* @return \90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82È\82çTRUE\82ð\95Ô\82·\81B\r
-*/\r
-static bool vault_aux_symbol_g(MONRACE_IDX r_idx)\r
-{\r
- monster_race *r_ptr = &r_info[r_idx];\r
-\r
- /* Validate the monster */\r
- if (!vault_monster_okay(r_idx)) return (FALSE);\r
-\r
- if ((r_ptr->flags2 & RF2_KILL_BODY) && !(r_ptr->flags1 & RF1_NEVER_BLOW)) return (FALSE);\r
-\r
- if (r_ptr->flags3 & (RF3_EVIL)) return (FALSE);\r
-\r
- /* Decline incorrect symbol */\r
- if (r_ptr->d_char != vault_aux_char) return (FALSE);\r
-\r
- /* Okay */\r
- return (TRUE);\r
-}\r
-\r
-\r
-/*!\r
-* @brief \83\82\83\93\83X\83^\81[\82ª\83I\81[\83Npit\82Ì\90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82©\82ð\95Ô\82· /\r
-* Helper function for "monster pit (orc)"\r
-* @param r_idx \8am\94F\82µ\82½\82¢\83\82\83\93\83X\83^\81[\8eí\91°ID\r
-* @return \90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82È\82çTRUE\82ð\95Ô\82·\81B\r
-*/\r
-static bool vault_aux_orc(MONRACE_IDX r_idx)\r
-{\r
- monster_race *r_ptr = &r_info[r_idx];\r
-\r
- /* Validate the monster */\r
- if (!vault_monster_okay(r_idx)) return (FALSE);\r
-\r
- /* Require orc */\r
- if (!(r_ptr->flags3 & RF3_ORC)) return (FALSE);\r
-\r
- /* Decline undead */\r
- if (r_ptr->flags3 & RF3_UNDEAD) return (FALSE);\r
-\r
- /* Okay */\r
- return (TRUE);\r
-}\r
-\r
-\r
-/*!\r
-* @brief \83\82\83\93\83X\83^\81[\82ª\83g\83\8d\83\8bpit\82Ì\90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82©\82ð\95Ô\82· /\r
-* Helper function for "monster pit (troll)"\r
-* @param r_idx \8am\94F\82µ\82½\82¢\83\82\83\93\83X\83^\81[\8eí\91°ID\r
-* @return \90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82È\82çTRUE\82ð\95Ô\82·\81B\r
-*/\r
-static bool vault_aux_troll(MONRACE_IDX r_idx)\r
-{\r
- monster_race *r_ptr = &r_info[r_idx];\r
-\r
- /* Validate the monster */\r
- if (!vault_monster_okay(r_idx)) return (FALSE);\r
-\r
- /* Require troll */\r
- if (!(r_ptr->flags3 & RF3_TROLL)) return (FALSE);\r
-\r
- /* Decline undead */\r
- if (r_ptr->flags3 & RF3_UNDEAD) return (FALSE);\r
-\r
- /* Okay */\r
- return (TRUE);\r
-}\r
-\r
-\r
-/*!\r
-* @brief \83\82\83\93\83X\83^\81[\82ª\8b\90\90lpit\82Ì\90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82©\82ð\95Ô\82· /\r
-* Helper function for "monster pit (giant)"\r
-* @param r_idx \8am\94F\82µ\82½\82¢\83\82\83\93\83X\83^\81[\8eí\91°ID\r
-* @return \90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82È\82çTRUE\82ð\95Ô\82·\81B\r
-*/\r
-static bool vault_aux_giant(MONRACE_IDX r_idx)\r
-{\r
- monster_race *r_ptr = &r_info[r_idx];\r
-\r
- /* Validate the monster */\r
- if (!vault_monster_okay(r_idx)) return (FALSE);\r
-\r
- /* Require giant */\r
- if (!(r_ptr->flags3 & RF3_GIANT)) return (FALSE);\r
-\r
- if (r_ptr->flags3 & RF3_GOOD) return (FALSE);\r
-\r
- /* Decline undead */\r
- if (r_ptr->flags3 & RF3_UNDEAD) return (FALSE);\r
-\r
- /* Okay */\r
- return (TRUE);\r
-}\r
-\r
-\r
-/*!\r
-* @brief \83\82\83\93\83X\83^\81[\82ª\83h\83\89\83S\83\93pit\82Ì\90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82©\82ð\95Ô\82· /\r
-* Helper function for "monster pit (dragon)"\r
-* @param r_idx \8am\94F\82µ\82½\82¢\83\82\83\93\83X\83^\81[\8eí\91°ID\r
-* @return \90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82È\82çTRUE\82ð\95Ô\82·\81B\r
-*/\r
-static bool vault_aux_dragon(MONRACE_IDX r_idx)\r
-{\r
- monster_race *r_ptr = &r_info[r_idx];\r
-\r
- /* Validate the monster */\r
- if (!vault_monster_okay(r_idx)) return (FALSE);\r
-\r
- /* Require dragon */\r
- if (!(r_ptr->flags3 & RF3_DRAGON)) return (FALSE);\r
-\r
- /* Hack -- Require correct "breath attack" */\r
- if (r_ptr->flags4 != vault_aux_dragon_mask4) return (FALSE);\r
-\r
- /* Decline undead */\r
- if (r_ptr->flags3 & RF3_UNDEAD) return (FALSE);\r
-\r
- /* Okay */\r
- return (TRUE);\r
-}\r
-\r
-\r
-/*!\r
-* @brief \83\82\83\93\83X\83^\81[\82ª\88«\96\82pit\82Ì\90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82©\82ð\95Ô\82· /\r
-* Helper function for "monster pit (demon)"\r
-* @param r_idx \8am\94F\82µ\82½\82¢\83\82\83\93\83X\83^\81[\8eí\91°ID\r
-* @return \90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82È\82çTRUE\82ð\95Ô\82·\81B\r
-*/\r
-static bool vault_aux_demon(MONRACE_IDX r_idx)\r
-{\r
- monster_race *r_ptr = &r_info[r_idx];\r
-\r
- /* Validate the monster */\r
- if (!vault_monster_okay(r_idx)) return (FALSE);\r
-\r
- if ((r_ptr->flags2 & RF2_KILL_BODY) && !(r_ptr->flags1 & RF1_NEVER_BLOW)) return (FALSE);\r
-\r
- /* Require demon */\r
- if (!(r_ptr->flags3 & RF3_DEMON)) return (FALSE);\r
-\r
- /* Okay */\r
- return (TRUE);\r
-}\r
-\r
-\r
-/*!\r
-* @brief \83\82\83\93\83X\83^\81[\82ª\8b¶\8bCpit\82Ì\90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82©\82ð\95Ô\82· /\r
-* Helper function for "monster pit (lovecraftian)"\r
-* @param r_idx \8am\94F\82µ\82½\82¢\83\82\83\93\83X\83^\81[\8eí\91°ID\r
-* @return \90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82È\82çTRUE\82ð\95Ô\82·\81B\r
-*/\r
-static bool vault_aux_cthulhu(MONRACE_IDX r_idx)\r
-{\r
- monster_race *r_ptr = &r_info[r_idx];\r
-\r
- /* Validate the monster */\r
- if (!vault_monster_okay(r_idx)) return (FALSE);\r
-\r
- if ((r_ptr->flags2 & RF2_KILL_BODY) && !(r_ptr->flags1 & RF1_NEVER_BLOW)) return (FALSE);\r
-\r
- /* Require eldritch horror */\r
- if (!(r_ptr->flags2 & (RF2_ELDRITCH_HORROR))) return (FALSE);\r
-\r
- /* Okay */\r
- return (TRUE);\r
-}\r
-\r
-\r
/*!\r
-* @brief pit/nest\82Ì\8aî\8f\80\82Æ\82È\82é\92P\8eí\83\82\83\93\83X\83^\81[\82ð\8c\88\82ß\82é /\r
-* @return \82È\82µ\r
+* @brief ダンジョン毎に指定されたピット配列を基準にランダムなpit/nestタイプを決める\r
+* @param l_ptr 選択されたpit/nest情報を返す参照ポインタ\r
+* @param allow_flag_mask 生成が許されるpit/nestのビット配列\r
+* @return 選択されたpit/nestのID、選択失敗した場合-1を返す。\r
*/\r
-static void vault_prep_clone(void)\r
-{\r
- /* Apply the monster restriction */\r
- get_mon_num_prep(vault_aux_simple, NULL);\r
-\r
- /* Pick a race to clone */\r
- vault_aux_race = get_mon_num(dun_level + 10);\r
-\r
- /* Remove the monster restriction */\r
- get_mon_num_prep(NULL, NULL);\r
-}\r
-\r
-\r
-/*!\r
-* @brief pit/nest\82Ì\8aî\8f\80\82Æ\82È\82é\83\82\83\93\83X\83^\81[\83V\83\93\83{\83\8b\82ð\8c\88\82ß\82é /\r
-* @return \82È\82µ\r
-*/\r
-static void vault_prep_symbol(void)\r
-{\r
- MONRACE_IDX r_idx;\r
-\r
- /* Apply the monster restriction */\r
- get_mon_num_prep(vault_aux_simple, NULL);\r
-\r
- /* Pick a race to clone */\r
- r_idx = get_mon_num(dun_level + 10);\r
-\r
- /* Remove the monster restriction */\r
- get_mon_num_prep(NULL, NULL);\r
-\r
- /* Extract the symbol */\r
- vault_aux_char = r_info[r_idx].d_char;\r
-}\r
-\r
-/*!\r
-* @brief pit/nest\82Ì\8aî\8f\80\82Æ\82È\82é\83h\83\89\83S\83\93\82Ì\8eí\97Þ\82ð\8c\88\82ß\82é /\r
-* @return \82È\82µ\r
-*/\r
-static void vault_prep_dragon(void)\r
-{\r
- /* Pick dragon type */\r
- switch (randint0(6))\r
- {\r
- /* Black */\r
- case 0:\r
- {\r
- /* Restrict dragon breath type */\r
- vault_aux_dragon_mask4 = RF4_BR_ACID;\r
-\r
- /* Done */\r
- break;\r
- }\r
-\r
- /* Blue */\r
- case 1:\r
- {\r
- /* Restrict dragon breath type */\r
- vault_aux_dragon_mask4 = RF4_BR_ELEC;\r
-\r
- /* Done */\r
- break;\r
- }\r
-\r
- /* Red */\r
- case 2:\r
- {\r
- /* Restrict dragon breath type */\r
- vault_aux_dragon_mask4 = RF4_BR_FIRE;\r
-\r
- /* Done */\r
- break;\r
- }\r
-\r
- /* White */\r
- case 3:\r
- {\r
- /* Restrict dragon breath type */\r
- vault_aux_dragon_mask4 = RF4_BR_COLD;\r
-\r
- /* Done */\r
- break;\r
- }\r
-\r
- /* Green */\r
- case 4:\r
- {\r
- /* Restrict dragon breath type */\r
- vault_aux_dragon_mask4 = RF4_BR_POIS;\r
-\r
- /* Done */\r
- break;\r
- }\r
-\r
- /* Multi-hued */\r
- default:\r
- {\r
- /* Restrict dragon breath type */\r
- vault_aux_dragon_mask4 = (RF4_BR_ACID | RF4_BR_ELEC |\r
- RF4_BR_FIRE | RF4_BR_COLD |\r
- RF4_BR_POIS);\r
-\r
- /* Done */\r
- break;\r
- }\r
- }\r
-}\r
-\r
-\r
-/*!\r
-* @brief \83\82\83\93\83X\83^\81[\82ª\83_\81[\83N\83G\83\8b\83tpit\82Ì\90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82©\82ð\95Ô\82· /\r
-* Helper function for "monster pit (dark elf)"\r
-* @param r_idx \8am\94F\82µ\82½\82¢\83\82\83\93\83X\83^\81[\8eí\91°ID\r
-* @return \90¶\90¬\95K\97v\8fð\8c\8f\82ð\96\9e\82½\82µ\82Ä\82¢\82é\82È\82çTRUE\82ð\95Ô\82·\81B\r
-*/\r
-static bool vault_aux_dark_elf(MONRACE_IDX r_idx)\r
-{\r
- int i;\r
- static int dark_elf_list[] =\r
- {\r
- MON_D_ELF, MON_D_ELF_MAGE, MON_D_ELF_WARRIOR, MON_D_ELF_PRIEST,\r
- MON_D_ELF_LORD, MON_D_ELF_WARLOCK, MON_D_ELF_DRUID, MON_NIGHTBLADE,\r
- MON_D_ELF_SORC, MON_D_ELF_SHADE, 0,\r
- };\r
-\r
- /* Validate the monster */\r
- if (!vault_monster_okay(r_idx)) return FALSE;\r
-\r
- /* Require dark elves */\r
- for (i = 0; dark_elf_list[i]; i++)\r
- if (r_idx == dark_elf_list[i]) return TRUE;\r
-\r
- /* Assume not */\r
- return FALSE;\r
-}\r
-\r
-\r
-/*!\r
-* @brief \83_\83\93\83W\83\87\83\93\96\88\82É\8ew\92è\82³\82ê\82½\83s\83b\83g\94z\97ñ\82ð\8aî\8f\80\82É\83\89\83\93\83_\83\80\82Èpit/nest\83^\83C\83v\82ð\8c\88\82ß\82é\r
-* @param l_ptr \91I\91ð\82³\82ê\82½pit/nest\8fî\95ñ\82ð\95Ô\82·\8eQ\8fÆ\83|\83C\83\93\83^\r
-* @param allow_flag_mask \90¶\90¬\82ª\8b\96\82³\82ê\82épit/nest\82Ì\83r\83b\83g\94z\97ñ\r
-* @return \91I\91ð\82³\82ê\82½pit/nest\82ÌID\81A\91I\91ð\8e¸\94s\82µ\82½\8fê\8d\87-1\82ð\95Ô\82·\81B\r
-*/\r
-static int pick_vault_type(vault_aux_type *l_ptr, s16b allow_flag_mask)\r
+static int pick_vault_type(vault_aux_type *l_ptr, BIT_FLAGS16 allow_flag_mask)\r
{\r
int tmp, total, count;\r
\r
}\r
\r
/*!\r
-* @brief \83f\83o\83b\83O\8e\9e\82É\90¶\90¬\82³\82ê\82½pit/nest\82Ì\8c^\82ð\8fo\97Í\82·\82é\8f\88\97\9d\r
-* @param type pit/nest\82Ì\8c^ID\r
-* @param nest TRUE\82È\82ç\82Înest\81AFALSE\82È\82ç\82Îpit\r
-* @return \83f\83o\83b\83O\95\\8e¦\95¶\8e\9a\97ñ\82Ì\8eQ\8fÆ\83|\83C\83\93\83^\r
+* @brief デバッグ時に生成されたpit/nestの型を出力する処理\r
+* @param type pit/nestの型ID\r
+* @param nest TRUEならばnest、FALSEならばpit\r
+* @return デバッグ表示文字列の参照ポインタ\r
* @details\r
* Hack -- Get the string describing subtype of pit/nest\r
* Determined in prepare function (some pit/nest only)\r
*/\r
-static cptr pit_subtype_string(int type, bool nest)\r
+static concptr pit_subtype_string(int type, bool nest)\r
{\r
static char inner_buf[256] = "";\r
\r
case PIT_TYPE_DRAGON:\r
switch (vault_aux_dragon_mask4)\r
{\r
-#ifdef JP\r
- case RF4_BR_ACID: strcpy(inner_buf, "(\8e_)"); break;\r
- case RF4_BR_ELEC: strcpy(inner_buf, "(\88î\8dÈ)"); break;\r
- case RF4_BR_FIRE: strcpy(inner_buf, "(\89Î\89\8a)"); break;\r
- case RF4_BR_COLD: strcpy(inner_buf, "(\97â\8bC)"); break;\r
- case RF4_BR_POIS: strcpy(inner_buf, "(\93Å)"); break;\r
+ case RF4_BR_ACID: strcpy(inner_buf, _("(酸)", "(acid)")); break;\r
+ case RF4_BR_ELEC: strcpy(inner_buf, _("(稲妻)", "(lightning)")); break;\r
+ case RF4_BR_FIRE: strcpy(inner_buf, _("(火炎)", "(fire)")); break;\r
+ case RF4_BR_COLD: strcpy(inner_buf, _("(冷気)", "(frost)")); break;\r
+ case RF4_BR_POIS: strcpy(inner_buf, _("(毒)", "(poison)")); break;\r
case (RF4_BR_ACID | RF4_BR_ELEC | RF4_BR_FIRE | RF4_BR_COLD | RF4_BR_POIS) :\r
- strcpy(inner_buf, "(\96\9c\90F)"); break;\r
- default: strcpy(inner_buf, "(\96¢\92è\8b`)"); break;\r
-#else\r
- case RF4_BR_ACID: strcpy(inner_buf, "(acid)"); break;\r
- case RF4_BR_ELEC: strcpy(inner_buf, "(lightning)"); break;\r
- case RF4_BR_FIRE: strcpy(inner_buf, "(fire)"); break;\r
- case RF4_BR_COLD: strcpy(inner_buf, "(frost)"); break;\r
- case RF4_BR_POIS: strcpy(inner_buf, "(poison)"); break;\r
- case (RF4_BR_ACID | RF4_BR_ELEC | RF4_BR_FIRE | RF4_BR_COLD | RF4_BR_POIS) :\r
- strcpy(inner_buf, "(multi-hued)"); break;\r
- default: strcpy(inner_buf, "(undefined)"); break;\r
-#endif\r
+ strcpy(inner_buf, _("(万色)", "(multi-hued)")); break;\r
+ default: strcpy(inner_buf, _("(未定義)", "(undefined)")); break;\r
}\r
break;\r
}\r
return inner_buf;\r
}\r
\r
-\r
-\r
-\r
-\r
/*\r
-*! @brief nest\82Ì\83\82\83\93\83X\83^\81[\83\8a\83X\83g\82ð\83\\81[\83g\82·\82é\82½\82ß\82Ì\8aÖ\90\94 /\r
+*! @brief nestのモンスターリストをソートするための関数 /\r
* Comp function for sorting nest monster information\r
-* @param u \83\\81[\83g\8f\88\97\9d\91Î\8fÛ\94z\97ñ\83|\83C\83\93\83^\r
-* @param v \96¢\8eg\97p\r
-* @param a \94ä\8ar\91Î\8fÛ\8eQ\8fÆID1\r
-* @param b \94ä\8ar\91Î\8fÛ\8eQ\8fÆID2\r
+* @param u ソート処理対象配列ポインタ\r
+* @param v 未使用\r
+* @param a 比較対象参照ID1\r
+* @param b 比較対象参照ID2\r
*/\r
static bool ang_sort_comp_nest_mon_info(vptr u, vptr v, int a, int b)\r
{\r
nest_mon_info_type *nest_mon_info = (nest_mon_info_type *)u;\r
- int w1 = nest_mon_info[a].r_idx;\r
- int w2 = nest_mon_info[b].r_idx;\r
+ MONSTER_IDX w1 = nest_mon_info[a].r_idx;\r
+ MONSTER_IDX w2 = nest_mon_info[b].r_idx;\r
monster_race *r1_ptr = &r_info[w1];\r
monster_race *r2_ptr = &r_info[w2];\r
int z1, z2;\r
}\r
\r
/*!\r
-* @brief nest\82Ì\83\82\83\93\83X\83^\81[\83\8a\83X\83g\82ð\83X\83\8f\83b\83v\82·\82é\82½\82ß\82Ì\8aÖ\90\94 /\r
+* @brief nestのモンスターリストをスワップするための関数 /\r
* Swap function for sorting nest monster information\r
-* @param u \83X\83\8f\83b\83v\8f\88\97\9d\91Î\8fÛ\94z\97ñ\83|\83C\83\93\83^\r
-* @param v \96¢\8eg\97p\r
-* @param a \83X\83\8f\83b\83v\91Î\8fÛ\8eQ\8fÆID1\r
-* @param b \83X\83\8f\83b\83v\91Î\8fÛ\8eQ\8fÆID2\r
+* @param u スワップ処理対象配列ポインタ\r
+* @param v 未使用\r
+* @param a スワップ対象参照ID1\r
+* @param b スワップ対象参照ID2\r
*/\r
static void ang_sort_swap_nest_mon_info(vptr u, vptr v, int a, int b)\r
{\r
\r
\r
\r
-/*!nest\8fî\95ñ\83e\81[\83u\83\8b*/\r
+/*!nest情報テーブル*/\r
static vault_aux_type nest_types[] =\r
{\r
-#ifdef JP\r
-{ "\83N\83\8d\81[\83\93", vault_aux_clone, vault_prep_clone, 5, 3 },\r
-{ "\83[\83\8a\81[", vault_aux_jelly, NULL, 5, 6 },\r
-{ "\83V\83\93\83{\83\8b(\91P)", vault_aux_symbol_g, vault_prep_symbol, 25, 2 },\r
-{ "\83V\83\93\83{\83\8b(\88«)", vault_aux_symbol_e, vault_prep_symbol, 25, 2 },\r
-{ "\83~\83~\83b\83N", vault_aux_mimic, NULL, 30, 4 },\r
-{ "\8b¶\8bC", vault_aux_cthulhu, NULL, 70, 2 },\r
-{ "\8c¢\8f¬\89®", vault_aux_kennel, NULL, 45, 4 },\r
-{ "\93®\95¨\89\80", vault_aux_animal, NULL, 35, 5 },\r
-{ "\8b³\89ï", vault_aux_chapel_g, NULL, 75, 4 },\r
-{ "\83A\83\93\83f\83b\83h", vault_aux_undead, NULL, 75, 5 },\r
-{ NULL, NULL, NULL, 0, 0 },\r
-#else\r
-{ "clone", vault_aux_clone, vault_prep_clone, 5, 3 },\r
-{ "jelly", vault_aux_jelly, NULL, 5, 6 },\r
-{ "symbol good", vault_aux_symbol_g, vault_prep_symbol, 25, 2 },\r
-{ "symbol evil", vault_aux_symbol_e, vault_prep_symbol, 25, 2 },\r
-{ "mimic", vault_aux_mimic, NULL, 30, 4 },\r
-{ "lovecraftian", vault_aux_cthulhu, NULL, 70, 2 },\r
-{ "kennel", vault_aux_kennel, NULL, 45, 4 },\r
-{ "animal", vault_aux_animal, NULL, 35, 5 },\r
-{ "chapel", vault_aux_chapel_g, NULL, 75, 4 },\r
-{ "undead", vault_aux_undead, NULL, 75, 5 },\r
-{ NULL, NULL, NULL, 0, 0 },\r
-#endif\r
+ { _("クローン", "clone"), vault_aux_clone, vault_prep_clone, 5, 3 },\r
+ { _("ゼリー", "jelly"), vault_aux_jelly, NULL, 5, 6 },\r
+ { _("シンボル(善)", "symbol good"), vault_aux_symbol_g, vault_prep_symbol, 25, 2 },\r
+ { _("シンボル(悪)", "symbol evil"), vault_aux_symbol_e, vault_prep_symbol, 25, 2 },\r
+ { _("ミミック", "mimic"), vault_aux_mimic, NULL, 30, 4 },\r
+ { _("狂気", "lovecraftian"), vault_aux_cthulhu, NULL, 70, 2 },\r
+ { _("犬小屋", "kennel"), vault_aux_kennel, NULL, 45, 4 },\r
+ { _("動物園", "animal"), vault_aux_animal, NULL, 35, 5 },\r
+ { _("教会", "chapel"), vault_aux_chapel_g, NULL, 75, 4 },\r
+ { _("アンデッド", "undead"), vault_aux_undead, NULL, 75, 5 },\r
+ { NULL, NULL, NULL, 0, 0 },\r
};\r
\r
-/*!pit\8fî\95ñ\83e\81[\83u\83\8b*/\r
+/*!pit情報テーブル*/\r
static vault_aux_type pit_types[] =\r
{\r
-#ifdef JP\r
-{ "\83I\81[\83N", vault_aux_orc, NULL, 5, 6 },\r
-{ "\83g\83\8d\83\8b", vault_aux_troll, NULL, 20, 6 },\r
-{ "\83W\83\83\83C\83A\83\93\83g", vault_aux_giant, NULL, 50, 6 },\r
-{ "\8b¶\8bC", vault_aux_cthulhu, NULL, 80, 2 },\r
-{ "\83V\83\93\83{\83\8b(\91P)", vault_aux_symbol_g, vault_prep_symbol, 70, 1 },\r
-{ "\83V\83\93\83{\83\8b(\88«)", vault_aux_symbol_e, vault_prep_symbol, 70, 1 },\r
-{ "\8b³\89ï", vault_aux_chapel_g, NULL, 65, 2 },\r
-{ "\83h\83\89\83S\83\93", vault_aux_dragon, vault_prep_dragon, 70, 6 },\r
-{ "\83f\81[\83\82\83\93", vault_aux_demon, NULL, 80, 6 },\r
-{ "\83_\81[\83N\83G\83\8b\83t", vault_aux_dark_elf, NULL, 45, 4 },\r
-{ NULL, NULL, NULL, 0, 0 },\r
-#else\r
-{ "orc", vault_aux_orc, NULL, 5, 6 },\r
-{ "troll", vault_aux_troll, NULL, 20, 6 },\r
-{ "giant", vault_aux_giant, NULL, 50, 6 },\r
-{ "lovecraftian", vault_aux_cthulhu, NULL, 80, 2 },\r
-{ "symbol good", vault_aux_symbol_g, vault_prep_symbol, 70, 1 },\r
-{ "symbol evil", vault_aux_symbol_e, vault_prep_symbol, 70, 1 },\r
-{ "chapel", vault_aux_chapel_g, NULL, 65, 2 },\r
-{ "dragon", vault_aux_dragon, vault_prep_dragon, 70, 6 },\r
-{ "demon", vault_aux_demon, NULL, 80, 6 },\r
-{ "dark elf", vault_aux_dark_elf, NULL, 45, 4 },\r
-{ NULL, NULL, NULL, 0, 0 },\r
-#endif\r
+ { _("オーク", "orc"), vault_aux_orc, NULL, 5, 6 },\r
+ { _("トロル", "troll"), vault_aux_troll, NULL, 20, 6 },\r
+ { _("ジャイアント", "giant"), vault_aux_giant, NULL, 50, 6 },\r
+ { _("狂気", "lovecraftian"), vault_aux_cthulhu, NULL, 80, 2 },\r
+ { _("シンボル(善)", "symbol good"), vault_aux_symbol_g, vault_prep_symbol, 70, 1 },\r
+ { _("シンボル(悪)", "symbol evil"), vault_aux_symbol_e, vault_prep_symbol, 70, 1 },\r
+ { _("教会", "chapel"), vault_aux_chapel_g, NULL, 65, 2 },\r
+ { _("ドラゴン", "dragon"), vault_aux_dragon, vault_prep_dragon, 70, 6 },\r
+ { _("デーモン", "demon"), vault_aux_demon, NULL, 80, 6 },\r
+ { _("ダークエルフ", "dark elf"), vault_aux_dark_elf, NULL, 45, 4 },\r
+ { NULL, NULL, NULL, 0, 0 },\r
};\r
\r
\r
\r
\r
/*!\r
-* @brief \83^\83C\83v5\82Ì\95\94\89®\81cnest\82ð\90¶\90¬\82·\82é / Type 5 -- Monster nests\r
-* @return \82È\82µ\r
+* @brief タイプ5の部屋…nestを生成する / Type 5 -- Monster nests\r
+* @return なし\r
* @details\r
* A monster nest is a "big" room, with an "inner" room, containing\n\r
* a "collection" of monsters of a given type strewn about the room.\n\r
\r
/* Process a preparation function if necessary */\r
if (n_ptr->prep_func) (*(n_ptr->prep_func))();\r
-\r
- /* Prepare allocation table */\r
get_mon_num_prep(n_ptr->hook_func, NULL);\r
\r
align.sub_align = SUB_ALIGN_NEUTRAL;\r
case 4: place_secret_door(yval, x2 + 1, DOOR_DEFAULT); break;\r
}\r
\r
- msg_format_wizard(CHEAT_DUNGEON, _("\83\82\83\93\83X\83^\81[\95\94\89®(nest)(%s%s)\82ð\90¶\90¬\82µ\82Ü\82·\81B", "Monster nest (%s%s)"), n_ptr->name, pit_subtype_string(cur_nest_type, TRUE));\r
+ msg_format_wizard(CHEAT_DUNGEON, _("モンスター部屋(nest)(%s%s)を生成します。", "Monster nest (%s%s)"), n_ptr->name, pit_subtype_string(cur_nest_type, TRUE));\r
\r
/* Place some monsters */\r
for (y = yval - 2; y <= yval + 2; y++)\r
if (nest_mon_info[i].r_idx != nest_mon_info[i + 1].r_idx) break;\r
if (!nest_mon_info[i + 1].used) break;\r
}\r
- msg_format_wizard(CHEAT_DUNGEON, "Nest\8d\\90¬\83\82\83\93\83X\83^\81[No.%d:%s", i, r_name + r_info[nest_mon_info[i].r_idx].name);\r
+ msg_format_wizard(CHEAT_DUNGEON, "Nest構成モンスターNo.%d:%s", i, r_name + r_info[nest_mon_info[i].r_idx].name);\r
}\r
}\r
\r
\r
\r
/*!\r
-* @brief \83^\83C\83v6\82Ì\95\94\89®\81cpit\82ð\90¶\90¬\82·\82é / Type 6 -- Monster pits\r
-* @return \82È\82µ\r
+* @brief タイプ6の部屋…pitを生成する / Type 6 -- Monster pits\r
+* @return なし\r
* @details\r
* A monster pit is a "big" room, with an "inner" room, containing\n\r
* a "collection" of monsters of a given type organized in the room.\n\r
\r
/* Process a preparation function if necessary */\r
if (n_ptr->prep_func) (*(n_ptr->prep_func))();\r
-\r
- /* Prepare allocation table */\r
get_mon_num_prep(n_ptr->hook_func, NULL);\r
\r
align.sub_align = SUB_ALIGN_NEUTRAL;\r
}\r
}\r
\r
- msg_format_wizard(CHEAT_DUNGEON, _("\83\82\83\93\83X\83^\81[\95\94\89®(pit)(%s%s)\82ð\90¶\90¬\82µ\82Ü\82·\81B", "Monster pit (%s%s)"), n_ptr->name, pit_subtype_string(cur_pit_type, FALSE));\r
+ msg_format_wizard(CHEAT_DUNGEON, _("モンスター部屋(pit)(%s%s)を生成します。", "Monster pit (%s%s)"), n_ptr->name, pit_subtype_string(cur_pit_type, FALSE));\r
\r
/* Select the entries */\r
for (i = 0; i < 8; i++)\r
{\r
/* Every other entry */\r
what[i] = what[i * 2];\r
- msg_format_wizard(CHEAT_DUNGEON, _("Nest\8d\\90¬\83\82\83\93\83X\83^\81[\91I\91ðNo.%d:%s", "Nest Monster Select No.%d:%s"), i, r_name + r_info[what[i]].name);\r
+ msg_format_wizard(CHEAT_DUNGEON, _("Nest構成モンスター選択No.%d:%s", "Nest Monster Select No.%d:%s"), i, r_name + r_info[what[i]].name);\r
}\r
\r
/* Top and bottom rows */\r
{\r
monster_race *r_ptr = &r_info[r_idx];\r
\r
- /* Validate the monster */\r
if (!vault_monster_okay(r_idx)) return (FALSE);\r
\r
/* No wall passing monster */\r
if (r_ptr->flags2 & (RF2_PASS_WALL | RF2_KILL_WALL)) return (FALSE);\r
\r
- /* Okay */\r
return (TRUE);\r
}\r
\r
\r
/*!\r
-* @brief \83^\83C\83v13\82Ì\95\94\89®\81c\83g\83\89\83b\83vpit\82Ì\90¶\90¬ / Type 13 -- Trapped monster pits\r
-* @return \82È\82µ\r
+* @brief タイプ13の部屋…トラップpitの生成 / Type 13 -- Trapped monster pits\r
+* @return なし\r
* @details\r
* A trapped monster pit is a "big" room with a straight corridor in\n\r
* which wall opening traps are placed, and with two "inner" rooms\n\r
\r
/* Process a preparation function if necessary */\r
if (n_ptr->prep_func) (*(n_ptr->prep_func))();\r
-\r
- /* Prepare allocation table */\r
get_mon_num_prep(n_ptr->hook_func, vault_aux_trapped_pit);\r
\r
align.sub_align = SUB_ALIGN_NEUTRAL;\r
}\r
}\r
\r
- msg_format_wizard(CHEAT_DUNGEON, _("%s%s\82Ìã©\83s\83b\83g\82ª\90¶\90¬\82³\82ê\82Ü\82µ\82½\81B", "Trapped monster pit (%s%s)"),\r
+ msg_format_wizard(CHEAT_DUNGEON, _("%s%sの罠ピットが生成されました。", "Trapped monster pit (%s%s)"),\r
n_ptr->name, pit_subtype_string(cur_pit_type, FALSE));\r
\r
/* Select the entries */\r
\r
if (cheat_hear)\r
{\r
- /* Message */\r
msg_print(r_name + r_info[what[i]].name);\r
}\r
}\r