Revision | 992cc97a1df0155ba768eded8ca27de6f5a78f40 (tree) |
---|---|
Zeit | 2022-01-03 01:07:00 |
Autor | SHIRAKATA Kentaro <argrath@ub32...> |
Commiter | SHIRAKATA Kentaro |
fix #43519
@@ -1,3 +1,6 @@ | ||
1 | + * 次の問題を修正 | |
2 | + * unix系でビルド・プレイできない (#43519) | |
3 | + | |
1 | 4 | Sat Jan 1 2022 SHIRAKATA Kentaro <argrath@ub32.org> |
2 | 5 | |
3 | 6 | * 次の問題を修正 |
@@ -1559,33 +1559,16 @@ build_savebones_compat_string() | ||
1559 | 1559 | #ifdef VERSION_COMPATIBILITY |
1560 | 1560 | unsigned long uver = VERSION_COMPATIBILITY; |
1561 | 1561 | #endif |
1562 | -#if 0 /*JP*/ | |
1563 | 1562 | Strcpy(save_bones_compat_buf, |
1564 | 1563 | "save and bones files accepted from version"); |
1565 | -#else | |
1566 | - Strcpy(save_bones_compat_buf, | |
1567 | - "使えるセーブと骨ファイルはバージョン"); | |
1568 | -#endif | |
1569 | 1564 | #ifdef VERSION_COMPATIBILITY |
1570 | -#if 0 /*JP*/ | |
1571 | 1565 | Sprintf(eos(save_bones_compat_buf), "s %lu.%lu.%lu through %d.%d.%d", |
1572 | 1566 | ((uver & 0xFF000000L) >> 24), ((uver & 0x00FF0000L) >> 16), |
1573 | 1567 | ((uver & 0x0000FF00L) >> 8), VERSION_MAJOR, VERSION_MINOR, |
1574 | 1568 | PATCHLEVEL); |
1575 | 1569 | #else |
1576 | - Sprintf(eos(save_bones_compat_buf), "%lu.%lu.%luから%d.%d.%d", | |
1577 | - ((uver & 0xFF000000L) >> 24), ((uver & 0x00FF0000L) >> 16), | |
1578 | - ((uver & 0x0000FF00L) >> 8), VERSION_MAJOR, VERSION_MINOR, | |
1579 | - PATCHLEVEL); | |
1580 | -#endif | |
1581 | -#else | |
1582 | -#if 0 /*JP*/ | |
1583 | 1570 | Sprintf(eos(save_bones_compat_buf), " %d.%d.%d only", VERSION_MAJOR, |
1584 | 1571 | VERSION_MINOR, PATCHLEVEL); |
1585 | -#else | |
1586 | - Sprintf(eos(save_bones_compat_buf), "%d.%d.%dのみ", VERSION_MAJOR, | |
1587 | - VERSION_MINOR, PATCHLEVEL); | |
1588 | -#endif | |
1589 | 1572 | #endif |
1590 | 1573 | } |
1591 | 1574 |
@@ -1597,17 +1580,11 @@ static const char *build_opts[] = { | ||
1597 | 1580 | "ANSI default terminal", |
1598 | 1581 | #endif |
1599 | 1582 | #ifdef TEXTCOLOR |
1600 | -/*JP | |
1601 | 1583 | "color", |
1602 | -*/ | |
1603 | - "カラー", | |
1604 | 1584 | #endif |
1605 | 1585 | #ifdef TTY_GRAPHICS |
1606 | 1586 | #ifdef TTY_TILES_ESCCODES |
1607 | -/*JP | |
1608 | 1587 | "console escape codes for tile hinting", |
1609 | -*/ | |
1610 | - "タイルのヒントのためのコンソールエスケープコード", | |
1611 | 1588 | #endif |
1612 | 1589 | #endif |
1613 | 1590 | #ifdef COM_COMPL |
@@ -1624,28 +1601,16 @@ static const char *build_opts[] = { | ||
1624 | 1601 | #endif |
1625 | 1602 | #ifdef DLB |
1626 | 1603 | #ifndef VERSION_IN_DLB_FILENAME |
1627 | -/*JP | |
1628 | 1604 | "data librarian", |
1629 | -*/ | |
1630 | - "データファイル", | |
1631 | 1605 | #else |
1632 | -/*JP | |
1633 | 1606 | "data librarian with a version-dependent name", |
1634 | -*/ | |
1635 | - "バージョン依存ファイル名が付いたデータファイル", | |
1636 | 1607 | #endif |
1637 | 1608 | #endif |
1638 | 1609 | #ifdef DUMPLOG |
1639 | -/*JP | |
1640 | 1610 | "end-of-game dumplogs", |
1641 | -*/ | |
1642 | - "ゲーム終了時データダンプ", | |
1643 | 1611 | #endif |
1644 | 1612 | #ifdef HOLD_LOCKFILE_OPEN |
1645 | -/*JP | |
1646 | 1613 | "exclusive lock on level 0 file", |
1647 | -*/ | |
1648 | - "レベル0ファイルでの排他ロック", | |
1649 | 1614 | #endif |
1650 | 1615 | #if defined(MSGHANDLER) && (defined(POSIX_TYPES) || defined(__GNUC__)) |
1651 | 1616 | "external program as a message handler", |
@@ -1654,28 +1619,16 @@ static const char *build_opts[] = { | ||
1654 | 1619 | "floppy drive support", |
1655 | 1620 | #endif |
1656 | 1621 | #ifdef INSURANCE |
1657 | -/*JP | |
1658 | 1622 | "insurance files for recovering from crashes", |
1659 | -*/ | |
1660 | - "クラッシュからの復旧のための保険ファイル", | |
1661 | 1623 | #endif |
1662 | 1624 | #ifdef LOGFILE |
1663 | -/*JP | |
1664 | 1625 | "log file", |
1665 | -*/ | |
1666 | - "ログファイル", | |
1667 | 1626 | #endif |
1668 | 1627 | #ifdef XLOGFILE |
1669 | -/*JP | |
1670 | 1628 | "extended log file", |
1671 | -*/ | |
1672 | - "拡張ログファイル", | |
1673 | 1629 | #endif |
1674 | 1630 | #ifdef PANICLOG |
1675 | -/*JP | |
1676 | 1631 | "errors and warnings log file", |
1677 | -*/ | |
1678 | - "エラーと警告のログファイル", | |
1679 | 1632 | #endif |
1680 | 1633 | #ifdef MAIL |
1681 | 1634 | "mail daemon", |
@@ -1684,10 +1637,7 @@ static const char *build_opts[] = { | ||
1684 | 1637 | "MSDOS protected mode", |
1685 | 1638 | #endif |
1686 | 1639 | #ifdef NEWS |
1687 | -/*JP | |
1688 | 1640 | "news file", |
1689 | -*/ | |
1690 | - "ニュースファイル", | |
1691 | 1641 | #endif |
1692 | 1642 | #ifdef OVERLAY |
1693 | 1643 | #ifdef MOVERLAY |
@@ -1701,116 +1651,62 @@ static const char *build_opts[] = { | ||
1701 | 1651 | #endif |
1702 | 1652 | #endif |
1703 | 1653 | /* pattern matching method will be substituted by nethack at run time */ |
1704 | -/*JP | |
1705 | 1654 | "pattern matching via :PATMATCH:", |
1706 | -*/ | |
1707 | - ":PATMATCH:によるパターンマッチング", | |
1708 | 1655 | #ifdef USE_ISAAC64 |
1709 | -/*JP | |
1710 | 1656 | "pseudo random numbers generated by ISAAC64", |
1711 | -*/ | |
1712 | - "ISAAC64による疑似乱数", | |
1713 | 1657 | #ifdef DEV_RANDOM |
1714 | 1658 | #ifdef NHSTDC |
1715 | 1659 | /* include which specific one */ |
1716 | -/*JP | |
1717 | 1660 | "strong PRNG seed available from " DEV_RANDOM, |
1718 | -*/ | |
1719 | - DEV_RANDOM "による強力な疑似乱数の種", | |
1720 | 1661 | #else |
1721 | -/*JP | |
1722 | 1662 | "strong PRNG seed available from DEV_RANDOM", |
1723 | -*/ | |
1724 | - "DEV_RANDOMによる強力な疑似乱数の種", | |
1725 | 1663 | #endif |
1726 | 1664 | #else |
1727 | 1665 | #ifdef WIN32 |
1728 | -/*JP | |
1729 | 1666 | "strong PRNG seed available from CNG BCryptGenRandom()", |
1730 | -*/ | |
1731 | - "CNG BCryptGenRandom()による強力な疑似乱数の種", | |
1732 | 1667 | #endif |
1733 | 1668 | #endif /* DEV_RANDOM */ |
1734 | 1669 | #else /* ISAAC64 */ |
1735 | 1670 | #ifdef RANDOM |
1736 | -/*JP | |
1737 | 1671 | "pseudo random numbers generated by random()", |
1738 | -*/ | |
1739 | - "random()による疑似乱数", | |
1740 | 1672 | #else |
1741 | -/*JP | |
1742 | 1673 | "pseudo random numbers generated by C rand()", |
1743 | -*/ | |
1744 | - "C rand()による疑似乱数", | |
1745 | 1674 | #endif |
1746 | 1675 | #endif |
1747 | 1676 | #ifdef SELECTSAVED |
1748 | -/*JP | |
1749 | 1677 | "restore saved games via menu", |
1750 | -*/ | |
1751 | - "セーブデータのメニュー選択", | |
1752 | 1678 | #endif |
1753 | 1679 | #ifdef SCORE_ON_BOTL |
1754 | -/*JP | |
1755 | 1680 | "score on status line", |
1756 | -*/ | |
1757 | - "ステータス行のスコア表示", | |
1758 | 1681 | #endif |
1759 | 1682 | #ifdef CLIPPING |
1760 | -/*JP | |
1761 | 1683 | "screen clipping", |
1762 | -*/ | |
1763 | - "画面のクリッピング", | |
1764 | 1684 | #endif |
1765 | 1685 | #ifdef NO_TERMS |
1766 | 1686 | #ifdef MAC |
1767 | -/*JP | |
1768 | 1687 | "screen control via mactty", |
1769 | -*/ | |
1770 | - "macttyによる画面制御", | |
1771 | 1688 | #endif |
1772 | 1689 | #ifdef SCREEN_BIOS |
1773 | -/*JP | |
1774 | 1690 | "screen control via BIOS", |
1775 | -*/ | |
1776 | - "BIOSによる画面制御", | |
1777 | 1691 | #endif |
1778 | 1692 | #ifdef SCREEN_DJGPPFAST |
1779 | -/*JP | |
1780 | 1693 | "screen control via DJGPP fast", |
1781 | -*/ | |
1782 | - "DJGPP fastによる画面制御", | |
1783 | 1694 | #endif |
1784 | 1695 | #ifdef SCREEN_VGA |
1785 | -/*JP | |
1786 | 1696 | "screen control via VGA graphics", |
1787 | -*/ | |
1788 | - "VGAグラフィックによる画面制御", | |
1789 | 1697 | #endif |
1790 | 1698 | #ifdef WIN32CON |
1791 | -/*JP | |
1792 | 1699 | "screen control via WIN32 console I/O", |
1793 | -*/ | |
1794 | - "WIN32コンソールI/Oによる画面制御", | |
1795 | 1700 | #endif |
1796 | 1701 | #endif |
1797 | 1702 | #ifdef SHELL |
1798 | 1703 | "shell command", |
1799 | 1704 | #endif |
1800 | -/*JP | |
1801 | 1705 | "traditional status display", |
1802 | -*/ | |
1803 | - "伝統的なステータス表示", | |
1804 | 1706 | #ifdef STATUS_HILITES |
1805 | -/*JP | |
1806 | 1707 | "status via windowport with highlighting", |
1807 | -*/ | |
1808 | - "ハイライト付きのウィンドウによるステータス", | |
1809 | 1708 | #else |
1810 | -/*JP | |
1811 | 1709 | "status via windowport without highlighting", |
1812 | -*/ | |
1813 | - "ハイライトなしのウィンドウによるステータス", | |
1814 | 1710 | #endif |
1815 | 1711 | #ifdef SUSPEND |
1816 | 1712 | "suspend command", |
@@ -1838,10 +1734,7 @@ static const char *build_opts[] = { | ||
1838 | 1734 | "timed wait for display effects", |
1839 | 1735 | #endif |
1840 | 1736 | #ifdef USER_SOUNDS |
1841 | -/*JP | |
1842 | 1737 | "user sounds", |
1843 | -*/ | |
1844 | - "サウンド", | |
1845 | 1738 | #endif |
1846 | 1739 | #ifdef PREFIXES_IN_USE |
1847 | 1740 | "variable playground", |
@@ -1856,16 +1749,10 @@ static const char *build_opts[] = { | ||
1856 | 1749 | "run-length compression of map in save files", |
1857 | 1750 | #endif |
1858 | 1751 | #ifdef SYSCF |
1859 | -/*JP | |
1860 | 1752 | "system configuration at run-time", |
1861 | -*/ | |
1862 | - "実行時設定ファイル", | |
1863 | 1753 | #endif |
1864 | 1754 | save_bones_compat_buf, |
1865 | -/*JP | |
1866 | 1755 | "and basic NetHack features" |
1867 | -*/ | |
1868 | - "JNetHack基本機能" | |
1869 | 1756 | }; |
1870 | 1757 | |
1871 | 1758 | struct win_info { |
@@ -1885,18 +1772,12 @@ static struct win_info window_opts[] = { | ||
1885 | 1772 | #else |
1886 | 1773 | /* assume that one or more of IBMgraphics, DECgraphics, or MACgraphics |
1887 | 1774 | can be enabled; we can't tell from here whether that is accurate */ |
1888 | -/*JP | |
1889 | 1775 | "traditional text with optional line-drawing" |
1890 | -*/ | |
1891 | - "伝統的なテキスト表示" | |
1892 | 1776 | #endif |
1893 | 1777 | }, |
1894 | 1778 | #endif |
1895 | 1779 | #ifdef CURSES_GRAPHICS |
1896 | -/*JP | |
1897 | 1780 | { "curses", "terminal-based graphics" }, |
1898 | -*/ | |
1899 | - { "curses", "端末ベースグラフィック" }, | |
1900 | 1781 | #endif |
1901 | 1782 | #ifdef X11_GRAPHICS |
1902 | 1783 | { "X11", "X11" }, |
@@ -2029,10 +1910,7 @@ do_options() | ||
2029 | 1910 | #endif |
2030 | 1911 | ); |
2031 | 1912 | |
2032 | -/*JP | |
2033 | 1913 | Fprintf(ofp, "\nOptions compiled into this edition:\n"); |
2034 | -*/ | |
2035 | - Fprintf(ofp, "\nコンパイル時オプション:\n"); | |
2036 | 1914 | length = COLNO + 1; /* force 1st item onto new line */ |
2037 | 1915 | for (i = 0; i < SIZE(build_opts); i++) { |
2038 | 1916 | opt_out_words(strcat(strcpy(buf, build_opts[i]), |
@@ -2042,12 +1920,8 @@ do_options() | ||
2042 | 1920 | Fprintf(ofp, "\n"); /* terminate last line of words */ |
2043 | 1921 | |
2044 | 1922 | winsyscnt = SIZE(window_opts) - 1; |
2045 | -#if 0 /*JP:T*/ | |
2046 | 1923 | Fprintf(ofp, "\nSupported windowing system%s:\n", |
2047 | 1924 | (winsyscnt > 1) ? "s" : ""); |
2048 | -#else | |
2049 | - Fprintf(ofp, "\n対応ウィンドウシステム:\n"); | |
2050 | -#endif | |
2051 | 1925 | length = COLNO + 1; /* force 1st item onto new line */ |
2052 | 1926 | for (i = 0; i < winsyscnt; i++) { |
2053 | 1927 | Sprintf(buf, "\"%s\"", window_opts[i].id); |
@@ -2058,25 +1932,14 @@ do_options() | ||
2058 | 1932 | * 2 : foo and bar (note no period; comes from 'with default' below) |
2059 | 1933 | * 3+: for, bar, and quux |
2060 | 1934 | */ |
2061 | -#if 0 /*JP*/ | |
2062 | 1935 | opt_out_words(strcat(buf, (winsyscnt == 1) ? "." /* no 'default' */ |
2063 | 1936 | : (winsyscnt == 2 && i == 0) ? " and" |
2064 | 1937 | : (i == winsyscnt - 2) ? ", and" |
2065 | 1938 | : ","), |
2066 | 1939 | &length); |
2067 | -#else | |
2068 | - opt_out_words(strcat(buf, (winsyscnt == 1) ? "." /* no 'default' */ | |
2069 | - : (winsyscnt == 2 && i == 0) ? ", " | |
2070 | - : (i == winsyscnt - 2) ? ", " | |
2071 | - : ","), | |
2072 | - &length); | |
2073 | -#endif | |
2074 | 1940 | } |
2075 | 1941 | if (winsyscnt > 1) { |
2076 | -/*JP | |
2077 | 1942 | Sprintf(buf, "with a default of \"%s\".", DEFAULT_WINDOW_SYS); |
2078 | -*/ | |
2079 | - Sprintf(buf, "デフォルトは\"%s\".", DEFAULT_WINDOW_SYS); | |
2080 | 1943 | opt_out_words(buf, &length); |
2081 | 1944 | } |
2082 | 1945 | Fprintf(ofp, "\n"); /* terminate last line of words */ |