Merge tag 'mame0191'

MAME 0.191
This commit is contained in:
Vas Crabb 2017-10-25 13:58:32 +11:00
commit ad13bddaf6
7 changed files with 90 additions and 75 deletions

View File

@ -4,8 +4,8 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mamedev.mame"
android:versionCode="190"
android:versionName="0.190"
android:versionCode="191"
android:versionName="0.191"
android:installLocation="auto">
<!-- Android 5.0 -->

View File

@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: MAME\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-10-03 10:32+1100\n"
"PO-Revision-Date: 2017-09-29 15:23+0800\n"
"PO-Revision-Date: 2017-10-03 22:56+0800\n"
"Last-Translator: YuiFAN\n"
"Language-Team: MAME Language Team\n"
"Language: zh_CN\n"
@ -181,6 +181,7 @@ msgid ""
"complete. There is nothing you can do to fix this problem except wait for "
"the developers to improve the emulation.\n"
msgstr ""
"\n"
"此机械无法执行,机械的模拟还不完全。除了等待开发人员改良模拟之外,没有方法可"
"以解决这个问题。\n"
@ -1016,7 +1017,7 @@ msgstr "档案已存在 — 是否覆写?"
#: src/frontend/mame/ui/filecreate.cpp:171
msgid "New Image Name:"
msgstr "新映档名称:"
msgstr "新映档名称:"
#: src/frontend/mame/ui/filecreate.cpp:177
msgid "Image Format:"
@ -1244,51 +1245,51 @@ msgstr "计时\t不完美\n"
#: src/frontend/mame/ui/selgame.cpp:945
msgid "Mechanical Machine\tYes\n"
msgstr ""
msgstr "机械式机台\t是\n"
#: src/frontend/mame/ui/selgame.cpp:945
msgid "Mechanical Machine\tNo\n"
msgstr ""
msgstr "机械式机台\t否\n"
#: src/frontend/mame/ui/selgame.cpp:946
msgid "Requires Artwork\tYes\n"
msgstr ""
msgstr "需要装饰图\t是\n"
#: src/frontend/mame/ui/selgame.cpp:946
msgid "Requires Artwork\tNo\n"
msgstr ""
msgstr "需要装饰图\t否\n"
#: src/frontend/mame/ui/selgame.cpp:947
msgid "Requires Clickable Artwork\tYes\n"
msgstr ""
msgstr "需要可点击的装饰图\t是\n"
#: src/frontend/mame/ui/selgame.cpp:947
msgid "Requires Clickable Artwork\tNo\n"
msgstr ""
msgstr "需要可点击的装饰图\t否\n"
#: src/frontend/mame/ui/selgame.cpp:948
msgid "Support Cocktail\tYes\n"
msgstr ""
msgstr "支援檯面型筐体\t是\n"
#: src/frontend/mame/ui/selgame.cpp:948
msgid "Support Cocktail\tNo\n"
msgstr ""
msgstr "支援檯面型筐体\t否\n"
#: src/frontend/mame/ui/selgame.cpp:949
msgid "Driver is BIOS\tYes\n"
msgstr ""
msgstr "驱动程式为 BIOS\t是\n"
#: src/frontend/mame/ui/selgame.cpp:949
msgid "Driver is BIOS\tNo\n"
msgstr ""
msgstr "驱动程式为 BIOS\t否\n"
#: src/frontend/mame/ui/selgame.cpp:950
msgid "Support Save\tYes\n"
msgstr ""
msgstr "支援即时存档\t是\n"
#: src/frontend/mame/ui/selgame.cpp:950
msgid "Support Save\tNo\n"
msgstr ""
msgstr "支援即时存档\t否\n"
#: src/frontend/mame/ui/selgame.cpp:951
msgid "Screen Orientation\tVertical\n"
@ -1300,37 +1301,39 @@ msgstr "画面方向\t水平\n"
#: src/frontend/mame/ui/selgame.cpp:961
msgid "Requires CHD\tYes\n"
msgstr ""
msgstr "需要 CHD\t是\n"
#: src/frontend/mame/ui/selgame.cpp:961
msgid "Requires CHD\tNo\n"
msgstr ""
msgstr "需要 CHD\t否\n"
#: src/frontend/mame/ui/selgame.cpp:974
msgid "ROM Audit Result\tOK\n"
msgstr ""
msgstr "ROM 校验结果\tOK\n"
#: src/frontend/mame/ui/selgame.cpp:976
msgid "ROM Audit Result\tBAD\n"
msgstr ""
msgstr "ROM 校验结果\t错误\n"
#: src/frontend/mame/ui/selgame.cpp:979
msgid "Samples Audit Result\tNone Needed\n"
msgstr ""
msgstr "样本档校验结果\t不需要\n"
#: src/frontend/mame/ui/selgame.cpp:981
msgid "Samples Audit Result\tOK\n"
msgstr ""
msgstr "样本档校验结果\tOK\n"
#: src/frontend/mame/ui/selgame.cpp:983
msgid "Samples Audit Result\tBAD\n"
msgstr ""
msgstr "样本档校验结果\t错误\n"
#: src/frontend/mame/ui/selgame.cpp:987
msgid ""
"ROM Audit Disabled\t\n"
"Samples Audit Disabled\t\n"
msgstr ""
"ROM 校验已停用\t\n"
"样本档校验已停用\t\n"
#: src/frontend/mame/ui/selgame.cpp:1171
#, c-format
@ -2495,27 +2498,27 @@ msgstr "设定热键"
#: plugins/cheat/init.lua:668
#, lua-format
msgid "Activated: %s = %s"
msgstr ""
msgstr "已激活: %s = %s"
#: plugins/cheat/init.lua:671 plugins/cheat/init.lua:729
#, lua-format
msgid "Activated: %s"
msgstr ""
msgstr "已激活: %s"
#: plugins/cheat/init.lua:733
#, lua-format
msgid "Enabled: %s"
msgstr ""
msgstr "启用: %s"
#: plugins/cheat/init.lua:738
#, lua-format
msgid "Disabled: %s"
msgstr ""
msgstr "停用: %s"
#: plugins/cheat/init.lua:776
#, lua-format
msgid "%s added"
msgstr ""
msgstr "%s 已加入"
#: plugins/data/data_command.lua:19
msgid "Command"
@ -2523,7 +2526,7 @@ msgstr "出招表"
#: plugins/data/data_gameinit.lua:16
msgid "Gameinit"
msgstr ""
msgstr "Gameinit"
#: plugins/data/data_hiscore.lua:770 plugins/data/data_hiscore.lua:818
msgid "High Scores"
@ -2563,7 +2566,7 @@ msgstr "系统信息"
#: plugins/data/data_marp.lua:129
msgid "MARPScore"
msgstr "MARPScore"
msgstr "MARP得分"
#: plugins/cheatfind/init.lua:344
msgid "Save Cheat"
@ -2584,7 +2587,7 @@ msgstr "作弊码名称"
#: plugins/cheatfind/init.lua:354
#, lua-format
msgid "Default name is %s"
msgstr ""
msgstr "缺省名称为 %s"
#: plugins/cheatfind/init.lua:362
msgid "Player"
@ -2601,7 +2604,7 @@ msgstr "储存"
#: plugins/cheatfind/init.lua:399
#, lua-format
msgid "Cheat written to %s and added to cheat.simple"
msgstr ""
msgstr "作弊码已写入至 %s 且已加入至 cheat.simple"
#: plugins/cheatfind/init.lua:407
msgid "Cheat added to cheat.simple"
@ -2612,6 +2615,8 @@ msgid ""
"Unable to write file\n"
"Ensure that cheatpath folder exists"
msgstr ""
"无法写入档案\n"
"确认 cheatpath 资料夹是否存在"
#: plugins/cheatfind/init.lua:421
msgid "Cancel"

