Only in src/: .DS_Store Only in src/: Quickband (68K) Only in src/: Quickband (68K).NJ Only in src/: Quickband (PPC) diff -ur oldsrc/cmd4.c src/cmd4.c --- oldsrc/cmd4.c Wed Nov 2 18:45:07 2005 +++ src/cmd4.c Wed Nov 2 18:51:41 2005 @@ -30,6 +30,10 @@ /*used for knowledge display*/ #define BROWSER_ROWS 16 +#ifdef MAC_MPW +static char JVERSION_NAME[] = "日本語版" VERSION_NAME; +#endif + /* * Header and footer marker string for pref file dumps */ diff -ur oldsrc/defines.h src/defines.h --- oldsrc/defines.h Wed Nov 2 18:45:07 2005 +++ src/defines.h Wed Nov 2 18:50:46 2005 @@ -64,7 +64,9 @@ /* * 日本語版のバージョン */ +#ifndef MAC_MPW #define JVERSION_NAME "日本語版" VERSION_NAME +#endif #define JVERSION_STRING VERSION_STRING "-j0.2.0" #define JVERSION_MAJOR 0 #define JVERSION_MINOR 2 diff -ur oldsrc/files.c src/files.c --- oldsrc/files.c Wed Nov 2 18:45:07 2005 +++ src/files.c Wed Nov 2 18:50:01 2005 @@ -31,6 +31,10 @@ #include "angband.h" +#ifdef MAC_MPW +static char JVERSION_NAME[] = "日本語版" VERSION_NAME; +#endif + /* * Hack -- drop permissions */ Only in src/: lib diff -ur oldsrc/main-mac.c src/main-mac.c --- oldsrc/main-mac.c Wed Nov 2 08:41:57 2005 +++ src/main-mac.c Tue Nov 8 11:22:04 2005 @@ -165,7 +165,7 @@ /* Default preferences file name (in Pascal string) */ # ifndef ANGBAND_PREFERENCES -# define ANGBAND_PREFERENCES "\pAngband Preferences" +# define ANGBAND_PREFERENCES "\pQuickband Preferences" # endif @@ -259,6 +259,10 @@ # include #endif /* !ANGBAND_LITE_MAC */ +#ifdef JP +#include +#endif + #ifdef ANGBAND_LITE_MAC @@ -1471,7 +1475,11 @@ } /* Notify error */ +#ifdef JP + plog("サウンドチャンネルを初期化出来ません!"); +#else plog("Cannot initialise sound channels!"); +#endif /* Cancel request */ use_sound = arg_sound = FALSE; @@ -1867,7 +1875,11 @@ if ((graf_mode_req != GRAF_MODE_NONE) && (globe_init() != 0)) { /* Oops */ +#ifdef JP + plog("グラフィックを初期化出来ません!"); +#else plog("Cannot initialize graphics!"); +#endif /* reject request */ graf_mode_req = GRAF_MODE_NONE; @@ -2313,6 +2325,21 @@ /* Move to the correct location */ MoveTo(xp, yp); +#ifdef JP + if (iskanji(c)) + { + /* Double width rectangle */ + dst_r.right += td->tile_wid; + + /* Draw the character */ + DrawText(cp, i, 2); + + i++; + + dst_r.left += td->tile_wid; + } + else +#endif /* Draw the character */ DrawChar(c); @@ -2655,8 +2682,14 @@ { short fid; +#ifdef JP + /* Default to 等幅明朝 font (Japanese) */ + GetFNum( "\p等幅明朝", &fid); + SetFScaleDisable( true ); +#else /* Default to Monaco font */ GetFNum("\pmonaco", &fid); +#endif /* Wipe it */ WIPE(td, term_data); @@ -5450,6 +5483,10 @@ /* Initialise cursor and turn it from a "watch" to an "arrow" */ InitCursor(); + +#ifdef JP + KeyScript(smRoman); +#endif #ifdef ANGBAND_LITE_MAC Only in src/: obj-68k Only in src/: obj-ppc Only in src/: out diff -ur oldsrc/z-util.c src/z-util.c --- oldsrc/z-util.c Wed Nov 2 08:42:06 2005 +++ src/z-util.c Tue Nov 8 11:07:46 2005 @@ -140,7 +140,7 @@ /* * strchr() that recognize kanji. */ -cptr my_strchr(cptr s, int ch) +char *my_strchr(const char *s, int ch) { while (*s) { @@ -150,7 +150,7 @@ } else if (*s == ch) { - return s; + return (char *)s; } s++; } diff -ur oldsrc/z-util.h src/z-util.h --- oldsrc/z-util.h Wed Nov 2 08:42:06 2005 +++ src/z-util.h Tue Nov 8 11:06:12 2005 @@ -46,7 +46,7 @@ extern size_t my_strcat(char *buf, const char *src, size_t bufsize); #ifdef JP -extern cptr my_strchr(cptr s, int ch); +extern char *my_strchr(const char *s, int ch); #undef strchr #define strchr(s, ch) my_strchr(s, ch) #endif /* JP */