From 2b52ff5e6faaa36976a3cb249a383d7b8f65facc Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 4 Sep 2022 07:26:01 +1000 Subject: Language updates, software demotions, and minor code cleanup. Updated Chinese UI translations. [YuiFAN] Updated Ukrainian UI translation. [Stanley Kid] gbcolor.xml: Demoted beastfgt to partially supported (HUD blank on GBC), and demoted emochndx to unsupported due to all kinds of broken behaviour. Also added chongwu title from title screen as another alt_title - it's different to the cartridge label. --- hash/gbcolor.xml | 15 ++++++--- language/Chinese_Simplified/strings.po | 58 +++++++++++++++------------------ language/Chinese_Traditional/strings.po | 14 +++----- language/Ukrainian/strings.po | 18 ++++------ src/mame/gaelco/glass.cpp | 24 ++++++-------- src/mame/gametron/gatron.cpp | 7 ++-- 6 files changed, 64 insertions(+), 72 deletions(-) diff --git a/hash/gbcolor.xml b/hash/gbcolor.xml index c60459790db..6a0234b2dc0 100644 --- a/hash/gbcolor.xml +++ b/hash/gbcolor.xml @@ -25003,7 +25003,8 @@ license:CC0 - + + Beast Fighter (Taiwan) 19?? Sachen @@ -25069,6 +25070,7 @@ license:CC0 + Rocman-X (Taiwan) 19?? @@ -25376,7 +25378,8 @@ license:CC0 --> - + + Emo Cheng DX (China) 200? Sintax @@ -26845,16 +26848,20 @@ license:CC0 + - Chong Wu Xiao Jing Ling - Jie Jin Ta Zhi Wang (China) + Chǒngwù Xiǎo Jīnglíng - Jié Jīn Tǎ Zhī Wáng (China) 20?? <unknown> - + + diff --git a/language/Chinese_Simplified/strings.po b/language/Chinese_Simplified/strings.po index 09e2496ca72..4c18c852037 100644 --- a/language/Chinese_Simplified/strings.po +++ b/language/Chinese_Simplified/strings.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-09-01 02:13+1000\n" -"PO-Revision-Date: 2022-07-02 08:42+0800\n" +"PO-Revision-Date: 2022-09-02 10:02+0800\n" "Last-Translator: YuiFAN\n" "Language-Team: MAME Language Team\n" "Language: zh_CN\n" @@ -30,7 +30,7 @@ msgstr "" #: src/frontend/mame/ui/ui.cpp:557 msgid "" "This system requires media images to be mounted for the following device(s): " -msgstr "此系统需要挂载下列装置的媒体映像档: " +msgstr "此系统需要挂载下列设备的媒体映像档: " #: src/frontend/mame/ui/ui.cpp:1252 #, c-format @@ -273,7 +273,7 @@ msgstr "%1$s %2$s ( %3$d / %4$d 软件包 )" #: src/frontend/mame/ui/selsoft.cpp:707 #, c-format msgid "%1$s - select software" -msgstr "" +msgstr "%1$s - 选择软件" #: src/frontend/mame/ui/selsoft.cpp:712 src/frontend/mame/ui/selgame.cpp:1074 #, c-format @@ -308,7 +308,7 @@ msgstr "插件" #: src/frontend/mame/ui/optsmenu.cpp:85 msgid "Input Devices" -msgstr "输入装置" +msgstr "输入设备" #: src/frontend/mame/ui/optsmenu.cpp:87 msgid "Save Settings" @@ -590,39 +590,39 @@ msgstr "投币脉冲" #: src/frontend/mame/ui/submenu.cpp:102 msgid "Input Device Options" -msgstr "输入装置选项" +msgstr "输入设备选项" #: src/frontend/mame/ui/submenu.cpp:103 msgid "Lightgun Device Assignment" -msgstr "分配光线枪装置" +msgstr "分配光线枪设备" #: src/frontend/mame/ui/submenu.cpp:104 msgid "Trackball Device Assignment" -msgstr "分配轨迹球装置" +msgstr "分配轨迹球设备" #: src/frontend/mame/ui/submenu.cpp:105 msgid "Pedal Device Assignment" -msgstr "分配踏板装置" +msgstr "分配踏板设备" #: src/frontend/mame/ui/submenu.cpp:106 msgid "AD Stick Device Assignment" -msgstr "分配 AD 游戏杆装置" +msgstr "分配 AD 游戏杆设备" #: src/frontend/mame/ui/submenu.cpp:107 msgid "Paddle Device Assignment" -msgstr "分配划桨装置" +msgstr "分配划桨设备" #: src/frontend/mame/ui/submenu.cpp:108 msgid "Dial Device Assignment" -msgstr "分配转盘装置" +msgstr "分配转盘设备" #: src/frontend/mame/ui/submenu.cpp:109 msgid "Positional Device Assignment" -msgstr "分配指向装置" +msgstr "分配指向设备" #: src/frontend/mame/ui/submenu.cpp:110 msgid "Mouse Device Assignment" -msgstr "分配鼠标装置" +msgstr "分配鼠标设备" #: src/frontend/mame/ui/submenu.cpp:112 msgid "Keyboard Input Provider" @@ -963,7 +963,7 @@ msgid "" "experience this system.\n" msgstr "" "\n" -"此系统的部分元件无法模拟, 因其需要实际活动的互动或机械装置的组合。 故无法达成" +"此系统的部分元件无法模拟, 因其需要实际活动的互动或机械设备的组合。 故无法达成" "此系统的完整体验。\n" #: src/frontend/mame/ui/info.cpp:165 @@ -1444,7 +1444,7 @@ msgstr "释出区域" #: src/frontend/mame/ui/utils.cpp:125 msgctxt "software-filter" msgid "Device Type" -msgstr "装置类别" +msgstr "设备类别" #: src/frontend/mame/ui/utils.cpp:126 msgctxt "software-filter" @@ -1541,7 +1541,7 @@ msgstr "重设" #: src/frontend/mame/ui/miscmenu.cpp:148 msgid "Network Devices" -msgstr "网路装置" +msgstr "网路设备" #: src/frontend/mame/ui/miscmenu.cpp:237 #, c-format @@ -1655,7 +1655,7 @@ msgstr "汇出 XML 格式列表 (同 -listxml)" #: src/frontend/mame/ui/miscmenu.cpp:706 msgid "Export list in XML format (like -listxml, but exclude devices)" -msgstr "汇出 XML 格式列表 (同 -listxml,但不包含装置)" +msgstr "汇出 XML 格式列表 (同 -listxml,但不包含设备)" #: src/frontend/mame/ui/miscmenu.cpp:707 msgid "Export list in TXT format (like -listfull)" @@ -1870,27 +1870,27 @@ msgstr "%1$s (%2$s %3$d)" #: src/frontend/mame/ui/inputdevices.cpp:88 msgctxt "menu-inputdev" msgid "Copy Device ID" -msgstr "" +msgstr "拷贝设备 ID" #: src/frontend/mame/ui/inputdevices.cpp:122 msgctxt "menu-inputdev" msgid "Copied device ID to clipboard" -msgstr "" +msgstr "已拷贝设备 ID 至剪贴板" #: src/frontend/mame/ui/inputdevices.cpp:124 msgctxt "menu-inputdev" msgid "Error copying device ID to clipboard" -msgstr "" +msgstr "拷贝设备 ID 至剪贴板时发生错误" #: src/frontend/mame/ui/inputdevices.cpp:162 msgctxt "menu-inputdev" msgid "Input Devices" -msgstr "输入装置" +msgstr "输入设备" #: src/frontend/mame/ui/inputdevices.cpp:203 msgctxt "menu-inputdev" msgid "[no input devices are enabled]" -msgstr "[已启用无输入装置]" +msgstr "[已启用无输入设备]" #: src/frontend/mame/ui/inputtoggle.cpp:22 msgctxt "menu-inputtoggle" @@ -1979,7 +1979,7 @@ msgstr "输入配置 (一般)" #: src/frontend/mame/ui/inputopts.cpp:109 msgctxt "menu-inputopts" msgid "Input Devices" -msgstr "输入装置" +msgstr "输入设备" #: src/frontend/mame/ui/imgcntrl.cpp:132 msgid "Cannot save over directory" @@ -2925,7 +2925,7 @@ msgstr "条码读取器" #: src/frontend/mame/ui/mainmenu.cpp:157 msgctxt "menu-main" msgid "Network Devices" -msgstr "网路装置" +msgstr "网路设备" #: src/frontend/mame/ui/mainmenu.cpp:159 msgctxt "menu-main" @@ -3528,7 +3528,7 @@ msgstr "" "[ 此选项当前已挂载於运行中的系统 ]\n" "\n" "选项: %1$s\n" -"装置: %2$s\n" +"设备: %2$s\n" "\n" "已选用的选项启用下列项目:\n" @@ -3545,7 +3545,7 @@ msgstr "" "[ 此选项当前「尚未」挂载於运行中的系统 ]\n" "\n" "选项: %1$s\n" -"装置: %2$s\n" +"设备: %2$s\n" "\n" "如选用此选项,下列项目將启用:\n" @@ -3606,7 +3606,7 @@ msgstr "* 配置设定:\n" #: src/frontend/mame/ui/devopt.cpp:298 msgid "* Input device(s):\n" -msgstr "* 输入装置:\n" +msgstr "* 输入设备:\n" #: src/frontend/mame/ui/devopt.cpp:300 #, c-format @@ -6498,7 +6498,3 @@ msgid "" msgstr "" "输入组合或按下 %s 取消\n" "%s" - -#, c-format -#~ msgid "System: \"%1$s\" software list " -#~ msgstr "系统: \"%1$s\" 软件清单 " diff --git a/language/Chinese_Traditional/strings.po b/language/Chinese_Traditional/strings.po index 380609878df..0df846e1bd8 100644 --- a/language/Chinese_Traditional/strings.po +++ b/language/Chinese_Traditional/strings.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-09-01 02:13+1000\n" -"PO-Revision-Date: 2022-07-02 08:43+0800\n" +"PO-Revision-Date: 2022-09-02 09:48+0800\n" "Last-Translator: YuiFAN\n" "Language-Team: MAME Language Team\n" "Language: zh_TW\n" @@ -273,7 +273,7 @@ msgstr "%1$s %2$s ( %3$d / %4$d 軟體套件 )" #: src/frontend/mame/ui/selsoft.cpp:707 #, c-format msgid "%1$s - select software" -msgstr "" +msgstr "%1$s - 選擇軟體" #: src/frontend/mame/ui/selsoft.cpp:712 src/frontend/mame/ui/selgame.cpp:1074 #, c-format @@ -1870,17 +1870,17 @@ msgstr "%1$s (%2$s %3$d)" #: src/frontend/mame/ui/inputdevices.cpp:88 msgctxt "menu-inputdev" msgid "Copy Device ID" -msgstr "" +msgstr "複製裝置 ID" #: src/frontend/mame/ui/inputdevices.cpp:122 msgctxt "menu-inputdev" msgid "Copied device ID to clipboard" -msgstr "" +msgstr "已複製裝置 ID 至剪貼簿" #: src/frontend/mame/ui/inputdevices.cpp:124 msgctxt "menu-inputdev" msgid "Error copying device ID to clipboard" -msgstr "" +msgstr "複製裝置 ID 至剪貼簿時發生錯誤" #: src/frontend/mame/ui/inputdevices.cpp:162 msgctxt "menu-inputdev" @@ -6498,7 +6498,3 @@ msgid "" msgstr "" "輸入組合或按下 %s 取消\n" "%s" - -#, c-format -#~ msgid "System: \"%1$s\" software list " -#~ msgstr "系統: \"%1$s\" 軟體清單 " diff --git a/language/Ukrainian/strings.po b/language/Ukrainian/strings.po index bcff076fbc5..9f79ec2faaa 100644 --- a/language/Ukrainian/strings.po +++ b/language/Ukrainian/strings.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-09-01 02:13+1000\n" -"PO-Revision-Date: 2022-06-19 17:51+0300\n" +"PO-Revision-Date: 2022-09-03 11:52+0300\n" "Last-Translator: Stanley Kid \n" "Language-Team: MAME Language Team\n" "Language: uk\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 3.0.1\n" +"X-Generator: Poedit 3.1.1\n" #: src/frontend/mame/ui/ui.cpp:472 src/frontend/mame/ui/ui.cpp:545 msgid "" @@ -276,7 +276,7 @@ msgstr "%1$s %2$s (%3$d / %4$d програмні пакети)" #: src/frontend/mame/ui/selsoft.cpp:707 #, c-format msgid "%1$s - select software" -msgstr "" +msgstr "%1$s - вибір програми" #: src/frontend/mame/ui/selsoft.cpp:712 src/frontend/mame/ui/selgame.cpp:1074 #, c-format @@ -1879,17 +1879,17 @@ msgstr "" #: src/frontend/mame/ui/inputdevices.cpp:88 msgctxt "menu-inputdev" msgid "Copy Device ID" -msgstr "" +msgstr "Копіювати ID пристрою" #: src/frontend/mame/ui/inputdevices.cpp:122 msgctxt "menu-inputdev" msgid "Copied device ID to clipboard" -msgstr "" +msgstr "Копіювати ID пристрою до буфера обміну." #: src/frontend/mame/ui/inputdevices.cpp:124 msgctxt "menu-inputdev" msgid "Error copying device ID to clipboard" -msgstr "" +msgstr "Помилка копіювання ID пристрою до буфера обміну." #: src/frontend/mame/ui/inputdevices.cpp:162 msgctxt "menu-inputdev" @@ -2177,7 +2177,7 @@ msgstr "UI-переклади" #: src/frontend/mame/ui/dirmenu.cpp:52 msgctxt "path-option" msgid "Software Lists" -msgstr "" +msgstr "Переліки програм" #: src/frontend/mame/ui/dirmenu.cpp:53 msgctxt "path-option" @@ -6513,7 +6513,3 @@ msgid "" msgstr "" "Укажи комбінацію чи натисни %s для скасування.\n" "%s" - -#, c-format -#~ msgid "System: \"%1$s\" software list " -#~ msgstr "Система: \"%1$s\" переліків програм " diff --git a/src/mame/gaelco/glass.cpp b/src/mame/gaelco/glass.cpp index fb6fb4b4b94..846cfa24bd9 100644 --- a/src/mame/gaelco/glass.cpp +++ b/src/mame/gaelco/glass.cpp @@ -161,23 +161,19 @@ void glass_state::blitter_w(uint16_t data) m_current_bit = 0; // fill the screen bitmap with the current picture - { - uint8_t const *gfx = m_bmap + (m_blitter_command & 0x07) * 0x10000 + (m_blitter_command & 0x08) * 0x10000 + 0x140; + uint8_t const *gfx = m_bmap + (m_blitter_command & 0x07) * 0x10000 + (m_blitter_command & 0x08) * 0x10000 + 0x140; - if ((m_blitter_command & 0x18) != 0) + if (m_blitter_command & 0x18) + { + for (int j = 0; j < 200; j++) { - for (int j = 0; j < 200; j++) - { - for (int i = 0; i < 320; i++) - { - int const color = *gfx; - gfx++; - m_screen_bitmap->pix(j, i) = color & 0xff; - } - } + for (int i = 0; i < 320; i++) + m_screen_bitmap->pix(j, i) = *gfx++; } - else - m_screen_bitmap->fill(0); + } + else + { + m_screen_bitmap->fill(0); } } } diff --git a/src/mame/gametron/gatron.cpp b/src/mame/gametron/gatron.cpp index 1aedeea9890..32b2b2a45b8 100644 --- a/src/mame/gametron/gatron.cpp +++ b/src/mame/gametron/gatron.cpp @@ -344,12 +344,13 @@ namespace { class gatron_state : public driver_device { public: - gatron_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + gatron_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_lamps(*this, "lamp%u", 0U) { } + m_lamps(*this, "lamp%u", 0U) + { } void gat(machine_config &config); -- cgit v1.2.3