View File

@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: MAME\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-10-03 10:32+1100\n"
"PO-Revision-Date: 2017-09-29 15:22+0800\n"
"PO-Revision-Date: 2017-10-03 22:41+0800\n"
"Last-Translator: YuiFAN\n"
"Language-Team: MAME Language Team\n"
"Language: zh_TW\n"
@ -181,6 +181,7 @@ msgid ""
"complete. There is nothing you can do to fix this problem except wait for "
"the developers to improve the emulation.\n"
msgstr ""
"\n"
"此機台無法執行,機台的模擬還不完全。除了等待開發人員改良模擬之外,沒有方法可"
"以解決這個問題。\n"
@ -1016,7 +1017,7 @@ msgstr "檔案已存在 — 是否覆蓋?"
#: src/frontend/mame/ui/filecreate.cpp:171
msgid "New Image Name:"
msgstr "新映檔名稱:"
msgstr "新映檔名稱:"
#: src/frontend/mame/ui/filecreate.cpp:177
msgid "Image Format:"
@ -1244,51 +1245,51 @@ msgstr "計時\t不完美\n"
#: src/frontend/mame/ui/selgame.cpp:945
msgid "Mechanical Machine\tYes\n"
msgstr ""
msgstr "機械式機台\t是\n"
#: src/frontend/mame/ui/selgame.cpp:945
msgid "Mechanical Machine\tNo\n"
msgstr ""
msgstr "機械式機台\t否\n"
#: src/frontend/mame/ui/selgame.cpp:946
msgid "Requires Artwork\tYes\n"
msgstr ""
msgstr "需要裝飾圖\t是\n"
#: src/frontend/mame/ui/selgame.cpp:946
msgid "Requires Artwork\tNo\n"
msgstr ""
msgstr "需要裝飾圖\t否\n"
#: src/frontend/mame/ui/selgame.cpp:947
msgid "Requires Clickable Artwork\tYes\n"
msgstr ""
msgstr "需要可點擊的裝飾圖\t是\n"
#: src/frontend/mame/ui/selgame.cpp:947
msgid "Requires Clickable Artwork\tNo\n"
msgstr ""
msgstr "需要可點擊的裝飾圖\t否\n"
#: src/frontend/mame/ui/selgame.cpp:948
msgid "Support Cocktail\tYes\n"
msgstr ""
msgstr "支援檯面型筐體\t是\n"
#: src/frontend/mame/ui/selgame.cpp:948
msgid "Support Cocktail\tNo\n"
msgstr ""
msgstr "支援檯面型筐體\t否\n"
#: src/frontend/mame/ui/selgame.cpp:949
msgid "Driver is BIOS\tYes\n"
msgstr ""
msgstr "驅動程式為 BIOS\t是\n"
#: src/frontend/mame/ui/selgame.cpp:949
msgid "Driver is BIOS\tNo\n"
msgstr ""
msgstr "驅動程式為 BIOS\t否\n"
#: src/frontend/mame/ui/selgame.cpp:950
msgid "Support Save\tYes\n"
msgstr ""
msgstr "支援即時存檔\t是\n"
#: src/frontend/mame/ui/selgame.cpp:950
msgid "Support Save\tNo\n"
msgstr ""
msgstr "支援即時存檔\t否\n"
#: src/frontend/mame/ui/selgame.cpp:951
msgid "Screen Orientation\tVertical\n"
@ -1300,37 +1301,39 @@ msgstr "畫面方向\t水平\n"
#: src/frontend/mame/ui/selgame.cpp:961
msgid "Requires CHD\tYes\n"
msgstr ""
msgstr "需要 CHD\t是\n"
#: src/frontend/mame/ui/selgame.cpp:961
msgid "Requires CHD\tNo\n"
msgstr ""
msgstr "需要 CHD\t否\n"
#: src/frontend/mame/ui/selgame.cpp:974
msgid "ROM Audit Result\tOK\n"
msgstr ""
msgstr "ROM 驗證結果\tOK\n"
#: src/frontend/mame/ui/selgame.cpp:976
msgid "ROM Audit Result\tBAD\n"
msgstr ""
msgstr "ROM 驗證結果\t錯誤\n"
#: src/frontend/mame/ui/selgame.cpp:979
msgid "Samples Audit Result\tNone Needed\n"
msgstr ""
msgstr "樣本檔驗證結果\t不需要\n"
#: src/frontend/mame/ui/selgame.cpp:981
msgid "Samples Audit Result\tOK\n"
msgstr ""
msgstr "樣本檔驗證結果\tOK\n"
#: src/frontend/mame/ui/selgame.cpp:983
msgid "Samples Audit Result\tBAD\n"
msgstr ""
msgstr "樣本檔驗證結果\t錯誤\n"
#: src/frontend/mame/ui/selgame.cpp:987
msgid ""
"ROM Audit Disabled\t\n"
"Samples Audit Disabled\t\n"
msgstr ""
"ROM 驗證已停用\t\n"
"樣本檔驗證已停用\t\n"
#: src/frontend/mame/ui/selgame.cpp:1171
#, c-format
@ -2495,27 +2498,27 @@ msgstr "設定熱鍵"
#: plugins/cheat/init.lua:668
#, lua-format
msgid "Activated: %s = %s"
msgstr ""
msgstr "已啟動: %s = %s"
#: plugins/cheat/init.lua:671 plugins/cheat/init.lua:729
#, lua-format
msgid "Activated: %s"
msgstr ""
msgstr "已啟動: %s"
#: plugins/cheat/init.lua:733
#, lua-format
msgid "Enabled: %s"
msgstr ""
msgstr "啟用: %s"
#: plugins/cheat/init.lua:738
#, lua-format
msgid "Disabled: %s"
msgstr ""
msgstr "已停用: %s"
#: plugins/cheat/init.lua:776
#, lua-format
msgid "%s added"
msgstr ""
msgstr "$s 已加入"
#: plugins/data/data_command.lua:19
msgid "Command"
@ -2584,7 +2587,7 @@ msgstr "作弊碼名稱"
#: plugins/cheatfind/init.lua:354
#, lua-format
msgid "Default name is %s"
msgstr ""
msgstr "預設名稱為 %s"
#: plugins/cheatfind/init.lua:362
msgid "Player"
@ -2601,7 +2604,7 @@ msgstr "儲存"
#: plugins/cheatfind/init.lua:399
#, lua-format
msgid "Cheat written to %s and added to cheat.simple"
msgstr ""
msgstr "作弊碼已寫入至 %s 且已加入 cheat.simple"
#: plugins/cheatfind/init.lua:407
msgid "Cheat added to cheat.simple"
@ -2612,6 +2615,8 @@ msgid ""
"Unable to write file\n"
"Ensure that cheatpath folder exists"
msgstr ""
"無法寫入檔案\n"
"確認 cheatpath 資料夾是否存在"
#: plugins/cheatfind/init.lua:421
msgid "Cancel"

