if (!o_ptr->inscription) return;
/* Find a '!' */
+#ifdef JP
+ s = strchr_j(quark_str(o_ptr->inscription), '!');
+#else
s = strchr(quark_str(o_ptr->inscription), '!');
+#endif
/* Process notification request. */
while (s)
}
/* Keep looking for '!'s */
+#ifdef JP
+ s = strchr_j(s + 1, '!');
+#else
s = strchr(s + 1, '!');
+#endif
}
}
extern void jverb3( const char *in , char *out);
extern void jverb( const char *in , char *out , int flag);
extern char* strstr_j(cptr str1, cptr str2);
+extern char *strchr_j(const char *ptr, char ch);
extern void sjis2euc(char *str);
extern void euc2sjis(char *str);
extern byte codeconv(char *str);
}
+#ifdef JP
+#undef strchr
+#define strchr strchr_j
+#endif
+
/*
* Creates a description of the item "o_ptr", and stores it in "out_val".
#ifdef JP
#undef strchr
-static char *_strchr(const char *ptr, char ch)
-{
- for ( ; *ptr != '\0'; ++ptr)
- {
- if (*ptr == ch) return (char *)ptr;
- if (iskanji(*ptr)) ++ptr;
- }
-
- return NULL;
-}
-#define strchr _strchr
+#define strchr strchr_j
#endif
/*
* This file is used to initialize various variables and arrays for the
}
+char *strchr_j(const char *ptr, char ch)
+{
+ for ( ; *ptr != '\0'; ++ptr)
+ {
+ if (*ptr == ch) return (char *)ptr;
+ if (iskanji(*ptr)) ++ptr;
+ }
+
+ return NULL;
+}
+
+
/*
* Convert SJIS string to EUC string
*/
}
+#ifdef JP
+#undef strchr
+#define strchr strchr_j
+#endif
+
+
/*
* Find the "first" inventory object with the given "tag".
*
if (!caretcmd)
caretcmd = command_cmd;
#endif
+
+#ifdef JP
+#undef strchr
+#define strchr strchr_j
+#endif
+
/* Hack -- Scan equipment */
for (i = INVEN_RARM; i < INVEN_TOTAL; i++)
{
return ((inventory[i].k_idx && inventory[i].tval >= TV_DIGGING && inventory[i].tval <= TV_SWORD) ? TRUE : FALSE);
}
+
+#ifdef JP
+#undef strchr
+#define strchr strchr_j
+#endif
+
+
/*
* Calculate the players current "state", taking into account
* not only race/class intrinsics, but also objects being worn