#ifdef JP
#undef strchr
-char* _strchr(char* ptr, char ch)
+static char *_strchr(const char *ptr, char ch)
{
- int k_flag = 0;
-
- for ( ; *ptr != '\0'; ++ptr)
- if (k_flag == 0) {
- if (*ptr == ch)
- return ptr;
- if (iskanji(*ptr))
- k_flag = 1;
- } else
- k_flag = 0;
-
- return NULL;
+ for ( ; *ptr != '\0'; ++ptr)
+ {
+ if (*ptr == ch) return (char *)ptr;
+ if (iskanji(*ptr)) ++ptr;
+ }
+
+ return NULL;
}
#define strchr _strchr
#endif
"INSULT",
"MOAN",
"SHOW",
+ "SHOOT",
NULL
};
"FORCE_MAXHP",
"FORCE_SLEEP",
"FORCE_EXTRA",
- "FRIEND",
+ "XXX1",
"FRIENDS",
"ESCORT",
"ESCORTS",
"DROP_4D2",
"DROP_GOOD",
"DROP_GREAT",
- "DROP_USEFUL",
- "DROP_CHOSEN"
+ "XXX2",
+ "XXX3"
};
/*
"BRAIN_4",
"BRAIN_5",
"BRAIN_6",
- "BRAIN_7",
+ "HUMAN",
"QUANTUM"
};
"XXX1",
"DISPEL",
"ROCKET",
- "ARROW_1",
- "ARROW_2",
- "ARROW_3",
- "ARROW_4",
+ "SHOOT",
+ "XXX2",
+ "XXX3",
+ "XXX4",
"BR_ACID",
"BR_ELEC",
"BR_FIRE",
"GUARDIAN",
"CHAMELEON",
"KILL_EXP",
- "XXX7X15",
+ "TANUKI",
"XXX7X16",
"XXX7X17",
"XXX7X18",
/*
* Object flags
*/
-static cptr k_info_flags1[] =
+static cptr k_info_flags[] =
{
"STR",
"INT",
"CON",
"CHR",
"MAGIC_MASTERY",
- "FORCE_WEPON",
+ "FORCE_WEAPON",
"STEALTH",
"SEARCH",
"INFRA",
"BRAND_ACID",
"BRAND_ELEC",
"BRAND_FIRE",
- "BRAND_COLD"
-};
+ "BRAND_COLD",
-/*
- * Object flags
- */
-static cptr k_info_flags2[] =
-{
"SUST_STR",
"SUST_INT",
"SUST_WIS",
"SUST_CON",
"SUST_CHR",
"RIDING",
- "XXX2",
+ "EASY_SPELL",
"IM_ACID",
"IM_ELEC",
"IM_FIRE",
"RES_NETHER",
"RES_NEXUS",
"RES_CHAOS",
- "RES_DISEN"
-};
+ "RES_DISEN",
-/*
- * Object flags
- */
-static cptr k_info_flags3[] =
-{
"SH_FIRE",
"SH_ELEC",
- "QUESTITEM",
+ "SLAY_HUMAN",
"SH_COLD",
"NO_TELE",
"NO_MAGIC",
"DEC_MANA",
"TY_CURSE",
- "XXX1",
+ "WARNING",
"HIDE_TYPE",
"SHOW_MODS",
- "INSTA_ART",
+ "XXX1",
"FEATHER",
"LITE",
"SEE_INVIS",
"TELEPORT",
"AGGRAVATE",
"BLESSED",
+ "XXX3",
+ "XXX4",
+ "XXX5",
+
+ "KILL_ANIMAL",
+ "KILL_EVIL",
+ "KILL_UNDEAD",
+ "KILL_DEMON",
+ "KILL_ORC",
+ "KILL_TROLL",
+ "KILL_GIANT",
+ "KILL_HUMAN",
+ "ESP_ANIMAL",
+ "ESP_UNDEAD",
+ "ESP_DEMON",
+ "ESP_ORC",
+ "ESP_TROLL",
+ "ESP_GIANT",
+ "ESP_DRAGON",
+ "ESP_HUMAN",
+ "ESP_EVIL",
+ "ESP_GOOD",
+ "ESP_NONLIVING",
+ "ESP_UNIQUE",
+ "FULL_NAME",
+};
+
+
+static cptr k_info_gen_flags[] =
+{
+ "INSTA_ART",
+ "QUESTITEM",
+ "XTRA_POWER",
+ "ONE_SUSTAIN",
+ "XTRA_RES_OR_POWER",
+ "XTRA_H_RES",
+ "XTRA_E_RES",
+ "XTRA_L_RES",
+ "XTRA_D_RES",
+ "XTRA_RES",
"CURSED",
"HEAVY_CURSE",
- "PERMA_CURSE"
+ "PERMA_CURSE",
+ "RANDOM_CURSE0",
+ "RANDOM_CURSE1",
+ "RANDOM_CURSE2",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
};
*/
static cptr d_info_flags1[] =
{
- "WINNER",
- "MAZE",
- "SMALLEST",
- "BEGINNER",
- "BIG",
- "NO_DOORS",
- "WATER_RIVER",
- "LAVA_RIVER",
- "WATER_RIVERS",
- "LAVA_RIVERS",
- "CAVE",
- "CAVERN",
- "NO_UP",
- "HOT",
- "COLD",
- "NO_DOWN",
- "FORGET",
- "LAKE_WATER",
- "LAKE_LAVA",
- "LAKE_RUBBLE",
- "LAKE_TREE",
- "NO_VAULT",
- "ARENA",
- "DESTROY",
- "XXX1",
- "NO_CAVE",
- "NO_MAGIC",
- "NO_MELEE",
- "CHAMELEON",
- "DARKNESS",
- "XXX1",
- "XXX1"
+ "WINNER",
+ "MAZE",
+ "SMALLEST",
+ "BEGINNER",
+ "BIG",
+ "NO_DOORS",
+ "WATER_RIVER",
+ "LAVA_RIVER",
+ "WATER_RIVERS",
+ "LAVA_RIVERS",
+ "CAVE",
+ "CAVERN",
+ "NO_UP",
+ "HOT",
+ "COLD",
+ "NO_DOWN",
+ "FORGET",
+ "LAKE_WATER",
+ "LAKE_LAVA",
+ "LAKE_RUBBLE",
+ "LAKE_TREE",
+ "NO_VAULT",
+ "ARENA",
+ "DESTROY",
+ "XXX1",
+ "NO_CAVE",
+ "NO_MAGIC",
+ "NO_MELEE",
+ "CHAMELEON",
+ "DARKNESS",
+ "XXX1",
+ "XXX1"
};
/*
+ * Add a text to the text-storage and store offset to it.
+ *
+ * Returns FALSE when there isn't enough space available to store
+ * the text.
+ */
+static bool add_text(u32b *offset, header *head, cptr buf)
+{
+ /* Hack -- Verify space */
+ if (head->text_size + strlen(buf) + 8 > FAKE_TEXT_SIZE)
+ return (FALSE);
+
+ /* New text? */
+ if (*offset == 0)
+ {
+ /* Advance and save the text index */
+ *offset = ++head->text_size;
+ }
+
+ /* Append chars to the text */
+ strcpy(head->text_ptr + head->text_size, buf);
+
+ /* Advance the index */
+ head->text_size += strlen(buf);
+
+ /* Success */
+ return (TRUE);
+}
+
+
+/*
+ * Add a name to the name-storage and return an offset to it.
+ *
+ * Returns FALSE when there isn't enough space available to store
+ * the name.
+ */
+static bool add_name(u32b *offset, header *head, cptr buf)
+{
+ /* Hack -- Verify space */
+ if (head->name_size + strlen(buf) + 8 > FAKE_NAME_SIZE)
+ return (FALSE);
+
+ /* New name? */
+ if (*offset == 0)
+ {
+ /* Advance and save the name index */
+ *offset = ++head->name_size;
+ }
+
+ /* Append chars to the names */
+ strcpy(head->name_ptr + head->name_size, buf);
+
+ /* Advance the index */
+ head->name_size += strlen(buf);
+
+ /* Success */
+ return (TRUE);
+}
+
+
+/*
* Convert a "color letter" into an "actual" color
* The colors are: dwsorgbuDWvyRGBU, as shown below
*/
-static int color_char_to_attr(char c)
+byte color_char_to_attr(char c)
{
switch (c)
{
case 'U': return (TERM_L_UMBER);
}
- return (-1);
+ return (255);
}
* Initialize an "*_info" array, by parsing an ascii "template" file
*/
errr init_info_txt(FILE *fp, char *buf, header *head,
- parse_info_txt_func parse_info_txt_line)
+ parse_info_txt_func parse_info_txt_line)
{
errr err;
continue;
}
+ /* Mega Hack -- Calculate Check Sum */
+ if (buf[0] != 'N' && buf[0] != 'D')
+ {
+ int i;
+ for (i = 0; buf[i]; i++)
+ {
+ head->v_extra += (byte)buf[i];
+ head->v_extra ^= (1 << (i % 8));
+ }
+ }
+
/* Parse the line */
if ((err = (*parse_info_txt_line)(buf, head)) != 0)
return (err);
/* Point at the "info" */
v_ptr = &v_info[i];
- /* Hack -- Verify space */
- if (head->name_size + strlen(s) + 8 > fake_name_size) return (7);
-
- /* Advance and Save the name index */
- if (!v_ptr->name) v_ptr->name = ++head->name_size;
-
- /* Append chars to the name */
- strcpy(head->name_ptr + head->name_size, s);
-
- /* Advance the index */
- head->name_size += strlen(s);
+ /* Store the name */
+ if (!add_name(&v_ptr->name, head, s)) return (7);
}
/* There better be a current v_ptr */
/* Acquire the text */
s = buf+2;
- /* Hack -- Verify space */
- if (head->text_size + strlen(s) + 8 > fake_text_size) return (7);
-
- /* Advance and Save the text index */
- if (!v_ptr->text) v_ptr->text = ++head->text_size;
-
- /* Append chars to the name */
- strcpy(head->text_ptr + head->text_size, s);
-
- /* Advance the index */
- head->text_size += strlen(s);
-
+ /* Store the text */
+ if (!add_text(&v_ptr->text, head, s)) return (7);
}
/* Process 'X' for "Extra info" (one line only) */
/* Scan for the values */
if (4 != sscanf(s, "%x:%d:%d:%d",
- &xtra, &type, &first, &weight)) return (1);
+ (uint *)&xtra, &type, &first, &weight)) return (1);
m_ptr->spell_xtra = xtra;
m_ptr->spell_type = type;
f_ptr = &f_info[i];
#ifdef JP
- /* Hack -- Verify space */
- if (head->name_size + strlen(s) + 8 > fake_name_size) return (7);
-
- /* Advance and Save the name index */
- if (!f_ptr->name) f_ptr->name = ++head->name_size;
-
- /* Append chars to the name */
- strcpy(head->name_ptr + head->name_size, s);
-
- /* Advance the index */
- head->name_size += strlen(s);
+ /* Store the name */
+ if (!add_name(&f_ptr->name, head, s)) return (7);
#endif
/* Default "mimic" */
f_ptr->mimic = i;
/* Acquire the Text */
s = buf+2;
- /* Hack -- Verify space */
- if (head->name_size + strlen(s) + 8 > fake_name_size) return (7);
-
- /* Advance and Save the name index */
- if (!f_ptr->name) f_ptr->name = ++head->name_size;
-
- /* Append chars to the name */
- strcpy(head->name_ptr + head->name_size, s);
-
- /* Advance the index */
- head->name_size += strlen(s);
+ /* Store the name */
+ if (!add_name(&f_ptr->name, head, s)) return (7);
}
#endif
-#if 0
-
- /* Process 'D' for "Description" */
- else if (buf[0] == 'D')
- {
- /* Acquire the text */
- s = buf+2;
-
- /* Hack -- Verify space */
- if (f_head->text_size + strlen(s) + 8 > fake_text_size) return (7);
-
- /* Advance and Save the text index */
- if (!f_ptr->text) f_ptr->text = ++f_head->text_size;
-
- /* Append chars to the name */
- strcpy(f_text + f_head->text_size, s);
-
- /* Advance the index */
- f_head->text_size += strlen(s);
-
- }
-
-#endif
-
/* Process 'M' for "Mimic" (one line only) */
else if (buf[0] == 'M')
/* Process 'G' for "Graphics" (one line only) */
else if (buf[0] == 'G')
{
- int tmp;
+ byte tmp;
/* Paranoia */
if (!buf[2]) return (1);
tmp = color_char_to_attr(buf[4]);
/* Paranoia */
- if (tmp < 0) return (1);
+ if (tmp > 127) return (1);
/* Save the values */
f_ptr->d_attr = tmp;
{
int i;
- /* Check flags1 */
- for (i = 0; i < 32; i++)
- {
- if (streq(what, k_info_flags1[i]))
- {
- k_ptr->flags1 |= (1L << i);
- return (0);
- }
- }
-
- /* Check flags2 */
- for (i = 0; i < 32; i++)
+ /* Check flags */
+ for (i = 0; i < TR_FLAG_MAX; i++)
{
- if (streq(what, k_info_flags2[i]))
+ if (streq(what, k_info_flags[i]))
{
- k_ptr->flags2 |= (1L << i);
+ add_flag(k_ptr->flags, i);
return (0);
}
}
- /* Check flags3 */
+ /* Check gen_flags */
for (i = 0; i < 32; i++)
{
- if (streq(what, k_info_flags3[i]))
+ if (streq(what, k_info_gen_flags[i]))
{
- k_ptr->flags3 |= (1L << i);
+ k_ptr->gen_flags |= (1L << i);
return (0);
}
}
k_ptr = &k_info[i];
#ifdef JP
- /* Hack -- Verify space */
- if (head->name_size + strlen(s) + 8 > fake_name_size) return (7);
-
- /* Advance and Save the name index */
- if (!k_ptr->name) k_ptr->name = ++head->name_size;
-
- /* Append chars to the name */
- strcpy(head->name_ptr + head->name_size, s);
-
- /* Advance the index */
- head->name_size += strlen(s);
+ /* Store the name */
+ if (!add_name(&k_ptr->name, head, s)) return (7);
#endif
}
/* Acquire the Text */
s = buf+2;
- /* Hack -- Verify space */
- if (head->name_size + strlen(s) + 8 > fake_name_size) return (7);
-
- /* Advance and Save the name index */
- if (!k_ptr->name) k_ptr->name = ++head->name_size;
-
- /* Append chars to the name */
- strcpy(head->name_ptr + head->name_size, s);
-
- /* Advance the index */
- head->name_size += strlen(s);
+ /* Store the name */
+ if (!add_name(&k_ptr->name, head, s)) return (7);
}
#endif
-#if 0
/* Process 'D' for "Description" */
else if (buf[0] == 'D')
{
+#ifdef JP
+ if (buf[2] == '$')
+ return (0);
/* Acquire the text */
s = buf+2;
-
- /* Hack -- Verify space */
- if (k_head->text_size + strlen(s) + 8 > fake_text_size) return (7);
-
- /* Advance and Save the text index */
- if (!k_ptr->text) k_ptr->text = ++k_head->text_size;
-
- /* Append chars to the name */
- strcpy(k_text + k_head->text_size, s);
-
- /* Advance the index */
- k_head->text_size += strlen(s);
- }
-
+#else
+ if (buf[2] != '$')
+ return (0);
+ /* Acquire the text */
+ s = buf+3;
#endif
+ /* Store the text */
+ if (!add_text(&k_ptr->text, head, s)) return (7);
+ }
/* Process 'G' for "Graphics" (one line only) */
else if (buf[0] == 'G')
{
char sym;
- int tmp;
+ byte tmp;
/* Paranoia */
if (!buf[2]) return (1);
tmp = color_char_to_attr(buf[4]);
/* Paranoia */
- if (tmp < 0) return (1);
+ if (tmp > 127) return (1);
/* Save the values */
k_ptr->d_attr = tmp;
{
int i;
- /* Check flags1 */
- for (i = 0; i < 32; i++)
+ /* Check flags */
+ for (i = 0; i < TR_FLAG_MAX; i++)
{
- if (streq(what, k_info_flags1[i]))
+ if (streq(what, k_info_flags[i]))
{
- a_ptr->flags1 |= (1L << i);
+ add_flag(a_ptr->flags, i);
return (0);
}
}
- /* Check flags2 */
+ /* Check gen_flags */
for (i = 0; i < 32; i++)
{
- if (streq(what, k_info_flags2[i]))
+ if (streq(what, k_info_gen_flags[i]))
{
- a_ptr->flags2 |= (1L << i);
- return (0);
- }
- }
-
- /* Check flags3 */
- for (i = 0; i < 32; i++)
- {
- if (streq(what, k_info_flags3[i]))
- {
- a_ptr->flags3 |= (1L << i);
+ a_ptr->gen_flags |= (1L << i);
return (0);
}
}
a_ptr = &a_info[i];
/* Ignore everything */
- a_ptr->flags3 |= (TR3_IGNORE_ACID);
- a_ptr->flags3 |= (TR3_IGNORE_ELEC);
- a_ptr->flags3 |= (TR3_IGNORE_FIRE);
- a_ptr->flags3 |= (TR3_IGNORE_COLD);
+ add_flag(a_ptr->flags, TR_IGNORE_ACID);
+ add_flag(a_ptr->flags, TR_IGNORE_ELEC);
+ add_flag(a_ptr->flags, TR_IGNORE_FIRE);
+ add_flag(a_ptr->flags, TR_IGNORE_COLD);
#ifdef JP
- /* Hack -- Verify space */
- if (head->name_size + strlen(s) + 8 > fake_name_size) return (7);
-
- /* Advance and Save the name index */
- if (!a_ptr->name) a_ptr->name = ++head->name_size;
-
- /* Append chars to the name */
- strcpy(head->name_ptr + head->name_size, s);
-
- /* Advance the index */
- head->name_size += strlen(s);
+ /* Store the name */
+ if (!add_name(&a_ptr->name, head, s)) return (7);
#endif
}
/* Acquire the Text */
s = buf+2;
- /* Hack -- Verify space */
- if (head->name_size + strlen(s) + 8 > fake_name_size) return (7);
-
- /* Advance and Save the name index */
- if (!a_ptr->name) a_ptr->name = ++head->name_size;
-
- /* Append chars to the name */
- strcpy(head->name_ptr + head->name_size, s);
-
- /* Advance the index */
- head->name_size += strlen(s);
+ /* Store the name */
+ if (!add_name(&a_ptr->name, head, s)) return (7);
}
#endif
s = buf+3;
#endif
- /* Hack -- Verify space */
- if (head->text_size + strlen(s) + 8 > fake_text_size) return (7);
-
- /* Advance and Save the text index */
- if (!a_ptr->text) a_ptr->text = ++head->text_size;
-
- /* Append chars to the name */
- strcpy(head->text_ptr + head->text_size, s);
-
- /* Advance the index */
- head->text_size += strlen(s);
+ /* Store the text */
+ if (!add_text(&a_ptr->text, head, s)) return (7);
}
{
int i;
- /* Check flags1 */
- for (i = 0; i < 32; i++)
- {
- if (streq(what, k_info_flags1[i]))
- {
- e_ptr->flags1 |= (1L << i);
- return (0);
- }
- }
-
- /* Check flags2 */
- for (i = 0; i < 32; i++)
+ /* Check flags */
+ for (i = 0; i < TR_FLAG_MAX; i++)
{
- if (streq(what, k_info_flags2[i]))
+ if (streq(what, k_info_flags[i]))
{
- e_ptr->flags2 |= (1L << i);
+ add_flag(e_ptr->flags, i);
return (0);
}
}
-
- /* Check flags3 */
+
+ /* Check gen_flags */
for (i = 0; i < 32; i++)
{
- if (streq(what, k_info_flags3[i]))
+ if (streq(what, k_info_gen_flags[i]))
{
- e_ptr->flags3 |= (1L << i);
+ e_ptr->gen_flags |= (1L << i);
return (0);
}
}
- /* Oops */
+/* Oops */
#ifdef JP
msg_format("̤ÃΤÎ̾¤Î¤¢¤ë¥¢¥¤¥Æ¥à¡¦¥Õ¥é¥° '%s'¡£", what);
#else
/* Point at the "info" */
e_ptr = &e_info[i];
#ifdef JP
- /* Hack -- Verify space */
- if (head->name_size + strlen(s) + 8 > fake_name_size) return (7);
-
- /* Advance and Save the name index */
- if (!e_ptr->name) e_ptr->name = ++head->name_size;
-
- /* Append chars to the name */
- strcpy(head->name_ptr + head->name_size, s);
-
- /* Advance the index */
- head->name_size += strlen(s);
+ /* Store the name */
+ if (!add_name(&e_ptr->name, head, s)) return (7);
#endif
}
/* Acquire the Text */
s = buf+2;
- /* Hack -- Verify space */
- if (head->name_size + strlen(s) + 8 > fake_name_size) return (7);
-
- /* Advance and Save the name index */
- if (!e_ptr->name) e_ptr->name = ++head->name_size;
-
- /* Append chars to the name */
- strcpy(head->name_ptr + head->name_size, s);
-
- /* Advance the index */
- head->name_size += strlen(s);
+ /* Store the name */
+ if (!add_name(&e_ptr->name, head, s)) return (7);
}
#endif
#if 0
/* Acquire the text */
s = buf+2;
- /* Hack -- Verify space */
- if (e_head->text_size + strlen(s) + 8 > fake_text_size) return (7);
-
- /* Advance and Save the text index */
- if (!e_ptr->text) e_ptr->text = ++e_head->text_size;
-
- /* Append chars to the name */
- strcpy(e_text + e_head->text_size, s);
-
- /* Advance the index */
- e_head->text_size += strlen(s);
+ /* Store the text */
+ if (!add_text(&e_ptr->text, head, s)) return (7);
}
#endif
/* Point at the "info" */
r_ptr = &r_info[i];
#ifdef JP
- /* Hack -- Verify space */
- if (head->name_size + strlen(s) + 8 > fake_name_size) return (7);
-
- /* Advance and Save the name index */
- if (!r_ptr->name) r_ptr->name = ++head->name_size;
-
- /* Append chars to the name */
- strcpy(head->name_ptr + head->name_size, s);
-
- /* Advance the index */
- head->name_size += strlen(s);
+ /* Store the name */
+ if (!add_name(&r_ptr->name, head, s)) return (7);
#endif
}
/* Acquire the Text */
s = buf+2;
- /* Hack -- Verify space */
- if (head->name_size + strlen(s) + 8 > fake_name_size) return (7);
-
- /* Advance and Save the name index */
- if (!r_ptr->E_name) r_ptr->E_name = ++head->name_size;
-
- /* Append chars to the name */
- strcpy(head->name_ptr + head->name_size, s);
-
- /* Advance the index */
- head->name_size += strlen(s);
+ /* Store the name */
+ if (!add_name(&r_ptr->E_name, head, s)) return (7);
}
#else
else if (buf[0] == 'E')
/* Acquire the Text */
s = buf+2;
- /* Hack -- Verify space */
- if (head->name_size + strlen(s) + 8 > fake_name_size) return (7);
-
- /* Advance and Save the name index */
- if (!r_ptr->name) r_ptr->name = ++head->name_size;
-
- /* Append chars to the name */
- strcpy(head->name_ptr + head->name_size, s);
-
- /* Advance the index */
- head->name_size += strlen(s);
+ /* Store the name */
+ if (!add_name(&r_ptr->name, head, s)) return (7);
}
#endif
/* Process 'D' for "Description" */
s = buf+3;
#endif
- /* Hack -- Verify space */
- if (head->text_size + strlen(s) + 8 > fake_text_size) return (7);
-
- /* Advance and Save the text index */
- if (!r_ptr->text) r_ptr->text = ++head->text_size;
-
- /* Append chars to the name */
- strcpy(head->text_ptr + head->text_size, s);
-
- /* Advance the index */
- head->text_size += strlen(s);
+ /* Store the text */
+ if (!add_text(&r_ptr->text, head, s)) return (7);
}
/* Process 'G' for "Graphics" (one line only) */
else if (buf[0] == 'G')
{
char sym;
- int tmp;
+ byte tmp;
/* Paranoia */
if (!buf[2]) return (1);
tmp = color_char_to_attr(buf[4]);
/* Paranoia */
- if (tmp < 0) return (1);
+ if (tmp > 127) return (1);
/* Save the values */
r_ptr->d_char = sym;
/* Scan flags1 */
for (i = 0; i < 32; i++)
{
- if (streq(what, d_info_flags1[i]))
+ if (streq(what, d_info_flags1[i]))
{
- d_ptr->flags1 |= (1L << i);
+ d_ptr->flags1 |= (1L << i);
return (0);
}
}
/* Oops */
#ifdef JP
- msg_format("̤ÃΤΥÀ¥ó¥¸¥ç¥ó¡¦¥Õ¥é¥° '%s'¡£", what);
+ msg_format("̤ÃΤΥÀ¥ó¥¸¥ç¥ó¡¦¥Õ¥é¥° '%s'¡£", what);
#else
- msg_format("Unknown dungeon type flag '%s'.", what);
+ msg_format("Unknown dungeon type flag '%s'.", what);
#endif
/* Failure */
/* Scan flags1 */
for (i = 0; i < 32; i++)
{
- if (streq(what, r_info_flags1[i]))
+ if (streq(what, r_info_flags1[i]))
{
- d_ptr->mflags1 |= (1L << i);
+ d_ptr->mflags1 |= (1L << i);
return (0);
}
}
{
if (streq(what, r_info_flags2[i]))
{
- d_ptr->mflags2 |= (1L << i);
+ d_ptr->mflags2 |= (1L << i);
return (0);
}
}
{
if (streq(what, r_info_flags3[i]))
{
- d_ptr->mflags3 |= (1L << i);
+ d_ptr->mflags3 |= (1L << i);
return (0);
}
}
/* Scan flags7 */
for (i = 0; i < 32; i++)
{
- if (streq(what, r_info_flags7[i]))
+ if (streq(what, r_info_flags7[i]))
{
- d_ptr->mflags7 |= (1L << i);
+ d_ptr->mflags7 |= (1L << i);
return (0);
}
}
{
if (streq(what, r_info_flags8[i]))
{
- d_ptr->mflags8 |= (1L << i);
+ d_ptr->mflags8 |= (1L << i);
return (0);
}
}
{
if (streq(what, r_info_flags9[i]))
{
- d_ptr->mflags9 |= (1L << i);
+ d_ptr->mflags9 |= (1L << i);
return (0);
}
}
{
if (streq(what, r_info_flags4[i]))
{
- d_ptr->mflags4 |= (1L << i);
+ d_ptr->mflags4 |= (1L << i);
return (0);
}
}
{
if (streq(what, r_info_flags5[i]))
{
- d_ptr->mflags5 |= (1L << i);
+ d_ptr->mflags5 |= (1L << i);
return (0);
}
}
{
if (streq(what, r_info_flags6[i]))
{
- d_ptr->mflags6 |= (1L << i);
+ d_ptr->mflags6 |= (1L << i);
return (0);
}
}
/* Point at the "info" */
d_ptr = &d_info[i];
#ifdef JP
- /* Hack -- Verify space */
- if (head->name_size + strlen(s) + 8 > fake_name_size) return (7);
-
- /* Advance and Save the name index */
- if (!d_ptr->name) d_ptr->name = ++head->name_size;
-
- /* Append chars to the name */
- strcpy(head->name_ptr + head->name_size, s);
-
- /* Advance the index */
- head->name_size += strlen(s);
+ /* Store the name */
+ if (!add_name(&d_ptr->name, head, s)) return (7);
#endif
}
/* Acquire the Text */
s = buf+2;
- /* Hack -- Verify space */
- if (head->name_size + strlen(s) + 8 > fake_name_size) return (7);
-
- /* Advance and Save the name index */
- if (!d_ptr->name) d_ptr->name = ++head->name_size;
-
- /* Append chars to the name */
- strcpy(head->name_ptr + head->name_size, s);
-
- /* Advance the index */
- head->name_size += strlen(s);
+ /* Store the name */
+ if (!add_name(&d_ptr->name, head, s)) return (7);
}
#endif
s = buf+3;
#endif
- /* Hack -- Verify space */
- if (head->text_size + strlen(s) + 8 > fake_text_size) return (7);
-
- /* Advance and Save the text index */
- if (!d_ptr->text) d_ptr->text = ++head->text_size;
-
- /* Append chars to the name */
- strcpy(d_text + head->text_size, s);
-
- /* Advance the index */
- head->text_size += strlen(s);
+ /* Store the text */
+ if (!add_text(&d_ptr->text, head, s)) return (7);
}
/* Process 'W' for "More Info" (one line only) */
/* Scan for the values */
if (7 != sscanf(buf+2, "%d:%d:%d:%d:%d:%d:%d",
- &f1, &p1, &f2, &p2, &f3, &p3, &tunnel)) return (1);
+ &f1, &p1, &f2, &p2, &f3, &p3, &tunnel)) return (1);
/* Save the values */
d_ptr->floor1 = f1;
/* Parse every entry */
for (s = buf + 2; *s; )
{
- /* Find the end of this entry */
+ /* Find the end of this entry */
for (t = s; *t && (*t != ' ') && (*t != '|'); ++t) /* loop */;
- /* Nuke and skip any dividers */
+ /* Nuke and skip any dividers */
if (*t)
{
*t++ = '\0';
while (*t == ' ' || *t == '|') t++;
}
- /* XXX XXX XXX Hack -- Read Final Artifact */
+ /* XXX XXX XXX Hack -- Read Final Artifact */
if (1 == sscanf(s, "FINAL_ARTIFACT_%d", &artif))
{
/* Extract a "Final Artifact" */
continue;
}
- /* XXX XXX XXX Hack -- Read Final Object */
+ /* XXX XXX XXX Hack -- Read Final Object */
if (1 == sscanf(s, "FINAL_OBJECT_%d", &artif))
{
/* Extract a "Final Artifact" */
continue;
}
- /* XXX XXX XXX Hack -- Read Artifact Guardian */
+ /* XXX XXX XXX Hack -- Read Artifact Guardian */
if (1 == sscanf(s, "FINAL_GUARDIAN_%d", &monst))
{
/* Extract a "Artifact Guardian" */
continue;
}
- /* XXX XXX XXX Hack -- Read Special Percentage */
+ /* XXX XXX XXX Hack -- Read Special Percentage */
if (1 == sscanf(s, "MONSTER_DIV_%d", &monst))
{
/* Extract a "Special %" */
continue;
}
- /* Parse this entry */
+ /* Parse this entry */
if (0 != grab_one_dungeon_flag(d_ptr, s)) return (5);
- /* Start the next entry */
+ /* Start the next entry */
s = t;
}
}
/* Process 'M' for "Basic Flags" (multiple lines) */
else if (buf[0] == 'M')
{
- byte r_char_number = 0, r_char;
-
/* Parse every entry */
for (s = buf + 2; *s; )
{
- /* Find the end of this entry */
+ /* Find the end of this entry */
for (t = s; *t && (*t != ' ') && (*t != '|'); ++t) /* loop */;
- /* Nuke and skip any dividers */
+ /* Nuke and skip any dividers */
if (*t)
{
*t++ = '\0';
while (*t == ' ' || *t == '|') t++;
}
- /* XXX XXX XXX Hack -- Read monster symbols */
- if (1 == sscanf(s, "R_CHAR_%c", &r_char))
+ /* Hack -- Read monster symbols */
+ if (!strncmp(s, "R_CHAR_", 7))
{
- /* Limited to 5 races */
- if(r_char_number >= 5) continue;
+ /* Skip "R_CHAR_" */
+ s += 7;
- /* Extract a "frequency" */
- d_ptr->r_char[r_char_number++] = r_char;
+ /* Read a string */
+ strncpy(d_ptr->r_char, s, sizeof(d_ptr->r_char));
/* Start at next entry */
s = t;
continue;
}
- /* Parse this entry */
+ /* Parse this entry */
if (0 != grab_one_basic_monster_flag(d_ptr, s)) return (5);
- /* Start the next entry */
+ /* Start the next entry */
s = t;
}
}
letter[index].monster = atoi(zz[3]);
}
}
+ else if (zz[3][0] == 'c')
+ {
+ letter[index].monster = - atoi(zz[3]+1);
+ }
else
{
letter[index].monster = atoi(zz[3]);
case 'Z':
{
-#ifdef USE_SCRIPT
- if (tokenize(s+2, 2, zz, 0) == 2)
- {
- /* Index of the action */
- int action_index = atoi(zz[0]);
-
- /* Name of the action */
- strcpy(building[index].act_script[action_index], zz[1]);
-
- break;
- }
- return (1);
-#else /* USE_SCRIPT */
/* Ignore scripts */
break;
-#endif /* USE_SCRIPT */
}
default:
{
monster_level = base_level + monster_index;
- place_monster(*y, *x, TRUE, TRUE);
+ place_monster(*y, *x, (PM_ALLOW_SLEEP | PM_ALLOW_GROUP));
monster_level = base_level;
}
else if (monster_index)
{
+ int old_cur_num, old_max_num;
+ bool clone = FALSE;
+
+ if (monster_index < 0)
+ {
+ monster_index = -monster_index;
+ clone = TRUE;
+ }
+ old_cur_num = r_info[monster_index].cur_num;
+ old_max_num = r_info[monster_index].max_num;
+
/* Make alive again */
if (r_info[monster_index].flags1 & RF1_UNIQUE)
{
}
/* Place it */
- place_monster_aux(*y, *x, monster_index, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE);
+ place_monster_aux(0, *y, *x, monster_index, (PM_ALLOW_SLEEP | PM_NO_KAGE));
+ if (clone)
+ {
+ /* clone */
+ m_list[hack_m_idx_ii].smart |= SM_CLONED;
+
+ /* Make alive again for real unique monster */
+ r_info[monster_index].cur_num = old_cur_num;
+ r_info[monster_index].max_num = old_max_num;
+ }
}
/* Object (and possible trap) */
* Random trap and random treasure defined
* 25% chance for trap and 75% chance for object
*/
- if (rand_int(100) < 75)
+ if (randint0(100) < 75)
{
place_object(*y, *x, FALSE, FALSE);
}
object_level = base_level + object_index;
/* Create an out of deep object */
- if (rand_int(100) < 75)
+ if (randint0(100) < 75)
place_object(*y, *x, FALSE, FALSE);
- else if (rand_int(100) < 80)
+ else if (randint0(100) < 80)
place_object(*y, *x, TRUE, FALSE);
else
place_object(*y, *x, TRUE, TRUE);
{
place_trap(*y, *x);
}
+ /* Hidden trap (or door) */
+ else if (letter[idx].trap)
+ {
+ c_ptr->mimic = c_ptr->feat;
+ c_ptr->feat = letter[idx].trap;
+ }
else if (object_index)
{
/* Get local object */
/* Apply magic (no messages, no artifacts) */
apply_magic(o_ptr, base_level, FALSE, TRUE, FALSE, FALSE);
-#ifdef USE_SCRIPT
- o_ptr->python = object_create_callback(o_ptr);
-#endif /* USE_SCRIPT */
-
(void)drop_near(o_ptr, -1, *y, *x);
}
{
if (a_info[artifact_index].cur_num)
{
- s16b k_idx = 198;
+ int k_idx = 198;
object_type forge;
object_type *q_ptr = &forge;
object_prep(q_ptr, k_idx);
-#ifdef USE_SCRIPT
- q_ptr->python = object_create_callback(q_ptr);
-#endif /* USE_SCRIPT */
/* Drop it in the dungeon */
(void)drop_near(q_ptr, -1, *y, *x);
r_ptr->flags1 |= RF1_QUESTOR;
a_ptr = &a_info[q_ptr->k_idx];
- a_ptr->flags3 |= TR3_QUESTITEM;
+ a_ptr->gen_flags |= TRG_QUESTITEM;
}
return (0);
}
if (*x % SCREEN_WID) panels_x++;
cur_wid = panels_x * SCREEN_WID;
- /* Choose a panel row */
- max_panel_rows = (cur_hgt / SCREEN_HGT) * 2 - 2;
- if (max_panel_rows < 0) max_panel_rows = 0;
-
- /* Choose a panel col */
- max_panel_cols = (cur_wid / SCREEN_WID) * 2 - 2;
- if (max_panel_cols < 0) max_panel_cols = 0;
-
/* Assume illegal panel */
- panel_row = max_panel_rows;
- panel_col = max_panel_cols;
+ panel_row_min = cur_hgt;
+ panel_col_min = cur_wid;
/* Place player in a quest level */
if (p_ptr->inside_quest)
max_e_idx = atoi(zz[1]);
}
- /* Maximum d_idx */
- else if (zz[0][0] == 'D')
+ /* Maximum d_idx */
+ else if (zz[0][0] == 'D')
{
- max_d_idx = atoi(zz[1]);
+ max_d_idx = atoi(zz[1]);
}
/* Maximum o_idx */
else if (streq(b+1, "RACE"))
{
#ifdef JP
- v = rp_ptr->E_title;
+ v = rp_ptr->E_title;
#else
v = rp_ptr->title;
#endif
else if (streq(b+1, "CLASS"))
{
#ifdef JP
- v = cp_ptr->E_title;
+ v = cp_ptr->E_title;
#else
v = cp_ptr->title;
#endif
#ifdef JP
v = E_realm_names[p_ptr->realm1];
#else
- v = realm_names[p_ptr->realm1];
+ v = realm_names[p_ptr->realm1];
#endif
}
else if (streq(b+1, "REALM2"))
{
#ifdef JP
- v = E_realm_names[p_ptr->realm2];
+ v = E_realm_names[p_ptr->realm2];
#else
v = realm_names[p_ptr->realm2];
#endif
/* Build the filename */
- path_build(buf, 1024, ANGBAND_DIR_EDIT, name);
+ path_build(buf, sizeof(buf), ANGBAND_DIR_EDIT, name);
/* Open the file */
fp = my_fopen(buf, "r");
/* Process the file */
- while (0 == my_fgets(fp, buf, 1024))
+ while (0 == my_fgets(fp, buf, sizeof(buf)))
{
/* Count lines */
num++;
/* Apply conditionals */
if (bypass) continue;
-
- /* Process "%:<file>" */
- if (buf[0] == '%')
- {
- /* Process that file if allowed */
- (void)process_dungeon_file(buf + 2, ymin, xmin, ymax, xmax);
-
- /* Continue */
- continue;
- }
-
-
/* Process the line */
err = process_dungeon_file_aux(buf, ymin, xmin, ymax, xmax, &y, &x);
OSDN Git Service