View File

@ -1547,14 +1547,14 @@ endif
ifeq (posix,$(SHELLTYPE))
$(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo '#define BARE_BUILD_VERSION "0.190"' > $@
@echo '#define BARE_BUILD_VERSION "0.191"' > $@
@echo 'extern const char bare_build_version[];' >> $@
@echo 'extern const char build_version[];' >> $@
@echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@
@echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@
else
$(GENDIR)/version.cpp: $(GENDIR)/git_desc
@echo #define BARE_BUILD_VERSION "0.190" > $@
@echo #define BARE_BUILD_VERSION "0.191" > $@
@echo extern const char bare_build_version[]; >> $@
@echo extern const char build_version[]; >> $@
@echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@

1
roms/dir.txt Normal file
View File

@ -0,0 +1 @@
Place ROM directories here

View File

@ -4,6 +4,10 @@
#include "emu.h"
#include "gamate_protection.h"
//#define VERBOSE 1
#include "logmacro.h"
DEFINE_DEVICE_TYPE(GAMATE_PROT, gamate_protection_device, "gamate_prot", "Gamate Protection Mapper")
gamate_protection_device::gamate_protection_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
@ -44,7 +48,7 @@ bool gamate_protection_device::is_protection_passed()
WRITE_LINE_MEMBER(gamate_protection_device::prot_w)
{
logerror("write to protection %01x\n", state);
LOG("write to protection %01x\n", state);
if (m_inpos < 8)
{
@ -53,7 +57,7 @@ WRITE_LINE_MEMBER(gamate_protection_device::prot_w)
}
else
{
logerror("byte in was %c\n", m_inbyte);
LOG("byte in was %c\n", m_inbyte);
if (!m_has_failed)
{
@ -61,7 +65,7 @@ WRITE_LINE_MEMBER(gamate_protection_device::prot_w)
{
if (m_inbyte == m_prot_string[m_inseq])
{
logerror("OK\n");
LOG("OK\n");
}
else
{
@ -78,7 +82,7 @@ WRITE_LINE_MEMBER(gamate_protection_device::prot_w)
if (!m_has_failed && m_inseq == 15)
{
m_inbyte = 0x47;
logerror("setting byte to output\n");
LOG("setting byte to output\n");
m_passed_write = 1;
}
}
@ -92,11 +96,11 @@ READ_LINE_MEMBER(gamate_protection_device::prot_r)
int retval = (m_inbyte >> (7 - m_inpos)) & 1;
m_inpos++;
logerror("read from protection %01x\n", retval);
LOG("read from protection %01x\n", retval);
if (m_inpos == 8)
{
logerror("unlocking ROM\n");
LOG("unlocking ROM\n");
m_is_protection_passed = 1;
m_inpos = 0;
m_inbyte = 0;
@ -106,7 +110,7 @@ READ_LINE_MEMBER(gamate_protection_device::prot_r)
}
else
{
logerror("read from protection when not ready\n");
LOG("read from protection when not ready\n");
}
return 0x0;

View File

@ -28,11 +28,11 @@ class alphatpx_state : public driver_device
{
public:
alphatpx_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_bankdev(*this, "bankdev"),
m_palette(*this, "palette"),
m_vram(*this, "vram"),
m_gfx(*this, "gfx")
driver_device(mconfig, type, tag),
m_bankdev(*this, "bankdev"),
m_palette(*this, "palette"),
m_vram(*this, "vram"),
m_gfx(*this, "gfx")
{ }
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@ -225,7 +225,7 @@ ROM_START( alphatp3 )
ROM_LOAD("caap36_02_19.bin", 0x0000, 0x1000, CRC(23df6666) SHA1(5ea04cd299dec9951425eb91ecceb4818c4c6378))
ROM_REGION(0x400, "mcu", 0)
ROM_LOAD("p3_8041.bin", 0x000, 0x400, CRC(97206ad7) SHA1(e4e6b2ebf87ae9dc0b051f3f478496109d124896))
ROM_LOAD("p3_8041.bin", 0x000, 0x400, NO_DUMP)
ROM_REGION(0x800, "gfx", 0)
ROM_LOAD("cajp08_01_15.bin", 0x000, 0x800, CRC(4ed11dac) SHA1(9db9b8e0edf471faaddbb5521d6223121146bab8))